Diffstat (limited to 'microkde/kio/kio/kdirwatch.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | microkde/kio/kio/kdirwatch.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/microkde/kio/kio/kdirwatch.cpp b/microkde/kio/kio/kdirwatch.cpp index 1596d1f..5f07c54 100644 --- a/microkde/kio/kio/kdirwatch.cpp +++ b/microkde/kio/kio/kdirwatch.cpp | |||
@@ -49,17 +49,19 @@ $Id$ | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include <sys/stat.h> | 51 | #include <sys/stat.h> |
52 | #include <assert.h> | 52 | #include <assert.h> |
53 | #include <qdir.h> | 53 | #include <qdir.h> |
54 | #include <qfile.h> | 54 | #include <qfile.h> |
55 | #include <qintdict.h> | 55 | #include <q3intdict.h> |
56 | #include <qptrlist.h> | 56 | #include <q3ptrlist.h> |
57 | #include <qsocketnotifier.h> | 57 | #include <qsocketnotifier.h> |
58 | #include <qstringlist.h> | 58 | #include <qstringlist.h> |
59 | #include <qtimer.h> | 59 | #include <qtimer.h> |
60 | //Added by qt3to4: | ||
61 | #include <Q3CString> | ||
60 | 62 | ||
61 | #include <kapplication.h> | 63 | #include <kapplication.h> |
62 | #include <kdebug.h> | 64 | #include <kdebug.h> |
63 | #include <kconfig.h> | 65 | #include <kconfig.h> |
64 | #include <kconfigbase.h> | 66 | #include <kconfigbase.h> |
65 | #include <kglobal.h> | 67 | #include <kglobal.h> |
@@ -181,13 +183,13 @@ KDirWatchPrivate::KDirWatchPrivate() | |||
181 | m_ref = 0; | 183 | m_ref = 0; |
182 | 184 | ||
183 | //US KConfigGroup config(KGlobal::config(), QCString("DirWatch")); | 185 | //US KConfigGroup config(KGlobal::config(), QCString("DirWatch")); |
184 | //US m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); | 186 | //US m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); |
185 | //US m_PollInterval = config.readNumEntry("PollInterval", 500); | 187 | //US m_PollInterval = config.readNumEntry("PollInterval", 500); |
186 | KConfig *config = KGlobal::config(); | 188 | KConfig *config = KGlobal::config(); |
187 | KConfigGroupSaver saver( config, QCString("DirWatch") ); | 189 | KConfigGroupSaver saver( config, Q3CString("DirWatch") ); |
188 | 190 | ||
189 | m_nfsPollInterval = config->readNumEntry("NFSPollInterval", 5000); | 191 | m_nfsPollInterval = config->readNumEntry("NFSPollInterval", 5000); |
190 | m_PollInterval = config->readNumEntry("PollInterval", 500); | 192 | m_PollInterval = config->readNumEntry("PollInterval", 500); |
191 | 193 | ||
192 | 194 | ||
193 | QString available("Stat"); | 195 | QString available("Stat"); |
@@ -728,13 +730,13 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, | |||
728 | 730 | ||
729 | /* Called from KDirWatch destructor: | 731 | /* Called from KDirWatch destructor: |
730 | * remove <instance> as client from all entries | 732 | * remove <instance> as client from all entries |
731 | */ | 733 | */ |
732 | void KDirWatchPrivate::removeEntries( KDirWatch* instance ) | 734 | void KDirWatchPrivate::removeEntries( KDirWatch* instance ) |
733 | { | 735 | { |
734 | QPtrList<Entry> list; | 736 | Q3PtrList<Entry> list; |
735 | int minfreq = 3600000; | 737 | int minfreq = 3600000; |
736 | 738 | ||
737 | // put all entries where instance is a client in list | 739 | // put all entries where instance is a client in list |
738 | EntryMap::Iterator it = m_mapEntries.begin(); | 740 | EntryMap::Iterator it = m_mapEntries.begin(); |
739 | for( ; it != m_mapEntries.end(); ++it ) { | 741 | for( ; it != m_mapEntries.end(); ++it ) { |
740 | Client* c = (*it).m_clients.first(); | 742 | Client* c = (*it).m_clients.first(); |
@@ -1004,13 +1006,13 @@ void KDirWatchPrivate::slotRescan() | |||
1004 | 1006 | ||
1005 | // We delay deletions of entries this way. | 1007 | // We delay deletions of entries this way. |
1006 | // removeDir(), when called in slotDirty(), can cause a crash otherwise | 1008 | // removeDir(), when called in slotDirty(), can cause a crash otherwise |
1007 | delayRemove = true; | 1009 | delayRemove = true; |
1008 | 1010 | ||
1009 | #ifdef HAVE_DNOTIFY | 1011 | #ifdef HAVE_DNOTIFY |
1010 | QPtrList<Entry> dList, cList; | 1012 | Q3PtrList<Entry> dList, cList; |
1011 | 1013 | ||
1012 | // for DNotify method, | 1014 | // for DNotify method, |
1013 | if (rescan_all) | 1015 | if (rescan_all) |
1014 | { | 1016 | { |
1015 | // mark all as dirty | 1017 | // mark all as dirty |
1016 | it = m_mapEntries.begin(); | 1018 | it = m_mapEntries.begin(); |