Fix KDE includes problem

gui/instancemodel.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include "kcategorizedsortfilterproxymodel.h"
+#include "categorizedsortfilterproxymodel.h"
 #include "lists/InstanceList.h"
 #include <QIcon>
 

gui/mainwindow.cpp

@@ -45,8 +45,8 @@
 #include "gui/legacymodeditdialog.h"
 #include "gui/instancesettings.h"
 
-#include "kcategorizedview.h"
+#include "categorizedview.h"
-#include "kcategorydrawer.h"
+#include "categorydrawer.h"
 
 #include "lists/InstanceList.h"
 #include "AppSettings.h"
@@ -84,12 +84,6 @@ MainWindow::MainWindow ( QWidget *parent ) :
 	// Create the widget
 	view = new KCategorizedView ( ui->centralWidget );
 	drawer = new KCategoryDrawer ( view );
-	/*
-	QPalette pal = view->palette();
-	pal.setBrush(QPalette::Base, QBrush(QPixmap(QString::fromUtf8(":/backgrounds/kitteh"))));
-	view->setPalette(pal);
-	*/
-	
 	view->setStyleSheet(
 		"QListView\
 		{\
@@ -137,13 +131,8 @@ MainWindow::MainWindow ( QWidget *parent ) :
     connect(view, SIGNAL(clicked(const QModelIndex &)),
         this, SLOT(instanceChanged(const QModelIndex &)));
 	
-	// Load the instances.
+	// Load the instances. FIXME: this is not the place I'd say.
 	instList.loadList();
-	// just a test
-	/*
-	instList.at(0)->setGroup("TEST GROUP");
-	instList.at(0)->setName("TEST ITEM");
-	*/
 	
 	//FIXME: WTF
 	if (!MinecraftVersionList::getMainList().isLoaded())

libgroupview/CMakeLists.txt

@@ -13,19 +13,19 @@ SET(LIBGROUPVIEW_HEADERS
 include/libgroupview_config.h
 
 # Public headers
-include/kcategorizedsortfilterproxymodel.h
+include/categorizedsortfilterproxymodel.h
-include/kcategorizedview.h
+include/categorizedview.h
-include/kcategorydrawer.h
+include/categorydrawer.h
 
 # Private headers
-src/kcategorizedsortfilterproxymodel_p.h
+src/categorizedsortfilterproxymodel_p.h
-src/kcategorizedview_p.h
+src/categorizedview_p.h
 )
 
 SET(LIBGROUPVIEW_SOURCES
-src/kcategorizedsortfilterproxymodel.cpp
+src/categorizedsortfilterproxymodel.cpp
-src/kcategorizedview.cpp
+src/categorizedview.cpp
-src/kcategorydrawer.cpp
+src/categorydrawer.cpp
 )
 
 # Set the include dir path.

libgroupview/include/categorizedsortfilterproxymodel.h

@@ -24,7 +24,6 @@
 
 #include <QSortFilterProxyModel>
 
-//#include <kdeui_export.h>
 #include <libgroupview_config.h>
 
 class QItemSelection;

libgroupview/include/categorizedview.h

@@ -23,7 +23,6 @@
 
 #include <QListView>
 
-//#include <kdeui_export.h>
 #include <libgroupview_config.h>
 
 class KCategoryDrawer;

libgroupview/src/categorizedsortfilterproxymodel.cpp

@@ -19,8 +19,8 @@
   * Boston, MA 02110-1301, USA.
   */
 
-#include "kcategorizedsortfilterproxymodel.h"
+#include "categorizedsortfilterproxymodel.h"
-#include "kcategorizedsortfilterproxymodel_p.h"
+#include "categorizedsortfilterproxymodel_p.h"
 
 #include <limits.h>
 

libgroupview/src/categorizedview.cpp

@@ -29,8 +29,8 @@
   * design.
   */
 
-#include "kcategorizedview.h"
+#include "categorizedview.h"
-#include "kcategorizedview_p.h"
+#include "categorizedview_p.h"
 
 #include <math.h> // trunc on C99 compliant systems
 //#include <kdefakes.h> // trunc for not C99 compliant systems
@@ -39,8 +39,8 @@
 #include <QScrollBar>
 #include <QPaintEvent>
 
-#include "kcategorydrawer.h"
+#include "categorydrawer.h"
-#include "kcategorizedsortfilterproxymodel.h"
+#include "categorizedsortfilterproxymodel.h"
 
 //BEGIN: Private part
 
@@ -1710,4 +1710,4 @@ void KCategorizedView::slotCollapseOrExpandClicked ( QModelIndex idx )
 }
 
 
-#include "kcategorizedview.moc"
+#include "categorizedview.moc"

libgroupview/src/categorydrawer.cpp

@@ -18,14 +18,14 @@
   * Boston, MA 02110-1301, USA.
   */
 
-#include "kcategorydrawer.h"
+#include "categorydrawer.h"
 
 #include <QPainter>
 #include <QStyleOption>
 #include <QApplication>
 
-#include <kcategorizedview.h>
+#include <categorizedview.h>
-#include <kcategorizedsortfilterproxymodel.h>
+#include <categorizedsortfilterproxymodel.h>
 
 #define HORIZONTAL_HINT 3
 
@@ -228,4 +228,4 @@ void KCategoryDrawer::mouseLeft(const QModelIndex&, const QRect&)
 {
 }
 
-#include "kcategorydrawer.moc"
+#include "categorydrawer.moc"