author | zautrix <zautrix> | 2004-08-08 12:16:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-08 12:16:57 (UTC) |
commit | 4cc869512488b72304c7cbb5526c6f4cc957e677 (patch) (unidiff) | |
tree | 5658bb7ec55abc04b8e4f2d8e97faf945f0b9eeb | |
parent | 7c4e0075810cf95ab2b1ecda2d971264e9a9b60c (diff) | |
download | kdepimpi-4cc869512488b72304c7cbb5526c6f4cc957e677.zip kdepimpi-4cc869512488b72304c7cbb5526c6f4cc957e677.tar.gz kdepimpi-4cc869512488b72304c7cbb5526c6f4cc957e677.tar.bz2 |
Made it compileable on desktop 2
-rw-r--r-- | kabc/distributionlist.cpp | 4 | ||||
-rw-r--r-- | kabc/distributionlist.h | 17 | ||||
-rw-r--r-- | microkde/microkde.pro | 1 |
3 files changed, 8 insertions, 14 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index 1fb186e..d34ba0b 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp | |||
@@ -255,17 +255,17 @@ bool DistributionListManager::save() | |||
255 | 255 | ||
256 | 256 | ||
257 | 257 | ||
258 | 258 | ||
259 | cfg.sync(); | 259 | cfg.sync(); |
260 | 260 | ||
261 | return true; | 261 | return true; |
262 | } | 262 | } |
263 | 263 | #if 0 | |
264 | DistributionListWatcher* DistributionListWatcher::mSelf = 0; | 264 | DistributionListWatcher* DistributionListWatcher::mSelf = 0; |
265 | 265 | ||
266 | DistributionListWatcher::DistributionListWatcher() | 266 | DistributionListWatcher::DistributionListWatcher() |
267 | : QObject( 0, "DistributionListWatcher" ) | 267 | : QObject( 0, "DistributionListWatcher" ) |
268 | { | 268 | { |
269 | 269 | ||
270 | mDirWatch = new KDirWatch; | 270 | mDirWatch = new KDirWatch; |
271 | mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); | 271 | mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); |
@@ -282,11 +282,11 @@ DistributionListWatcher::~DistributionListWatcher() | |||
282 | 282 | ||
283 | DistributionListWatcher *DistributionListWatcher::self() | 283 | DistributionListWatcher *DistributionListWatcher::self() |
284 | { | 284 | { |
285 | if ( !mSelf ) | 285 | if ( !mSelf ) |
286 | mSelf = new DistributionListWatcher(); | 286 | mSelf = new DistributionListWatcher(); |
287 | 287 | ||
288 | return mSelf; | 288 | return mSelf; |
289 | } | 289 | } |
290 | 290 | #endif | |
291 | //US #include "distributionlist.moc" | 291 | //US #include "distributionlist.moc" |
292 | 292 | ||
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h index 584f287..c81e543 100644 --- a/kabc/distributionlist.h +++ b/kabc/distributionlist.h | |||
@@ -16,17 +16,17 @@ | |||
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #ifndef KABC_DISTRIBUTIONLIST_H | 21 | #ifndef KABC_DISTRIBUTIONLIST_H |
22 | #define KABC_DISTRIBUTIONLIST_H | 22 | #define KABC_DISTRIBUTIONLIST_H |
23 | 23 | ||
24 | #include <kdirwatch.h> | 24 | //#include <kdirwatch.h> |
25 | 25 | ||
26 | #include "addressbook.h" | 26 | #include "addressbook.h" |
27 | 27 | ||
28 | namespace KABC { | 28 | namespace KABC { |
29 | 29 | ||
30 | class DistributionListManager; | 30 | class DistributionListManager; |
31 | 31 | ||
32 | /** | 32 | /** |
@@ -180,38 +180,33 @@ class DistributionListManager | |||
180 | 180 | ||
181 | <pre> | 181 | <pre> |
182 | KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self() | 182 | KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self() |
183 | 183 | ||
184 | connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) ); | 184 | connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) ); |
185 | </pre> | 185 | </pre> |
186 | */ | 186 | */ |
187 | 187 | ||
188 | /* | ||
188 | class DistributionListWatcher : public QObject | 189 | class DistributionListWatcher : public QObject |
189 | { | 190 | { |
190 | Q_OBJECT | 191 | Q_OBJECT_XX |
191 | 192 | ||
192 | public: | 193 | public: |
193 | /** | 194 | |
194 | * Returns the watcher object. | ||
195 | */ | ||
196 | static DistributionListWatcher *self(); | 195 | static DistributionListWatcher *self(); |
197 | 196 | ||
198 | 197 | ||
199 | signals: | 198 | signals: |
200 | /** | 199 | |
201 | * This signal is emmitted whenever the distribution lists has | ||
202 | * changed (if a list was added or removed, when a list was | ||
203 | * renamed or the entries of the list changed). | ||
204 | */ | ||
205 | void changed(); | 200 | void changed(); |
206 | 201 | ||
207 | protected: | 202 | protected: |
208 | DistributionListWatcher(); | 203 | DistributionListWatcher(); |
209 | ~DistributionListWatcher(); | 204 | ~DistributionListWatcher(); |
210 | 205 | ||
211 | private: | 206 | private: |
212 | static DistributionListWatcher* mSelf; | 207 | static DistributionListWatcher* mSelf; |
213 | KDirWatch *mDirWatch; | 208 | KDirWatch *mDirWatch; |
214 | }; | 209 | }; |
215 | 210 | */ | |
216 | } | 211 | } |
217 | #endif | 212 | #endif |
diff --git a/microkde/microkde.pro b/microkde/microkde.pro index f9adfb1..71d662b 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro | |||
@@ -31,17 +31,16 @@ KDGanttMinimizeSplitter.h \ | |||
31 | kcolorbutton.h \ | 31 | kcolorbutton.h \ |
32 | kcolordialog.h \ | 32 | kcolordialog.h \ |
33 | kcombobox.h \ | 33 | kcombobox.h \ |
34 | kconfig.h \ | 34 | kconfig.h \ |
35 | kdatetbl.h \ | 35 | kdatetbl.h \ |
36 | kdebug.h \ | 36 | kdebug.h \ |
37 | kdialog.h \ | 37 | kdialog.h \ |
38 | kdialogbase.h \ | 38 | kdialogbase.h \ |
39 | kdirwatch.h \ | ||
40 | keditlistbox.h \ | 39 | keditlistbox.h \ |
41 | kemailsettings.h \ | 40 | kemailsettings.h \ |
42 | kfiledialog.h \ | 41 | kfiledialog.h \ |
43 | kfontdialog.h \ | 42 | kfontdialog.h \ |
44 | kglobal.h \ | 43 | kglobal.h \ |
45 | kglobalsettings.h \ | 44 | kglobalsettings.h \ |
46 | kiconloader.h \ | 45 | kiconloader.h \ |
47 | klineedit.h \ | 46 | klineedit.h \ |