Browse Source

Merge SourceFile into SourceFileWindow, srcfile.h into srcfilewin.h.
Drop initBase() and THIS hacks.
Remove SourceFileWindow::destroy() slot, put content directly into destructor.


git-svn-id: file:///var/svn/tigccpp/trunk@1116 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
0e6805757b
6 changed files with 458 additions and 497 deletions
  1. 2 2
      ktigcc/ktigcc.h
  2. 0 1
      ktigcc/ktigcc.pro
  3. 38 38
      ktigcc/mainform.cpp
  4. 0 79
      ktigcc/srcfile.h
  5. 306 301
      ktigcc/srcfilewin.cpp
  6. 112 76
      ktigcc/srcfilewin.h

+ 2 - 2
ktigcc/ktigcc.h

@@ -30,7 +30,7 @@
 #include <Q3ValueVector>
 class QAssistantClient;
 class QClipboard;
-class SourceFile;
+class SourceFileWindow;
 typedef struct tprsettings tprSettings;
 typedef struct tprlibopts tprLibOpts;
 
@@ -51,7 +51,7 @@ extern const char *parg;
 extern QAssistantClient *assistant;
 extern QClipboard *clipboard;
 extern QStringList findHistory, replacementHistory;
-extern QList<SourceFile *> sourceFiles;
+extern QList<SourceFileWindow *> sourceFiles;
 extern tprSettings settings;
 extern tprLibOpts libopts;
 

+ 0 - 1
ktigcc/ktigcc.pro

@@ -13,7 +13,6 @@ LIBS	+= -lktexteditor -lkutils -lkdeui -lkdecore -lkio -lkparts -lkde3support
 HEADERS	+= tpr.h \
 	ktigcc.h \
 	preferences.h \
-	srcfile.h \
 	tiemu.h \
 	tiemu_stub.h \
 	callbacks.h \

+ 38 - 38
ktigcc/mainform.cpp

@@ -156,7 +156,7 @@ class DnDListView : public K3ListView {
 #include <tifiles.h>
 #include <ticalcs.h>
 #include "ktigcc.h"
-#include "srcfile.h"
+#include "srcfilewin.h"
 #include "tpr.h"
 #include "preferences.h"
 #include "projectoptions.h"
@@ -488,7 +488,7 @@ static KFindDialog *kfinddialog;
 QStringList findHistory, replacementHistory;
 static Q3ListViewItem *findCurrentDocument;
 static int findCurrentLine;
-QList<SourceFile *> sourceFiles;
+QList<SourceFileWindow *> sourceFiles;
 static Q3PopupMenu *findFunctionsPopup;
 bool have_usb;
 Tools tools, tempTools;
@@ -877,7 +877,7 @@ class ErrorListItem : public K3ListViewItem {
       kateView->setCursorPosition(*cursor);
   }
   ListViewFile *lvFile;
-  SourceFile *srcFile;
+  SourceFileWindow *srcFile;
   KTextEditor::SmartCursor *cursor;
   private:
   int errorLine;
@@ -893,7 +893,7 @@ class ErrorListItem : public K3ListViewItem {
       if (inProject)
         lvFile=reinterpret_cast<ListViewFile *>(sourceFile);
       else
-        srcFile=reinterpret_cast<SourceFile *>(sourceFile);
+        srcFile=reinterpret_cast<SourceFileWindow *>(sourceFile);
     }
     return found;
   }
@@ -929,7 +929,7 @@ void MainForm::deleteErrorsForSrcFile(void *srcFile)
   while ((errorItem=lvit.current())) {
     ++lvit;
     if (static_cast<ErrorListItem *>(errorItem)->srcFile
-        ==reinterpret_cast<SourceFile *>(srcFile))
+        ==reinterpret_cast<SourceFileWindow *>(srcFile))
       delete errorItem;
   }
 }
@@ -949,7 +949,7 @@ void MainForm::createErrorCursorsForSourceFile(Q3ListViewItem *item)
 // And the last.
 void MainForm::deleteOverwrittenErrorsIn(void *srcFile)
 {
-  SourceFile *sourceFile=reinterpret_cast<SourceFile *>(srcFile);
+  SourceFileWindow *sourceFile=reinterpret_cast<SourceFileWindow *>(srcFile);
   Q3ListViewItemIterator lvit(errorList->errorListView);
   ErrorListItem *errorItem;
   while ((errorItem=static_cast<ErrorListItem *>(lvit.current()))) {
@@ -987,7 +987,7 @@ bool MainForm::findSourceFile(bool &inProject, void *&srcFile, const QString &fi
       return TRUE;
     }
   }
-  foreach (SourceFile *sourceFile, sourceFiles) {
+  foreach (SourceFileWindow *sourceFile, sourceFiles) {
     if (compareAbsPaths?fileName==sourceFile->fileName
                        :fileName==QFileInfo(sourceFile->fileName).fileName()) {
       inProject=FALSE;
@@ -1929,7 +1929,7 @@ void *MainForm::createView(const QString &fileName, const QString &fileText, Q3L
 void MainForm::adoptSourceFile(void *srcFile)
 {
   if (compiling) return;
-  SourceFile *sourceFile=reinterpret_cast<SourceFile *>(srcFile);
+  SourceFileWindow *sourceFile=reinterpret_cast<SourceFileWindow *>(srcFile);
   QString fileName=sourceFile->fileName;
   KTextEditor::View *newView=sourceFile->kateView;
   // Determine category and caption.
@@ -2027,7 +2027,7 @@ void MainForm::adoptSourceFile(void *srcFile)
   Q3ListViewItem *errorItem;
   for (errorItem=lvit.current();errorItem;errorItem=(++lvit).current()) {
     if (static_cast<ErrorListItem *>(errorItem)->srcFile==sourceFile) {
-      static_cast<ErrorListItem *>(errorItem)->srcFile=static_cast<SourceFile *>(NULL);
+      static_cast<ErrorListItem *>(errorItem)->srcFile=static_cast<SourceFileWindow *>(NULL);
       static_cast<ErrorListItem *>(errorItem)->lvFile=newFile;
     }
   }
@@ -2162,7 +2162,7 @@ bool MainForm::openProject(const QString &fileName)
       KMessageBox::error(this,QString("The file \'%1\' is already included in the project.").arg(caption));
       return FALSE;
     }
-    foreach (SourceFile *sourceFile, sourceFiles) {
+    foreach (SourceFileWindow *sourceFile, sourceFiles) {
       if (!fileName.compare(sourceFile->fileName)) {
         ACTIVATE_WINDOW(sourceFile->winId());
         return FALSE;
@@ -2198,17 +2198,17 @@ bool MainForm::openProject(const QString &fileName)
                 1:
               0);
     
-    new SourceFile(this,fileName,
-                   (category==qllFilesListItem)?QLL_ENABLED_HL_MODE:
-                   (type==2)?S_ENABLED_HL_MODE:
-                   (type==3)?ASM_ENABLED_HL_MODE:
-                   (type==1)?C_ENABLED_HL_MODE:
-                   "None",
-                   (category==qllFilesListItem)?&(preferences.synQll.enabled):
-                   (type==2)?&(preferences.synS.enabled):
-                   (type==3)?&(preferences.synAsm.enabled):
-                   (type==1)?&(preferences.synC.enabled):
-                   NULL,category,(type==1),(type>1),category==txtFilesListItem);
+    new SourceFileWindow(this,fileName,
+                         (category==qllFilesListItem)?QLL_ENABLED_HL_MODE:
+                         (type==2)?S_ENABLED_HL_MODE:
+                         (type==3)?ASM_ENABLED_HL_MODE:
+                         (type==1)?C_ENABLED_HL_MODE:
+                         "None",
+                         (category==qllFilesListItem)?&(preferences.synQll.enabled):
+                         (type==2)?&(preferences.synS.enabled):
+                         (type==3)?&(preferences.synAsm.enabled):
+                         (type==1)?&(preferences.synC.enabled):
+                         NULL,category,(type==1),(type>1),category==txtFilesListItem);
     return FALSE;
   }
 }
@@ -2550,7 +2550,7 @@ void MainForm::fileSave_fromto(const QString &lastProj,const QString &nextProj)
     addRecent(nextProj);
   }
   updateRightStatusLabel();
-  foreach (SourceFile *sourceFile, sourceFiles) {
+  foreach (SourceFileWindow *sourceFile, sourceFiles) {
     if (sourceFile->kateView->document()->isModified())
       sourceFile->fileSave();
   }
@@ -2606,7 +2606,7 @@ void MainForm::filePreferences()
         }
       }
     }
-    foreach (SourceFile *sourceFile, sourceFiles) {
+    foreach (SourceFileWindow *sourceFile, sourceFiles) {
       KTextEditor::HighlightingInterface *hliface
         =qobject_cast<KTextEditor::HighlightingInterface*>(
           sourceFile->kateView->document());
@@ -2778,7 +2778,7 @@ void MainForm::filePreferences()
       }
     }
     // Apply the preferences to the source file windows.
-    foreach (SourceFile *sourceFile, sourceFiles) sourceFile->applyPreferences();
+    foreach (SourceFileWindow *sourceFile, sourceFiles) sourceFile->applyPreferences();
     // Apply the preferences to the debug menu.
     debugPauseAction->setEnabled(!compiling&&preferences.linkTarget==LT_TIEMU);
     debugResetAction->setEnabled(!compiling&&preferences.linkTarget==LT_TIEMU);
@@ -3467,7 +3467,7 @@ void MainForm::findAndOpenFile(const QString &fileName, void *category)
     if (inProject)
       fileTreeClicked(reinterpret_cast<ListViewFile *>(sourceFile));
     else
-      ACTIVATE_WINDOW(reinterpret_cast<SourceFile *>(sourceFile)->winId());
+      ACTIVATE_WINDOW(reinterpret_cast<SourceFileWindow *>(sourceFile)->winId());
   } else {
     // Not found. Try to open it instead.
     // Don't do this if the name ends with ".tpr" because that would cause
@@ -3477,7 +3477,7 @@ void MainForm::findAndOpenFile(const QString &fileName, void *category)
       if (getPathType(fileNameFull)==PATH_FILE) {
         openProject(fileNameFull);
         if (findSourceFile(inProject,sourceFile,fileNameFull) && !inProject)
-           ACTIVATE_WINDOW(reinterpret_cast<SourceFile *>(sourceFile)->winId());
+           ACTIVATE_WINDOW(reinterpret_cast<SourceFileWindow *>(sourceFile)->winId());
       } else {
         Q3ListViewItem *cat=reinterpret_cast<Q3ListViewItem *>(category);
         QString includeDir=(cat==asmFilesListItem)?"asm":
@@ -3487,7 +3487,7 @@ void MainForm::findAndOpenFile(const QString &fileName, void *category)
         if (getPathType(fileNameFull)==PATH_FILE) {
           openProject(fileNameFull);
           if (findSourceFile(inProject,sourceFile,fileNameFull) && !inProject)
-             ACTIVATE_WINDOW(reinterpret_cast<SourceFile *>(sourceFile)->winId());
+             ACTIVATE_WINDOW(reinterpret_cast<SourceFileWindow *>(sourceFile)->winId());
         } else {
           KMessageBox::error(this,QString("File \'%1\' not found.").arg(fileName),
                              "Search Failed");
@@ -3542,15 +3542,15 @@ void MainForm::openHeader(const QString &fileName, bool systemHeader,
           if (reinterpret_cast<ListViewFile *>(sourceFile)->kateView)
             reinterpret_cast<ListViewFile *>(sourceFile)->kateView->setCursorPosition(KTextEditor::Cursor(lineno,0));
         } else {
-          reinterpret_cast<SourceFile *>(sourceFile)->kateView->setCursorPosition(KTextEditor::Cursor(lineno,0));
-          ACTIVATE_WINDOW(reinterpret_cast<SourceFile *>(sourceFile)->winId());
+          reinterpret_cast<SourceFileWindow *>(sourceFile)->kateView->setCursorPosition(KTextEditor::Cursor(lineno,0));
+          ACTIVATE_WINDOW(reinterpret_cast<SourceFileWindow *>(sourceFile)->winId());
         }
       } else {
         if (getPathType(fileNameFull)==PATH_FILE) {
           openProject(fileNameFull);
           if (findSourceFile(inProject,sourceFile,fileNameFull) && !inProject) {
-            reinterpret_cast<SourceFile *>(sourceFile)->kateView->setCursorPosition(KTextEditor::Cursor(lineno,0));
-            ACTIVATE_WINDOW(reinterpret_cast<SourceFile *>(sourceFile)->winId());
+            reinterpret_cast<SourceFileWindow *>(sourceFile)->kateView->setCursorPosition(KTextEditor::Cursor(lineno,0));
+            ACTIVATE_WINDOW(reinterpret_cast<SourceFileWindow *>(sourceFile)->winId());
           }
         } else {
           KMessageBox::error(this,QString("File \'%1\' not found.").arg(fileName),
@@ -3758,7 +3758,7 @@ QString MainForm::writeTempSourceFile(void *srcFile, bool inProject)
       return fileName;
     }
   } else {
-    SourceFile *sourceFile=reinterpret_cast<SourceFile *>(srcFile);
+    SourceFileWindow *sourceFile=reinterpret_cast<SourceFileWindow *>(srcFile);
     origFileName=&(sourceFile->fileName);
     category=reinterpret_cast<Q3ListViewItem *>(sourceFile->category);
     fileName=QString("%1%2").arg(tempdir)
@@ -3783,7 +3783,7 @@ void MainForm::startCompiling()
       return;
     }
   } else {
-    foreach (SourceFile *sourceFile, sourceFiles) sourceFile->fileSave();
+    foreach (SourceFileWindow *sourceFile, sourceFiles) sourceFile->fileSave();
   }
   fileNewMenu->menuAction()->setEnabled(FALSE);
   fileNewAction->setEnabled(FALSE);
@@ -3809,7 +3809,7 @@ void MainForm::startCompiling()
   debugRunAction->setEnabled(FALSE);
   debugPauseAction->setEnabled(FALSE);
   debugResetAction->setEnabled(FALSE);
-  foreach (SourceFile *sourceFile, sourceFiles) {
+  foreach (SourceFileWindow *sourceFile, sourceFiles) {
     sourceFile->fileAddToProjectAction->setEnabled(FALSE);
     sourceFile->fileCompileAction->setEnabled(FALSE);
   }
@@ -3868,7 +3868,7 @@ void MainForm::stopCompiling()
   stopCompilingFlag=FALSE;
   errorsCompilingFlag=FALSE;
   compiling=FALSE;
-  foreach (SourceFile *sourceFile, sourceFiles) {
+  foreach (SourceFileWindow *sourceFile, sourceFiles) {
     sourceFile->fileAddToProjectAction->setEnabled(TRUE);
     sourceFile->fileCompileAction->setEnabled(TRUE);
     sourceFile->fileCloseAction->setEnabled(TRUE);
@@ -4152,7 +4152,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
       modified=TRUE;
     shortFileName=sourceFile->text(0);
   } else {
-    SourceFile *sourceFile=reinterpret_cast<SourceFile *>(srcFile);
+    SourceFileWindow *sourceFile=reinterpret_cast<SourceFileWindow *>(srcFile);
     category=reinterpret_cast<Q3ListViewItem *>(sourceFile->category);
     origFileName=&(sourceFile->fileName);
     if (sourceFile->kateView->document()->isModified())
@@ -4822,7 +4822,7 @@ void MainForm::projectBuild()
 void MainForm::compileSourceFile(void *srcFile)
 {
   if (compiling) return;
-  SourceFile *sourceFile=reinterpret_cast<SourceFile *>(srcFile);
+  SourceFileWindow *sourceFile=reinterpret_cast<SourceFileWindow *>(srcFile);
   sourceFile->fileCloseAction->setEnabled(FALSE);
   startCompiling();
   compileFile(sourceFile,FALSE,TRUE);
@@ -6317,7 +6317,7 @@ void MainForm::closeEvent(QCloseEvent *e)
   if (compiling || savePrompt())
     e->ignore();
   else {
-    foreach (SourceFile *sourceFile, sourceFiles) {
+    foreach (SourceFileWindow *sourceFile, sourceFiles) {
       if (sourceFile->savePrompt()) {
         e->ignore();
         return;

+ 0 - 79
ktigcc/srcfile.h

@@ -1,79 +0,0 @@
-/*
-   ktigcc - TIGCC IDE for KDE
-
-   Copyright (C) 2006-2007 Kevin Kofler
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
-*/
-
-#pragma once
-
-#include "tpr.h"
-#include "srcfilewin.h"
-#include "parsing.h"
-
-#include <QString>
-#include <Q3PopupMenu>
-#include <QLabel>
-class MainForm;
-namespace KTextEditor {
-  class View;
-}
-class KReplaceWithSelectionS;
-class QLabel;
-class Q3PopupMenu;
-class QClipboard;
-class QShortcut;
-class KFindDialog;
-class KDirWatch;
-class FunctionDialog;
-
-struct SourceFile : public SourceFileWindow {
-  SourceFile(MainForm *mainfrm, const QString &fn,
-             const QString &hlm, const bool *hle, void *cat,
-             bool isc, bool isasm, bool istxt) :
-    SourceFileWindow(), mainForm(mainfrm), fileName(fn),
-    hlMode(hlm), hlEnabled(hle), category(cat),
-    isCFile(isc), isASMFile(isasm), isTextFile(istxt)
-  {
-    initBase(); // We can do this only after initializing the variables here.
-    show();
-  }
-
-  MainForm *mainForm;
-  QString fileName;
-  QString hlMode;
-  const bool *hlEnabled;
-  void *category;
-  bool isCFile;
-  bool isASMFile;
-  bool isTextFile;
-  LineStartList lineStartList;
-
-  KReplaceWithSelectionS *kreplace;
-  KTextEditor::View *kateView;
-  QLabel *rowStatusLabel;
-  QLabel *colStatusLabel;
-  QLabel *charsStatusLabel;
-  QLabel *rightStatusLabel;
-  Q3PopupMenu *te_popup;
-  QShortcut *shortcuts[11];
-  KFindDialog *kfinddialog;
-  int findCurrentLine;
-  KDirWatch *dirWatch;
-  Q3PopupMenu *findFunctionsPopup;
-  SourceFileFunctions sourceFileFunctions;
-  FunctionDialog *functionDialog;
-};

File diff suppressed because it is too large
+ 306 - 301
ktigcc/srcfilewin.cpp


+ 112 - 76
ktigcc/srcfilewin.h

@@ -1,7 +1,7 @@
 /*
    ktigcc - TIGCC IDE for KDE
 
-   Copyright (C) 2007 Kevin Kofler
+   Copyright (C) 2006-2007 Kevin Kofler
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,99 +21,135 @@
 #pragma once
 
 #include "ui_srcfilewin.h"
+#include "tpr.h"
+#include "parsing.h"
 
+#include <QString>
+class MainForm;
 namespace KTextEditor {
   class Document;
   class View;
   class Cursor;
 }
+class KReplaceWithSelectionS;
+class QLabel;
+class Q3PopupMenu;
+class QClipboard;
+class QShortcut;
+class KFindDialog;
+class KDirWatch;
+class FunctionDialog;
 
 class SourceFileWindow : public QMainWindow, public Ui::SourceFileWindow
 {
-    Q_OBJECT
+  Q_OBJECT
 
 public:
-    SourceFileWindow(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = Qt::WType_TopLevel);
-    ~SourceFileWindow();
+  SourceFileWindow(MainForm *mainfrm, const QString &fn,
+                   const QString &hlm, const bool *hle, void *cat,
+                   bool isc, bool isasm, bool istxt);
+  ~SourceFileWindow();
 
-    virtual void initBase();
-    void * createView(const QString &fileName, const QString &hlModeName, unsigned tabWidth);
-    virtual int savePrompt(void);
-    virtual void applyPreferences();
+  void *createView(const QString &fileName, const QString &hlModeName, unsigned tabWidth);
+  virtual int savePrompt(void);
+  virtual void applyPreferences();
+
+  MainForm *mainForm;
+  QString fileName;
+  QString hlMode;
+  const bool *hlEnabled;
+  void *category;
+  bool isCFile;
+  bool isASMFile;
+  bool isTextFile;
+  LineStartList lineStartList;
+
+  KReplaceWithSelectionS *kreplace;
+  KTextEditor::View *kateView;
+  QLabel *rowStatusLabel;
+  QLabel *colStatusLabel;
+  QLabel *charsStatusLabel;
+  QLabel *rightStatusLabel;
+  Q3PopupMenu *te_popup;
+  QShortcut *shortcuts[11];
+  KFindDialog *kfinddialog;
+  int findCurrentLine;
+  KDirWatch *dirWatch;
+  Q3PopupMenu *findFunctionsPopup;
+  SourceFileFunctions sourceFileFunctions;
+  FunctionDialog *functionDialog;
 
 public slots:
-    virtual void destroy();
-    virtual void te_popup_aboutToShow();
-    virtual void te_popup_activated( int index );
-    virtual void shortcut_0_activated();
-    virtual void shortcut_1_activated();
-    virtual void shortcut_2_activated();
-    virtual void shortcut_3_activated();
-    virtual void shortcut_4_activated();
-    virtual void shortcut_5_activated();
-    virtual void shortcut_6_activated();
-    virtual void shortcut_7_activated();
-    virtual void shortcut_8_activated();
-    virtual void shortcut_9_activated();
-    virtual void shortcut_10_activated();
-    virtual void fileSave();
-    virtual void fileSaveAs();
-    virtual void fileAddToProject();
-    virtual void fileCompile();
-    virtual void filePrint();
-    virtual void filePrintQuickly();
-    virtual void editUndo();
-    virtual void editRedo();
-    virtual void editClear();
-    virtual void editCut();
-    virtual void editCopy();
-    virtual void editPaste();
-    virtual void editSelectAll();
-    virtual void editIncreaseIndent();
-    virtual void editDecreaseIndent();
-    virtual void findFind();
-    virtual void findFind_next();
-    virtual void findFind_highlight( const QString & text, int matchingindex, int matchedlength );
-    virtual void findFind_stop();
-    virtual void findReplace();
-    virtual void findReplace_next();
-    virtual void findReplace_highlight( const QString & text, int matchingindex, int matchedlength );
-    virtual void findReplace_replace( const QString & text, int replacementIndex, int replacedLength, int matchedLength );
-    virtual void findReplace_stop();
-    virtual void findFunctions();
-    virtual void findFunctions_functionListBox_highlighted( int index );
-    virtual void findFunctions_functionListBox_selected( int index );
-    virtual void findFunctions_prototypeButton_clicked();
-    virtual void findFunctions_implementationButton_clicked();
-    virtual void findFunctionsPopup_aboutToShow();
-    virtual void findFunctionsPopup_aboutToHide();
-    virtual void findFunctionsPopup_aboutToHide_async();
-    virtual void findFunctionsPopup_activated( int id );
-    virtual void findOpenFileAtCursor();
-    virtual void findFindSymbolDeclaration();
-    virtual void resizeEvent( QResizeEvent * event );
-    virtual void statusBar_messageChanged(const QString &message);
-    virtual void current_view_cursorPositionChanged(KTextEditor::View *view, const KTextEditor::Cursor &newPosition);
-    virtual void current_view_textChanged(KTextEditor::Document *document);
-    virtual void current_view_undoChanged();
-    virtual void current_view_selectionChanged(KTextEditor::View *view);
-    virtual void current_view_textInserted(KTextEditor::View *view, const KTextEditor::Cursor &position, const QString &text);
-    virtual void clipboard_dataChanged();
-    virtual void KDirWatch_dirty( const QString & fileName );
-    virtual void completionPopup_closed();
+  virtual void te_popup_aboutToShow();
+  virtual void te_popup_activated(int index);
+  virtual void shortcut_0_activated();
+  virtual void shortcut_1_activated();
+  virtual void shortcut_2_activated();
+  virtual void shortcut_3_activated();
+  virtual void shortcut_4_activated();
+  virtual void shortcut_5_activated();
+  virtual void shortcut_6_activated();
+  virtual void shortcut_7_activated();
+  virtual void shortcut_8_activated();
+  virtual void shortcut_9_activated();
+  virtual void shortcut_10_activated();
+  virtual void fileSave();
+  virtual void fileSaveAs();
+  virtual void fileAddToProject();
+  virtual void fileCompile();
+  virtual void filePrint();
+  virtual void filePrintQuickly();
+  virtual void editUndo();
+  virtual void editRedo();
+  virtual void editClear();
+  virtual void editCut();
+  virtual void editCopy();
+  virtual void editPaste();
+  virtual void editSelectAll();
+  virtual void editIncreaseIndent();
+  virtual void editDecreaseIndent();
+  virtual void findFind();
+  virtual void findFind_next();
+  virtual void findFind_highlight(const QString &text, int matchingindex, int matchedlength);
+  virtual void findFind_stop();
+  virtual void findReplace();
+  virtual void findReplace_next();
+  virtual void findReplace_highlight(const QString &text, int matchingindex, int matchedlength);
+  virtual void findReplace_replace(const QString &text, int replacementIndex, int replacedLength, int matchedLength);
+  virtual void findReplace_stop();
+  virtual void findFunctions();
+  virtual void findFunctions_functionListBox_highlighted(int index);
+  virtual void findFunctions_functionListBox_selected(int index);
+  virtual void findFunctions_prototypeButton_clicked();
+  virtual void findFunctions_implementationButton_clicked();
+  virtual void findFunctionsPopup_aboutToShow();
+  virtual void findFunctionsPopup_aboutToHide();
+  virtual void findFunctionsPopup_aboutToHide_async();
+  virtual void findFunctionsPopup_activated(int id);
+  virtual void findOpenFileAtCursor();
+  virtual void findFindSymbolDeclaration();
+  virtual void resizeEvent(QResizeEvent *event);
+  virtual void statusBar_messageChanged(const QString &message);
+  virtual void current_view_cursorPositionChanged(KTextEditor::View *view, const KTextEditor::Cursor &newPosition);
+  virtual void current_view_textChanged(KTextEditor::Document *document);
+  virtual void current_view_undoChanged();
+  virtual void current_view_selectionChanged(KTextEditor::View *view);
+  virtual void current_view_textInserted(KTextEditor::View *view, const KTextEditor::Cursor &position, const QString &text);
+  virtual void clipboard_dataChanged();
+  virtual void KDirWatch_dirty(const QString &fileName);
+  virtual void completionPopup_closed();
 
 protected:
-    virtual void closeEvent(QCloseEvent *e);
+  virtual void closeEvent(QCloseEvent *e);
 
 protected slots:
-    virtual void languageChange();
+  virtual void languageChange();
 
 private:
-    void removeTrailingSpacesFromView(void *view);
-    void findReplace_next(bool firstTime);
-    void updateSizes();
-    void updateRightStatusLabel();
-    void current_view_newLineHook();
-    void shortcutActivated(int index);
-
+  void removeTrailingSpacesFromView(void *view);
+  void findReplace_next(bool firstTime);
+  void updateSizes();
+  void updateRightStatusLabel();
+  void current_view_newLineHook();
+  void shortcutActivated(int index);
 };

Some files were not shown because too many files changed in this diff