diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:40 -0600 |
| commit | 4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e (patch) | |
| tree | 8bdb18e6838f1eb1357e22b6e50b2948d33868a6 /kverbos | |
| parent | d5f01dcc48ac3af828089b8810ef30a245e0346b (diff) | |
| download | tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.tar.gz tdeedu-4565bfb4e2e9acc5f67603e3de8720b4cd3c9a7e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kverbos')
| -rw-r--r-- | kverbos/kverbos/kerfassen.cpp | 2 | ||||
| -rw-r--r-- | kverbos/kverbos/kerfassen.h | 2 | ||||
| -rw-r--r-- | kverbos/kverbos/kresult.cpp | 2 | ||||
| -rw-r--r-- | kverbos/kverbos/kstartuplogo.cpp | 2 | ||||
| -rw-r--r-- | kverbos/kverbos/kverbosdoc.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp index 36037670..af5756ef 100644 --- a/kverbos/kverbos/kerfassen.cpp +++ b/kverbos/kverbos/kerfassen.cpp @@ -24,7 +24,7 @@ #include <tqtabwidget.h> //#include <tqvaluelist.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> //#include "verbspanish.h" diff --git a/kverbos/kverbos/kerfassen.h b/kverbos/kverbos/kerfassen.h index b1a3a74f..8e264986 100644 --- a/kverbos/kverbos/kerfassen.h +++ b/kverbos/kverbos/kerfassen.h @@ -18,7 +18,7 @@ #ifndef KERFASSEN_H #define KERFASSEN_H -#include <klocale.h> +#include <tdelocale.h> #include "qerfassen.h" #include "verbspanish.h" diff --git a/kverbos/kverbos/kresult.cpp b/kverbos/kverbos/kresult.cpp index 2eb5b6c1..92a85ecf 100644 --- a/kverbos/kverbos/kresult.cpp +++ b/kverbos/kverbos/kresult.cpp @@ -21,7 +21,7 @@ #include <tqlistview.h> #include <tqvaluestack.h> -#include <klocale.h> +#include <tdelocale.h> KResult::KResult(KVerbosUser* pU, TQWidget* parent, const char* name, bool modal, WFlags fl ) : QResult(parent, name, modal, fl) diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp index 1a376f54..4b95c3f5 100644 --- a/kverbos/kverbos/kstartuplogo.cpp +++ b/kverbos/kverbos/kstartuplogo.cpp @@ -18,7 +18,7 @@ #include "kstartuplogo.h" #include <tdeapplication.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name) : TQWidget(parent,name,WStyle_Customize | WStyle_NoBorder ) diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 05eb4e25..608f6b33 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -24,8 +24,8 @@ #include <tqmessagebox.h> // include files for KDE -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> // application specific includes |