3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- qpe-gaim/src/QGaimNotify.cpp~libopie2
7 +++ qpe-gaim/src/QGaimNotify.cpp
9 #include <qmessagebox.h>
10 #include <qtextview.h>
12 -#include <opie/odevice.h>
13 +#include <opie2/odevice.h>
15 -using namespace Opie;
16 +using namespace Opie::Core;
18 static int notifyActiveCount = 0;
21 if (!gaim_prefs_get_bool("/gaim/qpe/notify/use_buzzer"))
24 - ODevice::inst()->alarmSound();
25 + ODevice::inst()->playAlarmSound();
29 --- qpe-gaim/src/QGaimPrefsDialog.cpp~libopie2
30 +++ qpe-gaim/src/QGaimPrefsDialog.cpp
33 #include <qvgroupbox.h>
35 -#include <opie/otabwidget.h>
36 -#include <opie/owait.h>
37 +#include <opie2/otabwidget.h>
38 +#include <opie2/owait.h>
40 #include <qpe/resource.h>
43 layout = new QVBoxLayout(this);
44 layout->setAutoAdd(true);
46 - tabs = new OTabWidget(this, "pref tabs");
47 + tabs = new Opie::Ui::OTabWidget(this, "pref tabs");
49 blistPage = new QGaimBlistPrefPage(this, "blist page");
50 notifyPage = new QGaimNotifyPrefPage(this, "notify page");
53 QGaimPrefsDialog::accept()
56 + Opie::Ui::OWait wait(this);
60 --- qpe-gaim/src/QGaimPrefsDialog.h~libopie2
61 +++ qpe-gaim/src/QGaimPrefsDialog.h
63 #define _QGAIM_PREFS_DIALOG_H_
66 +#include <opie2/otabwidget.h>
71 class QGaimPrefPage : public QWidget
73 void buildInterface();
77 + Opie::Ui::OTabWidget *tabs;
79 QGaimPrefPage *blistPage;
80 QGaimPrefPage *convPage;
81 --- qpe-gaim/src/main.cpp~libopie2
82 +++ qpe-gaim/src/main.cpp
85 #include "QGaimMainWindow.h"
87 -#include <qpe/qpeapplication.h>
88 -#include <opie/oapplicationfactory.h>
89 +#include <opie2/oapplicationfactory.h>
90 +using namespace Opie::Core;
92 OPIE_EXPORT_APP(OApplicationFactory<QGaimMainWindow>)