diff options
| -rw-r--r-- | gui/instancemodel.h | 2 | ||||
| -rw-r--r-- | gui/mainwindow.cpp | 17 | ||||
| -rw-r--r-- | libgroupview/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | libgroupview/include/categorizedsortfilterproxymodel.h (renamed from libgroupview/include/kcategorizedsortfilterproxymodel.h) | 1 | ||||
| -rw-r--r-- | libgroupview/include/categorizedview.h (renamed from libgroupview/include/kcategorizedview.h) | 1 | ||||
| -rw-r--r-- | libgroupview/include/categorydrawer.h (renamed from libgroupview/include/kcategorydrawer.h) | 0 | ||||
| -rw-r--r-- | libgroupview/src/categorizedsortfilterproxymodel.cpp (renamed from libgroupview/src/kcategorizedsortfilterproxymodel.cpp) | 4 | ||||
| -rw-r--r-- | libgroupview/src/categorizedsortfilterproxymodel_p.h (renamed from libgroupview/src/kcategorizedsortfilterproxymodel_p.h) | 0 | ||||
| -rw-r--r-- | libgroupview/src/categorizedview.cpp (renamed from libgroupview/src/kcategorizedview.cpp) | 10 | ||||
| -rw-r--r-- | libgroupview/src/categorizedview_p.h (renamed from libgroupview/src/kcategorizedview_p.h) | 0 | ||||
| -rw-r--r-- | libgroupview/src/categorydrawer.cpp (renamed from libgroupview/src/kcategorydrawer.cpp) | 8 |
11 files changed, 23 insertions, 36 deletions
diff --git a/gui/instancemodel.h b/gui/instancemodel.h index 3938da45..fe05744f 100644 --- a/gui/instancemodel.h +++ b/gui/instancemodel.h @@ -1,7 +1,7 @@ #pragma once #include <QAbstractListModel> -#include "kcategorizedsortfilterproxymodel.h" +#include "categorizedsortfilterproxymodel.h" #include "lists/InstanceList.h" #include <QIcon> diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index c4e8dc03..d3dee254 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -45,8 +45,8 @@ #include "gui/legacymodeditdialog.h" #include "gui/instancesettings.h" -#include "kcategorizedview.h" -#include "kcategorydrawer.h" +#include "categorizedview.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()) diff --git a/libgroupview/CMakeLists.txt b/libgroupview/CMakeLists.txt index c53988a0..d60d914a 100644 --- a/libgroupview/CMakeLists.txt +++ b/libgroupview/CMakeLists.txt @@ -13,19 +13,19 @@ SET(LIBGROUPVIEW_HEADERS include/libgroupview_config.h # Public headers -include/kcategorizedsortfilterproxymodel.h -include/kcategorizedview.h -include/kcategorydrawer.h +include/categorizedsortfilterproxymodel.h +include/categorizedview.h +include/categorydrawer.h # Private headers -src/kcategorizedsortfilterproxymodel_p.h -src/kcategorizedview_p.h +src/categorizedsortfilterproxymodel_p.h +src/categorizedview_p.h ) SET(LIBGROUPVIEW_SOURCES -src/kcategorizedsortfilterproxymodel.cpp -src/kcategorizedview.cpp -src/kcategorydrawer.cpp +src/categorizedsortfilterproxymodel.cpp +src/categorizedview.cpp +src/categorydrawer.cpp ) # Set the include dir path. diff --git a/libgroupview/include/kcategorizedsortfilterproxymodel.h b/libgroupview/include/categorizedsortfilterproxymodel.h index df1be736..1ef39fc2 100644 --- a/libgroupview/include/kcategorizedsortfilterproxymodel.h +++ b/libgroupview/include/categorizedsortfilterproxymodel.h @@ -24,7 +24,6 @@ #include <QSortFilterProxyModel> -//#include <kdeui_export.h> #include <libgroupview_config.h> class QItemSelection; diff --git a/libgroupview/include/kcategorizedview.h b/libgroupview/include/categorizedview.h index e0ac31fd..243ccf15 100644 --- a/libgroupview/include/kcategorizedview.h +++ b/libgroupview/include/categorizedview.h @@ -23,7 +23,6 @@ #include <QListView> -//#include <kdeui_export.h> #include <libgroupview_config.h> class KCategoryDrawer; diff --git a/libgroupview/include/kcategorydrawer.h b/libgroupview/include/categorydrawer.h index aa561f0d..aa561f0d 100644 --- a/libgroupview/include/kcategorydrawer.h +++ b/libgroupview/include/categorydrawer.h diff --git a/libgroupview/src/kcategorizedsortfilterproxymodel.cpp b/libgroupview/src/categorizedsortfilterproxymodel.cpp index 46a845e0..09da9dd3 100644 --- a/libgroupview/src/kcategorizedsortfilterproxymodel.cpp +++ b/libgroupview/src/categorizedsortfilterproxymodel.cpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#include "kcategorizedsortfilterproxymodel.h" -#include "kcategorizedsortfilterproxymodel_p.h" +#include "categorizedsortfilterproxymodel.h" +#include "categorizedsortfilterproxymodel_p.h" #include <limits.h> diff --git a/libgroupview/src/kcategorizedsortfilterproxymodel_p.h b/libgroupview/src/categorizedsortfilterproxymodel_p.h index d7e7c9a0..d7e7c9a0 100644 --- a/libgroupview/src/kcategorizedsortfilterproxymodel_p.h +++ b/libgroupview/src/categorizedsortfilterproxymodel_p.h diff --git a/libgroupview/src/kcategorizedview.cpp b/libgroupview/src/categorizedview.cpp index 4da4271f..f4449949 100644 --- a/libgroupview/src/kcategorizedview.cpp +++ b/libgroupview/src/categorizedview.cpp @@ -29,8 +29,8 @@ * design. */ -#include "kcategorizedview.h" -#include "kcategorizedview_p.h" +#include "categorizedview.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 "kcategorizedsortfilterproxymodel.h" +#include "categorydrawer.h" +#include "categorizedsortfilterproxymodel.h" //BEGIN: Private part @@ -1710,4 +1710,4 @@ void KCategorizedView::slotCollapseOrExpandClicked ( QModelIndex idx ) } -#include "kcategorizedview.moc" +#include "categorizedview.moc" diff --git a/libgroupview/src/kcategorizedview_p.h b/libgroupview/src/categorizedview_p.h index 13809312..13809312 100644 --- a/libgroupview/src/kcategorizedview_p.h +++ b/libgroupview/src/categorizedview_p.h diff --git a/libgroupview/src/kcategorydrawer.cpp b/libgroupview/src/categorydrawer.cpp index 951c1eb2..04903206 100644 --- a/libgroupview/src/kcategorydrawer.cpp +++ b/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 <kcategorizedsortfilterproxymodel.h> +#include <categorizedview.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" |