From 094daabeade28ad530b479e2e9ad6571756d641f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:09:02 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- src/abakuscommon.h | 4 ++-- src/abakuslistview.cpp | 2 +- src/abakuslistview.h | 2 +- src/mainwindow.cpp | 8 ++++---- src/mainwindow.h | 2 +- src/resultlistview.cpp | 2 +- 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 #include #include -#include -#include +#include +#include #include #include 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 -#include +#include #include #include 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 +#include #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 +#include #include -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include 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 +#include #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 -#include +#include #include #include 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 +#include #include "numerictypes.h" class TDEPopupMenu;