author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /microkde/kio/kio | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | microkde/kio/kio/kdirwatch.cpp | 12 | ||||
-rw-r--r-- | microkde/kio/kio/kdirwatch_p.h | 10 |
2 files changed, 12 insertions, 10 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 | |||
@@ -52,11 +52,13 @@ $Id$ | |||
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> |
@@ -184,7 +186,7 @@ KDirWatchPrivate::KDirWatchPrivate() | |||
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); |
@@ -731,7 +733,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, | |||
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 |
@@ -1007,7 +1009,7 @@ void KDirWatchPrivate::slotRescan() | |||
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) |
diff --git a/microkde/kio/kio/kdirwatch_p.h b/microkde/kio/kio/kdirwatch_p.h index 0ab482f..be74f2a 100644 --- a/microkde/kio/kio/kdirwatch_p.h +++ b/microkde/kio/kio/kdirwatch_p.h | |||
@@ -18,7 +18,7 @@ $Id$ | |||
18 | #include <fam.h> | 18 | #include <fam.h> |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #include <qptrlist.h> | 21 | #include <q3ptrlist.h> |
22 | 22 | ||
23 | #include <kdirwatch.h> | 23 | #include <kdirwatch.h> |
24 | 24 | ||
@@ -58,9 +58,9 @@ public: | |||
58 | entryMode m_mode; | 58 | entryMode m_mode; |
59 | bool isDir; | 59 | bool isDir; |
60 | // instances interested in events | 60 | // instances interested in events |
61 | QPtrList<Client> m_clients; | 61 | Q3PtrList<Client> m_clients; |
62 | // nonexistent entries of this directory | 62 | // nonexistent entries of this directory |
63 | QPtrList<Entry> m_entries; | 63 | Q3PtrList<Entry> m_entries; |
64 | QString path; | 64 | QString path; |
65 | 65 | ||
66 | int msecLeft, freq; | 66 | int msecLeft, freq; |
@@ -124,7 +124,7 @@ private: | |||
124 | bool useStat(Entry*); | 124 | bool useStat(Entry*); |
125 | 125 | ||
126 | bool delayRemove; | 126 | bool delayRemove; |
127 | QPtrList<Entry> removeList; | 127 | Q3PtrList<Entry> removeList; |
128 | 128 | ||
129 | #ifdef HAVE_FAM | 129 | #ifdef HAVE_FAM |
130 | QSocketNotifier *sn; | 130 | QSocketNotifier *sn; |
@@ -141,7 +141,7 @@ private: | |||
141 | int mPipe[2]; | 141 | int mPipe[2]; |
142 | QTimer mTimer; | 142 | QTimer mTimer; |
143 | QSocketNotifier *mSn; | 143 | QSocketNotifier *mSn; |
144 | QIntDict<Entry> fd_Entry; | 144 | Q3IntDict<Entry> fd_Entry; |
145 | 145 | ||
146 | static void dnotify_handler(int, siginfo_t *si, void *); | 146 | static void dnotify_handler(int, siginfo_t *si, void *); |
147 | static void dnotify_sigio_handler(int, siginfo_t *si, void *); | 147 | static void dnotify_sigio_handler(int, siginfo_t *si, void *); |