diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:46:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:46:55 -0600 |
| commit | 05ca30417c525eb7b9c3b37a108f8952e392588e (patch) | |
| tree | cec47579241cb65b8f10d1d9c6525648629c7164 /kmymoney2/dialogs/settings | |
| parent | e6f3eb4234a6cb4210a21953f304fa1770421c9f (diff) | |
| download | kmymoney-05ca30417c525eb7b9c3b37a108f8952e392588e.tar.gz kmymoney-05ca30417c525eb7b9c3b37a108f8952e392588e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmymoney2/dialogs/settings')
| -rw-r--r-- | kmymoney2/dialogs/settings/ksettingsgpg.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/dialogs/settings/ksettingshome.cpp | 6 | ||||
| -rw-r--r-- | kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/dialogs/settings/ksettingsplugins.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp index 07b5d18..90e3b06 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp @@ -28,8 +28,8 @@ #include <klineedit.h> #include <keditlistbox.h> #include <kcombobox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp index 8eb85e5..d86b135 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.cpp +++ b/kmymoney2/dialogs/settings/ksettingshome.cpp @@ -25,10 +25,10 @@ #include <tdelistview.h> #include <kpushbutton.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktextedit.h> // ---------------------------------------------------------------------------- diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp index 6afa4f4..a984fd5 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp @@ -25,8 +25,8 @@ // KDE Includes #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kiconloader.h> #include <kguiitem.h> diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 38b1745..0eed4ae 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -25,7 +25,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kpluginselector.h> |