g++ 4.1.1 fix

3 files changed, 4 insertions, 4 deletions

diff --git a/core/pim/notes/editwindow.h b/core/pim/notes/editwindow.h
index 57c5241..30c44d6 100644
--- a/core/pim/notes/editwindow.h
+++ b/core/pim/notes/editwindow.h
@@ -1,22 +1,22 @@
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 
 class editWindowWidget : public QDialog
 {
     Q_OBJECT
 
     public:
-        editWindowWidget::editWindowWidget(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+        editWindowWidget(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
         ~editWindowWidget();
         void loadFile(QString fileName);
         void saveFile(QString fileName);
 
     private:
         QMultiLineEdit *editArea;
 
 };
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h
index 91ae429..8e96e9b 100644
--- a/inputmethods/multikey/configdlg.h
+++ b/inputmethods/multikey/configdlg.h
@@ -1,65 +1,65 @@
 #include <qpe/qpeapplication.h>
 #include <qdialog.h>
 #include <qcheckbox.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
 #ifndef CONFIGDLG_H
 #define CONFIGDLG_H
 
 class ConfigDlg : public QDialog
 {
     Q_OBJECT
 
 public:
     ConfigDlg ();
-    static QStringList ConfigDlg::loadSw();
+    static QStringList loadSw();
 
 signals:
     void pickboardToggled(bool on_off);
     void repeatToggled(bool on_off);
     void setMapToDefault();
     void setMapToFile(QString map);
     void reloadKeyboard();
     void configDlgClosed();
     void reloadSw();
 
 protected:
     virtual void accept();
 
 protected slots:
     void moveSelectedUp();
     void moveSelectedDown();
 
 private slots:
     void setMap(int index);
     void addMap();
     void removeMap();
     virtual void closeEvent ( QCloseEvent * );
 
     // all those required slots for the color push buttons
     void keyColorClicked();
     void keyColorPressedClicked();
     void keyColorLinesClicked();
     void textColorClicked();
 
 private:
     QCheckBox *pick_button;
     QCheckBox *repeat_button;
     QListBox *keymaps;
     QPushButton *add_button;
     QPushButton *remove_button;
 
     QStringList default_maps; // the maps in your share/multikey/ dir
     QStringList custom_maps; // maps you added with the 'add' button
     QStringList sw_maps; // maps, which used in keyboard switch rotation ring
 
     /* color buttons */
     QPushButton *keycolor_button;
     QPushButton *keycolor_pressed_button;
     QPushButton *keycolor_lines_button;
     QPushButton *textcolor_button;
 
 };
 
 #endif
diff --git a/noncore/games/minesweep/minefield.h b/noncore/games/minesweep/minefield.h
index e243d77..8d0f754 100644
--- a/noncore/games/minesweep/minefield.h
+++ b/noncore/games/minesweep/minefield.h
@@ -1,104 +1,104 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef MINEFIELD_H
 #define MINEFIELD_H
 
 #include <qscrollview.h>
 
 class Mine;
 class Config;
 
 class MineField : public QScrollView
 {
     Q_OBJECT
 public:
     MineField( QWidget* parent = 0, const char* name = 0 );
     ~MineField();
 
     enum State { Waiting, Playing, GameOver };
 
     State state() const { return stat; }
 
     void readConfig(Config&);
     void writeConfig(Config&) const;
 
     int level() const { return lev; }
 
     void setAvailableRect( const QRect & );
 
     QSize sizeHint() const;
 
 public slots:
     void setup( int level );
 
     void showMines();
 
 signals:
     void gameOver( bool won );
     void gameStarted();
     void mineCount( int );
     
 protected:
 
     void contentsMousePressEvent( QMouseEvent* );
     void contentsMouseReleaseEvent( QMouseEvent* );
     void keyPressEvent( QKeyEvent* );
     void keyReleaseEvent( QKeyEvent* );
     void drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph );
     
     int getHint( int row, int col );
     void setHint( int r, int c );
     void updateMine( int row, int col );
     void paletteChange( const QPalette & );
     void updateCell( int r, int c );
     bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; }
     Mine *mine( int row, int col ) { return onBoard(row, col ) ? mines[row+numCols*col] : 0; }
     const Mine *mine( int row, int col ) const { return onBoard(row, col ) ? mines[row+numCols*col] : 0; }
     
 protected slots:
     void cellPressed( int row, int col );
     void cellClicked( int row, int col );
     void held();
 
 private:
     int findCellSize();
     void setCellSize( int );
     
     State stat;
-    void MineField::setState( State st );
-    void MineField::placeMines();
+    void setState( State st );
+    void placeMines();
     enum FlagAction { NoAction, FlagOn, FlagNext };
     FlagAction flagAction;
     bool ignoreClick;
     int currRow;
     int currCol;
     int numRows, numCols;
     
     int minecount;
     int mineguess;
     int nonminecount;
     int lev;
     QRect availableRect;
     int cellSize;
     QTimer *holdTimer;
     Mine **mines;
 };
 
 #endif // MINEFIELD_H