diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:06:29 -0600 |
| commit | c0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch) | |
| tree | 2ba50375d78b077b266b224e4413150ef3e60a15 /parts/fileselector | |
| parent | 33d15e862e09fbcbb05e209f832414bd8a01291e (diff) | |
| download | tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'parts/fileselector')
| -rw-r--r-- | parts/fileselector/fileselector_part.cpp | 4 | ||||
| -rw-r--r-- | parts/fileselector/fileselector_part.h | 2 | ||||
| -rw-r--r-- | parts/fileselector/fileselector_widget.cpp | 6 | ||||
| -rw-r--r-- | parts/fileselector/fileselector_widget.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index cbe1cd06..82587ac0 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -11,8 +11,8 @@ #include <kapplication.h> #include <kstandarddirs.h> #include <ktextbrowser.h> -#include <kconfig.h> -#include <kfileitem.h> +#include <tdeconfig.h> +#include <tdefileitem.h> #include <kdevgenericfactory.h> #include <kdiroperator.h> #include <kdialogbase.h> diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index 29e535dc..c4cae6e1 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -4,7 +4,7 @@ #include <kdevplugin.h> #include <kdialogbase.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqguardedptr.h> diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index cfa72b6c..284b24da 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -56,7 +56,7 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kprotocolinfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcombobox.h> #include <kaction.h> @@ -65,13 +65,13 @@ #include <tqtoolbar.h> #include <kpopupmenu.h> #include <kdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdebug.h> //END Includes -// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) +// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) static void silenceTQToolBar(TQtMsgType, const char *) {} diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 17c533ee..7c80a6de 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -23,7 +23,7 @@ #define FILESELECTOR_WIDGET_H #include <tqwidget.h> -#include <kfile.h> +#include <tdefile.h> #include <kurl.h> #include <ktoolbar.h> #include <tqframe.h> |