summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-25 22:25:45 (UTC)
committer mickeyl <mickeyl>2006-05-25 22:25:45 (UTC)
commitedc6b08e3914537d6885e3474036ad4924f185f3 (patch) (side-by-side diff)
tree755be9de7fd3ad8a274ec8ac4515c3e92999a4e9
parent1004aa580c4f115b9959027deb7f19997adc9df8 (diff)
downloadopie-edc6b08e3914537d6885e3474036ad4924f185f3.zip
opie-edc6b08e3914537d6885e3474036ad4924f185f3.tar.gz
opie-edc6b08e3914537d6885e3474036ad4924f185f3.tar.bz2
g++ 4.1.1 fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/notes/editwindow.h2
-rw-r--r--inputmethods/multikey/configdlg.h2
-rw-r--r--noncore/games/minesweep/minefield.h4
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
@@ -2,21 +2,21 @@
#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
@@ -4,25 +4,25 @@
#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();
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
@@ -73,26 +73,26 @@ protected:
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;