summaryrefslogtreecommitdiffstats
path: root/ksim/library
diff options
context:
space:
mode:
Diffstat (limited to 'ksim/library')
-rw-r--r--ksim/library/chart.cpp10
-rw-r--r--ksim/library/chart.h6
-rw-r--r--ksim/library/common.h4
-rw-r--r--ksim/library/ksimconfig.cpp2
-rw-r--r--ksim/library/ksimconfig.h4
-rw-r--r--ksim/library/label.h6
-rw-r--r--ksim/library/led.h8
-rw-r--r--ksim/library/pluginglobal.cpp6
-rw-r--r--ksim/library/pluginglobal.h12
-rw-r--r--ksim/library/pluginloader.cpp16
-rw-r--r--ksim/library/pluginloader.h14
-rw-r--r--ksim/library/pluginmodule.cpp6
-rw-r--r--ksim/library/pluginmodule.h14
-rw-r--r--ksim/library/progress.h6
-rw-r--r--ksim/library/themeloader.cpp4
-rw-r--r--ksim/library/themeloader.h6
16 files changed, 62 insertions, 62 deletions
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:
/**
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-16 02:54:59 +0000