From 39de4d2189f86e632184f4390fef1d8b6dd88027 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:45:31 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- configdialog/kbfxconfigapp.h | 6 +++--- configdialog/kbfxconfigdlgbutton.ui | 2 +- configdialog/kbfxconfigdlgfonts-old.ui | 2 +- configdialog/kbfxconfigdlglayout.ui | 2 +- configdialog/kbfxconfigdlgmain.ui | 2 +- configdialog/kbfxconfigdlgplugins.ui | 2 +- configdialog/kbfxconfigdlgthemes.ui | 2 +- configdialog/main.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'configdialog') diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index ae0194c..506dc8e 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -52,14 +52,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui index 1673f35..366d414 100644 --- a/configdialog/kbfxconfigdlgbutton.ui +++ b/configdialog/kbfxconfigdlgbutton.ui @@ -1229,7 +1229,7 @@ KbfxResizeKicker - kmessagebox.h + tdemessagebox.h kbfxpushbutton.h tqstring.h tqpainter.h diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index 95b1a0d..f969308 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -1136,7 +1136,7 @@ kstandarddirs.h tdefiledialog.h tdeio/netaccess.h - kmessagebox.h + tdemessagebox.h tdeconfig.h kbfxfontchooser.h kbfxconfigdlgfonts-old.ui.h diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index 7c0060f..5f04159 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -1052,7 +1052,7 @@ kdebug.h tqstringlist.h kstandarddirs.h - kmessagebox.h + tdemessagebox.h tdefiledialog.h kbfxconfigdlglayout.ui.h diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui index 78e7c52..6c9a1eb 100644 --- a/configdialog/kbfxconfigdlgmain.ui +++ b/configdialog/kbfxconfigdlgmain.ui @@ -644,7 +644,7 @@ tqpainter.h tqimage.h tqpixmap.h - kmessagebox.h + tdemessagebox.h kbfxconfigdlgmain.ui.h diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui index d262944..1bd2038 100644 --- a/configdialog/kbfxconfigdlgplugins.ui +++ b/configdialog/kbfxconfigdlgplugins.ui @@ -361,7 +361,7 @@ kdebug.h tqstringlist.h kstandarddirs.h - kmessagebox.h + tdemessagebox.h tqlistbox.h kbfxplasmapluginloader.h kbfxconfigdlgplugins.ui.h diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 25d7499..660c80b 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -982,7 +982,7 @@ kbfxconfig.h kdebug.h tqstringlist.h - kmessagebox.h + tdemessagebox.h tdeio/netaccess.h tdefiledialog.h ktar.h diff --git a/configdialog/main.cpp b/configdialog/main.cpp index 0f5842b..f980748 100644 --- a/configdialog/main.cpp +++ b/configdialog/main.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include "kbfxconfigapp.h" -- cgit v1.2.1