summaryrefslogtreecommitdiffstats
path: root/klinkstatus/src/ui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:39:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:39:24 -0600
commitf9ced3b3f13f3136ef63c33ef163042010d6e80b (patch)
tree293ce93dfb0dcfd79f83674116d7b3bc56f29af2 /klinkstatus/src/ui
parent29df04c24350cc76a41e2410d1c92445f9338b98 (diff)
downloadtdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.tar.gz
tdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus/src/ui')
-rw-r--r--klinkstatus/src/ui/klshistorycombo.h2
-rw-r--r--klinkstatus/src/ui/sessionwidget.cpp6
-rw-r--r--klinkstatus/src/ui/sessionwidget.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h
index 501c7474..06973616 100644
--- a/klinkstatus/src/ui/klshistorycombo.h
+++ b/klinkstatus/src/ui/klshistorycombo.h
@@ -13,7 +13,7 @@
#define KLSHISTORYCOMBO_H
#include <kcombobox.h>
-class KConfig;
+class TDEConfig;
/**
@author Paulo Moura Guedes
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 7c611bc0..e6a96f61 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -228,7 +228,7 @@ void SessionWidget::slotCheck()
paused_ = false;
stopped_ = false;
- slotLoadSettings(false); // it seems that KConfigDialogManager is not trigering this slot
+ slotLoadSettings(false); // it seems that TDEConfigDialogManager is not trigering this slot
newSearchManager();
@@ -631,7 +631,7 @@ void SessionWidget::slotPauseSearch()
search_manager_->resume();
emit signalSearchStarted();
- slotLoadSettings(isEmpty()); // it seems that KConfigDialogManager is not trigering this slot
+ slotLoadSettings(isEmpty()); // it seems that TDEConfigDialogManager is not trigering this slot
resetPendingActions();
}
@@ -716,7 +716,7 @@ void SessionWidget::slotExportAsHTML( )
if (url.isLocalFile())
return;
- KIO::NetAccess::upload(filename, url, 0);
+ TDEIO::NetAccess::upload(filename, url, 0);
}
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index 368a7964..111b059d 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -35,7 +35,7 @@ class TQStringList;
class TQListViewItem;
class KURL;
-class KConfig;
+class TDEConfig;
class KToggleAction;
#include <vector>