summaryrefslogtreecommitdiffstats
path: root/superkaramba/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:57 -0600
commit0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch)
tree14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /superkaramba/src
parent0ec14ccb8401eff2be20f861953a77431410955c (diff)
downloadtdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz
tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba/src')
-rw-r--r--superkaramba/src/CMakeLists.txt2
-rw-r--r--superkaramba/src/imagelabel.cpp2
-rw-r--r--superkaramba/src/imagelabel.h2
-rw-r--r--superkaramba/src/karamba.h6
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/karambasessionmanaged.cpp2
-rw-r--r--superkaramba/src/main.cpp4
-rw-r--r--superkaramba/src/rsssensor.cpp2
-rw-r--r--superkaramba/src/sknewstuff.cpp4
-rw-r--r--superkaramba/src/taskbartest.cpp12
-rw-r--r--superkaramba/src/taskmanager.cpp2
-rw-r--r--superkaramba/src/themefile.cpp2
-rw-r--r--superkaramba/src/themelocale.cpp2
-rw-r--r--superkaramba/src/themesdlg.cpp6
14 files changed, 25 insertions, 25 deletions
diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt
index add2ef7..07b7ec5 100644
--- a/superkaramba/src/CMakeLists.txt
+++ b/superkaramba/src/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_executable( superkaramba AUTOMOC
superkarambasettings.kcfgc themelocale.cpp
input.cpp sklineedit.cpp input_python.cpp
svcgrp_python.cpp
- LINK kio-shared ${PYTHON_LIBRARIES}
+ LINK tdeio-shared ${PYTHON_LIBRARIES}
${KNEWSTUFF_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 64c523f..91638b6 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kimageeffect.h>
#include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include "karambaapp.h"
#include "imagelabel.h"
diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h
index bf4189c..9ed9672 100644
--- a/superkaramba/src/imagelabel.h
+++ b/superkaramba/src/imagelabel.h
@@ -32,7 +32,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <tqregexp.h>
#include <tqtimer.h>
#include "karamba.h"
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 572451d..3d4642c 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -35,7 +35,7 @@
#include <twin.h>
#include <tqfile.h>
-#include <kfile.h>
+#include <tdefile.h>
#include <tqfileinfo.h>
#include <kaction.h>
#include <tqtimer.h>
@@ -56,13 +56,13 @@
#include <tqcursor.h>
#include <netwm.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <tqmap.h>
#include <kurl.h>
#include <krun.h>
#include <tqdatetime.h>
#include <tqbitmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kprocess.h>
#include <tqdragobject.h>
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 3e69df6..95f810d 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -11,7 +11,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdir.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kcmdlineargs.h>
#include <fcntl.h>
#include <klocale.h>
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index ca41515..46d2805 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -21,7 +21,7 @@
****************************************************************************/
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "karambasessionmanaged.h"
#include "karamba.h"
#include "tqwidgetlist.h"
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index b0055cc..05809e5 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -26,11 +26,11 @@
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmainwindow.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tdeversion.h>
diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp
index 30ccf61..e0a4f9e 100644
--- a/superkaramba/src/rsssensor.cpp
+++ b/superkaramba/src/rsssensor.cpp
@@ -13,7 +13,7 @@
#include <tqdom.h>
#include <tqregexp.h>
#include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
RssSensor::RssSensor( const TQString &src, int interval, const TQString &form, const TQString &enc)
: Sensor(interval),
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 814cf05..1b8b451 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -20,8 +20,8 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <kfilemetainfo.h>
-#include <kio/netaccess.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/netaccess.h>
#include <kmimetype.h>
#include <krun.h>
#include <kstandarddirs.h>
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index f7d742b..7498b41 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -21,11 +21,11 @@
****************************************************************************/
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
@@ -66,10 +66,10 @@ int main(int argc, char **argv)
// // KSGRD::SensorMgr foo ;// p->engage( "" );
-// //TDEConfig *kconfig = TDEGlobal::config();
-// //kconfig->setGroup("karamba");
-// //kconfig->writeEntry("test", "/home/hk/foofoo");
-// //kconfig->sync();
+// //TDEConfig *tdeconfig = TDEGlobal::config();
+// //tdeconfig->setGroup("karamba");
+// //tdeconfig->writeEntry("test", "/home/hk/foofoo");
+// //tdeconfig->sync();
// bool OK = false;
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 7e977d4..34ec17b 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <twinmodule.h>
#include <netwm.h>
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index c1392c6..de38b14 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -31,7 +31,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <tqtextstream.h>
#include <tqfileinfo.h>
#include <tqdom.h>
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index 1b7314c..6709ff3 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -30,7 +30,7 @@
#include "themelocale.h"
#include "themefile.h"
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>
#include <tqbuffer.h>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 4b13c6b..9b13ff3 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -36,7 +36,7 @@
#include "superkarambasettings.h"
#include <karchive.h>
#include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <kapplication.h>
@@ -48,7 +48,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqptrlist.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kprotocolinfo.h>
ThemesDlg::ThemesDlg(TQWidget *parent, const char *name)
@@ -220,7 +220,7 @@ void ThemesDlg::getNewStuff()
TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writePathEntry("ProvidersUrl",
- TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+ TQString::fromLatin1("http://download.kde.org/tdehotnewstuff/karamba-providers.xml"));
config->sync();
m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
//This check is b/c KNewStuff will download, throw an error,