diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:09:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:09:02 -0600 |
| commit | 094daabeade28ad530b479e2e9ad6571756d641f (patch) | |
| tree | ec295b6c00cc4b7de02ac21d86bf5175ceb6311a | |
| parent | 6d33c9774c2d9115894db9ad296b91b73b55bc97 (diff) | |
| download | abakus-094daabeade28ad530b479e2e9ad6571756d641f.tar.gz abakus-094daabeade28ad530b479e2e9ad6571756d641f.zip | |
Rename many classes and 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/abakuslistview.h | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | src/mainwindow.h | 2 | ||||
| -rw-r--r-- | src/resultlistview.cpp | 2 | ||||
| -rw-r--r-- | src/resultlistview.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/abakuscommon.h b/src/abakuscommon.h index 8c5d440..3ad954e 100644 --- a/src/abakuscommon.h +++ b/src/abakuscommon.h @@ -8,8 +8,8 @@ #include <kglobal.h> #include <klocale.h> #include <kcombobox.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqlabel.h> #include <tqregexp.h> diff --git a/src/abakuslistview.cpp b/src/abakuslistview.cpp index 5dd52e4..9f09202 100644 --- a/src/abakuslistview.cpp +++ b/src/abakuslistview.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tqdragobject.h> diff --git a/src/abakuslistview.h b/src/abakuslistview.h index 0985879..708ff31 100644 --- a/src/abakuslistview.h +++ b/src/abakuslistview.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <klistview.h> +#include <tdelistview.h> #include "numerictypes.h" diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 2ad704c..f719170 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -19,16 +19,16 @@ #include "mainwindow.h" #include "abakuscommon.h" -#include <kaccel.h> +#include <tdeaccel.h> #include <kmenubar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kdebug.h> #include <tdeconfig.h> #include <kglobal.h> #include <tdeconfigbase.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kinputdialog.h> #include <tqlayout.h> diff --git a/src/mainwindow.h b/src/mainwindow.h index 02a4e7f..9b1e8a5 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "numerictypes.h" diff --git a/src/resultlistview.cpp b/src/resultlistview.cpp index ae6f0d2..74ac2c3 100644 --- a/src/resultlistview.cpp +++ b/src/resultlistview.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqclipboard.h> diff --git a/src/resultlistview.h b/src/resultlistview.h index b329bd6..c8ef15e 100644 --- a/src/resultlistview.h +++ b/src/resultlistview.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <klistview.h> +#include <tdelistview.h> #include "numerictypes.h" class TDEPopupMenu; |