Rename a number of classes to enhance compatibility with KDE4

src/kima.cpp

@@ -131,16 +131,16 @@ Kima::Kima(const TQString& inConfigFile, Type inType, int inActions, TQWidget* i
 	mLayout->updatePositions(mTDEConfig);
 
 	// create the menu
-	mMenu = new KPopupMenu(this);
+	mMenu = new TDEPopupMenu(this);
 	mMenu->insertTitle(SmallIcon("hwinfo"), i18n("Kima"));
 
 	if (mCpufreqd.enabled()) {
 		mMenu->insertItem(i18n("&Performance Profiles"), mCpufreqd.menu());
 	}
 
-	KActionCollection* actionCollection = new KActionCollection(this, "actionCollection", kapp);
+	TDEActionCollection* actionCollection = new TDEActionCollection(this, "actionCollection", kapp);
 
-	KAction* action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection);
+	TDEAction* action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection);
 	action->setText(i18n("&Preferences"));
 	action->plug(mMenu);
 

src/kima.h

@@ -40,8 +40,8 @@
 // Forward Declarations
 class FlowLayout;
 class KAboutApplication;
-class KPopupMenu;
-class KSelectAction;
+class TDEPopupMenu;
+class TDESelectAction;
 class TQMouseEvent;
 class KDialogBase;
 class Prefs;
@@ -194,7 +194,7 @@ private:
 	mutable int mCachedWFH;
 	mutable int mCachedHeight;
 	KAboutApplication* mAboutDialog;
-	KPopupMenu* mMenu;
+	TDEPopupMenu* mMenu;
 	KDialogBase* mPrefsDlg;
 	Prefs* mPrefs;
 

src/prefs.cpp

@@ -34,11 +34,11 @@ Prefs::Prefs( TQWidget* parent, const char* name, WFlags fl )
     splitter3 = new TQSplitter( this, "splitter3" );
     splitter3->setOrientation( TQSplitter::Horizontal );
 
-    sourceListView = new KListView( splitter3, "sourceListView" );
+    sourceListView = new TDEListView( splitter3, "sourceListView" );
     sourceListView->addColumn( tr2i18n( "Source" ) );
     sourceListView->header()->setClickEnabled( FALSE, sourceListView->header()->count() - 1 );
     sourceListView->header()->setResizeEnabled( FALSE, sourceListView->header()->count() - 1 );
-    sourceListView->setResizeMode( KListView::AllColumns );
+    sourceListView->setResizeMode( TDEListView::AllColumns );
 
     widgetStack = new TQWidgetStack( splitter3, "widgetStack" );
 

src/prefs.ui

@@ -30,7 +30,7 @@
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <column>
                     <property name="text">
                         <string>Source</string>

src/sources/labelsourcePrefs.cpp

@@ -60,7 +60,7 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f
     fontLabel = new TQLabel( defaultSourcePrefsFrame, "fontLabel" );
     layout17->addWidget( fontLabel );
 
-    fontRequester = new KFontRequester( defaultSourcePrefsFrame, "fontRequester" );
+    fontRequester = new TDEFontRequester( defaultSourcePrefsFrame, "fontRequester" );
     layout17->addWidget( fontRequester );
     defaultSourcePrefsFrameLayout->addLayout( layout17 );
 

src/sources/labelsourcePrefs.ui

@@ -112,7 +112,7 @@ Taskbar visual settings</string>
                                 <string>Font:</string>
                             </property>
                         </widget>
-                        <widget class="KFontRequester">
+                        <widget class="TDEFontRequester">
                             <property name="name">
                                 <cstring>fontRequester</cstring>
                             </property>