author | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
commit | 0c74629e8f5c12a9b5a282b817f884fa10dee491 (patch) (unidiff) | |
tree | 3294663b92023f8d24d68a01022e011a3c94002d /noncore/games/buzzword | |
parent | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (diff) | |
download | opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.zip opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.gz opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.bz2 |
Merge from the 1.0.x release
-rw-r--r-- | noncore/games/buzzword/buzzword.cpp | 2 | ||||
-rw-r--r-- | noncore/games/buzzword/buzzword.h | 3 | ||||
-rw-r--r-- | noncore/games/buzzword/buzzword.pro | 5 | ||||
-rw-r--r-- | noncore/games/buzzword/main.cpp | 15 | ||||
-rw-r--r-- | noncore/games/buzzword/opie-buzzword.control | 2 |
5 files changed, 8 insertions, 19 deletions
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp index 97a17a1..f746065 100644 --- a/noncore/games/buzzword/buzzword.cpp +++ b/noncore/games/buzzword/buzzword.cpp | |||
@@ -70,3 +70,3 @@ void BuzzItem::flip() | |||
70 | 70 | ||
71 | BuzzWord::BuzzWord() : QMainWindow(0) | 71 | BuzzWord::BuzzWord(QWidget* parent, const char* name, WFlags fl ) : QMainWindow( parent, name, fl ) |
72 | { | 72 | { |
diff --git a/noncore/games/buzzword/buzzword.h b/noncore/games/buzzword/buzzword.h index 37dd5b4..c0e43d0 100644 --- a/noncore/games/buzzword/buzzword.h +++ b/noncore/games/buzzword/buzzword.h | |||
@@ -66,3 +66,4 @@ class BuzzWord : public QMainWindow | |||
66 | public: | 66 | public: |
67 | BuzzWord(); | 67 | BuzzWord( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
68 | static QString appName() { return QString::fromLatin1("buzzword"); } | ||
68 | 69 | ||
diff --git a/noncore/games/buzzword/buzzword.pro b/noncore/games/buzzword/buzzword.pro index 0faede8..247b593 100644 --- a/noncore/games/buzzword/buzzword.pro +++ b/noncore/games/buzzword/buzzword.pro | |||
@@ -1,3 +1,2 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | HEADERS = buzzword.h | 2 | HEADERS = buzzword.h |
@@ -6,4 +5,4 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
6 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
7 | DESTDIR = $(OPIEDIR)/bin | ||
8 | LIBS += -lqpe | 6 | LIBS += -lqpe |
7 | |||
9 | TARGET = buzzword | 8 | TARGET = buzzword |
diff --git a/noncore/games/buzzword/main.cpp b/noncore/games/buzzword/main.cpp index 2d9ff81..67f2c26 100644 --- a/noncore/games/buzzword/main.cpp +++ b/noncore/games/buzzword/main.cpp | |||
@@ -19,5 +19,3 @@ | |||
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | 20 | #include <opie/oapplicationfactory.h> | |
21 | #include <stdlib.h> | ||
22 | #include <time.h> | ||
23 | 21 | ||
@@ -25,11 +23,2 @@ | |||
25 | 23 | ||
26 | int main(int argc, char **argv) | 24 | OPIE_EXPORT_APP( OApplicationFactory<BuzzWord> ) |
27 | { | ||
28 | srand(time(0)); | ||
29 | |||
30 | QPEApplication a( argc, argv ); | ||
31 | BuzzWord *top = new BuzzWord; | ||
32 | a.showMainWidget(top); | ||
33 | |||
34 | return a.exec(); | ||
35 | } | ||
diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control index 08b442b..b3e2496 100644 --- a/noncore/games/buzzword/opie-buzzword.control +++ b/noncore/games/buzzword/opie-buzzword.control | |||
@@ -1,3 +1,3 @@ | |||
1 | Package: opie-buzzword | 1 | Package: opie-buzzword |
2 | Files: bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords | 2 | Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords |
3 | Version: 1.1-$SUB_VERSION | 3 | Version: 1.1-$SUB_VERSION |