diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 23bfbfff2de55c72029349cc312adac29cf09809 (patch) | |
tree | 471f706949569f3531be5f2819f5071b117ce249 /digikam/utilities | |
parent | 0b843b137f8f7e7f3d43f7a7beafc51129668981 (diff) | |
download | digikam-23bfbfff2de55c72029349cc312adac29cf09809.tar.gz digikam-23bfbfff2de55c72029349cc312adac29cf09809.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'digikam/utilities')
103 files changed, 312 insertions, 312 deletions
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index bb4b0db..d721b15 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -69,8 +69,8 @@ public: AlbumList::Iterator albumsIt; }; -BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* tqparent) - : DProgressDlg(tqparent) +BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* parent) + : DProgressDlg(parent) { d = new BatchAlbumsSyncMetadataPriv; d->imageInfoJob = new ImageInfoJob(); diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.h b/digikam/utilities/batch/batchalbumssyncmetadata.h index c923d2f..b3a63f3 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.h +++ b/digikam/utilities/batch/batchalbumssyncmetadata.h @@ -46,7 +46,7 @@ class BatchAlbumsSyncMetadata : public DProgressDlg public: - BatchAlbumsSyncMetadata(TQWidget* tqparent); + BatchAlbumsSyncMetadata(TQWidget* parent); ~BatchAlbumsSyncMetadata(); signals: diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 23d5d41..8e7ff86 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -70,15 +70,15 @@ public: ImageInfo *imageInfo; }; -BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, Album *album) - : TQObject(tqparent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, Album *album) + : TQObject(parent) { d = new BatchSyncMetadataPriv; d->album = album; } -BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list) - : TQObject(tqparent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* parent, const ImageInfoList& list) + : TQObject(parent) { d = new BatchSyncMetadataPriv; d->imageInfoList = list; diff --git a/digikam/utilities/batch/batchsyncmetadata.h b/digikam/utilities/batch/batchsyncmetadata.h index 6cc61ea..a0ad2d2 100644 --- a/digikam/utilities/batch/batchsyncmetadata.h +++ b/digikam/utilities/batch/batchsyncmetadata.h @@ -49,10 +49,10 @@ class BatchSyncMetadata : public TQObject public: /** Constructor witch sync all metatada pictures from an Album */ - BatchSyncMetadata(TQObject* tqparent, Album *album); + BatchSyncMetadata(TQObject* parent, Album *album); /** Constructor witch sync all metatada from an images list */ - BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list); + BatchSyncMetadata(TQObject* parent, const ImageInfoList& list); ~BatchSyncMetadata(); diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 9a2c901..b32b86a 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -74,8 +74,8 @@ public: TQGuardedPtr<ThumbnailJob> thumbJob; }; -BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* tqparent) - : DProgressDlg(tqparent) +BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* parent) + : DProgressDlg(parent) { d = new BatchThumbsGeneratorPriv; setValue(0); diff --git a/digikam/utilities/batch/batchthumbsgenerator.h b/digikam/utilities/batch/batchthumbsgenerator.h index 5a51916..0349676 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.h +++ b/digikam/utilities/batch/batchthumbsgenerator.h @@ -45,7 +45,7 @@ class BatchThumbsGenerator : public DProgressDlg public: - BatchThumbsGenerator(TQWidget* tqparent); + BatchThumbsGenerator(TQWidget* parent); ~BatchThumbsGenerator(); signals: diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index a66f6ac..7fbf1ae 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -80,13 +80,13 @@ public: SearchTextBar *searchBar; }; -AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, +AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, const TQString& header, const TQString& newAlbumString, bool allowRootSelection ) : KDialogBase(Plain, i18n("Select Album"), Help|User1|Ok|Cancel, Ok, - tqparent, 0, true, true, + parent, 0, true, true, i18n("&New Album")) { d = new AlbumSelectDialogPrivate; @@ -136,11 +136,11 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, } else { - FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); + FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); if (!parentItem) { - DWarning() << "Failed to find tqparent for Album " + DWarning() << "Failed to find parent for Album " << album->title() << endl; continue; } @@ -207,11 +207,11 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album) if (!album || album->type() != Album::PHYSICAL) return; - FolderItem* parentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); + FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); if (!parentItem) { - DWarning() << "Failed to find tqparent for Album " + DWarning() << "Failed to find parent for Album " << album->title() << endl; return; } @@ -323,13 +323,13 @@ void AlbumSelectDialog::slotUser1() } } -PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* tqparent, +PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* parent, PAlbum* albumToSelect, const TQString& header, const TQString& newAlbumString, bool allowRootSelection ) { - AlbumSelectDialog dlg(tqparent, albumToSelect, + AlbumSelectDialog dlg(parent, albumToSelect, header, newAlbumString, allowRootSelection); @@ -365,16 +365,16 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter) if (!match) { // check if any of the parents match the search - Album* tqparent = palbum->tqparent(); - while (tqparent && !tqparent->isRoot()) + Album* parent = palbum->parent(); + while (parent && !parent->isRoot()) { - if (tqparent->title().lower().contains(search)) + if (parent->title().lower().contains(search)) { match = true; break; } - tqparent = tqparent->tqparent(); + parent = parent->parent(); } } diff --git a/digikam/utilities/cameragui/albumselectdialog.h b/digikam/utilities/cameragui/albumselectdialog.h index d9c70f7..b785537 100644 --- a/digikam/utilities/cameragui/albumselectdialog.h +++ b/digikam/utilities/cameragui/albumselectdialog.h @@ -47,14 +47,14 @@ class AlbumSelectDialog : public KDialogBase public: - AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, + AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect, const TQString& header=TQString(), const TQString& newAlbumString=TQString(), bool allowRootSelection=false); ~AlbumSelectDialog(); - static PAlbum* selectAlbum(TQWidget* tqparent, + static PAlbum* selectAlbum(TQWidget* parent, PAlbum* albumToSelect, const TQString& header=TQString(), const TQString& newAlbumString=TQString(), diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index ad60c05..1b64f29 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -56,8 +56,8 @@ public: TQPixmap pix; }; -AnimWidget::AnimWidget(TQWidget* tqparent, int size) - : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) +AnimWidget::AnimWidget(TQWidget* parent, int size) + : TQWidget(parent, 0, WResizeNoErase|WRepaintNoErase) { d = new AnimWidgetPriv; setBackgroundMode(TQt::NoBackground); diff --git a/digikam/utilities/cameragui/animwidget.h b/digikam/utilities/cameragui/animwidget.h index a286f9e..d85f33b 100644 --- a/digikam/utilities/cameragui/animwidget.h +++ b/digikam/utilities/cameragui/animwidget.h @@ -41,7 +41,7 @@ class AnimWidget : public TQWidget public: - AnimWidget(TQWidget* tqparent, int size=28); + AnimWidget(TQWidget* parent, int size=28); ~AnimWidget(); void start(); diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index cbfefc9..d8034a0 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -145,7 +145,7 @@ public: skipAll = false; canceled = false; downloadTotal = 0; - tqparent = 0; + parent = 0; timer = 0; camera = 0; thread = 0; @@ -158,7 +158,7 @@ public: int downloadTotal; - TQWidget *tqparent; + TQWidget *parent; TQTimer *timer; @@ -188,11 +188,11 @@ private: CameraControllerPriv *d; - TQObject *tqparent; + TQObject *parent; }; CameraThread::CameraThread(CameraController* controller) - : d(controller->d), tqparent(controller) + : d(controller->d), parent(controller) { } @@ -220,7 +220,7 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_connected); event->result = result; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); if (result) sendInfo(i18n("Connection established")); @@ -243,7 +243,7 @@ void CameraThread::run() event->map.insert("summary", TQVariant(summary)); event->map.insert("manual", TQVariant(manual)); event->map.insert("about", TQVariant(about)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); break; } case(CameraCommand::gp_listfolders): @@ -260,7 +260,7 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfolders); event->map.insert("folders", TQVariant(flist)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); sendInfo(i18n("The folders have been listed.")); @@ -289,7 +289,7 @@ void CameraThread::run() ds << itemsList; event->map.insert("files", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } sendInfo(i18n("Listing files in %1 is complete").tqarg(folder)); @@ -314,7 +314,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("thumbnail", TQVariant(thumbnail)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; @@ -342,7 +342,7 @@ void CameraThread::run() event->map.insert("file", TQVariant(file)); event->map.insert("exifSize", TQVariant(esize)); event->map.insert("exifData", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -371,7 +371,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); KURL tempURL(dest); tempURL = tempURL.upURL(); @@ -443,7 +443,7 @@ void CameraThread::run() event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); event->map.insert("temp", TQVariant(temp)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -451,7 +451,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -471,7 +471,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("dest", TQVariant(dest)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -504,7 +504,7 @@ void CameraThread::run() ds << itemsInfo; event->map.insert("info", TQVariant(ba)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { @@ -512,7 +512,7 @@ void CameraThread::run() event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); event->map.insert("src", TQVariant(src)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -530,14 +530,14 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_deleted); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_deleteFailed); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -556,14 +556,14 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_locked); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_lockFailed); event->map.insert("folder", TQVariant(folder)); event->map.insert("file", TQVariant(file)); - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } break; } @@ -581,33 +581,33 @@ void CameraThread::sendBusy(bool val) { CameraEvent* event = new CameraEvent(CameraEvent::gp_busy); event->result = val; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } void CameraThread::sendError(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_errormsg); event->msg = msg; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } void CameraThread::sendInfo(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_infomsg); event->msg = msg; - TQApplication::postEvent(tqparent, event); + TQApplication::postEvent(parent, event); } //-- Camera Controller ------------------------------------------------------ -CameraController::CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, +CameraController::CameraController(TQWidget* parent, const TQString& title, const TQString& model, const TQString& port, const TQString& path) - : TQObject(tqparent) + : TQObject(parent) { d = new CameraControllerPriv; - d->tqparent = tqparent; + d->parent = parent; d->canceled = false; d->close = false; d->overwriteAll = false; @@ -938,7 +938,7 @@ void CameraController::customEvent(TQCustomEvent* e) break; } - KIO::RenameDlg dlg(d->tqparent, i18n("Rename File"), + KIO::RenameDlg dlg(d->parent, i18n("Rename File"), folder + TQString("/") + file, dest, KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); @@ -1029,12 +1029,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1068,12 +1068,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1103,12 +1103,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1138,12 +1138,12 @@ void CameraController::customEvent(TQCustomEvent* e) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->tqparent, msg); + KMessageBox::error(d->parent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->tqparent, msg); + int result = KMessageBox::warningContinueCancel(d->parent, msg); if (result != KMessageBox::Continue) slotCancel(); } diff --git a/digikam/utilities/cameragui/cameracontroller.h b/digikam/utilities/cameragui/cameracontroller.h index dd7ddbe..aa7accd 100644 --- a/digikam/utilities/cameragui/cameracontroller.h +++ b/digikam/utilities/cameragui/cameracontroller.h @@ -48,7 +48,7 @@ class CameraController : public TQObject public: - CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, + CameraController(TQWidget* parent, const TQString& title, const TQString& model, const TQString& port, const TQString& path); ~CameraController(); diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index 36c31d5..ba3b99d 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -45,10 +45,10 @@ namespace Digikam { -CameraFolderDialog::CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, +CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraView, const TQStringList& cameraFolderList, const TQString& cameraName, const TQString& rootPath) - : KDialogBase(tqparent, 0, true, + : KDialogBase(parent, 0, true, i18n("%1 - Select Camera Folder").tqarg(cameraName), Help|Ok|Cancel, Ok, true) { diff --git a/digikam/utilities/cameragui/camerafolderdialog.h b/digikam/utilities/cameragui/camerafolderdialog.h index 8aaf477..51e0a55 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.h +++ b/digikam/utilities/cameragui/camerafolderdialog.h @@ -46,7 +46,7 @@ class CameraFolderDialog : public KDialogBase public: - CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, const TQStringList& cameraFolderList, + CameraFolderDialog(TQWidget *parent, CameraIconView *cameraView, const TQStringList& cameraFolderList, const TQString& cameraName, const TQString& rootPath); ~CameraFolderDialog(); diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/digikam/utilities/cameragui/camerafolderitem.cpp index 722c71f..6adc480 100644 --- a/digikam/utilities/cameragui/camerafolderitem.cpp +++ b/digikam/utilities/cameragui/camerafolderitem.cpp @@ -47,8 +47,8 @@ public: TQString name; }; -CameraFolderItem::CameraFolderItem(TQListView* tqparent, const TQString& name, const TQPixmap& pixmap) - : TQListViewItem(tqparent, name) +CameraFolderItem::CameraFolderItem(TQListView* parent, const TQString& name, const TQPixmap& pixmap) + : TQListViewItem(parent, name) { d = new CameraFolderItemPriv; d->virtualFolder = true; @@ -56,9 +56,9 @@ CameraFolderItem::CameraFolderItem(TQListView* tqparent, const TQString& name, c setPixmap(0, pixmap); } -CameraFolderItem::CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, +CameraFolderItem::CameraFolderItem(TQListViewItem* parent, const TQString& folderName, const TQString& folderPath, const TQPixmap& pixmap) - : TQListViewItem(tqparent, folderName) + : TQListViewItem(parent, folderName) { d = new CameraFolderItemPriv; d->folderName = folderName; diff --git a/digikam/utilities/cameragui/camerafolderitem.h b/digikam/utilities/cameragui/camerafolderitem.h index b88ce2d..dde2c5c 100644 --- a/digikam/utilities/cameragui/camerafolderitem.h +++ b/digikam/utilities/cameragui/camerafolderitem.h @@ -44,10 +44,10 @@ class CameraFolderItem : public TQListViewItem public: - CameraFolderItem(TQListView* tqparent, const TQString& name, + CameraFolderItem(TQListView* parent, const TQString& name, const TQPixmap& pixmap=SmallIcon("folder")); - CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, const TQString& folderPath, + CameraFolderItem(TQListViewItem* parent, const TQString& folderName, const TQString& folderPath, const TQPixmap& pixmap=SmallIcon("folder")); ~CameraFolderItem(); diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index 1c45e87..e04c450 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -54,8 +54,8 @@ public: CameraFolderItem *rootFolder; }; -CameraFolderView::CameraFolderView(TQWidget* tqparent) - : TQListView(tqparent) +CameraFolderView::CameraFolderView(TQWidget* parent) + : TQListView(parent) { d = new CameraFolderViewPriv; @@ -119,7 +119,7 @@ CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQSt } else { - DWarning() << "CameraFolderView: Couldn't find tqparent for subFolder " + DWarning() << "CameraFolderView: Couldn't find parent for subFolder " << subFolder << " of folder " << folder << endl; return 0; } diff --git a/digikam/utilities/cameragui/camerafolderview.h b/digikam/utilities/cameragui/camerafolderview.h index 207bf10..167b30d 100644 --- a/digikam/utilities/cameragui/camerafolderview.h +++ b/digikam/utilities/cameragui/camerafolderview.h @@ -47,7 +47,7 @@ class CameraFolderView : public TQListView public: - CameraFolderView(TQWidget* tqparent); + CameraFolderView(TQWidget* parent); ~CameraFolderView(); void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera")); diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index d6fbf24..b0a7da2 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -66,9 +66,9 @@ public: GPItemInfo *itemInfo; }; -CameraIconViewItem::CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, +CameraIconViewItem::CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, const TQImage& thumbnail, const TQString& downloadName) - : IconItem(tqparent) + : IconItem(parent) { d = new CameraIconViewItemPriv; d->itemInfo = new GPItemInfo(itemInfo); diff --git a/digikam/utilities/cameragui/cameraiconitem.h b/digikam/utilities/cameragui/cameraiconitem.h index e053010..961bc1a 100644 --- a/digikam/utilities/cameragui/cameraiconitem.h +++ b/digikam/utilities/cameragui/cameraiconitem.h @@ -45,7 +45,7 @@ class CameraIconViewItem : public IconItem public: - CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, + CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, const TQImage& thumbnail, const TQString& downloadName=TQString()); ~CameraIconViewItem(); diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index 0bbac23..927efd4 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -222,8 +222,8 @@ const char *CameraIconViewPriv::unknowPicture_xpm[] = " " }; -CameraIconView::CameraIconView(CameraUI* ui, TQWidget* tqparent) - : IconView(tqparent) +CameraIconView::CameraIconView(CameraUI* ui, TQWidget* parent) + : IconView(parent) { d = new CameraIconViewPriv; d->cameraUI = ui; diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h index d70d1ba..65dee0f 100644 --- a/digikam/utilities/cameragui/cameraiconview.h +++ b/digikam/utilities/cameragui/cameraiconview.h @@ -58,7 +58,7 @@ class CameraIconView : public IconView public: - CameraIconView(CameraUI* ui, TQWidget* tqparent); + CameraIconView(CameraUI* ui, TQWidget* parent); ~CameraIconView(); void setRenameCustomizer(RenameCustomizer* renamer); diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp index 42a83d4..6221bd9 100644 --- a/digikam/utilities/cameragui/camerainfodialog.cpp +++ b/digikam/utilities/cameragui/camerainfodialog.cpp @@ -40,9 +40,9 @@ namespace Digikam { -CameraInfoDialog::CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, +CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, const TQString& manual, const TQString& about) - : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, tqparent, 0, true, true) + : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, parent, 0, true, true) { setHelp("digitalstillcamera.anchor", "digikam"); resize(500, 400); diff --git a/digikam/utilities/cameragui/camerainfodialog.h b/digikam/utilities/cameragui/camerainfodialog.h index 07ca63e..7ec3120 100644 --- a/digikam/utilities/cameragui/camerainfodialog.h +++ b/digikam/utilities/cameragui/camerainfodialog.h @@ -40,7 +40,7 @@ class CameraInfoDialog : public KDialogBase { public: - CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, + CameraInfoDialog(TQWidget *parent, const TQString& summary, const TQString& manual, const TQString& about); ~CameraInfoDialog(); }; diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 3274c25..ce8212e 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -224,12 +224,12 @@ public: FreeSpaceWidget *freeSpaceWidget; }; -CameraUI::CameraUI(TQWidget* /*tqparent*/, const TQString& cameraTitle, +CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle, const TQString& model, const TQString& port, const TQString& path, const TQDateTime lastAccess) : KDialogBase(Plain, cameraTitle, Help|User1|User2|User3|Close, Close, - 0, // B.K.O # 116485: no tqparent for this modal dialog. + 0, // B.K.O # 116485: no parent for this modal dialog. 0, false, true, i18n("D&elete"), i18n("&Download"), @@ -1630,15 +1630,15 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub, // looks like the directory does not exist, try to create it AlbumManager* aman = AlbumManager::instance(); - PAlbum* tqparent = aman->findPAlbum(parentURL); - if (!tqparent) + PAlbum* parent = aman->findPAlbum(parentURL); + if (!parent) { errMsg = i18n("Failed to find Album for path '%1'") .tqarg(parentURL.path()); return false; } - return aman->createPAlbum(tqparent, sub, TQString(""), date, TQString(""), errMsg); + return aman->createPAlbum(parent, sub, TQString(""), date, TQString(""), errMsg); } void CameraUI::addFileExtension(const TQString& ext) diff --git a/digikam/utilities/cameragui/cameraui.h b/digikam/utilities/cameragui/cameraui.h index 889bc34..99d3871 100644 --- a/digikam/utilities/cameragui/cameraui.h +++ b/digikam/utilities/cameragui/cameraui.h @@ -54,7 +54,7 @@ class CameraUI : public KDialogBase public: - CameraUI(TQWidget* tqparent, const TQString& cameraTitle, + CameraUI(TQWidget* parent, const TQString& cameraTitle, const TQString& model, const TQString& port, const TQString& path, const TQDateTime lastAccess); ~CameraUI(); diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index f964f07..0a32eb2 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -81,8 +81,8 @@ public: TQPixmap pix; }; -FreeSpaceWidget::FreeSpaceWidget(TQWidget* tqparent, int width) - : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) +FreeSpaceWidget::FreeSpaceWidget(TQWidget* parent, int width) + : TQWidget(parent, 0, WResizeNoErase|WRepaintNoErase) { d = new FreeSpaceWidgetPriv; setBackgroundMode(TQt::NoBackground); diff --git a/digikam/utilities/cameragui/freespacewidget.h b/digikam/utilities/cameragui/freespacewidget.h index c8ad03f..4f777d3 100644 --- a/digikam/utilities/cameragui/freespacewidget.h +++ b/digikam/utilities/cameragui/freespacewidget.h @@ -41,7 +41,7 @@ class FreeSpaceWidget : public TQWidget public: - FreeSpaceWidget(TQWidget* tqparent, int width); + FreeSpaceWidget(TQWidget* parent, int width); ~FreeSpaceWidget(); void setEstimatedDSizeKb(unsigned long dSize); diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 9857feb..544ec8e 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -126,8 +126,8 @@ public: KIntNumInput *startIndexInput; }; -RenameCustomizer::RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle) - : TQButtonGroup(tqparent) +RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle) + : TQButtonGroup(parent) { d = new RenameCustomizerPriv; d->changedTimer = new TQTimer(this); diff --git a/digikam/utilities/cameragui/renamecustomizer.h b/digikam/utilities/cameragui/renamecustomizer.h index 843344a..bb5e8c7 100644 --- a/digikam/utilities/cameragui/renamecustomizer.h +++ b/digikam/utilities/cameragui/renamecustomizer.h @@ -51,7 +51,7 @@ public: LOWER }; - RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle); + RenameCustomizer(TQWidget* parent, const TQString& cameraTitle); ~RenameCustomizer(); void setUseDefault(bool val); diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 9344655..96edc14 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -94,7 +94,7 @@ public: panIconPopup = 0; panIconWidget = 0; cornerButton = 0; - tqparent = 0; + parent = 0; im = 0; rubber = 0; autoZoom = false; @@ -137,7 +137,7 @@ public: TQColor bgColor; - TQWidget *tqparent; + TQWidget *parent; KPopupFrame *panIconPopup; @@ -146,12 +146,12 @@ public: ImagePanIconWidget *panIconWidget; }; -Canvas::Canvas(TQWidget *tqparent) - : TQScrollView(tqparent) +Canvas::Canvas(TQWidget *parent) + : TQScrollView(parent) { d = new CanvasPrivate; d->im = new DImgInterface(); - d->tqparent = tqparent; + d->parent = parent; d->bgColor.setRgb(0, 0, 0); d->qcheck.resize(16, 16); @@ -242,7 +242,7 @@ void Canvas::load(const TQString& filename, IOFileSettingsContainer *IOFileSetti viewport()->setUpdatesEnabled(false); - d->im->load( filename, IOFileSettings, d->tqparent ); + d->im->load( filename, IOFileSettings, d->parent ); emit signalPrepareToLoad(); } diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/digikam/utilities/imageeditor/canvas/canvas.h index 2ce3493..a0c812c 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.h +++ b/digikam/utilities/imageeditor/canvas/canvas.h @@ -60,7 +60,7 @@ class DIGIKAM_EXPORT Canvas : public TQScrollView public: - Canvas(TQWidget *tqparent=0); + Canvas(TQWidget *parent=0); ~Canvas(); void load(const TQString& filename, IOFileSettingsContainer *IOFileSettings); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index e9d0074..5bb7f70 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -51,13 +51,13 @@ namespace Digikam { -ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* tqparent, DImg *preview, +ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, IccTransform *iccTrans, const TQString& file) - : KDialogBase(tqparent, "", true, TQString(), + : KDialogBase(parent, "", true, TQString(), Help|Ok|Apply|Cancel, Ok, true) { m_iccTrans = iccTrans; - m_parent = tqparent; + m_parent = parent; setHelp("iccprofile.anchor", "digikam"); setButtonText(Ok, i18n("Convert")); setButtonTip(Ok, i18n("Apply the default color workspace profile to the image")); diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h index c8165de..f519fc2 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h @@ -50,7 +50,7 @@ class DIGIKAM_EXPORT ColorCorrectionDlg : public KDialogBase public: - ColorCorrectionDlg(TQWidget *tqparent, DImg *preview, + ColorCorrectionDlg(TQWidget *parent, DImg *preview, IccTransform *iccTrans, const TQString& file); ~ColorCorrectionDlg(); diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index ba04834..b9a02ff 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -79,7 +79,7 @@ public: DImgInterfacePrivate() { - tqparent = 0; + parent = 0; undoMan = 0; cmSettings = 0; expoSettings = 0; @@ -120,7 +120,7 @@ public: double zoom; // Used by ICC color profile dialog. - TQWidget *tqparent; + TQWidget *parent; TQString filename; TQString savingFilename; @@ -185,7 +185,7 @@ DImgInterface::~DImgInterface() } void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofileSettings, - TQWidget *tqparent) + TQWidget *parent) { // store here in case filename == d->fileName, and is then reset by resetValues TQString newFileName = filename; @@ -194,7 +194,7 @@ void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofi d->filename = newFileName; d->iofileSettings = iofileSettings; - d->tqparent = tqparent; + d->parent = parent; if (d->iofileSettings->useRAWImport && DImg::fileFormat(d->filename) == DImg::RAW) { @@ -261,7 +261,7 @@ void DImgInterface::resetValues() d->brightness = 0.0; d->changedBCG = false; d->iofileSettings = 0; - d->tqparent = 0; + d->parent = 0; d->cmod.reset(); d->undoMan->clear(); @@ -323,7 +323,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), TQFile::encodeName(d->cmSettings->workspaceSetting)); @@ -333,7 +333,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription TQFile::exists(d->cmSettings->inputSetting)); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); } else { @@ -343,12 +343,12 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), TQFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); + ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); switch (dlg.exec()) { case TQDialog::Accepted: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); // NOTE: If Input color profile do not exist, using built-in sRGB intead. trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, @@ -356,12 +356,12 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription TQFile::exists(d->cmSettings->inputSetting)); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); break; case -1: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -375,11 +375,11 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); } else { @@ -395,21 +395,21 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); + ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); switch (dlg.exec()) { case TQDialog::Accepted: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); break; case -1: - if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->tqparent) d->tqparent->unsetCursor(); + if (d->parent) d->parent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -424,7 +424,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription "No color transform will be applied. " "Please check the \"Color Management\" " "configuration in digiKam's setup to verify the ICC path."); - KMessageBox::information(d->tqparent, message); + KMessageBox::information(d->parent, message); } } } diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/digikam/utilities/imageeditor/canvas/dimginterface.h index 9e01893..d17ca30 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.h +++ b/digikam/utilities/imageeditor/canvas/dimginterface.h @@ -60,7 +60,7 @@ public: DImgInterface(); ~DImgInterface(); - void load(const TQString& filename, IOFileSettingsContainer *iofileSettings, TQWidget *tqparent=0); + void load(const TQString& filename, IOFileSettingsContainer *iofileSettings, TQWidget *parent=0); void setICCSettings(ICCSettingsContainer *cmSettings); void setExposureSettings(ExposureSettingsContainer *expoSettings); diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index 389c7b3..c7ae00c 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -32,8 +32,8 @@ namespace Digikam { -ImagePlugin::ImagePlugin(TQObject *tqparent, const char* name) - : TQObject(tqparent, name) +ImagePlugin::ImagePlugin(TQObject *parent, const char* name) + : TQObject(parent, name) { } diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/digikam/utilities/imageeditor/canvas/imageplugin.h index 0d66ec4..19dfabd 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.h +++ b/digikam/utilities/imageeditor/canvas/imageplugin.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT ImagePlugin : public TQObject, public KXMLGUIClient public: - ImagePlugin(TQObject *tqparent, const char* name=0); + ImagePlugin(TQObject *parent, const char* name=0); virtual ~ImagePlugin(); virtual void setEnabledSelectionActions(bool enable); diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp index bf5ca1a..231c5b5 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp @@ -83,8 +83,8 @@ ImagePluginLoader* ImagePluginLoader::instance() return m_instance; } -ImagePluginLoader::ImagePluginLoader(TQObject *tqparent, SplashScreen *splash) - : TQObject(tqparent) +ImagePluginLoader::ImagePluginLoader(TQObject *parent, SplashScreen *splash) + : TQObject(parent) { m_instance = this; d = new ImagePluginLoaderPrivate; diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.h b/digikam/utilities/imageeditor/canvas/imagepluginloader.h index db23d44..55ffe93 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.h +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.h @@ -49,7 +49,7 @@ class DIGIKAM_EXPORT ImagePluginLoader : public TQObject public: - ImagePluginLoader(TQObject *tqparent, SplashScreen *splash=0); + ImagePluginLoader(TQObject *parent, SplashScreen *splash=0); ~ImagePluginLoader(); static ImagePluginLoader* instance(); diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp index f96b8a4..27fc2ef 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.cpp +++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp @@ -48,8 +48,8 @@ public: Canvas *canvas; }; -EditorStackView::EditorStackView(TQWidget *tqparent) - : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) +EditorStackView::EditorStackView(TQWidget *parent) + : TQWidgetStack(parent, 0, TQt::WDestructiveClose) { d = new EditorStackViewPriv; } diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/digikam/utilities/imageeditor/editor/editorstackview.h index e2a7618..3cccab8 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.h +++ b/digikam/utilities/imageeditor/editor/editorstackview.h @@ -54,7 +54,7 @@ public: public: - EditorStackView(TQWidget *tqparent=0); + EditorStackView(TQWidget *parent=0); ~EditorStackView(); void setCanvas(Canvas* canvas); diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp index fa70b28..55c1789 100644 --- a/digikam/utilities/imageeditor/editor/editortool.cpp +++ b/digikam/utilities/imageeditor/editor/editortool.cpp @@ -69,8 +69,8 @@ public: EditorToolSettings *settings; }; -EditorTool::EditorTool(TQObject *tqparent) - : TQObject(tqparent) +EditorTool::EditorTool(TQObject *parent) + : TQObject(parent) { d = new EditorToolPriv; d->timer = new TQTimer(this); @@ -234,8 +234,8 @@ public: DImgThreadedFilter *threadedFilter; }; -EditorToolThreaded::EditorToolThreaded(TQObject *tqparent) - : EditorTool(tqparent) +EditorToolThreaded::EditorToolThreaded(TQObject *parent) + : EditorTool(parent) { d = new EditorToolThreadedPriv; } diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/digikam/utilities/imageeditor/editor/editortool.h index 041d899..3a434eb 100644 --- a/digikam/utilities/imageeditor/editor/editortool.h +++ b/digikam/utilities/imageeditor/editor/editortool.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT EditorTool : public TQObject public: - EditorTool(TQObject *tqparent); + EditorTool(TQObject *parent); virtual ~EditorTool(); void init(); @@ -114,7 +114,7 @@ public: public: - EditorToolThreaded(TQObject *tqparent); + EditorToolThreaded(TQObject *parent); virtual ~EditorToolThreaded(); /** Set the small text to show in editor status progress bar during diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index 1d09d96..2e3920b 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -104,8 +104,8 @@ public: RIntNumInput *guideSize; }; -EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *tqparent) - : TQScrollView(tqparent) +EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *parent) + : TQScrollView(parent) { d = new EditorToolSettingsPriv; diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h index b2e8481..0f85909 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.h +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h @@ -65,7 +65,7 @@ public: public: - EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *tqparent=0); + EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *parent=0); ~EditorToolSettings(); virtual void setBusy(bool){}; diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index 061fd39..e1bedc9 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -69,7 +69,7 @@ public: TQPixmap qcheck; TQPixmap qpix; - TQBitmap qtqmask; + TQBitmap qmask; DImg previewImage; DImg targetPreviewImage; @@ -86,7 +86,7 @@ ImageIface::ImageIface(int w, int h) d->originalHeight = DImgInterface::defaultInterface()->origHeight(); d->originalBytesDepth = DImgInterface::defaultInterface()->bytesDepth(); - d->qpix.setMask(d->qtqmask); + d->qpix.setMask(d->qmask); d->qcheck.resize(8, 8); TQPainter p; @@ -199,7 +199,7 @@ uchar* ImageIface::getPreviewImage() const // only create another copy if needed, in putPreviewImage d->targetPreviewImage = d->previewImage; - d->qtqmask.resize(d->previewWidth, d->previewHeight); + d->qmask.resize(d->previewWidth, d->previewHeight); d->qpix.resize(d->previewWidth, d->previewHeight); if (d->usePreviewSelection) diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index dcce284..1c7fee3 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -68,8 +68,8 @@ public: RawPreview *previewWidget; }; -RawImport::RawImport(const KURL& url, TQObject *tqparent) - : EditorToolThreaded(tqparent) +RawImport::RawImport(const KURL& url, TQObject *parent) + : EditorToolThreaded(parent) { d = new RawImportPriv; d->previewWidget = new RawPreview(url, 0); diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.h b/digikam/utilities/imageeditor/rawimport/rawimport.h index 4f865d6..abf554b 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.h +++ b/digikam/utilities/imageeditor/rawimport/rawimport.h @@ -50,7 +50,7 @@ class DIGIKAM_EXPORT RawImport : public EditorToolThreaded public: - RawImport(const KURL& url, TQObject *tqparent); + RawImport(const KURL& url, TQObject *parent); ~RawImport(); DRawDecoding rawDecodingSettings(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp index 9bf78ba..d45dd5e 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp @@ -35,8 +35,8 @@ namespace Digikam { -RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *tqparent, const DRawDecoding& settings) - : DImgThreadedFilter(orgImage, tqparent, "RawPostProcessing") +RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *parent, const DRawDecoding& settings) + : DImgThreadedFilter(orgImage, parent, "RawPostProcessing") { m_customRawSettings = settings; initFilter(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h index f55b6f6..3b3c776 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h @@ -40,7 +40,7 @@ class DIGIKAM_EXPORT RawPostProcessing : public DImgThreadedFilter public: - RawPostProcessing(DImg *orgImage, TQObject *tqparent=0, const DRawDecoding& settings=DRawDecoding()); + RawPostProcessing(DImg *orgImage, TQObject *parent=0, const DRawDecoding& settings=DRawDecoding()); // Constructor for slave mode: execute immediately in current thread with specified master filter RawPostProcessing(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index f3a995a..352d821 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -85,8 +85,8 @@ public: LoadingDescription loadingDesc; }; -RawPreview::RawPreview(const KURL& url, TQWidget *tqparent) - : PreviewWidget(tqparent) +RawPreview::RawPreview(const KURL& url, TQWidget *parent) + : PreviewWidget(parent) { d = new RawPreviewPriv; d->thread = new ManagedLoadSaveThread; diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.h b/digikam/utilities/imageeditor/rawimport/rawpreview.h index a2cdc74..f7d73bc 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.h +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.h @@ -54,7 +54,7 @@ Q_OBJECT public: - RawPreview(const KURL& url, TQWidget *tqparent); + RawPreview(const KURL& url, TQWidget *parent); ~RawPreview(); DImg& demosaicedImage() const; diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 492cc7d..97936f6 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -161,8 +161,8 @@ public: DcrawSettingsWidget *decodingSettingsBox; }; -RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *tqparent) - : EditorToolSettings(Default|Ok|Cancel, NoTool, tqparent) +RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) + : EditorToolSettings(Default|Ok|Cancel, NoTool, parent) { d = new RawSettingsBoxPriv; diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h index 1cc2f0e..69b69b9 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h @@ -47,7 +47,7 @@ class DIGIKAM_EXPORT RawSettingsBox : public EditorToolSettings public: - RawSettingsBox(const KURL& url, TQWidget *tqparent); + RawSettingsBox(const KURL& url, TQWidget *parent); ~RawSettingsBox(); void setBusy(bool b); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 98e2437..8589e93 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -327,7 +327,7 @@ public: autoRotate = 0; colorManaged = 0; cmPreferences = 0; - tqparent = 0; + parent = 0; width = 0; height = 0; units = 0; @@ -346,7 +346,7 @@ public: TQPushButton *cmPreferences; - TQWidget *tqparent; + TQWidget *parent; KDoubleNumInput *width; KDoubleNumInput *height; @@ -359,12 +359,12 @@ public: ImageEditorPrintDialogPage::Unit previousUnit; }; -ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { d = new ImageEditorPrintDialogPagePrivate; d->image = image; - d->tqparent = tqparent; + d->parent = parent; setTitle( i18n("Image Settings") ); readSettings(); @@ -747,7 +747,7 @@ void ImageEditorPrintDialogPage::readSettings() void ImageEditorPrintDialogPage::slotSetupDlg() { - EditorWindow* editor = dynamic_cast<EditorWindow*>(d->tqparent); + EditorWindow* editor = dynamic_cast<EditorWindow*>(d->parent); editor->setup(true); } diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/digikam/utilities/imageeditor/tools/imageprint.h index aa1abf3..8a1d787 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.h +++ b/digikam/utilities/imageeditor/tools/imageprint.h @@ -90,7 +90,7 @@ public: public: - ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent=0L, const char *name=0); + ImageEditorPrintDialogPage(DImg& image, TQWidget *parent=0L, const char *name=0); ~ImageEditorPrintDialogPage(); virtual void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 12f4e54..2895c4e 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -96,7 +96,7 @@ public: ImageResizePriv() { currentRenderingMode = NoneRendering; - tqparent = 0; + parent = 0; preserveRatioBox = 0; useGreycstorationBox = 0; mainTab = 0; @@ -120,7 +120,7 @@ public: double prevWP; double prevHP; - TQWidget *tqparent; + TQWidget *parent; TQLabel *restorationTips; @@ -143,16 +143,16 @@ public: GreycstorationWidget *settingsWidget; }; -ImageResize::ImageResize(TQWidget* tqparent) +ImageResize::ImageResize(TQWidget* parent) : KDialogBase(Plain, i18n("Resize Image"), Help|Default|User2|User3|Ok|Cancel, Ok, - tqparent, 0, true, false, + parent, 0, true, false, TQString(), i18n("&Save As..."), i18n("&Load...")) { d = new ImageResizePriv; - d->tqparent = tqparent; + d->parent = parent; setHelp("resizetool.anchor", "digikam"); TQString whatsThis; setButtonWhatsThis( Default, i18n("<p>Reset all filter parameters to their default values.") ); @@ -474,7 +474,7 @@ void ImageResize::slotCancel() if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); } done(Cancel); @@ -490,7 +490,7 @@ void ImageResize::closeEvent(TQCloseEvent *e) if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); } e->accept(); @@ -516,7 +516,7 @@ void ImageResize::slotOk() enableButton(User2, false); enableButton(User3, false); - d->tqparent->setCursor( KCursor::waitCursor() ); + d->parent->setCursor( KCursor::waitCursor() ); writeUserSettings(); ImageIface iface(0, 0); uchar *data = iface.getOriginalImage(); @@ -550,7 +550,7 @@ void ImageResize::slotOk() image.resize(d->wInput->value(), d->hInput->value()); iface.putOriginalImage(i18n("Resize"), image.bits(), image.width(), image.height()); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); accept(); } } @@ -582,7 +582,7 @@ void ImageResize::customEvent(TQCustomEvent *event) iface.putOriginalImage(i18n("Resize"), resizedImage.bits(), resizedImage.width(), resizedImage.height()); - d->tqparent->unsetCursor(); + d->parent->unsetCursor(); accept(); break; } diff --git a/digikam/utilities/imageeditor/tools/imageresize.h b/digikam/utilities/imageeditor/tools/imageresize.h index d4383fa..2ba2f05 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.h +++ b/digikam/utilities/imageeditor/tools/imageresize.h @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT ImageResize : public KDialogBase public: - ImageResize(TQWidget* tqparent); + ImageResize(TQWidget* parent); ~ImageResize(); protected: diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index fd1a6e1..3ffb35e 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -90,8 +90,8 @@ public: ImageInfo *info; }; -LightTableBar::LightTableBar(TQWidget* tqparent, int orientation, bool exifRotate) - : ThumbBarView(tqparent, orientation, exifRotate) +LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate) + : ThumbBarView(parent, orientation, exifRotate) { d = new LightTableBarPriv; setMouseTracking(true); @@ -821,8 +821,8 @@ bool LightTableBarItem::isOnRightPanel() const // ------------------------------------------------------------------------- -LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *tqparent) - : ThumbBarToolTip(tqparent) +LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *parent) + : ThumbBarToolTip(parent) { } diff --git a/digikam/utilities/lighttable/lighttablebar.h b/digikam/utilities/lighttable/lighttablebar.h index d43178d..288a61f 100644 --- a/digikam/utilities/lighttable/lighttablebar.h +++ b/digikam/utilities/lighttable/lighttablebar.h @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT LightTableBar : public ThumbBarView public: - LightTableBar(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true); + LightTableBar(TQWidget* parent, int orientation=Vertical, bool exifRotate=true); ~LightTableBar(); ImageInfo* currentItemImageInfo() const; @@ -141,7 +141,7 @@ class DIGIKAM_EXPORT LightTableBarToolTip : public ThumbBarToolTip { public: - LightTableBarToolTip(ThumbBarView *tqparent); + LightTableBarToolTip(ThumbBarView *parent); private: diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index 1c2c704..8d2c4aa 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -120,8 +120,8 @@ public: PreviewLoadThread *previewPreloadThread; }; -LightTablePreview::LightTablePreview(TQWidget *tqparent) - : PreviewWidget(tqparent) +LightTablePreview::LightTablePreview(TQWidget *parent) + : PreviewWidget(parent) { d = new LightTablePreviewPriv; diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/digikam/utilities/lighttable/lighttablepreview.h index 4cdc5c2..41a6849 100644 --- a/digikam/utilities/lighttable/lighttablepreview.h +++ b/digikam/utilities/lighttable/lighttablepreview.h @@ -53,7 +53,7 @@ Q_OBJECT public: - LightTablePreview(TQWidget *tqparent=0); + LightTablePreview(TQWidget *parent=0); ~LightTablePreview(); void setLoadFullImageSize(bool b); diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index d23c356..70bd000 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -65,8 +65,8 @@ public: LightTablePreview *rightPreview; }; -LightTableView::LightTableView(TQWidget *tqparent) - : TQFrame(tqparent, 0, TQt::WDestructiveClose) +LightTableView::LightTableView(TQWidget *parent) + : TQFrame(parent, 0, TQt::WDestructiveClose) { d = new LightTableViewPriv; diff --git a/digikam/utilities/lighttable/lighttableview.h b/digikam/utilities/lighttable/lighttableview.h index 2b0fe50..25bafa5 100644 --- a/digikam/utilities/lighttable/lighttableview.h +++ b/digikam/utilities/lighttable/lighttableview.h @@ -48,7 +48,7 @@ Q_OBJECT public: - LightTableView(TQWidget *tqparent=0); + LightTableView(TQWidget *parent=0); ~LightTableView(); void setSyncPreview(bool sync); diff --git a/digikam/utilities/scripts/digitaglinktree b/digikam/utilities/scripts/digitaglinktree index b8759f8..8d0d12c 100644 --- a/digikam/utilities/scripts/digitaglinktree +++ b/digikam/utilities/scripts/digitaglinktree @@ -155,7 +155,7 @@ sub getTaggedImages{ # would be the path "people/friends". Images with tag friends would then be # linked in the directory <tagsroot>/people/friends/ for($i=0; $i<=$#tags; $i++){ - $pid=$tags[$i]->{"pid"}; # Get tqparent tag id of current tag + $pid=$tags[$i]->{"pid"}; # Get parent tag id of current tag $tag=$tags[$i]->{"tag"}; # Start constructing tag path if( $pid == 0 ){ $tagPath{$i}=$tag; @@ -164,7 +164,7 @@ sub getTaggedImages{ while( $pid != 0){ $tag=$tags[$pid]->{"tag"} . "/$tag"; # add parents tag name to path - $pid=$tags[$pid]->{"pid"}; # look if tqparent has another tqparent + $pid=$tags[$pid]->{"pid"}; # look if parent has another parent } # Store path constructed $tagPath{$i}=$tag; @@ -281,7 +281,7 @@ sub createLinkTree{ # For tags that have subtags there is a path defined in qtagPath # describing the parentrelationship as directory path like "friends/family/brothers" # If it is defined we want to use this path instead of the flat tag name like "brothers" - # Doing so results in a directory hirachy that maps the tags tqparent relationships + # Doing so results in a directory hirachy that maps the tags parent relationships # into the filesystem. if( $opt_flat ){ # For flat option just use the last subdirectory @@ -487,7 +487,7 @@ sub usage{ " -H Use hard links instead of symbolic links in linktree. \n", " -f If there are hierarchical tags (tags that have subtags) \n", " create a flat tag directory hierarchy. So directories for\n", - " subtags are at the same directory level like their tqparent tags\n", + " subtags are at the same directory level like their parent tags\n", " -h Print this help \n", " -v Print scripts version number \n"; diff --git a/digikam/utilities/scripts/digitaglinktree.1 b/digikam/utilities/scripts/digitaglinktree.1 index cbc10d2..fdfe9e0 100644 --- a/digikam/utilities/scripts/digitaglinktree.1 +++ b/digikam/utilities/scripts/digitaglinktree.1 @@ -130,7 +130,7 @@ will not run. In digikam photos can have hierachical tags (tags that have subtags). In this case digitaglinktree would by default add a directory for the tag and a subdirectory for each of the subtags of this tag. By setting \fB \-f \fR a subtag is treated like a -regular tag just as its tqparent tag so digitaglinktree will create all subdirectories +regular tag just as its parent tag so digitaglinktree will create all subdirectories for tags and subtags at the same level independent of the tag - subtag hierarchy. .TP diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index e1f30b8..b76156d 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -96,9 +96,9 @@ public: SearchTextBar *searchBar; }; -CameraSelection::CameraSelection( TQWidget* tqparent ) +CameraSelection::CameraSelection( TQWidget* parent ) : KDialogBase(Plain, i18n("Camera Configuration"), - Help|Ok|Cancel, Ok, tqparent, 0, true, true) + Help|Ok|Cancel, Ok, parent, 0, true, true) { d = new CameraSelectionPriv; diff --git a/digikam/utilities/setup/cameraselection.h b/digikam/utilities/setup/cameraselection.h index 0b96cbe..04e2fbc 100644 --- a/digikam/utilities/setup/cameraselection.h +++ b/digikam/utilities/setup/cameraselection.h @@ -48,7 +48,7 @@ class CameraSelection : public KDialogBase public: - CameraSelection(TQWidget *tqparent=0); + CameraSelection(TQWidget *parent=0); ~CameraSelection(); void setCamera(const TQString& title, const TQString& model, diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index 2bfece7..bdfe3d0 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -132,8 +132,8 @@ public: SetupPlugins *pluginsPage; }; -Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page) - : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent, +Setup::Setup(TQWidget* parent, const char* name, Setup::Page page) + : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent, name, true, true ) { d = new SetupPrivate; diff --git a/digikam/utilities/setup/setup.h b/digikam/utilities/setup/setup.h index f266e84..a94a21c 100644 --- a/digikam/utilities/setup/setup.h +++ b/digikam/utilities/setup/setup.h @@ -62,7 +62,7 @@ public: Miscellaneous }; - Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed); + Setup(TQWidget* parent=0, const char* name=0, Page page=LastPageUsed); ~Setup(); SetupPlugins *kipiPluginsPage(); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 4495314..02ffab6 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -75,12 +75,12 @@ public: TQListView *listView; }; -SetupCamera::SetupCamera( TQWidget* tqparent ) - : TQWidget( tqparent ) +SetupCamera::SetupCamera( TQWidget* parent ) + : TQWidget( parent ) { d = new SetupCameraPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQGridLayout* groupBoxLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); d->listView = new TQListView( this ); diff --git a/digikam/utilities/setup/setupcamera.h b/digikam/utilities/setup/setupcamera.h index 7ad3fef..addd89e 100644 --- a/digikam/utilities/setup/setupcamera.h +++ b/digikam/utilities/setup/setupcamera.h @@ -41,7 +41,7 @@ class SetupCamera : public TQWidget public: - SetupCamera( TQWidget* tqparent = 0 ); + SetupCamera( TQWidget* parent = 0 ); ~SetupCamera(); void applySettings(); diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index 7b9554e..09d6ffa 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -80,12 +80,12 @@ public: TQPushButton *delCollectionButton; }; -SetupCollections::SetupCollections(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupCollections::SetupCollections(TQWidget* parent ) + : TQWidget(parent) { d = new SetupCollectionsPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQGridLayout *collectionGroupLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupcollections.h b/digikam/utilities/setup/setupcollections.h index 4c9b33b..32046ee 100644 --- a/digikam/utilities/setup/setupcollections.h +++ b/digikam/utilities/setup/setupcollections.h @@ -40,7 +40,7 @@ class SetupCollections : public TQWidget public: - SetupCollections(TQWidget* tqparent = 0); + SetupCollections(TQWidget* parent = 0); ~SetupCollections(); void applySettings(); diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index ebb37f1..afedd31 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -70,12 +70,12 @@ public: KDcrawIface::DcrawSettingsWidget *dcrawSettings; }; -SetupDcraw::SetupDcraw(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupDcraw::SetupDcraw(TQWidget* parent ) + : TQWidget(parent) { d = new SetupDcrawPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); - d->dcrawSettings = new DcrawSettingsWidget(tqparent, DcrawSettingsWidget::SIXTEENBITS); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); + d->dcrawSettings = new DcrawSettingsWidget(parent, DcrawSettingsWidget::SIXTEENBITS); d->dcrawSettings->setItemIconSet(0, SmallIconSet("kdcraw")); d->dcrawSettings->setItemIconSet(1, SmallIconSet("whitebalance")); d->dcrawSettings->setItemIconSet(2, SmallIconSet("lensdistortion")); diff --git a/digikam/utilities/setup/setupdcraw.h b/digikam/utilities/setup/setupdcraw.h index d8f166a..abf46d9 100644 --- a/digikam/utilities/setup/setupdcraw.h +++ b/digikam/utilities/setup/setupdcraw.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupDcraw : public TQWidget public: - SetupDcraw(TQWidget* tqparent = 0); + SetupDcraw(TQWidget* parent = 0); ~SetupDcraw(); void applySettings(); diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index c6e2df8..ef7f4dd 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -73,15 +73,15 @@ public: KColorButton *overExposureColor; }; -SetupEditor::SetupEditor(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupEditor::SetupEditor(TQWidget* parent ) + : TQWidget(parent) { d = new SetupEditorPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); @@ -106,7 +106,7 @@ SetupEditor::SetupEditor(TQWidget* tqparent ) // -------------------------------------------------------- - TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent); + TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), parent); TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup); TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox); diff --git a/digikam/utilities/setup/setupeditor.h b/digikam/utilities/setup/setupeditor.h index 1d3ab10..783cf5c 100644 --- a/digikam/utilities/setup/setupeditor.h +++ b/digikam/utilities/setup/setupeditor.h @@ -40,7 +40,7 @@ class SetupEditor : public TQWidget public: - SetupEditor(TQWidget* tqparent = 0); + SetupEditor(TQWidget* parent = 0); ~SetupEditor(); void applySettings(); diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index 9ff04fd..fd8a72b 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -100,16 +100,16 @@ public: KDialogBase *mainDialog; }; -SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) - : TQWidget(tqparent) +SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog ) + : TQWidget(parent) { d = new SetupGeneralPriv; d->mainDialog = dialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQHGroupBox *albumPathBox = new TQHGroupBox(tqparent); + TQHGroupBox *albumPathBox = new TQHGroupBox(parent); albumPathBox->setTitle(i18n("Album &Library Path")); d->albumPathEdit = new KURLRequester(albumPathBox); @@ -129,7 +129,7 @@ SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - TQVGroupBox *iconTextGroup = new TQVGroupBox(i18n("Thumbnail Information"), tqparent); + TQVGroupBox *iconTextGroup = new TQVGroupBox(i18n("Thumbnail Information"), parent); d->iconShowNameBox = new TQCheckBox(i18n("Show file &name"), iconTextGroup); TQWhatsThis::add( d->iconShowNameBox, i18n("<p>Set this option to show the file name below the image thumbnail.")); @@ -165,7 +165,7 @@ SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); interfaceOptionsGroup->tqlayout()->setMargin(KDialog::marginHint()); TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->tqlayout(), 3, 4, KDialog::spacingHint()); diff --git a/digikam/utilities/setup/setupgeneral.h b/digikam/utilities/setup/setupgeneral.h index f3a4b43..8621b55 100644 --- a/digikam/utilities/setup/setupgeneral.h +++ b/digikam/utilities/setup/setupgeneral.h @@ -43,7 +43,7 @@ class SetupGeneral : public TQWidget public: - SetupGeneral(TQWidget* tqparent = 0, KDialogBase* dialog = 0); + SetupGeneral(TQWidget* parent = 0, KDialogBase* dialog = 0); ~SetupGeneral(); void applySettings(); diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 1cb4368..971824a 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -145,16 +145,16 @@ public: SqueezedComboBox *monitorProfilesKC; }; -SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) - : TQWidget(tqparent) +SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog ) + : TQWidget(parent) { d = new SetupICCPriv(); d->mainDialog = dialog; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), tqparent); + TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); TQGridLayout* grid = new TQGridLayout( colorPolicy->tqlayout(), 1, 2, KDialog::spacingHint()); d->enableColorManagement = new TQCheckBox(colorPolicy); @@ -197,7 +197,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->defaultPathGB = new TQHGroupBox(tqparent); + d->defaultPathGB = new TQHGroupBox(parent); d->defaultPathGB->setTitle(i18n("Color Profiles Directory")); d->defaultPathKU = new KURLRequester(d->defaultPathGB); @@ -210,7 +210,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), tqparent); + d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->tqlayout(), 4, 3, KDialog::spacingHint()); grid2->setColStretch(2, 10); @@ -293,7 +293,7 @@ SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) // -------------------------------------------------------- - d->advancedSettingsGB = new TQVGroupBox(i18n("Advanced Settings"), tqparent); + d->advancedSettingsGB = new TQVGroupBox(i18n("Advanced Settings"), parent); d->bpcAlgorithm = new TQCheckBox(d->advancedSettingsGB); d->bpcAlgorithm->setText(i18n("Use black point compensation")); diff --git a/digikam/utilities/setup/setupicc.h b/digikam/utilities/setup/setupicc.h index 7942240..f902f1e 100644 --- a/digikam/utilities/setup/setupicc.h +++ b/digikam/utilities/setup/setupicc.h @@ -49,7 +49,7 @@ class DIGIKAM_EXPORT SetupICC : public TQWidget public: - SetupICC(TQWidget* tqparent = 0, KDialogBase* dialog = 0); + SetupICC(TQWidget* parent = 0, KDialogBase* dialog = 0); ~SetupICC(); void applySettings(); diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index f2514ad..31824e6 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.cpp @@ -66,11 +66,11 @@ public: KLineEdit *copyrightEdit; }; -SetupIdentity::SetupIdentity(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupIdentity::SetupIdentity(TQWidget* parent ) + : TQWidget(parent) { d = new SetupIdentityPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- @@ -78,7 +78,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) TQRegExp asciiRx("[\x20-\x7F]+$"); TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); - TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), tqparent); + TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); TQGridLayout* grid = new TQGridLayout( photographerIdGroup->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); @@ -108,7 +108,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), tqparent); + TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); TQGridLayout* grid2 = new TQGridLayout( creditsGroup->tqlayout(), 2, 1, KDialog::spacingHint()); TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); @@ -171,7 +171,7 @@ SetupIdentity::SetupIdentity(TQWidget* tqparent ) "IPTC text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), tqparent); + "Use contextual help for details.</b>"), parent); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupidentity.h b/digikam/utilities/setup/setupidentity.h index 260f2e5..645b5a7 100644 --- a/digikam/utilities/setup/setupidentity.h +++ b/digikam/utilities/setup/setupidentity.h @@ -40,7 +40,7 @@ class SetupIdentity : public TQWidget public: - SetupIdentity(TQWidget* tqparent = 0); + SetupIdentity(TQWidget* parent = 0); ~SetupIdentity(); void applySettings(); diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index ecc13d4..69a9b52 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -67,37 +67,37 @@ public: JP2KSettings *JPEG2000Options; }; -SetupIOFiles::SetupIOFiles(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupIOFiles::SetupIOFiles(TQWidget* parent ) + : TQWidget(parent) { d = new SetupIOFilesPriv; - TQVBoxLayout* vbox = new TQVBoxLayout(tqparent); + TQVBoxLayout* vbox = new TQVBoxLayout(parent); //-- JPEG Settings ------------------------------------------------------ - d->JPEGOptions = new JPEGSettings(tqparent); - KSeparator *line1 = new KSeparator(Qt::Horizontal, tqparent); + d->JPEGOptions = new JPEGSettings(parent); + KSeparator *line1 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->JPEGOptions); vbox->addWidget(line1); //-- PNG Settings ------------------------------------------------------- - d->PNGOptions = new PNGSettings(tqparent); - KSeparator *line2 = new KSeparator(Qt::Horizontal, tqparent); + d->PNGOptions = new PNGSettings(parent); + KSeparator *line2 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->PNGOptions); vbox->addWidget(line2); //-- TIFF Settings ------------------------------------------------------ - d->TIFFOptions = new TIFFSettings(tqparent); - KSeparator *line3 = new KSeparator(Qt::Horizontal, tqparent); + d->TIFFOptions = new TIFFSettings(parent); + KSeparator *line3 = new KSeparator(Qt::Horizontal, parent); vbox->addWidget(d->TIFFOptions); vbox->addWidget(line3); //-- JPEG 2000 Settings ------------------------------------------------- - d->JPEG2000Options = new JP2KSettings(tqparent); + d->JPEG2000Options = new JP2KSettings(parent); vbox->addWidget(d->JPEG2000Options); vbox->addStretch(10); diff --git a/digikam/utilities/setup/setupiofiles.h b/digikam/utilities/setup/setupiofiles.h index 53ceeff..de935f2 100644 --- a/digikam/utilities/setup/setupiofiles.h +++ b/digikam/utilities/setup/setupiofiles.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupIOFiles : public TQWidget public: - SetupIOFiles(TQWidget* tqparent = 0); + SetupIOFiles(TQWidget* parent = 0); ~SetupIOFiles(); void applySettings(); diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp index 7089c76..0ec4a78 100644 --- a/digikam/utilities/setup/setuplighttable.cpp +++ b/digikam/utilities/setup/setuplighttable.cpp @@ -63,15 +63,15 @@ public: TQCheckBox *loadFullImageSize; }; -SetupLightTable::SetupLightTable(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupLightTable::SetupLightTable(TQWidget* parent ) + : TQWidget(parent) { d = new SetupLightTablePriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent); d->autoSyncPreview = new TQCheckBox(i18n("Synchronize panels automatically"), interfaceOptionsGroup); diff --git a/digikam/utilities/setup/setuplighttable.h b/digikam/utilities/setup/setuplighttable.h index 015172a..7830d0d 100644 --- a/digikam/utilities/setup/setuplighttable.h +++ b/digikam/utilities/setup/setuplighttable.h @@ -40,7 +40,7 @@ class SetupLightTable : public TQWidget public: - SetupLightTable(TQWidget* tqparent = 0); + SetupLightTable(TQWidget* parent = 0); ~SetupLightTable(); void applySettings(); diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index f342435..72e311c 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -85,15 +85,15 @@ public: TQCheckBox *saveCreditsIptcBox; }; -SetupMetadata::SetupMetadata(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupMetadata::SetupMetadata(TQWidget* parent ) + : TQWidget(parent) { d = new SetupMetadataPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), tqparent); + TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); @@ -103,7 +103,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), tqparent); + TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); @@ -124,7 +124,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), tqparent); + TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); @@ -143,7 +143,7 @@ SetupMetadata::SetupMetadata(TQWidget* tqparent ) // -------------------------------------------------------- - TQHBox *hbox = new TQHBox(tqparent); + TQHBox *hbox = new TQHBox(parent); KURLLabel *exiv2LogoLabel = new KURLLabel(hbox); exiv2LogoLabel->setText(TQString()); diff --git a/digikam/utilities/setup/setupmetadata.h b/digikam/utilities/setup/setupmetadata.h index 3a474d0..9fcbd7c 100644 --- a/digikam/utilities/setup/setupmetadata.h +++ b/digikam/utilities/setup/setupmetadata.h @@ -41,7 +41,7 @@ class SetupMetadata : public TQWidget public: - SetupMetadata(TQWidget* tqparent = 0); + SetupMetadata(TQWidget* parent = 0); ~SetupMetadata(); void applySettings(); diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index b86a27d..acf415e 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -76,15 +76,15 @@ public: TQLineEdit *rawFileFilterEdit; }; -SetupMime::SetupMime(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupMime::SetupMime(TQWidget* parent ) + : TQWidget(parent) { d = new SetupMimePriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), tqparent); + TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); @@ -115,7 +115,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), tqparent); + TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); @@ -146,7 +146,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), tqparent); + TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); @@ -177,7 +177,7 @@ SetupMime::SetupMime(TQWidget* tqparent ) // -------------------------------------------------------- - TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), tqparent); + TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); diff --git a/digikam/utilities/setup/setupmime.h b/digikam/utilities/setup/setupmime.h index 190ef55..3d909b3 100644 --- a/digikam/utilities/setup/setupmime.h +++ b/digikam/utilities/setup/setupmime.h @@ -40,7 +40,7 @@ class SetupMime : public TQWidget public: - SetupMime(TQWidget* tqparent = 0); + SetupMime(TQWidget* parent = 0); ~SetupMime(); void applySettings(); diff --git a/digikam/utilities/setup/setupmisc.cpp b/digikam/utilities/setup/setupmisc.cpp index 6981bb2..601189d 100644 --- a/digikam/utilities/setup/setupmisc.cpp +++ b/digikam/utilities/setup/setupmisc.cpp @@ -59,12 +59,12 @@ public: TQCheckBox* scanAtStart; }; -SetupMisc::SetupMisc(TQWidget* tqparent) - : TQWidget( tqparent ) +SetupMisc::SetupMisc(TQWidget* parent) + : TQWidget( parent ) { d = new SetupMiscPriv; - TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *mainLayout = new TQVBoxLayout(parent); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupmisc.h b/digikam/utilities/setup/setupmisc.h index 38b15f6..92918ba 100644 --- a/digikam/utilities/setup/setupmisc.h +++ b/digikam/utilities/setup/setupmisc.h @@ -38,7 +38,7 @@ class SetupMisc : public TQWidget { public: - SetupMisc(TQWidget* tqparent); + SetupMisc(TQWidget* parent); ~SetupMisc(); void applySettings(); diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp index 53e6e90..7d7f097 100644 --- a/digikam/utilities/setup/setupplugins.cpp +++ b/digikam/utilities/setup/setupplugins.cpp @@ -66,15 +66,15 @@ public: KIPI::ConfigWidget* kipiConfig; }; -SetupPlugins::SetupPlugins(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupPlugins::SetupPlugins(TQWidget* parent ) + : TQWidget(parent) { d = new SetupPluginsPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent); - d->pluginsNumber = new TQLabel(tqparent); + TQVBoxLayout *tqlayout = new TQVBoxLayout(parent); + d->pluginsNumber = new TQLabel(parent); d->pluginsNumber->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); - d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( tqparent ); + d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( parent ); TQString pluginsListHelp = i18n("<p>A list of available Kipi plugins appears below."); TQWhatsThis::add(d->kipiConfig, pluginsListHelp); diff --git a/digikam/utilities/setup/setupplugins.h b/digikam/utilities/setup/setupplugins.h index 667872e..82bca1d 100644 --- a/digikam/utilities/setup/setupplugins.h +++ b/digikam/utilities/setup/setupplugins.h @@ -40,7 +40,7 @@ class SetupPlugins : public TQWidget public: - SetupPlugins(TQWidget* tqparent = 0); + SetupPlugins(TQWidget* parent = 0); ~SetupPlugins(); void initPlugins(int kipiPluginsNumber); diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp index c0416fb..886c8bf 100644 --- a/digikam/utilities/setup/setupslideshow.cpp +++ b/digikam/utilities/setup/setupslideshow.cpp @@ -73,40 +73,40 @@ public: KIntNumInput *delayInput; }; -SetupSlideShow::SetupSlideShow(TQWidget* tqparent ) - : TQWidget(tqparent) +SetupSlideShow::SetupSlideShow(TQWidget* parent ) + : TQWidget(parent) { d = new SetupSlideShowPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent ); - d->delayInput = new KIntNumInput(5, tqparent); + d->delayInput = new KIntNumInput(5, parent); d->delayInput->setRange(1, 3600, 1, true ); d->delayInput->setLabel( i18n("&Delay between images:"), AlignLeft|AlignTop ); TQWhatsThis::add( d->delayInput, i18n("<p>The delay, in seconds, between images.")); - d->startWithCurrent = new TQCheckBox(i18n("Start with current image"), tqparent); + d->startWithCurrent = new TQCheckBox(i18n("Start with current image"), parent); TQWhatsThis::add( d->startWithCurrent, i18n("<p>If this option is enabled, slideshow will be started " "with currently selected image.")); - d->loopMode = new TQCheckBox(i18n("Display in a loop"), tqparent); + d->loopMode = new TQCheckBox(i18n("Display in a loop"), parent); TQWhatsThis::add( d->loopMode, i18n("<p>Run the slideshow in endless repetition.")); - d->printName = new TQCheckBox(i18n("Print image file name"), tqparent); + d->printName = new TQCheckBox(i18n("Print image file name"), parent); TQWhatsThis::add( d->printName, i18n("<p>Print the image file name at the bottom of the screen.")); - d->printDate = new TQCheckBox(i18n("Print image creation date"), tqparent); + d->printDate = new TQCheckBox(i18n("Print image creation date"), parent); TQWhatsThis::add( d->printDate, i18n("<p>Print the image creation time/date at the bottom of the screen.")); - d->printApertureFocal = new TQCheckBox(i18n("Print camera aperture and focal length"), tqparent); + d->printApertureFocal = new TQCheckBox(i18n("Print camera aperture and focal length"), parent); TQWhatsThis::add( d->printApertureFocal, i18n("<p>Print the camera aperture and focal length at the bottom of the screen.")); - d->printExpoSensitivity = new TQCheckBox(i18n("Print camera exposure and sensitivity"), tqparent); + d->printExpoSensitivity = new TQCheckBox(i18n("Print camera exposure and sensitivity"), parent); TQWhatsThis::add( d->printExpoSensitivity, i18n("<p>Print the camera exposure and sensitivity at the bottom of the screen.")); - d->printMakeModel = new TQCheckBox(i18n("Print camera make and model"), tqparent); + d->printMakeModel = new TQCheckBox(i18n("Print camera make and model"), parent); TQWhatsThis::add( d->printMakeModel, i18n("<p>Print the camera make and model at the bottom of the screen.")); - d->printComment = new TQCheckBox(i18n("Print image caption"), tqparent); + d->printComment = new TQCheckBox(i18n("Print image caption"), parent); TQWhatsThis::add( d->printComment, i18n("<p>Print the image caption at the bottom of the screen.")); tqlayout->addWidget(d->delayInput); diff --git a/digikam/utilities/setup/setupslideshow.h b/digikam/utilities/setup/setupslideshow.h index 14db3be..3b87795 100644 --- a/digikam/utilities/setup/setupslideshow.h +++ b/digikam/utilities/setup/setupslideshow.h @@ -44,7 +44,7 @@ class DIGIKAM_EXPORT SetupSlideShow : public TQWidget public: - SetupSlideShow(TQWidget* tqparent = 0); + SetupSlideShow(TQWidget* parent = 0); ~SetupSlideShow(); void applySettings(); diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index 7070bcd..74e30bd 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -100,13 +100,13 @@ public: TQVGroupBox *digikamSettingBox; }; -SetupToolTip::SetupToolTip(TQWidget* tqparent) - : TQWidget(tqparent) +SetupToolTip::SetupToolTip(TQWidget* parent) + : TQWidget(parent) { d = new SetupToolTipPriv; - TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() ); - d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), tqparent); + d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), parent); TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when " "the mouse hovers over an album item.")); @@ -114,7 +114,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent); + d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), parent); d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox); TQWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name.")); @@ -135,7 +135,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent); + d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), parent); d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox); TQWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the " @@ -168,7 +168,7 @@ SetupToolTip::SetupToolTip(TQWidget* tqparent) // -------------------------------------------------------- - d->digikamSettingBox = new TQVGroupBox(i18n("digiKam Information"), tqparent); + d->digikamSettingBox = new TQVGroupBox(i18n("digiKam Information"), parent); d->showAlbumNameBox = new TQCheckBox(i18n("Show album name"), d->digikamSettingBox); TQWhatsThis::add( d->showAlbumNameBox, i18n("<p>Set this option to display the album name.")); diff --git a/digikam/utilities/setup/setuptooltip.h b/digikam/utilities/setup/setuptooltip.h index 094d3af..06af9fe 100644 --- a/digikam/utilities/setup/setuptooltip.h +++ b/digikam/utilities/setup/setuptooltip.h @@ -40,7 +40,7 @@ class SetupToolTip : public TQWidget public: - SetupToolTip(TQWidget* tqparent = 0); + SetupToolTip(TQWidget* parent = 0); ~SetupToolTip(); void applySettings(); diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index a90166c..6f0a5b4 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -63,8 +63,8 @@ public: TQToolButton *prevBtn; }; -ToolBar::ToolBar(TQWidget* tqparent) - : TQWidget(tqparent) +ToolBar::ToolBar(TQWidget* parent) + : TQWidget(parent) { d = new ToolBarPriv; diff --git a/digikam/utilities/slideshow/toolbar.h b/digikam/utilities/slideshow/toolbar.h index 82c5442..88cfa8a 100644 --- a/digikam/utilities/slideshow/toolbar.h +++ b/digikam/utilities/slideshow/toolbar.h @@ -45,7 +45,7 @@ class DIGIKAM_EXPORT ToolBar : public TQWidget public: - ToolBar(TQWidget* tqparent); + ToolBar(TQWidget* parent); ~ToolBar(); bool canHide() const; |