summaryrefslogtreecommitdiffstats
path: root/ksim
diff options
context:
space:
mode:
Diffstat (limited to 'ksim')
-rw-r--r--ksim/ksim.cpp2
-rw-r--r--ksim/ksimview.cpp2
-rw-r--r--ksim/library/pluginmodule.cpp2
-rw-r--r--ksim/monitors/cpu/ksimcpu.cpp2
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemstats.cpp5
-rw-r--r--ksim/monitors/filesystem/ksimfsystem.cpp2
-rw-r--r--ksim/monitors/i8k/ksimi8k.cpp2
-rw-r--r--ksim/monitors/lm_sensors/NVCtrl.c4
-rw-r--r--ksim/monitors/lm_sensors/ksimsensors.cpp2
-rw-r--r--ksim/monitors/net/ksimnet.cpp2
-rw-r--r--ksim/monitors/net/netdialog.cpp2
-rw-r--r--ksim/themeprefs.cpp2
13 files changed, 13 insertions, 18 deletions
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 445ba8c..544c12e 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -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/ksimview.cpp b/ksim/ksimview.cpp
index 91fd84c..e112ece 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -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())
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 150a2ba..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
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 68d720b..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(),
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index fe278b5..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(),
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/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 262ae93..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(),
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 556f15c..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(),
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 e920df9..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(),
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 2167abe..20c0c9d 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -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(),
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 39ea761..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);
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index b39d02c..ece303f 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -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)
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-04 13:31:12 +0000