diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:02 -0600 |
| commit | 533c3127e1498430584d456034fe2558101d99cb (patch) | |
| tree | c65bb79b9fe98e34fbdca81ae843289fd47d14f0 /src | |
| parent | 821dbb340f650965ff257f4dec7b31ed7458c6e1 (diff) | |
| download | kdiff3-533c3127e1498430584d456034fe2558101d99cb.tar.gz kdiff3-533c3127e1498430584d456034fe2558101d99cb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/directorymergewindow.cpp | 4 | ||||
| -rw-r--r-- | src/kdiff3.h | 6 | ||||
| -rw-r--r-- | src/kdiff3_part.cpp | 2 | ||||
| -rw-r--r-- | src/kdiff3_shell.cpp | 2 | ||||
| -rw-r--r-- | src/optiondialog.cpp | 4 | ||||
| -rw-r--r-- | src/pdiff.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index ac8d3ee..c020d0e 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -24,8 +24,8 @@ #include <tqapplication.h> #include <tqpixmap.h> #include <tqimage.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqregexp.h> #include <tqmessagebox.h> #include <tqlayout.h> diff --git a/src/kdiff3.h b/src/kdiff3.h index 55d0a82..ff0ed8c 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -31,9 +31,9 @@ // include files for KDE #include <kapplication.h> -#include <kmainwindow.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <kurl.h> #include <tdeparts/mainwindow.h> diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index a97dbe8..f43381b 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -20,7 +20,7 @@ #include "kdiff3_part.h" #include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index 287a9b3..8bcc460 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -27,7 +27,7 @@ #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index f4448fa..e463b38 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -35,12 +35,12 @@ #include <kapplication.h> #include <kcolorbtn.h> -#include <kfontdialog.h> // For TDEFontChooser +#include <tdefontdialog.h> // For TDEFontChooser #include <kiconloader.h> #include <klocale.h> #include <tdeconfig.h> #include <kmessagebox.h> -#include <kmainwindow.h> //For ktoolbar.h +#include <tdemainwindow.h> //For tdetoolbar.h //#include <kkeydialog.h> #include <map> diff --git a/src/pdiff.cpp b/src/pdiff.cpp index 0a10b00..54f3ffb 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kstatusbar.h> #include <kkeydialog.h> |