Merge from BRANCH_1_0

1 files changed, 7 insertions, 18 deletions

diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h
index 077d5f0..2bf4de6 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/tinykate.h
@@ -23,9 +23,9 @@
 #include <opie/otabwidget.h>
 #include <ktexteditor.h>
 
+class QToolButton;
 class QAction;
 class QPopupMenu;
-class CGotoLine;
 
 class TinyKate : public QMainWindow
 {
@@ -36,6 +36,7 @@ public:
 
 public slots:
     void slotNew();
+ void setDocument(const QString& fileref);
 
 protected slots:
     void slotOpen();
@@ -43,32 +44,20 @@ protected slots:
     void slotCurrentChanged(QWidget *);
     void slotSave();
     void slotSaveAs();
-    void slotGoTo();
-    void slotCursorMoved();
-    void setDocument(const QString &doc);
-    
 protected:
     void open(const QString&);
 private:
     QString currentFileName;
     OTabWidget *tabwidget;
     KTextEditor::View *currentView;
-  
-    QAction *editCopy;
-    QAction *editCut;
-    QAction *editPaste;
-    QAction *editUndo;
-    QAction *editRedo;
-    QAction *editFind;
-    QAction *editFindReplace;
-    QAction *viewIncFontSizes;
-    QAction *viewDecFontSizes;
-    QAction *utilSettings;
-    
+    bool shutDown;
+
+    QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo,  *editFindReplace;
+    QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings;
+
     QPopupMenu *hlmenu;
     uint nextUnnamed;
     uint viewCount;
-    int curLine,curCol;
 };