diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:39:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:39:30 -0600 |
| commit | c1e4925208f428f2ad5a86d1a1eee47e3c43068a (patch) | |
| tree | 698b7dfc0db6bd962c0c699fdbc43e7435526123 | |
| parent | f5a0e45e0510e355733e6390eb26efd704c990c4 (diff) | |
| download | ksquirrel-c1e49252.tar.gz ksquirrel-c1e49252.zip | |
Remove additional unneeded tq method conversions
51 files changed, 209 insertions, 209 deletions
diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp index 9f22be8..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::fromLatin1("page_%1.").tqarg((TQString::fromLatin1("%1").tqarg(page)).rightJustify(3, '0')); + TQString spage = TQString::fromLatin1("page_%1.").arg((TQString::fromLatin1("%1").arg(page)).rightJustify(3, '0')); if(!putto.isEmpty()) { diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui index 4b8951d..f3dabde 100644 --- a/ksquirrel/imageedit/sq_imagebcg.ui +++ b/ksquirrel/imageedit/sq_imagebcg.ui @@ -519,7 +519,7 @@ <property name="name"> <cstring>text</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui index ccfaa93..2d03333 100644 --- a/ksquirrel/imageedit/sq_imagefilter.ui +++ b/ksquirrel/imageedit/sq_imagefilter.ui @@ -207,7 +207,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -338,7 +338,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -572,7 +572,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1052,7 +1052,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/ksquirrel/imageedit/sq_writeoption.ui b/ksquirrel/imageedit/sq_writeoption.ui index 634ca0c..aa11a78 100644 --- a/ksquirrel/imageedit/sq_writeoption.ui +++ b/ksquirrel/imageedit/sq_writeoption.ui @@ -145,7 +145,7 @@ <property name="text"> <string><i>No special options available for this format</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignHCenter</set> </property> <property name="indent"> diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui.h b/ksquirrel/ksquirrel-libs-configurator/klc.ui.h index d5961ee..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::fromLatin1(".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 9a1c187..80b549b 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -1748,7 +1748,7 @@ void KSquirrel::control(const TQString &command) { int id = it.data(); - KAction *a = SQ_GLWidget::window()->actionCollection()->action(TQString::fromLatin1("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("<p>Rename file <b>%1</b> to:</p>").tqarg(filename), + i18n("<p>Rename file <b>%1</b> to:</p>").arg(filename), renameSrcURL.filename(), &ok, this); if(!ok) return; diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index 7f8250f..b4cad73 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp @@ -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_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 <b>%1</b>. Please check your installation or contact <a href=\"mailto:ksquirrel.iv@gmail.com\">ksquirrel.iv@gmail.com</a>").tqarg(path), TQString(), groupBox); + TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from <b>%1</b>. Please check your installation or contact <a href=\"mailto:ksquirrel.iv@gmail.com\">ksquirrel.iv@gmail.com</a>").arg(path), TQString(), groupBox); t->setReadOnly(true); fake = t; } diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp index 1bc2886..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::fromLatin1(" (+%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 74494e0..5b42e58 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -492,9 +492,9 @@ void SQ_GLWidget::matrixChanged() // construct zoom str = TQString::fromLatin1("%1% [%2:%3]") - .tqarg(fzoom, 0, 'f', 1) - .tqarg((m < 1.0)?1.0:z, 0, 'f', 1) - .tqarg((m > 1.0)?1.0:z, 0, 'f', 1); + .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); @@ -504,9 +504,9 @@ void SQ_GLWidget::matrixChanged() // construct rotation angle str = TQString::fromLatin1("%1%2 %3 deg") - .tqarg((tab->isflippedV)?"V":"") - .tqarg((tab->isflippedH)?"H":"") - .tqarg(tab->curangle, 0, 'f', 1); + .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::fromLatin1("#%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); 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 f6157f7..60b0cd0 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -236,17 +236,17 @@ void SQ_GLWidget::slotProperties() // save tab->current image parameters and some additioanl information // in list list << tab->quickImageInfo - << TQString::fromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) + << 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::fromLatin1("%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::fromLatin1("%1").tqarg(errors) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image.size()) - << TQString::fromLatin1("#%1").tqarg(tab->current+1) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); + << 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; } @@ -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::fromLatin1("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())); @@ -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::fromLatin1("#%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) @@ -1624,9 +1624,9 @@ void SQ_GLWidget::createMarks() void SQ_GLWidget::updateCurrentFileInfo() { TQString status = TQString::fromLatin1("%1x%2@%3") - .tqarg(tab->finfo.image[tab->current].w) - .tqarg(tab->finfo.image[tab->current].h) - .tqarg(tab->finfo.image[tab->current].bpp); + .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::fromLatin1("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::fromLatin1("%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::fromLatin1("%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(); diff --git a/ksquirrel/ksquirrelpart/sq_helpwidget.ui b/ksquirrel/ksquirrelpart/sq_helpwidget.ui index d0500af..cb2a4bc 100644 --- a/ksquirrel/ksquirrelpart/sq_helpwidget.ui +++ b/ksquirrel/ksquirrelpart/sq_helpwidget.ui @@ -55,7 +55,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -79,7 +79,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -103,7 +103,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -127,7 +127,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -154,7 +154,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui index 4b8951d..f3dabde 100644 --- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui +++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui @@ -519,7 +519,7 @@ <property name="name"> <cstring>text</cstring> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui index ccfaa93..2d03333 100644 --- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui +++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui @@ -207,7 +207,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -338,7 +338,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -572,7 +572,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1052,7 +1052,7 @@ <property name="text"> <string>There are no special options available for this filter. Just click "Filter".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui index 940df9f..b15aaae 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui @@ -157,7 +157,7 @@ <property name="text"> <string>Permissions:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -219,7 +219,7 @@ <property name="text"> <string>Created:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -238,7 +238,7 @@ <property name="text"> <string>Last read:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -257,7 +257,7 @@ <property name="text"> <string>Last modified:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -443,7 +443,7 @@ <property name="text"> <string>Type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -454,7 +454,7 @@ <property name="text"> <string>Number of frames:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -473,7 +473,7 @@ <property name="text"> <string>Current frame</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -492,7 +492,7 @@ <property name="text"> <string>Delay:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -503,7 +503,7 @@ <property name="text"> <string>Dimensions:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -514,7 +514,7 @@ <property name="text"> <string>Bits per pixel:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -525,7 +525,7 @@ <property name="text"> <string>Color space:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -536,7 +536,7 @@ <property name="text"> <string>Compression:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -547,7 +547,7 @@ <property name="text"> <string>Uncompressed size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -566,7 +566,7 @@ <property name="text"> <string>Compression ratio:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -585,7 +585,7 @@ <property name="text"> <string>Interlaced:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -604,7 +604,7 @@ <property name="text"> <string>Status:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 2c78257..6c8606a 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::fromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); + TQString s = TQString::fromLatin1("%1").arg(i18n("1 error", "%n errors", errors)); textStatus->setText((errors)?s:TQString()); textStatusIcon->setPixmap((errors)?error:ok); - s = TQString::fromLatin1("%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<TQObjectList *>(kew1->tqchildren()); + TQObjectList *ch = const_cast<TQObjectList *>(kew1->children()); for(TQObjectList::iterator it = ch->begin();it != ch->end();++it) { if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) @@ -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_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/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("<p>Rename item <b>%1</b> to:</p>").tqarg(renameSrc), + i18n("<p>Rename item <b>%1</b> to:</p>").arg(renameSrc), renameSrc, &ok, KSquirrel::app()); if(ok) diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index ee00de7..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::fromLatin1("%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_treeviewitem.cpp b/ksquirrel/sidebar/sq_treeviewitem.cpp index 71483fa..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<KListView *>(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::fromLatin1(" [%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::fromLatin1(" [%1]").tqarg(count_files); + s = TQString::fromLatin1(" [%1]").arg(count_files); else if(use_c2 && count_dirs) // dirs, dir count is > 0 - s = TQString::fromLatin1(" [%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..4669edd 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.cpp +++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp @@ -62,7 +62,7 @@ void SQ_TreeViewMenu::slotDirectoryNew() bool ok; TQString mNewFilename = KInputDialog::getText(i18n("Create Subfolder"), - i18n("<p>Create new folder in <b>%1</b>:</p>").tqarg(TQStyleSheet::escape(m_url.filename())), + i18n("<p>Create new folder in <b>%1</b>:</p>").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("<p>Rename folder <b>%1</b> to:</p>").tqarg(filename), + i18n("<p>Rename folder <b>%1</b> to:</p>").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(), - "<qt>" + i18n("Are you sure you want to delete <b>%1</b>?").tqarg(dir) + "</qt>") == KMessageBox::No) + "<qt>" + i18n("Are you sure you want to delete <b>%1</b>?").arg(dir) + "</qt>") == 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(), - "<qt>" + i18n("Are you sure you want to delete contents of <b>%1</b>?").tqarg(m_url.path()) + "</qt>") == KMessageBox::No) + "<qt>" + i18n("Are you sure you want to delete contents of <b>%1</b>?").arg(m_url.path()) + "</qt>") == KMessageBox::No) return; KIO::Job *job = KIO::listDir(m_url, false, true); 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 <b>%1</b>. Please check your installation or contact <a href=\"mailto:ksquirrel.iv@gmail.com\">ksquirrel.iv@gmail.com</a>").tqarg(path), TQString(), groupBox); + TQTextEdit *t = new TQTextEdit(i18n("Error loading widget from <b>%1</b>. Please check your installation or contact <a href=\"mailto:ksquirrel.iv@gmail.com\">ksquirrel.iv@gmail.com</a>").arg(path), TQString(), groupBox); t->setReadOnly(true); fake = t; } diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index 04d6caa..c83023b 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -180,15 +180,15 @@ 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::fromLatin1("%1: %2/%3") - .tqarg(mount) - .tqarg(KIO::convertSizeFromKB(kbAvail)) - .tqarg(KIO::convertSizeFromKB(kbSize))); + .arg(mount) + .arg(KIO::convertSizeFromKB(kbAvail)) + .arg(KIO::convertSizeFromKB(kbSize))); TQToolTip::add(KSquirrel::app()->sbarWidget("diskSpace"), i18n("<table><tr><td>Mount point:</td><td>%1</td></tr><tr><td>Total size:</td><td>%2</td></tr><tr><td>Used:</td><td>%3</td></tr><tr><td>Available:</td><td>%4</td></tr></table>") - .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("<b>[%1/%2]</b>").tqarg(KIO::convertSize(sz)).tqarg(add):""); + .arg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH)) + .arg(KIO::convertSize(fi->size())) + .arg(add > 1 ? TQString("<b>[%1/%2]</b>").arg(KIO::convertSize(sz)).arg(add):""); } // update statusbar @@ -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 6d0450f..03e73bc 100644 --- a/ksquirrel/sq_dirthumbs.cpp +++ b/ksquirrel/sq_dirthumbs.cpp @@ -73,7 +73,7 @@ TQString SQ_DirThumbs::absPath(const KURL &relurl) { KMD5 md5(TQString(TQFile::encodeName(relurl.prettyURL()))); - TQString ext = TQString::fromLatin1(".%1").tqarg(sqdirThumbFormat); + TQString ext = TQString::fromLatin1(".%1").arg(sqdirThumbFormat); return m_orig + TQDir::separator() + TQString(md5.hexDigest()) + ext.lower(); } diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp index b3b3e11..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::fromLatin1("%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_externaltool.cpp b/ksquirrel/sq_externaltool.cpp index 1bc2886..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::fromLatin1(" (+%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_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp index c6daed1..0b7b30e 100644 --- a/ksquirrel/sq_filethumbview.cpp +++ b/ksquirrel/sq_filethumbview.cpp @@ -165,7 +165,7 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th painter.setPen(colorGroup().text()); - if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::fromLatin1("%1x%2").tqarg(t.w).tqarg(t.h)); + 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(); @@ -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() 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 a69edea..a6f353e 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -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(); diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp index 74494e0..5b42e58 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -492,9 +492,9 @@ void SQ_GLWidget::matrixChanged() // construct zoom str = TQString::fromLatin1("%1% [%2:%3]") - .tqarg(fzoom, 0, 'f', 1) - .tqarg((m < 1.0)?1.0:z, 0, 'f', 1) - .tqarg((m > 1.0)?1.0:z, 0, 'f', 1); + .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); @@ -504,9 +504,9 @@ void SQ_GLWidget::matrixChanged() // construct rotation angle str = TQString::fromLatin1("%1%2 %3 deg") - .tqarg((tab->isflippedV)?"V":"") - .tqarg((tab->isflippedH)?"H":"") - .tqarg(tab->curangle, 0, 'f', 1); + .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::fromLatin1("#%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); 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 f6157f7..60b0cd0 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -236,17 +236,17 @@ void SQ_GLWidget::slotProperties() // save tab->current image parameters and some additioanl information // in list list << tab->quickImageInfo - << TQString::fromLatin1("%1x%2").tqarg(tab->finfo.image[tab->current].w).tqarg(tab->finfo.image[tab->current].h) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].bpp) + << 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::fromLatin1("%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::fromLatin1("%1").tqarg(errors) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image.size()) - << TQString::fromLatin1("#%1").tqarg(tab->current+1) - << TQString::fromLatin1("%1").tqarg(tab->finfo.image[tab->current].delay); + << 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; } @@ -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::fromLatin1("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())); @@ -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::fromLatin1("#%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) @@ -1624,9 +1624,9 @@ void SQ_GLWidget::createMarks() void SQ_GLWidget::updateCurrentFileInfo() { TQString status = TQString::fromLatin1("%1x%2@%3") - .tqarg(tab->finfo.image[tab->current].w) - .tqarg(tab->finfo.image[tab->current].h) - .tqarg(tab->finfo.image[tab->current].bpp); + .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::fromLatin1("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::fromLatin1("%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::fromLatin1("%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(); diff --git a/ksquirrel/sq_helpwidget.ui b/ksquirrel/sq_helpwidget.ui index d0500af..cb2a4bc 100644 --- a/ksquirrel/sq_helpwidget.ui +++ b/ksquirrel/sq_helpwidget.ui @@ -55,7 +55,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -79,7 +79,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -103,7 +103,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -127,7 +127,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -154,7 +154,7 @@ <property name="text"> <string><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></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui index 766a227..00ad30e 100644 --- a/ksquirrel/sq_imageproperties.ui +++ b/ksquirrel/sq_imageproperties.ui @@ -157,7 +157,7 @@ <property name="text"> <string>Permissions:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -219,7 +219,7 @@ <property name="text"> <string>Created:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -238,7 +238,7 @@ <property name="text"> <string>Last read:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -257,7 +257,7 @@ <property name="text"> <string>Last modified:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -443,7 +443,7 @@ <property name="text"> <string>Type:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -454,7 +454,7 @@ <property name="text"> <string>Number of frames:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -473,7 +473,7 @@ <property name="text"> <string>Current frame</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -492,7 +492,7 @@ <property name="text"> <string>Delay:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -503,7 +503,7 @@ <property name="text"> <string>Dimensions:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -514,7 +514,7 @@ <property name="text"> <string>Bits per pixel:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -525,7 +525,7 @@ <property name="text"> <string>Color space:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -536,7 +536,7 @@ <property name="text"> <string>Compression:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -547,7 +547,7 @@ <property name="text"> <string>Uncompressed size:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -566,7 +566,7 @@ <property name="text"> <string>Compression ratio:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -585,7 +585,7 @@ <property name="text"> <string>Interlaced:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> @@ -604,7 +604,7 @@ <property name="text"> <string>Status:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> </widget> diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index fc7b0e0..41bcd53 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::fromLatin1("%1").tqarg(i18n("1 error", "%n errors", errors)); + TQString s = TQString::fromLatin1("%1").arg(i18n("1 error", "%n errors", errors)); textStatus->setText((errors)?s:TQString()); textStatusIcon->setPixmap((errors)?error:ok); - s = TQString::fromLatin1("%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<TQObjectList *>(kew1->tqchildren()); + TQObjectList *ch = const_cast<TQObjectList *>(kew1->children()); for(TQObjectList::iterator it = ch->begin();it != ch->end();++it) { if((*it)->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) @@ -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_options.ui b/ksquirrel/sq_options.ui index 52723ca..90918d7 100644 --- a/ksquirrel/sq_options.ui +++ b/ksquirrel/sq_options.ui @@ -1061,7 +1061,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h index d0ed42a..5f3d2c2 100644 --- a/ksquirrel/sq_options.ui.h +++ b/ksquirrel/sq_options.ui.h @@ -293,13 +293,13 @@ void SQ_Options::slotNewCustomTexture( const TQString & path) { custpixmap = path; textCustomValidate->setText(TQString::fromLatin1("%1x%2: OK") - .tqarg(p1.width()) - .tqarg(p1.height())); + .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() diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui index 11b76f6..89a8478 100644 --- a/ksquirrel/sq_slideshow.ui +++ b/ksquirrel/sq_slideshow.ui @@ -86,7 +86,7 @@ <property name="text"> <string>Directory:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -142,7 +142,7 @@ <property name="text"> <string>Delay:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -153,7 +153,7 @@ <property name="text"> <string>Repeats:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -164,7 +164,7 @@ <property name="text"> <string>Recursively</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -186,7 +186,7 @@ <property name="text"> <string>Show file size</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -200,7 +200,7 @@ <property name="text"> <string>Show current index</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -225,7 +225,7 @@ <property name="text"> <string>Show file name</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -258,7 +258,7 @@ <property name="text"> <string>Background color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -294,7 +294,7 @@ <property name="text"> <string>Onscreen messages</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -344,7 +344,7 @@ <property name="text"> <string>Message text color:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> 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 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/ksquirrel/sq_slideshowlisting.ui.h b/ksquirrel/sq_slideshowlisting.ui.h index 2de28a6..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::fromLatin1("[%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 68eee73..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::fromLatin1("[%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_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui index 1e301af..a3c85ec 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -46,7 +46,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -96,7 +96,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/ksquirrel/sq_thumbnailcachemaster.ui.h b/ksquirrel/sq_thumbnailcachemaster.ui.h index 575376e..eec64d9 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui.h +++ b/ksquirrel/sq_thumbnailcachemaster.ui.h @@ -66,8 +66,8 @@ void SQ_ThumbnailCacheMaster::slotClearMemoryCache() void SQ_ThumbnailCacheMaster::slotCalcCacheMemory() { textCacheMemSize->setText(TQString::fromLatin1("%1/%2") - .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) - .tqarg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); + .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 04bf3a3..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::fromLatin1(".%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 cb04c26..73e57c9 100644 --- a/ksquirrel/sq_viewcache.ui +++ b/ksquirrel/sq_viewcache.ui @@ -109,7 +109,7 @@ <property name="text"> <string><b>Total:</b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -120,7 +120,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/ksquirrel/sq_viewcache.ui.h b/ksquirrel/sq_viewcache.ui.h index 6b8b98a..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("<b>%1</b>").tqarg((int)SQ_PixmapCache::instance()->count())); + textTotal->setText(TQString("<b>%1</b>").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::fromLatin1("%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::fromLatin1("%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); |