summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:53:42 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:53:42 -0600
commit7890a8168b35a448135a03431cd5e19519f70e41 (patch)
tree81d8834bcca8c349feec90a3323d7ebc07c5333d
parent7843a9b39e03ed333b5c5183e23f84668293756c (diff)
downloadknemo-7890a8168b35a448135a03431cd5e19519f70e41.tar.gz
knemo-7890a8168b35a448135a03431cd5e19519f70e41.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m48
-rw-r--r--src/INSTALL.Mandrake6
-rw-r--r--src/kcm/configdialog.cpp4
-rw-r--r--src/kcm/kcm_knemo.desktop2
-rw-r--r--src/knemod/backends/nettoolsbackend.cpp2
-rw-r--r--src/knemod/backends/sysbackend.cpp2
-rw-r--r--src/knemod/interfaceicon.cpp2
-rw-r--r--src/knemod/interfacestatisticsdialog.cpp2
-rw-r--r--src/knemod/interfacestatusdialog.cpp4
-rw-r--r--src/knemod/interfacetooltip.cpp2
-rw-r--r--src/knemod/knemodaemon.cpp2
-rw-r--r--src/knemod/signalplotter.cpp2
12 files changed, 19 insertions, 19 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e1baa47..a2ce3eb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/src/INSTALL.Mandrake b/src/INSTALL.Mandrake
index 57419d4..75fba17 100644
--- a/src/INSTALL.Mandrake
+++ b/src/INSTALL.Mandrake
@@ -11,11 +11,11 @@ The simplest way to compile KNemo for Mandrake is:
2. Open the file `knemod\interfaceicon.cpp' and go to line 257.
Change the line from
- process << "kcmshell" << "kcm_knemo";
+ process << "tdecmshell" << "kcm_knemo";
to
- process << "kcmshell" << "/usr/share/applnk/Settings/Network/kcm_knemo";
+ process << "tdecmshell" << "/usr/share/applnk/Settings/Network/kcm_knemo";
Do the same in line 64 of `knemod\knemodaemon.cpp'
@@ -33,7 +33,7 @@ IMPORTANT: If you already installed and started KNemo before doing the
above changes it may be neccessary to open the configuration dialog
manually by running
- kcmshell /usr/share/applnk/Settings/Network/kcm_knemo
+ tdecmshell /usr/share/applnk/Settings/Network/kcm_knemo
on the console after you have installed KNemo with the above solution,
because KNemo won't display any icons in the system traybar until it
diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index 3d503da..357bbd7 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -34,12 +34,12 @@
#include <tqdatastream.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <knuminput.h>
#include <dcopclient.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kdesktopfile.h>
#include <kcolorbutton.h>
#include <kinputdialog.h>
diff --git a/src/kcm/kcm_knemo.desktop b/src/kcm/kcm_knemo.desktop
index 046e7dd..b07382c 100644
--- a/src/kcm/kcm_knemo.desktop
+++ b/src/kcm/kcm_knemo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
-Exec=kcmshell kcm_knemo
+Exec=tdecmshell kcm_knemo
Icon=knemo
X-TDE-ModuleType=Library
diff --git a/src/knemod/backends/nettoolsbackend.cpp b/src/knemod/backends/nettoolsbackend.cpp
index 2b36c69..014e299 100644
--- a/src/knemod/backends/nettoolsbackend.cpp
+++ b/src/knemod/backends/nettoolsbackend.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kprocess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include "nettoolsbackend.h"
diff --git a/src/knemod/backends/sysbackend.cpp b/src/knemod/backends/sysbackend.cpp
index 60eac96..e242d98 100644
--- a/src/knemod/backends/sysbackend.cpp
+++ b/src/knemod/backends/sysbackend.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kprocess.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include "sysbackend.h"
diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp
index 0c081a6..755f3b6 100644
--- a/src/knemod/interfaceicon.cpp
+++ b/src/knemod/interfaceicon.cpp
@@ -286,7 +286,7 @@ void InterfaceIcon::showConfigDialog()
KNemoDaemon::sSelectedInterface = mInterface->getName();
TDEProcess process;
- process << "kcmshell" << "kcm_knemo";
+ process << "tdecmshell" << "kcm_knemo";
process.start( TDEProcess::DontCare );
}
diff --git a/src/knemod/interfacestatisticsdialog.cpp b/src/knemod/interfacestatisticsdialog.cpp
index 27e38c7..489f158 100644
--- a/src/knemod/interfacestatisticsdialog.cpp
+++ b/src/knemod/interfacestatisticsdialog.cpp
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
#include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <kiconloader.h>
#include <kcalendarsystem.h>
diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp
index f0d132a..f4b9c0b 100644
--- a/src/knemod/interfacestatusdialog.cpp
+++ b/src/knemod/interfacestatusdialog.cpp
@@ -25,12 +25,12 @@
#include <tqtabwidget.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kactivelabel.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include "data.h"
#include "interface.h"
diff --git a/src/knemod/interfacetooltip.cpp b/src/knemod/interfacetooltip.cpp
index 6c84877..dd4c32b 100644
--- a/src/knemod/interfacetooltip.cpp
+++ b/src/knemod/interfacetooltip.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include "data.h"
#include "interface.h"
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index fba66c1..a48aa17 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kprocess.h>
#include <kinstance.h>
#include <kmessagebox.h>
diff --git a/src/knemod/signalplotter.cpp b/src/knemod/signalplotter.cpp
index 566c7f0..51a5b22 100644
--- a/src/knemod/signalplotter.cpp
+++ b/src/knemod/signalplotter.cpp
@@ -29,7 +29,7 @@
#include <tqpixmap.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "signalplotter.h"