Browse Source

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
2caa54700d
3 changed files with 8 additions and 8 deletions
  1. 1
    1
      ChangeLog
  2. 4
    4
      kdialogd3/kdialogd.cpp
  3. 3
    3
      kdialogd3/kdialogd.h

+ 1
- 1
ChangeLog View File

@@ -14,7 +14,7 @@
14 14
 2. When KDialogD is started, write its PID to a file. When each app
15 15
    attempts to connect to KDialogD, it checks if the PID in the file
16 16
    is still active - if not it starts KDialogD.
17
-3. KIO::NetAccess::mostLocalUrl fails if a file does not exist. If so,
17
+3. TDEIO::NetAccess::mostLocalUrl fails if a file does not exist. If so,
18 18
    then check if parent folder exists - and if so, append filename to
19 19
    that.
20 20
 

+ 4
- 4
kdialogd3/kdialogd.cpp View File

@@ -29,7 +29,7 @@
29 29
 #endif
30 30
 #include <fstream>
31 31
 
32
-KConfig *KDialogD::theirConfig=NULL;
32
+TDEConfig *KDialogD::theirConfig=NULL;
33 33
 
34 34
 #define CFG_KEY_DIALOG_SIZE "KDialogDSize"
35 35
 #define CFG_TIMEOUT_GROUP   "General"
@@ -132,7 +132,7 @@ static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *parent)
132 132
         else
133 133
         {
134 134
 #if KDE_IS_VERSION(3, 5, 0)
135
-            KURL url(KIO::NetAccess::mostLocalURL(*it, parent));
135
+            KURL url(TDEIO::NetAccess::mostLocalURL(*it, parent));
136 136
 
137 137
             if(url.isLocalFile())
138 138
                 items.append(url.path());
@@ -170,7 +170,7 @@ KDialogD::KDialogD(TQObject *parent)
170 170
             f.close();
171 171
         }
172 172
         if(!theirConfig)
173
-            theirConfig=new KConfig("kdialogdrc", false, false);
173
+            theirConfig=new TDEConfig("kdialogdrc", false, false);
174 174
 
175 175
         connect(new TQSocketNotifier(itsFd, TQSocketNotifier::Read, this),
176 176
                 TQT_SIGNAL(activated(int)), this, TQT_SLOT(newConnection()));
@@ -583,7 +583,7 @@ void KDialogDFileDialog::slotOk()
583 583
             good=false;
584 584
         }
585 585
         else if(itsConfirmOw && KFileDialog::Saving==operationMode())
586
-            good=!KIO::NetAccess::exists(urls.first(), false, this) ||
586
+            good=!TDEIO::NetAccess::exists(urls.first(), false, this) ||
587 587
                  KMessageBox::Continue==KMessageBox::warningContinueCancel(this,
588 588
                                             i18n("File %1 exists.\nDo you want to replace it?")
589 589
                                                  .arg(urls.first().prettyURL()),

+ 3
- 3
kdialogd3/kdialogd.h View File

@@ -14,7 +14,7 @@ class TQTimer;
14 14
 #include <kdedmodule.h>
15 15
 #endif
16 16
 class KDialogBase;
17
-class KConfig;
17
+class TDEConfig;
18 18
 
19 19
 class KDialogDFileDialog : public KFileDialog
20 20
 {
@@ -123,7 +123,7 @@ class KDialogD : public TQObject
123 123
     void deleteConnection(KDialogDClient *client);
124 124
     void timeout();
125 125
 
126
-    static KConfig * config() { return theirConfig; }
126
+    static TDEConfig * config() { return theirConfig; }
127 127
 
128 128
     private:
129 129
 
@@ -134,7 +134,7 @@ class KDialogD : public TQObject
134 134
     int    itsFd,
135 135
            itsNumConnections;
136 136
 
137
-    static KConfig *theirConfig;
137
+    static TDEConfig *theirConfig;
138 138
 };
139 139
 
140 140
 #ifndef KDIALOGD_APP

Loading…
Cancel
Save