Browse Source

Drop no longer needed #define hacks for __attribute__((unused)).

git-svn-id: file:///var/svn/tigccpp/trunk@1115 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 years ago
parent
commit
3079a8cca4
6 changed files with 16 additions and 21 deletions
  1. 3 5
      ktigcc/mainform.cpp
  2. 3 3
      ktigcc/mainform.h
  3. 3 5
      ktigcc/programoptions.cpp
  4. 3 3
      ktigcc/programoptions.h
  5. 2 3
      ktigcc/srcfilewin.cpp
  6. 2 2
      ktigcc/srcfilewin.h

+ 3 - 5
ktigcc/mainform.cpp

@@ -3012,8 +3012,7 @@ void MainForm::findFind_next()
   delete kfind;
 }
 
-#define unused_text text __attribute__((unused))
-void MainForm::findFind_highlight(const QString &unused_text, int matchingindex, int matchedlength)
+void MainForm::findFind_highlight(const QString &text __attribute__((unused)), int matchingindex, int matchedlength)
 {
   if (currentListItem!=findCurrentDocument) fileTreeClicked(findCurrentDocument);
   if (!CURRENT_VIEW) qFatal("CURRENT_VIEW should be set here!");
@@ -3296,7 +3295,7 @@ void MainForm::findReplace_next(bool firstTime)
   } while (result==KFind::NoMatch);
 }
 
-void MainForm::findReplace_highlight(const QString &unused_text, int matchingindex, int matchedlength)
+void MainForm::findReplace_highlight(const QString &text __attribute__((unused)), int matchingindex, int matchedlength)
 {
   if (currentListItem!=replaceCurrentDocument) fileTreeClicked(replaceCurrentDocument);
   if (!CURRENT_VIEW) qFatal("CURRENT_VIEW should be set here!");
@@ -5557,10 +5556,9 @@ bool MainForm::removeItem(Q3ListViewItem *item)
   } else return FALSE;
 }
 
-#define unused_col __attribute__((unused)) col /* stupid QT designer... */
 void MainForm::fileTreeContextMenuRequested(Q3ListViewItem *item,
                                             const QPoint &pos,
-                                            int unused_col)
+                                            int col __attribute__((unused)))
 {
   fileTreeClicked(item);
   if (IS_FOLDER(item)) {

+ 3 - 3
ktigcc/mainform.h

@@ -104,11 +104,11 @@ public slots:
     virtual void editDecreaseIndent();
     virtual void findFind();
     virtual void findFind_next();
-    virtual void findFind_highlight( const QString & unused_text, int matchingindex, int matchedlength );
+    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 & unused_text, int matchingindex, int matchedlength );
+    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();
@@ -151,7 +151,7 @@ public slots:
     virtual void timerEvent( QTimerEvent * event );
     virtual void fileTreeClicked( Q3ListViewItem * item );
     virtual void fileNewFolder();
-    virtual void fileTreeContextMenuRequested( Q3ListViewItem * item, const QPoint & pos, int unused_col );
+    virtual void fileTreeContextMenuRequested( Q3ListViewItem * item, const QPoint & pos, int col );
     virtual void fileNewCHeader();
     virtual void fileNewGNUAssemblyHeader();
     virtual void fileNewA68kAssemblyHeader();

+ 3 - 5
ktigcc/programoptions.cpp

@@ -161,9 +161,7 @@ void ProgramOptions::CMinimumAMSVersion_toggled(bool on)
   MinimumAMSVersion->setEnabled(on);
 }
 
-#define on_unused on __attribute__((unused))
-
-void ProgramOptions::CalcCheckbox_toggled(bool on_unused)
+void ProgramOptions::CalcCheckbox_toggled(bool on __attribute__((unused)))
 {
   static bool inEvent=FALSE;
   if (!inEvent) {
@@ -181,7 +179,7 @@ void ProgramOptions::CalcCheckbox_toggled(bool on_unused)
 }
 
 
-void ProgramOptions::KernelRadiobutton_toggled(bool on_unused)
+void ProgramOptions::KernelRadiobutton_toggled(bool on __attribute__((unused)))
 {
   static bool inEvent=FALSE;
   if (!inEvent) {
@@ -258,7 +256,7 @@ void ProgramOptions::KernelRadiobutton_toggled(bool on_unused)
 }
 
 
-void ProgramOptions::RelocSettings_toggled(bool on_unused)
+void ProgramOptions::RelocSettings_toggled(bool on __attribute__((unused)))
 {
   static bool inEvent=FALSE;
   if (!inEvent) {

+ 3 - 3
ktigcc/programoptions.h

@@ -35,9 +35,9 @@ public:
 
 public slots:
     virtual void CMinimumAMSVersion_toggled( bool on );
-    virtual void CalcCheckbox_toggled( bool on_unused );
-    virtual void KernelRadiobutton_toggled( bool on_unused );
-    virtual void RelocSettings_toggled( bool on_unused );
+    virtual void CalcCheckbox_toggled( bool on );
+    virtual void KernelRadiobutton_toggled( bool on );
+    virtual void RelocSettings_toggled( bool on );
 
 protected:
     virtual void mousePressEvent( QMouseEvent * e );

+ 2 - 3
ktigcc/srcfilewin.cpp

@@ -844,8 +844,7 @@ void SourceFileWindow::findFind_next()
   delete kfind;
 }
 
-#define unused_text text __attribute__((unused))
-void SourceFileWindow::findFind_highlight(const QString &unused_text, int matchingindex, int matchedlength)
+void SourceFileWindow::findFind_highlight(const QString &text __attribute__((unused)), int matchingindex, int matchedlength)
 {
   CURRENT_VIEW->setCursorPosition(KTextEditor::Cursor(THIS->findCurrentLine,matchingindex+matchedlength));
   CURRENT_VIEW->setSelection(KTextEditor::Range(THIS->findCurrentLine,matchingindex,
@@ -1004,7 +1003,7 @@ void SourceFileWindow::findReplace_next(bool firstTime)
   } while (result==KFind::NoMatch);
 }
 
-void SourceFileWindow::findReplace_highlight(const QString &unused_text, int matchingindex, int matchedlength)
+void SourceFileWindow::findReplace_highlight(const QString &text __attribute__((unused)), int matchingindex, int matchedlength)
 {
   CURRENT_VIEW->setCursorPosition(KTextEditor::Cursor(THIS->kreplace->replaceCurrentLine,matchingindex+matchedlength));
   CURRENT_VIEW->setSelection(KTextEditor::Range(THIS->kreplace->replaceCurrentLine,matchingindex,

+ 2 - 2
ktigcc/srcfilewin.h

@@ -73,11 +73,11 @@ public slots:
     virtual void editDecreaseIndent();
     virtual void findFind();
     virtual void findFind_next();
-    virtual void findFind_highlight( const QString & unused_text, int matchingindex, int matchedlength );
+    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 & unused_text, int matchingindex, int matchedlength );
+    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();