diff options
Diffstat (limited to 'ksim')
82 files changed, 303 insertions, 297 deletions
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index 42148d6..ee601c2 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -48,7 +48,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeBox = new TQGroupBox(this); m_sizeBox->setTitle(i18n("Graph Size")); - m_sizeBox->setColumnLayout(0, Qt::Horizontal); + m_sizeBox->setColumnLayout(0, TQt::Horizontal); TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout()); sizeBoxLayout->setSpacing(6); @@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeCombo->insertItem(i18n("%dd %h:%m")); m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s")); connect(m_uptimeCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(uptimeContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(uptimeContextMenu(TQPopupMenu *))); m_uptimeAdd = new TQPushButton(this); m_uptimeAdd->setPixmap(SmallIcon("go-down")); - connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem())); + connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem())); TQToolTip::add(m_uptimeAdd, i18n("Insert item")); m_uptimeCheck = new TQCheckBox(this); m_uptimeCheck->setText(i18n("Show uptime")); m_uptimeCheck->setChecked(true); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeCombo, TQT_SLOT(setEnabled(bool))); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeAdd, TQT_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeCombo, TQ_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_uptimeCheck); m_subLayout = new TQHBoxLayout; @@ -210,7 +210,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeBox = new TQGroupBox(this); m_uptimeBox->setTitle(i18n("Uptime Legend")); - m_uptimeBox->setColumnLayout(0, Qt::Vertical); + m_uptimeBox->setColumnLayout(0, TQt::Vertical); m_uptimeBox->layout()->setSpacing(0); m_uptimeBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout()); @@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertUptimeItem())); + this, TQ_SLOT(insertUptimeItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeUptimeItem())); + this, TQ_SLOT(removeUptimeItem())); } void KSim::UptimePrefs::insertUptimeItem() @@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); connect(m_memCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(memoryContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(memoryContextMenu(TQPopupMenu *))); m_memoryAdd = new TQPushButton(this); m_memoryAdd->setPixmap(SmallIcon("go-down")); - connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem())); + connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem())); TQToolTip::add(m_memoryAdd, i18n("Insert item")); m_memCheck = new TQCheckBox(this); m_memCheck->setText(i18n("Show memory and free memory")); m_memCheck->setChecked(false); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memCombo, TQT_SLOT(setEnabled(bool))); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memoryAdd, TQT_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memCombo, TQ_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memoryAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_memCheck); m_subLayout = new TQHBoxLayout; @@ -346,7 +346,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memBox = new TQGroupBox(this); m_memBox->setTitle(i18n("Memory Legend")); - m_memBox->setColumnLayout(0, Qt::Vertical); + m_memBox->setColumnLayout(0, TQt::Vertical); m_memBox->layout()->setSpacing(0); m_memBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_memBox->layout()); @@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertMemoryItem())); + this, TQ_SLOT(insertMemoryItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeMemoryItem())); + this, TQ_SLOT(removeMemoryItem())); } void KSim::MemoryPrefs::insertMemoryItem() @@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) //m_swapCombo->insertItem(i18n("%tM - %uM used")); connect(m_swapCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(swapContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(swapContextMenu(TQPopupMenu *))); m_swapAdd = new TQPushButton(this); m_swapAdd->setPixmap(SmallIcon("go-down")); - connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem())); + connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem())); TQToolTip::add(m_swapAdd, i18n("Insert item")); m_subLayout = new TQHBoxLayout; m_subLayout->setSpacing(6); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapCombo, TQT_SLOT(setEnabled(bool))); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapAdd, TQT_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapCombo, TQ_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapAdd, TQ_SLOT(setEnabled(bool))); m_swapFormat = new TQLabel(this); m_swapFormat->setText(i18n("Swap format:")); @@ -495,7 +495,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapBox = new TQGroupBox(this); m_swapBox->setTitle(i18n("Swap Legend")); - m_swapBox->setColumnLayout(0, Qt::Vertical); + m_swapBox->setColumnLayout(0, TQt::Vertical); m_swapBox->layout()->setSpacing(0); m_swapBox->layout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_swapBox->layout()); @@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config) void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); - menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem())); - menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem())); + menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem())); + menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem())); } void KSim::SwapPrefs::insertSwapItem() diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index 997cbac..e945c26 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -42,7 +42,7 @@ namespace KSim class GeneralPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: GeneralPrefs(TQWidget *parent, const char *name=0); @@ -65,7 +65,7 @@ namespace KSim class ClockPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ClockPrefs(TQWidget *parent, const char *name=0); @@ -83,7 +83,7 @@ namespace KSim class UptimePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: UptimePrefs(TQWidget *parent, const char *name=0); @@ -118,7 +118,7 @@ namespace KSim class MemoryPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MemoryPrefs(TQWidget *parent, const char *name=0); @@ -155,7 +155,7 @@ namespace KSim class SwapPrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SwapPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 4d70777..544c12e 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) + TDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { TDEGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, @@ -110,7 +110,7 @@ void KSim::PanelExtension::about() void KSim::PanelExtension::help() { - kapp->invokeHelp(TQString::null, "ksim"); + tdeApp->invokeHelp(TQString::null, "ksim"); } void KSim::PanelExtension::preferences() diff --git a/ksim/ksim.h b/ksim/ksim.h index 36903fb..50e0232 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -34,7 +34,7 @@ namespace KSim class PanelExtension : public KPanelExtension { - Q_OBJECT + TQ_OBJECT public: PanelExtension( const TQString & configFile, Type type, diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 87f5389..58a2b6b 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -33,7 +33,7 @@ namespace KSim */ class Frame : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: Frame(int type, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 746c810..9a27429 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqhbox.h> @@ -91,10 +91,10 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall)); m_themePage = new KSim::ThemePrefs(theme); - connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig())); + connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) plugin.configPage()->readConfig(); // TODO: implement this correctly one day -// connect (info.configPage(), TQT_SIGNAL(pageChanged()), -// this, TQT_SLOT(enableButtons())); +// connect (info.configPage(), TQ_SIGNAL(pageChanged()), +// this, TQ_SLOT(enableButtons())); } void KSim::ConfigDialog::savePrefs() diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 6eda8d9..502e71a 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> class TQFrame; -class KDesktopFile; +class TDEDesktopFile; namespace KSim { class Config; @@ -70,9 +70,9 @@ namespace KSim ~ChangedPluginList() {} }; - class KDE_EXPORT ConfigDialog : public KDialogBase + class TDE_EXPORT ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 1f204b7..e6b58e8 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config, //m_procsLabel = 0L; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate())); m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate())); createView(); } diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 89b8598..1f9cc38 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -33,7 +33,7 @@ namespace KSim class Sysinfo : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 5e83641..67379c5 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -40,9 +40,9 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <twin.h> #include <krun.h> @@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config, m_sizeLayout->addWidget(m_rightFrame); connect(&KSim::PluginLoader::self(), - TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)), - this, TQT_SLOT(addMonitor(const KSim::Plugin &))); + TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)), + this, TQ_SLOT(addMonitor(const KSim::Plugin &))); KSim::ThemeLoader::self().themeColours(this); @@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config, addPlugins(); } - connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); + connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView())); } KSim::MainView::~MainView() @@ -278,7 +278,7 @@ void KSim::MainView::reparseConfig(bool emitReload, if (!(*plugin).isDifferent() && (*plugin).isEnabled()) { kdDebug(2003) << "Recreating " << (*plugin).name() << "'s view" << endl; - kapp->processEvents(); + tdeApp->processEvents(); // Make sure the plugins background color is // set to the correct theme color if (themeChanged && (*plugin).view()) @@ -299,13 +299,13 @@ void KSim::MainView::reparseConfig(bool emitReload, for (it = list.begin(); it != list.end(); ++it) { if ((*it).isDifferent()) { if ((*it).isEnabled()) { // Go through the added/removed plugins and load/unload them - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); addPlugin(kdf); m_prefDialog->createPage((*it).libName()); } else { m_prefDialog->removePage((*it).libName()); - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); removePlugin(kdf); } } @@ -334,19 +334,19 @@ void KSim::MainView::addPlugins() TQStringList::ConstIterator it; for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it) { - const KDesktopFile kdf(*it, true); + const TDEDesktopFile kdf(*it, true); addPlugin(kdf); } } -void KSim::MainView::addPlugin(const KDesktopFile &file, bool force) +void KSim::MainView::addPlugin(const TDEDesktopFile &file, bool force) { if (force || m_config->enabledMonitor(file.readEntry("X-KSIM-LIBRARY"))) KSim::PluginLoader::self().loadPlugin(file); } // provided for convenience -void KSim::MainView::removePlugin(const KDesktopFile &file) +void KSim::MainView::removePlugin(const TDEDesktopFile &file) { KSim::PluginLoader::self().unloadPlugin(file.readEntry("X-KSIM-LIBRARY").local8Bit()); } @@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin) // kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl; // kdDebug(2003) << "location: " << location << endl; m_pluginLayout->addWidget(plugin.view()); - connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)), - TQT_SLOT(runCommand(const TQCString &))); + connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)), + TQ_SLOT(runCommand(const TQCString &))); // if (location > m_oldLocation) // m_oldLocation = location; @@ -393,8 +393,8 @@ void KSim::MainView::preferences() { if (m_prefDialog == 0L) { m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog"); - connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), - this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); + connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), + this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); } m_prefDialog->exec(); @@ -458,9 +458,9 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const return TQSize(width, height); } -void KSim::MainView::positionChange(Qt::Orientation o) +void KSim::MainView::positionChange(TQt::Orientation o) { - if (o == Qt::Vertical) + if (o == TQt::Vertical) m_pluginLayout->setDirection(TQBoxLayout::TopToBottom); else m_pluginLayout->setDirection(TQBoxLayout::LeftToRight); diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 7495076..0ac2885 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -32,7 +32,7 @@ class TQBoxLayout; class TQHBoxLayout; class TQVBoxLayout; class TQPopupMenu; -class KDesktopFile; +class TDEDesktopFile; class TDEConfig; namespace KSim @@ -46,9 +46,9 @@ namespace KSim class ConfigDialog; class ChangedPluginList; - class KDE_EXPORT MainView : public TQWidget, virtual public DCOPObject + class TDE_EXPORT MainView : public TQWidget, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: @@ -64,7 +64,7 @@ namespace KSim void makeDirs(); TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const; - void positionChange(Qt::Orientation); + void positionChange(TQt::Orientation); k_dcop: const TQString &hostname() const; @@ -76,8 +76,8 @@ namespace KSim public slots: void reparseConfig(bool, const KSim::ChangedPluginList &); void addPlugins(); - void addPlugin(const KDesktopFile &, bool force = false); - void removePlugin(const KDesktopFile &); + void addPlugin(const TDEDesktopFile &, bool force = false); + void removePlugin(const TDEDesktopFile &); void addMonitor(const KSim::Plugin &); void runCommand(const TQCString &); void preferences(); diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 9995769..8f07f30 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -49,8 +49,8 @@ class KSim::Chart::Timer tqAddPostRoutine(cleanup); } - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } static void disconnect(KSim::Chart *chart) @@ -58,8 +58,8 @@ class KSim::Chart::Timer if (!m_timer) return; - TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } private: @@ -373,7 +373,7 @@ void KSim::Chart::setMaxValue(int maxValue) void KSim::Chart::setValue(int valueIn, int valueOut) { - d->values.prepend(tqMakePair(range(valueIn), range(valueOut))); + d->values.prepend(qMakePair(range(valueIn), range(valueOut))); if (d->variableGraphs) { d->maxValues.prepend(valueIn > valueOut ? valueIn : valueOut); diff --git a/ksim/library/chart.h b/ksim/library/chart.h index e2e7494..620e6ad 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include "common.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQColor; @@ -33,9 +33,9 @@ namespace KSim * provides a graph displaying data onscreen using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Chart : public TQWidget, public KSim::Base + class TDE_EXPORT Chart : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: enum DataType { DataIn = 0, DataOut }; diff --git a/ksim/library/common.h b/ksim/library/common.h index 9fc01c0..42d6faf 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -24,7 +24,7 @@ #define KSIM_VERSION_STRING "1.1.0" #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** * namespace for common ksim entries @@ -72,7 +72,7 @@ namespace KSim * @short base class for widgets * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Base + class TDE_EXPORT Base { public: Base(); diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index b781630..d0ff3cc 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeglobal.h> diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h index 8f7376d..b7e777b 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -24,7 +24,7 @@ #include <tqpoint.h> #include <tqfont.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; @@ -33,7 +33,7 @@ namespace KSim /** * @internal */ - class KDE_EXPORT Config + class TDE_EXPORT Config { public: Config(TDEConfig *config); diff --git a/ksim/library/label.h b/ksim/library/label.h index dce2adc..0ae9f65 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include "common.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { @@ -34,9 +34,9 @@ namespace KSim * @short Label widget * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Label : public TQWidget, public KSim::Base + class TDE_EXPORT Label : public TQWidget, public KSim::Base { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/led.h b/ksim/library/led.h index 510f959..8d5e0f8 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -21,7 +21,7 @@ #define KSIM__LED_H #include "progress.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <tqpixmap.h> namespace KSim @@ -34,7 +34,7 @@ namespace KSim * @short led using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Led : public TQPixmap + class TDE_EXPORT Led : public TQPixmap { public: enum Type { First = 0, Second }; @@ -104,9 +104,9 @@ namespace KSim * @short Label widget with 2 leds * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT LedLabel : public KSim::Progress + class TDE_EXPORT LedLabel : public KSim::Progress { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp index 4d176bf..eb6d58f 100644 --- a/ksim/library/pluginglobal.cpp +++ b/ksim/library/pluginglobal.cpp @@ -21,7 +21,7 @@ #include "pluginmodule.h" #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <kiconloader.h> @@ -75,7 +75,7 @@ KSim::Plugin::Plugin() : d(0) { } -KSim::Plugin::Plugin(KSim::PluginObject *plugin, const KDesktopFile &file) +KSim::Plugin::Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file) { init(plugin, file); @@ -190,7 +190,7 @@ KSim::PluginPage *KSim::Plugin::configPage() const return d ? d->page : 0; } -void KSim::Plugin::init(KSim::PluginObject *plugin, const KDesktopFile &file) +void KSim::Plugin::init(KSim::PluginObject *plugin, const TDEDesktopFile &file) { if (!plugin || file.fileName().isEmpty()) { d = 0; diff --git a/ksim/library/pluginglobal.h b/ksim/library/pluginglobal.h index e094198..cc1f7be 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -24,9 +24,9 @@ #include <tqpixmap.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDesktopFile; +class TDEDesktopFile; namespace KSim { @@ -38,7 +38,7 @@ namespace KSim * A class that holds various information about a plugin * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Plugin + class TDE_EXPORT Plugin { public: /** @@ -48,7 +48,7 @@ namespace KSim /** * Constructs a Plugin */ - Plugin(KSim::PluginObject *plugin, const KDesktopFile &file); + Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file); /** * Copy constructor */ @@ -124,7 +124,7 @@ namespace KSim */ static KSim::Plugin null; private: - void init(KSim::PluginObject *plugin, const KDesktopFile &file); + void init(KSim::PluginObject *plugin, const TDEDesktopFile &file); class Private; Private *d; @@ -135,7 +135,7 @@ namespace KSim * use pluginList() from KSim::PluginLoader instead * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginList : public TQValueList<Plugin> + class TDE_EXPORT PluginList : public TQValueList<Plugin> { public: /** diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 9518bbb..35ea3fb 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -22,10 +22,10 @@ #include <kdebug.h> #include <klibloader.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqstringlist.h> @@ -86,7 +86,7 @@ KSim::PluginLoader::~PluginLoader() delete d; } -bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) +bool KSim::PluginLoader::loadPlugin(const TDEDesktopFile &file) { switch (createPlugin(file)) { case KSim::PluginLoader::EmptyLibName: @@ -174,7 +174,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readName() == name) { location = (*it); break; @@ -186,7 +186,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readEntry("X-KSIM-LIBRARY") == name) { location = (*it); break; @@ -195,7 +195,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, break; } case DesktopFile: { - if (!KDesktopFile::isDesktopFile(name)) + if (!TDEDesktopFile::isDesktopFile(name)) return KSim::PluginInfo(); location = name; @@ -203,7 +203,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, } } - KDesktopFile file(location); + TDEDesktopFile file(location); KSim::PluginInfo info; info.m_name = file.readName(); info.m_libName = file.readEntry("X-KSIM-LIBRARY").local8Bit(); @@ -292,7 +292,7 @@ void KSim::PluginLoader::cleanup() m_instance = 0; } -KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const KDesktopFile &file) +KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const TDEDesktopFile &file) { d->error = TQString(); TQCString pluginName(file.readEntry("X-KSIM-LIBRARY").local8Bit()); diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index 912297c..1dcd822 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -23,11 +23,11 @@ #include "pluginglobal.h" #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { - class KDE_EXPORT PluginInfo + class TDE_EXPORT PluginInfo { friend class PluginLoader; public: @@ -61,9 +61,9 @@ namespace KSim * Provides a loader for the plugins * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginLoader : public TQObject + class TDE_EXPORT PluginLoader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class MainView; public: @@ -78,7 +78,7 @@ namespace KSim /** * loads a plugin, example: * <pre> - * KDesktopFile deskfile("/home/user/foo.desktop"); + * TDEDesktopFile deskfile("/home/user/foo.desktop"); * KSim::PluginLoader::self().loadPlugin(deskFile); * </pre> * you can then use @ref pluginList() to access the plugin, view, @@ -86,7 +86,7 @@ namespace KSim * @param file is the desktop file of the lib * @return true if the plugin is successfully loaded */ - bool loadPlugin(const KDesktopFile &file); + bool loadPlugin(const TDEDesktopFile &file); /** * unloads a loaded plugin and removes plugin entries from pluginList() */ @@ -174,7 +174,7 @@ namespace KSim * Deletes the instance and cleans up after itself */ static void cleanup(); - ErrorCode createPlugin(const KDesktopFile &file); + ErrorCode createPlugin(const TDEDesktopFile &file); class Private; Private *d; diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7f450de..18aff4a 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -50,7 +50,7 @@ KSim::PluginObject::~PluginObject() const char *KSim::PluginObject::instanceName() const { - return kapp->aboutData()->appName(); + return tdeApp->aboutData()->appName(); } const TQCString &KSim::PluginObject::name() const @@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, - TQT_SLOT(showAbout()), 0, -1, 0); + TQ_SLOT(showAbout()), 0, -1, 0); if (parent && !parent->configFileName().isEmpty()) d->config = new TDEConfig(parent->configFileName() + "rc"); @@ -159,7 +159,7 @@ void KSim::PluginView::doCommand() void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) doCommand(); } diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index b93a98e..8ab04e7 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -22,14 +22,14 @@ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPopupMenu; class TDEConfig; #define KSIM_INIT_PLUGIN(className) \ extern "C" { \ - KDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ + TDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ return new className(name); \ } \ } @@ -50,7 +50,7 @@ namespace KSim * @see KSim::PluginView KSim::PluginPage * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginObject + class TDE_EXPORT PluginObject { public: /** @@ -111,9 +111,9 @@ namespace KSim * the config() to gain access to your config file * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginPage : public TQWidget + class TDE_EXPORT PluginPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -160,9 +160,9 @@ namespace KSim * when apply or ok gets clicked in the config dialog * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginView : public TQWidget + class TDE_EXPORT PluginView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/library/progress.h b/ksim/library/progress.h index c857000..88939d1 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -22,7 +22,7 @@ #include "label.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KSim { @@ -30,9 +30,9 @@ namespace KSim * provides a label with a progress bar meter * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Progress : public KSim::Label + class TDE_EXPORT Progress : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: enum ProgressType { Panel, Meter }; diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 5bc4038..c1eb655 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -33,9 +33,9 @@ #include <tqbitmap.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> class KSim::Theme::Private diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index c70dc92..a7a2804 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -26,7 +26,7 @@ #include <tqfont.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQStringList; template<class> class TQValueVector; @@ -44,7 +44,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT Theme + class TDE_EXPORT Theme { friend class ThemeLoader; public: @@ -397,7 +397,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT ThemeLoader + class TDE_EXPORT ThemeLoader { public: /** diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index 5f982a6..88a2105 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -22,8 +22,8 @@ #include <tdelocale.h> #include <tdeglobal.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <ksimconfig.h> @@ -49,7 +49,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) m_locatedFiles.sort(); TQStringList::ConstIterator it; for (it = m_locatedFiles.begin(); it != m_locatedFiles.end(); ++it) { - KDesktopFile file((*it), true); + TDEDesktopFile file((*it), true); (void)(new TQCheckListItem(this, file.readName(), TQCheckListItem::CheckBox))->setText(1, file.readComment()); } diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index 477210d..26f6d7b 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -29,7 +29,7 @@ namespace KSim class MonitorPrefs : public TDEListView { - Q_OBJECT + TQ_OBJECT public: MonitorPrefs(TQWidget *parent, const char *name=0); diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index af6074c..c3eca2a 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -94,7 +94,7 @@ KSim::PluginPage *CpuPlugin::createConfigPage(const char *className) void CpuPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim CPU Plugin"), version.latin1(), @@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) addDisplay(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView())); m_timer->start(CPU_SPEED); updateView(); } @@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_listView->addColumn(i18n("Chart Format")); m_listView->setAllColumnsShowFocus(true); m_listView->setSelectionMode(TQListView::Single); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); mainLayout->addWidget( m_listView ); @@ -386,12 +386,12 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); layout->addWidget( m_modify ); mainLayout->addLayout( layout ); m_legendBox = new TQGroupBox(this); - m_legendBox->setColumnLayout(0, Qt::Vertical); + m_legendBox->setColumnLayout(0, TQt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); m_legendBox->layout()->setSpacing(0); m_legendBox->layout()->setMargin(0); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 1ca3fca..9f9dd99 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -51,7 +51,7 @@ class CpuPlugin : public KSim::PluginObject class CpuView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: CpuView(KSim::PluginObject *parent, const char *name); @@ -200,7 +200,7 @@ class CpuView : public KSim::PluginView class CpuConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: CpuConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index d3a3827..47b478a 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -90,7 +90,7 @@ KSim::PluginPage *DiskPlugin::createConfigPage(const char *className) void DiskPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Disk Plugin"), version.latin1(), @@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) init(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay())); m_timer->start(DISK_SPEED); updateDisplay(); } @@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); layout->addWidget(m_remove); m_layout->addLayout(layout); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index 3cf62d1..079efbe 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -54,7 +54,7 @@ class DiskPlugin : public KSim::PluginObject class DiskView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: DiskView(KSim::PluginObject *parent, const char *name); @@ -131,7 +131,7 @@ class DiskView : public KSim::PluginView class DiskConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: DiskConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index 5c1cf3a..045e2ad 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -175,12 +175,7 @@ FilesystemStats::List FilesystemStats::readEntries() Entry entry; entry.dir = sfs[i].f_mntonname; entry.fsname = sfs[i].f_mntfromname; - -#ifdef __osf__ - entry.type = getvfsbynumber(sfs[i].f_type); -#else entry.type = sfs[i].f_fstypename; -#endif list.append( entry ); } diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 2fb77e1..82f3f7b 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqcursor.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kiconloader.h> @@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) while ((filesystem = it.current()) != 0) { ++it; - if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) { + if (filesystem->display() == o) { progressBar = filesystem->display(); break; } @@ -149,15 +149,15 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) ++i; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress) + if (o == progressBar && e->type() == TQEvent::MouseButtonPress) { - switch(TQT_TQMOUSEEVENT(e)->button()) { - case Qt::RightButton: + switch(static_cast<TQMouseEvent*>(e)->button()) { + case TQt::RightButton: showMenu(i); break; default: break; - case Qt::LeftButton: + case TQt::LeftButton: if (parentWidget()->inherits("KSim::PluginView")) static_cast<KSim::PluginView *>(parentWidget())->doCommand(); break; @@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po { m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(processExited(TDEProcess *))); + TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index 2a8f116..6e7f330 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class FilesystemWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FilesystemWidget(TQWidget *parent, const char *name); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index fe37957..8322bcd 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -32,7 +32,7 @@ class TQListBoxItem; class FsystemConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: FsystemConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 278a891..1f95a08 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -64,7 +64,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className) void PluginModule::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim FileSystem Plugin"), version.latin1(), @@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) createFreeInfo(); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS())); m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000); } @@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { splitList = TQStringList::split(":", (*it)); - newList.append(tqMakePair(splitList[0], splitList[1])); + newList.append(qMakePair(splitList[0], splitList[1])); } return newList; diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index 1583ba1..63e192c 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class Fsystem : public KSim::PluginView, public FsystemIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 21d0c9e..1b6c0b3 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -59,7 +59,7 @@ KSim::PluginPage *I8KPlugin::createConfigPage(const char *className) void I8KPlugin::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim I8K Plugin"), version.latin1(), @@ -121,7 +121,7 @@ void I8KView::openStream() { m_procStream = new TQTextIStream( m_procFile ); disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) ); m_timer->start( m_interval*1000 ); kdDebug( 2003 ) << "i8k: Success" << endl; @@ -130,7 +130,7 @@ void I8KView::openStream() { // i8k module is not loaded. Try again after 30 secs. disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) ); m_timer->start( 30*1000 ); kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl; } diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index e7eb3df..492af64 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -49,7 +49,7 @@ class I8KPlugin : public KSim::PluginObject class I8KView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: I8KView(KSim::PluginObject *parent, const char *name); @@ -81,7 +81,7 @@ class I8KView : public KSim::PluginView class I8TDEConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: I8TDEConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/NVCtrl.c b/ksim/monitors/lm_sensors/NVCtrl.c index 6c61b8a..fe5b5c4 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.c +++ b/ksim/monitors/lm_sensors/NVCtrl.c @@ -38,8 +38,8 @@ static const char *nvctrl_extension_name = NV_CONTROL_NAME; #define XNVCTRLSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, nvctrl_extension_name) -static int close_display(); -static Bool wire_to_event(); +static int close_display(Display*, XExtCodes*); +static Bool wire_to_event(Display*, XEvent*, xEvent*); static const XExtensionHooks nvctrl_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 9514bc5..d696c92 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -58,7 +58,7 @@ KSim::PluginPage *PluginModule::createConfigPage(const char *className) void PluginModule::showAbout() { - TQString version = kapp->aboutData()->version(); + TQString version = tdeApp->aboutData()->version(); TDEAboutData aboutData(instanceName(), I18N_NOOP("KSim Sensors Plugin"), version.latin1(), @@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); - connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)), - this, TQT_SLOT(updateSensors(const SensorList &))); + connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)), + this, TQ_SLOT(updateSensors(const SensorList &))); insertSensors(); } diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 9c1e801..f53082d 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class SensorsView : public KSim::PluginView, public KSimSensorsIface { - Q_OBJECT + TQ_OBJECT public: SensorsView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index c81ad56..2852134 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -25,7 +25,7 @@ #include <tdelocale.h> #include <tqglobal.h> #include <klibloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tqtimer.h> @@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject() } m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update())); } SensorBase::~SensorBase() diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h index 948a09b..8882920 100644 --- a/ksim/monitors/lm_sensors/sensorbase.h +++ b/ksim/monitors/lm_sensors/sensorbase.h @@ -90,7 +90,7 @@ class SensorList : public TQValueList<SensorInfo> class SensorBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SensorBase *self(); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1a1f4a1..e8afb88 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(2, 80); m_sensorView->setAllColumnsShowFocus(true); - connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *, - TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *, + connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *, + TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 ); m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index dff799e..7922433 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -35,7 +35,7 @@ class TQTimer; class SensorsConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: SensorsConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index bf67d46..fdfc977 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent ) // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); TQTimer* timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) ); timer->start( 100 ); } diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index d40ee33..1d1ff80 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -38,7 +38,7 @@ public: class MailView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: MailView( KSim::PluginObject* parent, const char* name ); @@ -52,7 +52,7 @@ private slots: class MailLabel : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: MailLabel( TQWidget* parent ); @@ -78,7 +78,7 @@ private: class MailConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: MailConfig( KSim::PluginObject* parent, const char* name ); 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); diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 6a4381d..3aeb2b1 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -95,11 +95,11 @@ void BrowseDialog::startWalk( const Identifier &startOid ) { stopWalker(); - m_walker = new Walker( m_host, startOid, TQT_TQOBJECT(this) ); - connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - connect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + m_walker = new Walker( m_host, startOid, this ); + connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + connect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); stop->setEnabled( true ); } @@ -109,10 +109,10 @@ void BrowseDialog::stopWalker() if ( !m_walker ) return; - disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - disconnect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + disconnect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); m_walker->deleteLater(); m_walker = 0; diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index a6a7904..910a3e0 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -38,7 +38,7 @@ namespace Snmp class BrowseDialog : public BrowseDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index 103537a..94255e7 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -251,11 +251,11 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">stopAllWalks()</slot> <slot access="protected">applyFilter()</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index bcf5f19..c128de3 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -30,7 +30,7 @@ namespace Snmp class ChartMonitor : public KSim::Chart { - Q_OBJECT + TQ_OBJECT public: ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index e1dfcca..4ecd44e 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name ) m_page = new ConfigWidget( this ); - connect( m_page->addHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewHost() ) ); - connect( m_page->modifyHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyHost() ) ); - connect( m_page->removeHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeHost() ) ); - - connect( m_page->addMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewMonitor() ) ); - connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyMonitor() ) ); - connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeMonitor() ) ); - - connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); - connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->addHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewHost() ) ); + connect( m_page->modifyHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyHost() ) ); + connect( m_page->removeHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeHost() ) ); + + connect( m_page->addMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewMonitor() ) ); + connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyMonitor() ) ); + connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeMonitor() ) ); + + connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); } ConfigPage::~ConfigPage() diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index 3311284..03246f9 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -78,7 +78,7 @@ class Plugin; class ConfigPage : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage( Plugin *parent, const char *name ); diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index 9508d77..3b5cb6c 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -32,7 +32,7 @@ namespace Snmp class HostDialog : public HostDialogBase { - Q_OBJECT + TQ_OBJECT public: HostDialog( TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d02104d..650e262 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -508,12 +508,12 @@ <tabstop>buttonCancel</tabstop> <tabstop>communityString</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">showSnmpAuthenticationDetailsForVersion(const TQString &)</slot> <slot>enableDisabledAuthenticationAndPrivacyElementsForSecurityLevel(const TQString &)</slot> <slot>checkValidity()</slot> <slot access="protected">testHost()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index a6f277c..73a54d5 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -32,7 +32,7 @@ namespace Snmp class LabelMonitor : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index aa645cf..1294c10 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ else m_timerId = -1; - TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) ); } Monitor::~Monitor() diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index 56bd03b..e56f81c 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -33,7 +33,7 @@ namespace Snmp class Monitor : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 6f6575d..4e42bda 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -107,9 +107,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name else w = new ChartMonitor( *this, parent, name ); - Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); - TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), - w, TQT_SLOT( setData( const Value & ) ) ); + Monitor *monitor = new Monitor( host, id, refresh, w ); + TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ), + w, TQ_SLOT( setData( const Value & ) ) ); return w; } diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index e778cd7..bbb1ecb 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -31,7 +31,7 @@ namespace Snmp class MonitorDialog : public MonitorDialogBase { - Q_OBJECT + TQ_OBJECT public: MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index a6d2e2d..285514f 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -428,10 +428,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">checkValues()</slot> <slot access="protected">browse()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp index e06539a..9ad1110 100644 --- a/ksim/monitors/snmp/pdu.cpp +++ b/ksim/monitors/snmp/pdu.cpp @@ -48,7 +48,7 @@ PDU::~PDU() void PDU::addNullVariables( const IdentifierList &oids ) { std::for_each( oids.begin(), oids.end(), - std::bind1st( std::mem_fun( &PDU::addNullVariable ), this ) ); + std::bind( std::mem_fn( &PDU::addNullVariable ), this, std::placeholders::_1 ) ); } void PDU::addNullVariable( Identifier oid ) diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 489080e..2c9e930 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -77,12 +77,12 @@ void ProbeDialog::probeOne() Identifier oid = m_probeOIDs.pop(); delete m_currentMonitor; - m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, TQT_TQOBJECT(this) ); + m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this ); - connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ), - this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) ); - connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), - this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ), + this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), + this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); } void ProbeDialog::probeResult( const Identifier &oid, const Value &value ) @@ -108,7 +108,7 @@ void ProbeDialog::nextProbe() if ( m_canceled ) KProgressDialog::done( TQDialog::Rejected ); else - TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) ); } #include "probedialog.moc" diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index cf5833a..b307435 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -37,7 +37,7 @@ class Monitor; class ProbeDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 30529d7..47a758c 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -32,7 +32,7 @@ namespace Snmp class ProbeResultDialog : public ProbeResultDialogBase { - Q_OBJECT + TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 6839283..b52fe5c 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -186,9 +186,16 @@ bool Session::initialize( ErrorInfo *error ) } switch ( source.privacy.protocol ) { + case AESPrivacy: { + d->defaultSession.securityPrivProto = usmAESPrivProtocol; + d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; + break; + } case DESPrivacy: { +#ifndef NETSNMP_DISABLE_DES d->defaultSession.securityPrivProto = usmDESPrivProtocol; d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; +#endif break; } default: assert( false ); diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index 333f0d2..1256228 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -48,7 +48,8 @@ static const struct EnumStringMapInfo { MD5Auth, "MD5", 0 }, { SHA1Auth, "SHA1", 0 }, { 0, 0, 0 } -}, privacyProtocolStrings[ 2 ] = { +}, privacyProtocolStrings[ 3 ] = { + { AESPrivacy, "AES", 0 }, { DESPrivacy, "DES", 0 }, { 0, 0, 0 } }; diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index c00e110..4b1e4fb 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -46,7 +46,10 @@ TQStringList allAuthenticationProtocols(); TQString authenticationProtocolToString( AuthenticationProtocol proto ); AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = 0 ); -enum PrivacyProtocol { DESPrivacy }; +enum PrivacyProtocol { + AESPrivacy, + DESPrivacy +}; TQStringList allPrivacyProtocols(); TQString privacyProtocolToString( PrivacyProtocol proto ); PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = 0 ); diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index 497001a..6ddae38 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -34,7 +34,7 @@ class Plugin; class View : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: View( Plugin *parent, const char *name ); diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 81a36f4..c74097b 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -29,7 +29,7 @@ using namespace KSim::Snmp; namespace { template <class T> - struct Deleter : public std::unary_function<T, void> + struct Deleter : public std::function<void(T)> { void operator()( T arg ) { delete arg; } diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index cf9e145..64052cf 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -35,7 +35,7 @@ namespace Snmp class Walker : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index 9ab7f60..5ebc7ea 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -29,7 +29,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tdefontdialog.h> @@ -77,11 +77,11 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); - connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURL(const TQString &))); + connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURL(const TQString &))); m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4); - m_line = new KSeparator(Qt::Horizontal, this); + m_line = new KSeparator(TQt::Horizontal, this); m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4); m_authorLabel = new TQLabel(this); @@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_listView = new TDEListView(this); m_listView->addColumn(i18n("Theme")); m_listView->setFullWidth(true); - connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(selectItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(selectItem(TQListViewItem *))); m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4); m_alternateLabel = new TQLabel(this); @@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontsCombo->insertItem(i18n("Default")); m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_fontsCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(showFontDialog(int))); + connect(m_fontsCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(showFontDialog(int))); m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4); TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes"); @@ -178,7 +178,7 @@ void KSim::ThemePrefs::setThemeAlts(int alternatives) void KSim::ThemePrefs::openURL(const TQString &url) { - kapp->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void KSim::ThemePrefs::insertItems(const ThemeInfoList &itemList) diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 8fca089..828d649 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -75,7 +75,7 @@ namespace KSim class ThemePrefs : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ThemePrefs(TQWidget *parent, const char *name=0); |