author | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:12:19 (UTC) |
commit | 1c58d1407f9584fedcdae390a04e2b37e5853361 (patch) (unidiff) | |
tree | 3c6e741c4d382d1a53c182930052b684d6e35b91 /noncore/apps/opie-reader/Prefs.h | |
parent | e3f4607edd0c1ca1434adb446df1d4a1d27c6a86 (diff) | |
download | opie-1c58d1407f9584fedcdae390a04e2b37e5853361.zip opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.gz opie-1c58d1407f9584fedcdae390a04e2b37e5853361.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/apps/opie-reader/Prefs.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/Prefs.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/apps/opie-reader/Prefs.h b/noncore/apps/opie-reader/Prefs.h index 37d8c9e..8fef2f5 100644 --- a/noncore/apps/opie-reader/Prefs.h +++ b/noncore/apps/opie-reader/Prefs.h | |||
@@ -35,7 +35,7 @@ class QLabel; | |||
35 | 35 | ||
36 | class CLayoutPrefs : public QWidget | 36 | class CLayoutPrefs : public QWidget |
37 | { | 37 | { |
38 | 38 | Q_OBJECT | |
39 | public: | 39 | public: |
40 | 40 | ||
41 | friend class CPrefs; | 41 | friend class CPrefs; |
@@ -56,7 +56,7 @@ public: | |||
56 | 56 | ||
57 | class CLayoutPrefs2 : public QWidget | 57 | class CLayoutPrefs2 : public QWidget |
58 | { | 58 | { |
59 | 59 | Q_OBJECT | |
60 | public: | 60 | public: |
61 | 61 | ||
62 | friend class CPrefs; | 62 | friend class CPrefs; |
@@ -99,7 +99,7 @@ protected: | |||
99 | */ | 99 | */ |
100 | class CMiscPrefs : public QWidget | 100 | class CMiscPrefs : public QWidget |
101 | { | 101 | { |
102 | 102 | Q_OBJECT | |
103 | public: | 103 | public: |
104 | 104 | ||
105 | friend class CPrefs; | 105 | friend class CPrefs; |
@@ -113,6 +113,7 @@ public: | |||
113 | 113 | ||
114 | class CButtonPrefs : public QWidget | 114 | class CButtonPrefs : public QWidget |
115 | { | 115 | { |
116 | Q_OBJECT | ||
116 | #ifdef USECOMBO | 117 | #ifdef USECOMBO |
117 | void populate(QComboBox*); | 118 | void populate(QComboBox*); |
118 | #else | 119 | #else |
@@ -135,7 +136,7 @@ public: | |||
135 | 136 | ||
136 | class CInterPrefs : public QWidget | 137 | class CInterPrefs : public QWidget |
137 | { | 138 | { |
138 | 139 | Q_OBJECT | |
139 | public: | 140 | public: |
140 | 141 | ||
141 | friend class CPrefs; | 142 | friend class CPrefs; |