summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/distributionlist.cpp4
-rw-r--r--kabc/distributionlist.h17
-rw-r--r--microkde/microkde.pro1
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
@@ -251,25 +251,25 @@ bool DistributionListManager::save()
251 } 251 }
252 cfg.writeEntry( "__Lists__List__", namelist ); 252 cfg.writeEntry( "__Lists__List__", namelist );
253 253
254 254
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
264DistributionListWatcher* DistributionListWatcher::mSelf = 0; 264DistributionListWatcher* DistributionListWatcher::mSelf = 0;
265 265
266DistributionListWatcher::DistributionListWatcher() 266DistributionListWatcher::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" ) );
272 272
273 connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) ); 273 connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) );
274 mDirWatch->startScan(); 274 mDirWatch->startScan();
275} 275}
@@ -278,15 +278,15 @@ DistributionListWatcher::~DistributionListWatcher()
278{ 278{
279 delete mDirWatch; 279 delete mDirWatch;
280 mDirWatch = 0; 280 mDirWatch = 0;
281} 281}
282 282
283DistributionListWatcher *DistributionListWatcher::self() 283DistributionListWatcher *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
@@ -12,25 +12,25 @@
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
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
28namespace KABC { 28namespace KABC {
29 29
30class DistributionListManager; 30class DistributionListManager;
31 31
32/** 32/**
33 @short Distribution list of email addresses 33 @short Distribution list of email addresses
34 34
35 This class represents a list of email addresses. Each email address is 35 This class represents a list of email addresses. Each email address is
36 associated with an address book entry. If the address book entry changes, the 36 associated with an address book entry. If the address book entry changes, the
@@ -176,42 +176,37 @@ class DistributionListManager
176 This class provides a @ref changed() signal that i emitted when the 176 This class provides a @ref changed() signal that i emitted when the
177 distribution lists has changed in some way. 177 distribution lists has changed in some way.
178 178
179 Exapmle: 179 Exapmle:
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/*
188class DistributionListWatcher : public QObject 189class 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
@@ -27,25 +27,24 @@ KDGanttMinimizeSplitter.h \
27 kapplication.h \ 27 kapplication.h \
28 kaudioplayer.h \ 28 kaudioplayer.h \
29 kcalendarsystem.h \ 29 kcalendarsystem.h \
30 kcalendarsystemgregorian.h \ 30 kcalendarsystemgregorian.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 \
48 klineeditdlg.h \ 47 klineeditdlg.h \
49 kmessagebox.h \ 48 kmessagebox.h \
50 knotifyclient.h \ 49 knotifyclient.h \
51 kprinter.h \ 50 kprinter.h \