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/diff | |
| 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/diff')
| -rw-r--r-- | parts/diff/diffpart.cpp | 6 | ||||
| -rw-r--r-- | parts/diff/diffwidget.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 2f899828..4d36bd17 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -18,10 +18,10 @@ #include <klocale.h> #include <kdevgenericfactory.h> #include <kaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kprocess.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <tdeparts/part.h> #include <tdetexteditor/editinterface.h> #include <kmessagebox.h> diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 539108e1..298e2083 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -15,21 +15,21 @@ #include <tqcursor.h> #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> #include <kservice.h> #include <ktempfile.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeparts/part.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kdevmainwindow.h> |