diff options
Diffstat (limited to 'ksim/monitors/net')
-rw-r--r-- | ksim/monitors/net/ksimnet.cpp | 16 | ||||
-rw-r--r-- | ksim/monitors/net/ksimnet.h | 2 | ||||
-rw-r--r-- | ksim/monitors/net/netconfig.cpp | 16 | ||||
-rw-r--r-- | ksim/monitors/net/netconfig.h | 2 | ||||
-rw-r--r-- | ksim/monitors/net/netdialog.cpp | 18 | ||||
-rw-r--r-- | ksim/monitors/net/netdialog.h | 2 |
6 files changed, 28 insertions, 28 deletions
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 065797d..a066c6e 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -47,7 +47,7 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; #include <tdelocale.h> #include <tdeaboutapplication.h> #include <tdeaboutdata.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <krun.h> #include <tdeapplication.h> @@ -84,7 +84,7 @@ KSim::PluginPage *NetPlugin::createConfigPage(const char *className) void NetPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Net Plugin"), version.latin1(), @@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) addDisplay(); m_netTimer = new TQTimer(this); - connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); m_netTimer->start(NET_UPDATE); m_lightTimer = new TQTimer(this); - connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights())); + connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights())); m_lightTimer->start(LED_UPDATE); updateGraph(); @@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) { TQPopupMenu *popup = new TQPopupMenu(this); popup->insertItem(SmallIcon("network"), i18n("Connect"), this, - TQT_SLOT(runConnectCommand(int)), 0, 1); + TQ_SLOT(runConnectCommand(int)), 0, 1); popup->setItemParameter(1, value); popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this, - TQT_SLOT(runDisconnectCommand(int)), 0, 2); + TQ_SLOT(runDisconnectCommand(int)), 0, 2); popup->setItemParameter(2, value); menu()->insertItem(device, popup, 100 + value); return popup; @@ -632,7 +632,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) Network::List::Iterator it; for ( it = m_networkList.begin(); it != m_networkList.end(); ++it ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).chart()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).label()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).led()) ) + if ( o == ( *it ).chart() || o == ( *it ).label() || o == ( *it ).led() ) { break; } @@ -642,7 +642,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) if ( e->type() == TQEvent::MouseButtonPress ) { - if ( TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton ) + if ( static_cast<TQMouseEvent*>( e )->button() == TQt::RightButton ) { showMenu(i); } diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 5da4165..c699112 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -42,7 +42,7 @@ class NetPlugin : public KSim::PluginObject class NetView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: NetView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index eb2c1a3..d05cc38 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -22,7 +22,7 @@ #include <tqcursor.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> @@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) usingBox ->addColumn(i18n("Commands")); usingBox->setAllColumnsShowFocus(true); - connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *, + connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(modifyItem(TQListViewItem *))); + TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); layout = new TQHBoxLayout; @@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog())); layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); - connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); + connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent())); layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); - connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent())); layout->addWidget(removeButton); mainLayout->addLayout(layout); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2a62158..6e43933 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -32,7 +32,7 @@ class TQListViewItem; class NetConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: NetConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 21d6236..5066541 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -53,7 +53,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) : TQTabDialog(parent, name, true) { m_clicked = false; - setCaption(kapp->makeStdCaption(i18n("Network Interface"))); + setCaption(tdeApp->makeStdCaption(i18n("Network Interface"))); m_generalTab = new TQWidget(this); m_generalLayout = new TQGridLayout(m_generalTab); @@ -85,7 +85,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); - m_timerBox->setColumnLayout(0, Qt::Vertical); + m_timerBox->setColumnLayout(0, TQt::Vertical); m_timerBox->layout()->setSpacing(0); m_timerBox->layout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); @@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_showTimer = new TQCheckBox(m_timerBox); m_showTimer->setText(i18n("Show timer")); - connect(m_showTimer, TQT_SIGNAL(toggled(bool)), - m_timerEdit, TQT_SLOT(setEnabled(bool))); + connect(m_showTimer, TQ_SIGNAL(toggled(bool)), + m_timerEdit, TQ_SLOT(setEnabled(bool))); m_timerBoxLayout->addWidget(m_showTimer); m_timerBoxLayout->addWidget(m_timerEdit); @@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_connectRequester = new KURLRequester(m_commandTab); m_connectRequester->setMinimumSize(145, 0); m_connectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_connectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_connectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2); m_dCommand = new TQLabel(m_commandTab); @@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_disconnectRequester = new KURLRequester(m_commandTab); m_disconnectRequester->setMinimumSize(145, 0); m_disconnectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_disconnectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_disconnectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2); TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20, @@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked())); + connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked())); } NetDialog::~NetDialog() diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 1c6cd85..f75692a 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -34,7 +34,7 @@ class KURLRequester; class NetDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: NetDialog(TQWidget *parent, const char *name = 0); |