From c1bbc88281394639e2a92c2d1b43ca4f3e1813aa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:08:22 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- digikam/digikam/album.cpp | 2 +- digikam/digikam/albumdb.cpp | 2 +- digikam/digikam/albumfiletip.cpp | 10 +- digikam/digikam/albumiconview.cpp | 26 +-- digikam/digikam/albumiconview.h | 2 +- digikam/digikam/albummanager.cpp | 2 +- digikam/digikam/albumpropsedit.cpp | 4 +- digikam/digikam/cameralist.cpp | 4 +- digikam/digikam/digikamapp.cpp | 44 ++--- digikam/digikam/digikamfirstrun.cpp | 2 +- digikam/digikam/digikamview.cpp | 2 +- digikam/digikam/dragobjects.cpp | 24 +-- digikam/digikam/dragobjects.h | 10 +- digikam/digikam/firstrun.cpp | 6 +- digikam/digikam/folderitem.cpp | 6 +- digikam/digikam/folderview.cpp | 6 +- digikam/digikam/folderview.h | 2 +- digikam/digikam/icongroupitem.cpp | 2 +- digikam/digikam/iconitem.cpp | 2 +- digikam/digikam/iconview.cpp | 30 ++-- digikam/digikam/iconview.h | 2 +- digikam/digikam/imagepreviewview.cpp | 6 +- digikam/digikam/kdateedit.cpp | 12 +- digikam/digikam/kdatepickerpopup.cpp | 12 +- digikam/digikam/kdatepickerpopup.h | 2 +- digikam/digikam/mediaplayerview.cpp | 6 +- digikam/digikam/metadatahub.cpp | 138 +++++++-------- digikam/digikam/metadatahub.h | 40 ++--- digikam/digikam/monthwidget.cpp | 8 +- digikam/digikam/monthwidget.h | 2 +- digikam/digikam/ratingwidget.cpp | 2 +- digikam/digikam/scanlib.cpp | 2 +- digikam/digikam/searchadvanceddialog.cpp | 4 +- digikam/digikam/searchresultsitem.cpp | 2 +- digikam/digikam/searchwidgets.cpp | 24 +-- digikam/digikam/tageditdlg.cpp | 2 +- digikam/digikam/tagfilterview.cpp | 2 +- digikam/digikam/tagfolderview.cpp | 2 +- digikam/digikam/tagspopupmenu.cpp | 8 +- digikam/digikam/timelineview.cpp | 4 +- digikam/digikam/timelinewidget.cpp | 2 +- .../adjustcurves/adjustcurves.cpp | 2 +- .../adjustcurves/adjustcurvestool.cpp | 2 +- .../adjustlevels/adjustlevels.cpp | 2 +- .../adjustlevels/adjustlevelstool.cpp | 2 +- .../antivignetting/antivignettingtool.cpp | 2 +- .../imageeffect_antivignetting.cpp | 2 +- digikam/imageplugins/blurfx/blurfx.cpp | 2 +- .../channelmixer/channelmixer.cpp | 2 +- .../channelmixer/channelmixertool.cpp | 2 +- digikam/imageplugins/colorfx/colorfxtool.cpp | 2 +- .../colorfx/imageeffect_colorfx.cpp | 2 +- .../coreplugin/autocorrectiontool.cpp | 2 +- digikam/imageplugins/coreplugin/bcgtool.cpp | 2 +- .../imageplugins/coreplugin/bwsepiatool.cpp | 2 +- .../imageplugins/coreplugin/hsl/hsltool.cpp | 2 +- .../coreplugin/hsl/imageeffect_hsl.cpp | 2 +- .../imageplugins/coreplugin/iccprooftool.cpp | 4 +- .../coreplugin/imageeffect_autocorrection.cpp | 2 +- .../coreplugin/imageeffect_bcg.cpp | 2 +- .../coreplugin/imageeffect_bwsepia.cpp | 2 +- .../coreplugin/imageeffect_iccproof.cpp | 4 +- .../coreplugin/imageeffect_redeye.cpp | 2 +- .../coreplugin/imageeffect_rgb.cpp | 14 +- .../ratiocrop/imageeffect_ratiocrop.cpp | 4 +- .../ratiocrop/imageselectionwidget.cpp | 2 +- .../coreplugin/ratiocrop/ratiocroptool.cpp | 4 +- .../imageplugins/coreplugin/redeyetool.cpp | 2 +- digikam/imageplugins/coreplugin/rgbtool.cpp | 14 +- .../distortionfx/distortionfx.cpp | 2 +- digikam/imageplugins/filmgrain/filmgrain.cpp | 2 +- .../freerotation/freerotationtool.cpp | 4 +- .../freerotation/imageeffect_freerotation.cpp | 4 +- digikam/imageplugins/infrared/infrared.cpp | 2 +- .../inpainting/imageeffect_inpainting.cpp | 2 +- .../inpainting/inpaintingtool.cpp | 2 +- .../inserttext/fontchooserwidget.cpp | 14 +- .../inserttext/fontchooserwidget.h | 2 +- .../inserttext/imageeffect_inserttext.cpp | 8 +- .../inserttext/inserttexttool.cpp | 8 +- .../inserttext/inserttextwidget.cpp | 4 +- .../imageeffect_lensdistortion.cpp | 2 +- .../lensdistortion/lensdistortiontool.cpp | 2 +- .../perspective/imageeffect_perspective.cpp | 4 +- .../perspective/perspectivetool.cpp | 4 +- .../perspective/perspectivewidget.cpp | 4 +- digikam/imageplugins/raindrop/raindrop.cpp | 2 +- .../restoration/imageeffect_restoration.cpp | 2 +- .../restoration/restorationtool.cpp | 2 +- .../sheartool/imageeffect_sheartool.cpp | 4 +- digikam/imageplugins/sheartool/sheartool.cpp | 4 +- .../superimpose/superimposewidget.cpp | 4 +- .../whitebalance/imageeffect_whitebalance.cpp | 2 +- .../whitebalance/whitebalancetool.cpp | 2 +- digikam/kioslave/digikamalbums.cpp | 8 +- digikam/kioslave/digikamsearch.cpp | 46 ++--- digikam/kioslave/sqlitedb.cpp | 14 +- digikam/libs/dialogs/deletedialogbase.ui | 2 +- digikam/libs/dialogs/imagedialog.cpp | 6 +- digikam/libs/dialogs/imagedialog.h | 2 +- digikam/libs/dialogs/imagedlgbase.cpp | 2 +- digikam/libs/dialogs/imageguidedlg.cpp | 2 +- digikam/libs/dmetadata/dmetadata.cpp | 40 ++--- digikam/libs/greycstoration/CImg.h | 8 +- .../cameraitempropertiestab.cpp | 6 +- .../libs/imageproperties/imagedescedittab.cpp | 26 +-- .../libs/imageproperties/imagedescedittab.h | 2 +- .../imagepropertiescolorstab.cpp | 38 ++-- .../imageproperties/imagepropertiestab.cpp | 8 +- .../libs/imageproperties/navigatebartab.cpp | 2 +- .../libs/imageproperties/talbumlistview.cpp | 4 +- digikam/libs/imageproperties/talbumlistview.h | 2 +- digikam/libs/jpegutils/jpegutils.cpp | 8 +- digikam/libs/jpegutils/jpegutils.h | 2 +- digikam/libs/lprof/cmslnr.cpp | 6 +- digikam/libs/themeengine/themeengine.cpp | 164 +++++++++--------- digikam/libs/threadimageio/loadsavetask.cpp | 36 ++-- digikam/libs/threadimageio/loadsavetask.h | 30 ++-- .../threadimageio/managedloadsavethread.cpp | 26 +-- digikam/libs/threadimageio/previewtask.cpp | 10 +- digikam/libs/thumbbar/thumbbar.cpp | 14 +- digikam/libs/widgets/common/curveswidget.cpp | 2 +- .../libs/widgets/common/dcursortracker.cpp | 2 +- digikam/libs/widgets/common/dlogoaction.cpp | 2 +- digikam/libs/widgets/common/dpopupmenu.cpp | 8 +- digikam/libs/widgets/common/paniconwidget.cpp | 2 +- digikam/libs/widgets/common/searchtextbar.cpp | 2 +- digikam/libs/widgets/common/splashscreen.cpp | 2 +- digikam/libs/widgets/common/splashscreen.h | 2 +- .../libs/widgets/common/squeezedcombobox.cpp | 4 +- .../libs/widgets/common/squeezedcombobox.h | 4 +- .../libs/widgets/common/statusprogressbar.cpp | 6 +- .../libs/widgets/common/statusprogressbar.h | 2 +- .../widgets/imageplugins/imageguidewidget.cpp | 6 +- .../imageplugins/imagepaniconwidget.cpp | 2 +- .../imageplugins/imagepannelwidget.cpp | 2 +- .../imageplugins/imageregionwidget.cpp | 2 +- .../libs/widgets/imageplugins/imagewidget.cpp | 2 +- .../libs/widgets/metadata/metadatawidget.cpp | 2 +- .../libs/widgets/metadata/worldmapwidget.cpp | 4 +- digikam/showfoto/showfoto.cpp | 6 +- digikam/themedesigner/mainwindow.cpp | 4 +- digikam/themedesigner/themediconitem.cpp | 2 +- digikam/themedesigner/themediconview.cpp | 18 +- digikam/themedesigner/themediconview.h | 2 +- .../utilities/cameragui/albumselectdialog.cpp | 2 +- digikam/utilities/cameragui/animwidget.cpp | 6 +- .../utilities/cameragui/cameraiconitem.cpp | 16 +- .../utilities/cameragui/cameraiconview.cpp | 16 +- digikam/utilities/cameragui/cameraiconview.h | 2 +- digikam/utilities/cameragui/cameraui.cpp | 10 +- .../utilities/cameragui/freespacewidget.cpp | 6 +- digikam/utilities/cameragui/gpcamera.cpp | 42 ++--- digikam/utilities/cameragui/gpcamera.h | 4 +- digikam/utilities/cameragui/gpiteminfo.h | 4 +- .../utilities/cameragui/renamecustomizer.cpp | 10 +- .../utilities/imageeditor/canvas/canvas.cpp | 4 +- .../imageeditor/editor/editortoolsettings.cpp | 6 +- .../imageeditor/editor/editortoolsettings.h | 2 +- .../imageeditor/editor/editorwindow.cpp | 8 +- .../imageeditor/editor/imagewindow.cpp | 4 +- .../imageeditor/rawimport/rawpreview.cpp | 2 +- .../imageeditor/rawimport/rawsettingsbox.cpp | 4 +- .../utilities/lighttable/lighttablebar.cpp | 2 +- .../lighttable/lighttablepreview.cpp | 4 +- .../utilities/lighttable/lighttablewindow.cpp | 2 +- digikam/utilities/setup/setupcamera.cpp | 8 +- digikam/utilities/setup/setupcollections.cpp | 2 +- digikam/utilities/setup/setupplugins.cpp | 2 +- digikam/utilities/slideshow/toolbar.cpp | 2 +- 170 files changed, 712 insertions(+), 712 deletions(-) diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index 11402d3..d0b6b19 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -247,7 +247,7 @@ PAlbum::PAlbum(const TQString& title, int id, bool root) setTitle(title); m_caption = ""; m_collection = ""; - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); } PAlbum::~PAlbum() diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index ddcbdc7..21f1d88 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -1027,7 +1027,7 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder) execSql( TQString ("INSERT INTO Albums (url, date) " "VALUES ('%1','%2')") .tqarg(escapeString(folder), - TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) ); + TQDateTime::currentDateTime().toString(Qt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else albumID = values[0].toInt(); diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 6ae8862..d205e2e 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -111,7 +111,7 @@ AlbumFileTip::AlbumFileTip(AlbumIconView* view) d->label = new TQLabel(this); d->label->setMargin(0); - d->label->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + d->label->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); tqlayout->addWidget(d->label); tqlayout->setResizeMode(TQLayout::Fixed); @@ -206,7 +206,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix0 = d->corners[0]; pix0.resize(w, w); - pix0.fill(tqcolorGroup().background()); + pix0.fill(colorGroup().background()); TQPainter p0(&pix0); p0.setPen(TQPen(TQt::black, 1)); @@ -220,7 +220,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix1 = d->corners[1]; pix1.resize(w, w); - pix1.fill(tqcolorGroup().background()); + pix1.fill(colorGroup().background()); TQPainter p1(&pix1); p1.setPen(TQPen(TQt::black, 1)); @@ -234,7 +234,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix2 = d->corners[2]; pix2.resize(w, w); - pix2.fill(tqcolorGroup().background()); + pix2.fill(colorGroup().background()); TQPainter p2(&pix2); p2.setPen(TQPen(TQt::black, 1)); @@ -248,7 +248,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix3 = d->corners[3]; pix3.resize(w, w); - pix3.fill(tqcolorGroup().background()); + pix3.fill(colorGroup().background()); TQPainter p3(&pix3); p3.setPen(TQPen(TQt::black, 1)); diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index dba9d20..fa45d7c 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -155,7 +155,7 @@ public: TQString albumDate; TQString albumComments; - TQRect tqitemRect; + TQRect itemRect; TQRect itemRatingRect; TQRect itemDateRect; TQRect itemModDateRect; @@ -650,8 +650,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) { KAction* action = *iter; - if (TQString::tqfromLatin1(action->name()) - == TQString::tqfromLatin1("jpeglossless_rotate")) + if (TQString::fromLatin1(action->name()) + == TQString::fromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } @@ -1469,7 +1469,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) } else if(TagDrag::canDecode(event)) { - TQByteArray ba = event->tqencodedData("digikam/tag-id"); + TQByteArray ba = event->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -1554,7 +1554,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) } else if(TagListDrag::canDecode(event)) { - TQByteArray ba = event->tqencodedData("digikam/taglist"); + TQByteArray ba = event->encodedData("digikam/taglist"); TQDataStream ds(ba, IO_ReadOnly); TQValueList tagIDs; ds >> tagIDs; @@ -1906,9 +1906,9 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) refreshItems(urlList); } -TQRect AlbumIconView::tqitemRect() const +TQRect AlbumIconView::itemRect() const { - return d->tqitemRect; + return d->itemRect; } TQRect AlbumIconView::itemRatingRect() const @@ -2044,7 +2044,7 @@ void AlbumIconView::updateBannerRectPixmap() void AlbumIconView::updateItemRectsPixmap() { - d->tqitemRect = TQRect(0,0,0,0); + d->itemRect = TQRect(0,0,0,0); d->itemRatingRect = TQRect(0,0,0,0); d->itemDateRect = TQRect(0,0,0,0); d->itemModDateRect = TQRect(0,0,0,0); @@ -2143,13 +2143,13 @@ void AlbumIconView::updateItemRectsPixmap() y = d->itemTagRect.bottom(); } - d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin); + d->itemRect = TQRect(0, 0, w+2*margin, y+margin); - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), + d->itemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), + d->itemRect.height()); } void AlbumIconView::slotThemeChanged() diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index 3ef3304..4ba6397 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -95,7 +95,7 @@ public: void refresh(); void refreshItems(const KURL::List& itemList); - TQRect tqitemRect() const; + TQRect itemRect() const; TQRect itemRatingRect() const; TQRect itemDateRect() const; TQRect itemModDateRect() const; diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index f08d1af..a851979 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -727,7 +727,7 @@ void AlbumManager::scanSAlbums() if (sMap.contains(info.id)) continue; - bool simple = (info.url.queryItem("1.key") == TQString::tqfromLatin1("keyword")); + bool simple = (info.url.queryItem("1.key") == TQString::fromLatin1("keyword")); // Its a new album. SAlbum* album = new SAlbum(info.id, info.url, simple, false); diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index edfac21..a258ae7 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -120,7 +120,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) topLabel->setText( i18n( "\"%1\" Album Properties") .tqarg(album->title())); } - topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); + topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); topLayout->addMultiCellWidget( topLabel, 0, 0, 0, 1 ); // -------------------------------------------------------- @@ -212,7 +212,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) if (create) { d->titleEdit->setText( i18n("New Album") ); - d->datePicker->setDate( TQDate::tqcurrentDate() ); + d->datePicker->setDate( TQDate::currentDate() ); } else { diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index 16c9e09..b10d750 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -110,7 +110,7 @@ bool CameraList::load() TQString model = e.attribute("model"); TQString port = e.attribute("port"); TQString path = e.attribute("path"); - TQDateTime lastAccess = TQDateTime::tqcurrentDateTime(); + TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!e.attribute("lastaccess").isEmpty()) lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); @@ -254,7 +254,7 @@ CameraType* CameraList::autoDetect(bool& retry) if (port.startsWith("usb:")) port = "usb:"; - CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::tqcurrentDateTime()); + CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::currentDateTime()); insert(ctype); return ctype; diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 52ac8a4..bfecfa7 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -379,7 +379,7 @@ void DigikamApp::setupView() void DigikamApp::setupStatusBar() { d->statusProgressBar = new StatusProgressBar(statusBar()); - d->statusProgressBar->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); + d->statusProgressBar->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); d->statusProgressBar->setMaximumHeight(fontMetrics().height()+4); statusBar()->addWidget(d->statusProgressBar, 100, true); @@ -1082,7 +1082,7 @@ void DigikamApp::setupActions() loadCameras(); - createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); + createGUI(TQString::fromLatin1( "digikamui.rc" ), false); // Initialize Actions --------------------------------------- @@ -1493,7 +1493,7 @@ void DigikamApp::slotDownloadImages() // the CameraUI will delete itself when it has finished CameraUI* cgui = new CameraUI(this, i18n("Images found in %1").tqarg(d->cameraGuiPath), - "directory browse","Fixed", localUrl, TQDateTime::tqcurrentDateTime()); + "directory browse","Fixed", localUrl, TQDateTime::currentDateTime()); cgui->show(); connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), @@ -1725,14 +1725,14 @@ void DigikamApp::slotConfToolbars() if(dlg->exec()) { - createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); + createGUI(TQString::fromLatin1( "digikamui.rc" ), false); applyMainWindowSettings(KGlobal::config()); - plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions ); - plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport ); + plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); + plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); + plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); + plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions ); + plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions ); + plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport ); } delete dlg; @@ -1826,12 +1826,12 @@ void DigikamApp::loadPlugins() void DigikamApp::slotKipiPluginPlug() { - unplugActionList( TQString::tqfromLatin1("file_actions_export") ); - unplugActionList( TQString::tqfromLatin1("file_actions_import") ); - unplugActionList( TQString::tqfromLatin1("image_actions") ); - unplugActionList( TQString::tqfromLatin1("tool_actions") ); - unplugActionList( TQString::tqfromLatin1("batch_actions") ); - unplugActionList( TQString::tqfromLatin1("album_actions") ); + unplugActionList( TQString::fromLatin1("file_actions_export") ); + unplugActionList( TQString::fromLatin1("file_actions_import") ); + unplugActionList( TQString::fromLatin1("image_actions") ); + unplugActionList( TQString::fromLatin1("tool_actions") ); + unplugActionList( TQString::fromLatin1("batch_actions") ); + unplugActionList( TQString::fromLatin1("album_actions") ); d->kipiImageActions.clear(); d->kipiFileActionsExport.clear(); @@ -1906,12 +1906,12 @@ void DigikamApp::slotKipiPluginPlug() // Create GUI menu in according with plugins. - plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport ); - plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions ); + plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport ); + plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); + plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); + plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); + plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions ); + plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions ); } void DigikamApp::loadCameras() diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index 602c14c..8d0acc0 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -92,7 +92,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent, KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); - m_ui->setMinimumSize(450, m_ui->tqsizeHint().height()); + m_ui->setMinimumSize(450, m_ui->sizeHint().height()); } DigikamFirstRun::~DigikamFirstRun() diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 61f0e28..1da5f5e 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -180,7 +180,7 @@ DigikamView::DigikamView(TQWidget *parent) d->leftSideBar->setSplitter(d->splitter); d->albumWidgetStack = new AlbumWidgetStack(d->splitter); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - d->albumWidgetStack->tqsetSizePolicy(rightSzPolicy); + d->albumWidgetStack->setSizePolicy(rightSzPolicy); d->iconView = d->albumWidgetStack->albumIconView(); d->rightSideBar = new ImagePropertiesSideBarDB(this, "Digikam Right Sidebar", d->splitter, diff --git a/digikam/digikam/dragobjects.cpp b/digikam/digikam/dragobjects.cpp index b835faa..14a3545 100644 --- a/digikam/digikam/dragobjects.cpp +++ b/digikam/digikam/dragobjects.cpp @@ -60,9 +60,9 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR if (KURLDrag::decode(e, urls)) { - TQByteArray albumarray = e->tqencodedData("digikam/album-ids"); - TQByteArray imagearray = e->tqencodedData("digikam/image-ids"); - TQByteArray kioarray = e->tqencodedData("digikam/digikamalbums"); + TQByteArray albumarray = e->encodedData("digikam/album-ids"); + TQByteArray imagearray = e->encodedData("digikam/image-ids"); + TQByteArray kioarray = e->encodedData("digikam/digikamalbums"); if (albumarray.size() && imagearray.size() && kioarray.size()) { @@ -97,7 +97,7 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR return false; } -TQByteArray ItemDrag::tqencodedData(const char* mime) const +TQByteArray ItemDrag::encodedData(const char* mime) const { TQCString mimetype(mime); @@ -142,7 +142,7 @@ TQByteArray ItemDrag::tqencodedData(const char* mime) const } else { - return KURLDrag::tqencodedData(mime); + return KURLDrag::encodedData(mime); } } @@ -184,7 +184,7 @@ const char* TagDrag::format( int i ) const return 0; } -TQByteArray TagDrag::tqencodedData( const char* ) const +TQByteArray TagDrag::encodedData( const char* ) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -217,7 +217,7 @@ const char* AlbumDrag::format( int i ) const return 0; } -TQByteArray AlbumDrag::tqencodedData(const char *mime) const +TQByteArray AlbumDrag::encodedData(const char *mime) const { TQCString mimetype( mime ); if(mimetype == "digikam/album-id") @@ -229,7 +229,7 @@ TQByteArray AlbumDrag::tqencodedData(const char *mime) const } else { - return KURLDrag::tqencodedData(mime); + return KURLDrag::encodedData(mime); } } @@ -241,7 +241,7 @@ bool AlbumDrag::decode(const TQMimeSource* e, KURL::List &urls, if(KURLDrag::decode(e, urls)) { - TQByteArray ba = e->tqencodedData("digikam/album-id"); + TQByteArray ba = e->encodedData("digikam/album-id"); if (ba.size()) { TQDataStream ds(ba, IO_ReadOnly); @@ -270,7 +270,7 @@ bool TagListDrag::canDecode(const TQMimeSource* e) return e->provides("digikam/taglist"); } -TQByteArray TagListDrag::tqencodedData(const char*) const +TQByteArray TagListDrag::encodedData(const char*) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -301,7 +301,7 @@ bool CameraItemListDrag::canDecode(const TQMimeSource* e) return e->provides("digikam/cameraItemlist"); } -TQByteArray CameraItemListDrag::tqencodedData(const char*) const +TQByteArray CameraItemListDrag::encodedData(const char*) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -350,7 +350,7 @@ bool CameraDragObject::canDecode(const TQMimeSource* e) bool CameraDragObject::decode(const TQMimeSource* e, CameraType& ctype) { - TQByteArray payload = e->tqencodedData("camera/unknown"); + TQByteArray payload = e->encodedData("camera/unknown"); if (payload.size()) { TQString title, model, port, path; diff --git a/digikam/digikam/dragobjects.h b/digikam/digikam/dragobjects.h index 5d5f72e..f0aef04 100644 --- a/digikam/digikam/dragobjects.h +++ b/digikam/digikam/dragobjects.h @@ -74,7 +74,7 @@ public: protected: virtual const char* format(int i) const; - virtual TQByteArray tqencodedData(const char* mime) const; + virtual TQByteArray encodedData(const char* mime) const; private: @@ -99,7 +99,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: @@ -122,7 +122,7 @@ public: int &albumID); protected: - TQByteArray tqencodedData(const char*) const; + TQByteArray encodedData(const char*) const; const char* format(int i) const; private: @@ -145,7 +145,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: @@ -169,7 +169,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp index f354d01..f1bac2e 100644 --- a/digikam/digikam/firstrun.cpp +++ b/digikam/digikam/firstrun.cpp @@ -62,7 +62,7 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent ) TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 0, 6 ); m_pixLabel = new TQLabel( this ); - m_pixLabel->tqsetAlignment( int( TQLabel::AlignTop ) ); + m_pixLabel->setAlignment( int( TQLabel::AlignTop ) ); grid->addMultiCellWidget( m_pixLabel, 0, 1, 0, 0 ); m_path = new KURLRequester( this ); @@ -71,14 +71,14 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent ) grid->addWidget( m_path, 1, 1 ); m_textLabel1 = new TQLabel( this ); - m_textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); grid->addWidget( m_textLabel1, 0, 1 ); vtqlayout->addLayout( grid ); vtqlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); languageChange(); - resize( TQSize(479, 149).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(479, 149).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index d658529..5350176 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -123,7 +123,7 @@ void FolderItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int if (m_focus) { p->setPen(cg.link()); - TQRect r = fv->tqitemRect(this); + TQRect r = fv->itemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } @@ -211,7 +211,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co if ((type() == TQCheckListItem::CheckBox) || (type() == TQCheckListItem::CheckBoxController)) { - int boxsize = fv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, fv); + int boxsize = fv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, fv); int x = 3; int y = (height() - boxsize)/2 + margin; r += boxsize + 4; @@ -249,7 +249,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co if (m_focus) { p->setPen(cg.link()); - TQRect r = fv->tqitemRect(this); + TQRect r = fv->itemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index 2a3c152..a7d6b71 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -120,12 +120,12 @@ int FolderView::itemHeight() const return d->itemHeight; } -TQRect FolderView::tqitemRect(TQListViewItem *item) const +TQRect FolderView::itemRect(TQListViewItem *item) const { if(!item) return TQRect(); - TQRect r = TQListView::tqitemRect(item); + TQRect r = TQListView::itemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); return r; } @@ -358,7 +358,7 @@ bool FolderView::mouseInItemRect(TQListViewItem* item, int x) const FolderCheckListItem* citem = dynamic_cast(item); if (citem && ((citem->type() == TQCheckListItem::CheckBox) || (citem->type() == TQCheckListItem::CheckBoxController))) - boxsize = tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, this); + boxsize = tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, this); return (x > (offset + boxsize) && x < (offset + boxsize + width)); } diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index ebc6f29..06ef7bf 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -79,7 +79,7 @@ public: bool active() const; int itemHeight() const; - TQRect tqitemRect(TQListViewItem *item) const; + TQRect itemRect(TQListViewItem *item) const; TQPixmap itemBasePixmapRegular() const; TQPixmap itemBasePixmapSelected() const; diff --git a/digikam/digikam/icongroupitem.cpp b/digikam/digikam/icongroupitem.cpp index 51d91bc..e16588f 100644 --- a/digikam/digikam/icongroupitem.cpp +++ b/digikam/digikam/icongroupitem.cpp @@ -279,7 +279,7 @@ void IconGroupItem::paintBanner() { TQRect r(rect()); TQPixmap pix(r.width(), r.height()); - pix.fill(d->view->tqcolorGroup().base()); + pix.fill(d->view->colorGroup().base()); r = TQRect(d->view->contentsToViewport(TQPoint(r.x(), r.y())), TQSize(r.width(), r.height())); diff --git a/digikam/digikam/iconitem.cpp b/digikam/digikam/iconitem.cpp index fb7ff2e..10aff52 100644 --- a/digikam/digikam/iconitem.cpp +++ b/digikam/digikam/iconitem.cpp @@ -87,7 +87,7 @@ int IconItem::y() const TQRect IconItem::rect() const { IconView* view = m_group->iconView(); - TQRect r(view->tqitemRect()); + TQRect r(view->itemRect()); r.moveTopLeft(TQPoint(m_x, m_y)); return r; } diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index d4e1eb8..8592865 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -664,8 +664,8 @@ void IconView::slotRearrange() bool IconView::arrangeItems() { int y = 0; - int itemW = tqitemRect().width(); - int itemH = tqitemRect().height(); + int itemW = itemRect().width(); + int itemH = itemRect().height(); int maxW = 0; int numItemsPerRow = visibleWidth()/(itemW + d->spacing); @@ -720,7 +720,7 @@ bool IconView::arrangeItems() return changed; } -TQRect IconView::tqitemRect() const +TQRect IconView::itemRect() const { return TQRect(0, 0, 100, 100); } @@ -773,7 +773,7 @@ void IconView::viewportPaintEvent(TQPaintEvent* pe) } painter.setClipRegion(paintRegion); - painter.fillRect(r, tqcolorGroup().base()); + painter.fillRect(r, colorGroup().base()); painter.end(); } @@ -1070,8 +1070,8 @@ void IconView::drawRubber(TQPainter* p) tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height() ), - tqcolorGroup(), TQStyle::Style_Default, - TQStyleOption(tqcolorGroup().base())); + colorGroup(), TQStyle::Style_Default, + TQStyleOption(colorGroup().base())); } void IconView::contentsMouseMoveEvent(TQMouseEvent* e) @@ -1464,7 +1464,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + tqitemRect().width()/2; + int x = d->currItem->x() + itemRect().width()/2; int y = d->currItem->y() - d->spacing*2; IconItem *it = 0; @@ -1546,8 +1546,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + tqitemRect().width()/2; - int y = d->currItem->y() + tqitemRect().height() + d->spacing*2; + int x = d->currItem->x() + itemRect().width()/2; + int y = d->currItem->y() + itemRect().height() + d->spacing*2; IconItem *it = 0; @@ -1634,7 +1634,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (!ni) { - r = TQRect( 0, d->currItem->y() + tqitemRect().height(), + r = TQRect( 0, d->currItem->y() + itemRect().height(), contentsWidth(), contentsHeight() ); ni = findLastVisibleItem(r, false); } @@ -1731,7 +1731,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) ensureItemVisible(d->currItem); - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); int h = r.height(); TQPoint p(d->currItem->x() + w / 2, d->currItem->y() + h / 2); @@ -1785,13 +1785,13 @@ void IconView::ensureItemVisible(IconItem *item) if ( item->y() == firstItem()->y() ) { - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); ensureVisible( item->x() + w / 2, 0, w/2+1, 0 ); } else { - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); int h = r.height(); ensureVisible( item->x() + w / 2, item->y() + h / 2, @@ -1905,7 +1905,7 @@ void IconView::drawFrameRaised(TQPainter* p) TQRect r = frameRect(); int lwidth = lineWidth(); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); qDrawShadeRect( p, r, g, false, lwidth, midLineWidth() ); @@ -1916,7 +1916,7 @@ void IconView::drawFrameSunken(TQPainter* p) TQRect r = frameRect(); int lwidth = lineWidth(); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); qDrawShadeRect( p, r, g, true, lwidth, midLineWidth() ); diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index f3ca3e2..47bc051 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -98,7 +98,7 @@ public: IconItem* findFirstVisibleItem(bool useThumbnailRect = true) const; IconItem* findLastVisibleItem(bool useThumbnailRect = true) const; - virtual TQRect tqitemRect() const; + virtual TQRect itemRect() const; virtual TQRect bannerRect() const; TQRect contentsRectToViewport(const TQRect& r) const; diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index cbbf85c..a51defc 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -138,7 +138,7 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) if (d->previewSize > 2560) d->previewSize = 2560; - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); @@ -397,8 +397,8 @@ void ImagePreviewView::slotContextMenu() { KAction* action = *iter; - if (TQString::tqfromLatin1(action->name()) - == TQString::tqfromLatin1("jpeglossless_rotate")) + if (TQString::fromLatin1(action->name()) + == TQString::fromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index d045df1..d48cf28 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -81,13 +81,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::tqcurrentDate(); + mDate = TQDate::currentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect( lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( lineEnterPressed() ) ); @@ -147,13 +147,13 @@ void KDateEdit::popup() TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->tqsizeHint().height(); + int dateFrameHeight = mPopup->sizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->tqsizeHint().width(); + int dateFrameWidth = mPopup->sizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -166,7 +166,7 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::tqcurrentDate() ); + mPopup->setDate( TQDate::currentDate() ); mPopup->popup( popupPoint ); @@ -230,7 +230,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( text.isEmpty() ) result = TQDate(); else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index bd44476..34e2654 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -114,17 +114,17 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::tqcurrentDate() ); + emit dateChanged( TQDate::currentDate() ); } void KDatePickerPopup::slotYesterday() { - emit dateChanged( TQDate::tqcurrentDate().addDays( -1 ) ); + emit dateChanged( TQDate::currentDate().addDays( -1 ) ); } void KDatePickerPopup::slotPrevFriday() { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); int day = date.dayOfWeek(); if ( day < 6 ) date = date.addDays( 5 - 7 - day ); @@ -136,7 +136,7 @@ void KDatePickerPopup::slotPrevFriday() void KDatePickerPopup::slotPrevMonday() { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); emit dateChanged( date.addDays( 1 - date.dayOfWeek() ) ); } @@ -147,12 +147,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotPrevWeek() { - emit dateChanged( TQDate::tqcurrentDate().addDays( -7 ) ); + emit dateChanged( TQDate::currentDate().addDays( -7 ) ); } void KDatePickerPopup::slotPrevMonth() { - emit dateChanged( TQDate::tqcurrentDate().addMonths( -1 ) ); + emit dateChanged( TQDate::currentDate().addMonths( -1 ) ); } } // namespace Digikam diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index 9dee8f0..c8a02ab 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -75,7 +75,7 @@ public: @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(), + KDatePickerPopup(int items = 2, const TQDate &date = TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0); /** diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 25a9a69..250eada 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -88,7 +88,7 @@ MediaPlayerView::MediaPlayerView(TQWidget *parent) TQGridLayout *grid = new TQGridLayout(d->errorView, 2, 2, KDialogBase::marginHint(), KDialogBase::spacingHint()); - errorMsg->tqsetAlignment(TQt::AlignCenter); + errorMsg->setAlignment(TQt::AlignCenter); d->errorView->setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); d->errorView->setMargin(0); d->errorView->setLineWidth(1); @@ -151,7 +151,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true); KServiceTypeProfile::OfferList services = KServiceTypeProfile::offers(mimePtr->name(), - TQString::tqfromLatin1("KParts/ReadOnlyPart")); + TQString::fromLatin1("KParts/ReadOnlyPart")); DDebug() << "Search a KPart to preview " << url.fileName() << " (" << mimePtr->name() << ") " << endl; @@ -214,7 +214,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) } d->grid->addMultiCellWidget(mediaPlayerWidget, 0, 0, 0, 2); - mediaPlayerWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + mediaPlayerWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->mediaPlayerPart->openURL(url); setPreviewMode(MediaPlayerViewPriv::PlayerView); } diff --git a/digikam/digikam/metadatahub.cpp b/digikam/digikam/metadatahub.cpp index 71102a5..a1ab4d3 100644 --- a/digikam/digikam/metadatahub.cpp +++ b/digikam/digikam/metadatahub.cpp @@ -47,9 +47,9 @@ public: MetadataHubPriv() { - dateTimetqStatus = MetadataHub::MetadataInvalid; - ratingtqStatus = MetadataHub::MetadataInvalid; - commenttqStatus = MetadataHub::MetadataInvalid; + dateTimeStatus = MetadataHub::MetadataInvalid; + ratingStatus = MetadataHub::MetadataInvalid; + commentStatus = MetadataHub::MetadataInvalid; rating = -1; highestRating = -1; @@ -64,9 +64,9 @@ public: tagsChanged = false; } - MetadataHub::tqStatus dateTimetqStatus; - MetadataHub::tqStatus commenttqStatus; - MetadataHub::tqStatus ratingtqStatus; + MetadataHub::Status dateTimeStatus; + MetadataHub::Status commentStatus; + MetadataHub::Status ratingStatus; TQDateTime dateTime; TQDateTime lastDateTime; @@ -76,7 +76,7 @@ public: int count; - TQMap tags; + TQMap tags; TQStringList tagList; MetadataHub::DatabaseMode dbmode; @@ -86,8 +86,8 @@ public: bool ratingChanged; bool tagsChanged; - template void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status); - template void loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status); + template void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status); + template void loadSingleValue(const T &data, T &storage, MetadataHub::Status &status); }; MetadataWriteSettings::MetadataWriteSettings() @@ -256,21 +256,21 @@ void MetadataHub::loadTags(const TQValueList &loadedTags) for (TQValueList::const_iterator it = loadedTags.begin(); it != loadedTags.end(); ++it) { // that is a reference - TagtqStatus &status = d->tags[*it]; + TagStatus &status = d->tags[*it]; // if it was not contained in the list, the default constructor will mark it as invalid if (status == MetadataInvalid) { if (d->count == 1) // there were no previous sets that could have contained the set - status = TagtqStatus(MetadataAvailable, true); + status = TagStatus(MetadataAvailable, true); else // previous sets did not contain the tag, we do => disjoint - status = TagtqStatus(MetadataDisjoint, true); + status = TagStatus(MetadataDisjoint, true); } - else if (status == TagtqStatus(MetadataAvailable, false)) + else if (status == TagStatus(MetadataAvailable, false)) { // set to explicitly not contained, but we contain it => disjoint - status = TagtqStatus(MetadataDisjoint, true); + status = TagStatus(MetadataDisjoint, true); } // else if mapIt.data() == MetadataAvailable, true: all right, we contain it too // else if mapIt.data() == MetadataDisjoint: it's already disjoint @@ -283,10 +283,10 @@ void MetadataHub::loadTags(const TQValueList &loadedTags) // but are not contained in this set, have to be set to MetadataDisjoint for (TQValueList::iterator it = previousTags.begin(); it != previousTags.end(); ++it) { - TQMap::iterator mapIt = d->tags.find(*it); - if (mapIt != d->tags.end() && mapIt.data() == TagtqStatus(MetadataAvailable, true)) + TQMap::iterator mapIt = d->tags.find(*it); + if (mapIt != d->tags.end() && mapIt.data() == TagStatus(MetadataAvailable, true)) { - mapIt.data() = TagtqStatus(MetadataDisjoint, true); + mapIt.data() = TagStatus(MetadataDisjoint, true); } } } @@ -320,16 +320,16 @@ void MetadataHub::load(const TQDateTime &dateTime, const TQString &comment, int { if (dateTime.isValid()) { - d->loadWithInterval(dateTime, d->dateTime, d->lastDateTime, d->dateTimetqStatus); + d->loadWithInterval(dateTime, d->dateTime, d->lastDateTime, d->dateTimeStatus); } - d->loadWithInterval(rating, d->rating, d->highestRating, d->ratingtqStatus); + d->loadWithInterval(rating, d->rating, d->highestRating, d->ratingStatus); - d->loadSingleValue(comment, d->comment, d->commenttqStatus); + d->loadSingleValue(comment, d->comment, d->commentStatus); } // template method to share code for dateTime and rating -template void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status) +template void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status) { switch (status) { @@ -364,7 +364,7 @@ template void MetadataHubPriv::loadWithInterval(const T &data, T &stor } // template method used by comment -template void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status) +template void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::Status &status) { switch (status) { @@ -391,11 +391,11 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode) bool changed = false; // find out in advance if we have something to write - needed for FullWriteIfChanged mode - bool saveComment = d->commenttqStatus == MetadataAvailable; - bool saveDateTime = d->dateTimetqStatus == MetadataAvailable; - bool saveRating = d->ratingtqStatus == MetadataAvailable; + bool saveComment = d->commentStatus == MetadataAvailable; + bool saveDateTime = d->dateTimeStatus == MetadataAvailable; + bool saveRating = d->ratingStatus == MetadataAvailable; bool saveTags = false; - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -437,7 +437,7 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode) { if (d->dbmode == ManagedTags) { - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -464,15 +464,15 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata bool dirty = false; // find out in advance if we have something to write - needed for FullWriteIfChanged mode - bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -522,7 +522,7 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata // create list of keywords to be added and to be removed TQStringList newKeywords, oldKeywords; - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { // it is important that MetadataDisjoint keywords are not touched if (it.data() == MetadataAvailable) @@ -609,15 +609,15 @@ bool MetadataHub::needWriteMetadata(WriteMode writeMode, const MetadataWriteSett // This is the same logic as in write(DMetadata) but without actually writing. // Adapt if the method above changes - bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -661,42 +661,42 @@ MetadataWriteSettings MetadataHub::defaultWriteSettings() // -------------------------------------------------- -MetadataHub::tqStatus MetadataHub::dateTimetqStatus() const +MetadataHub::Status MetadataHub::dateTimeStatus() const { - return d->dateTimetqStatus; + return d->dateTimeStatus; } -MetadataHub::tqStatus MetadataHub::commenttqStatus() const +MetadataHub::Status MetadataHub::commentStatus() const { - return d->commenttqStatus; + return d->commentStatus; } -MetadataHub::tqStatus MetadataHub::ratingtqStatus() const +MetadataHub::Status MetadataHub::ratingStatus() const { - return d->ratingtqStatus; + return d->ratingStatus; } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(int albumId) const +MetadataHub::TagStatus MetadataHub::tagStatus(int albumId) const { if (d->dbmode == NewTagsImport) - return TagtqStatus(MetadataInvalid); - return tagtqStatus(AlbumManager::instance()->findTAlbum(albumId)); + return TagStatus(MetadataInvalid); + return tagStatus(AlbumManager::instance()->findTAlbum(albumId)); } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(const TQString &tagPath) const +MetadataHub::TagStatus MetadataHub::tagStatus(const TQString &tagPath) const { if (d->dbmode == NewTagsImport) - return TagtqStatus(MetadataInvalid); - return tagtqStatus(AlbumManager::instance()->findTAlbum(tagPath)); + return TagStatus(MetadataInvalid); + return tagStatus(AlbumManager::instance()->findTAlbum(tagPath)); } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(TAlbum *album) const +MetadataHub::TagStatus MetadataHub::tagStatus(TAlbum *album) const { if (!album) - return TagtqStatus(MetadataInvalid); - TQMap::iterator mapIt = d->tags.find(album); + return TagStatus(MetadataInvalid); + TQMap::iterator mapIt = d->tags.find(album); if (mapIt == d->tags.end()) - return TagtqStatus(MetadataInvalid); + return TagStatus(MetadataInvalid); return mapIt.data(); } @@ -738,7 +738,7 @@ int MetadataHub::rating() const void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) const { - switch (d->dateTimetqStatus) + switch (d->dateTimeStatus) { case MetadataInvalid: lowest = highest = TQDateTime(); @@ -755,7 +755,7 @@ void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) cons void MetadataHub::ratingInterval(int &lowest, int &highest) const { - switch (d->ratingtqStatus) + switch (d->ratingStatus) { case MetadataInvalid: lowest = highest = -1; @@ -777,26 +777,26 @@ TQStringList MetadataHub::keywords() const else { TQStringList tagList; - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { - if (it.data() == TagtqStatus(MetadataAvailable, true)) + if (it.data() == TagStatus(MetadataAvailable, true)) tagList.append(it.key()->tagPath(false)); } return tagList; } } -TQMap MetadataHub::tags() const +TQMap MetadataHub::tags() const { // DatabaseMode == ManagedTags is assumed return d->tags; } -TQMap MetadataHub::tagIDs() const +TQMap MetadataHub::tagIDs() const { // DatabaseMode == ManagedTags is assumed - TQMap intmap; - for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + TQMap intmap; + for (TQMap::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { intmap.insert(it.key()->id(), it.data()); } @@ -806,35 +806,35 @@ TQMap MetadataHub::tagIDs() const // -------------------------------------------------- -void MetadataHub::setDateTime(const TQDateTime &dateTime, tqStatus status) +void MetadataHub::setDateTime(const TQDateTime &dateTime, Status status) { - d->dateTimetqStatus = status; + d->dateTimeStatus = status; d->dateTime = dateTime; d->dateTimeChanged = true; } -void MetadataHub::setComment(const TQString &comment, tqStatus status) +void MetadataHub::setComment(const TQString &comment, Status status) { - d->commenttqStatus = status; + d->commentStatus = status; d->comment = comment; d->commentChanged = true; } -void MetadataHub::setRating(int rating, tqStatus status) +void MetadataHub::setRating(int rating, Status status) { - d->ratingtqStatus = status; + d->ratingStatus = status; d->rating = rating; d->ratingChanged = true; } -void MetadataHub::setTag(TAlbum *tag, bool hasTag, tqStatus status) +void MetadataHub::setTag(TAlbum *tag, bool hasTag, Status status) { // DatabaseMode == ManagedTags is assumed - d->tags[tag] = TagtqStatus(status, hasTag); + d->tags[tag] = TagStatus(status, hasTag); d->tagsChanged = true; } -void MetadataHub::setTag(int albumID, bool hasTag, tqStatus status) +void MetadataHub::setTag(int albumID, bool hasTag, Status status) { // DatabaseMode == ManagedTags is assumed TAlbum *album = AlbumManager::instance()->findTAlbum(albumID); diff --git a/digikam/digikam/metadatahub.h b/digikam/digikam/metadatahub.h index b0062f1..decb148 100644 --- a/digikam/digikam/metadatahub.h +++ b/digikam/digikam/metadatahub.h @@ -92,7 +92,7 @@ public: If only one set has been added, the status is always MetadataAvailable. If no set has been added, the status is always MetadataInvalid */ - enum tqStatus + enum Status { MetadataInvalid, /// not yet filled with any value MetadataAvailable, /// only one data set has been added, or a common value is available @@ -102,21 +102,21 @@ public: /** Describes the complete status of a Tag: The metadata status, and the fact if it has the tag or not. */ - class TagtqStatus + class TagStatus { public: - TagtqStatus(tqStatus status, bool hasTag = false) : status(status), hasTag(hasTag) {}; - TagtqStatus() : status(MetadataInvalid), hasTag(false) {}; + TagStatus(Status status, bool hasTag = false) : status(status), hasTag(hasTag) {}; + TagStatus() : status(MetadataInvalid), hasTag(false) {}; - tqStatus status; + Status status; bool hasTag; - bool operator==(TagtqStatus otherstatus) + bool operator==(TagStatus otherstatus) { return otherstatus.status == status && otherstatus.hasTag == hasTag; } - bool operator==(tqStatus otherstatus) { return otherstatus == status; } + bool operator==(Status otherstatus) { return otherstatus == status; } }; enum DatabaseMode @@ -251,13 +251,13 @@ public: // -------------------------------------------------- - tqStatus dateTimetqStatus() const; - tqStatus commenttqStatus() const; - tqStatus ratingtqStatus() const; + Status dateTimeStatus() const; + Status commentStatus() const; + Status ratingStatus() const; - TagtqStatus tagtqStatus(TAlbum *album) const; - TagtqStatus tagtqStatus(int albumId) const; - TagtqStatus tagtqStatus(const TQString &tagPath) const; + TagStatus tagStatus(TAlbum *album) const; + TagStatus tagStatus(int albumId) const; + TagStatus tagStatus(const TQString &tagPath) const; /** Returns if the metadata field has been changed @@ -320,23 +320,23 @@ public: sets contained the tag. The hasTag value is true then. If MapMode (set in constructor) is false, returns an empty map. */ - TQMap tags() const; + TQMap tags() const; /** Similar to the method above. This method is less efficient internally. */ - TQMap tagIDs() const; + TQMap tagIDs() const; // -------------------------------------------------- /** Set dateTime to the given value, and the dateTime status to MetadataAvailable */ - void setDateTime(const TQDateTime &dateTime, tqStatus status = MetadataAvailable); - void setComment(const TQString &comment, tqStatus status = MetadataAvailable); - void setRating(int rating, tqStatus status = MetadataAvailable); - void setTag(TAlbum *tag, bool hasTag, tqStatus status = MetadataAvailable); - void setTag(int albumID, bool hasTag, tqStatus status = MetadataAvailable); + void setDateTime(const TQDateTime &dateTime, Status status = MetadataAvailable); + void setComment(const TQString &comment, Status status = MetadataAvailable); + void setRating(int rating, Status status = MetadataAvailable); + void setTag(TAlbum *tag, bool hasTag, Status status = MetadataAvailable); + void setTag(int albumID, bool hasTag, Status status = MetadataAvailable); /** Resets the information that metadata fields have been changed with one of the diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 19d6704..2d7a755 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -83,7 +83,7 @@ MonthWidget::MonthWidget(TQWidget* parent) d = new MonthWidgetPriv; init(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setYearMonth(date.year(), date.month()); setActive(false); @@ -134,7 +134,7 @@ void MonthWidget::setYearMonth(int year, int month) update(); } -TQSize MonthWidget::tqsizeHint() const +TQSize MonthWidget::sizeHint() const { return TQSize(d->width * 8, d->height * 9); } @@ -153,7 +153,7 @@ void MonthWidget::drawContents(TQPainter *) TQPixmap pix(cr.width(), cr.height()); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); TQFont fnBold(font()); TQFont fnOrig(font()); @@ -363,7 +363,7 @@ void MonthWidget::setActive(bool val) } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setYearMonth(date.year(), date.month()); AlbumLister::instance()->setDayFilter(TQValueList()); diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index 0333050..9b54736 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -48,7 +48,7 @@ public: ~MonthWidget(); void setYearMonth(int year, int month); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setActive(bool val); diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index 46c011e..375268f 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -175,7 +175,7 @@ void RatingWidget::slotThemeChanged() TQPainter painter(&d->regPixmap); painter.fillRect(0, 0, d->regPixmap.width(), d->regPixmap.height(), - tqcolorGroup().dark()); + colorGroup().dark()); painter.end(); TQPainter painter2(&d->selPixmap); diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 87456d8..0e16937 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -123,7 +123,7 @@ void ScanLib::startScan() deleteStaleEntries(); AlbumDB* db = AlbumManager::instance()->albumDB(); - db->setSetting("Scanned", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); + db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate)); } void ScanLib::findFoldersWhichDoNotExist() diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index e7af525..2c9ca5a 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -124,8 +124,8 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) "searching in album library.")); d->rulesBox->tqlayout()->setSpacing( spacingHint() ); d->rulesBox->tqlayout()->setMargin( spacingHint() ); - d->rulesBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - d->rulesBox->tqlayout()->tqsetAlignment( TQt::AlignTop ); + d->rulesBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + d->rulesBox->tqlayout()->setAlignment( TQt::AlignTop ); // ---------------------------------------------------------------- // Box for the add/delete diff --git a/digikam/digikam/searchresultsitem.cpp b/digikam/digikam/searchresultsitem.cpp index 85b02ab..d3f2ab1 100644 --- a/digikam/digikam/searchresultsitem.cpp +++ b/digikam/digikam/searchresultsitem.cpp @@ -41,7 +41,7 @@ SearchResultsItem::SearchResultsItem(TQIconView* view, const TQString& path) if (!m_basePixmap) { m_basePixmap = new TQPixmap(128, 128); - m_basePixmap->fill(view->tqcolorGroup().base()); + m_basePixmap->fill(view->colorGroup().base()); TQPainter p(m_basePixmap); p.setPen(TQt::lightGray); diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 6e2a00b..8bbfffb 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -127,7 +127,7 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt { m_box = new TQVBox(parent); m_box->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_box->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_optionsBox = 0; m_option = option; @@ -139,23 +139,23 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_optionsBox); TQFrame* hline = new TQFrame( m_optionsBox ); hline->setFrameStyle( TQFrame::HLine|TQFrame::Sunken ); - m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); - hline->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + hline->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), this, TQT_SLOT( slotLabelDoubleClick() )); } m_hbox = new TQWidget( m_box ); - m_hbox->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_hbox->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_key = new TQComboBox( m_hbox, "key" ); - m_key->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + m_key->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); for (int i=0; i< RuleKeyTableCount; i++) m_key->insertItem( i18n(RuleKeyTable[i].keyText), i ); m_operator = new TQComboBox( m_hbox ); - m_operator->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + m_operator->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); // prepopulate the operator widget to get optimal size for (int i=0; i< RuleOpTableCount; i++) m_operator->insertItem( i18n(RuleOpTable[i].keyText), i ); @@ -311,7 +311,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp if (newType == DATE) { m_dateEdit = new KDateEdit( m_valueBox,"datepicker"); - m_dateEdit->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_dateEdit->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_dateEdit->show(); connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ), @@ -320,7 +320,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == LINEEDIT) { m_lineEdit = new TQLineEdit( m_valueBox, "lineedit" ); - m_lineEdit->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_lineEdit->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_lineEdit->show(); connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ), @@ -330,7 +330,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == ALBUMS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "albumscombo" ); - m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList aList = aManager->allPAlbums(); @@ -370,7 +370,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == TAGS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "tagscombo" ); - m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList tList = aManager->allTAlbums(); @@ -483,7 +483,7 @@ void SearchAdvancedRule::addOption(Option option) new TQLabel(option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox); TQFrame* hline = new TQFrame(m_optionsBox); hline->setFrameStyle(TQFrame::HLine|TQFrame::Sunken); - hline->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + hline->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); m_optionsBox->show(); m_box->tqlayout()->add(m_hbox); @@ -500,7 +500,7 @@ void SearchAdvancedRule::removeOption() void SearchAdvancedRule::addCheck() { m_check = new TQCheckBox(m_hbox); - m_check->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_check->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_check->show(); diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 2b675a2..8dc6a58 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -108,7 +108,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); d->topLabel = new TQLabel(page); - d->topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); + d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); KSeparator *line = new KSeparator(Qt::Horizontal, page); diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 962a61d..a0fe259 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -539,7 +539,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e) if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index f5be7dc..2b92942 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -822,7 +822,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e) if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index 72b1602..99ccb19 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -67,11 +67,11 @@ public: { } - virtual TQSize tqsizeHint() + virtual TQSize sizeHint() { TQFont fn = m_popup->font(); TQFontMetrics fm(fn); - int w = fm.width(m_txt) + 5 + kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + int w = fm.width(m_txt) + 5 + kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); int h = TQMAX(fm.height(), m_pix.height()); return TQSize( w, h ); } @@ -90,8 +90,8 @@ public: p->drawPixmap( pixRect.topLeft(), m_pix ); } - int checkWidth = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); - int checkHeight = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight, 0); + int checkWidth = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + int checkHeight = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorHeight, 0); TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_On; diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 6422485..11607b6 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -185,7 +185,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->cursorDateLabel = new KSqueezedTextLabel(0, panel); d->cursorCountLabel = new TQLabel(panel); - d->cursorCountLabel->tqsetAlignment(TQt::AlignRight); + d->cursorCountLabel->setAlignment(TQt::AlignRight); // --------------------------------------------------------------- @@ -334,7 +334,7 @@ void TimeLineView::readConfig() d->scaleBG->setButton(config->readNumEntry("Histogram Scale", TimeLineWidget::LinScale)); slotScaleChanged(d->scaleBG->selectedId()); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); d->timeLineWidget->setCursorDateTime(config->readDateTimeEntry("Cursor Position", &now)); d->timeLineWidget->setCurrentIndex(d->timeLineWidget->indexForCursorDateTime()); } diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 1c33527..39f3b82 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -120,7 +120,7 @@ TimeLineWidget::TimeLineWidget(TQWidget *parent) setMinimumWidth(256); setMinimumHeight(192); - TQDateTime ref = TQDateTime::tqcurrentDateTime(); + TQDateTime ref = TQDateTime::currentDateTime(); setCursorDateTime(ref); setRefDateTime(ref); diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index ed8aeab..88b6217 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -127,7 +127,7 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) TQGridLayout* grid = new TQGridLayout( gboxSettings, 5, 5, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index d119073..f4dc531 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -118,7 +118,7 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 5, 5); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index c827e35..74a394b 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -126,7 +126,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) TQGridLayout* grid = new TQGridLayout(gboxSettings, 16, 8, spacingHint(), 0); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index 68c79c2..5c0c667 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -119,7 +119,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 20, 6); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index f6fafe6..657be11 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -86,7 +86,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 14, 2); m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() ); - m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

You can see here a thumbnail preview of the anti-vignetting " "mask applied to the image.") ); diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 364ad8b..4e809c9 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -89,7 +89,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 13, 2, spacingHint()); m_maskPreviewLabel = new TQLabel( gboxSettings ); - m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

You can see here a thumbnail preview of the anti-vignetting " "mask applied to the image.") ); gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2); diff --git a/digikam/imageplugins/blurfx/blurfx.cpp b/digikam/imageplugins/blurfx/blurfx.cpp index a299fcc..ec5ff30 100644 --- a/digikam/imageplugins/blurfx/blurfx.cpp +++ b/digikam/imageplugins/blurfx/blurfx.cpp @@ -1050,7 +1050,7 @@ void BlurFX::frostGlass(Digikam::DImg *orgImage, Digikam::DImg *destImage, int F // Randomize. - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index ca40bb0..3acef9b 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -124,7 +124,7 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent) TQGridLayout* grid = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index b1d63a4..26560ad 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -118,7 +118,7 @@ ChannelMixerTool::ChannelMixerTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index 7be4358..3755eb3 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -101,7 +101,7 @@ ColorFXTool::ColorFXTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 9, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 17eadbf..e18a3b3 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -107,7 +107,7 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 3928cf3..2f129e8 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -101,7 +101,7 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 2, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index dd944ac..323a4fa 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -100,7 +100,7 @@ BCGTool::BCGTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 3e7a3e6..e65831c 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -191,7 +191,7 @@ BWSepiaTool::BWSepiaTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 4, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index b3f610f..7442b87 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -104,7 +104,7 @@ HSLTool::HSLTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 11, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 28cce25..1658714 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -87,7 +87,7 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 373896d..2caa9ef 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -128,7 +128,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQGridLayout *gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2); TQLabel *label1 = new TQLabel(i18n("Channel: "), m_gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); @@ -267,7 +267,7 @@ ICCProofTool::ICCProofTool(TQObject* parent) "specific color.")); KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions); - lcmsLogoLabel->tqsetAlignment(AlignTop | AlignRight); + lcmsLogoLabel->setAlignment(AlignTop | AlignRight); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index ba1a732..8809ce3 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -94,7 +94,7 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index ee4e293..3ae2d47 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -87,7 +87,7 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 2dcff0b..cfa90f4 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -189,7 +189,7 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index a1dd583..74030bf 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -115,7 +115,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQGridLayout *gridSettings = new TQGridLayout( gboxSettings, 3, 2, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel: "), gboxSettings); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, gboxSettings); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); @@ -253,7 +253,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) "specific color.")); KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions); - lcmsLogoLabel->tqsetAlignment( AlignTop | AlignRight ); + lcmsLogoLabel->setAlignment( AlignTop | AlignRight ); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index 230ae63..f919c39 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -86,7 +86,7 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index f836478..1fff34f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -85,7 +85,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 7, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); @@ -147,13 +147,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) // ------------------------------------------------------------- TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings); - labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider"); m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickInterval(20); TQWhatsThis::add( m_rSlider, i18n("

Set here the cyan/red color adjustment of the image.")); TQLabel *labelRight = new TQLabel(i18n("Red"), gboxSettings); - labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); m_rInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_rInput"); gridSettings->addMultiCellWidget(labelLeft, 3, 3, 0, 0); @@ -164,13 +164,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) // ------------------------------------------------------------- labelLeft = new TQLabel(i18n("Magenta"), gboxSettings); - labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider"); m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickInterval(20); TQWhatsThis::add( m_gSlider, i18n("

Set here the magenta/green color adjustment of the image.")); labelRight = new TQLabel(i18n("Green"), gboxSettings); - labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); m_gInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_gInput"); gridSettings->addMultiCellWidget(labelLeft, 4, 4, 0, 0); @@ -181,13 +181,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) // ------------------------------------------------------------- labelLeft = new TQLabel(i18n("Yellow"), gboxSettings); - labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider"); m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickInterval(20); TQWhatsThis::add( m_bSlider, i18n("

Set here the yellow/blue color adjustment of the image.")); labelRight = new TQLabel(i18n("Blue"), gboxSettings); - labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); m_bInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_bInput"); gridSettings->addMultiCellWidget(labelLeft, 5, 5, 0, 0); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index 553cf86..9871942 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -140,11 +140,11 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) // ------------------------------------------------------------- m_customLabel1 = new TQLabel(i18n("Custom ratio:"), cropSelection); - m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter); + m_customLabel1->setAlignment(AlignLeft|AlignVCenter); m_customRatioNInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection); TQWhatsThis::add( m_customRatioNInput, i18n("

Set here the desired custom aspect numerator value.")); m_customLabel2 = new TQLabel(" : ", cropSelection); - m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter); + m_customLabel2->setAlignment(AlignCenter|AlignVCenter); m_customRatioDInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection); TQWhatsThis::add( m_customRatioDInput, i18n("

Set here the desired custom aspect denominator value.")); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index c87ef44..31a4458 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -717,7 +717,7 @@ void ImageSelectionWidget::updatePixmap() d->localRegionSelection.bottom() - 7, 8, 8); // Drawing background and image. - d->pixmap->fill(tqcolorGroup().background()); + d->pixmap->fill(colorGroup().background()); if (d->preview.isNull()) return; diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index f8a2e38..5a220ef 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -159,14 +159,14 @@ RatioCropTool::RatioCropTool(TQObject* parent) // ------------------------------------------------------------- m_customLabel1 = new TQLabel(i18n("Custom:"), cropSelection); - m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter); + m_customLabel1->setAlignment(AlignLeft|AlignVCenter); m_customRatioNInput = new RIntNumInput(cropSelection); m_customRatioNInput->input()->setRange(1, 10000, 1, false); m_customRatioNInput->setDefaultValue(1); TQWhatsThis::add( m_customRatioNInput, i18n("

Set here the desired custom aspect numerator value.")); m_customLabel2 = new TQLabel(" : ", cropSelection); - m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter); + m_customLabel2->setAlignment(AlignCenter|AlignVCenter); m_customRatioDInput = new RIntNumInput(cropSelection); m_customRatioDInput->input()->setRange(1, 10000, 1, false); m_customRatioDInput->setDefaultValue(1); diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index 563d776..dfa7029 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -101,7 +101,7 @@ RedEyeTool::RedEyeTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 11, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index df69f9d..69382b3 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -98,7 +98,7 @@ RGBTool::RGBTool(TQObject* parent) TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 7, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); @@ -160,13 +160,13 @@ RGBTool::RGBTool(TQObject* parent) // ------------------------------------------------------------- TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage()); - labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider"); m_rSlider->setTickmarks(TQSlider::Below); m_rSlider->setTickInterval(20); TQWhatsThis::add( m_rSlider, i18n("

Set here the cyan/red color adjustment of the image.")); TQLabel *labelRight = new TQLabel(i18n("Red"), m_gboxSettings->plainPage()); - labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); + labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); m_rInput = new RIntNumInput(m_gboxSettings->plainPage()); m_rInput->setDefaultValue(0); m_rInput->input()->setRange(-100, 100, 1, false); @@ -179,13 +179,13 @@ RGBTool::RGBTool(TQObject* parent) // ------------------------------------------------------------- labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage()); - labelLeft->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter); m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider"); m_gSlider->setTickmarks(TQSlider::Below); m_gSlider->setTickInterval(20); TQWhatsThis::add( m_gSlider, i18n("

Set here the magenta/green color adjustment of the image.")); labelRight = new TQLabel(i18n("Green"), m_gboxSettings->plainPage()); - labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); m_gInput = new RIntNumInput(m_gboxSettings->plainPage()); m_gInput->setDefaultValue(0); m_gInput->input()->setRange(-100, 100, 1, false); @@ -198,13 +198,13 @@ RGBTool::RGBTool(TQObject* parent) // ------------------------------------------------------------- labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage()); - labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider"); m_bSlider->setTickmarks(TQSlider::Below); m_bSlider->setTickInterval(20); TQWhatsThis::add( m_bSlider, i18n("

Set here the yellow/blue color adjustment of the image.")); labelRight = new TQLabel(i18n("Blue"), m_gboxSettings->plainPage()); - labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); m_bInput = new RIntNumInput(m_gboxSettings->plainPage()); m_bInput->setDefaultValue(0); m_bInput->input()->setRange(-100, 100, 1, false); diff --git a/digikam/imageplugins/distortionfx/distortionfx.cpp b/digikam/imageplugins/distortionfx/distortionfx.cpp index 79f7195..f1616af 100644 --- a/digikam/imageplugins/distortionfx/distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/distortionfx.cpp @@ -815,7 +815,7 @@ void DistortionFX::tile(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Width = orgImage->width(); int Height = orgImage->height(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); diff --git a/digikam/imageplugins/filmgrain/filmgrain.cpp b/digikam/imageplugins/filmgrain/filmgrain.cpp index 02bbca8..57616eb 100644 --- a/digikam/imageplugins/filmgrain/filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/filmgrain.cpp @@ -92,7 +92,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) else Shade = 52; - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = (uint) dt.secsTo(Y2000); diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index b11c128..3330601 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -95,11 +95,11 @@ FreeRotationTool::FreeRotationTool(TQObject* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage()); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage()); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index ea2a67f..630f260 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -101,11 +101,11 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); diff --git a/digikam/imageplugins/infrared/infrared.cpp b/digikam/imageplugins/infrared/infrared.cpp index 4874df9..fa2983d 100644 --- a/digikam/imageplugins/infrared/infrared.cpp +++ b/digikam/imageplugins/infrared/infrared.cpp @@ -162,7 +162,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai // Create gray grain mask. - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = ((uint) dt.secsTo(Y2000)); diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index 35e477c..c351e21 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -173,7 +173,7 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent) TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); - typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter); m_inpaintingTypeCB = new TQComboBox( false, firstPage ); m_inpaintingTypeCB->insertItem( i18n("None") ); m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") ); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index 94f69b4..a0a9fe5 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -121,7 +121,7 @@ InPaintingTool::InPaintingTool(TQObject* parent) TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); - typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter); m_inpaintingTypeCB = new TQComboBox( false, firstPage ); m_inpaintingTypeCB->insertItem( i18n("None") ); m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") ); diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index 8f13082..bd6517f 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -301,8 +301,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::fromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } FontChooserWidget::~FontChooserWidget() @@ -326,7 +326,7 @@ int FontChooserWidget::minimumListWidth( const TQListBox *list ) } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->tqsizeHint().width(); + w += list->verticalScrollBar()->sizeHint().width(); return w; } @@ -405,9 +405,9 @@ TQButton::ToggleState FontChooserWidget::sizeIsRelative() const : TQButton::NoChange; } -TQSize FontChooserWidget::tqsizeHint( void ) const +TQSize FontChooserWidget::sizeHint( void ) const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void FontChooserWidget::enableColumn( int column, bool state ) @@ -696,13 +696,13 @@ void FontChooserWidget::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::tqfromLatin1(ptr + 1); + TQString font = TQString::fromLatin1(ptr + 1); int pos; if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h index b39b7c9..5971046 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.h +++ b/digikam/imageplugins/inserttext/fontchooserwidget.h @@ -97,7 +97,7 @@ public: int fontDiffFlags(); void enableColumn( int column, bool state ); - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; signals: diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index aa5ed90..52a7e45 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -299,19 +299,19 @@ void ImageEffect_InsertText::slotAlignModeChanged(int mode) switch (m_alignTextMode) { case ALIGN_LEFT: - m_textEdit->tqsetAlignment( TQt::AlignLeft ); + m_textEdit->setAlignment( TQt::AlignLeft ); break; case ALIGN_RIGHT: - m_textEdit->tqsetAlignment( TQt::AlignRight ); + m_textEdit->setAlignment( TQt::AlignRight ); break; case ALIGN_CENTER: - m_textEdit->tqsetAlignment( TQt::AlignHCenter ); + m_textEdit->setAlignment( TQt::AlignHCenter ); break; case ALIGN_BLOCK: - m_textEdit->tqsetAlignment( TQt::AlignJustify ); + m_textEdit->setAlignment( TQt::AlignJustify ); break; } diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index d48690a..7311ac8 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -289,19 +289,19 @@ void InsertTextTool::slotAlignModeChanged(int mode) switch (m_alignTextMode) { case ALIGN_LEFT: - m_textEdit->tqsetAlignment( TQt::AlignLeft ); + m_textEdit->setAlignment( TQt::AlignLeft ); break; case ALIGN_RIGHT: - m_textEdit->tqsetAlignment( TQt::AlignRight ); + m_textEdit->setAlignment( TQt::AlignRight ); break; case ALIGN_CENTER: - m_textEdit->tqsetAlignment( TQt::AlignHCenter ); + m_textEdit->setAlignment( TQt::AlignHCenter ); break; case ALIGN_BLOCK: - m_textEdit->tqsetAlignment( TQt::AlignJustify ); + m_textEdit->setAlignment( TQt::AlignJustify ); break; } diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 82e0789..d274f75 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -61,7 +61,7 @@ InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *parent) m_w = m_iface->previewWidth(); m_h = m_iface->previewHeight(); m_pixmap = new TQPixmap(w, h); - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); @@ -229,7 +229,7 @@ void InsertTextWidget::makePixmap(void) // paint pixmap for drawing this widget // First, fill with background color - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); TQPainter p(m_pixmap); // Convert image to pixmap and draw it TQPixmap imagePixmap = image.convertToPixmap(); diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index e645b0a..144d34b 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -96,7 +96,7 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent) TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 8, 1, spacingHint()); m_maskPreviewLabel = new TQLabel( gboxSettings ); - m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

You can see here a thumbnail preview of the distortion correction " "applied to a cross pattern.") ); gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index 88e88e5..4cdaffa 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -90,7 +90,7 @@ LensDistortionTool::LensDistortionTool(TQObject* parent) TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1); m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() ); - m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); TQWhatsThis::add( m_maskPreviewLabel, i18n("

You can see here a thumbnail preview of the distortion correction " "applied to a cross pattern.") ); diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index 92de5e5..a6b05b9 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -108,11 +108,11 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), gbox2); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gbox2); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), gbox2); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gbox2); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); gridLayout->addMultiCellWidget(label1, 0, 0, 0, 0); gridLayout->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index 714c748..c6d47f4 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -99,11 +99,11 @@ PerspectiveTool::PerspectiveTool(TQObject* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage()); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage()); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); // ------------------------------------------------------------- diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index e3cf614..02db19d 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -270,7 +270,7 @@ void PerspectiveWidget::updatePixmap(void) // Draw background - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); // if we are resizing with the mouse, compute and draw only if drawWhileMoving is set if (m_currentResizing == ResizingNone || m_drawWhileMoving) @@ -280,7 +280,7 @@ void PerspectiveWidget::updatePixmap(void) Digikam::DImg destImage(m_previewImage.width(), m_previewImage.height(), m_previewImage.sixteenBit(), m_previewImage.hasAlpha()); - Digikam::DColor background(tqcolorGroup().background()); + Digikam::DColor background(colorGroup().background()); m_transformedCenter = buildPerspective(TQPoint(0, 0), TQPoint(m_w, m_h), m_topLeftPoint, m_topRightPoint, diff --git a/digikam/imageplugins/raindrop/raindrop.cpp b/digikam/imageplugins/raindrop/raindrop.cpp index bd466d3..db7c8ce 100644 --- a/digikam/imageplugins/raindrop/raindrop.cpp +++ b/digikam/imageplugins/raindrop/raindrop.cpp @@ -164,7 +164,7 @@ void RainDrop::rainDropsImage(Digikam::DImg *orgImage, Digikam::DImg *destImage, // Randomize. - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index 4472ee8..f241919 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -105,7 +105,7 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent) TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); - typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter); m_restorationTypeCB = new TQComboBox( false, firstPage ); m_restorationTypeCB->insertItem( i18n("None") ); m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") ); diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 0d67922..1d5792b 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -96,7 +96,7 @@ RestorationTool::RestorationTool(TQObject* parent) TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); - typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter); m_restorationTypeCB = new TQComboBox(false, firstPage); m_restorationTypeCB->insertItem( i18n("None") ); m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") ); diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index ecd5849..9d9f6e7 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -101,11 +101,11 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index 95fc3e0..603ea20 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -93,11 +93,11 @@ ShearTool::ShearTool(TQObject* parent) TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage()); m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage()); m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight ); + m_newHeightLabel->setAlignment( AlignBottom | AlignRight ); KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index 5f91115..743491e 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -91,7 +91,7 @@ void SuperImposeWidget::makePixmap(void) SuperImpose superimpose(iface.getOriginalImg(), &m_templateScaled, m_currentSelection); Digikam::DImg image = superimpose.getTargetImage(); - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); TQPainter p(m_pixmap); TQPixmap imagePix = image.convertToPixmap(); p.drawPixmap(m_rect.x(), m_rect.y(), imagePix, 0, 0, m_rect.width(), m_rect.height()); @@ -128,7 +128,7 @@ void SuperImposeWidget::resizeEvent(TQResizeEvent * e) else { m_rect = TQRect(); - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); } blockSignals(false); diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 31bb084..8a4e10d 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -123,7 +123,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) TQGridLayout *grid = new TQGridLayout( tqlayout2, 2, 4, spacingHint()); TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 5f01d8a..069c404 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -119,7 +119,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) TQGridLayout *grid = new TQGridLayout(tqlayout2, 2, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 8ef2329..35754de 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -843,7 +843,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o ut.modtime = buff_src.st_mtime; if ( ::utime( _dst.data(), &ut ) != 0 ) { - kdWarning() << TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1") + kdWarning() << TQString::fromLatin1("Couldn't preserve access and modification time for\n%1") .tqarg( dst.url() ) << endl; } @@ -1124,7 +1124,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) " "VALUES('%1','%2')") .tqarg(escapeString(url.path()), - TQDate::tqcurrentDate().toString(Qt::ISODate)) ); + TQDate::currentDate().toString(Qt::ISODate)) ); if ( permissions != -1 ) { @@ -1336,11 +1336,11 @@ void kio_digikamalbums::createDigikamPropsUDSEntry(KIO::UDSEntry& entry) entry.append( atom ); atom.m_uds = KIO::UDS_MODIFICATION_TIME; - atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t(); + atom.m_long = TQDateTime::currentDateTime().toTime_t(); entry.append( atom ); atom.m_uds = KIO::UDS_ACCESS_TIME; - atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t(); + atom.m_long = TQDateTime::currentDateTime().toTime_t(); entry.append( atom ); atom.m_uds = KIO::UDS_NAME; diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index a23e66a..d4aa058 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -471,8 +471,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, query = " (Images.dirid IN " " (SELECT a.id FROM Albums a, Albums b " " WHERE a.url $$##$$ '%' || b.url || '%' AND b.id = $$@@$$))"; - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(ALBUMNAME): @@ -516,8 +516,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // " (SELECT imageid FROM ImageTags " // " WHERE tagid $$##$$ $$@@$$)) "; - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } @@ -544,8 +544,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, " WHERE TagsTree.pid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) " " OR ImageTags.tagid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) )) "; -// query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) -// + TQString::tqfromLatin1("'")); +// query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) +// + TQString::fromLatin1("'")); break; } @@ -596,57 +596,57 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, case(EQ): { query.replace("$$##$$", "="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(NE): { query.replace("$$##$$", "<>"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LT): { query.replace("$$##$$", "<"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(GT): { query.replace("$$##$$", ">"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LTE): { query.replace("$$##$$", "<="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(GTE): { query.replace("$$##$$", ">="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LIKE): { query.replace("$$##$$", "LIKE"); - query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) - + TQString::tqfromLatin1("%'")); + query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val) + + TQString::fromLatin1("%'")); break; } case(NLIKE): { query.replace("$$##$$", "NOT LIKE"); - query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) - + TQString::tqfromLatin1("%'")); + query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val) + + TQString::fromLatin1("%'")); break; } } @@ -708,7 +708,7 @@ TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const if (ok) { // ok. its an int, does it look like a year? - if (1970 <= num && num <= TQDate::tqcurrentDate().year()) + if (1970 <= num && num <= TQDate::currentDate().year()) { // very sure its a year return TQString("%1-%-%").tqarg(num); diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp index 47e36bf..7eb6aef 100644 --- a/digikam/kioslave/sqlitedb.cpp +++ b/digikam/kioslave/sqlitedb.cpp @@ -98,7 +98,7 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values, << endl; if (errMsg) { - *errMsg = TQString::tqfromLatin1("SQLite database not open"); + *errMsg = TQString::fromLatin1("SQLite database not open"); } return false; } @@ -118,9 +118,9 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values, << sql << endl; if (errMsg) { - *errMsg = TQString::tqfromLatin1("sqlite_compile error: ") + - TQString::tqfromLatin1(sqlite3_errmsg(m_db)) + - TQString::tqfromLatin1(" on query: ") + + *errMsg = TQString::fromLatin1("sqlite_compile error: ") + + TQString::fromLatin1(sqlite3_errmsg(m_db)) + + TQString::fromLatin1(" on query: ") + sql; } return false; @@ -152,9 +152,9 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values, << sql << endl; if (errMsg) { - *errMsg = TQString::tqfromLatin1("sqlite_step error: ") + - TQString::tqfromLatin1(sqlite3_errmsg(m_db)) + - TQString::tqfromLatin1(" on query: ") + + *errMsg = TQString::fromLatin1("sqlite_step error: ") + + TQString::fromLatin1(sqlite3_errmsg(m_db)) + + TQString::fromLatin1(" on query: ") + sql; } return false; diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui index 72db02d..6eaa796 100644 --- a/digikam/libs/dialogs/deletedialogbase.ui +++ b/digikam/libs/dialogs/deletedialogbase.ui @@ -23,7 +23,7 @@ 374 - + 420 320 diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 3754f7a..a3e4721 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -90,8 +90,8 @@ ImageDialogPreview::ImageDialogPreview(TQWidget *parent) TQVBoxLayout *vlay = new TQVBoxLayout(this); d->imageLabel = new TQLabel(this); - d->imageLabel->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); - d->imageLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + d->imageLabel->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + d->imageLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); d->infoLabel = new TQLabel(this); @@ -118,7 +118,7 @@ ImageDialogPreview::~ImageDialogPreview() delete d; } -TQSize ImageDialogPreview::tqsizeHint() const +TQSize ImageDialogPreview::sizeHint() const { return TQSize(256, 256); } diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h index 23d85d5..658caa4 100644 --- a/digikam/libs/dialogs/imagedialog.h +++ b/digikam/libs/dialogs/imagedialog.h @@ -49,7 +49,7 @@ public: ImageDialogPreview(TQWidget *parent=0); ~ImageDialogPreview(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index 7f1ba5d..5a1463d 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -229,7 +229,7 @@ void ImageDlgBase::setPreviewAreaWidget(TQWidget *w) TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - w->tqsetSizePolicy(rightSzPolicy); + w->setSizePolicy(rightSzPolicy); } void ImageDlgBase::setUserAreaWidget(TQWidget *w) diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 5cd94b6..028ccae 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -192,7 +192,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name, d->splitter->setOpaqueResize(false); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - m_imagePreviewWidget->tqsetSizePolicy(rightSzPolicy); + m_imagePreviewWidget->setSizePolicy(rightSzPolicy); TQString sbName(d->name + TQString(" Image Plugin Sidebar")); d->settingsSideBar = new Sidebar(d->hbox, sbName.ascii(), Sidebar::Right); diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp index 2398157..d342b37 100644 --- a/digikam/libs/dmetadata/dmetadata.cpp +++ b/digikam/libs/dmetadata/dmetadata.cpp @@ -453,7 +453,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date, } TQDomElement rootElem = xmlDoc.documentElement(); - if (rootElem.tagName() != TQString::tqfromLatin1("digikamproperties")) + if (rootElem.tagName() != TQString::fromLatin1("digikamproperties")) return false; for (TQDomNode node = rootElem.firstChild(); @@ -461,34 +461,34 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date, { TQDomElement e = node.toElement(); TQString name = e.tagName(); - TQString val = e.attribute(TQString::tqfromLatin1("value")); + TQString val = e.attribute(TQString::fromLatin1("value")); - if (name == TQString::tqfromLatin1("comments")) + if (name == TQString::fromLatin1("comments")) { comments = val; } - else if (name == TQString::tqfromLatin1("date")) + else if (name == TQString::fromLatin1("date")) { if (val.isEmpty()) continue; date = TQDateTime::fromString(val, Qt::ISODate); } - else if (name == TQString::tqfromLatin1("rating")) + else if (name == TQString::fromLatin1("rating")) { if (val.isEmpty()) continue; bool ok=false; rating = val.toInt(&ok); if (!ok) rating = 0; } - else if (name == TQString::tqfromLatin1("tagslist")) + else if (name == TQString::fromLatin1("tagslist")) { for (TQDomNode node2 = e.firstChild(); !node2.isNull(); node2 = node2.nextSibling()) { TQDomElement e2 = node2.toElement(); TQString name2 = e2.tagName(); - TQString val2 = e2.attribute(TQString::tqfromLatin1("path")); + TQString val2 = e2.attribute(TQString::fromLatin1("path")); - if (name2 == TQString::tqfromLatin1("tag")) + if (name2 == TQString::fromLatin1("tag")) { if (val2.isEmpty()) continue; tagsPath.append(val2); @@ -505,32 +505,32 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime { TQDomDocument xmlDoc; - xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"), - TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); + xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"), + TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); - TQDomElement propertiesElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamproperties")); + TQDomElement propertiesElem = xmlDoc.createElement(TQString::fromLatin1("digikamproperties")); xmlDoc.appendChild( propertiesElem ); - TQDomElement c = xmlDoc.createElement(TQString::tqfromLatin1("comments")); - c.setAttribute(TQString::tqfromLatin1("value"), comments); + TQDomElement c = xmlDoc.createElement(TQString::fromLatin1("comments")); + c.setAttribute(TQString::fromLatin1("value"), comments); propertiesElem.appendChild(c); - TQDomElement d = xmlDoc.createElement(TQString::tqfromLatin1("date")); - d.setAttribute(TQString::tqfromLatin1("value"), date.toString(Qt::ISODate)); + TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date")); + d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate)); propertiesElem.appendChild(d); - TQDomElement r = xmlDoc.createElement(TQString::tqfromLatin1("rating")); - r.setAttribute(TQString::tqfromLatin1("value"), rating); + TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating")); + r.setAttribute(TQString::fromLatin1("value"), rating); propertiesElem.appendChild(r); - TQDomElement tagsElem = xmlDoc.createElement(TQString::tqfromLatin1("tagslist")); + TQDomElement tagsElem = xmlDoc.createElement(TQString::fromLatin1("tagslist")); propertiesElem.appendChild(tagsElem); TQStringList path = tagsPath; for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it ) { - TQDomElement e = xmlDoc.createElement(TQString::tqfromLatin1("tag")); - e.setAttribute(TQString::tqfromLatin1("path"), *it); + TQDomElement e = xmlDoc.createElement(TQString::fromLatin1("tag")); + e.setAttribute(TQString::fromLatin1("path"), *it); tagsElem.appendChild(e); } diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h index 008f22a..3589f7a 100644 --- a/digikam/libs/greycstoration/CImg.h +++ b/digikam/libs/greycstoration/CImg.h @@ -9393,8 +9393,8 @@ namespace cimg_library { return assign(width,height,title,normalization,!is_fullscreen,false); } - static OStqStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) { - OStqStatus result = eventNotHandledErr; + static OSStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) { + OSStatus result = eventNotHandledErr; CImgDisplay* disp = (CImgDisplay*) userData; (void)myHandler; // Avoid "unused parameter" cimg::CarbonInfo& c = cimg::CarbonAttr(); @@ -9605,7 +9605,7 @@ namespace cimg_library { MPSignalSemaphore(c.sync_event); // Notify the caller that all goes fine EventRef theEvent; EventTargetRef theTarget; - OStqStatus err; + OSStatus err; CbSerializedQuery* query; theTarget = GetEventDispatcherTarget(); @@ -9617,7 +9617,7 @@ namespace cimg_library { SendEventToEventTarget (theEvent, theTarget); ReleaseEvent(theEvent); } else if (err == eventLoopTimedOutErr) { // There is no event to process, so check if there is new messages to process - OStqStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond); + OSStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond); if (r!=noErr) continue; //nothing in the queue or an error.., bye // If we're here, we've something to do now. if (query) { diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index dd71c64..52891cd 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -170,7 +170,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) d->settingsArea = new TQFrame(sv->viewport()); d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); + d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); sv->addChild(d->settingsArea); m_navigateBarLayout->addWidget(sv); @@ -227,7 +227,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea); int hgt = fontMetrics().height()-2; - d->title->tqsetAlignment(TQt::AlignCenter); + d->title->setAlignment(TQt::AlignCenter); d->file->setMaximumHeight(hgt); d->folder->setMaximumHeight(hgt); d->date->setMaximumHeight(hgt); @@ -249,7 +249,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar) d->labelNewFileName->setMaximumHeight(hgt); d->labelAlreadyDownloaded->setMaximumHeight(hgt); - d->title2->tqsetAlignment(TQt::AlignCenter); + d->title2->setAlignment(TQt::AlignCenter); d->make->setMaximumHeight(hgt); d->model->setMaximumHeight(hgt); d->photoDate->setMaximumHeight(hgt); diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index ff1f594..32c24e8 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -688,7 +688,7 @@ void ImageDescEditTab::slotItemStateChanged(TAlbumCheckListItem *item) d->hub.setTag(item->album(), item->isOn()); d->tagsView->blockSignals(true); - item->settqStatus(d->hub.tagtqStatus(item->album())); + item->setStatus(d->hub.tagStatus(item->album())); d->tagsView->blockSignals(false); slotModified(); @@ -703,14 +703,14 @@ void ImageDescEditTab::slotCommentChanged() return; d->hub.setComment(d->commentsEdit->text()); - setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit); + setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit); slotModified(); } void ImageDescEditTab::slotDateTimeChanged(const TQDateTime& dateTime) { d->hub.setDateTime(dateTime); - setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit); + setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit); slotModified(); } @@ -743,7 +743,7 @@ void ImageDescEditTab::updateTagsView() { TAlbumCheckListItem* tItem = dynamic_cast(it.current()); if (tItem) - tItem->settqStatus(d->hub.tagtqStatus(tItem->album())); + tItem->setStatus(d->hub.tagStatus(tItem->album())); ++it; } @@ -759,14 +759,14 @@ void ImageDescEditTab::updateComments() { d->commentsEdit->blockSignals(true); d->commentsEdit->setText(d->hub.comment()); - setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit); + setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit); d->commentsEdit->blockSignals(false); } void ImageDescEditTab::updateRating() { d->ratingWidget->blockSignals(true); - if (d->hub.ratingtqStatus() == MetadataHub::MetadataDisjoint) + if (d->hub.ratingStatus() == MetadataHub::MetadataDisjoint) d->ratingWidget->setRating(0); else d->ratingWidget->setRating(d->hub.rating()); @@ -777,11 +777,11 @@ void ImageDescEditTab::updateDate() { d->dateTimeEdit->blockSignals(true); d->dateTimeEdit->setDateTime(d->hub.dateTime()); - setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit); + setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit); d->dateTimeEdit->blockSignals(false); } -void ImageDescEditTab::setMetadataWidgettqStatus(int status, TQWidget *widget) +void ImageDescEditTab::setMetadataWidgetStatus(int status, TQWidget *widget) { if (status == MetadataHub::MetadataDisjoint) { @@ -1646,7 +1646,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) { if (t) { - MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album()); + MetadataHub::TagStatus status = d->hub.tagStatus(item->album()); bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag) || status == MetadataHub::MetadataDisjoint; item->setVisible(tagAssigned); @@ -1686,7 +1686,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) if (!tag->isRoot()) { // only if the current item is not marked as tagged, check all tqchildren - MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album()); + MetadataHub::TagStatus status = d->hub.tagStatus(item->album()); bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag) || status == MetadataHub::MetadataDisjoint; if (!tagAssigned) @@ -1698,9 +1698,9 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) while (*tmpIt != nextSibling ) { TAlbumCheckListItem* tmpItem = dynamic_cast(tmpIt.current()); - MetadataHub::TagtqStatus tmptqStatus = d->hub.tagtqStatus(tmpItem->album()); - bool tmpTagAssigned = (tmptqStatus == MetadataHub::MetadataAvailable && tmptqStatus.hasTag) - || tmptqStatus == MetadataHub::MetadataDisjoint; + MetadataHub::TagStatus tmpStatus = d->hub.tagStatus(tmpItem->album()); + bool tmpTagAssigned = (tmpStatus == MetadataHub::MetadataAvailable && tmpStatus.hasTag) + || tmpStatus == MetadataHub::MetadataDisjoint; if(tmpTagAssigned) { somethingIsSet = true; diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h index 30f8722..5db5132 100644 --- a/digikam/libs/imageproperties/imagedescedittab.h +++ b/digikam/libs/imageproperties/imagedescedittab.h @@ -93,7 +93,7 @@ private: void setTagThumbnail(TAlbum *album); bool singleSelection() const; - void setMetadataWidgettqStatus(int status, TQWidget *widget); + void setMetadataWidgetStatus(int status, TQWidget *widget); void reloadForMetadataChange(TQ_LLONG imageId); private slots: diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 4fe50c3..7454681 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -165,7 +165,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar sv->addChild(histogramPage); TQLabel *label1 = new TQLabel(i18n("Channel:"), histogramPage); - label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); d->channelCB = new TQComboBox( false, histogramPage ); d->channelCB->insertItem( i18n("Luminosity") ); d->channelCB->insertItem( i18n("Red") ); @@ -210,7 +210,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar logHistoButton->setToggleButton(true); TQLabel *label10 = new TQLabel(i18n("Colors:"), histogramPage); - label10->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + label10->setAlignment ( TQt::AlignRight | TQt::AlignVCenter ); d->colorsCB = new TQComboBox( false, histogramPage ); d->colorsCB->insertItem( i18n("Red") ); d->colorsCB->insertItem( i18n("Green") ); @@ -262,7 +262,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar TQHBoxLayout *hlay2 = new TQHBoxLayout(KDialog::spacingHint()); TQLabel *label3 = new TQLabel(i18n("Range:"), histogramPage); - label3->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label3->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->minInterv = new TQSpinBox(0, 255, 1, histogramPage); d->minInterv->setValue(0); TQWhatsThis::add(d->minInterv, i18n("

Select the minimal intensity " @@ -283,44 +283,44 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar "channels.")); TQLabel *label5 = new TQLabel(i18n("Pixels:"), gbox); - label5->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label5->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelPixelsValue = new TQLabel(gbox); - d->labelPixelsValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelPixelsValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label7 = new TQLabel(i18n("Count:"), gbox); - label7->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label7->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelCountValue = new TQLabel(gbox); - d->labelCountValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelCountValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label4 = new TQLabel(i18n("Mean:"), gbox); - label4->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label4->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelMeanValue = new TQLabel(gbox); - d->labelMeanValue->tqsetAlignment (TQt::AlignRight | TQt::AlignVCenter); + d->labelMeanValue->setAlignment (TQt::AlignRight | TQt::AlignVCenter); TQLabel *label6 = new TQLabel(i18n("Std. deviation:"), gbox); - label6->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label6->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelStdDevValue = new TQLabel(gbox); - d->labelStdDevValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelStdDevValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label8 = new TQLabel(i18n("Median:"), gbox); - label8->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label8->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelMedianValue = new TQLabel(gbox); - d->labelMedianValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelMedianValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label9 = new TQLabel(i18n("Percentile:"), gbox); - label9->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label9->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelPercentileValue = new TQLabel(gbox); - d->labelPercentileValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelPercentileValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label11 = new TQLabel(i18n("Color depth:"), gbox); - label11->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label11->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelColorDepth = new TQLabel(gbox); - d->labelColorDepth->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelColorDepth->setAlignment(TQt::AlignRight | TQt::AlignVCenter); TQLabel *label12 = new TQLabel(i18n("Alpha Channel:"), gbox); - label12->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + label12->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->labelAlphaChannel = new TQLabel(gbox); - d->labelAlphaChannel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + d->labelAlphaChannel->setAlignment(TQt::AlignRight | TQt::AlignVCenter); topLayout->addMultiCellWidget(label1, 1, 1, 0, 0); topLayout->addMultiCellWidget(d->channelCB, 1, 1, 1, 1); diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 0d4b3ac..f2f6350 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -183,7 +183,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->settingsArea = new TQFrame(sv->viewport()); d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); + d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); sv->addChild(d->settingsArea); m_navigateBarLayout->addWidget(sv); @@ -248,7 +248,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea); int hgt = fontMetrics().height()-2; - d->title->tqsetAlignment(TQt::AlignCenter); + d->title->setAlignment(TQt::AlignCenter); d->file->setMaximumHeight(hgt); d->folder->setMaximumHeight(hgt); d->modifiedDate->setMaximumHeight(hgt); @@ -262,7 +262,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->labelFileOwner->setMaximumHeight(hgt); d->labelFilePermissions->setMaximumHeight(hgt); - d->title2->tqsetAlignment(TQt::AlignCenter); + d->title2->setAlignment(TQt::AlignCenter); d->mime->setMaximumHeight(hgt); d->dimensions->setMaximumHeight(hgt); d->compression->setMaximumHeight(hgt); @@ -274,7 +274,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar) d->labelImageBitDepth->setMaximumHeight(hgt); d->labelImageColorMode->setMaximumHeight(hgt); - d->title3->tqsetAlignment(TQt::AlignCenter); + d->title3->setAlignment(TQt::AlignCenter); d->make->setMaximumHeight(hgt); d->model->setMaximumHeight(hgt); d->photoDate->setMaximumHeight(hgt); diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp index 92e975b..87540cd 100644 --- a/digikam/libs/imageproperties/navigatebartab.cpp +++ b/digikam/libs/imageproperties/navigatebartab.cpp @@ -93,7 +93,7 @@ void NavigateBarTab::setupNavigateBar(bool withBar) this, TQT_SIGNAL(signalLastItem())); d->label = new TQLabel(d->stack); - d->label->tqsetAlignment(TQt::AlignCenter); + d->label->setAlignment(TQt::AlignCenter); d->stack->addWidget(d->label); } } diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 6798b19..fef2644 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -151,7 +151,7 @@ int TAlbumCheckListItem::count() return m_count; } -void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status) +void TAlbumCheckListItem::setStatus(MetadataHub::TagStatus status) { if (status == MetadataHub::MetadataDisjoint) { @@ -253,7 +253,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e) if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h index 94b1186..aeba1d0 100644 --- a/digikam/libs/imageproperties/talbumlistview.h +++ b/digikam/libs/imageproperties/talbumlistview.h @@ -47,7 +47,7 @@ public: TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album); - void settqStatus(MetadataHub::TagtqStatus status); + void setStatus(MetadataHub::TagStatus status); void refresh(); void setOpen(bool o); TAlbum* album() const; diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp index 5d2f78d..b83825f 100644 --- a/digikam/libs/jpegutils/jpegutils.cpp +++ b/digikam/libs/jpegutils/jpegutils.cpp @@ -105,7 +105,7 @@ static void jpegutils_jpeg_output_message(j_common_ptr cinfo) #endif } -bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize) +bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize) { TQString format = TQImageIO::imageFormat(path); if (format !="JPEG") return false; @@ -138,7 +138,7 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize) // libjpeg supports 1/1, 1/2, 1/4, 1/8 int scale=1; - while(tqmaximumSize*scale*2<=imgSize) + while(maximumSize*scale*2<=imgSize) { scale*=2; } @@ -229,8 +229,8 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize) } int newMax = TQMAX(cinfo.output_width, cinfo.output_height); - int newx = tqmaximumSize*cinfo.output_width / newMax; - int newy = tqmaximumSize*cinfo.output_height / newMax; + int newx = maximumSize*cinfo.output_width / newMax; + int newy = maximumSize*cinfo.output_height / newMax; jpeg_destroy_decompress(&cinfo); fclose(inputFile); diff --git a/digikam/libs/jpegutils/jpegutils.h b/digikam/libs/jpegutils/jpegutils.h index db6b50b..ad38477 100644 --- a/digikam/libs/jpegutils/jpegutils.h +++ b/digikam/libs/jpegutils/jpegutils.h @@ -33,7 +33,7 @@ namespace Digikam { -bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize); +bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize); bool exifRotate(const TQString& file, const TQString& documentName); bool jpegConvert(const TQString& src, const TQString& dest, const TQString& documentName, const TQString& format=TQString("PNG")); diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp index 8e3b277..696d2c7 100644 --- a/digikam/libs/lprof/cmslnr.cpp +++ b/digikam/libs/lprof/cmslnr.cpp @@ -191,7 +191,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) LCMSHANDLE h; double ChiSq, OldChiSq; int i; - BOOL tqStatus = true; + BOOL Status = true; /* initial guesses */ @@ -213,7 +213,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) for(i = 0; i < LEVENBERG_MARTQUARDT_ITERATE_MAX; i++) { if (!cmsxLevenbergMarquardtIterate(h)) { - tqStatus = false; + Status = false; break; } @@ -227,7 +227,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) cmsxLevenbergMarquardtFree(h); - return tqStatus; + return Status; } /* Tries to fit gamma as per IEC 61966-2.1 using Levenberg-Marquardt method */ diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index 8ea0adb..9797079 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -325,7 +325,7 @@ void ThemeEngine::changePalette() plt.setDisabled(cg); } - kapp->tqsetPalette(plt, true); + kapp->setPalette(plt, true); } Theme* ThemeEngine::getCurrentTheme() const @@ -414,7 +414,7 @@ bool ThemeEngine::loadTheme() } TQDomElement rootElem = xmlDoc.documentElement(); - if (rootElem.tagName() != TQString::tqfromLatin1("digikamtheme")) + if (rootElem.tagName() != TQString::fromLatin1("digikamtheme")) return false; TQString resource; @@ -678,7 +678,7 @@ TQString ThemeEngine::resourceValue(const TQDomElement &rootElem, const TQString { TQDomElement e = node.toElement(); TQString name = e.tagName(); - TQString val = e.attribute(TQString::tqfromLatin1("value")); + TQString val = e.attribute(TQString::fromLatin1("value")); if (key == name) { @@ -711,8 +711,8 @@ bool ThemeEngine::saveTheme() // header ------------------------------------------------------------------ - xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::tqfromLatin1("xml"), - TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\""))); + xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::fromLatin1("xml"), + TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\""))); TQString banner = TQString("\n/* ============================================================" "\n *" @@ -736,52 +736,52 @@ bool ThemeEngine::saveTheme() "\n * GNU General Public License for more details." "\n *" "\n * ============================================================ */\n") - .tqarg(TQDate::tqcurrentDate().year()) - .tqarg(TQDate::tqcurrentDate().month()) - .tqarg(TQDate::tqcurrentDate().day()) + .tqarg(TQDate::currentDate().year()) + .tqarg(TQDate::currentDate().month()) + .tqarg(TQDate::currentDate().day()) .tqarg(fi.fileName()) - .tqarg(TQDate::tqcurrentDate().year()) + .tqarg(TQDate::currentDate().year()) .tqarg(user.fullName()); xmlDoc.appendChild(xmlDoc.createComment(banner)); - TQDomElement themeElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamtheme")); + TQDomElement themeElem = xmlDoc.createElement(TQString::fromLatin1("digikamtheme")); xmlDoc.appendChild(themeElem); // base props -------------------------------------------------------------- - e = xmlDoc.createElement(TQString::tqfromLatin1("name")); - e.setAttribute(TQString::tqfromLatin1("value"), fi.fileName()); + e = xmlDoc.createElement(TQString::fromLatin1("name")); + e.setAttribute(TQString::fromLatin1("value"), fi.fileName()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("BaseColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->baseColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("BaseColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->baseColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("TextRegularColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textRegColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("TextRegularColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->textRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("TextSelectedColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSelColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("TextSelectedColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialRegularColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialRegularColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialSelectedColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialSelectedColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper()); themeElem.appendChild(e); // banner props ------------------------------------------------------------ - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("BannerColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColorTo")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColorTo.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("BannerColorTo")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColorTo.name()).upper()); themeElem.appendChild(e); switch(t->bannerBevel) @@ -803,8 +803,8 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBevel")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("BannerBevel")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); switch(t->bannerGrad) @@ -831,26 +831,26 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerGradient")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("BannerGradient")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorder")); - e.setAttribute(TQString::tqfromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::fromLatin1("BannerBorder")); + e.setAttribute(TQString::fromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorderColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerBorderColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("BannerBorderColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerBorderColor.name()).upper()); themeElem.appendChild(e); // thumbnail.regular props ------------------------------------------------- - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColorTo")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColorTo")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper()); themeElem.appendChild(e); switch(t->thumbRegBevel) @@ -872,8 +872,8 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBevel")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBevel")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); switch(t->thumbRegGrad) @@ -900,26 +900,26 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularGradient")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularGradient")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorder")); - e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorder")); + e.setAttribute(TQString::fromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorderColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorderColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper()); themeElem.appendChild(e); // thumbnail.selected props ------------------------------------------------- - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColorTo")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColorTo")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper()); themeElem.appendChild(e); switch(t->thumbSelBevel) @@ -941,8 +941,8 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBevel")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBevel")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); switch(t->thumbSelGrad) @@ -969,26 +969,26 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedGradient")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedGradient")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorder")); - e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorder")); + e.setAttribute(TQString::fromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorderColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorderColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper()); themeElem.appendChild(e); // listview.regular props ------------------------------------------------- - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColorTo")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColorTo.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColorTo")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColorTo.name()).upper()); themeElem.appendChild(e); switch(t->listRegBevel) @@ -1010,8 +1010,8 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBevel")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBevel")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); switch(t->listRegGrad) @@ -1038,26 +1038,26 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularGradient")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularGradient")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorder")); - e.setAttribute(TQString::tqfromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorder")); + e.setAttribute(TQString::fromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorderColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegBorderColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorderColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegBorderColor.name()).upper()); themeElem.appendChild(e); // listview.selected props ------------------------------------------------- - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColorTo")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColorTo.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColorTo")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColorTo.name()).upper()); themeElem.appendChild(e); switch(t->listSelBevel) @@ -1079,8 +1079,8 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBevel")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBevel")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); switch(t->listSelGrad) @@ -1107,16 +1107,16 @@ bool ThemeEngine::saveTheme() } }; - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedGradient")); - e.setAttribute(TQString::tqfromLatin1("value"), val); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedGradient")); + e.setAttribute(TQString::fromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorder")); - e.setAttribute(TQString::tqfromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorder")); + e.setAttribute(TQString::fromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorderColor")); - e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelBorderColor.name()).upper()); + e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorderColor")); + e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelBorderColor.name()).upper()); themeElem.appendChild(e); // ------------------------------------------------------------------------- diff --git a/digikam/libs/threadimageio/loadsavetask.cpp b/digikam/libs/threadimageio/loadsavetask.cpp index 698f75b..585c4d9 100644 --- a/digikam/libs/threadimageio/loadsavetask.cpp +++ b/digikam/libs/threadimageio/loadsavetask.cpp @@ -78,7 +78,7 @@ void SavedEvent::notify(LoadSaveThread *thread) void LoadingTask::execute() { - if (m_loadingTasktqStatus == LoadingTaskStatusStopping) + if (m_loadingTaskStatus == LoadingTaskStatusStopping) return; DImg img(m_loadingDescription.filePath, this, m_loadingDescription.rawDecodingSettings); m_thread->taskHasFinished(); @@ -92,7 +92,7 @@ LoadingTask::TaskType LoadingTask::type() void LoadingTask::progressInfo(const DImg *, float progress) { - if (m_loadingTasktqStatus == LoadingTaskStatusLoading) + if (m_loadingTaskStatus == LoadingTaskStatusLoading) { if (m_thread->querySendNotifyEvent()) TQApplication::postEvent(m_thread, new LoadingProgressEvent(m_loadingDescription.filePath, progress)); @@ -101,12 +101,12 @@ void LoadingTask::progressInfo(const DImg *, float progress) bool LoadingTask::continueQuery(const DImg *) { - return m_loadingTasktqStatus != LoadingTaskStatusStopping; + return m_loadingTaskStatus != LoadingTaskStatusStopping; } -void LoadingTask::settqStatus(LoadingTasktqStatus status) +void LoadingTask::setStatus(LoadingTaskStatus status) { - m_loadingTasktqStatus = status; + m_loadingTaskStatus = status; } @@ -123,7 +123,7 @@ bool LoadingTask::isShuttingDown() void SharedLoadingTask::execute() { - if (m_loadingTasktqStatus == LoadingTaskStatusStopping) + if (m_loadingTaskStatus == LoadingTaskStatusStopping) return; // send StartedLoadingEvent from each single Task, not via LoadingProcess list TQApplication::postEvent(m_thread, new StartedLoadingEvent(m_loadingDescription.filePath)); @@ -168,13 +168,13 @@ void SharedLoadingTask::execute() // has finished. m_usedProcess->addListener(this); // break loop when either the loading has completed, or this task is being stopped - while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping ) + while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping ) lock.timedWait(); // remove listener from process m_usedProcess->removeListener(this); // wake up the process which is waiting until all listeners have removed themselves lock.wakeAll(); - // set to 0, as checked in settqStatus + // set to 0, as checked in setStatus m_usedProcess = 0; //DDebug() << "SharedLoadingTask " << this << ": waited" << endl; return; @@ -186,7 +186,7 @@ void SharedLoadingTask::execute() cache->addLoadingProcess(this); // Add this to the list of listeners addListener(this); - // for use in settqStatus + // for use in setStatus m_usedProcess = this; // Notify other processes that we are now loading this image. // They might be interested - see notifyNewLoadingProcess below @@ -284,14 +284,14 @@ void SharedLoadingTask::execute() // wait until all listeners have removed themselves while (m_listeners.count() != 0) lock.timedWait(); - // set to 0, as checked in settqStatus + // set to 0, as checked in setStatus m_usedProcess = 0; } } void SharedLoadingTask::progressInfo(const DImg *, float progress) { - if (m_loadingTasktqStatus == LoadingTaskStatusLoading) + if (m_loadingTaskStatus == LoadingTaskStatusLoading) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); @@ -308,13 +308,13 @@ bool SharedLoadingTask::continueQuery(const DImg *) { // If this is called, the thread is currently loading an image. // In shared loading, we cannot stop until all listeners have been removed as well - return (m_loadingTasktqStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0); + return (m_loadingTaskStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0); } -void SharedLoadingTask::settqStatus(LoadingTasktqStatus status) +void SharedLoadingTask::setStatus(LoadingTaskStatus status) { - m_loadingTasktqStatus = status; - if (m_loadingTasktqStatus == LoadingTaskStatusStopping) + m_loadingTaskStatus = status; + if (m_loadingTaskStatus == LoadingTaskStatusStopping) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); @@ -413,12 +413,12 @@ void SavingTask::progressInfo(const DImg *, float progress) bool SavingTask::continueQuery(const DImg *) { - return m_savingTasktqStatus != SavingTaskStatusStopping; + return m_savingTaskStatus != SavingTaskStatusStopping; } -void SavingTask::settqStatus(SavingTasktqStatus status) +void SavingTask::setStatus(SavingTaskStatus status) { - m_savingTasktqStatus = status; + m_savingTaskStatus = status; } } //namespace Digikam diff --git a/digikam/libs/threadimageio/loadsavetask.h b/digikam/libs/threadimageio/loadsavetask.h index 13b2df2..833f86f 100644 --- a/digikam/libs/threadimageio/loadsavetask.h +++ b/digikam/libs/threadimageio/loadsavetask.h @@ -208,7 +208,7 @@ class LoadingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum LoadingTasktqStatus + enum LoadingTaskStatus { LoadingTaskStatusLoading, LoadingTaskStatusPreloading, @@ -216,8 +216,8 @@ public: }; LoadingTask(LoadSaveThread* thread, LoadingDescription description, - LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) - : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTasktqStatus(loadingTasktqStatus) + LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) + : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTaskStatus(loadingTaskStatus) {} // LoadSaveTask @@ -231,11 +231,11 @@ public: virtual bool continueQuery(const DImg *); virtual bool isShuttingDown(); - virtual void settqStatus(LoadingTasktqStatus status); + virtual void setStatus(LoadingTaskStatus status); - LoadingTasktqStatus status() const + LoadingTaskStatus status() const { - return m_loadingTasktqStatus; + return m_loadingTaskStatus; } TQString filePath() const @@ -251,7 +251,7 @@ public: protected: LoadingDescription m_loadingDescription; - LoadingTasktqStatus m_loadingTasktqStatus; + LoadingTaskStatus m_loadingTaskStatus; }; //--------------------------------------------------------------------------------------------------- @@ -262,15 +262,15 @@ public: SharedLoadingTask(LoadSaveThread* thread, LoadingDescription description, LoadSaveThread::AccessMode mode = LoadSaveThread::AccessModeReadWrite, - LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) - : LoadingTask(thread, description, loadingTasktqStatus), + LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) + : LoadingTask(thread, description, loadingTaskStatus), m_accessMode(mode), m_completed(false), m_usedProcess(0) {} virtual void execute(); virtual void progressInfo(const DImg *, float progress); virtual bool continueQuery(const DImg *); - virtual void settqStatus(LoadingTasktqStatus status); + virtual void setStatus(LoadingTaskStatus status); // LoadingProcess @@ -319,7 +319,7 @@ class SavingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum SavingTasktqStatus + enum SavingTaskStatus { SavingTaskStatusSaving, SavingTaskStatusStopping @@ -335,11 +335,11 @@ public: virtual void progressInfo(const DImg *, float progress); virtual bool continueQuery(const DImg *); - virtual void settqStatus(SavingTasktqStatus status); + virtual void setStatus(SavingTaskStatus status); - SavingTasktqStatus status() const + SavingTaskStatus status() const { - return m_savingTasktqStatus; + return m_savingTaskStatus; } TQString filePath() const @@ -352,7 +352,7 @@ private: DImg m_img; TQString m_filePath; TQString m_format; - SavingTasktqStatus m_savingTasktqStatus; + SavingTaskStatus m_savingTaskStatus; }; } // namespace Digikam diff --git a/digikam/libs/threadimageio/managedloadsavethread.cpp b/digikam/libs/threadimageio/managedloadsavethread.cpp index 0f6768b..51d9f1b 100644 --- a/digikam/libs/threadimageio/managedloadsavethread.cpp +++ b/digikam/libs/threadimageio/managedloadsavethread.cpp @@ -46,7 +46,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread() { TQMutexLocker lock(&m_mutex); if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterAll); break; } @@ -54,7 +54,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread() { TQMutexLocker lock(&m_mutex); if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterPreloading); break; } @@ -125,13 +125,13 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa // reuse task if it exists if (existingTask) { - existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); } // stop current task if (m_currentTask && m_currentTask != existingTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); } //DDebug() << "LoadingPolicyFirstRemovePrevious, Existing task " << existingTask << //", m_currentTask " << m_currentTask << ", loadingTask " << loadingTask << endl; @@ -153,14 +153,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa case LoadingPolicyPrepend: if (existingTask) { - existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); } // stop and postpone current task if it is a preloading task if (m_currentTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) { - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } } @@ -173,14 +173,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa case LoadingPolicyAppend: if (existingTask) { - existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); } // stop and postpone current task if it is a preloading task if (m_currentTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) { - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } } @@ -222,13 +222,13 @@ void ManagedLoadSaveThread::loadPreview(LoadingDescription description) // reuse task if it exists if (existingTask) { - existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); } // stop current task if (m_currentTask && m_currentTask != existingTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); } // remove all loading tasks for (LoadSaveTask *task = m_todo.first(); task; task = m_todo.next()) @@ -289,7 +289,7 @@ void ManagedLoadSaveThread::stopSaving(const TQString& filePath) SavingTask *savingTask = (SavingTask *)m_currentTask; if (filePath.isNull() || savingTask->filePath() == filePath) { - savingTask->settqStatus(SavingTask::SavingTaskStatusStopping); + savingTask->setStatus(SavingTask::SavingTaskStatusStopping); } } @@ -318,7 +318,7 @@ void ManagedLoadSaveThread::removeLoadingTasks(const LoadingDescription &descrip { if (description.filePath.isNull() || loadingTask->loadingDescription() == description) { - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); } } @@ -344,7 +344,7 @@ void ManagedLoadSaveThread::save(DImg &image, const TQString& filePath, const TQ // stop and postpone current task if it is a preloading task if (m_currentTask && (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading))) { - loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } // append new loading task, put it in front of preloading tasks diff --git a/digikam/libs/threadimageio/previewtask.cpp b/digikam/libs/threadimageio/previewtask.cpp index 5c1d394..b0cc3c5 100644 --- a/digikam/libs/threadimageio/previewtask.cpp +++ b/digikam/libs/threadimageio/previewtask.cpp @@ -50,7 +50,7 @@ namespace Digikam void PreviewLoadingTask::execute() { - if (m_loadingTasktqStatus == LoadingTaskStatusStopping) + if (m_loadingTaskStatus == LoadingTaskStatusStopping) return; LoadingCache *cache = LoadingCache::cache(); @@ -106,13 +106,13 @@ void PreviewLoadingTask::execute() // has finished. m_usedProcess->addListener(this); // break loop when either the loading has completed, or this task is being stopped - while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping ) + while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping ) lock.timedWait(); // remove listener from process m_usedProcess->removeListener(this); // wake up the process which is waiting until all listeners have removed themselves lock.wakeAll(); - // set to 0, as checked in settqStatus + // set to 0, as checked in setStatus m_usedProcess = 0; return; } @@ -123,7 +123,7 @@ void PreviewLoadingTask::execute() cache->addLoadingProcess(this); // Add this to the list of listeners addListener(this); - // for use in settqStatus + // for use in setStatus m_usedProcess = this; // Notify other processes that we are now loading this image. // They might be interested - see notifyNewLoadingProcess below @@ -228,7 +228,7 @@ void PreviewLoadingTask::execute() // wait until all listeners have removed themselves while (m_listeners.count() != 0) lock.timedWait(); - // set to 0, as checked in settqStatus + // set to 0, as checked in setStatus m_usedProcess = 0; } } diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 091c055..9559d0f 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -206,13 +206,13 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e) if (d->orientation ==Qt::Vertical) { - d->tileSize = width() - 2*d->margin - verticalScrollBar()->tqsizeHint().width(); + d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width(); verticalScrollBar()->setLineStep(d->tileSize); verticalScrollBar()->setPageStep(2*d->tileSize); } else { - d->tileSize = height() - 2*d->margin - horizontalScrollBar()->tqsizeHint().height(); + d->tileSize = height() - 2*d->margin - horizontalScrollBar()->sizeHint().height(); horizontalScrollBar()->setLineStep(d->tileSize); horizontalScrollBar()->setPageStep(2*d->tileSize); } @@ -480,7 +480,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) x2 = ((x1 + er.width())/ts +1)*ts; } - bgPix.fill(tqcolorGroup().background()); + bgPix.fill(colorGroup().background()); for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) { @@ -489,9 +489,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) if (y1 <= item->d->pos && item->d->pos <= y2) { if (item == d->currItem) - tile.fill(tqcolorGroup().highlight()); + tile.fill(colorGroup().highlight()); else - tile.fill(tqcolorGroup().background()); + tile.fill(colorGroup().background()); TQPainter p(&tile); p.setPen(TQt::white); @@ -516,9 +516,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) if (x1 <= item->d->pos && item->d->pos <= x2) { if (item == d->currItem) - tile.fill(tqcolorGroup().highlight()); + tile.fill(colorGroup().highlight()); else - tile.fill(tqcolorGroup().background()); + tile.fill(colorGroup().background()); TQPainter p(&tile); p.setPen(TQt::white); diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index d464116..ac70ee3 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -148,7 +148,7 @@ void CurvesWidget::setup(int w, int h, bool readOnly) m_imageHistogram = 0; setMouseTracking(true); - setPaletteBackgroundColor(tqcolorGroup().background()); + setPaletteBackgroundColor(colorGroup().background()); setMinimumSize(w, h); d->blinkTimer = new TQTimer( this ); diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index fc82060..2e3ae53 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -103,7 +103,7 @@ DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent) setPalette(TQToolTip::palette()); setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); - tqsetAlignment(AlignAuto | AlignTop); + setAlignment(AlignAuto | AlignTop); } } // namespace Digikam diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index de82a75..5d0e400 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -62,7 +62,7 @@ int DLogoAction::plug(TQWidget *widget, int index) KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar); pixmapLogo->setMargin(0); pixmapLogo->setScaledContents(false); - pixmapLogo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 10bcef0..04b0a5a 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -84,7 +84,7 @@ int DPopupMenu::sidePixmapWidth() const TQRect DPopupMenu::sideImageRect() const { - return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(), + return TQStyle::visualRect(TQRect(frameWidth(), frameWidth(), s_dpopupmenu_sidePixmap.width(), height() - 2*frameWidth()), this); @@ -153,7 +153,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e) { KPopupMenu::resizeEvent(e); - setFrameRect(TQStyle::tqvisualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0, + setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0, width() - s_dpopupmenu_sidePixmap.width(), height()), this ) ); } @@ -161,7 +161,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e) //Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough. void DPopupMenu::resize(int width, int height) { - width = kMax(width, tqmaximumSize().width()); + width = kMax(width, maximumSize().width()); KPopupMenu::resize(width, height); } @@ -190,7 +190,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e) tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p, TQRect(0, 0, width(), height()), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0)); } diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index 7f7fcc3..cd917f6 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -192,7 +192,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone) void PanIconWidget::updatePixmap() { // Drawing background and image. - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0); TQPainter p(m_pixmap); diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index e7f9e73..30c0c7b 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -172,7 +172,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString kcom->setOrder(KCompletion::Sorted); d->searchEdit->setCompletionObject(kcom, true); d->searchEdit->setAutoDeleteCompletionObject(true); - d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + d->searchEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); hlay->setSpacing(0); hlay->setMargin(0); diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 8294d97..05ae620 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -93,7 +93,7 @@ void SplashScreen::setColor(const TQColor& color) { d->color = color; } -void SplashScreen::tqsetAlignment(int tqalignment) +void SplashScreen::setAlignment(int tqalignment) { d->tqalignment = tqalignment; } diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index 9845c81..294b360 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -52,7 +52,7 @@ public: SplashScreen(const TQString& splash, WFlags f=0); virtual ~SplashScreen(); - void tqsetAlignment(int tqalignment); + void setAlignment(int tqalignment); void setColor(const TQColor& color); protected: diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 470f40f..ab8163d 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -89,7 +89,7 @@ SqueezedComboBox::~SqueezedComboBox() delete d; } -TQSize SqueezedComboBox::tqsizeHint() const +TQSize SqueezedComboBox::sizeHint() const { constPolish(); TQFontMetrics fm = fontMetrics(); @@ -188,7 +188,7 @@ void SqueezedComboBoxTip::maybeTip(const TQPoint &pos) TQListBoxItem* selectedItem = listBox->itemAt( pos ); if (selectedItem) { - TQRect positionToolTip = listBox->tqitemRect(selectedItem); + TQRect positionToolTip = listBox->itemRect(selectedItem); TQString toolTipText = m_originalWidget->itemHighlighted(); if (!toolTipText.isNull()) tip(positionToolTip, toolTipText); diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index d85b81d..87bd691 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -100,9 +100,9 @@ public: TQString itemHighlighted(); /** - * Sets the tqsizeHint() of this widget. + * Sets the sizeHint() of this widget. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 52d33b3..31bcbd5 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -86,7 +86,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) setProgressTotalSteps(100); d->cancelButton = new TQPushButton(d->progressWidget); d->cancelButton->setFocusPolicy(TQ_NoFocus); - d->cancelButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelButton->setPixmap(SmallIcon("cancel")); // Parent widget will probably have the wait cursor set. @@ -115,9 +115,9 @@ void StatusProgressBar::setText(const TQString& text) d->textLabel->setText(text); } -void StatusProgressBar::tqsetAlignment(int a) +void StatusProgressBar::setAlignment(int a) { - d->textLabel->tqsetAlignment(a); + d->textLabel->setAlignment(a); } int StatusProgressBar::progressValue() diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index f4292bb..0b0866b 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -58,7 +58,7 @@ public: StatusProgressBar(TQWidget *parent=0); ~StatusProgressBar(); - void tqsetAlignment(int a); + void setAlignment(int a); void progressBarMode(int mode, const TQString& text=TQString()); diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index 07f0541..0d84d4d 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -235,7 +235,7 @@ void ImageGuideWidget::updatePixmap() TQFontMetrics fontMt = p.fontMetrics(); p.setPen(TQPen(TQt::red, 1)) ; - d->pixmap->fill(tqcolorGroup().background()); + d->pixmap->fill(colorGroup().background()); if (d->renderingPreviewMode == PreviewOriginalImage || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == false )) @@ -303,7 +303,7 @@ void ImageGuideWidget::updatePixmap() } // Drawing the information and others stuff. - p.fillRect(d->rect.right(), 0, width(), height(), tqcolorGroup().background()); + p.fillRect(d->rect.right(), 0, width(), height(), colorGroup().background()); p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(d->rect.x()+d->rect.width()/2-1, @@ -368,7 +368,7 @@ void ImageGuideWidget::updatePixmap() 0, 0, d->rect.width(), d->rect.height()/2); } - p.fillRect(0, d->rect.bottom(), width(), height(), tqcolorGroup().background()); + p.fillRect(0, d->rect.bottom(), width(), height(), colorGroup().background()); p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(d->rect.x(), diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 0d16724..2d11e70 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -103,7 +103,7 @@ void ImagePanIconWidget::setHighLightPoints(const TQPointArray& pointsList) void ImagePanIconWidget::updatePixmap() { // Drawing background and image. - m_pixmap->fill(tqcolorGroup().background()); + m_pixmap->fill(colorGroup().background()); d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); TQPainter p(m_pixmap); diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 5f3b3ba..59fcf00 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -132,7 +132,7 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec l1->addWidget(d->imageRegionWidget, 0); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - d->previewWidget->tqsetSizePolicy(rightSzPolicy); + d->previewWidget->setSizePolicy(rightSzPolicy); // ------------------------------------------------------------- diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index 6975968..c00348a 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -87,7 +87,7 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro d->image = d->iface->getOriginalImg()->copy(); setMinimumSize(wp, hp); - setBackgroundColor(tqcolorGroup().background()); + setBackgroundColor(colorGroup().background()); if( !scrollBar ) { diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index c6667d9..c5e1177 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -87,7 +87,7 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, TQGridLayout* grid = new TQGridLayout(this, 2, 3); d->spotInfoLabel = new KSqueezedTextLabel(this); - d->spotInfoLabel->tqsetAlignment(TQt::AlignRight); + d->spotInfoLabel->setAlignment(TQt::AlignRight); // ------------------------------------------------------------- diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index ee7764d..f9cd999 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -354,7 +354,7 @@ void MetadataWidget::slotPrintMetadata() do { - richText.draw( &p, margin, margin, view, tqcolorGroup() ); + richText.draw( &p, margin, margin, view, colorGroup() ); view.moveBy( 0, view.height() ); p.translate( 0 , -view.height() ); p.setFont( font ); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 6cf7771..d690a39 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -81,14 +81,14 @@ WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *parent) setVScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff); viewport()->setMouseTracking(true); - viewport()->setPaletteBackgroundColor(tqcolorGroup().background()); + viewport()->setPaletteBackgroundColor(colorGroup().background()); setMinimumWidth(w); setMaximumHeight(h); resizeContents(worldMapPixmap().width(), worldMapPixmap().height()); d->latLonPos = new TQLabel(viewport()); d->latLonPos->setMaximumHeight(fontMetrics().height()); - d->latLonPos->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + d->latLonPos->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); d->latLonPos->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); addChild(d->latLonPos); } diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index d719744..b84b695 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -420,7 +420,7 @@ void ShowFoto::setupUserArea() d->thumbBar = new Digikam::ThumbBarView(m_splitter, Digikam::ThumbBarView::Vertical); m_stackView = new Digikam::EditorStackView(m_splitter); m_canvas = new Digikam::Canvas(m_stackView); - m_canvas->tqsetSizePolicy(rightSzPolicy); + m_canvas->setSizePolicy(rightSzPolicy); d->rightSidebar = new Digikam::ImagePropertiesSideBar(widget, "ShowFoto Sidebar Right", m_splitter, Digikam::Sidebar::Right); @@ -438,7 +438,7 @@ void ShowFoto::setupUserArea() m_canvas = new Digikam::Canvas(m_stackView); d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal); - m_canvas->tqsetSizePolicy(rightSzPolicy); + m_canvas->setSizePolicy(rightSzPolicy); d->vSplitter->setFrameStyle( TQFrame::NoFrame ); d->vSplitter->setFrameShadow( TQFrame::Plain ); @@ -522,7 +522,7 @@ void ShowFoto::readSettings() if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter) d->vSplitter->setSizes(config->readIntListEntry("Vertical Splitter Sizes")); else - m_canvas->tqsetSizePolicy(szPolicy); + m_canvas->setSizePolicy(szPolicy); Digikam::ThemeEngine::instance()->setCurrentTheme(config->readEntry("Theme", i18n("Default"))); } diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index 85c2b60..2fd533b 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -82,7 +82,7 @@ MainWindow::MainWindow() TQSplitter* splitter = new TQSplitter(this); splitter->setOrientation( Qt::Horizontal ); - splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_folderView = new FolderView(splitter); m_iconView = new ThemedIconView(splitter); @@ -113,7 +113,7 @@ MainWindow::MainWindow() m_borderColorLabel = new TQLabel("Border Color: ", groupBox); m_borderColorBtn = new KColorButton(groupBox); - vlay->tqsetAlignment(TQt::AlignTop); + vlay->setAlignment(TQt::AlignTop); vlay->setSpacing(5); vlay->setMargin(5); vlay->addWidget(label1); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 5d867d7..6b63d90 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -154,7 +154,7 @@ void ThemedIconItem::paintItem() p.setFont(view->itemFontXtra()); { - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); r = view->itemDateRect(); p.setFont(view->itemFontXtra()); diff --git a/digikam/themedesigner/themediconview.cpp b/digikam/themedesigner/themediconview.cpp index 7ab0050..c573ded 100644 --- a/digikam/themedesigner/themediconview.cpp +++ b/digikam/themedesigner/themediconview.cpp @@ -39,7 +39,7 @@ public: int thumbSize; - TQRect tqitemRect; + TQRect itemRect; TQRect itemDateRect; TQRect itemPixmapRect; TQRect itemNameRect; @@ -85,9 +85,9 @@ ThemedIconView::~ThemedIconView() delete d; } -TQRect ThemedIconView::tqitemRect() const +TQRect ThemedIconView::itemRect() const { - return d->tqitemRect; + return d->itemRect; } TQRect ThemedIconView::itemDateRect() const @@ -224,7 +224,7 @@ void ThemedIconView::updateBannerRectPixmap() void ThemedIconView::updateItemRectsPixmap() { - d->tqitemRect = TQRect(0,0,0,0); + d->itemRect = TQRect(0,0,0,0); d->itemDateRect = TQRect(0,0,0,0); d->itemPixmapRect = TQRect(0,0,0,0); d->itemNameRect = TQRect(0,0,0,0); @@ -292,13 +292,13 @@ void ThemedIconView::updateItemRectsPixmap() y = d->itemTagRect.bottom(); } - d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin); + d->itemRect = TQRect(0, 0, w+2*margin, y+margin); - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), + d->itemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), + d->itemRect.height()); } } // NameSpace Digikam diff --git a/digikam/themedesigner/themediconview.h b/digikam/themedesigner/themediconview.h index 4921c92..bbce959 100644 --- a/digikam/themedesigner/themediconview.h +++ b/digikam/themedesigner/themediconview.h @@ -47,7 +47,7 @@ public: ThemedIconView(TQWidget* parent); ~ThemedIconView(); - TQRect tqitemRect() const; + TQRect itemRect() const; TQRect itemDateRect() const; TQRect itemPixmapRect() const; TQRect itemNameRect() const; diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 7fbf1ae..54815e7 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -307,7 +307,7 @@ void AlbumSelectDialog::slotUser1() TQString errMsg; PAlbum* newAlbum = AlbumManager::instance()->createPAlbum(album, newAlbumName, - TQString(), TQDate::tqcurrentDate(), + TQString(), TQDate::currentDate(), TQString(), errMsg); if (!newAlbum) { diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index 1b64f29..48e5507 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -92,19 +92,19 @@ void AnimWidget::stop() void AnimWidget::paintEvent(TQPaintEvent*) { - d->pix.fill(tqcolorGroup().background()); + d->pix.fill(colorGroup().background()); TQPainter p(&d->pix); p.translate(d->size/2, d->size/2); if (d->timer->isActive()) { - p.setPen(TQPen(tqcolorGroup().text())); + p.setPen(TQPen(colorGroup().text())); p.rotate( d->pos ); } else { - p.setPen(TQPen(tqcolorGroup().dark())); + p.setPen(TQPen(colorGroup().dark())); } for ( int i=0 ; i<12 ; i++ ) diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index b0a7da2..0529b39 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -229,8 +229,8 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down d->pixRect = TQRect(0,0,0,0); d->textRect = TQRect(0,0,0,0); d->extraRect = TQRect(0,0,0,0); - TQRect tqitemRect = rect(); - tqitemRect.moveTopLeft(TQPoint(0, 0)); + TQRect itemRect = rect(); + itemRect.moveTopLeft(TQPoint(0, 0)); d->pixRect.setWidth(thumbSize); d->pixRect.setHeight(thumbSize); @@ -264,19 +264,19 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down int w = TQMAX(d->textRect.width(), d->pixRect.width() ); int h = d->textRect.height() + d->pixRect.height() ; - tqitemRect.setWidth(w+4); - tqitemRect.setHeight(h+4); + itemRect.setWidth(w+4); + itemRect.setHeight(h+4); // Center the pix and text rect d->pixRect = TQRect(2, 2, d->pixRect.width(), d->pixRect.height()); - d->textRect = TQRect((tqitemRect.width() - d->textRect.width())/2, - tqitemRect.height() - d->textRect.height(), + d->textRect = TQRect((itemRect.width() - d->textRect.width())/2, + itemRect.height() - d->textRect.height(), d->textRect.width(), d->textRect.height()); if (!d->extraRect.isEmpty()) { - d->extraRect = TQRect((tqitemRect.width() - d->extraRect.width())/2, - tqitemRect.height() - d->extraRect.height(), + d->extraRect = TQRect((itemRect.width() - d->extraRect.width())/2, + itemRect.height() - d->extraRect.height(), d->extraRect.width(), d->extraRect.height()); } } diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index 927efd4..f717aea 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -81,7 +81,7 @@ public: TQDict itemDict; - TQRect tqitemRect; + TQRect itemRect; TQPixmap itemRegPixmap; TQPixmap itemSelPixmap; @@ -770,9 +770,9 @@ void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs) } } -TQRect CameraIconView::tqitemRect() const +TQRect CameraIconView::itemRect() const { - return d->tqitemRect; + return d->itemRect; } void CameraIconView::setThumbnailSize(const ThumbnailSize& thumbSize) @@ -825,13 +825,13 @@ void CameraIconView::updateItemRectsPixmap() r.setWidth(TQMAX(TQMAX(pixRect.width(), textRect.width()), extraRect.width()) + 4); r.setHeight(pixRect.height() + textRect.height() + extraRect.height() + 4); - d->tqitemRect = r; + d->itemRect = r; - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), + d->itemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), + d->itemRect.height()); } void CameraIconView::slotThemeChanged() diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h index 65dee0f..7b67a3b 100644 --- a/digikam/utilities/cameragui/cameraiconview.h +++ b/digikam/utilities/cameragui/cameraiconview.h @@ -84,7 +84,7 @@ public: TQPixmap newPicturePixmap() const; TQPixmap unknowPicturePixmap() const; - virtual TQRect tqitemRect() const; + virtual TQRect itemRect() const; TQString defaultDownloadName(CameraIconViewItem *item); diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index ce8212e..a9c2519 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -249,7 +249,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, d->view = new CameraIconView(this, d->splitter); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - d->view->tqsetSizePolicy(rightSzPolicy); + d->view->setSizePolicy(rightSzPolicy); d->rightSidebar = new ImagePropertiesSideBarCamGui(widget, "CameraGui Sidebar Right", d->splitter, Sidebar::Right, true); @@ -354,7 +354,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, // ------------------------------------------------------------------------- d->cancelBtn = new TQToolButton(plainPage()); - d->cancelBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + d->cancelBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelBtn->setPixmap( SmallIcon( "cancel" ) ); d->cancelBtn->setEnabled(false); @@ -365,12 +365,12 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, TQWidget *frame = new TQWidget(plainPage()); TQHBoxLayout* tqlayout = new TQHBoxLayout(frame); - frame->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + frame->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), TQString(), frame ); pixmapLogo->setMargin(0); pixmapLogo->setScaledContents( false ); - pixmapLogo->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum)); TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data"); TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); @@ -739,7 +739,7 @@ void CameraUI::finishDialog() { CameraList* clist = CameraList::instance(); if (clist) - clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::tqcurrentDateTime()); + clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::currentDateTime()); } // When a directory is created, a watch is put on it to spot new files diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index 0a32eb2..afece0e 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -151,10 +151,10 @@ void FreeSpaceWidget::updatePixmap() { TQPixmap fimgPix = SmallIcon("folder_image"); d->pix = TQPixmap(size()); - d->pix.fill(tqcolorGroup().background()); + d->pix.fill(colorGroup().background()); TQPainter p(&d->pix); - p.setPen(tqcolorGroup().mid()); + p.setPen(colorGroup().mid()); p.drawRect(0, 0, d->pix.width(), d->pix.height()); p.drawPixmap(2, d->pix.height()/2-fimgPix.height()/2, fimgPix, 0, 0, fimgPix.width(), fimgPix.height()); @@ -174,7 +174,7 @@ void FreeSpaceWidget::updatePixmap() TQRect tRect(fimgPix.height()+2, 1, d->pix.width()-2-fimgPix.width()-2, d->pix.height()-2); TQString text = TQString("%1%").tqarg(peUsed); - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); TQFontMetrics fontMt = p.fontMetrics(); TQRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(), tRect.width(), tRect.height(), 0, text); diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp index 9c6be9b..6e50d0f 100644 --- a/digikam/utilities/cameragui/gpcamera.cpp +++ b/digikam/utilities/cameragui/gpcamera.cpp @@ -80,19 +80,19 @@ public: CameraAbilities cameraAbilities; }; -class GPtqStatus +class GPStatus { public: - GPtqStatus() + GPStatus() { context = gp_context_new(); cancel = false; gp_context_set_cancel_func(context, cancel_func, 0); } - ~GPtqStatus() + ~GPStatus() { gp_context_unref(context); cancel = false; @@ -108,7 +108,7 @@ public: } }; -bool GPtqStatus::cancel = false; +bool GPStatus::cancel = false; GPCamera::GPCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) : DKCamera(title, model, port, path) @@ -202,7 +202,7 @@ bool GPCamera::doConnect() m_status = 0; } - m_status = new GPtqStatus(); + m_status = new GPStatus(); gp_abilities_list_new(&abilList); gp_abilities_list_load(abilList, m_status->context); @@ -271,7 +271,7 @@ bool GPCamera::doConnect() // -- Now try to initialize the camera ----------------- - m_status = new GPtqStatus(); + m_status = new GPStatus(); // Try and initialize the camera to see if its connected errorCode = gp_camera_init(d->camera, m_status->context); @@ -331,7 +331,7 @@ bool GPCamera::getSubFolders(const TQString& folder, TQStringList& subFolderList delete m_status; m_status = 0; } - m_status = new GPtqStatus(); + m_status = new GPStatus(); errorCode = gp_camera_folder_list_folders(d->camera, TQFile::encodeName(folder), clist, m_status->context); if (errorCode != GP_OK) @@ -378,7 +378,7 @@ bool GPCamera::getItemsList(const TQString& folder, TQStringList& itemsList) delete m_status; m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; gp_list_new(&clist); @@ -429,7 +429,7 @@ bool GPCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& items, b delete m_status; m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; gp_list_new(&clist); @@ -538,7 +538,7 @@ bool GPCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQ m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), TQFile::encodeName(itemName), @@ -588,7 +588,7 @@ bool GPCamera::getExif(const TQString& folder, const TQString& itemName, m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), TQFile::encodeName(itemName), @@ -638,7 +638,7 @@ bool GPCamera::downloadItem(const TQString& folder, const TQString& itemName, m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), TQFile::encodeName(itemName), @@ -679,7 +679,7 @@ bool GPCamera::setLockItem(const TQString& folder, const TQString& itemName, boo m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; CameraFileInfo info; errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder), @@ -737,7 +737,7 @@ bool GPCamera::deleteItem(const TQString& folder, const TQString& itemName) m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_file_delete(d->camera, TQFile::encodeName(folder), TQFile::encodeName(itemName), @@ -786,7 +786,7 @@ bool GPCamera::deleteAllItems(const TQString& folder) m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_folder_delete_all(d->camera, TQFile::encodeName(folder), m_status->context); @@ -843,7 +843,7 @@ bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, cons m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_folder_put_file(d->camera, TQFile::encodeName(folder), @@ -941,7 +941,7 @@ bool GPCamera::cameraSummary(TQString& summary) m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_get_summary(d->camera, &sum, m_status->context); if (errorCode != GP_OK) @@ -990,7 +990,7 @@ bool GPCamera::cameraManual(TQString& manual) m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_get_manual(d->camera, &man, m_status->context); if (errorCode != GP_OK) @@ -1020,7 +1020,7 @@ bool GPCamera::cameraAbout(TQString& about) m_status = 0; } - m_status = new GPtqStatus; + m_status = new GPStatus; errorCode = gp_camera_get_about(d->camera, &abt, m_status->context); if (errorCode != GP_OK) @@ -1193,8 +1193,8 @@ int GPCamera::autoDetect(TQString& model, TQString& port) if (camModel_ && camPort_) { - model = TQString::tqfromLatin1(camModel_); - port = TQString::tqfromLatin1(camPort_); + model = TQString::fromLatin1(camModel_); + port = TQString::fromLatin1(camPort_); gp_list_free(camList); return 0; } diff --git a/digikam/utilities/cameragui/gpcamera.h b/digikam/utilities/cameragui/gpcamera.h index 50752d6..7071e97 100644 --- a/digikam/utilities/cameragui/gpcamera.h +++ b/digikam/utilities/cameragui/gpcamera.h @@ -35,7 +35,7 @@ namespace Digikam { class GPCameraPrivate; -class GPtqStatus; +class GPStatus; // Gphoto2 camera Implementation of abstract type DKCamera @@ -99,7 +99,7 @@ private: private: GPCameraPrivate *d; - GPtqStatus *m_status; + GPStatus *m_status; }; } // namespace Digikam diff --git a/digikam/utilities/cameragui/gpiteminfo.h b/digikam/utilities/cameragui/gpiteminfo.h index 8143c5f..02b2869 100644 --- a/digikam/utilities/cameragui/gpiteminfo.h +++ b/digikam/utilities/cameragui/gpiteminfo.h @@ -44,7 +44,7 @@ class GPItemInfo public: - enum DownloadtqStatus + enum DownloadStatus { DownloadUnknow = -1, DownloadedNo = 0, @@ -59,7 +59,7 @@ public: long size; int width; int height; - int downloaded; // See DownloadtqStatus enum. + int downloaded; // See DownloadStatus enum. int readPermissions; int writePermissions; diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 544ec8e..4d6192d 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -151,13 +151,13 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle d->renameDefaultBox->setColumnLayout(0, Qt::Vertical); d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox ); - d->renameDefaultCase->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); d->renameDefaultCaseType = new TQComboBox( d->renameDefaultBox ); d->renameDefaultCaseType->insertItem(i18n("Leave as Is"), 0); d->renameDefaultCaseType->insertItem(i18n("Upper"), 1); d->renameDefaultCaseType->insertItem(i18n("Lower"), 2); - d->renameDefaultCaseType->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + d->renameDefaultCaseType->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); TQWhatsThis::add( d->renameDefaultCaseType, i18n("

Set the method to use to change the case " "of image filenames.")); @@ -222,9 +222,9 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle "

Local Settings: the date format depending on KDE control panel settings.

" "

Advanced: allows the user to specify a custom date format.

")); d->dateTimeButton = new TQPushButton(SmallIcon("configure"), TQString(), dateTimeWidget); - TQSizePolicy policy = d->dateTimeButton->tqsizePolicy(); + TQSizePolicy policy = d->dateTimeButton->sizePolicy(); policy.setHorData(TQSizePolicy::Maximum); - d->dateTimeButton->tqsetSizePolicy(policy); + d->dateTimeButton->setSizePolicy(policy); TQHBoxLayout *boxLayout2 = new TQHBoxLayout(dateTimeWidget); boxLayout2->addWidget(d->dateTimeLabel); boxLayout2->addWidget(d->dateTimeFormat); @@ -389,7 +389,7 @@ void RenameCustomizer::slotRadioButtonClicked(int) void RenameCustomizer::slotRenameOptionsChanged() { - d->focusedWidget = tqfocusWidget(); + d->focusedWidget = focusWidget(); if (d->addSeqNumberBox->isChecked()) { diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 96edc14..06a99b7 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -639,8 +639,8 @@ void Canvas::drawRubber() tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(pnt.x(), pnt.y(), r.width(), r.height()), - tqcolorGroup(), TQStyle::Style_Default, - TQStyleOption(tqcolorGroup().base())); + colorGroup(), TQStyle::Style_Default, + TQStyleOption(colorGroup().base())); p.end(); } diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index 2e3920b..f46759d 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -247,15 +247,15 @@ EditorToolSettings::~EditorToolSettings() delete d; } -TQSize EditorToolSettings::tqminimumSizeHint() const +TQSize EditorToolSettings::minimumSizeHint() const { // Editor Tools usually require a larger horizontal space than other widgets in right side bar // Set scroll area to a horizontal minimum size sufficient for the settings. // Do not touch vertical size hint. // Limit to 40% of the desktop width. - TQSize hint = TQScrollView::tqminimumSizeHint(); + TQSize hint = TQScrollView::minimumSizeHint(); TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox); - hint.setWidth(TQMIN(d->mainVBox->tqminimumSizeHint().width(), desktopRect.width() * 2 / 5)); + hint.setWidth(TQMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5)); return hint; } diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h index 0f85909..e5b974b 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.h +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h @@ -88,7 +88,7 @@ public: KPushButton* button(int buttonCode) const; void enableButton(int buttonCode, bool state); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; signals: diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index c9e9db6..cb75a31 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -563,18 +563,18 @@ void EditorWindow::setupStandardAccelerators() void EditorWindow::setupStatusBar() { m_nameLabel = new StatusProgressBar(statusBar()); - m_nameLabel->tqsetAlignment(TQt::AlignCenter); + m_nameLabel->setAlignment(TQt::AlignCenter); m_nameLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(m_nameLabel, 100); d->selectLabel = new TQLabel(i18n("No selection"), statusBar()); - d->selectLabel->tqsetAlignment(TQt::AlignCenter); + d->selectLabel->setAlignment(TQt::AlignCenter); d->selectLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(d->selectLabel, 100); TQToolTip::add(d->selectLabel, i18n("Information about current selection area")); m_resLabel = new TQLabel(statusBar()); - m_resLabel->tqsetAlignment(TQt::AlignCenter); + m_resLabel->setAlignment(TQt::AlignCenter); m_resLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(m_resLabel, 100); TQToolTip::add(m_resLabel, i18n("Information about image size")); @@ -940,7 +940,7 @@ void EditorWindow::applyStandardSettings() if(config->hasKey("Splitter Sizes")) m_splitter->setSizes(config->readIntListEntry("Splitter Sizes")); else - m_canvas->tqsetSizePolicy(rightSzPolicy); + m_canvas->setSizePolicy(rightSzPolicy); d->fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false); diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index ae073f5..897cba5 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -285,7 +285,7 @@ void ImageWindow::setupUserArea() m_canvas->makeDefaultEditingCanvas(); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - m_canvas->tqsetSizePolicy(rightSzPolicy); + m_canvas->setSizePolicy(rightSzPolicy); d->rightSidebar = new ImagePropertiesSideBarDB(widget, "ImageEditor Right Sidebar", m_splitter, Sidebar::Right, true); @@ -1210,7 +1210,7 @@ void ImageWindow::dropEvent(TQDropEvent *e) } else if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index 352d821..e1581ae 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -93,7 +93,7 @@ RawPreview::RawPreview(const KURL& url, TQWidget *parent) d->url = url; setMinimumWidth(500); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 97936f6..3bc4100 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -171,7 +171,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) TQGridLayout* gridSettings = new TQGridLayout(plainPage(), 5, 4); TQLabel *label1 = new TQLabel(i18n("Channel:"), plainPage()); - label1->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); + label1->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); d->channelCB = new TQComboBox(false, plainPage()); d->channelCB->insertItem( i18n("Luminosity") ); d->channelCB->insertItem( i18n("Red") ); @@ -211,7 +211,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) logHistoButton->setToggleButton(true); TQLabel *label10 = new TQLabel(i18n("Colors:"), plainPage()); - label10->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); + label10->setAlignment( TQt::AlignRight | TQt::AlignVCenter ); d->colorsCB = new TQComboBox(false, plainPage()); d->colorsCB->insertItem( i18n("Red") ); d->colorsCB->insertItem( i18n("Green") ); diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index 3ffb35e..aab72dc 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -732,7 +732,7 @@ void LightTableBar::contentsDropEvent(TQDropEvent *e) } else if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 8d2c4aa..a0b369c 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -137,7 +137,7 @@ LightTablePreview::LightTablePreview(TQWidget *parent) setAcceptDrops(true); slotThemeChanged(); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); @@ -725,7 +725,7 @@ void LightTablePreview::contentsDropEvent(TQDropEvent *e) } else if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 81a5302..3ec827a 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -224,7 +224,7 @@ void LightTableWindow::setupStatusBar() d->leftZoomBar->setEnabled(false); d->statusProgressBar = new StatusProgressBar(statusBar()); - d->statusProgressBar->tqsetAlignment(TQt::AlignCenter); + d->statusProgressBar->setAlignment(TQt::AlignCenter); d->statusProgressBar->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(d->statusProgressBar, 100); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 02ffab6..77898d1 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -121,7 +121,7 @@ SetupCamera::SetupCamera( TQWidget* parent ) gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) ); TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website")); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxLayout->setAlignment( TQt::AlignTop ); groupBoxLayout->addMultiCellWidget( d->listView, 0, 5, 0, 0 ); groupBoxLayout->addWidget( d->addButton, 0, 1 ); groupBoxLayout->addWidget( d->removeButton, 1, 1 ); @@ -261,7 +261,7 @@ void SetupCamera::slotAutoDetectCamera() KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") .tqarg(model).tqarg(port)); new TQListViewItem(d->listView, model, model, port, "/", - TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(Qt::ISODate)); } } @@ -269,7 +269,7 @@ void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) { new TQListViewItem(d->listView, title, model, port, path, - TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); + TQDateTime::currentDateTime().toString(Qt::ISODate)); } void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model, @@ -297,7 +297,7 @@ void SetupCamera::applySettings() for ( ; it.current(); ++it ) { TQListViewItem *item = it.current(); - TQDateTime lastAccess = TQDateTime::tqcurrentDateTime(); + TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!item->text(4).isEmpty()) lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate); diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index 496a293..3aa88b7 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -106,7 +106,7 @@ SetupCollections::SetupCollections(TQWidget* parent ) TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - collectionGroupLayout->tqsetAlignment( TQt::AlignTop ); + collectionGroupLayout->setAlignment( TQt::AlignTop ); collectionGroupLayout->addMultiCellWidget( d->albumCollectionBox, 0, 4, 0, 0 ); collectionGroupLayout->addWidget( d->addCollectionButton, 0, 1); collectionGroupLayout->addWidget( d->delCollectionButton, 1, 1); diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp index 7d7f097..78a3b06 100644 --- a/digikam/utilities/setup/setupplugins.cpp +++ b/digikam/utilities/setup/setupplugins.cpp @@ -72,7 +72,7 @@ SetupPlugins::SetupPlugins(TQWidget* parent ) d = new SetupPluginsPriv; TQVBoxLayout *tqlayout = new TQVBoxLayout(parent); d->pluginsNumber = new TQLabel(parent); - d->pluginsNumber->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->pluginsNumber->setAlignment(TQt::AlignLeft | TQt::AlignVCenter); d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( parent ); TQString pluginsListHelp = i18n("

A list of available Kipi plugins appears below."); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 6f0a5b4..5ea420a 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -88,7 +88,7 @@ ToolBar::ToolBar(TQWidget* parent) setBackgroundMode(TQt::NoBackground); adjustSize(); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); connect(d->playBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlayBtnToggled()));