diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-28 00:41:56 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-28 00:41:56 +0000 |
| commit | a3313ea1bcdc03d4a7b9bd785627b3cc99835721 (patch) | |
| tree | ef7d8502ce5c4a639fc52779581089e177cb0c45 /packages/qpe-vexed/files | |
| parent | 6256a3b966cd513c048f4b64df72c226b107858b (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/28 02:18:48+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/28 02:18:37+02:00 uni-frankfurt.de!mickeyl
fix qpe-vexed
2005/03/28 02:05:56+02:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded
2005/03/28 02:05:40+02:00 vanille.de!mickeyl
ship prism3 stuff in the clamshell images
2005/03/28 02:03:38+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/28 02:03:27+02:00 uni-frankfurt.de!mickeyl
fix stupid typo in preferred-opie-versions.inc
BKrev: 424752d48m38o6z1b39U7R_jBDkQOw
Diffstat (limited to 'packages/qpe-vexed/files')
| -rw-r--r-- | packages/qpe-vexed/files/vit.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/packages/qpe-vexed/files/vit.patch b/packages/qpe-vexed/files/vit.patch index e69de29bb2..c07d46983a 100644 --- a/packages/qpe-vexed/files/vit.patch +++ b/packages/qpe-vexed/files/vit.patch @@ -0,0 +1,82 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpe-vexed_arm/mainWidget.cpp~vit ++++ qpe-vexed_arm/mainWidget.cpp +@@ -24,7 +24,7 @@ + #include <qhbox.h> + #include <qpe/qpeapplication.h> + +-MainWidget::MainWidget(QWidget *parent, const char *name) : QWidget(parent, name) { ++MainWidget::MainWidget(QWidget *parent, const char *name, WFlags f) : QMainWindow(parent, name, f) { + this -> setBackgroundMode(PaletteButton); + this -> setCaption("QPE-Vexed"); + +--- qpe-vexed_arm/mainWidget.h~vit ++++ qpe-vexed_arm/mainWidget.h +@@ -28,7 +28,7 @@ + #include "level.h" + #include "statuslabel.h" + +-#include <qwidget.h> ++#include <qmainwindow.h> + #include <qstring.h> + + /* +@@ -36,10 +36,11 @@ + * Handles allmost all signals + */ + +-class MainWidget : public QWidget { ++class MainWidget : public QMainWindow { + Q_OBJECT + public: +- MainWidget(QWidget *parent = NULL, const char *name = NULL); ++ static QString appName() { return QString::fromLatin1("qpevexed"); } ++ MainWidget(QWidget *parent = NULL, const char *name = NULL, WFlags f = 0); + ~MainWidget(); + protected: + void keyPressEvent(QKeyEvent*); +--- qpe-vexed_arm/qpeVexed.cpp~vit ++++ qpe-vexed_arm/qpeVexed.cpp +@@ -18,15 +18,8 @@ + * + */ + +-#include <qpe/qpeapplication.h> + #include "mainWidget.h" ++#include <opie2/oapplicationfactory.h> + +-int main(int argc, char **argv) { +- QPEApplication a(argc, argv); +- +- MainWidget mw; +- +- a.setMainWidget(&mw); +- mw.show(); +- a.exec(); +-} ++using namespace Opie::Core; ++OPIE_EXPORT_APP( OApplicationFactory<MainWidget> ) +--- qpe-vexed_arm/statuslabel.cpp~vit ++++ qpe-vexed_arm/statuslabel.cpp +@@ -32,6 +32,6 @@ + StatusLabel::~StatusLabel() {} + + void StatusLabel::setLabel(const QString& pack, const QString& name, int num) { +- QString s = QString::number(num); ++ QString s = QString::number(num+1); + setText(pack+" ("+s+"):\n\t"+name); + } +--- qpe-vexed_arm/qpe-vexed.pro~vit ++++ qpe-vexed_arm/qpe-vexed.pro +@@ -5,6 +5,6 @@ + SOURCES = button.cpp fileiface.cpp level.cpp mainWidget.cpp menuBar.cpp playingBoard.cpp qpeVexed.cpp stone.cpp about.cpp statuslabel.cpp instruction.cpp + INCLUDEPATH += $(QPEDIR)/include + DEPENDPATH += $(QPEDIR)/include +-LIBS += -lqpe -lqte ++LIBS += -lqpe -lqte -lopiecore2 + #INTERFACES = board_designed.ui + TARGET = qpe-vexed |