From 741d31a614c21db43a66f0f6bbef5a0c40dab479 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:13:21 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name (cherry picked from commit f5a0e45e0510e355733e6390eb26efd704c990c4) --- ksquirrel/imageedit/sq_bcglabel.cpp | 2 +- ksquirrel/imageedit/sq_converter.cpp | 6 +- ksquirrel/imageedit/sq_imagebcg.ui | 20 +++---- ksquirrel/imageedit/sq_imageconvert.ui | 4 +- ksquirrel/imageedit/sq_imageeditoptions.ui | 4 +- ksquirrel/imageedit/sq_imagefilter.ui | 60 +++++++++---------- ksquirrel/imageedit/sq_writeoption.ui | 4 +- ksquirrel/ksquirrel-libs-configurator/klc.cpp | 2 +- ksquirrel/ksquirrel-libs-configurator/klc.ui | 2 +- .../ksquirrel-libs-configurator/klc.ui.h | 2 +- ksquirrel/ksquirrel.cpp | 24 ++++---- ksquirrel/ksquirrelpart/ksquirrelpart.cpp | 2 +- ksquirrel/ksquirrelpart/sq_bcglabel.cpp | 2 +- .../ksquirrelpart/sq_codecsettingsskeleton.ui | 4 +- ksquirrel/ksquirrelpart/sq_errorstring.cpp | 2 +- ksquirrel/ksquirrelpart/sq_externaltool.cpp | 2 +- ksquirrel/ksquirrelpart/sq_glwidget.cpp | 8 +-- ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp | 46 +++++++------- ksquirrel/ksquirrelpart/sq_helpwidget.ui | 2 +- ksquirrel/ksquirrelpart/sq_imagebcg.ui | 20 +++---- ksquirrel/ksquirrelpart/sq_imagefilter.ui | 60 +++++++++---------- ksquirrel/ksquirrelpart/sq_imageproperties.ui | 12 ++-- .../ksquirrelpart/sq_imageproperties.ui.h | 10 ++-- ksquirrel/ksquirrelpart/sq_libraryhandler.cpp | 4 +- ksquirrel/main.cpp | 2 +- ksquirrel/sidebar/sq_categorybrowsermenu.cpp | 2 +- ksquirrel/sidebar/sq_mountview.cpp | 2 +- ksquirrel/sidebar/sq_multibar.cpp | 2 +- ksquirrel/sidebar/sq_previewwidget.cpp | 2 +- ksquirrel/sidebar/sq_storagefile.cpp | 2 +- ksquirrel/sidebar/sq_treeviewitem.cpp | 6 +- ksquirrel/sq_codecsettingsskeleton.ui | 4 +- ksquirrel/sq_dir.cpp | 2 +- ksquirrel/sq_diroperator.cpp | 2 +- ksquirrel/sq_dirthumbs.cpp | 6 +- ksquirrel/sq_dragprovider.cpp | 2 +- ksquirrel/sq_errorstring.cpp | 2 +- ksquirrel/sq_externaltool.cpp | 2 +- ksquirrel/sq_externaltools.ui | 10 ++-- ksquirrel/sq_filethumbview.cpp | 20 +++---- ksquirrel/sq_filters.ui | 8 +-- ksquirrel/sq_glinfo.ui | 2 +- ksquirrel/sq_glview.cpp | 12 ++-- ksquirrel/sq_glwidget.cpp | 8 +-- ksquirrel/sq_glwidget_stuff.cpp | 46 +++++++------- ksquirrel/sq_helpwidget.ui | 2 +- ksquirrel/sq_iconlistbox.cpp | 2 +- ksquirrel/sq_imageproperties.ui | 12 ++-- ksquirrel/sq_imageproperties.ui.h | 10 ++-- ksquirrel/sq_libraryhandler.cpp | 4 +- ksquirrel/sq_options.ui | 36 +++++------ ksquirrel/sq_options.ui.h | 8 +-- ksquirrel/sq_pluginsinfo.ui | 4 +- ksquirrel/sq_slideshow.ui | 8 +-- ksquirrel/sq_slideshowlisting.ui.h | 2 +- ksquirrel/sq_slideshowwidget.cpp | 2 +- ksquirrel/sq_tabopendialog.ui | 2 +- ksquirrel/sq_thumbnailcachemaster.ui | 2 +- ksquirrel/sq_thumbnailcachemaster.ui.h | 2 +- ksquirrel/sq_thumbnailloadjob.cpp | 2 +- ksquirrel/sq_viewcache.ui | 2 +- ksquirrel/sq_viewcache.ui.h | 4 +- 62 files changed, 276 insertions(+), 276 deletions(-) diff --git a/ksquirrel/imageedit/sq_bcglabel.cpp b/ksquirrel/imageedit/sq_bcglabel.cpp index 39c5f62..41395e3 100644 --- a/ksquirrel/imageedit/sq_bcglabel.cpp +++ b/ksquirrel/imageedit/sq_bcglabel.cpp @@ -21,7 +21,7 @@ SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel { setScaledContents(false); - tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); } SQ_BCGLabel::~SQ_BCGLabel() diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp index 0f5cd5f..9f22be8 100644 --- a/ksquirrel/imageedit/sq_converter.cpp +++ b/ksquirrel/imageedit/sq_converter.cpp @@ -98,7 +98,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri TQString result, inner, filter = lw->filter; TQString ext = ff.extension(false); TQString prefix, suffix, name2 = name; - TQString spage = TQString::tqfromLatin1("page_%1.").tqarg((TQString::tqfromLatin1("%1").tqarg(page)).rightJustify(3, '0')); + TQString spage = TQString::fromLatin1("page_%1.").tqarg((TQString::fromLatin1("%1").tqarg(page)).rightJustify(3, '0')); if(!putto.isEmpty()) { @@ -110,7 +110,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri prefix.truncate(name2.length() - ext.length()); - suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::tqfromLatin1("*.") + ext)) + suffix = (SQ_LibraryHandler::instance()->knownExtension(TQString::fromLatin1("*.") + ext)) ? TQString(lw->codec->extension(32)) : ext; if(replace == 0 || replace == 2) @@ -121,7 +121,7 @@ TQString SQ_Converter::adjustFileName(const TQString &globalprefix, const TQStri if(TQFile::exists(result)) { - inner = TQString::tqfromLatin1("1."); + inner = TQString::fromLatin1("1."); result = (!paged) ? (prefix + inner + suffix) : (prefix + spage + inner + suffix); } } diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui index cad344f..4b8951d 100644 --- a/ksquirrel/imageedit/sq_imagebcg.ui +++ b/ksquirrel/imageedit/sq_imagebcg.ui @@ -491,7 +491,7 @@ Expanding - + 1 16 @@ -508,7 +508,7 @@ Expanding - + 1 16 @@ -535,7 +535,7 @@ MinimumExpanding - + 16 16 @@ -560,7 +560,7 @@ Expanding - + 249 21 @@ -615,7 +615,7 @@ MinimumExpanding - + 16 20 @@ -640,7 +640,7 @@ Expanding - + 1 16 @@ -665,7 +665,7 @@ Expanding - + 1 16 @@ -684,7 +684,7 @@ 0 - + 160 160 @@ -709,7 +709,7 @@ Expanding - + 1 16 @@ -728,7 +728,7 @@ 0 - + 160 160 diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/ksquirrel/imageedit/sq_imageconvert.ui index 649680f..65af5d4 100644 --- a/ksquirrel/imageedit/sq_imageconvert.ui +++ b/ksquirrel/imageedit/sq_imageconvert.ui @@ -40,7 +40,7 @@ Expanding - + 237 20 @@ -149,7 +149,7 @@ Expanding - + 26 155 diff --git a/ksquirrel/imageedit/sq_imageeditoptions.ui b/ksquirrel/imageedit/sq_imageeditoptions.ui index cb5549f..6992481 100644 --- a/ksquirrel/imageedit/sq_imageeditoptions.ui +++ b/ksquirrel/imageedit/sq_imageeditoptions.ui @@ -111,7 +111,7 @@ Expanding - + 16 16 @@ -147,7 +147,7 @@ Expanding - + 260 16 diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui index 79ec3e4..ccfaa93 100644 --- a/ksquirrel/imageedit/sq_imagefilter.ui +++ b/ksquirrel/imageedit/sq_imagefilter.ui @@ -82,7 +82,7 @@ Expanding - + 16 40 @@ -120,7 +120,7 @@ Expanding - + 16 20 @@ -166,7 +166,7 @@ Expanding - + 16 45 @@ -221,7 +221,7 @@ Expanding - + 11 26 @@ -251,7 +251,7 @@ Expanding - + 16 30 @@ -289,7 +289,7 @@ Expanding - + 16 30 @@ -352,7 +352,7 @@ Expanding - + 11 14 @@ -390,7 +390,7 @@ Expanding - + 16 10 @@ -452,7 +452,7 @@ Expanding - + 10 11 @@ -514,7 +514,7 @@ Expanding - + 16 25 @@ -552,7 +552,7 @@ Expanding - + 11 14 @@ -694,7 +694,7 @@ Expanding - + 16 35 @@ -740,7 +740,7 @@ Expanding - + 21 10 @@ -786,7 +786,7 @@ Expanding - + 16 10 @@ -832,7 +832,7 @@ Expanding - + 20 60 @@ -870,7 +870,7 @@ Expanding - + 16 35 @@ -943,7 +943,7 @@ Expanding - + 11 41 @@ -973,7 +973,7 @@ Expanding - + 16 25 @@ -1011,7 +1011,7 @@ Expanding - + 16 75 @@ -1066,7 +1066,7 @@ Expanding - + 11 113 @@ -1104,7 +1104,7 @@ Expanding - + 16 71 @@ -1124,7 +1124,7 @@ Expanding - + 16 16 @@ -1149,7 +1149,7 @@ Expanding - + 285 16 @@ -1316,7 +1316,7 @@ 0 - + 140 0 @@ -1333,7 +1333,7 @@ Expanding - + 16 16 @@ -1360,7 +1360,7 @@ 0 - + 160 160 @@ -1385,7 +1385,7 @@ Expanding - + 1 16 @@ -1402,7 +1402,7 @@ Expanding - + 1 16 @@ -1421,7 +1421,7 @@ 0 - + 160 160 @@ -1438,7 +1438,7 @@ Expanding - + 1 16 diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/ksquirrel/imageedit/sq_writeoption.ui index cba0f45..634ca0c 100644 --- a/ksquirrel/imageedit/sq_writeoption.ui +++ b/ksquirrel/imageedit/sq_writeoption.ui @@ -20,7 +20,7 @@ 0 - + 250 0 @@ -75,7 +75,7 @@ Expanding - + 16 10 diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp index 4a90161..808ee9e 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp +++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp @@ -74,7 +74,7 @@ KLC::KLC( TQWidget* parent, const char* name, WFlags fl ) KLCLayout->addWidget( listEnabled, 1, 0 ); languageChange(); - resize( TQSize(586, 425).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(586, 425).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui index 91a0dc0..7759eb6 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui @@ -37,7 +37,7 @@ Expanding - + 371 26 diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h index 68df556..d5961ee 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h @@ -99,7 +99,7 @@ void KLC::slotNewItems(const KFileItemList &list) { KFileItemListIterator it(list); KFileItem *fi; - TQString soname = TQString::tqfromLatin1(".so.%1").tqarg(SQ_KL_VER); + TQString soname = TQString::fromLatin1(".so.%1").tqarg(SQ_KL_VER); while((fi = it.current())) { diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index 57a46ec..e3cb279 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -514,7 +514,7 @@ void KSquirrel::createWidgets(int createFirst) m_urlbox = kconf->readBoolEntry("has_url", false); // main TQVBox - mainPage = new TQVBox(this, TQString::tqfromLatin1("SQ_BROWSER_VBOX")); + mainPage = new TQVBox(this, TQString::fromLatin1("SQ_BROWSER_VBOX")); mainPage->resize(size()); SQ_SplashScreen::advance(); @@ -526,8 +526,8 @@ void KSquirrel::createWidgets(int createFirst) tools = new KToolBar(mainPage); // location toolbar - pTLocation = new KToolBar(mainPage, TQString::tqfromLatin1("Location toolbar")); - pTLocation->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + pTLocation = new KToolBar(mainPage, TQString::fromLatin1("Location toolbar")); + pTLocation->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); // main splitter mainView = new TQSplitter(Qt::Horizontal, mainPage); Q_ASSERT(mainView); @@ -628,7 +628,7 @@ void KSquirrel::createWidgets(int createFirst) void KSquirrel::createStatusBar(KStatusBar *bar) { sbar = bar; - sbar->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + sbar->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); sbar->setSizeGripEnabled(true); sbar->show(); @@ -642,9 +642,9 @@ void KSquirrel::createStatusBar(KStatusBar *bar) fileIcon->setScaledContents(false); // name of current file - fileName = new KSqueezedTextLabel(TQString::tqfromLatin1("----"), vb, "fileName"); + fileName = new KSqueezedTextLabel(TQString::fromLatin1("----"), vb, "fileName"); fileName->setTextFormat(TQt::RichText); - fileName->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs); + fileName->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs); diskSpace = new TQLabel(TQString(), sbar, "diskSpace"); @@ -823,7 +823,7 @@ void KSquirrel::createActions() pASelectGroup = new KAction(i18n("Select group"), "viewmag+", CTRL+TQt::Key_Plus, 0, 0, actionCollection(), "SQ Select Group"); pADeselectGroup = new KAction(i18n("Deselect group"), "viewmag-", CTRL+TQt::Key_Minus, 0, 0, actionCollection(), "SQ Deselect Group"); - const TQString thumbs_size__ = TQString::tqfromLatin1("thumbs_size__"); + const TQString thumbs_size__ = TQString::fromLatin1("thumbs_size__"); pAThumb1->setExclusiveGroup(thumbs_size__); pAThumb2->setExclusiveGroup(thumbs_size__); pAThumb3->setExclusiveGroup(thumbs_size__); @@ -849,7 +849,7 @@ void KSquirrel::createActions() pAThumbs->setDelayed(false); - TQString raise_some_widget_from_stack = TQString::tqfromLatin1("raise_some_widget_from_stack"); + TQString raise_some_widget_from_stack = TQString::fromLatin1("raise_some_widget_from_stack"); pARaiseListView->setExclusiveGroup(raise_some_widget_from_stack); pARaiseIconView->setExclusiveGroup(raise_some_widget_from_stack); pARaiseDetailView->setExclusiveGroup(raise_some_widget_from_stack); @@ -1142,7 +1142,7 @@ void KSquirrel::createPostSplash() TQLabel *pp = new TQLabel(hbox); pp->setPalette(TQPalette(cc, cc)); - pp->tqsetAlignment(TQt::AlignCenter); + pp->setAlignment(TQt::AlignCenter); TQPixmap todo = TQPixmap::fromMimeSource(locate("data", "images/tray.png")); @@ -1154,7 +1154,7 @@ void KSquirrel::createPostSplash() TQLabel *l = new TQLabel(i18n(" writing settings and thumbnails... "), hbox); l->setPalette(TQPalette(cc, cc)); - l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + l->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); hbox->setStretchFactor(pp, 0); hbox->setStretchFactor(l, 1); @@ -1494,7 +1494,7 @@ void KSquirrel::slotOpenFileAndSet() void KSquirrel::slotAnimatedClicked() { // invoke default browser - kapp->invokeBrowser(TQString::tqfromLatin1("http://ksquirrel.sourceforge.net/")); + kapp->invokeBrowser(TQString::fromLatin1("http://ksquirrel.sourceforge.net/")); } // Create SQ_ThumbnailCacheMaster, which can do something with thumbnails @@ -1748,7 +1748,7 @@ void KSquirrel::control(const TQString &command) { int id = it.data(); - KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::tqfromLatin1("action_%1").tqarg(id)); + KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("action_%1").tqarg(id)); if(a) a->activate(); } diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index f22b923..7f8250f 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp @@ -48,7 +48,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, ext = new KSquirrelPartBrowserExtension(this); - KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::tqfromLatin1("ksquirrel")); + KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::fromLatin1("ksquirrel")); KGlobal::locale()->setActiveCatalogue(KSquirrelFactory::instance()->instanceName()); if(!SQ_ErrorString::instance()) diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp index 39c5f62..41395e3 100644 --- a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp +++ b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp @@ -21,7 +21,7 @@ SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel { setScaledContents(false); - tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); } SQ_BCGLabel::~SQ_BCGLabel() diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui index 7f282ab..bd5339c 100644 --- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui +++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui @@ -34,7 +34,7 @@ 0 - + 16 16 @@ -117,7 +117,7 @@ Expanding - + 16 16 diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.cpp b/ksquirrel/ksquirrelpart/sq_errorstring.cpp index cd5a047..f762ee3 100644 --- a/ksquirrel/ksquirrelpart/sq_errorstring.cpp +++ b/ksquirrel/ksquirrelpart/sq_errorstring.cpp @@ -30,7 +30,7 @@ SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) m_instance = this; // fill map with translated messages - messages.insert(SQE_OK, TQString::tqfromLatin1("OK")); + messages.insert(SQE_OK, TQString::fromLatin1("OK")); messages.insert(SQE_R_NOFILE, i18n("cannot open file for reading")); messages.insert(SQE_R_BADFILE, i18n("file corrupted")); messages.insert(SQE_R_NOMEMORY, i18n("no memory")); diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp index cd5a5f7..1bc2886 100644 --- a/ksquirrel/ksquirrelpart/sq_externaltool.cpp +++ b/ksquirrel/ksquirrelpart/sq_externaltool.cpp @@ -171,7 +171,7 @@ void SQ_ExternalTool::slotAboutToShowMenu() TQString file = KStringHandler::rsqueeze(item->name(), 30); // finally, change title - TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::tqfromLatin1(" (+%1)").tqarg(items.count()-1)); + TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::fromLatin1(" (+%1)").tqarg(items.count()-1)); menu->changeTitle(final); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp index 4891e6f..4c19429 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -491,7 +491,7 @@ void SQ_GLWidget::matrixChanged() float z = (m < 1.0) ? 1.0/m : m; // construct zoom - str = TQString::tqfromLatin1("%1% [%2:%3]") + str = TQString::fromLatin1("%1% [%2:%3]") .tqarg(fzoom, 0, 'f', 1) .tqarg((m < 1.0)?1.0:z, 0, 'f', 1) .tqarg((m > 1.0)?1.0:z, 0, 'f', 1); @@ -503,7 +503,7 @@ void SQ_GLWidget::matrixChanged() #endif // construct rotation angle - str = TQString::tqfromLatin1("%1%2 %3 deg") + str = TQString::fromLatin1("%1%2 %3 deg") .tqarg((tab->isflippedV)?"V":"") .tqarg((tab->isflippedH)?"H":"") .tqarg(tab->curangle, 0, 'f', 1); @@ -1598,7 +1598,7 @@ void SQ_GLWidget::decode() } } - id = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp)); + id = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp)); images->setItemParameter(id, tab->current); @@ -1655,7 +1655,7 @@ void SQ_GLWidget::paletteChange(const TQPalette &oldPalette) if(SQ_Config::instance()->readNumEntry("GL view background type", 1) == 0) { - TQColor color = tqcolorGroup().color(TQColorGroup::Base); + TQColor color = colorGroup().color(TQColorGroup::Base); qglClearColor(color); updateGL(); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index 3a212cb..f6157f7 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -91,14 +91,14 @@ void SQ_GLWidget::createActions() pAFull = new KToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full"); - TQString squirrel_zoom_actions = TQString::tqfromLatin1("squirrel_zoom_actions"); + TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions"); pAZoomW->setExclusiveGroup(squirrel_zoom_actions); pAZoomH->setExclusiveGroup(squirrel_zoom_actions); pAZoomWH->setExclusiveGroup(squirrel_zoom_actions); pAZoom100->setExclusiveGroup(squirrel_zoom_actions); pAZoomLast->setExclusiveGroup(squirrel_zoom_actions); - TQString squirrel_selection_type = TQString::tqfromLatin1("squirrel_selection_type"); + TQString squirrel_selection_type = TQString::fromLatin1("squirrel_selection_type"); pASelectionEllipse->setExclusiveGroup(squirrel_selection_type); pASelectionRect->setExclusiveGroup(squirrel_selection_type); @@ -236,17 +236,17 @@ void SQ_GLWidget::slotProperties() // save tab->current image parameters and some additioanl information // in list list << tab->quickImageInfo - << TQString::tqfromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) + << TQString::fromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) << tab->finfo.image[tab->current].colorspace << tab->finfo.image[tab->current].compression << sz - << TQString::tqfromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2) + << TQString::fromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2) << ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no")) - << TQString::tqfromLatin1("%1").tqarg(errors) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image.size()) - << TQString::tqfromLatin1("#%1").tqarg(tab->current+1) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); + << TQString::fromLatin1("%1").tqarg(errors) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image.size()) + << TQString::fromLatin1("#%1").tqarg(tab->current+1) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); // create dialog and setup it SQ_ImageProperties prop(this); @@ -867,7 +867,7 @@ void SQ_GLWidget::initAccelsAndMenu() menu->insertItem(i18n("Image"), menuImage); #define SQ_ADD_KACTION(b) \ - (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::tqfromLatin1("action_%1").tqarg(b))) + (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").tqarg(b))) id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate())); @@ -900,13 +900,13 @@ void SQ_GLWidget::initAccelsAndMenu() menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQT_SLOT(activate())); menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQT_SLOT(activate())); menuZoom->insertSeparator(); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::tqfromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::tqfromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::tqfromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::tqfromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::tqfromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::tqfromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::tqfromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate())); menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQT_SLOT(activate())); menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQT_SLOT(activate())); @@ -1312,7 +1312,7 @@ void SQ_GLWidget::slotChangeTab(int id) for(;it != itEnd;++it, ++i) { - mid = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp)); + mid = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp)); images->setItemParameter(mid, i); if(i == tab->current) @@ -1493,7 +1493,7 @@ void SQ_GLWidget::setClearColor() { // system color case 0: - color = tqcolorGroup().color(TQColorGroup::Base); + color = colorGroup().color(TQColorGroup::Base); break; // custom color @@ -1623,7 +1623,7 @@ void SQ_GLWidget::createMarks() */ void SQ_GLWidget::updateCurrentFileInfo() { - TQString status = TQString::tqfromLatin1("%1x%2@%3") + TQString status = TQString::fromLatin1("%1x%2@%3") .tqarg(tab->finfo.image[tab->current].w) .tqarg(tab->finfo.image[tab->current].h) .tqarg(tab->finfo.image[tab->current].bpp); @@ -1667,7 +1667,7 @@ void SQ_GLWidget::calcFrameLabelWidth() #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBFrame")->setFixedWidth( SQ_GLView::window()->sbarWidget("SBFrame")->fontMetrics() - .boundingRect(TQString::tqfromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width()); + .boundingRect(TQString::fromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width()); #endif } @@ -1680,9 +1680,9 @@ void SQ_GLWidget::calcFrameLabelWidth() void SQ_GLWidget::frameChanged() { #ifndef KSQUIRREL_PART - SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); + SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); #else - t_glv.sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); + t_glv.sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); #endif } diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/ksquirrel/ksquirrelpart/sq_helpwidget.ui index 02fb30d..d0500af 100644 --- a/ksquirrel/ksquirrelpart/sq_helpwidget.ui +++ b/ksquirrel/ksquirrelpart/sq_helpwidget.ui @@ -296,7 +296,7 @@ Expanding - + 16 16 diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui index cad344f..4b8951d 100644 --- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui +++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui @@ -491,7 +491,7 @@ Expanding - + 1 16 @@ -508,7 +508,7 @@ Expanding - + 1 16 @@ -535,7 +535,7 @@ MinimumExpanding - + 16 16 @@ -560,7 +560,7 @@ Expanding - + 249 21 @@ -615,7 +615,7 @@ MinimumExpanding - + 16 20 @@ -640,7 +640,7 @@ Expanding - + 1 16 @@ -665,7 +665,7 @@ Expanding - + 1 16 @@ -684,7 +684,7 @@ 0 - + 160 160 @@ -709,7 +709,7 @@ Expanding - + 1 16 @@ -728,7 +728,7 @@ 0 - + 160 160 diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui index 79ec3e4..ccfaa93 100644 --- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui +++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui @@ -82,7 +82,7 @@ Expanding - + 16 40 @@ -120,7 +120,7 @@ Expanding - + 16 20 @@ -166,7 +166,7 @@ Expanding - + 16 45 @@ -221,7 +221,7 @@ Expanding - + 11 26 @@ -251,7 +251,7 @@ Expanding - + 16 30 @@ -289,7 +289,7 @@ Expanding - + 16 30 @@ -352,7 +352,7 @@ Expanding - + 11 14 @@ -390,7 +390,7 @@ Expanding - + 16 10 @@ -452,7 +452,7 @@ Expanding - + 10 11 @@ -514,7 +514,7 @@ Expanding - + 16 25 @@ -552,7 +552,7 @@ Expanding - + 11 14 @@ -694,7 +694,7 @@ Expanding - + 16 35 @@ -740,7 +740,7 @@ Expanding - + 21 10 @@ -786,7 +786,7 @@ Expanding - + 16 10 @@ -832,7 +832,7 @@ Expanding - + 20 60 @@ -870,7 +870,7 @@ Expanding - + 16 35 @@ -943,7 +943,7 @@ Expanding - + 11 41 @@ -973,7 +973,7 @@ Expanding - + 16 25 @@ -1011,7 +1011,7 @@ Expanding - + 16 75 @@ -1066,7 +1066,7 @@ Expanding - + 11 113 @@ -1104,7 +1104,7 @@ Expanding - + 16 71 @@ -1124,7 +1124,7 @@ Expanding - + 16 16 @@ -1149,7 +1149,7 @@ Expanding - + 285 16 @@ -1316,7 +1316,7 @@ 0 - + 140 0 @@ -1333,7 +1333,7 @@ Expanding - + 16 16 @@ -1360,7 +1360,7 @@ 0 - + 160 160 @@ -1385,7 +1385,7 @@ Expanding - + 1 16 @@ -1402,7 +1402,7 @@ Expanding - + 1 16 @@ -1421,7 +1421,7 @@ 0 - + 160 160 @@ -1438,7 +1438,7 @@ Expanding - + 1 16 diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui index 345fa76..940df9f 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui @@ -49,7 +49,7 @@ Expanding - + 470 20 @@ -81,7 +81,7 @@ Expanding - + 20 10 @@ -602,7 +602,7 @@ - tqStatus: + Status: AlignTop|AlignRight @@ -618,7 +618,7 @@ Expanding - + 210 16 @@ -813,7 +813,7 @@ - texttqStatus + textStatus @@ -831,7 +831,7 @@ Expanding - + 205 16 diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 385acf3..2c78257 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h @@ -69,11 +69,11 @@ void SQ_ImageProperties::setParams(TQStringList &l) int errors = (*it).toInt(); ++it; textFrames->setText(*it); ++it; textFrame->setText(*it); ++it; - TQString s = TQString::tqfromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); - texttqStatus->setText((errors)?s:TQString()); + TQString s = TQString::fromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); + textStatus->setText((errors)?s:TQString()); textStatusIcon->setPixmap((errors)?error:ok); - s = TQString::tqfromLatin1("%1%2").tqarg(*it).tqarg(i18n(" ms.")); + s = TQString::fromLatin1("%1%2").tqarg(*it).tqarg(i18n(" ms.")); textDelay->setText(s); } @@ -162,9 +162,9 @@ void SQ_ImageProperties::setMetaInfo(TQValueVector > m for(TQValueVector >::iterator it = meta.begin();it != itEnd;++it) { if(after) - item = new TQListViewItem(listMeta, after, (*it).first+TQString::tqfromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); + item = new TQListViewItem(listMeta, after, (*it).first+TQString::fromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); else - after = item = new TQListViewItem(listMeta, (*it).first+TQString::tqfromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); + after = item = new TQListViewItem(listMeta, (*it).first+TQString::fromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); listMeta->insertItem(item); } diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp index 23c84da..326f07f 100644 --- a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp +++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp @@ -252,8 +252,8 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.lib->load(); // resolve create() and destroy() functions - libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::tqfromLatin1("codec_create")); - libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::tqfromLatin1("codec_destroy")); + libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create")); + libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy")); // couldn't resolve - corrupted library ? if(!libtmp.codec_create || !libtmp.codec_destroy) diff --git a/ksquirrel/main.cpp b/ksquirrel/main.cpp index 3c1a2b5..1c315d1 100644 --- a/ksquirrel/main.cpp +++ b/ksquirrel/main.cpp @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) } } - KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::tqfromLatin1("ksquirrel")); + KGlobal::dirs()->addResourceType("data", KStandardDirs::kde_default("data") + TQString::fromLatin1("ksquirrel")); SQ_SplashScreen *splash = 0; diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp index f111e20..40abdc8 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp @@ -419,7 +419,7 @@ void SQ_CategoryBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) void SQ_CategoryBrowserMenu::dropEvent( TQDropEvent *ev ) { - KFileItem item( path(), TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path(), TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path(), ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/ksquirrel/sidebar/sq_mountview.cpp index 7bb430a..6472995 100644 --- a/ksquirrel/sidebar/sq_mountview.cpp +++ b/ksquirrel/sidebar/sq_mountview.cpp @@ -130,7 +130,7 @@ void SQ_MountView::reload(bool current) fi->setText(colum++, (*it)->mountType()); if(m_columns & OPT_COL_OPTIONS) - fi->setText(colum, (*it)->mountOptions().join(TQString::tqfromLatin1(", "))); + fi->setText(colum, (*it)->mountOptions().join(TQString::fromLatin1(", "))); } } } diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp index e958705..b960cfd 100644 --- a/ksquirrel/sidebar/sq_multibar.cpp +++ b/ksquirrel/sidebar/sq_multibar.cpp @@ -126,7 +126,7 @@ void SQ_MultiBar::raiseWidget(int id) void SQ_MultiBar::updateLayout() { - setFixedWidth(mt->tqsizeHint().width()); + setFixedWidth(mt->sizeHint().width()); stack->hide(); } diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index 7a889f7..ee00de7 100644 --- a/ksquirrel/sidebar/sq_previewwidget.cpp +++ b/ksquirrel/sidebar/sq_previewwidget.cpp @@ -280,7 +280,7 @@ void SQ_PreviewWidget::slotDownloadResult(const KURL &url) int w = finfo->image[0].w; int h = finfo->image[0].h; - dimstring = TQString::tqfromLatin1("%1x%2").tqarg(w).tqarg(h); + dimstring = TQString::fromLatin1("%1x%2").tqarg(w).tqarg(h); const int wh = w * h; unsigned char t; diff --git a/ksquirrel/sidebar/sq_storagefile.cpp b/ksquirrel/sidebar/sq_storagefile.cpp index 7697687..cb26937 100644 --- a/ksquirrel/sidebar/sq_storagefile.cpp +++ b/ksquirrel/sidebar/sq_storagefile.cpp @@ -34,7 +34,7 @@ void SQ_StorageFile::writeStorageFileAsString(const TQString &path, const KURL & content = inpath.prettyURL(); KMD5 md5(TQFile::encodeName(inpath.prettyURL()).data()); - TQFile file(path + TQString::tqfromLatin1(".") + TQString(md5.hexDigest())); + TQFile file(path + TQString::fromLatin1(".") + TQString(md5.hexDigest())); if(file.open(IO_WriteOnly)) { diff --git a/ksquirrel/sidebar/sq_treeviewitem.cpp b/ksquirrel/sidebar/sq_treeviewitem.cpp index 9ad313c..71483fa 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.cpp +++ b/ksquirrel/sidebar/sq_treeviewitem.cpp @@ -96,11 +96,11 @@ void SQ_TreeViewItem::setText(int column, const TQString &text) TQString s; if(use_c1 && use_c2) // files + dirs: show these two values anyway - s = TQString::tqfromLatin1(" [%1/%2]").tqarg(count_dirs).tqarg(count_files); + s = TQString::fromLatin1(" [%1/%2]").tqarg(count_dirs).tqarg(count_files); else if(use_c1 && count_files) // files, file count is > 0 - s = TQString::tqfromLatin1(" [%1]").tqarg(count_files); + s = TQString::fromLatin1(" [%1]").tqarg(count_files); else if(use_c2 && count_dirs) // dirs, dir count is > 0 - s = TQString::tqfromLatin1(" [%1]").tqarg(count_dirs); + s = TQString::fromLatin1(" [%1]").tqarg(count_dirs); KFileTreeViewItem::setText(column, text + s); } diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/ksquirrel/sq_codecsettingsskeleton.ui index 7f282ab..bd5339c 100644 --- a/ksquirrel/sq_codecsettingsskeleton.ui +++ b/ksquirrel/sq_codecsettingsskeleton.ui @@ -34,7 +34,7 @@ 0 - + 16 16 @@ -117,7 +117,7 @@ Expanding - + 16 16 diff --git a/ksquirrel/sq_dir.cpp b/ksquirrel/sq_dir.cpp index 5683743..a4dbd0c 100644 --- a/ksquirrel/sq_dir.cpp +++ b/ksquirrel/sq_dir.cpp @@ -79,7 +79,7 @@ bool SQ_Dir::mkdir(const TQString &relpath) void SQ_Dir::setRoot(const TQString &name) { - m_root = TQDir::cleanDirPath(homeDirPath() + TQDir::separator() + TQString::tqfromLatin1(".ksquirrel")); + m_root = TQDir::cleanDirPath(homeDirPath() + TQDir::separator() + TQString::fromLatin1(".ksquirrel")); TQDir::mkdir(m_root); m_root = TQDir::cleanDirPath(m_root + TQDir::separator() + name); diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index 06232c9..e795358 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -179,7 +179,7 @@ void SQ_DirOperator::slotFoundMountPoint(const unsigned long &kbSize, KSquirrel::app()->diskProgress()->setTotalSteps(kbSize); KSquirrel::app()->diskProgress()->setIndicator(kbSize-kbAvail); // kbSize != kbAvail+kbUsed - KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::tqfromLatin1("%1: %2/%3") + KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::fromLatin1("%1: %2/%3") .tqarg(mount) .tqarg(KIO::convertSizeFromKB(kbAvail)) .tqarg(KIO::convertSizeFromKB(kbSize))); diff --git a/ksquirrel/sq_dirthumbs.cpp b/ksquirrel/sq_dirthumbs.cpp index 87c8b4c..6d0450f 100644 --- a/ksquirrel/sq_dirthumbs.cpp +++ b/ksquirrel/sq_dirthumbs.cpp @@ -73,17 +73,17 @@ TQString SQ_DirThumbs::absPath(const KURL &relurl) { KMD5 md5(TQString(TQFile::encodeName(relurl.prettyURL()))); - TQString ext = TQString::tqfromLatin1(".%1").tqarg(sqdirThumbFormat); + TQString ext = TQString::fromLatin1(".%1").tqarg(sqdirThumbFormat); return m_orig + TQDir::separator() + TQString(md5.hexDigest()) + ext.lower(); } void SQ_DirThumbs::setRoot() { - m_orig = TQDir::cleanDirPath(homeDirPath() + TQDir::separator() + TQString::tqfromLatin1(".thumbnails")); + m_orig = TQDir::cleanDirPath(homeDirPath() + TQDir::separator() + TQString::fromLatin1(".thumbnails")); TQDir::mkdir(m_orig); - m_orig = TQDir::cleanDirPath(m_orig + TQDir::separator() + TQString::tqfromLatin1("normal")); + m_orig = TQDir::cleanDirPath(m_orig + TQDir::separator() + TQString::fromLatin1("normal")); TQDir::mkdir(m_orig); } diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp index 43a67bd..b3b3e11 100644 --- a/ksquirrel/sq_dragprovider.cpp +++ b/ksquirrel/sq_dragprovider.cpp @@ -138,7 +138,7 @@ void SQ_DragProvider::start() text = text + *sit + '\n'; } - text += TQString::tqfromLatin1("%1 %2").tqarg(i18n("Total")).tqarg(i18n("1 file", "%n files", count)); + text += TQString::fromLatin1("%1 %2").tqarg(i18n("Total")).tqarg(i18n("1 file", "%n files", count)); TQFontMetrics ms(source->font()); TQRect r = ms.boundingRect(0, 0, 1, 1, flags, text); diff --git a/ksquirrel/sq_errorstring.cpp b/ksquirrel/sq_errorstring.cpp index cd5a047..f762ee3 100644 --- a/ksquirrel/sq_errorstring.cpp +++ b/ksquirrel/sq_errorstring.cpp @@ -30,7 +30,7 @@ SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) m_instance = this; // fill map with translated messages - messages.insert(SQE_OK, TQString::tqfromLatin1("OK")); + messages.insert(SQE_OK, TQString::fromLatin1("OK")); messages.insert(SQE_R_NOFILE, i18n("cannot open file for reading")); messages.insert(SQE_R_BADFILE, i18n("file corrupted")); messages.insert(SQE_R_NOMEMORY, i18n("no memory")); diff --git a/ksquirrel/sq_externaltool.cpp b/ksquirrel/sq_externaltool.cpp index cd5a5f7..1bc2886 100644 --- a/ksquirrel/sq_externaltool.cpp +++ b/ksquirrel/sq_externaltool.cpp @@ -171,7 +171,7 @@ void SQ_ExternalTool::slotAboutToShowMenu() TQString file = KStringHandler::rsqueeze(item->name(), 30); // finally, change title - TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::tqfromLatin1(" (+%1)").tqarg(items.count()-1)); + TQString final = (items.count() == 1 || items.count() == 0) ? file : (file + TQString::fromLatin1(" (+%1)").tqarg(items.count()-1)); menu->changeTitle(final); } diff --git a/ksquirrel/sq_externaltools.ui b/ksquirrel/sq_externaltools.ui index be97196..e5c5cdf 100644 --- a/ksquirrel/sq_externaltools.ui +++ b/ksquirrel/sq_externaltools.ui @@ -32,7 +32,7 @@ Expanding - + 65 20 @@ -162,7 +162,7 @@ Expanding - + 20 130 @@ -267,7 +267,7 @@ 0 - + 22 22 @@ -301,7 +301,7 @@ 0 - + 22 22 @@ -351,7 +351,7 @@ 0 - + 22 22 diff --git a/ksquirrel/sq_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp index fe824ca..c6daed1 100644 --- a/ksquirrel/sq_filethumbview.cpp +++ b/ksquirrel/sq_filethumbview.cpp @@ -107,8 +107,8 @@ void SQ_FileThumbView::insertItem(KFileItem *i) TQPixmap mimeall = i->pixmap(SQ_ThumbnailSize::smallest()); TQPixmap thumbnail(pixelSize.width(), pixelSize.height()); TQPainter painter(&thumbnail); - painter.setBrush(tqcolorGroup().base()); - painter.setPen(tqcolorGroup().highlight()); + painter.setBrush(colorGroup().base()); + painter.setPen(colorGroup().highlight()); painter.drawRect(0, 0, pixelSize.width(), pixelSize.height()); painter.drawPixmap((pixelSize.width()-mimeall.width())/2, (pixelSize.height()-mimeall.height())/2, mimeall); item = new SQ_FileThumbViewItem(this, i->text(), thumbnail, i); @@ -147,8 +147,8 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th TQPainter painter; painter.begin(&newpix); - painter.setPen(tqcolorGroup().highlight()); - painter.setBrush(tqcolorGroup().base()); + painter.setPen(colorGroup().highlight()); + painter.setBrush(colorGroup().base()); // draw bounding rect painter.drawRect(0, 0, W, H); @@ -163,9 +163,9 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th int rest = H-W-2; - painter.setPen(tqcolorGroup().text()); + painter.setPen(colorGroup().text()); - if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::tqfromLatin1("%1x%2").tqarg(t.w).tqarg(t.h)); + if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::fromLatin1("%1x%2").tqarg(t.w).tqarg(t.h)); painter.drawText(4, W+rest/2+1, 100, 12, 0, KIO::convertSize(fileItem->size())); painter.end(); @@ -177,8 +177,8 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th TQPainter painter; painter.begin(&newpix); - painter.setPen(tqcolorGroup().highlight()); - painter.setBrush(tqcolorGroup().base()); + painter.setPen(colorGroup().highlight()); + painter.setBrush(colorGroup().base()); // draw bounding rect painter.drawRect(0, 0, pixelSize.width(), pixelSize.height()); @@ -466,8 +466,8 @@ void SQ_FileThumbView::rebuildPendingPixmap(bool dir) p->resize(pixelSize.width(), pixelSize.height()); TQPainter painter(p); - painter.setBrush(tqcolorGroup().base()); - painter.setPen(tqcolorGroup().highlight()); + painter.setBrush(colorGroup().base()); + painter.setPen(colorGroup().highlight()); painter.drawRect(0, 0, pixelSize.width(), pixelSize.height()); painter.drawPixmap((pixelSize.width() - w->width())/2, (pixelSize.height() - w->height())/2, *w); } diff --git a/ksquirrel/sq_filters.ui b/ksquirrel/sq_filters.ui index 9cc6865..3fbd653 100644 --- a/ksquirrel/sq_filters.ui +++ b/ksquirrel/sq_filters.ui @@ -67,7 +67,7 @@ Expanding - + 411 20 @@ -186,7 +186,7 @@ 0 - + 22 22 @@ -220,7 +220,7 @@ 0 - + 22 22 @@ -253,7 +253,7 @@ Expanding - + 20 145 diff --git a/ksquirrel/sq_glinfo.ui b/ksquirrel/sq_glinfo.ui index 862eb9e..8aad68f 100644 --- a/ksquirrel/sq_glinfo.ui +++ b/ksquirrel/sq_glinfo.ui @@ -132,7 +132,7 @@ Expanding - + 431 21 diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp index 681f499..a69edea 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -115,8 +115,8 @@ void SQ_GLView::createContent() TQLabel *sqSBFile = new KSqueezedTextLabel(TQString(), 0, "SBFile"); names.insert("SBFile", sqSBFile); - sqSBFrame->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter | TQt::ExpandTabs); - sqSBFile->tqsetAlignment(TQt::AlignRight | TQt::AlignTop); + sqSBFrame->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter | TQt::ExpandTabs); + sqSBFile->setAlignment(TQt::AlignRight | TQt::AlignTop); TQFont font = sqSBFile->font(); font.setBold(true); sqSBFile->setFont(font); @@ -198,15 +198,15 @@ void SQ_GLView::restoreGeometry() */ void SQ_GLView::resetStatusBar() { - TQString fl = TQString::tqfromLatin1("----"); + TQString fl = TQString::fromLatin1("----"); names["SBGLZoom"]->setText(fl); names["SBGLAngle"]->setText(fl); names["SBLoaded"]->setText(fl); - names["SBDecodedI"]->setText(TQString::tqfromLatin1("--")); - names["SBFile"]->setText(TQString::tqfromLatin1("--------")); + names["SBDecodedI"]->setText(TQString::fromLatin1("--")); + names["SBFile"]->setText(TQString::fromLatin1("--------")); names["SBDecoded"]->setText(fl); - names["SBFrame"]->setText(TQString::tqfromLatin1("0/0")); + names["SBFrame"]->setText(TQString::fromLatin1("0/0")); } SQ_ToolBar::SQ_ToolBar(TQWidget *parent) : KToolBar(parent) diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp index 4891e6f..4c19429 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -491,7 +491,7 @@ void SQ_GLWidget::matrixChanged() float z = (m < 1.0) ? 1.0/m : m; // construct zoom - str = TQString::tqfromLatin1("%1% [%2:%3]") + str = TQString::fromLatin1("%1% [%2:%3]") .tqarg(fzoom, 0, 'f', 1) .tqarg((m < 1.0)?1.0:z, 0, 'f', 1) .tqarg((m > 1.0)?1.0:z, 0, 'f', 1); @@ -503,7 +503,7 @@ void SQ_GLWidget::matrixChanged() #endif // construct rotation angle - str = TQString::tqfromLatin1("%1%2 %3 deg") + str = TQString::fromLatin1("%1%2 %3 deg") .tqarg((tab->isflippedV)?"V":"") .tqarg((tab->isflippedH)?"H":"") .tqarg(tab->curangle, 0, 'f', 1); @@ -1598,7 +1598,7 @@ void SQ_GLWidget::decode() } } - id = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp)); + id = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(tab->current+1).tqarg(im->w).tqarg(im->h).tqarg(im->bpp)); images->setItemParameter(id, tab->current); @@ -1655,7 +1655,7 @@ void SQ_GLWidget::paletteChange(const TQPalette &oldPalette) if(SQ_Config::instance()->readNumEntry("GL view background type", 1) == 0) { - TQColor color = tqcolorGroup().color(TQColorGroup::Base); + TQColor color = colorGroup().color(TQColorGroup::Base); qglClearColor(color); updateGL(); } diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index 3a212cb..f6157f7 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -91,14 +91,14 @@ void SQ_GLWidget::createActions() pAFull = new KToggleAction(TQString(), 0, 0, 0, ac, "SQ GL Full"); - TQString squirrel_zoom_actions = TQString::tqfromLatin1("squirrel_zoom_actions"); + TQString squirrel_zoom_actions = TQString::fromLatin1("squirrel_zoom_actions"); pAZoomW->setExclusiveGroup(squirrel_zoom_actions); pAZoomH->setExclusiveGroup(squirrel_zoom_actions); pAZoomWH->setExclusiveGroup(squirrel_zoom_actions); pAZoom100->setExclusiveGroup(squirrel_zoom_actions); pAZoomLast->setExclusiveGroup(squirrel_zoom_actions); - TQString squirrel_selection_type = TQString::tqfromLatin1("squirrel_selection_type"); + TQString squirrel_selection_type = TQString::fromLatin1("squirrel_selection_type"); pASelectionEllipse->setExclusiveGroup(squirrel_selection_type); pASelectionRect->setExclusiveGroup(squirrel_selection_type); @@ -236,17 +236,17 @@ void SQ_GLWidget::slotProperties() // save tab->current image parameters and some additioanl information // in list list << tab->quickImageInfo - << TQString::tqfromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) + << TQString::fromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) << tab->finfo.image[tab->current].colorspace << tab->finfo.image[tab->current].compression << sz - << TQString::tqfromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2) + << TQString::fromLatin1("%1").tqarg((double)real_size / tab->fmt_size, 0, 'f', 2) << ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no")) - << TQString::tqfromLatin1("%1").tqarg(errors) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image.size()) - << TQString::tqfromLatin1("#%1").tqarg(tab->current+1) - << TQString::tqfromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); + << TQString::fromLatin1("%1").tqarg(errors) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image.size()) + << TQString::fromLatin1("#%1").tqarg(tab->current+1) + << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); // create dialog and setup it SQ_ImageProperties prop(this); @@ -867,7 +867,7 @@ void SQ_GLWidget::initAccelsAndMenu() menu->insertItem(i18n("Image"), menuImage); #define SQ_ADD_KACTION(b) \ - (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::tqfromLatin1("action_%1").tqarg(b))) + (new KAction(TQString(), b, TQT_TQOBJECT(this), TQT_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").tqarg(b))) id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("filesaveas", KIcon::Desktop, KIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQT_SLOT(activate())); @@ -900,13 +900,13 @@ void SQ_GLWidget::initAccelsAndMenu() menuZoom->insertItem(i18n("Zoom 2x") + "\tCtrl++", SQ_ADD_KACTION(TQt::Key_Plus+CTRL), TQT_SLOT(activate())); menuZoom->insertItem(i18n("Zoom 1/2x") + "\tCtrl+-", SQ_ADD_KACTION(TQt::Key_Minus+CTRL), TQT_SLOT(activate())); menuZoom->insertSeparator(); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::tqfromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::tqfromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::tqfromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::tqfromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::tqfromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::tqfromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate())); - menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::tqfromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom10016.png")), TQString::fromLatin1("100%") + "\t1", SQ_ADD_KACTION(TQt::Key_1), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom20016.png")), TQString::fromLatin1("200%") + "\t2", SQ_ADD_KACTION(TQt::Key_2), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom30016.png")), TQString::fromLatin1("300%") + "\t3", SQ_ADD_KACTION(TQt::Key_3), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom50016.png")), TQString::fromLatin1("500%") + "\t5", SQ_ADD_KACTION(TQt::Key_5), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom70016.png")), TQString::fromLatin1("700%") + "\t7", SQ_ADD_KACTION(TQt::Key_7), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom90016.png")), TQString::fromLatin1("900%") + "\t9", SQ_ADD_KACTION(TQt::Key_9), TQT_SLOT(activate())); + menuZoom->insertItem(TQPixmap(locate("data", "images/menu/zoom100016.png")), TQString::fromLatin1("1000%") + "\t0", SQ_ADD_KACTION(TQt::Key_0), TQT_SLOT(activate())); menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveLeft16.png")), i18n("Move left") + "\tRight", SQ_ADD_KACTION(TQt::Key_Right), TQT_SLOT(activate())); menuMove->insertItem(TQPixmap(locate("data", "images/menu/moveRight16.png")), i18n("Move right") + "\tLeft", SQ_ADD_KACTION(TQt::Key_Left), TQT_SLOT(activate())); @@ -1312,7 +1312,7 @@ void SQ_GLWidget::slotChangeTab(int id) for(;it != itEnd;++it, ++i) { - mid = images->insertItem(TQString::tqfromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp)); + mid = images->insertItem(TQString::fromLatin1("#%1 [%2x%3@%4]").tqarg(i+1).tqarg((*it).w).tqarg((*it).h).tqarg((*it).bpp)); images->setItemParameter(mid, i); if(i == tab->current) @@ -1493,7 +1493,7 @@ void SQ_GLWidget::setClearColor() { // system color case 0: - color = tqcolorGroup().color(TQColorGroup::Base); + color = colorGroup().color(TQColorGroup::Base); break; // custom color @@ -1623,7 +1623,7 @@ void SQ_GLWidget::createMarks() */ void SQ_GLWidget::updateCurrentFileInfo() { - TQString status = TQString::tqfromLatin1("%1x%2@%3") + TQString status = TQString::fromLatin1("%1x%2@%3") .tqarg(tab->finfo.image[tab->current].w) .tqarg(tab->finfo.image[tab->current].h) .tqarg(tab->finfo.image[tab->current].bpp); @@ -1667,7 +1667,7 @@ void SQ_GLWidget::calcFrameLabelWidth() #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBFrame")->setFixedWidth( SQ_GLView::window()->sbarWidget("SBFrame")->fontMetrics() - .boundingRect(TQString::tqfromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width()); + .boundingRect(TQString::fromLatin1("0%1/0%2").tqarg(tab->total).tqarg(tab->total)).width()); #endif } @@ -1680,9 +1680,9 @@ void SQ_GLWidget::calcFrameLabelWidth() void SQ_GLWidget::frameChanged() { #ifndef KSQUIRREL_PART - SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); + SQ_GLView::window()->sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); #else - t_glv.sbarWidget("SBFrame")->setText(TQString::tqfromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); + t_glv.sbarWidget("SBFrame")->setText(TQString::fromLatin1("%1/%2").tqarg(tab->current+1).tqarg(tab->total)); #endif } diff --git a/ksquirrel/sq_helpwidget.ui b/ksquirrel/sq_helpwidget.ui index 02fb30d..d0500af 100644 --- a/ksquirrel/sq_helpwidget.ui +++ b/ksquirrel/sq_helpwidget.ui @@ -296,7 +296,7 @@ Expanding - + 16 16 diff --git a/ksquirrel/sq_iconlistbox.cpp b/ksquirrel/sq_iconlistbox.cpp index d50bee2..d4cb006 100644 --- a/ksquirrel/sq_iconlistbox.cpp +++ b/ksquirrel/sq_iconlistbox.cpp @@ -44,7 +44,7 @@ void SQ_IconListBox::updateWidth() ((SQ_IconListItem *)i)->expandMinimumWidth(maxWidth + 30); if(verticalScrollBar()->isVisible()) - maxWidth += verticalScrollBar()->tqsizeHint().width(); + maxWidth += verticalScrollBar()->sizeHint().width(); setFixedWidth(maxWidth + frameWidth()*2 + 30); mWidthValid = true; diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui index caee756..766a227 100644 --- a/ksquirrel/sq_imageproperties.ui +++ b/ksquirrel/sq_imageproperties.ui @@ -49,7 +49,7 @@ Expanding - + 470 20 @@ -81,7 +81,7 @@ Expanding - + 20 10 @@ -602,7 +602,7 @@ - tqStatus: + Status: AlignTop|AlignRight @@ -618,7 +618,7 @@ Expanding - + 210 16 @@ -813,7 +813,7 @@ - texttqStatus + textStatus @@ -831,7 +831,7 @@ Expanding - + 205 16 diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index 340676c..fc7b0e0 100644 --- a/ksquirrel/sq_imageproperties.ui.h +++ b/ksquirrel/sq_imageproperties.ui.h @@ -69,11 +69,11 @@ void SQ_ImageProperties::setParams(TQStringList &l) int errors = (*it).toInt(); ++it; textFrames->setText(*it); ++it; textFrame->setText(*it); ++it; - TQString s = TQString::tqfromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); - texttqStatus->setText((errors)?s:TQString()); + TQString s = TQString::fromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); + textStatus->setText((errors)?s:TQString()); textStatusIcon->setPixmap((errors)?error:ok); - s = TQString::tqfromLatin1("%1%2").tqarg(*it).tqarg(i18n(" ms.")); + s = TQString::fromLatin1("%1%2").tqarg(*it).tqarg(i18n(" ms.")); textDelay->setText(s); } @@ -162,9 +162,9 @@ void SQ_ImageProperties::setMetaInfo(TQValueVector > m for(TQValueVector >::iterator it = meta.begin();it != itEnd;++it) { if(after) - item = new TQListViewItem(listMeta, after, (*it).first+TQString::tqfromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); + item = new TQListViewItem(listMeta, after, (*it).first+TQString::fromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); else - after = item = new TQListViewItem(listMeta, (*it).first+TQString::tqfromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); + after = item = new TQListViewItem(listMeta, (*it).first+TQString::fromLatin1(" "), (*it).second.replace(TQChar('\n'), TQChar(' '))); listMeta->insertItem(item); } diff --git a/ksquirrel/sq_libraryhandler.cpp b/ksquirrel/sq_libraryhandler.cpp index 23c84da..326f07f 100644 --- a/ksquirrel/sq_libraryhandler.cpp +++ b/ksquirrel/sq_libraryhandler.cpp @@ -252,8 +252,8 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries) libtmp.lib->load(); // resolve create() and destroy() functions - libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::tqfromLatin1("codec_create")); - libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::tqfromLatin1("codec_destroy")); + libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create")); + libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy")); // couldn't resolve - corrupted library ? if(!libtmp.codec_create || !libtmp.codec_destroy) diff --git a/ksquirrel/sq_options.ui b/ksquirrel/sq_options.ui index bbc722f..52723ca 100644 --- a/ksquirrel/sq_options.ui +++ b/ksquirrel/sq_options.ui @@ -21,13 +21,13 @@ 0 - + 0 0 - + 10000 10000 @@ -77,7 +77,7 @@ Expanding - + 400 20 @@ -164,7 +164,7 @@ Expanding - + 20 20 @@ -466,7 +466,7 @@ Expanding - + 20 10 @@ -496,7 +496,7 @@ Expanding - + 26 10 @@ -590,7 +590,7 @@ Expanding - + 20 40 @@ -688,7 +688,7 @@ Expanding - + 20 10 @@ -981,7 +981,7 @@ false - + 95 25 @@ -1077,7 +1077,7 @@ Expanding - + 16 2 @@ -1151,7 +1151,7 @@ Expanding - + 20 2 @@ -1243,7 +1243,7 @@ Expanding - + 16 50 @@ -1273,7 +1273,7 @@ Expanding - + 20 20 @@ -1473,7 +1473,7 @@ Expanding - + 20 40 @@ -1511,7 +1511,7 @@ Expanding - + 16 46 @@ -1659,7 +1659,7 @@ Expanding - + 21 135 @@ -1697,7 +1697,7 @@ Expanding - + 21 90 @@ -1751,7 +1751,7 @@ Expanding - + 21 10 diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h index 4252981..d0ed42a 100644 --- a/ksquirrel/sq_options.ui.h +++ b/ksquirrel/sq_options.ui.h @@ -89,7 +89,7 @@ void SQ_Options::init() buttonGroupColor->setButton(tp); widgetStack4->raiseWidget(tp); - kColorSystem->setColor(tqcolorGroup().color(TQColorGroup::Base)); + kColorSystem->setColor(colorGroup().color(TQColorGroup::Base)); tp = kconf->readNumEntry("zoom limit", 1); buttonGroupZoomLimit->setButton(tp); @@ -292,7 +292,7 @@ void SQ_Options::slotNewCustomTexture( const TQString & path) if(validPixmap(p1)) { custpixmap = path; - textCustomValidate->setText(TQString::tqfromLatin1("%1x%2: OK") + textCustomValidate->setText(TQString::fromLatin1("%1x%2: OK") .tqarg(p1.width()) .tqarg(p1.height())); } @@ -324,10 +324,10 @@ void SQ_Options::paletteChange( const TQPalette &oldPalette ) { TQDialog::paletteChange(oldPalette); - kColorSystem->setColor(tqcolorGroup().color(TQColorGroup::Base)); + kColorSystem->setColor(colorGroup().color(TQColorGroup::Base)); } void SQ_Options::slotSetSystemBack( const TQColor & ) { - kColorSystem->setColor(tqcolorGroup().color(TQColorGroup::Base)); + kColorSystem->setColor(colorGroup().color(TQColorGroup::Base)); } diff --git a/ksquirrel/sq_pluginsinfo.ui b/ksquirrel/sq_pluginsinfo.ui index 49962df..06b0d0f 100644 --- a/ksquirrel/sq_pluginsinfo.ui +++ b/ksquirrel/sq_pluginsinfo.ui @@ -163,7 +163,7 @@ Expanding - + 70 16 @@ -211,7 +211,7 @@ Expanding - + 445 16 diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui index a8b718e..11b76f6 100644 --- a/ksquirrel/sq_slideshow.ui +++ b/ksquirrel/sq_slideshow.ui @@ -40,7 +40,7 @@ Expanding - + 220 26 @@ -100,7 +100,7 @@ Expanding - + 175 16 @@ -280,7 +280,7 @@ Expanding - + 186 16 @@ -316,7 +316,7 @@ Expanding - + 145 16 diff --git a/ksquirrel/sq_slideshowlisting.ui.h b/ksquirrel/sq_slideshowlisting.ui.h index 5b57c2a..2de28a6 100644 --- a/ksquirrel/sq_slideshowlisting.ui.h +++ b/ksquirrel/sq_slideshowlisting.ui.h @@ -17,6 +17,6 @@ void SQ_SlideShowListing::init() void SQ_SlideShowListing::setFile(int count, const TQString &f) { - textCount->setText(TQString::tqfromLatin1("[%1]").tqarg(count)); + textCount->setText(TQString::fromLatin1("[%1]").tqarg(count)); textFile->setText(f); } diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp index 5e330aa..68eee73 100644 --- a/ksquirrel/sq_slideshowwidget.cpp +++ b/ksquirrel/sq_slideshowwidget.cpp @@ -346,7 +346,7 @@ void SQ_SlideShowWidget::constructMessage() TQFileInfo fm(path); TQString s_message; - if(mes_pos) s_message = TQString::tqfromLatin1("[%1/%2] ").tqarg(current+1).tqarg(total); + if(mes_pos) s_message = TQString::fromLatin1("[%1/%2] ").tqarg(current+1).tqarg(total); if(mes_name) s_message += fm.fileName(); diff --git a/ksquirrel/sq_tabopendialog.ui b/ksquirrel/sq_tabopendialog.ui index 6359e64..a07780d 100644 --- a/ksquirrel/sq_tabopendialog.ui +++ b/ksquirrel/sq_tabopendialog.ui @@ -56,7 +56,7 @@ Expanding - + 10 31 diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui index dd31202..1e301af 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -154,7 +154,7 @@ Expanding - + 195 21 diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h index a435add..575376e 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui.h +++ b/ksquirrel/sq_thumbnailcachemaster.ui.h @@ -65,7 +65,7 @@ void SQ_ThumbnailCacheMaster::slotClearMemoryCache() void SQ_ThumbnailCacheMaster::slotCalcCacheMemory() { - textCacheMemSize->setText(TQString::tqfromLatin1("%1/%2") + textCacheMemSize->setText(TQString::fromLatin1("%1/%2") .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); } diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp index 883313a..04bf3a3 100644 --- a/ksquirrel/sq_thumbnailloadjob.cpp +++ b/ksquirrel/sq_thumbnailloadjob.cpp @@ -257,7 +257,7 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) mState = STATE_PREDOWNLOAD; continueDownload = false; - tmp = new KTempFile(TQString(), TQString::tqfromLatin1(".%1").tqarg(suff), 0600); + tmp = new KTempFile(TQString(), TQString::fromLatin1(".%1").tqarg(suff), 0600); tmp->setAutoDelete(true); tmp->close(); diff --git a/ksquirrel/sq_viewcache.ui b/ksquirrel/sq_viewcache.ui index f748c39..cb04c26 100644 --- a/ksquirrel/sq_viewcache.ui +++ b/ksquirrel/sq_viewcache.ui @@ -134,7 +134,7 @@ Expanding - + 16 20 diff --git a/ksquirrel/sq_viewcache.ui.h b/ksquirrel/sq_viewcache.ui.h index 5066e05..6b8b98a 100644 --- a/ksquirrel/sq_viewcache.ui.h +++ b/ksquirrel/sq_viewcache.ui.h @@ -31,10 +31,10 @@ void SQ_ViewCache::init() if(itemafter) item = new TQListViewItem(listCache, itemafter, s, - TQString(), TQString::tqfromLatin1("%1x%2").tqarg(th.w).tqarg(th.h)); + TQString(), TQString::fromLatin1("%1x%2").tqarg(th.w).tqarg(th.h)); else item = new TQListViewItem(listCache, s, - TQString(), TQString::tqfromLatin1("%1x%2").tqarg(th.w).tqarg(th.h)); + TQString(), TQString::fromLatin1("%1x%2").tqarg(th.w).tqarg(th.h)); item->setPixmap(1, it.data().mime);