diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:01:18 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:01:18 -0600 |
commit | 3e1b671141239f4379f2187d0e46112b644e34f7 (patch) | |
tree | 3bc1093f60f0d7710e02afb55986c71155b987ef | |
parent | e8d26d34e57ab37009c6cd8153d90ec64a30a749 (diff) | |
download | knetstats-3e1b671141239f4379f2187d0e46112b644e34f7.tar.gz knetstats-3e1b671141239f4379f2187d0e46112b644e34f7.zip |
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r-- | src/src/configurebase.ui | 2 | ||||
-rw-r--r-- | src/src/knetstats.cpp | 8 | ||||
-rw-r--r-- | src/src/knetstats.h | 10 | ||||
-rw-r--r-- | src/src/knetstatsview.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/src/configurebase.ui b/src/src/configurebase.ui index 44f4685..1e769ac 100644 --- a/src/src/configurebase.ui +++ b/src/src/configurebase.ui @@ -444,7 +444,7 @@ <string></string> </property> </widget> - <widget class="KFontRequester" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TDEFontRequester" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>mTxtFont</cstring> </property> diff --git a/src/src/knetstats.cpp b/src/src/knetstats.cpp index 7f101f9..5fe3730 100644 --- a/src/src/knetstats.cpp +++ b/src/src/knetstats.cpp @@ -67,17 +67,17 @@ KNetStats::~KNetStats() { void KNetStats::setupUi() { setIcon(kapp->icon()); // Cria o contextMenu - mActionCollection = new KActionCollection(this); - mContextMenu = new KPopupMenu(this); + mActionCollection = new TDEActionCollection(this); + mContextMenu = new TDEPopupMenu(this); mContextMenu->insertTitle( kapp->miniIcon(), kapp->caption() ); - KAction* configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), mActionCollection, "configure"); + TDEAction* configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), mActionCollection, "configure"); configure->plug(mContextMenu); mContextMenu->insertSeparator(); KHelpMenu* helpmenu = new KHelpMenu(this, TQString(), false); mContextMenu->insertItem( i18n("&Help"), helpmenu->menu() ); mContextMenu->insertSeparator(); - KAction* quitAction = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), mActionCollection); + TDEAction* quitAction = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), mActionCollection); quitAction->plug(mContextMenu); connect(helpmenu, TQT_SIGNAL(showAboutApplication()), this, TQT_SLOT(about())); diff --git a/src/src/knetstats.h b/src/src/knetstats.h index e119406..e5042da 100644 --- a/src/src/knetstats.h +++ b/src/src/knetstats.h @@ -28,8 +28,8 @@ class KNetStatsView; class TDEConfig; -class KPopupMenu; -class KActionCollection; +class TDEPopupMenu; +class TDEActionCollection; class Interface; @@ -48,7 +48,7 @@ public: KNetStats(); ~KNetStats(); - KPopupMenu* const contextMenu() const { return mContextMenu; } + TDEPopupMenu* const contextMenu() const { return mContextMenu; } /** * \brief Search for network interfaces parsing /proc/net/dev * \return A StringList with the network interface names @@ -75,9 +75,9 @@ public slots: */ void detectNewInterfaces(int* count_ptr = 0); private: - KPopupMenu* mContextMenu; // help menu usado por todos os tray icons + TDEPopupMenu* mContextMenu; // help menu usado por todos os tray icons Configure* mConfigure; - KActionCollection* mActionCollection; + TDEActionCollection* mActionCollection; bool mBoot; InterfaceMap mInterfaces; diff --git a/src/src/knetstatsview.h b/src/src/knetstatsview.h index 31cb193..a0dab81 100644 --- a/src/src/knetstatsview.h +++ b/src/src/knetstatsview.h @@ -139,7 +139,7 @@ private: bool mCarrier; // Interface carrier is on? bool mConnected; // Interface exists? - KPopupMenu* mContextMenu; // Global ContextMenu + TDEPopupMenu* mContextMenu; // Global ContextMenu Statistics* mStatistics; // Statistics window TQString mInterface; // Current interface Options mOptions; // View options |