summaryrefslogtreecommitdiffstats
path: root/ksim
diff options
context:
space:
mode:
Diffstat (limited to 'ksim')
-rw-r--r--ksim/ksimpref.cpp2
-rw-r--r--ksim/ksimview.cpp14
-rw-r--r--ksim/ksimview.h4
-rw-r--r--ksim/library/label.cpp10
-rw-r--r--ksim/library/label.h2
-rw-r--r--ksim/library/led.cpp6
-rw-r--r--ksim/library/led.h2
-rw-r--r--ksim/library/pluginmodule.cpp4
-rw-r--r--ksim/library/pluginmodule.h4
-rw-r--r--ksim/library/progress.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp4
-rw-r--r--ksim/monitors/snmp/browsedialogbase.ui2
-rw-r--r--ksim/monitors/snmp/configwidget.ui2
-rw-r--r--ksim/monitors/snmp/hostdialog.cpp2
-rw-r--r--ksim/monitors/snmp/hostdialogbase.ui2
-rw-r--r--ksim/monitors/snmp/monitordialogbase.ui2
-rw-r--r--ksim/monitors/snmp/proberesultdialogbase.ui2
17 files changed, 33 insertions, 33 deletions
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 6d426c7..9115fea 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -126,7 +126,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name)
return;
}
- TQWidget *frame = plugin.configPage()->tqparentWidget();
+ TQWidget *frame = plugin.configPage()->parentWidget();
// reparent the widget if the tqparent is not null
if (frame) {
plugin.configPage()->hide();
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index b0b35b6..5624f54 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -150,7 +150,7 @@ KSim::MainView::MainView(KConfig *config,
addPlugins();
}
- connect(&m_tqmaskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
+ connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
}
KSim::MainView::~MainView()
@@ -160,7 +160,7 @@ KSim::MainView::~MainView()
void KSim::MainView::show()
{
- tqmaskMainView();
+ maskMainView();
TQWidget::show();
}
@@ -207,10 +207,10 @@ const TQString &KSim::MainView::hostname() const
void KSim::MainView::slotMaskMainView()
{
- tqmaskMainView();
+ maskMainView();
}
-void KSim::MainView::tqmaskMainView()
+void KSim::MainView::maskMainView()
{
if (!m_topFrame->background()->tqmask() ||
!m_leftFrame->background()->tqmask() ||
@@ -228,7 +228,7 @@ void KSim::MainView::tqmaskMainView()
TQSize insideSize(m_pluginLayout->tqgeometry().size());
- // make a cleared bigrect where we can put our pixmap tqmasks on
+ // make a cleared bigrect where we can put our pixmap masks on
TQBitmap bigBitmap(tqtopLevelWidget()->size(), true);
// better return if our bitmap is null so we can avoid crashes
@@ -318,7 +318,7 @@ void KSim::MainView::reparseConfig(bool emitReload,
KSim::ThemeLoader::self().themeColours(this);
m_sysinfo->createView();
- tqmaskMainView();
+ maskMainView();
m_topLevel->reparse();
@@ -404,7 +404,7 @@ void KSim::MainView::preferences()
void KSim::MainView::resizeEvent(TQResizeEvent *re)
{
TQWidget::resizeEvent(re);
- m_tqmaskTimer.start(0, true);
+ m_maskTimer.start(0, true);
}
void KSim::MainView::paletteChange(const TQPalette &)
diff --git a/ksim/ksimview.h b/ksim/ksimview.h
index c6c158e..a1930f5 100644
--- a/ksim/ksimview.h
+++ b/ksim/ksimview.h
@@ -68,7 +68,7 @@ namespace KSim
k_dcop:
const TQString &hostname() const;
- virtual void tqmaskMainView();
+ virtual void maskMainView();
signals:
void reload();
@@ -107,7 +107,7 @@ namespace KSim
TQBoxLayout *m_pluginLayout;
TQPoint m_mousePoint;
int m_oldLocation;
- TQTimer m_tqmaskTimer;
+ TQTimer m_maskTimer;
};
}
#endif // KSIMVIEW_H
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 1f32724..37b86b3 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -91,7 +91,7 @@ void KSim::Label::configureObject(bool repaintWidget)
TQSize oldSize = tqsizeHint();
setConfigValues();
- retqlayoutLabel(oldSize, repaintWidget);
+ relayoutLabel(oldSize, repaintWidget);
}
void KSim::Label::setPixmap(const TQPixmap &pixmap)
@@ -102,7 +102,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap)
TQSize oldSize = tqsizeHint();
d->sidePixmap = pixmap;
- retqlayoutLabel(oldSize);
+ relayoutLabel(oldSize);
}
const TQPixmap &KSim::Label::pixmap() const
@@ -141,7 +141,7 @@ void KSim::Label::setText(const TQString &text)
TQSize oldSize = tqsizeHint();
// set the text of our widget and tqrepaint
d->text = text;
- retqlayoutLabel(oldSize);
+ relayoutLabel(oldSize);
}
void KSim::Label::extraTypeCall()
@@ -273,10 +273,10 @@ void KSim::Label::setThemePixmap(const TQString &image)
d->meterImage.load(image);
KSim::ThemeLoader::self().reColourImage(d->meterImage);
d->background = d->meterImage.smoothScale(size());
- retqlayoutLabel(oldSize);
+ relayoutLabel(oldSize);
}
-void KSim::Label::retqlayoutLabel(const TQSize &old, bool tqrepaint)
+void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
{
if (tqsizeHint() != old) {
updateGeometry();
diff --git a/ksim/library/label.h b/ksim/library/label.h
index 484b36b..a888d89 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -196,7 +196,7 @@ namespace KSim
* sets the background image to be painted
*/
void setThemePixmap(const TQString &image);
- void retqlayoutLabel(const TQSize &old, bool tqrepaint = true);
+ void relayoutLabel(const TQSize &old, bool tqrepaint = true);
private:
/**
diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp
index 6977304..f2acc2b 100644
--- a/ksim/library/led.cpp
+++ b/ksim/library/led.cpp
@@ -228,7 +228,7 @@ void KSim::LedLabel::configureObject(bool reapaintWidget)
d->sendLed.update();
setConfigValues();
- tqlayoutLeds();
+ layoutLeds();
if (reapaintWidget)
update();
@@ -313,10 +313,10 @@ void KSim::LedLabel::paintEvent(TQPaintEvent *ev)
void KSim::LedLabel::resizeEvent(TQResizeEvent *ev)
{
KSim::Progress::resizeEvent(ev);
- tqlayoutLeds();
+ layoutLeds();
}
-void KSim::LedLabel::tqlayoutLeds()
+void KSim::LedLabel::layoutLeds()
{
int ledHeight = height() / 2;
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 1d0cb4f..8ed0a14 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -184,7 +184,7 @@ namespace KSim
virtual void resizeEvent(TQResizeEvent *);
private:
- void tqlayoutLeds();
+ void layoutLeds();
void init();
class Private;
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 7dff303..cfc57de 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -163,12 +163,12 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev)
doCommand();
}
-KSim::PluginObject *KSim::PluginView::tqparentPlugin() const
+KSim::PluginObject *KSim::PluginView::parentPlugin() const
{
return d->tqparent;
}
void KSim::PluginView::showAbout()
{
- tqparentPlugin()->showAbout();
+ parentPlugin()->showAbout();
}
diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h
index 39baef4..91285f4 100644
--- a/ksim/library/pluginmodule.h
+++ b/ksim/library/pluginmodule.h
@@ -145,7 +145,7 @@ namespace KSim
void pageChanged();
protected:
- PluginObject *tqparentPlugin() const;
+ PluginObject *parentPlugin() const;
private:
class Private;
@@ -194,7 +194,7 @@ namespace KSim
protected:
virtual void mousePressEvent(TQMouseEvent *);
- PluginObject *tqparentPlugin() const;
+ PluginObject *parentPlugin() const;
private slots:
void showAbout();
diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp
index 32311e4..bbdbd61 100644
--- a/ksim/library/progress.cpp
+++ b/ksim/library/progress.cpp
@@ -188,7 +188,7 @@ void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap)
{
TQSize oldSize = tqsizeHint();
d->meterPixmap = pixmap;
- retqlayoutLabel(oldSize);
+ relayoutLabel(oldSize);
}
int KSim::Progress::xLocation() const
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 5d20213..fb3b3ed 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -158,8 +158,8 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
default:
break;
case Qt::LeftButton:
- if (tqparentWidget()->inherits("KSim::PluginView"))
- static_cast<KSim::PluginView *>(tqparentWidget())->doCommand();
+ if (parentWidget()->inherits("KSim::PluginView"))
+ static_cast<KSim::PluginView *>(parentWidget())->doCommand();
break;
}
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index c3efab1..ed7d93d 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -253,7 +253,7 @@
<slot access="protected">applyFilter()</slot>
<slot access="protected">objectSelected(TQListViewItem *)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 2d6134f..608dc8f 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -207,7 +207,7 @@
<tabstop>modifyMonitor</tabstop>
<tabstop>removeMonitor</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp
index b237bfe..e8eceab 100644
--- a/ksim/monitors/snmp/hostdialog.cpp
+++ b/ksim/monitors/snmp/hostdialog.cpp
@@ -141,7 +141,7 @@ void HostDialog::init( const HostConfig &src )
{
// hide these, there's nothing to choose right now. might be that
// net-snmp will support different privacy types in the future, but
- // aptqparently not now.
+ // apparently not now.
privacyTypeLabel->hide();
privacyType->hide();
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index 935d013..d3da054 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -514,7 +514,7 @@
<slot>checkValidity()</slot>
<slot access="protected">testHost()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index bb6a059..5f9fb53 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -432,7 +432,7 @@
<slot access="protected">checkValues()</slot>
<slot access="protected">browse()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index be32c72..c3df9bd 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -117,7 +117,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>