diff options
author | Timothy Pearson <[email protected]> | 2013-01-27 01:06:46 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-27 01:06:46 -0600 |
commit | ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8 (patch) | |
tree | ac4650a642d502c458d0b654c8b731739ce601dc /klinkstatus | |
parent | a32b928478b59d4fa8b8495bbad6864476c129b1 (diff) | |
download | tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.tar.gz tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus')
-rw-r--r-- | klinkstatus/klinkstatus.tdevelop | 4 | ||||
-rw-r--r-- | klinkstatus/src/cfg/klsconfig.kcfgc | 2 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkchecker.cpp | 10 | ||||
-rw-r--r-- | klinkstatus/src/engine/linkchecker.h | 2 | ||||
-rw-r--r-- | klinkstatus/src/klinkstatus.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/klinkstatus_part.cpp | 4 | ||||
-rw-r--r-- | klinkstatus/src/ui/klshistorycombo.cpp | 2 | ||||
-rw-r--r-- | klinkstatus/src/ui/sessionwidget.cpp | 6 |
8 files changed, 17 insertions, 17 deletions
diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop index 1a58961e..2caa649b 100644 --- a/klinkstatus/klinkstatus.tdevelop +++ b/klinkstatus/klinkstatus.tdevelop @@ -57,12 +57,12 @@ <cflags/> <f77flags/> <envvars> - <envvar value="kfilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" /> + <envvar value="tdefilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" /> </envvars> </debug> <default> <envvars> - <envvar value="kfilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" /> + <envvar value="tdefilereplace kommander kimagemapeditor kxsldbg quanta lib" name="DO_NOT_COMPILE" /> </envvars> <configargs>--enable-debug=full</configargs> <builddir></builddir> diff --git a/klinkstatus/src/cfg/klsconfig.kcfgc b/klinkstatus/src/cfg/klsconfig.kcfgc index 089abab7..10adf128 100644 --- a/klinkstatus/src/cfg/klsconfig.kcfgc +++ b/klinkstatus/src/cfg/klsconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=klinkstatus.kcfg #IncludeFiles=defines.h ClassName=KLSConfig diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 47a45ca6..13700c4e 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -27,11 +27,11 @@ #include <tqtextcodec.h> #include <tqcstring.h> -#include <kio/netaccess.h> -#include <kio/global.h> -#include <kio/job.h> -#include <kio/scheduler.h> -#include <kio/slave.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/job.h> +#include <tdeio/scheduler.h> +#include <tdeio/slave.h> #include <kmimetype.h> #include <kapplication.h> #include <klocale.h> diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index a28d66bb..93b9268c 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -24,7 +24,7 @@ #include <tqthread.h> #include <tqstring.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class KHTMLPart; #include "../parser/http.h" diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 2efde62e..8309cb19 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -21,8 +21,8 @@ #include "klinkstatus.h" #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> #include <kaction.h> diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 78c72716..bf56dbd3 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -23,13 +23,13 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/genericfactory.h> #include <tdeparts/factory.h> #include <kstandarddirs.h> #include <kaboutapplication.h> #include <kbugreport.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kglobalsettings.h> #include <kshortcut.h> #include <kaccel.h> diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index c29ae53d..13c8a16d 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -13,7 +13,7 @@ #include "klsconfig.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcompletionbox.h> #include <kdebug.h> #include <kstdaccel.h> diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index e6a96f61..a761499d 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -24,16 +24,16 @@ #include <ksqueezedtextlabel.h> #include <kprogress.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kglobal.h> #include <kpushbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kactionclasses.h> #include <ktempfile.h> #include <ksavefile.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqevent.h> #include <tqlineedit.h> |