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

5 files changed, 11 insertions, 11 deletions

diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 9af7e65..8419dff 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -57,11 +57,11 @@ namespace KSB_News {
     // An instance of your dialog could be already created and could be
     // cached, in which case you want to display the cached dialog
     // instead of creating another one
-    if (KConfigDialog::showDialog("settings"))
+    if (TDEConfigDialog::showDialog("settings"))
       return;
 
-    // KConfigDialog didn't find an instance of this dialog, so lets create it
-    m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+    // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+    m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
                                   KDialogBase::Plain,
                                   KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default,
                                   KDialogBase::Ok,
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h
index 62dd437..1bea54c 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.h
+++ b/konq-plugins/sidebar/newsticker/norsswidget.h
@@ -26,7 +26,7 @@
 #define _NORSSWIDGET_H_
 
 
-class KConfigDialog;
+class TDEConfigDialog;
 
 
 namespace KSB_News {
@@ -43,7 +43,7 @@ namespace KSB_News {
     void slotConfigure_okClicked();
 
   private:
-    KConfigDialog *m_confdlg;
+    TDEConfigDialog *m_confdlg;
   };
 
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 2f054bd..6a3ee73 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -67,7 +67,7 @@ namespace KSB_News {
     void setListbox(TTListBox *lb);
     void setPixmap(const TQPixmap &pm);
     void setPixmapBuffer(TQBuffer *buf);
-    void setJob(KIO::Job *kio_job);
+    void setJob(TDEIO::Job *kio_job);
 
     TTListBox *listbox() const;
     TQPixmap pixmap();
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 30aedb4..ecbad6c 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -244,11 +244,11 @@ namespace KSB_News {
     // An instance of your dialog could be already created and could be
     // cached, in which case you want to display the cached dialog
     // instead of creating another one
-    if (KConfigDialog::showDialog("settings"))
+    if (TDEConfigDialog::showDialog("settings"))
       return;
 
-    // KConfigDialog didn't find an instance of this dialog, so lets create it
-    m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+    // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+    m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
                                   KDialogBase::Plain,
                                   KDialogBase::Ok|KDialogBase::Cancel| \
                                                   KDialogBase::Default| \
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 53934f4..2be171f 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -39,7 +39,7 @@ class KPopupMenu;
 class TDEAboutData;
 class KAboutApplication;
 class KBugReport;
-class KConfigDialog;
+class TDEConfigDialog;
 
 namespace KSB_News {
 
@@ -81,7 +81,7 @@ namespace KSB_News {
     KAboutApplication *m_about;
     KBugReport *m_bugreport;
     TQPushButton *m_last_button_rightclicked;
-    KConfigDialog *m_confdlg;
+    TDEConfigDialog *m_confdlg;
     TQStringList m_our_rsssources;
   };