diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:43:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:43:38 -0600 |
| commit | 4b8e72b34773f9e10c2d0f877063bb9dee9b48f7 (patch) | |
| tree | f81144adafb1accbab48e9126795fa051deb9c08 | |
| parent | 0079f31d03ce531c5ad04b1a80f3004673e7af7b (diff) | |
| download | abakus-4b8e72b34773f9e10c2d0f877063bb9dee9b48f7.tar.gz abakus-4b8e72b34773f9e10c2d0f877063bb9dee9b48f7.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | src/abakuscommon.h | 4 | ||||
| -rw-r--r-- | src/abakuslistview.cpp | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | src/numerictypes.cpp | 4 | ||||
| -rw-r--r-- | src/parser.yy | 4 | ||||
| -rw-r--r-- | src/resultlistview.cpp | 2 | ||||
| -rw-r--r-- | src/rpnmuncher.cpp | 2 | ||||
| -rw-r--r-- | src/valuemanager.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/abakuscommon.h b/src/abakuscommon.h index c093446..e58fbae 100644 --- a/src/abakuscommon.h +++ b/src/abakuscommon.h @@ -5,8 +5,8 @@ #include <kdebug.h> #include <kpushbutton.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdepopupmenu.h> #include <tdeaction.h> diff --git a/src/abakuslistview.cpp b/src/abakuslistview.cpp index 9f09202..f97c096 100644 --- a/src/abakuslistview.cpp +++ b/src/abakuslistview.cpp @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kdebug.h> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f719170..418ef16 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -20,13 +20,13 @@ #include "abakuscommon.h" #include <tdeaccel.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdeshortcut.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfigbase.h> #include <tdeactionclasses.h> #include <kinputdialog.h> diff --git a/src/numerictypes.cpp b/src/numerictypes.cpp index 7a80368..d1fe591 100644 --- a/src/numerictypes.cpp +++ b/src/numerictypes.cpp @@ -21,8 +21,8 @@ #include "hmath.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> Abakus::TrigMode Abakus::m_trigMode = Abakus::Degrees; int Abakus::m_prec = -1; diff --git a/src/parser.yy b/src/parser.yy index 3632eae..9ab2c7d 100644 --- a/src/parser.yy +++ b/src/parser.yy @@ -20,8 +20,8 @@ /* Add necessary includes here. */ #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/resultlistview.cpp b/src/resultlistview.cpp index 74ac2c3..86db28f 100644 --- a/src/resultlistview.cpp +++ b/src/resultlistview.cpp @@ -18,7 +18,7 @@ */ #include <kdebug.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqclipboard.h> #include <tqapplication.h> diff --git a/src/rpnmuncher.cpp b/src/rpnmuncher.cpp index 6a64eea..309a819 100644 --- a/src/rpnmuncher.cpp +++ b/src/rpnmuncher.cpp @@ -19,7 +19,7 @@ #include <math.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvaluestack.h> #include <tqregexp.h> diff --git a/src/valuemanager.cpp b/src/valuemanager.cpp index 57b7cd9..4880fdf 100644 --- a/src/valuemanager.cpp +++ b/src/valuemanager.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> |