author | zecke <zecke> | 2004-03-13 20:51:18 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 20:51:18 (UTC) |
commit | a3304e23c7f8576a4584475ef0cf49d0e588671e (patch) (unidiff) | |
tree | 854fa06307ad13c403a5be06caa2c9da305dd9b6 | |
parent | 8ff0f6a5875346302d62b52621f9e6189d683dd9 (diff) | |
download | opie-a3304e23c7f8576a4584475ef0cf49d0e588671e.zip opie-a3304e23c7f8576a4584475ef0cf49d0e588671e.tar.gz opie-a3304e23c7f8576a4584475ef0cf49d0e588671e.tar.bz2 |
convert to Opie2 namespace
most of them are only using namespace Opie::Core in the main
remove <qpe/qpetoolbar.h>
-rw-r--r-- | noncore/games/bounce/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/buzzword/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/fifteen/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/go/gowidget.cpp | 2 | ||||
-rw-r--r-- | noncore/games/go/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/kcheckers/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/minesweep/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/parashoot/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/qasteroids/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/snake/interface.cpp | 2 | ||||
-rw-r--r-- | noncore/games/snake/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/tetrix/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/tictac/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/wordgame/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/wordgame/wordgame.cpp | 2 | ||||
-rw-r--r-- | noncore/games/zlines/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/zsame/ZSameWidget.cpp | 1 |
18 files changed, 18 insertions, 3 deletions
diff --git a/noncore/games/bounce/main.cpp b/noncore/games/bounce/main.cpp index eb8d561..bec4a86 100644 --- a/noncore/games/bounce/main.cpp +++ b/noncore/games/bounce/main.cpp | |||
@@ -19,6 +19,7 @@ | |||
19 | #include "kbounce.h" | 19 | #include "kbounce.h" |
20 | 20 | ||
21 | #include <opie2/oapplicationfactory.h> | 21 | #include <opie2/oapplicationfactory.h> |
22 | 22 | ||
23 | using namespace Opie::Core; | ||
23 | OPIE_EXPORT_APP( OApplicationFactory<KJezzball> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<KJezzball> ) |
24 | 25 | ||
diff --git a/noncore/games/buzzword/main.cpp b/noncore/games/buzzword/main.cpp index 596cf16..a95e91a 100644 --- a/noncore/games/buzzword/main.cpp +++ b/noncore/games/buzzword/main.cpp | |||
@@ -19,5 +19,6 @@ | |||
19 | #include <opie2/oapplicationfactory.h> | 19 | #include <opie2/oapplicationfactory.h> |
20 | 20 | ||
21 | #include "buzzword.h" | 21 | #include "buzzword.h" |
22 | 22 | ||
23 | using namespace Opie::Core; | ||
23 | OPIE_EXPORT_APP( OApplicationFactory<BuzzWord> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<BuzzWord> ) |
diff --git a/noncore/games/fifteen/main.cpp b/noncore/games/fifteen/main.cpp index ed74a47..800a270 100644 --- a/noncore/games/fifteen/main.cpp +++ b/noncore/games/fifteen/main.cpp | |||
@@ -18,6 +18,7 @@ | |||
18 | #include "fifteen.h" | 18 | #include "fifteen.h" |
19 | 19 | ||
20 | #include <opie2/oapplicationfactory.h> | 20 | #include <opie2/oapplicationfactory.h> |
21 | 21 | ||
22 | using namespace Opie::Core; | ||
22 | OPIE_EXPORT_APP( OApplicationFactory<FifteenMainWindow> ) | 23 | OPIE_EXPORT_APP( OApplicationFactory<FifteenMainWindow> ) |
23 | 24 | ||
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp index 79820b1..d134540 100644 --- a/noncore/games/go/gowidget.cpp +++ b/noncore/games/go/gowidget.cpp | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
24 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
25 | 25 | ||
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qpe/qpetoolbar.h> | 27 | #include <qtoolbar.h> |
28 | #include <qmenubar.h> | 28 | #include <qmenubar.h> |
29 | #include <qaction.h> | 29 | #include <qaction.h> |
30 | #include <qapplication.h> //processEvents() | 30 | #include <qapplication.h> //processEvents() |
31 | #include <qlabel.h> | 31 | #include <qlabel.h> |
diff --git a/noncore/games/go/main.cpp b/noncore/games/go/main.cpp index 46817d1..f6bb813 100644 --- a/noncore/games/go/main.cpp +++ b/noncore/games/go/main.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<GoMainWidget> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<GoMainWidget> ) |
27 | 28 | ||
diff --git a/noncore/games/kcheckers/main.cpp b/noncore/games/kcheckers/main.cpp index 79b5ac7..8c708e2 100644 --- a/noncore/games/kcheckers/main.cpp +++ b/noncore/games/kcheckers/main.cpp | |||
@@ -3,7 +3,8 @@ | |||
3 | #include "kcheckers.h" | 3 | #include "kcheckers.h" |
4 | 4 | ||
5 | #include <opie2/oapplicationfactory.h> | 5 | #include <opie2/oapplicationfactory.h> |
6 | 6 | ||
7 | using namespace Opie::Core; | ||
7 | OPIE_EXPORT_APP( OApplicationFactory<KCheckers> ) | 8 | OPIE_EXPORT_APP( OApplicationFactory<KCheckers> ) |
8 | 9 | ||
9 | 10 | ||
diff --git a/noncore/games/minesweep/main.cpp b/noncore/games/minesweep/main.cpp index f3070f5..629afbf 100644 --- a/noncore/games/minesweep/main.cpp +++ b/noncore/games/minesweep/main.cpp | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "minesweep.h" | 21 | #include "minesweep.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<MineSweep> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<MineSweep> ) |
26 | 27 | ||
diff --git a/noncore/games/parashoot/main.cpp b/noncore/games/parashoot/main.cpp index 81d513d..da21c25 100644 --- a/noncore/games/parashoot/main.cpp +++ b/noncore/games/parashoot/main.cpp | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "interface.h" | 21 | #include "interface.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<ParaShoot> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<ParaShoot> ) |
26 | 27 | ||
diff --git a/noncore/games/qasteroids/main.cpp b/noncore/games/qasteroids/main.cpp index 33e4729..6ddb238 100644 --- a/noncore/games/qasteroids/main.cpp +++ b/noncore/games/qasteroids/main.cpp | |||
@@ -22,5 +22,6 @@ | |||
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<KAstTopLevel> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<KAstTopLevel> ) |
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp index b5fb5bf..9d9550a 100644 --- a/noncore/games/snake/interface.cpp +++ b/noncore/games/snake/interface.cpp | |||
@@ -21,9 +21,9 @@ | |||
21 | #include "interface.h" | 21 | #include "interface.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | 24 | ||
25 | #include <qpe/qpetoolbar.h> | 25 | #include <qtoolbar.h> |
26 | #include <qtoolbutton.h> | 26 | #include <qtoolbutton.h> |
27 | 27 | ||
28 | SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) : | 28 | SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) : |
29 | QMainWindow(parent,name,f), | 29 | QMainWindow(parent,name,f), |
diff --git a/noncore/games/snake/main.cpp b/noncore/games/snake/main.cpp index 44f742f..81eb9ee 100644 --- a/noncore/games/snake/main.cpp +++ b/noncore/games/snake/main.cpp | |||
@@ -22,7 +22,8 @@ | |||
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<SnakeGame> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<SnakeGame> ) |
27 | 28 | ||
28 | 29 | ||
diff --git a/noncore/games/solitaire/main.cpp b/noncore/games/solitaire/main.cpp index d4f6673..c8d4040 100644 --- a/noncore/games/solitaire/main.cpp +++ b/noncore/games/solitaire/main.cpp | |||
@@ -21,5 +21,6 @@ | |||
21 | #include "canvascardwindow.h" | 21 | #include "canvascardwindow.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> ) \ No newline at end of file | 26 | OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> ) \ No newline at end of file |
diff --git a/noncore/games/tetrix/main.cpp b/noncore/games/tetrix/main.cpp index 147d13d..6194bbf 100644 --- a/noncore/games/tetrix/main.cpp +++ b/noncore/games/tetrix/main.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<QTetrix> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<QTetrix> ) |
27 | 28 | ||
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp index b8193f7..f3df375 100644 --- a/noncore/games/tictac/main.cpp +++ b/noncore/games/tictac/main.cpp | |||
@@ -9,5 +9,6 @@ | |||
9 | #include "tictac.h" | 9 | #include "tictac.h" |
10 | 10 | ||
11 | #include <opie2/oapplicationfactory.h> | 11 | #include <opie2/oapplicationfactory.h> |
12 | 12 | ||
13 | using namespace Opie::Core; | ||
13 | OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> ) | 14 | OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> ) |
diff --git a/noncore/games/wordgame/main.cpp b/noncore/games/wordgame/main.cpp index 7fd5f50..c388775 100644 --- a/noncore/games/wordgame/main.cpp +++ b/noncore/games/wordgame/main.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<WordGame> ) | 27 | OPIE_EXPORT_APP( OApplicationFactory<WordGame> ) |
27 | 28 | ||
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index 43a54f8..a80bd35 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <qlineedit.h> | 32 | #include <qlineedit.h> |
33 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
34 | #include <qtextstream.h> | 34 | #include <qtextstream.h> |
35 | #include <qtimer.h> | 35 | #include <qtimer.h> |
36 | #include <qpe/qpetoolbar.h> | 36 | #include <qtoolbar.h> |
37 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
38 | #include <qvbox.h> | 38 | #include <qvbox.h> |
39 | #include <qwidgetstack.h> | 39 | #include <qwidgetstack.h> |
40 | #include <qlayout.h> | 40 | #include <qlayout.h> |
diff --git a/noncore/games/zlines/main.cpp b/noncore/games/zlines/main.cpp index d1709e4..8d80bae 100644 --- a/noncore/games/zlines/main.cpp +++ b/noncore/games/zlines/main.cpp | |||
@@ -24,5 +24,6 @@ | |||
24 | #include "klines.h" | 24 | #include "klines.h" |
25 | 25 | ||
26 | #include <opie2/oapplicationfactory.h> | 26 | #include <opie2/oapplicationfactory.h> |
27 | 27 | ||
28 | using namespace Opie::Core; | ||
28 | OPIE_EXPORT_APP( OApplicationFactory<KLines> ) | 29 | OPIE_EXPORT_APP( OApplicationFactory<KLines> ) |
diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp index 3c58c93..4fab0f6 100644 --- a/noncore/games/zsame/ZSameWidget.cpp +++ b/noncore/games/zsame/ZSameWidget.cpp | |||
@@ -39,8 +39,9 @@ static int default_colors=3; | |||
39 | 39 | ||
40 | #define i18n tr | 40 | #define i18n tr |
41 | 41 | ||
42 | 42 | ||
43 | using namespace Opie::Core; | ||
43 | OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> ) | 44 | OPIE_EXPORT_APP( OApplicationFactory<ZSameWidget> ) |
44 | 45 | ||
45 | 46 | ||
46 | 47 | ||