From 7ea89afa119615e547323a7a482ea7fef8e67029 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:52 -0600 Subject: Remove additional unneeded tq method conversions --- ksim/library/chart.cpp | 20 ++++++++++---------- ksim/library/label.cpp | 12 ++++++------ ksim/library/label.h | 2 +- ksim/library/led.h | 2 +- ksim/library/pluginloader.cpp | 8 ++++---- ksim/library/themeloader.cpp | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'ksim/library') diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 388b9ea..b68c073 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -263,7 +263,7 @@ void KSim::Chart::configureObject(bool repaintWidget) d->krell->show(); } - // Update our tqgeometry if we need to let any + // Update our geometry if we need to let any // tqlayout know about our sizeHint() change if (oldSize != sizeHint()) { // Using resize() here seems to be needed @@ -333,19 +333,19 @@ void KSim::Chart::setDisplayMeter(bool value) void KSim::Chart::setText(const TQString &in, const TQString &out) { - bool tqrepaint = false; + bool repaint = false; if (d->inText != in) { - tqrepaint = true; + repaint = true; d->inText = in; } if (d->outText != out) { - tqrepaint = true; + repaint = true; d->outText = out; } - if (tqrepaint) + if (repaint) update(); } @@ -407,13 +407,13 @@ void KSim::Chart::setValue(int valueIn, int valueOut) void KSim::Chart::setConfigValues() { TQFont newFont = font(); - bool tqrepaint = themeLoader().current().fontColours(this, + bool repaint = themeLoader().current().fontColours(this, newFont, d->mColour, d->sColour, d->showShadow); if (font() != newFont) setFont(newFont); - if (tqrepaint) + if (repaint) update(); } @@ -446,7 +446,7 @@ void KSim::Chart::paintEvent(TQPaintEvent *) const TQSize &size = chartSize(); TQPixmap pixmap(size); TQPainter painter; - painter.tqbegin(&pixmap, this); + painter.begin(&pixmap, this); int location = size.height() / 5; painter.drawPixmap(0, 0, d->chartPixmap); @@ -521,7 +521,7 @@ void KSim::Chart::drawChart() TQPainter painter; d->graphData.setMask(drawMask(&painter)); - painter.tqbegin(&d->graphData, this); + painter.begin(&d->graphData, this); int position = width() - 1; TQValueList::ConstIterator it; @@ -553,7 +553,7 @@ TQSize KSim::Chart::chartSize() const TQBitmap KSim::Chart::drawMask(TQPainter *painter) { TQBitmap bitmap(chartSize(), true); - painter->tqbegin(&bitmap, this); + painter->begin(&bitmap, this); painter->setPen(color1); int position = width() - 1; diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 32a18d8..4aa12b0 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -136,10 +136,10 @@ void KSim::Label::clear() void KSim::Label::setText(const TQString &text) { if (text == d->text) - return; // If the text is the same, no need to tqrepaint etc + return; // If the text is the same, no need to repaint etc TQSize oldSize = sizeHint(); - // set the text of our widget and tqrepaint + // set the text of our widget and repaint d->text = text; relayoutLabel(oldSize); } @@ -183,13 +183,13 @@ const TQColor &KSim::Label::shadowColour() const void KSim::Label::setConfigValues() { TQFont newFont = font(); - bool tqrepaint = themeLoader().current().fontColours(this, + bool repaint = themeLoader().current().fontColours(this, newFont, d->mColour, d->sColour, d->showShadow); if (font() != newFont) setFont(newFont); - if (tqrepaint) + if (repaint) update(); } @@ -276,13 +276,13 @@ void KSim::Label::setThemePixmap(const TQString &image) relayoutLabel(oldSize); } -void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint) +void KSim::Label::relayoutLabel(const TQSize &old, bool repaint) { if (sizeHint() != old) { updateGeometry(); } - if (tqrepaint) + if (repaint) update(); } diff --git a/ksim/library/label.h b/ksim/library/label.h index 8ae9b64..9e24c95 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 relayoutLabel(const TQSize &old, bool tqrepaint = true); + void relayoutLabel(const TQSize &old, bool repaint = true); private: /** diff --git a/ksim/library/led.h b/ksim/library/led.h index bdb26f4..6dcecce 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -88,7 +88,7 @@ namespace KSim */ Type type() const; /** - * Force the Led to tqrepaint its state + * Force the Led to repaint its state */ void update(); diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 775a02e..71b17b7 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -92,13 +92,13 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) case KSim::PluginLoader::EmptyLibName: KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" " due to the X-KSIM-LIBRARY property being empty in the" - " plugins desktop file").tqarg(file.readName())); + " plugins desktop file").arg(file.readName())); return false; break; case KSim::PluginLoader::LibNotFound: KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" " due to not being able to find the plugin, check that the plugin" - " is installed and is in your $TDEDIR/lib path").tqarg(file.readName())); + " is installed and is in your $TDEDIR/lib path").arg(file.readName())); return false; break; case KSim::PluginLoader::UnSymbols: @@ -108,8 +108,8 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) " macro\n
  • The plugin has been damaged or has" " some unresolved symbols
    • \n \nLast" " error message that occurred: \n%3") - .tqarg(d->lib.prepend("ksim_")).tqarg("KSIM_INIT_PLUGIN") - .tqarg(d->error)); + .arg(d->lib.prepend("ksim_")).arg("KSIM_INIT_PLUGIN") + .arg(d->error)); return false; break; default: diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index a453af2..a7e21da 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -718,14 +718,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font, TQColor &text, TQColor &shadow, bool &showShadow) const { TQString key = KSim::Types::typeToString(type, false); - bool tqrepaint = false; + bool repaint = false; // set colours from the string 'key' if (!readEntry(string, key + ".textcolor").isEmpty()) { text= textColour(string, key + ".textcolor"); shadow = shadowColour(string, key + ".textcolor"); showShadow = textShadow(string, key + ".textcolor"); - tqrepaint = true; + repaint = true; } else { text= textColour(string, "*.textcolor"); @@ -737,14 +737,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font, if (!readEntry(string, key + ".font").isEmpty()) { if (KSim::ThemeLoader::currentFontItem() != 3) { font = readFontEntry(string, key + ".font"); - tqrepaint = true; + repaint = true; } } else { font = currentFont(); } - return tqrepaint; + return repaint; } bool KSim::Theme::fontColours(const KSim::Base *const base, TQFont &font, -- cgit v1.2.1