Browse Source

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

Timothy Pearson 6 years ago
parent
commit
715ba29794

+ 1
- 1
ChangeLog View File

@@ -98,7 +98,7 @@ Changes in 2.8:
98 98
   without their own postfix.
99 99
 * Fixed a crash when a terminal in a tab other than the currently selected tab
100 100
   exits.
101
-* Ported preferences handling to KDE's KConfigXT framework. Aside from cleaner
101
+* Ported preferences handling to KDE's TDEConfigXT framework. Aside from cleaner
102 102
   code, this improves over the old preferences handling by avoiding unnecessary
103 103
   disk activity (and thus spurious hard drive spin-ups on laptop computers and
104 104
   other battery-bound devices).

+ 8
- 8
yakuake/src/main_window.cpp View File

@@ -43,7 +43,7 @@ MainWindow::MainWindow(TQWidget * parent, const char * name) :
43 43
     background_changed = false;
44 44
     use_translucency = false;
45 45
 
46
-    KConfig config(CONFIG_FILE);
46
+    TDEConfig config(CONFIG_FILE);
47 47
 
48 48
     back_widget = new TQWidget(this);
49 49
     widgets_stack = new TQWidgetStack(this);
@@ -724,7 +724,7 @@ TQRect MainWindow::getDesktopGeometry()
724 724
     TQRect result;
725 725
     result = desk_info.workArea();
726 726
 
727
-    KConfigGroup group(TDEGlobal::config(), "Windows");
727
+    TDEConfigGroup group(TDEGlobal::config(), "Windows");
728 728
 
729 729
     if (TQApplication::desktop()->isVirtualDesktop() &&
730 730
             group.readBoolEntry("XineramaEnabled", true) &&
@@ -1000,7 +1000,7 @@ void MainWindow::slotDecreaseHeight()
1000 1000
 
1001 1001
 void MainWindow::slotInitSkin()
1002 1002
 {
1003
-    KConfig config(locate("appdata", Settings::skin() + "/title.skin"));
1003
+    TDEConfig config(locate("appdata", Settings::skin() + "/title.skin"));
1004 1004
 
1005 1005
     config.setGroup("Border");
1006 1006
 
@@ -1133,7 +1133,7 @@ void MainWindow::slotSetAccessKey()
1133 1133
 
1134 1134
     if (focus_policy == false) focus_policy = true;
1135 1135
 
1136
-    KConfig config(CONFIG_FILE);
1136
+    TDEConfig config(CONFIG_FILE);
1137 1137
 
1138 1138
     KKeyDialog::configure(global_key);
1139 1139
 
@@ -1149,7 +1149,7 @@ void MainWindow::slotSetControlKeys()
1149 1149
 
1150 1150
     if (focus_policy == false) focus_policy = true;
1151 1151
 
1152
-    KConfig config(CONFIG_FILE);
1152
+    TDEConfig config(CONFIG_FILE);
1153 1153
 
1154 1154
     KKeyDialog::configure(actionCollection());
1155 1155
 
@@ -1198,10 +1198,10 @@ void MainWindow::slotOpenSettingsDialog()
1198 1198
     if (focus_policy == false)
1199 1199
         focus_policy = true;
1200 1200
 
1201
-    if (KConfigDialog::showDialog("settings"))
1201
+    if (TDEConfigDialog::showDialog("settings"))
1202 1202
         return;
1203 1203
 
1204
-    KConfigDialog* settings_dialog = new KConfigDialog(this, "settings", Settings::self());
1204
+    TDEConfigDialog* settings_dialog = new TDEConfigDialog(this, "settings", Settings::self());
1205 1205
 
1206 1206
     GeneralSettings* general_settings = new GeneralSettings(settings_dialog, "General");
1207 1207
     settings_dialog->addPage(general_settings, i18n("General"), "package_settings");
@@ -1260,7 +1260,7 @@ void MainWindow::slotFirstRunDialogOK()
1260 1260
 
1261 1261
     if (first_run_dialog_page->shortcut() != global_key->shortcut("AccessKey"))
1262 1262
     {
1263
-        KConfig config(CONFIG_FILE);
1263
+        TDEConfig config(CONFIG_FILE);
1264 1264
         global_key->setShortcut("AccessKey", first_run_dialog_page->shortcut());
1265 1265
         global_key->updateConnections();
1266 1266
         global_key->writeSettings(&config);

+ 20
- 20
yakuake/src/skin_settings.cpp View File

@@ -105,7 +105,7 @@ void SkinSettings::slotPopulate()
105 105
         for (TQStringList::Iterator it = skins_dirs.begin(); it != skins_dirs.end(); ++it)
106 106
         {
107 107
             TQUrl titles_url = locate("appdata", (*it) + "/title.skin");
108
-            KConfig titles_config(titles_url.path());
108
+            TDEConfig titles_config(titles_url.path());
109 109
             titles_config.setGroup("Description");
110 110
 
111 111
             TQString titles_name(titles_config.readEntry("Skin", ""));
@@ -113,7 +113,7 @@ void SkinSettings::slotPopulate()
113 113
             TQString titles_icon_name(titles_config.readEntry("Icon", ""));
114 114
 
115 115
             TQUrl tabs_url = locate("appdata", (*it) + "/tabs.skin");
116
-            KConfig tabs_config(tabs_url.path());
116
+            TDEConfig tabs_config(tabs_url.path());
117 117
             tabs_config.setGroup("Description");
118 118
 
119 119
             TQString tabs_name(tabs_config.readEntry("Skin", ""));
@@ -179,10 +179,10 @@ void SkinSettings::slotInstallSkin()
179 179
 
180 180
     if (skin_url.isEmpty()) return;
181 181
 
182
-    if (!KIO::NetAccess::download(skin_url, install_skin_file, NULL))
182
+    if (!TDEIO::NetAccess::download(skin_url, install_skin_file, NULL))
183 183
     {
184 184
         KMessageBox::error(0L,
185
-            KIO::NetAccess::lastErrorString(),
185
+            TDEIO::NetAccess::lastErrorString(),
186 186
             i18n("Failed to Download Skin"),
187 187
             KMessageBox::Notify
188 188
             );
@@ -194,29 +194,29 @@ void SkinSettings::slotInstallSkin()
194 194
 
195 195
     if (!skin_dir.exists())
196 196
     {
197
-        KIO::ListJob* job = KIO::listRecursive("tar:" + install_skin_file, false, false);
197
+        TDEIO::ListJob* job = TDEIO::listRecursive("tar:" + install_skin_file, false, false);
198 198
 
199
-        connect(job, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
200
-            this, TQT_SLOT(slotListSkinArchive(KIO::Job*, const KIO::UDSEntryList&)));
199
+        connect(job, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
200
+            this, TQT_SLOT(slotListSkinArchive(TDEIO::Job*, const TDEIO::UDSEntryList&)));
201 201
 
202
-        connect(job, TQT_SIGNAL(result(KIO::Job*)),
203
-            this, TQT_SLOT(slotValidateSkinArchive(KIO::Job*)));
202
+        connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
203
+            this, TQT_SLOT(slotValidateSkinArchive(TDEIO::Job*)));
204 204
     }
205 205
     else
206 206
         failInstall(i18n("The installer was given a directory, not a file."));
207 207
 }
208 208
 
209
-void SkinSettings::slotListSkinArchive(KIO::Job* /* job */, const KIO::UDSEntryList& list)
209
+void SkinSettings::slotListSkinArchive(TDEIO::Job* /* job */, const TDEIO::UDSEntryList& list)
210 210
 {
211
-    KIO::UDSEntryList::const_iterator it = list.begin();
211
+    TDEIO::UDSEntryList::const_iterator it = list.begin();
212 212
 
213 213
     for(; it != list.end(); ++it)
214 214
     {
215
-        KIO::UDSEntry::const_iterator itUSDEntry = (*it).begin();
215
+        TDEIO::UDSEntry::const_iterator itUSDEntry = (*it).begin();
216 216
 
217 217
         for (; itUSDEntry != (*it).end(); ++itUSDEntry )
218 218
         {
219
-            if((*itUSDEntry).m_uds == KIO::UDS_NAME)
219
+            if((*itUSDEntry).m_uds == TDEIO::UDS_NAME)
220 220
             {
221 221
                 install_skin_file_list.append((*itUSDEntry).m_str);
222 222
             }
@@ -224,7 +224,7 @@ void SkinSettings::slotListSkinArchive(KIO::Job* /* job */, const KIO::UDSEntryL
224 224
     }
225 225
 }
226 226
 
227
-void SkinSettings::slotValidateSkinArchive(KIO::Job* job)
227
+void SkinSettings::slotValidateSkinArchive(TDEIO::Job* job)
228 228
 {
229 229
     if (!job->error())
230 230
     {
@@ -276,8 +276,8 @@ void SkinSettings::checkForExistingSkin()
276 276
             if (remove == KMessageBox::Continue)
277 277
             {
278 278
                 unlink(TQFile::encodeName(item->dir()));
279
-                KIO::DeleteJob* job = KIO::del(KURL(item->dir()), false, false);
280
-                connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotInstallSkinArchive(KIO::Job*)));
279
+                TDEIO::DeleteJob* job = TDEIO::del(KURL(item->dir()), false, false);
280
+                connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotInstallSkinArchive(TDEIO::Job*)));
281 281
             }
282 282
             else
283 283
                 cleanupAfterInstall();
@@ -287,7 +287,7 @@ void SkinSettings::checkForExistingSkin()
287 287
         slotInstallSkinArchive();
288 288
 }
289 289
 
290
-void SkinSettings::slotInstallSkinArchive(KIO::Job* delete_job)
290
+void SkinSettings::slotInstallSkinArchive(TDEIO::Job* delete_job)
291 291
 {
292 292
     if (delete_job && delete_job->error())
293 293
     {
@@ -331,7 +331,7 @@ void SkinSettings::failInstall(const TQString& error)
331 331
 
332 332
 void SkinSettings::cleanupAfterInstall()
333 333
 {
334
-    KIO::NetAccess::removeTempFile(install_skin_file);
334
+    TDEIO::NetAccess::removeTempFile(install_skin_file);
335 335
     install_skin_file = TQString();
336 336
     install_skin_name = TQString();
337 337
     install_skin_file_list.clear();
@@ -354,8 +354,8 @@ void SkinSettings::slotRemoveSkin()
354 354
     if (remove == KMessageBox::Continue)
355 355
     {
356 356
         unlink(TQFile::encodeName(selected_item->dir()));
357
-        KIO::DeleteJob* job = KIO::del(KURL(selected_item->dir()), false, false);
358
-        connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotPopulate()));
357
+        TDEIO::DeleteJob* job = TDEIO::del(KURL(selected_item->dir()), false, false);
358
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotPopulate()));
359 359
 
360 360
         if (selected_item->name() == Settings::skin())
361 361
         {

+ 3
- 3
yakuake/src/skin_settings.h View File

@@ -58,9 +58,9 @@ class SkinSettings : public SkinSettingsUI
58 58
         void slotPopulate();
59 59
 
60 60
         void slotInstallSkin();
61
-        void slotListSkinArchive(KIO::Job* job, const KIO::UDSEntryList& list);
62
-        void slotValidateSkinArchive(KIO::Job* job);
63
-        void slotInstallSkinArchive(KIO::Job* delete_job = 0);
61
+        void slotListSkinArchive(TDEIO::Job* job, const TDEIO::UDSEntryList& list);
62
+        void slotValidateSkinArchive(TDEIO::Job* job);
63
+        void slotInstallSkinArchive(TDEIO::Job* delete_job = 0);
64 64
 
65 65
         void slotRemoveSkin();
66 66
 

+ 1
- 1
yakuake/src/tab_bar.cpp View File

@@ -189,7 +189,7 @@ void TabBar::reloadSkin(const TQString& skin)
189 189
 void TabBar::setPixmaps(const TQString& skin)
190 190
 {
191 191
     TQUrl url(locate("appdata", skin + "/tabs.skin"));
192
-    KConfig config(url.path());
192
+    TDEConfig config(url.path());
193 193
 
194 194
     config.setGroup("Tabs");
195 195
 

+ 1
- 1
yakuake/src/title_bar.cpp View File

@@ -130,7 +130,7 @@ void TitleBar::setPixmaps(const TQString& skin)
130 130
     /* Initialize the skin objects. */
131 131
 
132 132
     TQUrl url(locate("appdata", skin + "/title.skin"));
133
-    KConfig config(url.path());
133
+    TDEConfig config(url.path());
134 134
 
135 135
     // Load the text information.
136 136
     config.setGroup("Text");

Loading…
Cancel
Save