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 /vcs/cvsservice | |
| 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 'vcs/cvsservice')
| -rw-r--r-- | vcs/cvsservice/checkoutdialog.cpp | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/cvsoptions.cpp | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/diffwidget.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 07745c5c..17260ab4 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -19,7 +19,7 @@ #include <kurlrequester.h> #include <klocale.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcursor.h> #include <kdebug.h> #include <kapplication.h> diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 723ad9d5..f1b45c30 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -13,7 +13,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "domutil.h" diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index fae85d9d..2261e2be 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/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 "diffwidget.h" |