diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:35:27 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:35:27 -0600 |
commit | bcc684e28ad6f9ebeeae5d334a4dc297cef3e816 (patch) | |
tree | 07fafab2b93966c9e2128ba52337a43d388d300c /ksim | |
parent | 955e20356d63ed405198c8143617a8a0ca8bfc02 (diff) | |
download | tdeutils-bcc684e28ad6f9ebeeae5d334a4dc297cef3e816.tar.gz tdeutils-bcc684e28ad6f9ebeeae5d334a4dc297cef3e816.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'ksim')
33 files changed, 118 insertions, 118 deletions
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index 3727b1f..0e89bc1 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -61,7 +61,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeHSpin->setValue(40); m_sizeHSpin->setMinValue(40); m_sizeHSpin->setMaxValue(200); - m_sizeHSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_sizeHSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); sizeBoxLayout->addWidget(m_sizeHSpin, 0, 1); @@ -77,7 +77,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeWSpin->setValue(58); m_sizeWSpin->setMinValue(58); m_sizeWSpin->setMaxValue(200); - m_sizeWSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_sizeWSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); sizeBoxLayout->addWidget(m_sizeWSpin, 1, 1); @@ -168,7 +168,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeCombo = new KComboBox(true, this); m_uptimeCombo->setDuplicatesEnabled(false); - m_uptimeCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_uptimeCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); m_uptimeCombo->insertItem(i18n("%hh:%mm:%ss")); m_uptimeCombo->insertItem(i18n("%dd %h:%m")); @@ -214,7 +214,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeBox->tqlayout()->setSpacing(0); m_uptimeBox->tqlayout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout()); - m_boxLayout->tqsetAlignment(TQt::AlignTop); + m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setSpacing(6); m_boxLayout->setMargin(11); @@ -305,7 +305,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memCombo = new KComboBox(true, this); m_memCombo->setDuplicatesEnabled(false); - m_memCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_memCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); @@ -350,7 +350,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memBox->tqlayout()->setSpacing(0); m_memBox->tqlayout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout()); - m_boxLayout->tqsetAlignment(TQt::AlignTop); + m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setSpacing(6); m_boxLayout->setMargin(11); @@ -458,7 +458,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapCombo = new KComboBox(true, this); m_swapCombo->setDuplicatesEnabled(false); - m_swapCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_swapCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); //m_swapCombo->insertItem(i18n("%tM - %fM free")); //m_swapCombo->insertItem(i18n("%tM - %uM used")); @@ -499,7 +499,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapBox->tqlayout()->setSpacing(0); m_swapBox->tqlayout()->setMargin(0); m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout()); - m_boxLayout->tqsetAlignment(TQt::AlignTop); + m_boxLayout->setAlignment(TQt::AlignTop); m_boxLayout->setSpacing(6); m_boxLayout->setMargin(11); diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 2e2587e..8a2b643 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -75,9 +75,9 @@ KSim::PanelExtension::~PanelExtension() delete m_dcopClient; } -TQSize KSim::PanelExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize KSim::PanelExtension::sizeHint(Position p, TQSize maxSize) const { - return m_view->tqsizeHint(p, maxSize); + return m_view->sizeHint(p, maxSize); } void KSim::PanelExtension::resizeEvent(TQResizeEvent *) diff --git a/ksim/ksim.h b/ksim/ksim.h index 2c1a4f5..5451b83 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -42,7 +42,7 @@ namespace KSim ~PanelExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; void resizeEvent(TQResizeEvent *); Position preferedPosition() const; diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 6813aeb..49e4608 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate() // only update the date when necessary if (m_dateLabel) { if (updateDate) { - m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); + m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate())); updateDate = false; } } diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 1e93816..af53876 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -183,8 +183,8 @@ KSim::Config *KSim::MainView::config() const void KSim::MainView::makeDirs() { TQString homeDir = locateLocal("data", "ksim"); - TQString themeDir = homeDir + TQString::tqfromLatin1("/themes"); - TQString monitorDir = homeDir + TQString::tqfromLatin1("/monitors"); + TQString themeDir = homeDir + TQString::fromLatin1("/themes"); + TQString monitorDir = homeDir + TQString::fromLatin1("/monitors"); // return true if the dirs already exist if (TQFile::exists(themeDir) && TQFile::exists(monitorDir)) @@ -217,7 +217,7 @@ void KSim::MainView::maskMainView() !m_rightFrame->background()->mask() || !m_bottomFrame->background()->mask()) { - tqtopLevelWidget()->clearMask(); + topLevelWidget()->clearMask(); return; } @@ -229,13 +229,13 @@ void KSim::MainView::maskMainView() TQSize insideSize(m_pluginLayout->tqgeometry().size()); // make a cleared bigrect where we can put our pixmap masks on - TQBitmap bigBitmap(tqtopLevelWidget()->size(), true); + TQBitmap bigBitmap(topLevelWidget()->size(), true); // better return if our bitmap is null so we can avoid crashes if (bigBitmap.isNull()) return; - TQPoint ofs = mapTo(tqtopLevelWidget(), TQPoint(0,0)); + TQPoint ofs = mapTo(topLevelWidget(), TQPoint(0,0)); int ofsX = ofs.x(); int ofsY = ofs.y(); @@ -254,7 +254,7 @@ void KSim::MainView::maskMainView() bottomPixmap); painter.end(); - tqtopLevelWidget()->setMask(bigBitmap); + topLevelWidget()->setMask(bigBitmap); } void KSim::MainView::reparseConfig(bool emitReload, @@ -430,7 +430,7 @@ void KSim::MainView::destroyPref() } } -TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const +TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const { int width = 0; int height = 0; @@ -439,7 +439,7 @@ TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const for( TQLayoutIterator it = m_pluginLayout->iterator(); (child = it.current()) != 0; ++it) { - TQSize sz = child->tqminimumSize(); + TQSize sz = child->minimumSize(); if ((p == KPanelExtension::Right) || (p == KPanelExtension::Left)) { width = TQMAX(width, sz.width()); diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 7aaacf1..6bbb989 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -63,7 +63,7 @@ namespace KSim KSim::Config *config() const; void makeDirs(); - TQSize tqsizeHint(KPanelExtension::Position, TQSize maxSize) const; + TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const; void positionChange(Qt::Orientation); k_dcop: diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index ca555a4..388b9ea 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -251,7 +251,7 @@ void KSim::Chart::buildPixmaps() void KSim::Chart::configureObject(bool repaintWidget) { - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); KSim::Config::config()->setGroup("Misc"); d->size = KSim::Config::config()->readSizeEntry("GraphSize"); @@ -264,10 +264,10 @@ void KSim::Chart::configureObject(bool repaintWidget) } // Update our tqgeometry if we need to let any - // tqlayout know about our tqsizeHint() change - if (oldSize != tqsizeHint()) { + // tqlayout know about our sizeHint() change + if (oldSize != sizeHint()) { // Using resize() here seems to be needed - resize(tqsizeHint()); + resize(sizeHint()); updateGeometry(); } @@ -279,14 +279,14 @@ void KSim::Chart::configureObject(bool repaintWidget) update(); } -TQSize KSim::Chart::tqsizeHint() const +TQSize KSim::Chart::sizeHint() const { return d->size; } -TQSize KSim::Chart::tqminimumSizeHint() const +TQSize KSim::Chart::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } void KSim::Chart::resizeEvent(TQResizeEvent *re) @@ -608,7 +608,7 @@ void KSim::Chart::init(bool krell, int maxValue, const TQString &title) { setConfigString("StyleChart"); setThemeConfigOnly(false); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); d = new Private; KSim::Config::config()->setGroup("Misc"); diff --git a/ksim/library/chart.h b/ksim/library/chart.h index cd658c0..6f8cfeb 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -109,11 +109,11 @@ namespace KSim /** * reimplemented for internal reasons */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * reimplemented for internal reasons */ - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; void disableAutomaticUpdates(); diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 0b9ed18..32a18d8 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -88,7 +88,7 @@ void KSim::Label::configureObject(bool repaintWidget) d->meterImage.load(image); KSim::ThemeLoader::self().reColourImage(d->meterImage); d->background = d->meterImage.smoothScale(size()); - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); setConfigValues(); relayoutLabel(oldSize, repaintWidget); @@ -99,7 +99,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap) if (pixmap.serialNumber() == d->sidePixmap.serialNumber()) return; - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); d->sidePixmap = pixmap; relayoutLabel(oldSize); @@ -110,7 +110,7 @@ const TQPixmap &KSim::Label::pixmap() const return d->sidePixmap; } -TQSize KSim::Label::tqsizeHint() const +TQSize KSim::Label::sizeHint() const { int width = fontMetrics().size(SingleLine, text()).width(); if (!pixmap().isNull()) @@ -123,9 +123,9 @@ TQSize KSim::Label::tqsizeHint() const return TQSize(width, height); } -TQSize KSim::Label::tqminimumSizeHint() const +TQSize KSim::Label::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } void KSim::Label::clear() @@ -138,7 +138,7 @@ void KSim::Label::setText(const TQString &text) if (text == d->text) return; // If the text is the same, no need to tqrepaint etc - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); // set the text of our widget and tqrepaint d->text = text; relayoutLabel(oldSize); @@ -232,7 +232,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect, if (!pixmap().isNull()) location.setX(pixmap().width() + 5); - tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true, + tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true, 0, text, -1, &color); } @@ -242,7 +242,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect, TQRect location(rect); location.setWidth(pixmap.width()); - tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true, + tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true, pixmap.isNull() ? 0 : &pixmap, TQString()); } @@ -268,7 +268,7 @@ const TQRect &KSim::Label::shadowLocation() const void KSim::Label::setThemePixmap(const TQString &image) { - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); d->meterImage.reset(); d->meterImage.load(image); KSim::ThemeLoader::self().reColourImage(d->meterImage); @@ -278,7 +278,7 @@ void KSim::Label::setThemePixmap(const TQString &image) void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint) { - if (tqsizeHint() != old) { + if (sizeHint() != old) { updateGeometry(); } @@ -294,7 +294,7 @@ void KSim::Label::initWidget(int type) // try to reduce flicker as much as possible setBackgroundMode(NoBackground); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); configureObject(); diff --git a/ksim/library/label.h b/ksim/library/label.h index f20d8df..8ae9b64 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -108,11 +108,11 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * reimplemented for internal reasons */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; public slots: /** diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp index 3fa8d7f..a20a1d1 100644 --- a/ksim/library/led.cpp +++ b/ksim/library/led.cpp @@ -234,9 +234,9 @@ void KSim::LedLabel::configureObject(bool reapaintWidget) update(); } -TQSize KSim::LedLabel::tqsizeHint() const +TQSize KSim::LedLabel::sizeHint() const { - TQSize hint(Progress::tqsizeHint()); + TQSize hint(Progress::sizeHint()); if (d->sendLed.height() > hint.height()) hint.setHeight(d->sendLed.height()); diff --git a/ksim/library/led.h b/ksim/library/led.h index 5c5e615..bdb26f4 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -150,7 +150,7 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: /** diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp index e37cff1..82ae16e 100644 --- a/ksim/library/progress.cpp +++ b/ksim/library/progress.cpp @@ -124,9 +124,9 @@ void KSim::Progress::configureObject(bool repaintWidget) update(); } -TQSize KSim::Progress::tqsizeHint() const +TQSize KSim::Progress::sizeHint() const { - TQSize hint(Label::tqsizeHint()); + TQSize hint(Label::sizeHint()); if (d->meterPixmap.height() > hint.height()) hint.setHeight(d->meterPixmap.height()); @@ -186,7 +186,7 @@ void KSim::Progress::setOrigin(const TQRect &origin) void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap) { - TQSize oldSize = tqsizeHint(); + TQSize oldSize = sizeHint(); d->meterPixmap = pixmap; relayoutLabel(oldSize); } diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 0e30986..415c9fa 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -122,7 +122,7 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: /** diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 3fced29..a453af2 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -691,7 +691,7 @@ TQString KSim::Theme::readColourEntry(const TQString &itemType, { TQString color = readEntry(itemType, entry); if (color.isEmpty()) - color = TQString::tqfromLatin1("#ffffff #ffffff"); + color = TQString::fromLatin1("#ffffff #ffffff"); return TQStringList::split(' ', color)[row]; } @@ -927,7 +927,7 @@ void KSim::ThemeLoader::reload() if (m_theme.d) m_theme.d->globalReader = d->globalReader; - TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString(); + TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString(); m_theme.reparse(currentUrl(), fileName, currentAlternative()); } @@ -1036,7 +1036,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt) { TQString homePath = TQDir::current().path(); homePath = locateLocal( "data", "ksim" ) - + TQString::tqfromLatin1( "/themes" ) + + TQString::fromLatin1( "/themes" ) + homePath.right( homePath.length() - homePath.findRev( TQRegExp( "\\/" ), homePath.length() ) ); @@ -1072,7 +1072,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt) // go through the meters array and move the files to the correct dir/filename TQStringList::Iterator meter; for (meter = meters.begin(); meter != meters.end(); ++meter) { - TQString bgMeter = TQString::tqfromLatin1("bg_meter_"); + TQString bgMeter = TQString::fromLatin1("bg_meter_"); if (TQFile::exists(bgMeter + (*meter) + altString + "." + (*format))) { if (KStandardDirs::makeDir(url + (*meter))) directory.rename(bgMeter + (*meter) + altString + "." + (*format), @@ -1083,7 +1083,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt) // go through the panels array and move the files to the correct dir/filename TQStringList::ConstIterator panel; for (panel = panels.begin(); panel != panels.end(); ++panel) { - TQString bgPanel = TQString::tqfromLatin1("bg_panel_"); + TQString bgPanel = TQString::fromLatin1("bg_panel_"); if (TQFile::exists(bgPanel + (*panel) + altString + "." + (*format))) { if (KStandardDirs::makeDir(url + (*panel))) directory.rename(bgPanel + (*panel) + altString + "." + (*format), @@ -1092,13 +1092,13 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt) } // fix stupid themes that have a bg_panel image in the host dir - TQString tempFile = TQString::tqfromLatin1("host/bg_panel"); + TQString tempFile = TQString::fromLatin1("host/bg_panel"); if (TQFile::exists(tempFile + altString + "." + (*format))) directory.rename(tempFile + altString + "." + (*format), "host/bg_meter" + altString + "." + (*format)); // move decal_net_leds* to the net folder to be more consistant - tempFile = TQString::tqfromLatin1("decal_net_leds"); + tempFile = TQString::fromLatin1("decal_net_leds"); if (TQFile::exists(tempFile + altString + "." + (*format))) { if (KStandardDirs::makeDir(url + "net")) directory.rename(tempFile + altString + "." + (*format), @@ -1159,7 +1159,7 @@ int KSim::ThemeLoader::currentAlternative() TQString KSim::ThemeLoader::alternativeAsString(int alt) { int alternative = (alt == -1 ? currentAlternative() : alt); - return (alternative == 0 ? TQString() : TQString::tqfromLatin1("_") + return (alternative == 0 ? TQString() : TQString::fromLatin1("_") + TQString::number(alternative)); } @@ -1225,7 +1225,7 @@ KSim::ThemeLoader::ThemeLoader() m_theme.create(d->fileNames, d->imageTypes, d->globalReader); - TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString(); + TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString(); m_theme.init(currentUrl(), fileName, currentAlternative()); reColourItems(); diff --git a/ksim/library/themetypes.h b/ksim/library/themetypes.h index 82b7aa3..9ca4bb4 100644 --- a/ksim/library/themetypes.h +++ b/ksim/library/themetypes.h @@ -74,7 +74,7 @@ namespace KSim TQString returnString; returnString.setLatin1(typeNames[type]); - return incSlash ? returnString + TQString::tqfromLatin1("/") : returnString; + return incSlash ? returnString + TQString::fromLatin1("/") : returnString; } } } diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 39bbffd..2f05e7c 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -397,7 +397,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_legendBox->tqlayout()->setMargin(0); m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout()); - m_legendLayout->tqsetAlignment(TQt::AlignTop); + m_legendLayout->setAlignment(TQt::AlignTop); m_legendLayout->setSpacing(6); m_legendLayout->setMargin(11); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index c91f173..69c1219 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -414,19 +414,19 @@ TQString DiskView::diskName( int major, int minor ) const switch ( major ) { case IDE0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hda")); + returnValue.prepend(TQString::fromLatin1("hda")); break; case IDE1_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hdc")); + returnValue.prepend(TQString::fromLatin1("hdc")); break; case IDE3_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hde")); + returnValue.prepend(TQString::fromLatin1("hde")); break; case SCSI_DISK0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sda")); + returnValue.prepend(TQString::fromLatin1("sda")); break; case SCSI_GENERIC_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sg0")); + returnValue.prepend(TQString::fromLatin1("sg0")); break; } diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index fa215fc..1aa156d 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries() #endif #ifdef USE_FAILSAFE - TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) ); + TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) ); if ( !file.open( IO_ReadOnly ) ) return list; diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index fb04470..3df1917 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *) TQStringList::Iterator it; for (it = errorList.begin(); it != errorList.end(); ++it) { - message += TQString::tqfromLatin1("<li>%1</li>") + message += TQString::fromLatin1("<li>%1</li>") .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString())); } - message += TQString::tqfromLatin1("</ul></qt>"); + message += TQString::fromLatin1("</ul></qt>"); KMessageBox::sorry(0, message); } diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 6b8c928..1ffe5a8 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) m_intervalLabel = new TQLabel(this); m_intervalLabel->setText( i18n("Update interval:")); - m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0); @@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index cabbf5a..45251db 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -126,7 +126,7 @@ void SensorBase::update() m_sensorList.append(SensorInfo(currentSensor++, label, TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix), - chipset, sensorType(TQString::tqfromLatin1(name)))); + chipset, sensorType(TQString::fromLatin1(name)))); } } } @@ -134,13 +134,13 @@ void SensorBase::update() if (m_hasNVControl) { int temp = 0; if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Temp"); + TQString name = TQString::fromLatin1("GPU Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Ambient Temp"); + TQString name = TQString::fromLatin1("GPU Ambient Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } @@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name) if (name.findRev("temp", -1, false) != -1) if (SensorBase::fahrenheit()) - return TQString::tqfromLatin1("°F"); + return TQString::fromLatin1("°F"); else - return TQString::tqfromLatin1("°C"); + return TQString::fromLatin1("°C"); if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1) return i18n("Volt", "V"); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1f1cf10..95e65e5 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_updateLabel = new TQLabel(this); m_updateLabel->setText(i18n("Update interval:")); - m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0); @@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2); } diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index c470a2c..997f9b2 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -65,7 +65,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_generalLayout->addMultiCellWidget(m_deviceLabel, 0, 0, 0, 0); m_deviceCombo = new KComboBox(true, m_generalTab); - m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_deviceCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); m_deviceCombo->setFocus(); m_deviceCombo->setDuplicatesEnabled(false); @@ -89,7 +89,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox->tqlayout()->setSpacing(0); m_timerBox->tqlayout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout()); - m_timerBoxLayout->tqsetAlignment(TQt::AlignTop); + m_timerBoxLayout->setAlignment(TQt::AlignTop); m_timerBoxLayout->setSpacing(6); m_timerBoxLayout->setMargin(11); diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index b79fc80..9bfae99 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 608dc8f..69b94db 100644 --- a/ksim/monitors/snmp/configwidget.ui +++ b/ksim/monitors/snmp/configwidget.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d3da054..12fe8ab 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>351</width> <height>20</height> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 1bcbb0b..6ab85b6 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type { switch ( type ) { - case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" ); - case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" ); + case MonitorConfig::Label: return TQString::fromLatin1( "Label" ); + case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" ); default: assert( false ); }; return TQString(); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index 5f9fb53..e466c66 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>271</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>244</width> <height>20</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -335,7 +335,7 @@ <cstring>status</cstring> </property> <property name="text"> - <string>blehtqStatus</string> + <string>blehStatus</string> </property> </widget> <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4"> diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index c3df9bd..dcdbd2a 100644 --- a/ksim/monitors/snmp/proberesultdialogbase.ui +++ b/ksim/monitors/snmp/proberesultdialogbase.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index d79c596..ae04b67 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array ) { TQStringList result; for ( uint i = 0; array[ i ].stringValue; ++i ) - result << TQString::tqfromLatin1( array[ i ].stringValue ); + result << TQString::fromLatin1( array[ i ].stringValue ); return result; } @@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value ) { for ( uint i = 0; array[ i ].stringValue; ++i ) if ( array[ i ].enumValue == value ) - return TQString::tqfromLatin1( array[ i ].stringValue ); + return TQString::fromLatin1( array[ i ].stringValue ); assert( false ); return TQString(); @@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool * string = string.lower(); uint i; for ( i = 0; array[ i ].stringValue; ++i ) - if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) { + if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) { if ( ok ) *ok = true; return array[ i ].enumValue; } @@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session ) static TQString messageForErrorCode( int errorCode ) { if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); return TQString(); } diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index 2803aec..667613a 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags ); // not using i18n here, because it may be called from within a worker thread, and I'm // not sure it makes sense to translate it anyway - case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" ); - case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" ); - case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" ); + case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" ); + case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" ); + case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" ); case Value::Invalid: case Value::Null: return TQString(); } diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index afabec5..aaa726d 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -67,16 +67,16 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_label = new TQLabel(this); m_label->setText(i18n("GKrellm theme support. To use" " gkrellm themes just untar the themes into the folder below")); - m_label->tqsetAlignment(TQLabel::WordBreak | + m_label->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft); m_themeLayout->addMultiCellWidget(m_label, 0, 0, 0, 4); TQString themeDir(locateLocal("data", "ksim")); - themeDir += TQString::tqfromLatin1("/themes"); + themeDir += TQString::fromLatin1("/themes"); m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); - m_urlLabel->setURL(TQString::tqfromLatin1("file://") + themeDir); + m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), this, TQT_SLOT(openURL(const TQString &))); m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4); @@ -85,13 +85,13 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4); m_authorLabel = new TQLabel(this); - m_authorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_authorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); m_authorLabel->setText(i18n("Author:")); m_themeLayout->addMultiCellWidget(m_authorLabel, 3, 3, 0, 0); m_authLabel = new KSqueezedTextLabel(this); - m_authLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_authLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); m_authLabel->setText(i18n("None")); m_themeLayout->addMultiCellWidget(m_authLabel, 3, 3, 1, 4); @@ -105,7 +105,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_alternateLabel = new TQLabel(this); m_alternateLabel->setText(i18n("Alternate themes:")); - m_alternateLabel->tqsetAlignment(AlignVCenter | AlignRight); + m_alternateLabel->setAlignment(AlignVCenter | AlignRight); m_themeLayout->addMultiCellWidget(m_alternateLabel, 5, 5, 0, 1); m_altTheme = new KIntSpinBox(this); @@ -113,8 +113,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontLabel = new TQLabel(this); m_fontLabel->setText(i18n("Font:")); - m_fontLabel->tqsetAlignment(AlignVCenter | AlignRight); - m_fontLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + m_fontLabel->setAlignment(AlignVCenter | AlignRight); + m_fontLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); m_themeLayout->addMultiCellWidget(m_fontLabel, 5, 5, 3, 3); @@ -124,7 +124,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontsCombo->insertItem(i18n("Large")); m_fontsCombo->insertItem(i18n("Custom")); m_fontsCombo->insertItem(i18n("Default")); - m_fontsCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); connect(m_fontsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(showFontDialog(int))); |