diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kompare/libdialogpages | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdialogpages')
| -rw-r--r-- | kompare/libdialogpages/diffsettings.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/filespage.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/filessettings.cpp | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/pagebase.h | 2 | ||||
| -rw-r--r-- | kompare/libdialogpages/viewsettings.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp index 26239d78..582fb106 100644 --- a/kompare/libdialogpages/diffsettings.cpp +++ b/kompare/libdialogpages/diffsettings.cpp @@ -15,7 +15,7 @@ ** ****************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include "diffsettings.h" diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 9fa58a35..f1981c9a 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <klocale.h> diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp index 966d5fcd..3808edb0 100644 --- a/kompare/libdialogpages/filessettings.cpp +++ b/kompare/libdialogpages/filessettings.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "filessettings.h" diff --git a/kompare/libdialogpages/pagebase.h b/kompare/libdialogpages/pagebase.h index 1521db96..564e2f90 100644 --- a/kompare/libdialogpages/pagebase.h +++ b/kompare/libdialogpages/pagebase.h @@ -23,7 +23,7 @@ #include <tqsize.h> #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktabctl.h> #include "kompare.h" diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp index 8bbd8895..902f4091 100644 --- a/kompare/libdialogpages/viewsettings.cpp +++ b/kompare/libdialogpages/viewsettings.cpp @@ -19,7 +19,7 @@ #include <tqfont.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include "viewsettings.h" |