Author: tgoettlicher
Date: Wed Feb 6 17:08:20 2008
New Revision: 44205
URL: http://svn.opensuse.org/viewcvs/yast?rev=44205&view=rev
Log:
removing kde deps
Modified:
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorizedview.cpp
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorydrawer.cpp
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/main.cpp
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorizedview.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorizedview.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorizedview.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorizedview.cpp Wed Feb 6 17:08:20 2008
@@ -22,13 +22,14 @@
#include "kcategorizedview_p.h"
#include // trunc on C99 compliant systems
-#include // trunc for not C99 compliant systems
+//#include // trunc for not C99 compliant systems
+
#include <QPainter>
#include <QScrollBar>
#include <QPaintEvent>
-#include
+//#include
#include "kcategorydrawer.h"
#include "kcategorizedsortfilterproxymodel.h"
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorydrawer.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorydrawer.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorydrawer.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcategorydrawer.cpp Wed Feb 6 17:08:20 2008
@@ -23,8 +23,8 @@
#include <QPainter>
#include <QStyleOption>
-#include
-#include
+//#include
+#include "kcategorizedsortfilterproxymodel.h"
KCategoryDrawer::KCategoryDrawer()
{
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp Wed Feb 6 17:08:20 2008
@@ -22,8 +22,9 @@
#include <QHash>
#include <QList>
-#include <KDebug>
-#include <KIcon>
+#include <QIcon>
+
+#include <iostream>
#include "kcategorizedsortfilterproxymodel.h"
#include "menuitem.h"
@@ -48,7 +49,6 @@
if ( !( leftWeight.isValid() && rightWeight.isValid() ) ) {
return KCategorizedSortFilterProxyModel::subSortLessThan( left, right );
} else {
- kDebug() << "comparing " << left.data().toString() << " (" << leftWeight.toInt() << ") and " << right.data().toString() << " (" << rightWeight.toInt() << ")";
if ( leftWeight.toInt() == rightWeight.toInt() ) {
return left.data().toString() < right.data().toString();
} else {
@@ -178,7 +178,7 @@
break;
case Qt::DecorationRole:
if ( index.column() == 0 )
- theData = QVariant( KIcon( mi->service->icon() ) );
+ theData = QVariant( QIcon( mi->service->icon() ) );
break;
case KCategorizedSortFilterProxyModel::CategorySortRole:
if ( mi->parent )
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp Wed Feb 6 17:08:20 2008
@@ -278,7 +278,7 @@
slotAboutToShow( module );
}
KPageWidgetItem* page = addPage(moduleScrollArea, moduleinfo.moduleName());
- page->setIcon( KIcon(moduleinfo.icon()) );
+ page->setIcon( QIcon(moduleinfo.icon()) );
page->setHeader(moduleinfo.comment());
#endif
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/main.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/main.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/main.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/main.cpp Wed Feb 6 17:08:20 2008
@@ -21,7 +21,7 @@
#include <KAboutData>
#include <KCmdLineArgs>
-#include <KIcon>
+#include <QIcon>
#include <KLocale>
#include <KUniqueApplication>
@@ -55,7 +55,7 @@
}
KUniqueApplication application;
- QApplication::setWindowIcon(KIcon("preferences-system"));
+ QApplication::setWindowIcon(QIcon("preferences-system"));
MainWindow *mainWindow = new MainWindow();
Modified: branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp?rev=44205&r1=44204&r2=44205&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp (original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp Wed Feb 6 17:08:20 2008
@@ -108,21 +108,25 @@
YService* entry3 = new YService;
entry3->_name = "Thomas";
+ entry3->_icon = "/usr/share/icons/hicolor/32x32/apps/yast.png";
YService* entry4 = new YService;
entry4->_name = "Huha";
+ entry4->_icon = "/usr/share/icons/hicolor/32x32/apps/yast.png";
YService* entry5 = new YService;
entry5->_name = "Chile";
YService* entry6 = new YService;
entry6->_name = "Duncan";
+ entry6->_icon = "/usr/share/icons/hicolor/32x32/apps/yast.png";
YService* entry7 = new YService;
entry7->_name = "Germany";
YService* entry8 = new YService;
entry8->_name = "Daniel";
+ entry8->_icon = "/usr/share/icons/hicolor/32x32/apps/yast.png";
@@ -282,7 +286,7 @@
addAction(defaultModule);
showAllAction = actionCollection()->addAction("showAll");
- showAllAction->setIcon( KIcon(QApplication::layoutDirection() == Qt::RightToLeft?"go-next":"go-previous") );
+ showAllAction->setIcon( QIcon(QApplication::layoutDirection() == Qt::RightToLeft?"go-next":"go-previous") );
showAllAction->setText( i18n("Overview") );
connect(showAllAction, SIGNAL(triggered()), this, SLOT(showAllModules()));
showAllAction->setEnabled(false);
@@ -416,7 +420,7 @@
if ( currentModule->aboutData() ) {
aboutModuleAction->setText(i18nc("Help menu->about <modulename>", "About %1",
currentModule->moduleInfo().moduleName().replace("&","&&")));
- aboutModuleAction->setIcon(KIcon(currentModule->moduleInfo().icon()));
+ aboutModuleAction->setIcon(QIcon(currentModule->moduleInfo().icon()));
aboutModuleAction->setEnabled(true);
}
else {
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
