summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--systemsettings/kcmsearch.cpp2
-rw-r--r--systemsettings/kcmsearch.h2
-rw-r--r--systemsettings/kcmultiwidget.cpp4
-rw-r--r--systemsettings/moduleiconitem.cpp10
-rw-r--r--systemsettings/moduleiconitem.h4
-rw-r--r--systemsettings/modulesview.cpp2
-rw-r--r--systemsettings/modulesview.h4
7 files changed, 14 insertions, 14 deletions
diff --git a/systemsettings/kcmsearch.cpp b/systemsettings/kcmsearch.cpp
index ac97647..cc2a3d7 100644
--- a/systemsettings/kcmsearch.cpp
+++ b/systemsettings/kcmsearch.cpp
@@ -28,7 +28,7 @@
#include "moduleiconitem.h"
KcmSearch::KcmSearch( TQPtrList<ModulesView> *moduleViewList, TQWidget *parent, const char *name )
- : KIconViewSearchLine(parent, (moduleViewList->at(0))?moduleViewList->at(0)->groups[0]:NULL, name){
+ : TDEIconViewSearchLine(parent, (moduleViewList->at(0))?moduleViewList->at(0)->groups[0]:NULL, name){
this->moduleViewList = moduleViewList;
}
diff --git a/systemsettings/kcmsearch.h b/systemsettings/kcmsearch.h
index c4de5db..a625c64 100644
--- a/systemsettings/kcmsearch.h
+++ b/systemsettings/kcmsearch.h
@@ -31,7 +31,7 @@ class ModulesView;
* Searches all the ModuleIconItem's in MainWindow and "disables" the ones
* whos keywords don't match the current search.
*/
-class KcmSearch : public KIconViewSearchLine
+class KcmSearch : public TDEIconViewSearchLine
{
Q_OBJECT
diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index 7c61cfe..d5b308a 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -256,13 +256,13 @@ void KCMultiWidget::addModule(const TDECModuleInfo& moduleinfo,
parentmodulenames += moduleinfo.moduleName();
page = addHBoxPage( parentmodulenames, moduleinfo.comment(),
SmallIcon( moduleinfo.icon(),
- IconSize( KIcon::Small ) ) );
+ IconSize( TDEIcon::Small ) ) );
break;
case Tabbed:
case IconList:
page = addHBoxPage( moduleinfo.moduleName(),
moduleinfo.comment(), DesktopIcon( moduleinfo.icon(),
- KIcon::SizeMedium ) );
+ TDEIcon::SizeMedium ) );
break;
case Plain:
page = plainPage();
diff --git a/systemsettings/moduleiconitem.cpp b/systemsettings/moduleiconitem.cpp
index 21838fb..a5f3dfc 100644
--- a/systemsettings/moduleiconitem.cpp
+++ b/systemsettings/moduleiconitem.cpp
@@ -24,25 +24,25 @@
#define IMAGE_SIZE 32
-ModuleIconItem::ModuleIconItem( KIconView *parent, TDECModuleInfo module)
+ModuleIconItem::ModuleIconItem( TDEIconView *parent, TDECModuleInfo module)
: TQIconViewItem( parent, module.moduleName(),
SmallIcon( module.icon(), IMAGE_SIZE ) ),
- currentState( KIcon::ActiveState), imageName(module.icon())
+ currentState( TDEIcon::ActiveState), imageName(module.icon())
{
modules.append(module);
}
-ModuleIconItem::ModuleIconItem( KIconView *parent, const TQString &text,
+ModuleIconItem::ModuleIconItem( TDEIconView *parent, const TQString &text,
const TQString &imageName )
: TQIconViewItem( parent, text, SmallIcon( imageName, IMAGE_SIZE ) ),
- currentState( KIcon::ActiveState )
+ currentState( TDEIcon::ActiveState )
{
this->imageName = imageName;
}
void ModuleIconItem::loadIcon( bool enabled )
{
- int newState = enabled ? KIcon::DefaultState : KIcon::DisabledState;
+ int newState = enabled ? TDEIcon::DefaultState : TDEIcon::DisabledState;
if( newState == currentState )
return;
diff --git a/systemsettings/moduleiconitem.h b/systemsettings/moduleiconitem.h
index 721c4b5..b4ac5a7 100644
--- a/systemsettings/moduleiconitem.h
+++ b/systemsettings/moduleiconitem.h
@@ -35,9 +35,9 @@ class ModuleIconItem : public TQIconViewItem
{
public:
- ModuleIconItem( KIconView *parent, TDECModuleInfo module );
+ ModuleIconItem( TDEIconView *parent, TDECModuleInfo module );
- ModuleIconItem( KIconView *parent, const TQString &text,
+ ModuleIconItem( TDEIconView *parent, const TQString &text,
const TQString &imageName );
/**
diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp
index 326fa1a..a0b2f39 100644
--- a/systemsettings/modulesview.cpp
+++ b/systemsettings/modulesview.cpp
@@ -152,7 +152,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
TQString path = (*it).subMenu;
KServiceGroup::Ptr group = KServiceGroup::group( path );
if ( group ) {
- ModuleIconItem *item = new ModuleIconItem( ((KIconView*)iconView),
+ ModuleIconItem *item = new ModuleIconItem( ((TDEIconView*)iconView),
group->caption(), group->icon() );
item->modules = rootMenu->modules( path );
}
diff --git a/systemsettings/modulesview.h b/systemsettings/modulesview.h
index c0640b6..f51a213 100644
--- a/systemsettings/modulesview.h
+++ b/systemsettings/modulesview.h
@@ -26,12 +26,12 @@
/**
* Overloaded to give a larger default size that fits with text of two lines.
*/
-class RowIconView : public KIconView
+class RowIconView : public TDEIconView
{
public:
RowIconView( TQWidget* parent, const char *name=0 )
- : KIconView( parent, name ){ };
+ : TDEIconView( parent, name ){ };
// Figure out the hight/width to have only one row
TQSize minimumSizeHint() const {