diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:16 -0600 |
commit | efced10a26e1ba349406dbe725fd79d7214119f2 (patch) | |
tree | 19826f27a2a1bb9ade37de882a1bc5470aeed48d /yakuake | |
parent | ea478d4f82610d93ff53c50fd576089c620d2904 (diff) | |
download | yakuake-efced10a26e1ba349406dbe725fd79d7214119f2.tar.gz yakuake-efced10a26e1ba349406dbe725fd79d7214119f2.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'yakuake')
-rw-r--r-- | yakuake/src/general_settings.cpp | 2 | ||||
-rw-r--r-- | yakuake/src/image_button.cpp | 2 | ||||
-rw-r--r-- | yakuake/src/main.cpp | 2 | ||||
-rw-r--r-- | yakuake/src/main_window.cpp | 2 | ||||
-rw-r--r-- | yakuake/src/main_window.h | 2 | ||||
-rw-r--r-- | yakuake/src/skin_list_item.cpp | 4 | ||||
-rw-r--r-- | yakuake/src/skin_settings.cpp | 6 | ||||
-rw-r--r-- | yakuake/src/tab_bar.cpp | 2 | ||||
-rw-r--r-- | yakuake/src/tabbed_widget.h | 2 | ||||
-rw-r--r-- | yakuake/src/title_bar.cpp | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/yakuake/src/general_settings.cpp b/yakuake/src/general_settings.cpp index 6ee3315..114ffe1 100644 --- a/yakuake/src/general_settings.cpp +++ b/yakuake/src/general_settings.cpp @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> GeneralSettings::GeneralSettings(TQWidget* parent, const char* name) diff --git a/yakuake/src/image_button.cpp b/yakuake/src/image_button.cpp index ab364fb..67d15e1 100644 --- a/yakuake/src/image_button.cpp +++ b/yakuake/src/image_button.cpp @@ -18,7 +18,7 @@ #include <tqwhatsthis.h> #include <tqtimer.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> ImageButton::ImageButton(TQWidget* parent, const char* name, bool translucency) : TranslucentWidget(parent, name, translucency) diff --git a/yakuake/src/main.cpp b/yakuake/src/main.cpp index f954fde..e28ee58 100644 --- a/yakuake/src/main.cpp +++ b/yakuake/src/main.cpp @@ -13,7 +13,7 @@ #include "main_window.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kuniqueapplication.h> diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp index 79545cf..bee729b 100644 --- a/yakuake/src/main_window.cpp +++ b/yakuake/src/main_window.cpp @@ -24,7 +24,7 @@ #include <tdeaboutapplication.h> #include <tdeabouttde.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfigdialog.h> #include <kiconloader.h> #include <twin.h> diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h index aec7bc6..d0a3151 100644 --- a/yakuake/src/main_window.h +++ b/yakuake/src/main_window.h @@ -31,7 +31,7 @@ #include <twin.h> #include <tdeaction.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kkeydialog.h> #include <tdepopupmenu.h> diff --git a/yakuake/src/skin_list_item.cpp b/yakuake/src/skin_list_item.cpp index 29893cc..2b55301 100644 --- a/yakuake/src/skin_list_item.cpp +++ b/yakuake/src/skin_list_item.cpp @@ -18,8 +18,8 @@ #include <tqpixmap.h> #include <tqpalette.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> SkinListItem::SkinListItem(TDEListView* parent, const TQString& fancy_name, diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp index a644b46..8bbbdca 100644 --- a/yakuake/src/skin_settings.cpp +++ b/yakuake/src/skin_settings.cpp @@ -24,10 +24,10 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeio/global.h> #include <tdeio/job.h> diff --git a/yakuake/src/tab_bar.cpp b/yakuake/src/tab_bar.cpp index ce97423..317243a 100644 --- a/yakuake/src/tab_bar.cpp +++ b/yakuake/src/tab_bar.cpp @@ -18,7 +18,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> diff --git a/yakuake/src/tabbed_widget.h b/yakuake/src/tabbed_widget.h index 722e6b6..f9d6c91 100644 --- a/yakuake/src/tabbed_widget.h +++ b/yakuake/src/tabbed_widget.h @@ -26,7 +26,7 @@ #include <tqvaluelist.h> #include <tqfontmetrics.h> -#include <klocale.h> +#include <tdelocale.h> #include <krootpixmap.h> #include <kinputdialog.h> diff --git a/yakuake/src/title_bar.cpp b/yakuake/src/title_bar.cpp index 0d505e9..e73e4b2 100644 --- a/yakuake/src/title_bar.cpp +++ b/yakuake/src/title_bar.cpp @@ -17,7 +17,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> TitleBar::TitleBar(TQWidget * parent, const char * name, const TQString & skin) : TQWidget(parent, name) |