aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/obsolete/qpe-gaim/files/libopie2.patch
blob: 9ebb8bc2641f0643b493e943dca93bf6e9285b47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
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>)