diff options
Diffstat (limited to 'ksim/library')
-rw-r--r-- | ksim/library/Makefile.am | 2 | ||||
-rw-r--r-- | ksim/library/chart.cpp | 10 | ||||
-rw-r--r-- | ksim/library/chart.h | 4 | ||||
-rw-r--r-- | ksim/library/common.h | 2 | ||||
-rw-r--r-- | ksim/library/ksimconfig.h | 2 | ||||
-rw-r--r-- | ksim/library/label.h | 4 | ||||
-rw-r--r-- | ksim/library/led.h | 6 | ||||
-rw-r--r-- | ksim/library/pluginglobal.h | 4 | ||||
-rw-r--r-- | ksim/library/pluginloader.h | 6 | ||||
-rw-r--r-- | ksim/library/pluginmodule.cpp | 4 | ||||
-rw-r--r-- | ksim/library/pluginmodule.h | 12 | ||||
-rw-r--r-- | ksim/library/progress.h | 4 | ||||
-rw-r--r-- | ksim/library/themeloader.h | 4 |
13 files changed, 32 insertions, 32 deletions
diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am index f68b0a5..1b1947f 100644 --- a/ksim/library/Makefile.am +++ b/ksim/library/Makefile.am @@ -7,7 +7,7 @@ libksimcore_la_SOURCES = common.cpp themeloader.cpp \ pluginmodule.cpp ksimconfig.cpp libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined -libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -ltdefx +libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) -ltdefx ksiminclude_HEADERS = common.h themeloader.h \ chart.h label.h \ 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..1cb53be 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -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..6f6ae56 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -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.h b/ksim/library/ksimconfig.h index 8f7376d..f16a67e 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -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..40c0b48 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -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..de912c8 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -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.h b/ksim/library/pluginglobal.h index e094198..7258ce5 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -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: /** @@ -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.h b/ksim/library/pluginloader.h index 912297c..7f3b3f8 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -27,7 +27,7 @@ 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: diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7f450de..150a2ba 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -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..e7dc363 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -29,7 +29,7 @@ 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..1439652 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -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.h b/ksim/library/themeloader.h index c70dc92..cb38b2c 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -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: /** |