diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/qpe-gaim/files/libopie2.patch | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/qpe-gaim/files/libopie2.patch')
| -rw-r--r-- | packages/qpe-gaim/files/libopie2.patch | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/packages/qpe-gaim/files/libopie2.patch b/packages/qpe-gaim/files/libopie2.patch index e69de29bb2..9ebb8bc264 100644 --- a/packages/qpe-gaim/files/libopie2.patch +++ b/packages/qpe-gaim/files/libopie2.patch @@ -0,0 +1,92 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpe-gaim/src/QGaimNotify.cpp~libopie2 ++++ qpe-gaim/src/QGaimNotify.cpp +@@ -28,9 +28,9 @@ + #include <qmessagebox.h> + #include <qtextview.h> + +-#include <opie/odevice.h> ++#include <opie2/odevice.h> + +-using namespace Opie; ++using namespace Opie::Core; + + static int notifyActiveCount = 0; + +@@ -215,7 +215,7 @@ + if (!gaim_prefs_get_bool("/gaim/qpe/notify/use_buzzer")) + return; + +- ODevice::inst()->alarmSound(); ++ ODevice::inst()->playAlarmSound(); + } + + void +--- qpe-gaim/src/QGaimPrefsDialog.cpp~libopie2 ++++ qpe-gaim/src/QGaimPrefsDialog.cpp +@@ -30,8 +30,8 @@ + #include <qvbox.h> + #include <qvgroupbox.h> + +-#include <opie/otabwidget.h> +-#include <opie/owait.h> ++#include <opie2/otabwidget.h> ++#include <opie2/owait.h> + + #include <qpe/resource.h> + +@@ -306,7 +306,7 @@ + layout = new QVBoxLayout(this); + layout->setAutoAdd(true); + +- tabs = new OTabWidget(this, "pref tabs"); ++ tabs = new Opie::Ui::OTabWidget(this, "pref tabs"); + + blistPage = new QGaimBlistPrefPage(this, "blist page"); + notifyPage = new QGaimNotifyPrefPage(this, "notify page"); +@@ -332,7 +332,7 @@ + void + QGaimPrefsDialog::accept() + { +- OWait wait(this); ++ Opie::Ui::OWait wait(this); + + wait.show(); + +--- qpe-gaim/src/QGaimPrefsDialog.h~libopie2 ++++ qpe-gaim/src/QGaimPrefsDialog.h +@@ -22,8 +22,8 @@ + #define _QGAIM_PREFS_DIALOG_H_ + + #include <qdialog.h> ++#include <opie2/otabwidget.h> + +-class OTabWidget; + class QCheckBox; + + class QGaimPrefPage : public QWidget +@@ -150,7 +150,7 @@ + void buildInterface(); + + private: +- OTabWidget *tabs; ++ Opie::Ui::OTabWidget *tabs; + + QGaimPrefPage *blistPage; + QGaimPrefPage *convPage; +--- qpe-gaim/src/main.cpp~libopie2 ++++ qpe-gaim/src/main.cpp +@@ -20,7 +20,7 @@ + */ + #include "QGaimMainWindow.h" + +-#include <qpe/qpeapplication.h> +-#include <opie/oapplicationfactory.h> ++#include <opie2/oapplicationfactory.h> ++using namespace Opie::Core; + + OPIE_EXPORT_APP(OApplicationFactory<QGaimMainWindow>) |