diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:50 -0600 |
| commit | d04d2847e11f0eb9218c877ad9dc2a51f7c0d4ec (patch) | |
| tree | 2d6eac180c9446e62e62f94d5003f08752864e8f /kdirstat | |
| parent | 6cddb500f2ba134e6dbc04f096c87d523fee6e0d (diff) | |
| download | kdirstat-d04d2847e11f0eb9218c877ad9dc2a51f7c0d4ec.tar.gz kdirstat-d04d2847e11f0eb9218c877ad9dc2a51f7c0d4ec.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdirstat')
| -rw-r--r-- | kdirstat/Makefile.am | 2 | ||||
| -rw-r--r-- | kdirstat/kactivitytracker.cpp | 2 | ||||
| -rw-r--r-- | kdirstat/kdirstatapp.cpp | 4 | ||||
| -rw-r--r-- | kdirstat/kdirtree.cpp | 8 | ||||
| -rw-r--r-- | kdirstat/kdirtree.h | 4 | ||||
| -rw-r--r-- | kdirstat/ktreemapview.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kdirstat/Makefile.am b/kdirstat/Makefile.am index 925aeb5..219977a 100644 --- a/kdirstat/Makefile.am +++ b/kdirstat/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST = \ hi16-app-kdirstat.png -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kdirstat.upd update_SCRIPTS = fix_move_to_trash_bin.pl diff --git a/kdirstat/kactivitytracker.cpp b/kdirstat/kactivitytracker.cpp index 0e98f9e..fbd5bc2 100644 --- a/kdirstat/kactivitytracker.cpp +++ b/kdirstat/kactivitytracker.cpp @@ -11,7 +11,7 @@ #include <kapp.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kactivitytracker.h" diff --git a/kdirstat/kdirstatapp.cpp b/kdirstat/kdirstatapp.cpp index 1c07e2e..33c4d73 100644 --- a/kdirstat/kdirstatapp.cpp +++ b/kdirstat/kdirstatapp.cpp @@ -17,8 +17,8 @@ #include <kaccel.h> #include <kaction.h> #include <kapp.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <kmenubar.h> diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp index 47c609d..82f7df6 100644 --- a/kdirstat/kdirtree.cpp +++ b/kdirstat/kdirtree.cpp @@ -14,13 +14,13 @@ #include <tqtimer.h> #include <kapp.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kdirtree.h" #include "kdirtreeiterators.h" #include "kdirtreeview.h" #include "kdirsaver.h" -#include "kio/job.h" -#include "kio/netaccess.h" +#include "tdeio/job.h" +#include "tdeio/netaccess.h" #define HAVE_STUPID_COMPILER 0 @@ -1556,7 +1556,7 @@ KDirStat::fixedUrl( const TQString & dirtyUrl ) } - // Strip off the rightmost slash - some kioslaves (e.g. 'tar') can't handle that. + // Strip off the rightmost slash - some tdeioslaves (e.g. 'tar') can't handle that. TQString path = url.path(); diff --git a/kdirstat/kdirtree.h b/kdirstat/kdirtree.h index abadd7e..ca1eda4 100644 --- a/kdirstat/kdirtree.h +++ b/kdirstat/kdirtree.h @@ -21,8 +21,8 @@ #include <dirent.h> #include <tqptrqueue.h> #include <kdebug.h> -#include <kfileitem.h> -#include <kio/jobclasses.h> +#include <tdefileitem.h> +#include <tdeio/jobclasses.h> #ifndef NOT_USED # define NOT_USED(PARAM) ( (void) (PARAM) ) diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp index 6509738..473422a 100644 --- a/kdirstat/ktreemapview.cpp +++ b/kdirstat/ktreemapview.cpp @@ -14,7 +14,7 @@ #include <tqregexp.h> #include <kapp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> |