diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:47 -0600 |
| commit | e9bf6fab2dcfd9d3bfe9a874537909aee0256675 (patch) | |
| tree | c3e0ffe2eb0c86459eaa412870797b5dbdd86035 /src | |
| parent | 00d0a95b8c6deb786c62c9520f4716942788d02a (diff) | |
| download | kdiff3-e9bf6fab2dcfd9d3bfe9a874537909aee0256675.tar.gz kdiff3-e9bf6fab2dcfd9d3bfe9a874537909aee0256675.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/difftextwindow.cpp | 2 | ||||
| -rw-r--r-- | src/directorymergewindow.cpp | 2 | ||||
| -rw-r--r-- | src/fileaccess.cpp | 2 | ||||
| -rw-r--r-- | src/fileaccess.h | 4 | ||||
| -rw-r--r-- | src/kdiff3.cpp | 4 | ||||
| -rw-r--r-- | src/kdiff3_part.cpp | 2 | ||||
| -rw-r--r-- | src/kdiff3_shell.cpp | 4 | ||||
| -rw-r--r-- | src/kreplacements/tdeconfig.h (renamed from src/kreplacements/kconfig.h) | 0 | ||||
| -rw-r--r-- | src/kreplacements/tdefiledialog.h (renamed from src/kreplacements/kfiledialog.h) | 0 | ||||
| -rw-r--r-- | src/optiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/smalldialogs.cpp | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index e8124fa..727579d 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -35,7 +35,7 @@ #include <cstdlib> #include <tqdragobject.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> class DiffTextWindowData { diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index b4f6b20..c56f69b 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -35,7 +35,7 @@ #include <tqtextedit.h> #include <tqprogressdialog.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klocale.h> #include <iostream> diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index eaf1732..44f3037 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -11,7 +11,7 @@ #include "fileaccess.h" #include <iostream> #include <cstdlib> -#include <kio/global.h> +#include <tdeio/global.h> #include <kmessagebox.h> #include "optiondialog.h" #include <tqlayout.h> diff --git a/src/fileaccess.h b/src/fileaccess.h index 1103f46..9338a85 100644 --- a/src/fileaccess.h +++ b/src/fileaccess.h @@ -14,8 +14,8 @@ #include <tqdialog.h> #include <tqfileinfo.h> #include <kprogress.h> -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <kurldrag.h> #include <list> #include <tqstring.h> diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 377257b..8d0839a 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -37,11 +37,11 @@ // include files for KDE #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <kstatusbar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <kcmdlineargs.h> #include <kprinter.h> diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 78bd226..6e7ce45 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -22,7 +22,7 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index a8a2a84..287a9b3 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -21,8 +21,8 @@ #include "kdiff3.h" #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> diff --git a/src/kreplacements/kconfig.h b/src/kreplacements/tdeconfig.h index 53443ee..53443ee 100644 --- a/src/kreplacements/kconfig.h +++ b/src/kreplacements/tdeconfig.h diff --git a/src/kreplacements/kfiledialog.h b/src/kreplacements/tdefiledialog.h index 53443ee..53443ee 100644 --- a/src/kreplacements/kfiledialog.h +++ b/src/kreplacements/tdefiledialog.h diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index a67c665..be84a9b 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -38,7 +38,7 @@ #include <kfontdialog.h> // For KFontChooser #include <kiconloader.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kmainwindow.h> //For ktoolbar.h diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp index b19b7c2..f0d715b 100644 --- a/src/smalldialogs.cpp +++ b/src/smalldialogs.cpp @@ -34,7 +34,7 @@ #include <tqcursor.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> // OpenDialog ************************************************************** |