Browse Source

Adapt to KatePart signal API changes:
* View::cursorPositionChanged now takes a KTextEditor::View* and a KTextEditor::Cursor&.
* Document::selectionChanged() -> View::selectionChanged(KTextEditor::View*)
* Document::textChanged now takes a KTextEditor::Document*.


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

kevinkofler 17 years ago
parent
commit
c8c053b91d
4 changed files with 43 additions and 41 deletions
  1. 18 18
      ktigcc/mainform.cpp
  2. 5 4
      ktigcc/mainform.h
  3. 15 15
      ktigcc/srcfilewin.cpp
  4. 5 4
      ktigcc/srcfilewin.h

+ 18 - 18
ktigcc/mainform.cpp

@@ -1812,12 +1812,12 @@ void *MainForm::createView(const QString &fileName, const QString &fileText, Q3L
     (category==cFilesListItem||category==qllFilesListItem||category==hFilesListItem)?preferences.tabWidthC:
     8
   );
-  connect(newView,SIGNAL(cursorPositionChanged()),this,SLOT(current_view_cursorPositionChanged()));
+  connect(newView,SIGNAL(cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)),this,SLOT(current_view_cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)));
   connect(newView,SIGNAL(textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)),
           this,SLOT(current_view_textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)));
-  connect(newView->document(),SIGNAL(textChanged()),this,SLOT(current_view_textChanged()));
+  connect(newView,SIGNAL(selectionChanged(KTextEditor::View*)),this,SLOT(current_view_selectionChanged(KTextEditor::View*)));
+  connect(newView->document(),SIGNAL(textChanged(KTextEditor::Document*)),this,SLOT(current_view_textChanged(KTextEditor::Document*)));
   connect(newView->document(),SIGNAL(undoChanged()),this,SLOT(current_view_undoChanged()));
-  connect(newView->document(),SIGNAL(selectionChanged()),this,SLOT(current_view_selectionChanged()));
   newView->setContextMenu(te_popup);
   newView->setCursorPosition(KTextEditor::Cursor(0,0));
   return newView;
@@ -1906,12 +1906,12 @@ void MainForm::adoptSourceFile(void *srcFile)
     (category==cFilesListItem||category==qllFilesListItem||category==hFilesListItem)?preferences.tabWidthC:
     8
   );
-  connect(newView,SIGNAL(cursorPositionChanged()),this,SLOT(current_view_cursorPositionChanged()));
+  connect(newView,SIGNAL(cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)),this,SLOT(current_view_cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)));
   connect(newView,SIGNAL(textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)),
           this,SLOT(current_view_textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)));
-  connect(newView->document(),SIGNAL(textChanged()),this,SLOT(current_view_textChanged()));
+  connect(newView,SIGNAL(selectionChanged(KTextEditor::View*)),this,SLOT(current_view_selectionChanged(KTextEditor::View*)));
+  connect(newView->document(),SIGNAL(textChanged(KTextEditor::Document*)),this,SLOT(current_view_textChanged(KTextEditor::Document*)));
   connect(newView->document(),SIGNAL(undoChanged()),this,SLOT(current_view_undoChanged()));
-  connect(newView->document(),SIGNAL(selectionChanged()),this,SLOT(current_view_selectionChanged()));
   newView->setContextMenu(te_popup);
   // Mark project dirty.
   projectIsDirty=TRUE;
@@ -5954,20 +5954,20 @@ void MainForm::updateRightStatusLabel()
   }
 }
 
-void MainForm::current_view_cursorPositionChanged()
+void MainForm::current_view_cursorPositionChanged(KTextEditor::View *view, const KTextEditor::Cursor &newPosition)
 {
-  if (CURRENT_VIEW && !disableViewEvents) {
+  if (CURRENT_VIEW==view && !disableViewEvents) {
     int line, col;
-    CURRENT_VIEW->cursorPosition().position(line,col);
+    newPosition.position(line,col);
     rowStatusLabel->setText(QString("%1").arg(line+1));
     colStatusLabel->setText(QString("%1").arg(col+1));
   }
 }
 
-void MainForm::current_view_textChanged()
+void MainForm::current_view_textChanged(KTextEditor::Document *document)
 {
   if (disableViewEvents) return;
-  if (CURRENT_VIEW) {
+  if (CURRENT_VIEW && CURRENT_VIEW->document()==document) {
     charsStatusLabel->setText(QString("%1 Characters").arg(CURRENT_VIEW->document()->text().length()));
     if (IS_FILE(currentListItem)) {
       static_cast<ListViewFile *>(currentListItem)->modifiedSinceLastCompile=TRUE;
@@ -6006,14 +6006,14 @@ void MainForm::current_view_undoChanged()
   }
 }
 
-void MainForm::current_view_selectionChanged()
+void MainForm::current_view_selectionChanged(KTextEditor::View *view)
 {
-  if (CURRENT_VIEW && !disableViewEvents) {
-    editClearAction->setEnabled(CURRENT_VIEW->selection());
-    editCutAction->setEnabled(CURRENT_VIEW->selection());
-    editCopyAction->setEnabled(CURRENT_VIEW->selection());
-    accel->setItemEnabled(2,CURRENT_VIEW->selection());
-    accel->setItemEnabled(3,CURRENT_VIEW->selection());
+  if (CURRENT_VIEW==view && !disableViewEvents) {
+    editClearAction->setEnabled(view->selection());
+    editCutAction->setEnabled(view->selection());
+    editCopyAction->setEnabled(view->selection());
+    accel->setItemEnabled(2,view->selection());
+    accel->setItemEnabled(3,view->selection());
   }
 }
 

+ 5 - 4
ktigcc/mainform.h

@@ -25,6 +25,7 @@
 #include "tiemu.h"
 
 namespace KTextEditor {
+  class Document;
   class View;
   class Cursor;
 }
@@ -143,11 +144,11 @@ public slots:
     virtual void fileNewA68kAssemblySourceFile();
     virtual void fileNewQuillSourceFile();
     virtual void fileNewTextFile();
-    virtual void statusBar_messageChanged( const QString & message );
-    virtual void current_view_cursorPositionChanged();
-    virtual void current_view_textChanged();
+    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();
+    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 fileTreeItemRenamed( Q3ListViewItem * item, const QString & newName, int col );

+ 15 - 15
ktigcc/srcfilewin.cpp

@@ -458,12 +458,12 @@ void *SourceFileWindow::createView(const QString &fileName, const QString &hlMod
     sendCommand(newView,"set-remove-trailing-space-save 0");
   }
   setTabWidth(newView,tabWidth);
-  connect(newView,SIGNAL(cursorPositionChanged()),this,SLOT(current_view_cursorPositionChanged()));
+  connect(newView,SIGNAL(cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)),this,SLOT(current_view_cursorPositionChanged(KTextEditor::View*,const KTextEditor::Cursor&)));
   connect(newView,SIGNAL(textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)),
           this,SLOT(current_view_textInserted(KTextEditor::View*,const KTextEditor::Cursor&,const QString&)));
-  connect(newView->document(),SIGNAL(textChanged()),this,SLOT(current_view_textChanged()));
+  connect(newView,SIGNAL(selectionChanged(KTextEditor::View*)),this,SLOT(current_view_selectionChanged(KTextEditor::View*)));
+  connect(newView->document(),SIGNAL(textChanged(KTextEditor::Document*)),this,SLOT(current_view_textChanged(KTextEditor::Document*)));
   connect(newView->document(),SIGNAL(undoChanged()),this,SLOT(current_view_undoChanged()));
-  connect(newView->document(),SIGNAL(selectionChanged()),this,SLOT(current_view_selectionChanged()));
   newView->setContextMenu(THIS->te_popup);
   newView->setCursorPosition(KTextEditor::Cursor(0,0));
   return newView;
@@ -1193,20 +1193,20 @@ void SourceFileWindow::updateRightStatusLabel()
   THIS->rightStatusLabel->setText(THIS->fileName);
 }
 
-void SourceFileWindow::current_view_cursorPositionChanged()
+void SourceFileWindow::current_view_cursorPositionChanged(KTextEditor::View *view, const KTextEditor::Cursor &newPosition)
 {
-  if (CURRENT_VIEW && !disableViewEvents) {
+  if (CURRENT_VIEW==view && !disableViewEvents) {
     int line, col;
-    CURRENT_VIEW->cursorPosition().position(line,col);
+    newPosition.position(line,col);
     THIS->rowStatusLabel->setText(QString("%1").arg(line+1));
     THIS->colStatusLabel->setText(QString("%1").arg(col+1));
   }
 }
 
-void SourceFileWindow::current_view_textChanged()
+void SourceFileWindow::current_view_textChanged(KTextEditor::Document *document)
 {
   if (disableViewEvents) return;
-  if (CURRENT_VIEW) {
+  if (CURRENT_VIEW && CURRENT_VIEW->document()==document) {
     THIS->charsStatusLabel->setText(QString("%1 Characters").arg(CURRENT_VIEW->document()->text().length()));
     if (projectCompletion.contains(THIS->fileName))
       projectCompletion[THIS->fileName].dirty=TRUE;
@@ -1225,14 +1225,14 @@ void SourceFileWindow::current_view_undoChanged()
   }
 }
 
-void SourceFileWindow::current_view_selectionChanged()
+void SourceFileWindow::current_view_selectionChanged(KTextEditor::View *view)
 {
-  if (CURRENT_VIEW && !disableViewEvents) {
-    editClearAction->setEnabled(CURRENT_VIEW->selection());
-    editCutAction->setEnabled(CURRENT_VIEW->selection());
-    editCopyAction->setEnabled(CURRENT_VIEW->selection());
-    THIS->accel->setItemEnabled(2,CURRENT_VIEW->selection());
-    THIS->accel->setItemEnabled(3,CURRENT_VIEW->selection());
+  if (CURRENT_VIEW==view && !disableViewEvents) {
+    editClearAction->setEnabled(view->selection());
+    editCutAction->setEnabled(view->selection());
+    editCopyAction->setEnabled(view->selection());
+    THIS->accel->setItemEnabled(2,view->selection());
+    THIS->accel->setItemEnabled(3,view->selection());
   }
 }
 

+ 5 - 4
ktigcc/srcfilewin.h

@@ -23,6 +23,7 @@
 #include "ui_srcfilewin.h"
 
 namespace KTextEditor {
+  class Document;
   class View;
   class Cursor;
 }
@@ -81,11 +82,11 @@ public slots:
     virtual void findOpenFileAtCursor();
     virtual void findFindSymbolDeclaration();
     virtual void resizeEvent( QResizeEvent * event );
-    virtual void statusBar_messageChanged( const QString & message );
-    virtual void current_view_cursorPositionChanged();
-    virtual void current_view_textChanged();
+    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();
+    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 );