From bc48dbcc61e0c39023cc81c09f716d2ed8158648 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:09:22 -0600 Subject: Rename old tq methods that no longer need a unique name --- configdialog/kbfxconfigdlgabout.ui | 38 +++++++++++++------------- configdialog/kbfxconfigdlgbutton.ui | 50 +++++++++++++++++----------------- configdialog/kbfxconfigdlgfonts-old.ui | 20 +++++++------- configdialog/kbfxconfigdlglayout.ui | 18 ++++++------ configdialog/kbfxconfigdlgmain.ui | 26 +++++++++--------- configdialog/kbfxconfigdlgplugins.ui | 14 +++++----- configdialog/kbfxconfigdlgstyle.ui | 34 +++++++++++------------ configdialog/kbfxconfigdlgthemes.ui | 42 ++++++++++++++-------------- configdialog/kbfxconfigdlgtooltip.ui | 38 +++++++++++++------------- configdialog/kbfxthemeinfo.ui | 22 +++++++-------- kbfxlib/common/kbfxconfig.cpp | 6 ++-- kbfxlib/common/kbfxfontchooser.cpp | 8 +++--- kbfxlib/common/kbfxpixmaplabel.cpp | 4 +-- kbfxlib/data/kbfxplugin.h | 2 +- src/kbfxplasmacanvasview.cpp | 4 +-- src/kbfxplasmaindexview.cpp | 2 +- 16 files changed, 164 insertions(+), 164 deletions(-) diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui index 33c9e49..ba5607d 100644 --- a/configdialog/kbfxconfigdlgabout.ui +++ b/configdialog/kbfxconfigdlgabout.ui @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -114,13 +114,13 @@ 0 - + 629 20 - + 629 20 @@ -160,13 +160,13 @@ 0 - + 0 20 - + 32767 20 @@ -285,13 +285,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -328,13 +328,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -371,13 +371,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -414,13 +414,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -457,13 +457,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -500,13 +500,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -571,7 +571,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! MinimumExpanding - + 24 1 diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui index 221d9ba..93b3505 100644 --- a/configdialog/kbfxconfigdlgbutton.ui +++ b/configdialog/kbfxconfigdlgbutton.ui @@ -68,7 +68,7 @@ 0 - + 32767 150 @@ -154,7 +154,7 @@ 0 - + 322 150 @@ -191,13 +191,13 @@ 0 - + 150 50 - + 150 50 @@ -240,7 +240,7 @@ 0 - + 32767 150 @@ -320,7 +320,7 @@ 0 - + 322 150 @@ -360,13 +360,13 @@ 0 - + 150 50 - + 150 50 @@ -409,7 +409,7 @@ 0 - + 32767 150 @@ -498,7 +498,7 @@ 0 - + 322 150 @@ -535,13 +535,13 @@ 0 - + 150 50 - + 150 50 @@ -576,13 +576,13 @@ 0 - + 0 29 - + 32767 29 @@ -691,7 +691,7 @@ Minimum - + 1 1 @@ -710,7 +710,7 @@ 0 - + 270 58 @@ -745,7 +745,7 @@ Minimum - + 1 1 @@ -764,7 +764,7 @@ Minimum - + 16 1 @@ -785,13 +785,13 @@ 0 - + 0 29 - + 32767 29 @@ -892,7 +892,7 @@ Minimum - + 20 1 @@ -914,13 +914,13 @@ 0 - + 150 50 - + 150 50 @@ -1047,7 +1047,7 @@ MinimumExpanding - + 16 16 @@ -1066,7 +1066,7 @@ MinimumExpanding - + 16 1 diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index 835739d..b35b9e3 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -101,7 +101,7 @@ Expanding - + 436 1 @@ -167,7 +167,7 @@ MinimumExpanding - + 16 1 @@ -200,7 +200,7 @@ MinimumExpanding - + 1 1 @@ -667,7 +667,7 @@ MinimumExpanding - + 22 1 @@ -821,7 +821,7 @@ Minimum - + 16 1 @@ -868,7 +868,7 @@ 0 - + 32767 32767 @@ -896,7 +896,7 @@ 0 - + 32767 32767 @@ -965,7 +965,7 @@ Minimum - + 16 1 diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index e1d5f2d..9628534 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -101,7 +101,7 @@ Expanding - + 408 1 @@ -167,7 +167,7 @@ Minimum - + 23 1 @@ -279,7 +279,7 @@ Minimum - + 16 1 @@ -304,7 +304,7 @@ Expanding - + 1 1 @@ -369,7 +369,7 @@ Expanding - + 1 1 @@ -388,7 +388,7 @@ MinimumExpanding - + 16 1 @@ -968,7 +968,7 @@ Minimum - + 23 1 diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui index d87e019..afbb6d4 100644 --- a/configdialog/kbfxconfigdlgmain.ui +++ b/configdialog/kbfxconfigdlgmain.ui @@ -126,13 +126,13 @@ 0 - + 150 265 - + 32767 32767 @@ -160,13 +160,13 @@ 0 - + 150 280 - + 32767 32767 @@ -277,7 +277,7 @@ Expanding - + 160 1 @@ -390,13 +390,13 @@ 0 - + 507 100 - + 32767 100 @@ -436,7 +436,7 @@ Minimum - + 61 25 @@ -453,7 +453,7 @@ Minimum - + 16 16 @@ -470,7 +470,7 @@ Expanding - + 56 7 @@ -513,13 +513,13 @@ 0 - + 114 100 - + 114 100 @@ -549,7 +549,7 @@ 0 - + 32767 32767 diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui index 201e2f0..bada01d 100644 --- a/configdialog/kbfxconfigdlgplugins.ui +++ b/configdialog/kbfxconfigdlgplugins.ui @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -114,7 +114,7 @@ 0 - + 32767 44 @@ -142,7 +142,7 @@ 0 - + 32767 44 @@ -197,7 +197,7 @@ MinimumExpanding - + 1 1 @@ -270,7 +270,7 @@ MinimumExpanding - + 1 1 @@ -289,7 +289,7 @@ Minimum - + 1 1 diff --git a/configdialog/kbfxconfigdlgstyle.ui b/configdialog/kbfxconfigdlgstyle.ui index 40220c0..572a4eb 100644 --- a/configdialog/kbfxconfigdlgstyle.ui +++ b/configdialog/kbfxconfigdlgstyle.ui @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -112,7 +112,7 @@ Minimum - + 53 1 @@ -129,7 +129,7 @@ Expanding - + 1 1 @@ -146,7 +146,7 @@ Minimum - + 38 1 @@ -242,13 +242,13 @@ 0 - + 293 334 - + 293 334 @@ -274,7 +274,7 @@ MinimumExpanding - + 1 1 @@ -291,7 +291,7 @@ MinimumExpanding - + 1 1 @@ -308,7 +308,7 @@ MinimumExpanding - + 1 1 @@ -325,7 +325,7 @@ MinimumExpanding - + 1 1 @@ -374,13 +374,13 @@ 0 - + 293 334 - + 293 334 @@ -406,7 +406,7 @@ MinimumExpanding - + 1 1 @@ -423,7 +423,7 @@ MinimumExpanding - + 1 1 @@ -440,7 +440,7 @@ MinimumExpanding - + 1 1 @@ -457,7 +457,7 @@ MinimumExpanding - + 1 1 diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 9e1a646..f4ad8a9 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -105,7 +105,7 @@ MinimumExpanding - + 28 16 @@ -137,7 +137,7 @@ 0 - + 200 0 @@ -196,7 +196,7 @@ Minimum - + 17 21 @@ -213,7 +213,7 @@ MinimumExpanding - + 1 1 @@ -230,7 +230,7 @@ MinimumExpanding - + 1 1 @@ -249,13 +249,13 @@ 0 - + 270 210 - + 270 210 @@ -281,7 +281,7 @@ Minimum - + 17 21 @@ -462,7 +462,7 @@ Minimum - + 16 7 @@ -548,7 +548,7 @@ Minimum - + 18 54 @@ -565,7 +565,7 @@ Minimum - + 17 62 @@ -613,13 +613,13 @@ 0 - + 48 48 - + 48 48 @@ -644,7 +644,7 @@ Minimum - + 16 16 @@ -661,7 +661,7 @@ Minimum - + 16 16 @@ -697,7 +697,7 @@ Minimum - + 16 10 @@ -741,7 +741,7 @@ MinimumExpanding - + 1 1 @@ -807,13 +807,13 @@ 0 - + 0 29 - + 32767 29 @@ -854,13 +854,13 @@ 0 - + 0 29 - + 32767 29 diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui index 98215d6..2f35e0b 100644 --- a/configdialog/kbfxconfigdlgtooltip.ui +++ b/configdialog/kbfxconfigdlgtooltip.ui @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -158,7 +158,7 @@ Minimum - + 24 1 @@ -200,7 +200,7 @@ Expanding - + 1 1 @@ -223,13 +223,13 @@ 0 - + 120 80 - + 120 80 @@ -311,7 +311,7 @@ Minimum - + 1 19 @@ -332,13 +332,13 @@ 0 - + 0 100 - + 32767 100 @@ -374,13 +374,13 @@ 0 - + 0 29 - + 32767 29 @@ -487,7 +487,7 @@ Minimum - + 26 1 @@ -526,7 +526,7 @@ Expanding - + 1 1 @@ -549,13 +549,13 @@ 0 - + 120 80 - + 120 80 @@ -585,7 +585,7 @@ MinimumExpanding - + 1 1 @@ -604,13 +604,13 @@ 0 - + 0 29 - + 32767 29 @@ -646,7 +646,7 @@ MinimumExpanding - + 1 1 diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui index c52b7ea..e9ace0b 100644 --- a/configdialog/kbfxthemeinfo.ui +++ b/configdialog/kbfxthemeinfo.ui @@ -63,7 +63,7 @@ MinimumExpanding - + 54 6 @@ -99,7 +99,7 @@ MinimumExpanding - + 54 6 @@ -118,7 +118,7 @@ MinimumExpanding - + 16 16 @@ -135,7 +135,7 @@ MinimumExpanding - + 16 16 @@ -174,7 +174,7 @@ MinimumExpanding - + 10 49 @@ -193,13 +193,13 @@ 0 - + 100 100 - + 100 100 @@ -225,7 +225,7 @@ MinimumExpanding - + 10 49 @@ -244,7 +244,7 @@ MinimumExpanding - + 16 16 @@ -534,7 +534,7 @@ MinimumExpanding - + 16 16 @@ -551,7 +551,7 @@ MinimumExpanding - + 16 16 diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 942a173..da83d47 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -325,7 +325,7 @@ void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName ) void KbfxConfig::read() { /* read general configuration */ - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); @@ -499,7 +499,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us KbfxOffImg = TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); /* use theme's default dude image if any */ - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); @@ -702,7 +702,7 @@ void KbfxConfig::write() kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl; } - KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::fromLatin1 ( "kbfxrc" ) ); /* write general KBFX configuration options */ KConfig *conf = confskel->config(); diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp index 2a445d6..ca0fd74 100644 --- a/kbfxlib/common/kbfxfontchooser.cpp +++ b/kbfxlib/common/kbfxfontchooser.cpp @@ -26,7 +26,7 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name ) TQHBoxLayout* tqlayout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() ); m_label = new TQLabel ( this, "fontLabel" ); - m_label->tqsetSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE); + m_label->setSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE); // m_label->setFrameShape ( TQFrame::StyledPanel ); // m_label->setFrameShadow ( TQFrame::Sunken ); @@ -36,9 +36,9 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name ) m_label->setMaximumHeight ( m_button -> height() ); m_label->setMinimumHeight ( m_button -> height() ); TQString fontText = i18n ( "Font..." ); -// m_button->tqsetSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE); +// m_button->setSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE); m_button->setText ( fontText ); - TQIconSet iconSet = SmallIconSet ( TQString::tqfromLatin1 ( "fonts" ) ); + TQIconSet iconSet = SmallIconSet ( TQString::fromLatin1 ( "fonts" ) ); TQPixmap pixmap = iconSet.pixmap ( TQIconSet::Small, TQIconSet::Normal ); m_button->setIconSet ( iconSet ); m_button->setFixedWidth ( m_button->fontMetrics().width ( fontText ) + @@ -66,7 +66,7 @@ void KBFXFontChooser::updateFontLabel() TQString s = TQString ( "%1 (%2pt) " ).arg ( m_font.family() ).arg ( m_font.pointSize() ); m_label->setFont ( m_font ); m_label->setText ( s ); - m_label->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + m_label->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); emit FontChanged(); } diff --git a/kbfxlib/common/kbfxpixmaplabel.cpp b/kbfxlib/common/kbfxpixmaplabel.cpp index 25f43bc..b563f91 100644 --- a/kbfxlib/common/kbfxpixmaplabel.cpp +++ b/kbfxlib/common/kbfxpixmaplabel.cpp @@ -29,7 +29,7 @@ KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *parent, const char *name, WFlags fl setFrameShape ( TQLabel::LineEditPanel ); setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); setMouseTracking ( TRUE ); } @@ -43,7 +43,7 @@ void KbfxPixmapLabel::normalize () setFrameShape ( TQLabel::NoFrame ); setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); + setAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); } /* processing drag events over label */ diff --git a/kbfxlib/data/kbfxplugin.h b/kbfxlib/data/kbfxplugin.h index f657d8a..72031a0 100644 --- a/kbfxlib/data/kbfxplugin.h +++ b/kbfxlib/data/kbfxplugin.h @@ -45,7 +45,7 @@ class KbfxPlugin:public TQObject KbfxPlugin ( TQString Name,TQString lib,uint id ); ~KbfxPlugin(); - void settqStatus ( bool ); + void setStatus ( bool ); TQString name(); TQString libName(); diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 57b3106..0f1ce6b 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -331,7 +331,7 @@ KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv ) TQImage img = pixmap->convertToImage(); img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); + this->canvas ()->setBackgroundPixmap ( *pixmap ); } } @@ -465,7 +465,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name ) TQImage img = pixmap->convertToImage(); img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); + this->canvas ()->setBackgroundPixmap ( *pixmap ); } this->setCursor ( TQCursor ( TQt::BusyCursor ) ); diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index d7f8d12..becf108 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -262,7 +262,7 @@ KbfxPlasmaIndexView::setKbfxCanvas ( TQCanvas * cnv ) { setCanvas ( cnv ); - canvas ()->tqsetBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); + canvas ()->setBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); canvas ()->update (); } -- cgit v1.2.1