Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent e8d26d34e5
commit 3e1b671141

@ -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>

@ -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()));

@ -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;

@ -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

Loading…
Cancel
Save