diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:00:43 -0600 |
commit | 2c4a290ae270924340991931a9e0ca793f8e9443 (patch) | |
tree | 7aa3b953d70dbdd6a5de525cdd7a5f4319ee1dd5 /kdat | |
parent | 567923f30f7c0700cb526f26c20b5577bfe2a802 (diff) | |
download | tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.tar.gz tdeadmin-2c4a290ae270924340991931a9e0ca793f8e9443.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdat')
-rw-r--r-- | kdat/KDatMainWindow.cpp | 2 | ||||
-rw-r--r-- | kdat/LoggerWidget.cpp | 2 | ||||
-rw-r--r-- | kdat/Options.cpp | 2 | ||||
-rw-r--r-- | kdat/OptionsDlgWidget.ui | 2 | ||||
-rw-r--r-- | kdat/VerifyOptDlg.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 37d1715..c3056ef 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -35,7 +35,7 @@ #include <kpopupmenu.h> #include <ktoolbar.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kstringhandler.h> #include <kpushbutton.h> diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp index 6adc0f1..53166ba 100644 --- a/kdat/LoggerWidget.cpp +++ b/kdat/LoggerWidget.cpp @@ -21,7 +21,7 @@ #include <tqmultilineedit.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "LoggerWidget.h" #include <klocale.h> diff --git a/kdat/Options.cpp b/kdat/Options.cpp index e3475f9..ff77c30 100644 --- a/kdat/Options.cpp +++ b/kdat/Options.cpp @@ -17,7 +17,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "Options.h" diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui index c79be05..9a5950a 100644 --- a/kdat/OptionsDlgWidget.ui +++ b/kdat/OptionsDlgWidget.ui @@ -364,7 +364,7 @@ You must still specify the block size.</string> </connections> <includes> <include location="global" impldecl="in implementation">kapplication.h</include> - <include location="global" impldecl="in implementation">kfiledialog.h</include> + <include location="global" impldecl="in implementation">tdefiledialog.h</include> <include location="global" impldecl="in implementation">kmessagebox.h</include> <include location="global" impldecl="in implementation">kglobal.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp index f65d41f..6416277 100644 --- a/kdat/VerifyOptDlg.cpp +++ b/kdat/VerifyOptDlg.cpp @@ -24,7 +24,7 @@ #include <tqlistbox.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kstdguiitem.h> |