diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:00:38 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:00:38 -0600 |
commit | 50fd2fb357f83b24afbc163791fc665285aeea09 (patch) | |
tree | 1480f907a36c63221e4f9724c75d642c76265286 | |
parent | 63a7bd41b7dc3027f48cce5879887670cf5e2059 (diff) | |
download | kima-50fd2fb357f83b24afbc163791fc665285aeea09.tar.gz kima-50fd2fb357f83b24afbc163791fc665285aeea09.zip |
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r-- | src/kima.cpp | 6 | ||||
-rw-r--r-- | src/kima.h | 6 | ||||
-rw-r--r-- | src/prefs.cpp | 4 | ||||
-rw-r--r-- | src/prefs.ui | 2 | ||||
-rw-r--r-- | src/sources/labelsourcePrefs.cpp | 2 | ||||
-rw-r--r-- | src/sources/labelsourcePrefs.ui | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/kima.cpp b/src/kima.cpp index 5ea4e64..4d27899 100644 --- a/src/kima.cpp +++ b/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); @@ -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; diff --git a/src/prefs.cpp b/src/prefs.cpp index 3d605c3..c79c492 100644 --- a/src/prefs.cpp +++ b/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" ); diff --git a/src/prefs.ui b/src/prefs.ui index 1351d96..6845d7f 100644 --- a/src/prefs.ui +++ b/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> diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp index 8510961..1da8ace 100644 --- a/src/sources/labelsourcePrefs.cpp +++ b/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 ); diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui index 2458413..14eb3d3 100644 --- a/src/sources/labelsourcePrefs.ui +++ b/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> |