diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /atlantikdesigner/designer | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'atlantikdesigner/designer')
| -rw-r--r-- | atlantikdesigner/designer/boardinfo.cpp | 2 | ||||
| -rw-r--r-- | atlantikdesigner/designer/designer.cpp | 6 | ||||
| -rw-r--r-- | atlantikdesigner/designer/editor.cpp | 4 | ||||
| -rw-r--r-- | atlantikdesigner/designer/group.cpp | 4 | ||||
| -rw-r--r-- | atlantikdesigner/designer/main.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index 56b561a..b29106c 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -7,7 +7,7 @@ #include <kcolorbutton.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> #include <kpushbutton.h> diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 05297ca..eaab1e5 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -17,12 +17,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstdaction.h> #include <kurl.h> diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 3a61a5e..3301ba6 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -18,8 +18,8 @@ #include <kdialogbase.h> #include <klineeditdlg.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kseparator.h> diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index b284b82..2aca4f4 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -12,8 +12,8 @@ #include <klineedit.h> #include <klineeditdlg.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kseparator.h> diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp index 59b86aa..31ebf27 100644 --- a/atlantikdesigner/designer/main.cpp +++ b/atlantikdesigner/designer/main.cpp @@ -1,6 +1,6 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "designer.h" @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); - TDEApplication kapplication; + TDEApplication tdeapplication; if (tdeapplication.isRestored()) RESTORE(AtlanticDesigner) |