From bc35492ff852bb290006909536af53391753513f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:41 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- ksquirrel/imageedit/sq_bcglabel.cpp | 2 +- ksquirrel/imageedit/sq_converter.cpp | 6 +- ksquirrel/imageedit/sq_imagebcg.ui | 38 +++++----- ksquirrel/imageedit/sq_imageconvert.ui | 6 +- ksquirrel/imageedit/sq_imageeditoptions.ui | 4 +- ksquirrel/imageedit/sq_imagefilter.ui | 72 +++++++++---------- ksquirrel/imageedit/sq_writeoption.ui | 6 +- ksquirrel/ksquirrel-libs-configurator/klc.cpp | 14 ++-- ksquirrel/ksquirrel-libs-configurator/klc.ui | 4 +- .../ksquirrel-libs-configurator/klc.ui.h | 2 +- ksquirrel/ksquirrel.cpp | 28 ++++---- ksquirrel/ksquirrelpart/ksquirrelpart.cpp | 30 ++++---- ksquirrel/ksquirrelpart/sq_bcglabel.cpp | 2 +- .../ksquirrelpart/sq_codecsettingsskeleton.ui | 8 +-- .../sq_codecsettingsskeleton.ui.h | 2 +- ksquirrel/ksquirrelpart/sq_errorstring.cpp | 2 +- ksquirrel/ksquirrelpart/sq_externaltool.cpp | 2 +- .../ksquirrelpart/sq_glselectionpainter.h | 2 +- ksquirrel/ksquirrelpart/sq_glwidget.cpp | 24 +++---- ksquirrel/ksquirrelpart/sq_glwidget_helpers.h | 2 +- ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp | 66 ++++++++--------- ksquirrel/ksquirrelpart/sq_helpwidget.ui | 12 ++-- ksquirrel/ksquirrelpart/sq_imagebcg.ui | 38 +++++----- ksquirrel/ksquirrelpart/sq_imagefilter.ui | 72 +++++++++---------- ksquirrel/ksquirrelpart/sq_imageproperties.ui | 54 +++++++------- .../ksquirrelpart/sq_imageproperties.ui.h | 22 +++--- ksquirrel/ksquirrelpart/sq_libraryhandler.cpp | 4 +- ksquirrel/ksquirrelpart/sq_utils_scale.cpp | 2 +- ksquirrel/main.cpp | 2 +- ksquirrel/sidebar/sq_categorybrowsermenu.cpp | 2 +- ksquirrel/sidebar/sq_directorybasket.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 | 10 +-- ksquirrel/sidebar/sq_treeviewitem.h | 4 +- ksquirrel/sidebar/sq_treeviewmenu.cpp | 10 +-- ksquirrel/sq_codecsettingsskeleton.ui | 8 +-- ksquirrel/sq_codecsettingsskeleton.ui.h | 2 +- ksquirrel/sq_dir.cpp | 2 +- ksquirrel/sq_diroperator.cpp | 36 +++++----- ksquirrel/sq_dirthumbs.cpp | 6 +- ksquirrel/sq_dragprovider.cpp | 4 +- ksquirrel/sq_errorstring.cpp | 2 +- ksquirrel/sq_externaltool.cpp | 2 +- ksquirrel/sq_externaltools.ui | 12 ++-- ksquirrel/sq_filethumbview.cpp | 22 +++--- ksquirrel/sq_filters.ui | 12 ++-- ksquirrel/sq_glinfo.ui | 2 +- ksquirrel/sq_glselectionpainter.h | 2 +- ksquirrel/sq_glview.cpp | 16 ++--- ksquirrel/sq_glwidget.cpp | 24 +++---- ksquirrel/sq_glwidget_helpers.h | 2 +- ksquirrel/sq_glwidget_stuff.cpp | 66 ++++++++--------- ksquirrel/sq_helpwidget.ui | 12 ++-- ksquirrel/sq_iconlistbox.cpp | 2 +- ksquirrel/sq_imageproperties.ui | 54 +++++++------- ksquirrel/sq_imageproperties.ui.h | 22 +++--- ksquirrel/sq_libraryhandler.cpp | 4 +- ksquirrel/sq_options.ui | 42 +++++------ ksquirrel/sq_options.ui.h | 16 ++--- ksquirrel/sq_pluginsinfo.ui | 8 +-- ksquirrel/sq_progress.cpp | 2 +- ksquirrel/sq_slideshow.ui | 32 ++++----- ksquirrel/sq_slideshowlisting.ui | 2 +- ksquirrel/sq_slideshowlisting.ui.h | 2 +- ksquirrel/sq_slideshowwidget.cpp | 2 +- ksquirrel/sq_tabopendialog.ui | 2 +- ksquirrel/sq_thumbnailcachemaster.ui | 8 +-- ksquirrel/sq_thumbnailcachemaster.ui.h | 6 +- ksquirrel/sq_thumbnailloadjob.cpp | 2 +- ksquirrel/sq_utils_scale.cpp | 2 +- ksquirrel/sq_viewcache.ui | 8 +-- ksquirrel/sq_viewcache.ui.h | 6 +- ksquirrel/sq_widgetstack.cpp | 6 +- 76 files changed, 512 insertions(+), 512 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..dbb1ad9 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.").arg((TQString::fromLatin1("%1").arg(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..59bad45 100644 --- a/ksquirrel/imageedit/sq_imagebcg.ui +++ b/ksquirrel/imageedit/sq_imagebcg.ui @@ -114,7 +114,7 @@ - tqlayout6 + layout6 @@ -152,7 +152,7 @@ - tqlayout5 + layout5 @@ -190,7 +190,7 @@ - tqlayout4 + layout4 @@ -322,7 +322,7 @@ - tqlayout1 + layout1 @@ -357,7 +357,7 @@ - tqlayout2 + layout2 @@ -392,7 +392,7 @@ - tqlayout3 + layout3 @@ -491,7 +491,7 @@ Expanding - + 1 16 @@ -508,7 +508,7 @@ Expanding - + 1 16 @@ -519,7 +519,7 @@ text - + WordBreak|AlignCenter @@ -535,7 +535,7 @@ MinimumExpanding - + 16 16 @@ -544,7 +544,7 @@ - tqlayout8 + layout8 @@ -560,7 +560,7 @@ Expanding - + 249 21 @@ -615,7 +615,7 @@ MinimumExpanding - + 16 20 @@ -624,7 +624,7 @@ - tqlayout15 + layout15 @@ -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..d1ae474 100644 --- a/ksquirrel/imageedit/sq_imageconvert.ui +++ b/ksquirrel/imageedit/sq_imageconvert.ui @@ -24,7 +24,7 @@ - tqlayout1 + layout1 @@ -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..d3e4783 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 @@ -207,7 +207,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -221,7 +221,7 @@ Expanding - + 11 26 @@ -251,7 +251,7 @@ Expanding - + 16 30 @@ -289,7 +289,7 @@ Expanding - + 16 30 @@ -338,7 +338,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -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 @@ -572,7 +572,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -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 @@ -1052,7 +1052,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -1066,7 +1066,7 @@ Expanding - + 11 113 @@ -1104,7 +1104,7 @@ Expanding - + 16 71 @@ -1124,7 +1124,7 @@ Expanding - + 16 16 @@ -1133,7 +1133,7 @@ - tqlayout2 + layout2 @@ -1149,7 +1149,7 @@ Expanding - + 285 16 @@ -1316,7 +1316,7 @@ 0 - + 140 0 @@ -1333,7 +1333,7 @@ Expanding - + 16 16 @@ -1342,7 +1342,7 @@ - tqlayout4 + layout4 @@ -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..aa11a78 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 @@ -145,7 +145,7 @@ <i>No special options available for this format</i> - + WordBreak|AlignTop|AlignHCenter diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp index 4a90161..385755a 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp +++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include "./klc.ui.h" @@ -38,17 +38,17 @@ KLC::KLC( TQWidget* parent, const char* name, WFlags fl ) setName( "KLC" ); KLCLayout = new TQGridLayout( this, 1, 1, 11, 6, "KLCLayout"); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new TQSpacerItem( 371, 26, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer1 ); + layout1->addItem( spacer1 ); pushApply = new TQPushButton( this, "pushApply" ); - tqlayout1->addWidget( pushApply ); + layout1->addWidget( pushApply ); pushClose = new TQPushButton( this, "pushClose" ); - tqlayout1->addWidget( pushClose ); + layout1->addWidget( pushClose ); - KLCLayout->addMultiCellLayout( tqlayout1, 2, 2, 0, 1 ); + KLCLayout->addMultiCellLayout( layout1, 2, 2, 0, 1 ); listDisabled = new TQListView( this, "listDisabled" ); listDisabled->addColumn( tr2i18n( "..." ) ); @@ -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..8027065 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -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..3372fef 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").arg(SQ_KL_VER); while((fi = it.current())) { diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index f7a1818..981ea19 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -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").arg(id)); if(a) a->activate(); } @@ -2159,7 +2159,7 @@ void KSquirrel::slotRename() TQString filename = TQStyleSheet::escape(renameSrcURL.filename()); TQString mNewFilename = KInputDialog::getText(i18n("Renaming File"), - i18n("

Rename file %1 to:

").tqarg(filename), + i18n("

Rename file %1 to:

").arg(filename), renameSrcURL.filename(), &ok, this); if(!ok) return; diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index f22b923..b4cad73 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()) @@ -80,46 +80,46 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, KAction *a; - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_Plus)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus)); new KAction(i18n("Zoom +"), "viewmag+", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_Minus)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus)); new KAction(i18n("Zoom -"), "viewmag-", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_P)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P)); new KAction(i18n("Properties"), "image", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_R)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R)); new KAction(i18n("Normalize"), "rebuild", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize"); // colorize & filters - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_D)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D)); new KAction(i18n("Color balance..."), "colorize", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_U)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U)); new KAction(i18n("Apply filter..."), "effect", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart filter"); // rotate - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_Left+CTRL)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL)); new KAction(i18n("Rotate left"), "rotate_ccw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_Right+CTRL)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL)); new KAction(i18n("Rotate right"), "rotate_cw", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright"); // copy/move - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_F5)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5)); new KAction(i18n("Copy to..."), "editcopy", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copyto"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_F7)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7)); new KAction(i18n("Move to..."), "editcut", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart moveto"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_F6)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6)); new KAction(i18n("Copy to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart copy"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_F8)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8)); new KAction(i18n("Move to last folder"), "", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart move"); - a = gl->actionCollection()->action(TQString("action_%1").tqarg(TQt::Key_S)); + a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S)); new KAction(i18n("Save As..."), "filesaveas", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart saveas"); sa = new KSelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom"); @@ -228,7 +228,7 @@ bool KSquirrelPart::openFile() void KSquirrelPart::setKonquerorWindowCaption(const KURL &, const TQString &filename) { - TQString caption = TQString("%1").tqarg(filename); + TQString caption = TQString("%1").arg(filename); emit setWindowCaption(caption); } 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..345b1be 100644 --- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui +++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui @@ -34,7 +34,7 @@ 0 - + 16 16 @@ -101,7 +101,7 @@ - tqlayout2 + layout2 @@ -117,7 +117,7 @@ Expanding - + 16 16 @@ -191,7 +191,7 @@ knuminput.h tqwidgetfactory.h tqspinbox.h - tqtextedit.h + textedit.h kurl.h kcolorbutton.h sq_codecsettingsskeleton.ui.h diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h index 5c6433b..8fff837 100644 --- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h +++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui.h @@ -25,7 +25,7 @@ void SQ_CodecSettingsSkeleton::addSettingsWidget(const TQString &path) pushApply->setEnabled(false); pushOK->setEnabled(false); - TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from %1. Please check your installation or contact ksquirrel.iv@gmail.com").tqarg(path), TQString(), groupBox); + TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from %1. Please check your installation or contact ksquirrel.iv@gmail.com").arg(path), TQString(), groupBox); t->setReadOnly(true); fake = t; } 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..93ff52e 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)").arg(items.count()-1)); menu->changeTitle(final); } diff --git a/ksquirrel/ksquirrelpart/sq_glselectionpainter.h b/ksquirrel/ksquirrelpart/sq_glselectionpainter.h index 19cec2c..ea39286 100644 --- a/ksquirrel/ksquirrelpart/sq_glselectionpainter.h +++ b/ksquirrel/ksquirrelpart/sq_glselectionpainter.h @@ -64,7 +64,7 @@ class SQ_GLSelectionPainter void end(); /* - * Selected rectangle tqgeometry + * Selected rectangle geometry */ TQPoint pos() const; TQSize size() const; diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp index bda1f57..5b42e58 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -491,10 +491,10 @@ void SQ_GLWidget::matrixChanged() float z = (m < 1.0) ? 1.0/m : m; // construct zoom - str = TQString::tqfromLatin1("%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); + str = TQString::fromLatin1("%1% [%2:%3]") + .arg(fzoom, 0, 'f', 1) + .arg((m < 1.0)?1.0:z, 0, 'f', 1) + .arg((m > 1.0)?1.0:z, 0, 'f', 1); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBGLZoom")->setText(str); @@ -503,10 +503,10 @@ void SQ_GLWidget::matrixChanged() #endif // construct rotation angle - str = TQString::tqfromLatin1("%1%2 %3 deg") - .tqarg((tab->isflippedV)?"V":"") - .tqarg((tab->isflippedH)?"H":"") - .tqarg(tab->curangle, 0, 'f', 1); + str = TQString::fromLatin1("%1%2 %3 deg") + .arg((tab->isflippedV)?"V":"") + .arg((tab->isflippedH)?"H":"") + .arg(tab->curangle, 0, 'f', 1); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBGLAngle")->setText(str); @@ -1273,7 +1273,7 @@ bool SQ_GLWidget::prepare() if(!m_lib) { - KMessageBox::error(this, i18n("Codec for %1 format not found").tqarg(tab->fmt_ext)); + KMessageBox::error(this, i18n("Codec for %1 format not found").arg(tab->fmt_ext)); reset_mode = false; tab = tabold; return false; @@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .tqarg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); decodeFailedOn0(SQE_R_NOMEMORY); return; @@ -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]").arg(tab->current+1).arg(im->w).arg(im->h).arg(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_helpers.h b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h index 18e1956..db637ed 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h +++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h @@ -66,7 +66,7 @@ namespace SQ_GLHelpers /* * normalize selection rectangle * sx,sy are X and Y coordinates - * sw x sh is a selection tqgeometry + * sw x sh is a selection geometry */ bool normalizeSelection(int &sx, int &sy, int &sw, int &sh, int w, int h, const TQWMatrix&, int curangle, int orient); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index 3a212cb..0ba4dd5 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -19,7 +19,7 @@ #include "config.h" #endif -#include +#include #include #include #include @@ -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").arg(tab->finfo.image[tab->current].w).arg(tab->finfo.image[tab->current].h) + << TQString::fromLatin1("%1").arg(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").arg((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").arg(errors) + << TQString::fromLatin1("%1").arg(tab->finfo.image.size()) + << TQString::fromLatin1("#%1").arg(tab->current+1) + << TQString::fromLatin1("%1").arg(tab->finfo.image[tab->current].delay); // create dialog and setup it SQ_ImageProperties prop(this); @@ -493,7 +493,7 @@ void SQ_GLWidget::saveAs() if(!wlib || !wlib->writestatic) { - KMessageBox::error(this, i18n("Sorry, could not perform write operation\nfor codec \"%1\"").tqarg(d.nameFilter())); + KMessageBox::error(this, i18n("Sorry, could not perform write operation\nfor codec \"%1\"").arg(d.nameFilter())); return; } @@ -644,9 +644,9 @@ void SQ_GLWidget::toClipboard() // image doesn't have extra regions if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h) - KApplication::tqclipboard()->setImage(im, TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im, TQClipboard::Clipboard); else - KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); } void SQ_GLWidget::bcg() @@ -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").arg(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())); @@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .tqarg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); return; } @@ -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]").arg(i+1).arg((*it).w).arg((*it).h).arg((*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,10 +1623,10 @@ void SQ_GLWidget::createMarks() */ void SQ_GLWidget::updateCurrentFileInfo() { - TQString status = TQString::tqfromLatin1("%1x%2@%3") - .tqarg(tab->finfo.image[tab->current].w) - .tqarg(tab->finfo.image[tab->current].h) - .tqarg(tab->finfo.image[tab->current].bpp); + TQString status = TQString::fromLatin1("%1x%2@%3") + .arg(tab->finfo.image[tab->current].w) + .arg(tab->finfo.image[tab->current].h) + .arg(tab->finfo.image[tab->current].bpp); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBDecoded")->setText(status); @@ -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").arg(tab->total).arg(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").arg(tab->current+1).arg(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").arg(tab->current+1).arg(tab->total)); #endif } @@ -1755,7 +1755,7 @@ void SQ_GLWidget::slotPrint() TQSize sz(img.width(), img.height()); if(img.width() > mt.width() || img.height() > mt.height()) - sz.tqscale(mt.width(), mt.height(), TQSize::ScaleMin); + sz.scale(mt.width(), mt.height(), TQSize::ScaleMin); int cp = printer.numCopies(); @@ -1774,5 +1774,5 @@ void SQ_GLWidget::copyURL() if(!decoded || tab->broken) return; - TQApplication::tqclipboard()->setText(tab->m_original.prettyURL()); + TQApplication::clipboard()->setText(tab->m_original.prettyURL()); } diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/ksquirrel/ksquirrelpart/sq_helpwidget.ui index 02fb30d..cb2a4bc 100644 --- a/ksquirrel/ksquirrelpart/sq_helpwidget.ui +++ b/ksquirrel/ksquirrelpart/sq_helpwidget.ui @@ -55,7 +55,7 @@ <p align=center><table><tr><td><b><p align=right>Esc,X,Return</p></b></td><td>close</td></tr><tr><td><b><p align=right>Middle click, F</p></b></td><td>fullscreen</td></tr><tr><td><b><p align=right>Z</p></b></td><td>show 'Zoom' menu</td></tr><tr><td><b><p align=right>/</p></b></td><td>show this help</td></tr><tr><td><b><p align=right>Right click, M, ContextMenu</p></b></td><td>show context menu</td></tr><tr><td><b><p align=right>N</p></b></td><td>toggle filter</td></tr><tr><td><b><p align=right>Shift + Left button</p></b></td><td>select a region</td></tr><tr><td><b><p align=right>Shift + Left</p></b></td><td>previous tab</td></tr><tr><td><b><p align=right>Shift + Right</p></b></td><td>next tab</td></tr><tr><td><b><p align=right>W</p></b></td><td>close tab</td></tr></table></p> - + WordBreak|AlignTop @@ -79,7 +79,7 @@ <p align=center><table><tr><td><b><p align=right>Space, Page Down</p></b></td><td>next image</td></tr><tr><td><b><p align=right>Backspace, Page Up</p></b></td><td>previous image</td></tr><tr><td><b><p align=right>Home</p></b></td><td>first image</td></tr><tr><td><b><p align=right>End</p></b></td><td>last image</td></tr></table></p> - + WordBreak|AlignTop @@ -103,7 +103,7 @@ <p align=center><table><tr><td><b><p align=right>Left, Right, Up, Down</p></b></td><td>move the image</td></tr><tr><td><b><p align=right>Ctrl + Left</p></b></td><td>rotate left</td></tr><tr><td><b><p align=right>Ctrl + Right</p></b></td><td>rotate right</td></tr><tr><td><b><p align=right>Ctrl + Up/Down</p></b></td><td>rotate for 180 degrees up/down</td></tr><tr><td><b><p align=right>Alt + Left/Right</p></b></td><td>rotate for 1 degree left/right</td></tr></table</p> - + WordBreak|AlignTop @@ -127,7 +127,7 @@ <p align=center><table><tr><td><b><p align=right>+/-</p></b></td><td>zoom Nx</td></tr><tr><td><b><p align=right>Ctrl + +/-</p></b></td><td>zoom 2x/0.5x</td></tr><tr><td><b><p align=right>Scroll</p></b></td><td>load next/prev file OR zoom+/zoom-</td></tr><tr><td><b><p align=right>Shift + Scroll</p></b></td><td>zoom+/zoom-</td></tr><tr><td><b><p align=right>Ctrl + Scroll</p></b></td><td>zoom+ 2x/zoom- 2x</td></tr><tr><td><b><p align=right>1..9</p></b></td><td>zoom 1..9x</td></tr><tr><td><b><p align=right>0</p></b></td><td>zoom 10x</td></tr><tr><td><b><p align=right>comma</p></b></td><td>fit width</td></tr><tr><td><b><p align=right>period</p></b></td><td>fit height</td></tr><tr><td><b><p align=right>*</p></b></td><td>fit image</td></tr></table</p> - + WordBreak|AlignTop @@ -154,7 +154,7 @@ <p align=center><table><tr><td><p align=right><b>S</b></p></td><td>save as</td></tr><tr><td><p align=right><b>V</b></p></td><td>flip vertically</td></tr><tr><td><p align=right><b>H</b></p></td><td>flip horizontally</td></tr><tr><td><p align=right><b>R</b></p></td><td>reset</td></tr><tr><td><p align=right><b>P</b></p></td><td>image properties</td></tr><tr><td><p align=right><b>C</b></p></td><td>codec settings</td></tr><tr><td><p align=right><b>L</b></p></td><td>ignore zoom if image is smaller than window</td></tr><tr><td><p align=right><b>I</b></p></td><td>menu with images</td></tr><tr><td><p align=right><b>A</b></p></td><td>stop/start animation</td></tr><tr><td><p align=right><b>B</b></p></td><td>toggle drawing background for transparent images</td></tr><tr><td><p align=right><b>K</b></p></td><td>toggle drawing tickmarks</td></tr><tr><td><p align=right><b>E</b></p></td><td>show menu with external tools</td></tr><tr><td><p align=right><b>Y</b></p></td><td>crop</td></tr><tr><td><p align=right><b>F1</b></p></td><td>first image in multi-paged image</td></tr><tr><td><p align=right><b>F2</b></p></td><td>previous</td></tr><tr><td><p align=right><b>F3</b></p></td><td>next</td></tr><tr><td><p align=right><b>F4</b></p></td><td>last</td></tr></table></p> - + WordBreak|AlignTop @@ -296,7 +296,7 @@ Expanding - + 16 16 diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui index cad344f..59bad45 100644 --- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui +++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui @@ -114,7 +114,7 @@ - tqlayout6 + layout6 @@ -152,7 +152,7 @@ - tqlayout5 + layout5 @@ -190,7 +190,7 @@ - tqlayout4 + layout4 @@ -322,7 +322,7 @@ - tqlayout1 + layout1 @@ -357,7 +357,7 @@ - tqlayout2 + layout2 @@ -392,7 +392,7 @@ - tqlayout3 + layout3 @@ -491,7 +491,7 @@ Expanding - + 1 16 @@ -508,7 +508,7 @@ Expanding - + 1 16 @@ -519,7 +519,7 @@ text - + WordBreak|AlignCenter @@ -535,7 +535,7 @@ MinimumExpanding - + 16 16 @@ -544,7 +544,7 @@ - tqlayout8 + layout8 @@ -560,7 +560,7 @@ Expanding - + 249 21 @@ -615,7 +615,7 @@ MinimumExpanding - + 16 20 @@ -624,7 +624,7 @@ - tqlayout15 + layout15 @@ -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..d3e4783 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 @@ -207,7 +207,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -221,7 +221,7 @@ Expanding - + 11 26 @@ -251,7 +251,7 @@ Expanding - + 16 30 @@ -289,7 +289,7 @@ Expanding - + 16 30 @@ -338,7 +338,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -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 @@ -572,7 +572,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -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 @@ -1052,7 +1052,7 @@ There are no special options available for this filter. Just click "Filter". - + WordBreak|AlignVCenter @@ -1066,7 +1066,7 @@ Expanding - + 11 113 @@ -1104,7 +1104,7 @@ Expanding - + 16 71 @@ -1124,7 +1124,7 @@ Expanding - + 16 16 @@ -1133,7 +1133,7 @@ - tqlayout2 + layout2 @@ -1149,7 +1149,7 @@ Expanding - + 285 16 @@ -1316,7 +1316,7 @@ 0 - + 140 0 @@ -1333,7 +1333,7 @@ Expanding - + 16 16 @@ -1342,7 +1342,7 @@ - tqlayout4 + layout4 @@ -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..1651c2f 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 @@ -157,7 +157,7 @@ Permissions: - + AlignVCenter @@ -219,7 +219,7 @@ Created: - + WordBreak|AlignTop @@ -238,7 +238,7 @@ Last read: - + WordBreak|AlignTop @@ -257,7 +257,7 @@ Last modified: - + WordBreak|AlignTop @@ -422,7 +422,7 @@ - tqlayout5 + layout5 @@ -430,7 +430,7 @@ - tqlayout3 + layout3 @@ -443,7 +443,7 @@ Type: - + AlignTop|AlignRight @@ -454,7 +454,7 @@ Number of frames: - + AlignTop|AlignRight @@ -473,7 +473,7 @@ Current frame - + AlignTop|AlignRight @@ -492,7 +492,7 @@ Delay: - + AlignTop|AlignRight @@ -503,7 +503,7 @@ Dimensions: - + AlignTop|AlignRight @@ -514,7 +514,7 @@ Bits per pixel: - + AlignTop|AlignRight @@ -525,7 +525,7 @@ Color space: - + AlignTop|AlignRight @@ -536,7 +536,7 @@ Compression: - + AlignTop|AlignRight @@ -547,7 +547,7 @@ Uncompressed size: - + AlignTop|AlignRight @@ -566,7 +566,7 @@ Compression ratio: - + AlignTop|AlignRight @@ -585,7 +585,7 @@ Interlaced: - + AlignTop|AlignRight @@ -602,9 +602,9 @@ - tqStatus: + Status: - + AlignTop|AlignRight @@ -618,7 +618,7 @@ Expanding - + 210 16 @@ -629,7 +629,7 @@ - tqlayout4 + layout4 @@ -789,7 +789,7 @@ - tqlayout1 + layout1 @@ -813,7 +813,7 @@ - texttqStatus + textStatus @@ -831,7 +831,7 @@ Expanding - + 205 16 @@ -926,7 +926,7 @@ kstdaction.h kaction.h tqapplication.h - tqclipboard.h + clipboard.h tqdir.h sq_iconloader.h tqbuttongroup.h diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 385acf3..1ec36b0 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").arg(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").arg(*it).arg(i18n(" ms.")); textDelay->setText(s); } @@ -115,7 +115,7 @@ void SQ_ImageProperties::setFileParams() kew1->loadFile(file); // hack to workaround poor libkexif API - TQObjectList *ch = const_cast(kew1->tqchildren()); + TQObjectList *ch = const_cast(kew1->children()); for(TQObjectList::iterator it = ch->begin();it != ch->end();++it) { if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) @@ -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); } @@ -192,7 +192,7 @@ void SQ_ImageProperties::slotContextMenu( TQListViewItem *item, const TQPoint &p void SQ_ImageProperties::slotCopyString() { - TQApplication::tqclipboard()->setText(data->text(z), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(data->text(z), TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyAll() @@ -208,7 +208,7 @@ void SQ_ImageProperties::slotCopyAll() app.append(item->text(0) + "\n" + item->text(1) + "\n"); } - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyEntry() @@ -218,7 +218,7 @@ void SQ_ImageProperties::slotCopyEntry() TQString app = data->text(0) + "\n" + data->text(1) + "\n"; - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotModeClicked(int id) @@ -243,8 +243,8 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job) lineFile->setText(fi.name()); textSize->setText(KIO::convertSize(fi.size())); - textOwner->setText(TQString("%1").tqarg(fi.user())); - textGroup->setText(TQString("%1").tqarg(fi.group())); + textOwner->setText(TQString("%1").arg(fi.user())); + textGroup->setText(TQString("%1").arg(fi.group())); textPermissions->setText(fi.permissionsString()); TQDateTime abs; 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/ksquirrelpart/sq_utils_scale.cpp b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp index 53124ee..3e121a1 100644 --- a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp +++ b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp @@ -1883,7 +1883,7 @@ TQImage scale(const TQImage& image, int width, int height, if( image.isNull()) return image.copy(); TQSize newSize( image.size() ); - newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 + newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null if ( newSize == image.size() ) return image.copy(); 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_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp index 9bc756a..901de19 100644 --- a/ksquirrel/sidebar/sq_directorybasket.cpp +++ b/ksquirrel/sidebar/sq_directorybasket.cpp @@ -89,7 +89,7 @@ void SQ_DBMenu::slotDirectoryRename() bool ok; TQString mNewFilename = KInputDialog::getText(i18n("Rename Folder"), - i18n("

Rename item %1 to:

").tqarg(renameSrc), + i18n("

Rename item %1 to:

").arg(renameSrc), renameSrc, &ok, KSquirrel::app()); if(ok) 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..34c7ad1 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").arg(w).arg(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..2f4f3f4 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.cpp +++ b/ksquirrel/sidebar/sq_treeviewitem.cpp @@ -39,7 +39,7 @@ SQ_TreeViewItem::~SQ_TreeViewItem() void SQ_TreeViewItem::paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {} -void SQ_TreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void SQ_TreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { KListView *klv = static_cast(listView()); @@ -79,7 +79,7 @@ void SQ_TreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column cc.setColor(TQColorGroup::Base, klv->alternateBackground()); } - TQListViewItem::paintCell(p, cc, column, width, tqalignment); + TQListViewItem::paintCell(p, cc, column, width, alignment); } } @@ -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]").arg(count_dirs).arg(count_files); else if(use_c1 && count_files) // files, file count is > 0 - s = TQString::tqfromLatin1(" [%1]").tqarg(count_files); + s = TQString::fromLatin1(" [%1]").arg(count_files); else if(use_c2 && count_dirs) // dirs, dir count is > 0 - s = TQString::tqfromLatin1(" [%1]").tqarg(count_dirs); + s = TQString::fromLatin1(" [%1]").arg(count_dirs); KFileTreeViewItem::setText(column, text + s); } diff --git a/ksquirrel/sidebar/sq_treeviewitem.h b/ksquirrel/sidebar/sq_treeviewitem.h index 64a2059..7c8419a 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.h +++ b/ksquirrel/sidebar/sq_treeviewitem.h @@ -42,7 +42,7 @@ class SQ_TreeViewItem : public KFileTreeViewItem virtual void setText(int column, const TQString &text); protected: - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); private: bool m_checked; @@ -67,7 +67,7 @@ inline void SQ_TreeViewItem::setChecked(bool c) { m_checked = c; - tqrepaint(); + repaint(); } inline diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp index db75998..cbf1ac4 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.cpp +++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -62,7 +62,7 @@ void SQ_TreeViewMenu::slotDirectoryNew() bool ok; TQString mNewFilename = KInputDialog::getText(i18n("Create Subfolder"), - i18n("

Create new folder in %1:

").tqarg(TQStyleSheet::escape(m_url.filename())), + i18n("

Create new folder in %1:

").arg(TQStyleSheet::escape(m_url.filename())), TQString(), &ok, KSquirrel::app()); if(ok) @@ -86,7 +86,7 @@ void SQ_TreeViewMenu::slotDirectoryRename() TQString filename = TQStyleSheet::escape(renameSrcURL.filename()); TQString mNewFilename = KInputDialog::getText(i18n("Rename Folder"), - i18n("

Rename folder %1 to:

").tqarg(filename), + i18n("

Rename folder %1 to:

").arg(filename), renameSrcURL.filename(), &ok, KSquirrel::app()); if(ok) @@ -108,7 +108,7 @@ void SQ_TreeViewMenu::slotDirectoryDelete() TQString dir = TQStyleSheet::escape(m_url.path()); if(KMessageBox::questionYesNo(KSquirrel::app(), - "" + i18n("Are you sure you want to delete %1?").tqarg(dir) + "") == KMessageBox::No) + "" + i18n("Are you sure you want to delete %1?").arg(dir) + "") == KMessageBox::No) return; KIO::Job *job = KIO::del(m_url); @@ -124,7 +124,7 @@ void SQ_TreeViewMenu::slotDirectoryClear() urlstodel.clear(); if(KMessageBox::questionYesNo(KSquirrel::app(), - "" + i18n("Are you sure you want to delete contents of %1?").tqarg(m_url.path()) + "") == KMessageBox::No) + "" + i18n("Are you sure you want to delete contents of %1?").arg(m_url.path()) + "") == KMessageBox::No) return; KIO::Job *job = KIO::listDir(m_url, false, true); diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/ksquirrel/sq_codecsettingsskeleton.ui index 7f282ab..345b1be 100644 --- a/ksquirrel/sq_codecsettingsskeleton.ui +++ b/ksquirrel/sq_codecsettingsskeleton.ui @@ -34,7 +34,7 @@ 0 - + 16 16 @@ -101,7 +101,7 @@ - tqlayout2 + layout2 @@ -117,7 +117,7 @@ Expanding - + 16 16 @@ -191,7 +191,7 @@ knuminput.h tqwidgetfactory.h tqspinbox.h - tqtextedit.h + textedit.h kurl.h kcolorbutton.h sq_codecsettingsskeleton.ui.h diff --git a/ksquirrel/sq_codecsettingsskeleton.ui.h b/ksquirrel/sq_codecsettingsskeleton.ui.h index 417ef55..1c0cdce 100644 --- a/ksquirrel/sq_codecsettingsskeleton.ui.h +++ b/ksquirrel/sq_codecsettingsskeleton.ui.h @@ -25,7 +25,7 @@ void SQ_CodecSettingsSkeleton::addSettingsWidget(const TQString &path) pushApply->setEnabled(false); pushOK->setEnabled(false); - TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from %1. Please check your installation or contact ksquirrel.iv@gmail.com").tqarg(path), TQString(), groupBox); + TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from %1. Please check your installation or contact ksquirrel.iv@gmail.com").arg(path), TQString(), groupBox); t->setReadOnly(true); fake = t; } 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 3716641..9f9e3a0 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -179,16 +179,16 @@ 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") - .tqarg(mount) - .tqarg(KIO::convertSizeFromKB(kbAvail)) - .tqarg(KIO::convertSizeFromKB(kbSize))); + KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::fromLatin1("%1: %2/%3") + .arg(mount) + .arg(KIO::convertSizeFromKB(kbAvail)) + .arg(KIO::convertSizeFromKB(kbSize))); TQToolTip::add(KSquirrel::app()->sbarWidget("diskSpace"), i18n("
Mount point:%1
Total size:%2
Used:%3
Available:%4
") - .tqarg(mount) - .tqarg(KIO::convertSizeFromKB(kbSize)) - .tqarg(KIO::convertSizeFromKB(kbUsed)) - .tqarg(KIO::convertSizeFromKB(kbAvail)) + .arg(mount) + .arg(KIO::convertSizeFromKB(kbSize)) + .arg(KIO::convertSizeFromKB(kbUsed)) + .arg(KIO::convertSizeFromKB(kbAvail)) ); } @@ -320,9 +320,9 @@ void SQ_DirOperator::slotSelectionChanged() // costruct name and size str = TQString("%1 %2 %3") - .tqarg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH)) - .tqarg(KIO::convertSize(fi->size())) - .tqarg(add > 1 ? TQString("[%1/%2]").tqarg(KIO::convertSize(sz)).tqarg(add):""); + .arg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH)) + .arg(KIO::convertSize(fi->size())) + .arg(add > 1 ? TQString("[%1/%2]").arg(KIO::convertSize(sz)).arg(add):""); } // update statusbar @@ -419,7 +419,7 @@ void SQ_DirOperator::slotCopyPath() KFileItem *f = fileview->currentFileItem(); if(f) - TQApplication::tqclipboard()->setText(f->url().path()); + TQApplication::clipboard()->setText(f->url().path()); } void SQ_DirOperator::slotCopyURL() @@ -427,7 +427,7 @@ void SQ_DirOperator::slotCopyURL() KFileItem *f = fileview->currentFileItem(); if(f) - TQApplication::tqclipboard()->setText(f->url().prettyURL()); + TQApplication::clipboard()->setText(f->url().prettyURL()); } void SQ_DirOperator::slotEditMime() @@ -558,10 +558,10 @@ void SQ_DirOperator::slotUpdateInformation(int files, int dirs) SQ_Config::instance()->setGroup("Fileview"); TQString str = i18n("Total %1 in %2 (%3, %4)") - .tqarg(KIO::convertSize(totalSize)) - .tqarg(i18n("1 item", "%n items", total)) - .tqarg(i18n("1 folder", "%n folders", dirs)) - .tqarg(i18n("1 file", "%n files", files)); + .arg(KIO::convertSize(totalSize)) + .arg(i18n("1 item", "%n items", total)) + .arg(i18n("1 folder", "%n folders", dirs)) + .arg(i18n("1 file", "%n files", files)); KSquirrel::app()->sbarWidget("dirInfo")->setText(str); } diff --git a/ksquirrel/sq_dirthumbs.cpp b/ksquirrel/sq_dirthumbs.cpp index 87c8b4c..03e73bc 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").arg(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..8e93652 100644 --- a/ksquirrel/sq_dragprovider.cpp +++ b/ksquirrel/sq_dragprovider.cpp @@ -102,7 +102,7 @@ void SQ_DragProvider::start() if(pixw > SQ_THUMB_SIZE) { TQSize sz(pixw, pixh); - sz.tqscale(SQ_THUMB_SIZE, SQ_THUMB_SIZE, TQSize::ScaleMin); + sz.scale(SQ_THUMB_SIZE, SQ_THUMB_SIZE, TQSize::ScaleMin); pixw = sz.width(); pixh = sz.height(); } @@ -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").arg(i18n("Total")).arg(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..93ff52e 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)").arg(items.count()-1)); menu->changeTitle(final); } diff --git a/ksquirrel/sq_externaltools.ui b/ksquirrel/sq_externaltools.ui index be97196..0867547 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 @@ -171,7 +171,7 @@ - tqlayout4 + layout4 @@ -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..0b7b30e 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").arg(t.w).arg(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()); @@ -192,7 +192,7 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th item->setListed(true); // update item - item->tqrepaint(); + item->repaint(); } void SQ_FileThumbView::startThumbnailUpdate() @@ -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..922e2ac 100644 --- a/ksquirrel/sq_filters.ui +++ b/ksquirrel/sq_filters.ui @@ -67,7 +67,7 @@ Expanding - + 411 20 @@ -90,7 +90,7 @@ - tqlayout7 + layout7 @@ -186,7 +186,7 @@ 0 - + 22 22 @@ -220,7 +220,7 @@ 0 - + 22 22 @@ -253,7 +253,7 @@ Expanding - + 20 145 @@ -262,7 +262,7 @@ - tqlayout7 + layout7 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_glselectionpainter.h b/ksquirrel/sq_glselectionpainter.h index 19cec2c..ea39286 100644 --- a/ksquirrel/sq_glselectionpainter.h +++ b/ksquirrel/sq_glselectionpainter.h @@ -64,7 +64,7 @@ class SQ_GLSelectionPainter void end(); /* - * Selected rectangle tqgeometry + * Selected rectangle geometry */ TQPoint pos() const; TQSize size() const; diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp index 681f499..4924363 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -19,7 +19,7 @@ #include "config.h" #endif -#include +#include #include #include #include @@ -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); @@ -133,7 +133,7 @@ void SQ_GLView::createContent() sbar->setShown(SQ_Config::instance()->readBoolEntry("statusbar", true)); - // restore tqgeometry from config file + // restore geometry from config file restoreGeometry(); gl->matrixChanged(); @@ -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 bda1f57..5b42e58 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -491,10 +491,10 @@ void SQ_GLWidget::matrixChanged() float z = (m < 1.0) ? 1.0/m : m; // construct zoom - str = TQString::tqfromLatin1("%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); + str = TQString::fromLatin1("%1% [%2:%3]") + .arg(fzoom, 0, 'f', 1) + .arg((m < 1.0)?1.0:z, 0, 'f', 1) + .arg((m > 1.0)?1.0:z, 0, 'f', 1); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBGLZoom")->setText(str); @@ -503,10 +503,10 @@ void SQ_GLWidget::matrixChanged() #endif // construct rotation angle - str = TQString::tqfromLatin1("%1%2 %3 deg") - .tqarg((tab->isflippedV)?"V":"") - .tqarg((tab->isflippedH)?"H":"") - .tqarg(tab->curangle, 0, 'f', 1); + str = TQString::fromLatin1("%1%2 %3 deg") + .arg((tab->isflippedV)?"V":"") + .arg((tab->isflippedH)?"H":"") + .arg(tab->curangle, 0, 'f', 1); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBGLAngle")->setText(str); @@ -1273,7 +1273,7 @@ bool SQ_GLWidget::prepare() if(!m_lib) { - KMessageBox::error(this, i18n("Codec for %1 format not found").tqarg(tab->fmt_ext)); + KMessageBox::error(this, i18n("Codec for %1 format not found").arg(tab->fmt_ext)); reset_mode = false; tab = tabold; return false; @@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .tqarg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); decodeFailedOn0(SQE_R_NOMEMORY); return; @@ -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]").arg(tab->current+1).arg(im->w).arg(im->h).arg(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_helpers.h b/ksquirrel/sq_glwidget_helpers.h index 18e1956..db637ed 100644 --- a/ksquirrel/sq_glwidget_helpers.h +++ b/ksquirrel/sq_glwidget_helpers.h @@ -66,7 +66,7 @@ namespace SQ_GLHelpers /* * normalize selection rectangle * sx,sy are X and Y coordinates - * sw x sh is a selection tqgeometry + * sw x sh is a selection geometry */ bool normalizeSelection(int &sx, int &sy, int &sw, int &sh, int w, int h, const TQWMatrix&, int curangle, int orient); } diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index 3a212cb..0ba4dd5 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -19,7 +19,7 @@ #include "config.h" #endif -#include +#include #include #include #include @@ -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").arg(tab->finfo.image[tab->current].w).arg(tab->finfo.image[tab->current].h) + << TQString::fromLatin1("%1").arg(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").arg((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").arg(errors) + << TQString::fromLatin1("%1").arg(tab->finfo.image.size()) + << TQString::fromLatin1("#%1").arg(tab->current+1) + << TQString::fromLatin1("%1").arg(tab->finfo.image[tab->current].delay); // create dialog and setup it SQ_ImageProperties prop(this); @@ -493,7 +493,7 @@ void SQ_GLWidget::saveAs() if(!wlib || !wlib->writestatic) { - KMessageBox::error(this, i18n("Sorry, could not perform write operation\nfor codec \"%1\"").tqarg(d.nameFilter())); + KMessageBox::error(this, i18n("Sorry, could not perform write operation\nfor codec \"%1\"").arg(d.nameFilter())); return; } @@ -644,9 +644,9 @@ void SQ_GLWidget::toClipboard() // image doesn't have extra regions if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h) - KApplication::tqclipboard()->setImage(im, TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im, TQClipboard::Clipboard); else - KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); } void SQ_GLWidget::bcg() @@ -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").arg(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())); @@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop() { KMessageBox::error(this, i18n("Memory allocation failed for %1 of memory") - .tqarg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); + .arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); return; } @@ -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]").arg(i+1).arg((*it).w).arg((*it).h).arg((*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,10 +1623,10 @@ void SQ_GLWidget::createMarks() */ void SQ_GLWidget::updateCurrentFileInfo() { - TQString status = TQString::tqfromLatin1("%1x%2@%3") - .tqarg(tab->finfo.image[tab->current].w) - .tqarg(tab->finfo.image[tab->current].h) - .tqarg(tab->finfo.image[tab->current].bpp); + TQString status = TQString::fromLatin1("%1x%2@%3") + .arg(tab->finfo.image[tab->current].w) + .arg(tab->finfo.image[tab->current].h) + .arg(tab->finfo.image[tab->current].bpp); #ifndef KSQUIRREL_PART SQ_GLView::window()->sbarWidget("SBDecoded")->setText(status); @@ -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").arg(tab->total).arg(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").arg(tab->current+1).arg(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").arg(tab->current+1).arg(tab->total)); #endif } @@ -1755,7 +1755,7 @@ void SQ_GLWidget::slotPrint() TQSize sz(img.width(), img.height()); if(img.width() > mt.width() || img.height() > mt.height()) - sz.tqscale(mt.width(), mt.height(), TQSize::ScaleMin); + sz.scale(mt.width(), mt.height(), TQSize::ScaleMin); int cp = printer.numCopies(); @@ -1774,5 +1774,5 @@ void SQ_GLWidget::copyURL() if(!decoded || tab->broken) return; - TQApplication::tqclipboard()->setText(tab->m_original.prettyURL()); + TQApplication::clipboard()->setText(tab->m_original.prettyURL()); } diff --git a/ksquirrel/sq_helpwidget.ui b/ksquirrel/sq_helpwidget.ui index 02fb30d..cb2a4bc 100644 --- a/ksquirrel/sq_helpwidget.ui +++ b/ksquirrel/sq_helpwidget.ui @@ -55,7 +55,7 @@ <p align=center><table><tr><td><b><p align=right>Esc,X,Return</p></b></td><td>close</td></tr><tr><td><b><p align=right>Middle click, F</p></b></td><td>fullscreen</td></tr><tr><td><b><p align=right>Z</p></b></td><td>show 'Zoom' menu</td></tr><tr><td><b><p align=right>/</p></b></td><td>show this help</td></tr><tr><td><b><p align=right>Right click, M, ContextMenu</p></b></td><td>show context menu</td></tr><tr><td><b><p align=right>N</p></b></td><td>toggle filter</td></tr><tr><td><b><p align=right>Shift + Left button</p></b></td><td>select a region</td></tr><tr><td><b><p align=right>Shift + Left</p></b></td><td>previous tab</td></tr><tr><td><b><p align=right>Shift + Right</p></b></td><td>next tab</td></tr><tr><td><b><p align=right>W</p></b></td><td>close tab</td></tr></table></p> - + WordBreak|AlignTop @@ -79,7 +79,7 @@ <p align=center><table><tr><td><b><p align=right>Space, Page Down</p></b></td><td>next image</td></tr><tr><td><b><p align=right>Backspace, Page Up</p></b></td><td>previous image</td></tr><tr><td><b><p align=right>Home</p></b></td><td>first image</td></tr><tr><td><b><p align=right>End</p></b></td><td>last image</td></tr></table></p> - + WordBreak|AlignTop @@ -103,7 +103,7 @@ <p align=center><table><tr><td><b><p align=right>Left, Right, Up, Down</p></b></td><td>move the image</td></tr><tr><td><b><p align=right>Ctrl + Left</p></b></td><td>rotate left</td></tr><tr><td><b><p align=right>Ctrl + Right</p></b></td><td>rotate right</td></tr><tr><td><b><p align=right>Ctrl + Up/Down</p></b></td><td>rotate for 180 degrees up/down</td></tr><tr><td><b><p align=right>Alt + Left/Right</p></b></td><td>rotate for 1 degree left/right</td></tr></table</p> - + WordBreak|AlignTop @@ -127,7 +127,7 @@ <p align=center><table><tr><td><b><p align=right>+/-</p></b></td><td>zoom Nx</td></tr><tr><td><b><p align=right>Ctrl + +/-</p></b></td><td>zoom 2x/0.5x</td></tr><tr><td><b><p align=right>Scroll</p></b></td><td>load next/prev file OR zoom+/zoom-</td></tr><tr><td><b><p align=right>Shift + Scroll</p></b></td><td>zoom+/zoom-</td></tr><tr><td><b><p align=right>Ctrl + Scroll</p></b></td><td>zoom+ 2x/zoom- 2x</td></tr><tr><td><b><p align=right>1..9</p></b></td><td>zoom 1..9x</td></tr><tr><td><b><p align=right>0</p></b></td><td>zoom 10x</td></tr><tr><td><b><p align=right>comma</p></b></td><td>fit width</td></tr><tr><td><b><p align=right>period</p></b></td><td>fit height</td></tr><tr><td><b><p align=right>*</p></b></td><td>fit image</td></tr></table</p> - + WordBreak|AlignTop @@ -154,7 +154,7 @@ <p align=center><table><tr><td><p align=right><b>S</b></p></td><td>save as</td></tr><tr><td><p align=right><b>V</b></p></td><td>flip vertically</td></tr><tr><td><p align=right><b>H</b></p></td><td>flip horizontally</td></tr><tr><td><p align=right><b>R</b></p></td><td>reset</td></tr><tr><td><p align=right><b>P</b></p></td><td>image properties</td></tr><tr><td><p align=right><b>C</b></p></td><td>codec settings</td></tr><tr><td><p align=right><b>L</b></p></td><td>ignore zoom if image is smaller than window</td></tr><tr><td><p align=right><b>I</b></p></td><td>menu with images</td></tr><tr><td><p align=right><b>A</b></p></td><td>stop/start animation</td></tr><tr><td><p align=right><b>B</b></p></td><td>toggle drawing background for transparent images</td></tr><tr><td><p align=right><b>K</b></p></td><td>toggle drawing tickmarks</td></tr><tr><td><p align=right><b>E</b></p></td><td>show menu with external tools</td></tr><tr><td><p align=right><b>Y</b></p></td><td>crop</td></tr><tr><td><p align=right><b>F1</b></p></td><td>first image in multi-paged image</td></tr><tr><td><p align=right><b>F2</b></p></td><td>previous</td></tr><tr><td><p align=right><b>F3</b></p></td><td>next</td></tr><tr><td><p align=right><b>F4</b></p></td><td>last</td></tr></table></p> - + WordBreak|AlignTop @@ -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..90b31ea 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 @@ -157,7 +157,7 @@ Permissions: - + AlignVCenter @@ -219,7 +219,7 @@ Created: - + WordBreak|AlignTop @@ -238,7 +238,7 @@ Last read: - + WordBreak|AlignTop @@ -257,7 +257,7 @@ Last modified: - + WordBreak|AlignTop @@ -422,7 +422,7 @@ - tqlayout5 + layout5 @@ -430,7 +430,7 @@ - tqlayout3 + layout3 @@ -443,7 +443,7 @@ Type: - + AlignTop|AlignRight @@ -454,7 +454,7 @@ Number of frames: - + AlignTop|AlignRight @@ -473,7 +473,7 @@ Current frame - + AlignTop|AlignRight @@ -492,7 +492,7 @@ Delay: - + AlignTop|AlignRight @@ -503,7 +503,7 @@ Dimensions: - + AlignTop|AlignRight @@ -514,7 +514,7 @@ Bits per pixel: - + AlignTop|AlignRight @@ -525,7 +525,7 @@ Color space: - + AlignTop|AlignRight @@ -536,7 +536,7 @@ Compression: - + AlignTop|AlignRight @@ -547,7 +547,7 @@ Uncompressed size: - + AlignTop|AlignRight @@ -566,7 +566,7 @@ Compression ratio: - + AlignTop|AlignRight @@ -585,7 +585,7 @@ Interlaced: - + AlignTop|AlignRight @@ -602,9 +602,9 @@ - tqStatus: + Status: - + AlignTop|AlignRight @@ -618,7 +618,7 @@ Expanding - + 210 16 @@ -629,7 +629,7 @@ - tqlayout4 + layout4 @@ -789,7 +789,7 @@ - tqlayout1 + layout1 @@ -813,7 +813,7 @@ - texttqStatus + textStatus @@ -831,7 +831,7 @@ Expanding - + 205 16 @@ -926,7 +926,7 @@ kstdaction.h kaction.h tqapplication.h - tqclipboard.h + clipboard.h tqdir.h sq_iconloader.h tqbuttongroup.h diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index 340676c..73b63bb 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").arg(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").arg(*it).arg(i18n(" ms.")); textDelay->setText(s); } @@ -115,7 +115,7 @@ void SQ_ImageProperties::setFileParams() kew1->loadFile(file); // hack to workaround poor libkexif API - TQObjectList *ch = const_cast(kew1->tqchildren()); + TQObjectList *ch = const_cast(kew1->children()); for(TQObjectList::iterator it = ch->begin();it != ch->end();++it) { if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) @@ -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); } @@ -192,7 +192,7 @@ void SQ_ImageProperties::slotContextMenu( TQListViewItem *item, const TQPoint &p void SQ_ImageProperties::slotCopyString() { - TQApplication::tqclipboard()->setText(data->text(z), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(data->text(z), TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyAll() @@ -208,7 +208,7 @@ void SQ_ImageProperties::slotCopyAll() app.append(item->text(0) + "\n" + item->text(1) + "\n"); } - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyEntry() @@ -218,7 +218,7 @@ void SQ_ImageProperties::slotCopyEntry() TQString app = data->text(0) + "\n" + data->text(1) + "\n"; - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotModeClicked(int id) @@ -243,8 +243,8 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job) lineFile->setText(fi.name()); textSize->setText(KIO::convertSize(fi.size())); - textOwner->setText(TQString("%1").tqarg(fi.user())); - textGroup->setText(TQString("%1").tqarg(fi.group())); + textOwner->setText(TQString("%1").arg(fi.user())); + textGroup->setText(TQString("%1").arg(fi.group())); textPermissions->setText(fi.permissionsString()); TQDateTime abs; 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..91c17da 100644 --- a/ksquirrel/sq_options.ui +++ b/ksquirrel/sq_options.ui @@ -21,13 +21,13 @@ 0 - + 0 0 - + 10000 10000 @@ -61,7 +61,7 @@ - tqlayout5 + layout5 @@ -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 @@ -872,7 +872,7 @@ - tqlayout8 + layout8 @@ -981,7 +981,7 @@ false - + 95 25 @@ -1061,7 +1061,7 @@ - + WordBreak|AlignVCenter @@ -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..5f3d2c2 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,14 +292,14 @@ void SQ_Options::slotNewCustomTexture( const TQString & path) if(validPixmap(p1)) { custpixmap = path; - textCustomValidate->setText(TQString::tqfromLatin1("%1x%2: OK") - .tqarg(p1.width()) - .tqarg(p1.height())); + textCustomValidate->setText(TQString::fromLatin1("%1x%2: OK") + .arg(p1.width()) + .arg(p1.height())); } else textCustomValidate->setText(i18n("Wrong dimensions: %1x%2.") - .tqarg(p1.width()) - .tqarg(p1.height())); + .arg(p1.width()) + .arg(p1.height())); } void SQ_Options::slotShowPage() @@ -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..b3163e7 100644 --- a/ksquirrel/sq_pluginsinfo.ui +++ b/ksquirrel/sq_pluginsinfo.ui @@ -126,7 +126,7 @@ - tqlayout1 + layout1 @@ -163,7 +163,7 @@ Expanding - + 70 16 @@ -195,7 +195,7 @@ - tqlayout6 + layout6 @@ -211,7 +211,7 @@ Expanding - + 445 16 diff --git a/ksquirrel/sq_progress.cpp b/ksquirrel/sq_progress.cpp index 6e7f0b1..ed404a3 100644 --- a/ksquirrel/sq_progress.cpp +++ b/ksquirrel/sq_progress.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui index a8b718e..ebaaaa0 100644 --- a/ksquirrel/sq_slideshow.ui +++ b/ksquirrel/sq_slideshow.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -40,7 +40,7 @@ Expanding - + 220 26 @@ -86,7 +86,7 @@ Directory: - + AlignVCenter|AlignRight @@ -100,7 +100,7 @@ Expanding - + 175 16 @@ -142,7 +142,7 @@ Delay: - + AlignVCenter|AlignRight @@ -153,7 +153,7 @@ Repeats: - + AlignVCenter|AlignRight @@ -164,7 +164,7 @@ Recursively - + AlignVCenter|AlignRight @@ -186,7 +186,7 @@ Show file size - + AlignVCenter|AlignRight @@ -200,7 +200,7 @@ Show current index - + AlignVCenter|AlignRight @@ -225,7 +225,7 @@ Show file name - + AlignVCenter|AlignRight @@ -258,7 +258,7 @@ Background color: - + AlignVCenter|AlignRight @@ -280,7 +280,7 @@ Expanding - + 186 16 @@ -294,7 +294,7 @@ Onscreen messages - + AlignVCenter|AlignRight @@ -316,7 +316,7 @@ Expanding - + 145 16 @@ -344,13 +344,13 @@ Message text color: - + AlignVCenter|AlignRight - tqlayout3 + layout3 diff --git a/ksquirrel/sq_slideshowlisting.ui b/ksquirrel/sq_slideshowlisting.ui index 15d60b1..71d6daf 100644 --- a/ksquirrel/sq_slideshowlisting.ui +++ b/ksquirrel/sq_slideshowlisting.ui @@ -73,7 +73,7 @@ RichText - + AlignVCenter diff --git a/ksquirrel/sq_slideshowlisting.ui.h b/ksquirrel/sq_slideshowlisting.ui.h index 5b57c2a..17eea16 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]").arg(count)); textFile->setText(f); } diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp index 5e330aa..6b3a54d 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] ").arg(current+1).arg(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..7848c67 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -46,7 +46,7 @@ - + AlignCenter @@ -96,7 +96,7 @@ - + AlignCenter @@ -138,7 +138,7 @@ - tqlayout1 + layout1 @@ -154,7 +154,7 @@ Expanding - + 195 21 diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h index a435add..eec64d9 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui.h +++ b/ksquirrel/sq_thumbnailcachemaster.ui.h @@ -65,9 +65,9 @@ void SQ_ThumbnailCacheMaster::slotClearMemoryCache() void SQ_ThumbnailCacheMaster::slotCalcCacheMemory() { - textCacheMemSize->setText(TQString::tqfromLatin1("%1/%2") - .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) - .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); + textCacheMemSize->setText(TQString::fromLatin1("%1/%2") + .arg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) + .arg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); } void SQ_ThumbnailCacheMaster::slotShowDiskCache() diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp index 883313a..bfc4a41 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").arg(suff), 0600); tmp->setAutoDelete(true); tmp->close(); diff --git a/ksquirrel/sq_utils_scale.cpp b/ksquirrel/sq_utils_scale.cpp index 143e012..dbb1bde 100644 --- a/ksquirrel/sq_utils_scale.cpp +++ b/ksquirrel/sq_utils_scale.cpp @@ -1883,7 +1883,7 @@ TQImage scale(const TQImage& image, int width, int height, if( image.isNull()) return image.copy(); TQSize newSize( image.size() ); - newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 + newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null if ( newSize == image.size() ) return image.copy(); diff --git a/ksquirrel/sq_viewcache.ui b/ksquirrel/sq_viewcache.ui index f748c39..b82ceb7 100644 --- a/ksquirrel/sq_viewcache.ui +++ b/ksquirrel/sq_viewcache.ui @@ -96,7 +96,7 @@ - tqlayout2 + layout2 @@ -109,7 +109,7 @@ <b>Total:</b> - + AlignVCenter @@ -120,7 +120,7 @@ RichText - + AlignCenter @@ -134,7 +134,7 @@ Expanding - + 16 20 diff --git a/ksquirrel/sq_viewcache.ui.h b/ksquirrel/sq_viewcache.ui.h index 5066e05..7e2ece9 100644 --- a/ksquirrel/sq_viewcache.ui.h +++ b/ksquirrel/sq_viewcache.ui.h @@ -9,7 +9,7 @@ void SQ_ViewCache::init() { - textTotal->setText(TQString("%1").tqarg((int)SQ_PixmapCache::instance()->count())); + textTotal->setText(TQString("%1").arg((int)SQ_PixmapCache::instance()->count())); if(SQ_PixmapCache::instance()->isEmpty()) return; @@ -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").arg(th.w).arg(th.h)); else item = new TQListViewItem(listCache, s, - TQString(), TQString::tqfromLatin1("%1x%2").tqarg(th.w).tqarg(th.h)); + TQString(), TQString::fromLatin1("%1x%2").arg(th.w).arg(th.h)); item->setPixmap(1, it.data().mime); diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp index ab2ac43..0eb9738 100644 --- a/ksquirrel/sq_widgetstack.cpp +++ b/ksquirrel/sq_widgetstack.cpp @@ -583,11 +583,11 @@ void SQ_WidgetStack::emitNewLastURL(const KURL &u) TQString targ = KStringHandler::csqueeze(u.isLocalFile() ? u.path() : u.prettyURL(), 25); if(fileaction == SQ_WidgetStack::Copy) - text = i18n("Repeat (copy to %1)").tqarg(targ); + text = i18n("Repeat (copy to %1)").arg(targ); else if(fileaction == SQ_WidgetStack::Cut) - text = i18n("Repeat (move to %1)").tqarg(targ); + text = i18n("Repeat (move to %1)").arg(targ); else if(fileaction == SQ_WidgetStack::Link) - text = i18n("Repeat (link to %1)").tqarg(targ); + text = i18n("Repeat (link to %1)").arg(targ); if(!text.isEmpty()) emit newLastURL(text);