diff options
Diffstat (limited to 'digikam/digikam')
88 files changed, 942 insertions, 942 deletions
diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index ef46b5a..9b08d5c 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -323,7 +323,7 @@ AlbumInfo::List AlbumDB::scanAlbums() ++it; info.url = *it; ++it; - info.date = TQDate::fromString(*it, Qt::ISODate); + info.date = TQDate::fromString(*it, TQt::ISODate); ++it; info.caption = *it; ++it; @@ -433,7 +433,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption, execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) " "VALUES('%1', '%2', '%3', '%4');") .arg(escapeString(url), - date.toString(Qt::ISODate), + date.toString(TQt::ISODate), escapeString(caption), escapeString(collection))); @@ -458,7 +458,7 @@ void AlbumDB::setAlbumCollection(int albumID, const TQString& collection) void AlbumDB::setAlbumDate(int albumID, const TQDate& date) { execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;") - .arg(date.toString(Qt::ISODate)) + .arg(date.toString(TQt::ISODate)) .arg(albumID) ); } @@ -766,7 +766,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID) if (values.isEmpty()) return TQDateTime(); else - return TQDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], TQt::ISODate); } TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) @@ -782,7 +782,7 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) if (values.isEmpty()) return TQDateTime(); else - return TQDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], TQt::ISODate); } TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name) @@ -1027,7 +1027,7 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder) execSql( TQString ("INSERT INTO Albums (url, date) " "VALUES ('%1','%2')") .arg(escapeString(folder), - TQDateTime::currentDateTime().toString(Qt::ISODate)) ); + TQDateTime::currentDateTime().toString(TQt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else albumID = values[0].toInt(); @@ -1046,7 +1046,7 @@ TQ_LLONG AlbumDB::addItem(int albumID, "( caption , datetime, name, dirid ) " " VALUES ('%1','%2','%3',%4) " ) .arg(escapeString(comment), - datetime.toString(Qt::ISODate), + datetime.toString(TQt::ISODate), escapeString(name), TQString::number(albumID)) ); @@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID, { execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE id=%2;") - .arg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(TQt::ISODate), TQString::number(imageID)) ); return true; @@ -1289,7 +1289,7 @@ bool AlbumDB::setItemDate(int albumID, const TQString& name, { execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE dirid=%2 AND name='%3';") - .arg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(TQt::ISODate), TQString::number(albumID), escapeString(name)) ); @@ -1456,7 +1456,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID) execSql( TQString("SELECT MIN(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") .arg( albumID ), &values); - TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); + TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate ); return itemDate; } @@ -1466,7 +1466,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID) execSql( TQString("SELECT MAX(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") .arg( albumID ), &values); - TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); + TQDate itemDate = TQDate::fromString( values[0], TQt::ISODate ); return itemDate; } @@ -1482,7 +1482,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID) for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { - TQDateTime itemDateTime = TQDateTime::fromString( *it, Qt::ISODate ); + TQDateTime itemDateTime = TQDateTime::fromString( *it, TQt::ISODate ); if (itemDateTime.isValid()) { ++amountOfImages; diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index 9d84999..6e9048a 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -273,40 +273,40 @@ AlbumFolderView::AlbumFolderView(TQWidget *parent) setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalPAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(d->albumMan, TQ_SIGNAL(signalPAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } AlbumFolderView::~AlbumFolderView() @@ -825,8 +825,8 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) u.setProtocol("file"); u.setPath(album->folderPath()); TDEIO::Job* job = DIO::del(u, useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::addAlbumChildrenToList(KURL::List &list, Album *album) @@ -1082,8 +1082,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) destAlbum = itemDrop->album(); } TDEIO::Job* job = DIO::move(album->kurl(), destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } } else if (AlbumSettings::instance()->getAlbumSortOrder() @@ -1208,8 +1208,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 10: { TDEIO::Job* job = DIO::move(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); // In recurssive album contents mode, we need to force AlbumLister to take a care about // moved items. This will have no incidence in normal mode. @@ -1223,8 +1223,8 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 11: { TDEIO::Job* job = DIO::copy(extUrls, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 12: @@ -1334,15 +1334,15 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destAlbum->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1393,8 +1393,8 @@ void AlbumFolderView::albumImportFolder() return; TDEIO::Job* job = DIO::copy(urls, parent->kurl()); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job *))); } void AlbumFolderView::selectItem(int id) diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index 2cbd4c7..b02e57a 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -49,7 +49,7 @@ class AlbumFolderViewPriv; class AlbumFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumhistory.h b/digikam/digikam/albumhistory.h index 18d0d98..585dad8 100644 --- a/digikam/digikam/albumhistory.h +++ b/digikam/digikam/albumhistory.h @@ -46,7 +46,7 @@ class HistoryItem; */ class AlbumHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index 2d3a7a4..88d6a3d 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -218,63 +218,63 @@ AlbumIconView::AlbumIconView(TQWidget* parent) // -- ImageLister connections ------------------------------------- - connect(d->imageLister, TQT_SIGNAL(signalNewFilteredItems(const ImageInfoList&)), - this, TQT_SLOT(slotImageListerNewItems(const ImageInfoList&))); + connect(d->imageLister, TQ_SIGNAL(signalNewFilteredItems(const ImageInfoList&)), + this, TQ_SLOT(slotImageListerNewItems(const ImageInfoList&))); - connect(d->imageLister, TQT_SIGNAL(signalDeleteFilteredItem(ImageInfo*)), - this, TQT_SLOT(slotImageListerDeleteItem(ImageInfo*)) ); + connect(d->imageLister, TQ_SIGNAL(signalDeleteFilteredItem(ImageInfo*)), + this, TQ_SLOT(slotImageListerDeleteItem(ImageInfo*)) ); - connect(d->imageLister, TQT_SIGNAL(signalClear()), - this, TQT_SLOT(slotImageListerClear())); + connect(d->imageLister, TQ_SIGNAL(signalClear()), + this, TQ_SLOT(slotImageListerClear())); // -- Icon connections -------------------------------------------- - connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(this, TQT_SIGNAL(signalReturnPressed(IconItem*)), - this, TQT_SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQ_SIGNAL(signalReturnPressed(IconItem*)), + this, TQ_SLOT(slotDoubleClicked(IconItem*))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(IconItem*, const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(IconItem*, const TQPoint &))); - connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); + connect(this, TQ_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(signalShowToolTip(IconItem*)), - this, TQT_SLOT(slotShowToolTip(IconItem*))); + connect(this, TQ_SIGNAL(signalShowToolTip(IconItem*)), + this, TQ_SLOT(slotShowToolTip(IconItem*))); // -- ThemeEngine connections --------------------------------------- - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + TQ_SLOT(slotThemeChanged())); // -- Pixmap manager connections ------------------------------------ - connect(d->pixMan, TQT_SIGNAL(signalPixmap(const KURL&)), - TQT_SLOT(slotGotThumbnail(const KURL&))); + connect(d->pixMan, TQ_SIGNAL(signalPixmap(const KURL&)), + TQ_SLOT(slotGotThumbnail(const KURL&))); // -- ImageAttributesWatch connections ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImagesChanged(int)), - this, TQT_SLOT(slotAlbumImagesChanged(int))); + connect(watch, TQ_SIGNAL(signalImagesChanged(int)), + this, TQ_SLOT(slotAlbumImagesChanged(int))); - connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), - this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); + connect(watch, TQ_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQ_SLOT(slotImageAttributesChanged(TQ_LLONG))); } AlbumIconView::~AlbumIconView() @@ -524,7 +524,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos) } TQPopupMenu popmenu(this); - TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); + TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) @@ -593,8 +593,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) if (!man->albumDB()->hasTags(selectedImageIDs)) gotoMenu.setItemEnabled(gotoTagId, false); - connect(gotoTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotGotoTag(int))); + connect(gotoTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotGotoTag(int))); if (d->currentAlbum->type() == Album::PHYSICAL ) { @@ -682,8 +682,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) // -------------------------------------------------------- - TDEAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0); - TDEAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); + TDEAction *copy = KStdAction::copy(this, TQ_SLOT(slotCopy()), 0); + TDEAction *paste = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0); TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { @@ -706,11 +706,11 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) TagsPopupMenu* assignTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::ASSIGN); TagsPopupMenu* removeTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::REMOVE); - connect(assignTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsPopup, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsPopup, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); popmenu.insertItem(i18n("Assign Tag"), assignTagsPopup); @@ -728,8 +728,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) RatingPopupMenu ratingMenu; - connect(&ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(&ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), &ratingMenu); @@ -888,8 +888,8 @@ void AlbumIconView::slotPaste() KURLDrag::decode(data, srcURLs); TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } else if(d->currentAlbum->type() == Album::TAG && ItemDrag::canDecode(data)) { @@ -982,10 +982,10 @@ void AlbumIconView::slotRename(AlbumIconItem* item) newURL.setFileName(newName + ext); TDEIO::CopyJob* job = DIO::rename(oldURL, newURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), - this, TQT_SLOT(slotRenamed(TDEIO::Job*, const KURL &, const KURL&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(copyingDone(TDEIO::Job *, const KURL &, const KURL &, bool, bool)), + this, TQ_SLOT(slotRenamed(TDEIO::Job*, const KURL &, const KURL&))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1038,8 +1038,8 @@ void AlbumIconView::slotDeleteSelectedItems(bool deletePermanently) // trash does not like non-local URLs, put is not implemented TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList, useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1069,8 +1069,8 @@ void AlbumIconView::slotDeleteSelectedItemsDirectly(bool useTrash) // trash does not like non-local URLs, put is not implemented TDEIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList , useTrash); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); } void AlbumIconView::slotFilesModified() @@ -1156,17 +1156,17 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) imview->disconnect(this); - connect(imview, TQT_SIGNAL(signalFileAdded(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(imview, TQ_SIGNAL(signalFileAdded(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(imview, TQT_SIGNAL(signalFileModified(const KURL&)), - this, TQT_SLOT(slotFilesModified(const KURL&))); + connect(imview, TQ_SIGNAL(signalFileModified(const KURL&)), + this, TQ_SLOT(slotFilesModified(const KURL&))); - connect(imview, TQT_SIGNAL(signalFileDeleted(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(imview, TQ_SIGNAL(signalFileDeleted(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(imview, TQT_SIGNAL(signalURLChanged(const KURL&)), - this, TQT_SLOT(slotImageWindowURLChanged(const KURL &))); + connect(imview, TQ_SIGNAL(signalURLChanged(const KURL&)), + this, TQ_SLOT(slotImageWindowURLChanged(const KURL &))); imview->loadImageInfos(imageInfoList, currentImageInfo, @@ -1207,11 +1207,11 @@ void AlbumIconView::insertToLightTable(const ImageInfoList& list, ImageInfo* cur ltview->disconnect(this); - connect(ltview, TQT_SIGNAL(signalFileDeleted(const KURL&)), - this, TQT_SLOT(slotFilesModified())); + connect(ltview, TQ_SIGNAL(signalFileDeleted(const KURL&)), + this, TQ_SLOT(slotFilesModified())); - connect(this, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), - ltview, TQT_SLOT(slotItemsUpdated(const KURL::List&))); + connect(this, TQ_SIGNAL(signalItemsUpdated(const KURL::List&)), + ltview, TQ_SLOT(slotItemsUpdated(const KURL::List&))); if (ltview->isHidden()) ltview->show(); @@ -1414,15 +1414,15 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: @@ -1452,15 +1452,15 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) case 10: { TDEIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } case 11: { TDEIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDIOResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDIOResult(TDEIO::Job*))); break; } default: diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index 612d545..0239a39 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -62,7 +62,7 @@ class AlbumIconViewPrivate; class AlbumIconView : public IconView, public AlbumItemHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index e45566b..85a7c5f 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -93,20 +93,20 @@ AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* parent) setSpacing(KDialog::spacingHint()); setMargin(0); - connect(d->ratingFilter, TQT_SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), - this, TQT_SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); + connect(d->ratingFilter, TQ_SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), + this, TQ_SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); - connect(d->mimeFilter, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMimeTypeFilterChanged(int))); + connect(d->mimeFilter, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMimeTypeFilterChanged(int))); - connect(d->textFilter, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotTextFilterChanged(const TQString&))); + connect(d->textFilter, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotTextFilterChanged(const TQString&))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsTextFilterMatch(bool)), - d->textFilter, TQT_SLOT(slotSearchResult(bool))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalItemsTextFilterMatch(bool)), + d->textFilter, TQ_SLOT(slotSearchResult(bool))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsFilterMatch(bool)), - this, TQT_SLOT(slotItemsFilterMatch(bool))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalItemsFilterMatch(bool)), + this, TQ_SLOT(slotItemsFilterMatch(bool))); } AlbumIconViewFilter::~AlbumIconViewFilter() @@ -186,12 +186,12 @@ void AlbumIconViewFilter::slotItemsFilterMatch(bool match) bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); if (e->type() == TQEvent::MouseButtonRelease) { - TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) + TQMouseEvent* event = static_cast<TQMouseEvent*>(e); + if ( widget->rect().contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) { // Reset all filters settings. d->textFilter->setText(TQString()); diff --git a/digikam/digikam/albumiconviewfilter.h b/digikam/digikam/albumiconviewfilter.h index c001319..8fdbaa6 100644 --- a/digikam/digikam/albumiconviewfilter.h +++ b/digikam/digikam/albumiconviewfilter.h @@ -43,7 +43,7 @@ class AlbumIconViewFilterPriv; class AlbumIconViewFilter : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp index 170d033..6364877 100644 --- a/digikam/digikam/albumlister.cpp +++ b/digikam/digikam/albumlister.cpp @@ -134,8 +134,8 @@ AlbumLister::AlbumLister() d->itemList.setAutoDelete(true); d->filterTimer = new TQTimer(this); - connect(d->filterTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotFilterItems())); + connect(d->filterTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotFilterItems())); } AlbumLister::~AlbumLister() @@ -175,11 +175,11 @@ void AlbumLister::openAlbum(Album *album) d->job = new TDEIO::TransferJob(album->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::refresh() @@ -214,11 +214,11 @@ void AlbumLister::refresh() d->job = new TDEIO::TransferJob(d->currAlbum->kurl(), TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void AlbumLister::setDayFilter(const TQValueList<TQDateTime>& days) @@ -618,7 +618,7 @@ void AlbumLister::slotData(TDEIO::Job*, const TQByteArray& data) } ImageInfo* info = new ImageInfo(imageID, albumID, name, - TQDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, TQt::ISODate), size, dims); if (matchesFilter(info, foundText)) diff --git a/digikam/digikam/albumlister.h b/digikam/digikam/albumlister.h index b9f980a..7c14e4c 100644 --- a/digikam/digikam/albumlister.h +++ b/digikam/digikam/albumlister.h @@ -59,7 +59,7 @@ class AlbumListerPriv; */ class AlbumLister : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 80b477e..847ce99 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -374,8 +374,8 @@ void AlbumManager::startScan() d->changed = false; d->dirWatch = new KDirWatch(this); - connect(d->dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotDirty(const TQString&))); + connect(d->dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotDirty(const TQString&))); KDirWatch::Method m = d->dirWatch->internalMethod(); TQString mName("FAM"); @@ -545,11 +545,11 @@ void AlbumManager::scanPAlbums() ba, TQByteArray(), false); d->albumListJob->addMetaData("folders", "yes"); - connect(d->albumListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotAlbumsJobResult(TDEIO::Job*))); + connect(d->albumListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotAlbumsJobResult(TDEIO::Job*))); - connect(d->albumListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotAlbumsJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->albumListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotAlbumsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanTAlbums() @@ -694,11 +694,11 @@ void AlbumManager::scanTAlbums() ba, TQByteArray(), false); d->tagListJob->addMetaData("folders", "yes"); - connect(d->tagListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotTagsJobResult(TDEIO::Job*))); + connect(d->tagListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotTagsJobResult(TDEIO::Job*))); - connect(d->tagListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotTagsJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->tagListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotTagsJobData(TDEIO::Job*, const TQByteArray&))); } void AlbumManager::scanSAlbums() @@ -764,11 +764,11 @@ void AlbumManager::scanDAlbums() ba, TQByteArray(), false); d->dateListJob->addMetaData("folders", "yes"); - connect(d->dateListJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDatesJobResult(TDEIO::Job*))); + connect(d->dateListJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDatesJobResult(TDEIO::Job*))); - connect(d->dateListJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotDatesJobData(TDEIO::Job*, const TQByteArray&))); + connect(d->dateListJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotDatesJobData(TDEIO::Job*, const TQByteArray&))); } AlbumList AlbumManager::allPAlbums() const diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 3e79033..3244f5a 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -86,7 +86,7 @@ typedef TQPair<int, int> YearMonth; */ class DIGIKAM_EXPORT AlbumManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index 7983f42..703d8c4 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -141,7 +141,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) titleLabel->setBuddy( d->titleEdit ); TQRegExp titleRx("[^/]+"); - TQValidator *titleValidator = new TQRegExpValidator(titleRx, TQT_TQOBJECT(this)); + TQValidator *titleValidator = new TQRegExpValidator(titleRx, this); d->titleEdit->setValidator(titleValidator); TQLabel *collectionLabel = new TQLabel( plainPage( ) ); @@ -223,17 +223,17 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) // -- slots connections ------------------------------------------- - connect(d->titleEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleChanged(const TQString&))); + connect(d->titleEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleChanged(const TQString&))); - connect(dateLowButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateLowButtonClicked())); + connect(dateLowButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateLowButtonClicked())); - connect(dateAvgButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateAverageButtonClicked())); + connect(dateAvgButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateAverageButtonClicked())); - connect(dateHighButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDateHighButtonClicked())); + connect(dateHighButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDateHighButtonClicked())); adjustSize(); } diff --git a/digikam/digikam/albumpropsedit.h b/digikam/digikam/albumpropsedit.h index 55c9bba..cd8f756 100644 --- a/digikam/digikam/albumpropsedit.h +++ b/digikam/digikam/albumpropsedit.h @@ -44,7 +44,7 @@ class AlbumPropsEditPriv; class AlbumPropsEdit : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp index 4e5c94d..1fe2065 100644 --- a/digikam/digikam/albumthumbnailloader.cpp +++ b/digikam/digikam/albumthumbnailloader.cpp @@ -110,11 +110,11 @@ AlbumThumbnailLoader::AlbumThumbnailLoader() { d = new AlbumThumbnailLoaderPrivate; - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotIconChanged(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotIconChanged(Album*))); } @@ -281,11 +281,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconTagThumbJob, - TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconTagThumbJob, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotThumbnailLost(const KURL&))); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotThumbnailLost(const KURL&))); } else { @@ -301,11 +301,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconAlbumThumbJob, - TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconAlbumThumbJob, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotThumbnailLost(const KURL&))); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotThumbnailLost(const KURL&))); } else { diff --git a/digikam/digikam/albumthumbnailloader.h b/digikam/digikam/albumthumbnailloader.h index f126207..9d08c5a 100644 --- a/digikam/digikam/albumthumbnailloader.h +++ b/digikam/digikam/albumthumbnailloader.h @@ -45,7 +45,7 @@ class AlbumThumbnailLoaderPrivate; class AlbumThumbnailLoader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp index a83df0c..79b1959 100644 --- a/digikam/digikam/albumwidgetstack.cpp +++ b/digikam/digikam/albumwidgetstack.cpp @@ -85,29 +85,29 @@ AlbumWidgetStack::AlbumWidgetStack(TQWidget *parent) // ----------------------------------------------------------------- - connect(d->imagePreviewView, TQT_SIGNAL(signalNextItem()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalNextItem()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalPrevItem()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalPrevItem()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalEditItem()), - this, TQT_SIGNAL(signalEditItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalEditItem()), + this, TQ_SIGNAL(signalEditItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalDeleteItem()), - this, TQT_SIGNAL(signalDeleteItem())); + connect(d->imagePreviewView, TQ_SIGNAL(signalDeleteItem()), + this, TQ_SIGNAL(signalDeleteItem())); - connect(d->imagePreviewView, TQT_SIGNAL(signalBack2Album()), - this, TQT_SIGNAL(signalBack2Album())); + connect(d->imagePreviewView, TQ_SIGNAL(signalBack2Album()), + this, TQ_SIGNAL(signalBack2Album())); - connect(d->imagePreviewView, TQT_SIGNAL(signalSlideShow()), - this, TQT_SIGNAL(signalSlideShow())); + connect(d->imagePreviewView, TQ_SIGNAL(signalSlideShow()), + this, TQ_SIGNAL(signalSlideShow())); - connect(d->imagePreviewView, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged(double))); + connect(d->imagePreviewView, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged(double))); - connect(d->imagePreviewView, TQT_SIGNAL(signalInsert2LightTable()), - this, TQT_SIGNAL(signalInsert2LightTable())); + connect(d->imagePreviewView, TQ_SIGNAL(signalInsert2LightTable()), + this, TQ_SIGNAL(signalInsert2LightTable())); } AlbumWidgetStack::~AlbumWidgetStack() diff --git a/digikam/digikam/albumwidgetstack.h b/digikam/digikam/albumwidgetstack.h index 6a7daf6..c8a6f6a 100644 --- a/digikam/digikam/albumwidgetstack.h +++ b/digikam/digikam/albumwidgetstack.h @@ -47,7 +47,7 @@ class AlbumWidgetStackPriv; class DIGIKAM_EXPORT AlbumWidgetStack : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index bed6bcf..6a380e0 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -113,7 +113,7 @@ bool CameraList::load() TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!e.attribute("lastaccess").isEmpty()) - lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); + lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), TQt::ISODate); CameraType *ctype = new CameraType(title, model, port, path, lastAccess); insertPrivate(ctype); @@ -141,7 +141,7 @@ bool CameraList::save() elem.setAttribute("model", ctype->model()); elem.setAttribute("port", ctype->port()); elem.setAttribute("path", ctype->path()); - elem.setAttribute("lastaccess", ctype->lastAccess().toString(Qt::ISODate)); + elem.setAttribute("lastaccess", ctype->lastAccess().toString(TQt::ISODate)); docElem.appendChild(elem); } diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index 7e25d98..65ecbce 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -40,7 +40,7 @@ class CameraListPrivate; class CameraList : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 8c4bedb..8e36742 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -195,23 +195,23 @@ DateFolderView::DateFolderView(TQWidget* parent) d->listview->setResizeMode(TQListView::LastColumn); d->listview->setRootIsDecorated(true); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), - this, TQT_SLOT(slotAllDAlbumsLoaded())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAllDAlbumsLoaded()), + this, TQ_SLOT(slotAllDAlbumsLoaded())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - d->listview, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + d->listview, TQ_SLOT(clear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalDAlbumsDirty(const TQMap<YearMonth, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<YearMonth, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalDAlbumsDirty(const TQMap<YearMonth, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<YearMonth, int>&))); - connect(d->listview, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->listview, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } DateFolderView::~DateFolderView() @@ -238,8 +238,8 @@ void DateFolderView::setActive(bool val) void DateFolderView::slotAllDAlbumsLoaded() { - disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), - this, TQT_SLOT(slotAllDAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQ_SIGNAL(signalAllDAlbumsLoaded()), + this, TQ_SLOT(slotAllDAlbumsLoaded())); loadViewState(); } diff --git a/digikam/digikam/datefolderview.h b/digikam/digikam/datefolderview.h index f213ba1..2e467fe 100644 --- a/digikam/digikam/datefolderview.h +++ b/digikam/digikam/datefolderview.h @@ -44,7 +44,7 @@ class DAlbum; class DateFolderView : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/dcopiface.h b/digikam/digikam/dcopiface.h index b203eb9..9367e6b 100644 --- a/digikam/digikam/dcopiface.h +++ b/digikam/digikam/dcopiface.h @@ -44,7 +44,7 @@ namespace Digikam class DCOPIface : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 6d5e583..5b12575 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -138,16 +138,16 @@ DigikamApp::DigikamApp() d->cameraMediaList = new TDEPopupMenu; - connect(d->cameraMediaList, TQT_SIGNAL( aboutToShow() ), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenu())); + connect(d->cameraMediaList, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT(slotCameraMediaMenu())); - d->cameraList = new CameraList(TQT_TQOBJECT(this), locateLocal("appdata", "cameras.xml")); + d->cameraList = new CameraList(this, locateLocal("appdata", "cameras.xml")); - connect(d->cameraList, TQT_SIGNAL(signalCameraAdded(CameraType *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraAdded(CameraType *))); + connect(d->cameraList, TQ_SIGNAL(signalCameraAdded(CameraType *)), + this, TQ_SLOT(slotCameraAdded(CameraType *))); - connect(d->cameraList, TQT_SIGNAL(signalCameraRemoved(CameraType *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraRemoved(CameraType *))); + connect(d->cameraList, TQ_SIGNAL(signalCameraRemoved(CameraType *)), + this, TQ_SLOT(slotCameraRemoved(CameraType *))); setupView(); setupStatusBar(); @@ -191,13 +191,13 @@ DigikamApp::DigikamApp() setAutoSaveSettings(); - d->dcopIface = new DCOPIface(TQT_TQOBJECT(this), "camera"); + d->dcopIface = new DCOPIface(this, "camera"); - connect(d->dcopIface, TQT_SIGNAL(signalCameraAutoDetect()), - TQT_TQOBJECT(this), TQT_SLOT(slotDcopCameraAutoDetect())); + connect(d->dcopIface, TQ_SIGNAL(signalCameraAutoDetect()), + this, TQ_SLOT(slotDcopCameraAutoDetect())); - connect(d->dcopIface, TQT_SIGNAL(signalDownloadImages( const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT(slotDcopDownloadImages(const TQString &))); + connect(d->dcopIface, TQ_SIGNAL(signalDownloadImages( const TQString & )), + this, TQ_SLOT(slotDcopDownloadImages(const TQString &))); } DigikamApp::~DigikamApp() @@ -329,7 +329,7 @@ void DigikamApp::autoDetect() if(d->splashScreen) d->splashScreen->message(i18n("Auto-detect camera")); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCameraAutoDetect())); } void DigikamApp::downloadFrom(const TQString &cameraGuiPath) @@ -343,7 +343,7 @@ void DigikamApp::downloadFrom(const TQString &cameraGuiPath) if(d->splashScreen) d->splashScreen->message(i18n("Opening Download Dialog")); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDownloadImages())); } } @@ -366,14 +366,14 @@ void DigikamApp::setupView() setCentralWidget(d->view); d->view->applySettings(); - connect(d->view, TQT_SIGNAL(signalAlbumSelected(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotAlbumSelected(bool))); + connect(d->view, TQ_SIGNAL(signalAlbumSelected(bool)), + this, TQ_SLOT(slotAlbumSelected(bool))); - connect(d->view, TQT_SIGNAL(signalTagSelected(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotTagSelected(bool))); + connect(d->view, TQ_SIGNAL(signalTagSelected(bool)), + this, TQ_SLOT(slotTagSelected(bool))); - connect(d->view, TQT_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)), - TQT_TQOBJECT(this), TQT_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&))); + connect(d->view, TQ_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)), + this, TQ_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&))); } void DigikamApp::setupStatusBar() @@ -403,41 +403,41 @@ void DigikamApp::setupStatusBar() //------------------------------------------------------------------------------ - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomOut())); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->view, TQ_SLOT(slotZoomOut())); - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomIn())); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->view, TQ_SLOT(slotZoomIn())); - connect(d->statusZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->statusZoomBar, TQ_SIGNAL(signalZoomSliderChanged(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); - connect(d->view, TQT_SIGNAL(signalThumbSizeChanged(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotThumbSizeChanged(int))); + connect(d->view, TQ_SIGNAL(signalThumbSizeChanged(int)), + this, TQ_SLOT(slotThumbSizeChanged(int))); - connect(d->view, TQT_SIGNAL(signalZoomChanged(double, int)), - TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(double, int))); + connect(d->view, TQ_SIGNAL(signalZoomChanged(double, int)), + this, TQ_SLOT(slotZoomChanged(double, int))); - connect(d->view, TQT_SIGNAL(signalTogglePreview(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreview(bool))); + connect(d->view, TQ_SIGNAL(signalTogglePreview(bool)), + this, TQ_SLOT(slotTogglePreview(bool))); - connect(d->albumIconViewFilter, TQT_SIGNAL(signalResetTagFilters()), - TQT_TQOBJECT(this), TQT_SIGNAL(signalResetTagFilters())); + connect(d->albumIconViewFilter, TQ_SIGNAL(signalResetTagFilters()), + this, TQ_SIGNAL(signalResetTagFilters())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalFirstItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotFirstItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalFirstItem()), + d->view, TQ_SLOT(slotFirstItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalNextItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotNextItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalNextItem()), + d->view, TQ_SLOT(slotNextItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalPrevItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalPrevItem()), + d->view, TQ_SLOT(slotPrevItem())); - connect(d->statusNavigateBar, TQT_SIGNAL(signalLastItem()), - TQT_TQOBJECT(d->view), TQT_SLOT(slotLastItem())); + connect(d->statusNavigateBar, TQ_SIGNAL(signalLastItem()), + d->view, TQ_SLOT(slotLastItem())); - connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), - TQT_TQOBJECT(this), TQT_SIGNAL(signalCancelButtonPressed())); + connect(d->statusProgressBar, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SIGNAL(signalCancelButtonPressed())); } void DigikamApp::setupAccelerators() @@ -446,52 +446,52 @@ void DigikamApp::setupAccelerators() d->accelerators->insert("Exit Preview Mode", i18n("Exit Preview"), i18n("Exit preview mode"), - Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(signalEscapePressed()), + Key_Escape, this, TQ_SIGNAL(signalEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Next Image"), - Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), + Key_Space, this, TQ_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Previous Image"), - SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + SHIFT+Key_Space, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Previous Image"), - Key_Backspace, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + Key_Backspace, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Next Image"), - Key_Next, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), + Key_Next, this, TQ_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Previous Image"), - Key_Prior, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), + Key_Prior, this, TQ_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("First Image Key_Home", i18n("First Image"), i18n("First Image"), - Key_Home, TQT_TQOBJECT(this), TQT_SIGNAL(signalFirstItem()), + Key_Home, this, TQ_SIGNAL(signalFirstItem()), false, true); d->accelerators->insert("Last Image Key_End", i18n("Last Image"), i18n("Last Image"), - Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(signalLastItem()), + Key_End, this, TQ_SIGNAL(signalLastItem()), false, true); d->accelerators->insert("Copy Album Items Selection CTRL+Key_C", i18n("Copy Album Items Selection"), i18n("Copy Album Items Selection"), - CTRL+Key_C, TQT_TQOBJECT(this), TQT_SIGNAL(signalCopyAlbumItemsSelection()), + CTRL+Key_C, this, TQ_SIGNAL(signalCopyAlbumItemsSelection()), false, true); d->accelerators->insert("Paste Album Items Selection CTRL+Key_V", i18n("Paste Album Items Selection"), i18n("Paste Album Items Selection"), - CTRL+Key_V, TQT_TQOBJECT(this), TQT_SIGNAL(signalPasteAlbumItemsSelection()), + CTRL+Key_V, this, TQ_SIGNAL(signalPasteAlbumItemsSelection()), false, true); } @@ -508,49 +508,49 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); + connect(d->themeMenuAction, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ----------------------------------------------------------------- d->backwardActionMenu = new TDEToolBarPopupAction(i18n("&Back"), "back", ALT+Key_Left, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumHistoryBack()), + d->view, + TQ_SLOT(slotAlbumHistoryBack()), actionCollection(), "album_back"); d->backwardActionMenu->setEnabled(false); - connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowBackwardMenu())); + connect(d->backwardActionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowBackwardMenu())); - connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryBack(int))); + connect(d->backwardActionMenu->popupMenu(), TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotAlbumHistoryBack(int))); d->forwardActionMenu = new TDEToolBarPopupAction(i18n("Forward"), "forward", ALT+Key_Right, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumHistoryForward()), + d->view, + TQ_SLOT(slotAlbumHistoryForward()), actionCollection(), "album_forward"); d->forwardActionMenu->setEnabled(false); - connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), - TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowForwardMenu())); + connect(d->forwardActionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShowForwardMenu())); - connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryForward(int))); + connect(d->forwardActionMenu->popupMenu(), TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotAlbumHistoryForward(int))); d->newAction = new TDEAction(i18n("&New..."), "albumfolder-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(d->view), - TQT_SLOT(slotNewAlbum()), + d->view, + TQ_SLOT(slotNewAlbum()), actionCollection(), "album_new"); d->newAction->setWhatsThis(i18n("Creates a new empty Album in the database.")); @@ -561,8 +561,8 @@ void DigikamApp::setupActions() actionCollection(), "album_sort"); - connect(d->albumSortAction, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSortAlbums(int))); + connect(d->albumSortAction, TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotSortAlbums(int))); // Use same list order as in albumsettings enum TQStringList sortActionList; @@ -573,41 +573,41 @@ void DigikamApp::setupActions() d->recurseAlbumsAction = new TDEToggleAction(i18n("Include Album Sub-Tree"), 0, - TQT_TQOBJECT(this), + this, 0, actionCollection(), "albums_recursive"); d->recurseAlbumsAction->setWhatsThis(i18n("Activate this option to recursively show all sub-albums below " "the current album.")); - connect(d->recurseAlbumsAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRecurseAlbums(bool))); + connect(d->recurseAlbumsAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRecurseAlbums(bool))); d->recurseTagsAction = new TDEToggleAction(i18n("Include Tag Sub-Tree"), 0, - TQT_TQOBJECT(this), + this, 0, actionCollection(), "tags_recursive"); d->recurseTagsAction->setWhatsThis(i18n("Activate this option to show all images marked by the given tag " "and its all its sub-tags.")); - connect(d->recurseTagsAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool))); + connect(d->recurseTagsAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotRecurseTags(bool))); d->deleteAction = new TDEAction(i18n("Delete"), "edit-delete", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotDeleteAlbum()), + d->view, + TQ_SLOT(slotDeleteAlbum()), actionCollection(), "album_delete"); d->addImagesAction = new TDEAction( i18n("Add Images..."), "albumfolder-importimages", CTRL+Key_I, - TQT_TQOBJECT(this), - TQT_SLOT(slotAlbumAddImages()), + this, + TQ_SLOT(slotAlbumAddImages()), actionCollection(), "album_addImages"); d->addImagesAction->setWhatsThis(i18n("Adds new items to the current Album.")); @@ -615,16 +615,16 @@ void DigikamApp::setupActions() d->albumImportAction = new TDEAction( i18n("Add Folders..."), "albumfolder-importdir", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumImportFolder()), + d->view, + TQ_SLOT(slotAlbumImportFolder()), actionCollection(), "album_importFolder"); d->propsEditAction = new TDEAction( i18n("Properties..."), "albumfolder-properties", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumPropsEdit()), + d->view, + TQ_SLOT(slotAlbumPropsEdit()), actionCollection(), "album_propsEdit"); d->propsEditAction->setWhatsThis(i18n("Edit Album Properties and Collection information.")); @@ -632,8 +632,8 @@ void DigikamApp::setupActions() d->refreshAlbumAction = new TDEAction( i18n("Refresh"), "rebuild", Key_F5, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumRefresh()), + d->view, + TQ_SLOT(slotAlbumRefresh()), actionCollection(), "album_refresh"); d->refreshAlbumAction->setWhatsThis(i18n("Refresh all album contents")); @@ -641,8 +641,8 @@ void DigikamApp::setupActions() d->syncAlbumMetadataAction = new TDEAction( i18n("Synchronize Images with Database"), "rebuild", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumSyncPicturesMetadata()), + d->view, + TQ_SLOT(slotAlbumSyncPicturesMetadata()), actionCollection(), "album_syncmetadata"); d->syncAlbumMetadataAction->setWhatsThis(i18n("Updates all image metadata of the current " @@ -652,23 +652,23 @@ void DigikamApp::setupActions() d->openInKonquiAction = new TDEAction( i18n("Open in File Manager"), "konqueror", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotAlbumOpenInKonqui()), + d->view, + TQ_SLOT(slotAlbumOpenInKonqui()), actionCollection(), "album_openinkonqui"); // ----------------------------------------------------------- d->newTagAction = new TDEAction(i18n("New &Tag..."), "tag-new", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), + 0, d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new"); d->editTagAction = new TDEAction(i18n("Edit Tag Properties..."), "tag-properties", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotEditTag()), + 0, d->view, TQ_SLOT(slotEditTag()), actionCollection(), "tag_edit"); d->deleteTagAction = new TDEAction(i18n("Delete Tag"), "tag-delete", - 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotDeleteTag()), + 0, d->view, TQ_SLOT(slotDeleteTag()), actionCollection(), "tag_delete"); // ----------------------------------------------------------- @@ -676,16 +676,16 @@ void DigikamApp::setupActions() d->imagePreviewAction = new TDEToggleAction(i18n("View..."), "viewimage", Key_F3, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImagePreview()), + d->view, + TQ_SLOT(slotImagePreview()), actionCollection(), "image_view"); d->imageViewAction = new TDEAction(i18n("Edit..."), "editimage", Key_F4, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageEdit()), + d->view, + TQ_SLOT(slotImageEdit()), actionCollection(), "image_edit"); d->imageViewAction->setWhatsThis(i18n("Open the selected item in the image editor.")); @@ -693,8 +693,8 @@ void DigikamApp::setupActions() d->imageLightTableAction = new TDEAction(i18n("Place onto Light Table"), "lighttable", CTRL+Key_L, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageLightTable()), + d->view, + TQ_SLOT(slotImageLightTable()), actionCollection(), "image_lighttable"); d->imageLightTableAction->setWhatsThis(i18n("Place the selected items on the light table thumbbar.")); @@ -702,8 +702,8 @@ void DigikamApp::setupActions() d->imageAddLightTableAction = new TDEAction(i18n("Add to Light Table"), "lighttableadd", SHIFT+CTRL+Key_L, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageAddToLightTable()), + d->view, + TQ_SLOT(slotImageAddToLightTable()), actionCollection(), "image_add_to_lighttable"); d->imageAddLightTableAction->setWhatsThis(i18n("Add selected items to the light table thumbbar.")); @@ -711,8 +711,8 @@ void DigikamApp::setupActions() d->imageRenameAction = new TDEAction(i18n("Rename..."), "pencil", Key_F2, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageRename()), + d->view, + TQ_SLOT(slotImageRename()), actionCollection(), "image_rename"); d->imageRenameAction->setWhatsThis(i18n("Change the filename of the currently selected item.")); @@ -721,8 +721,8 @@ void DigikamApp::setupActions() d->imageDeleteAction = new TDEAction(i18n("Delete"), "edittrash", Key_Delete, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDelete()), + d->view, + TQ_SLOT(slotImageDelete()), actionCollection(), "image_delete"); @@ -730,8 +730,8 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"), "edit-delete", SHIFT+Key_Delete, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDeletePermanently()), + d->view, + TQ_SLOT(slotImageDeletePermanently()), actionCollection(), "image_delete_permanently"); @@ -740,16 +740,16 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"), "edit-delete", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageDeletePermanentlyDirectly()), + d->view, + TQ_SLOT(slotImageDeletePermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); d->imageTrashDirectlyAction = new TDEAction(i18n("Move to trash without confirmation"), "edittrash", 0, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotImageTrashDirectly()), + d->view, + TQ_SLOT(slotImageTrashDirectly()), actionCollection(), "image_trash_directly"); @@ -759,8 +759,8 @@ void DigikamApp::setupActions() actionCollection(), "image_sort"); - connect(d->imageSortAction, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSortImages(int))); + connect(d->imageSortAction, TQ_SIGNAL(activated(int)), + d->view, TQ_SLOT(slotSortImages(int))); // Use same list order as in albumsettings enum TQStringList sortImagesActionList; @@ -773,10 +773,10 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- - TQSignalMapper *exifOrientationMapper = new TQSignalMapper( TQT_TQOBJECT(d->view) ); + TQSignalMapper *exifOrientationMapper = new TQSignalMapper( d->view ); - connect(exifOrientationMapper, TQT_SIGNAL(mapped(int) ), - TQT_TQOBJECT(d->view), TQT_SLOT(slotImageExifOrientation(int))); + connect(exifOrientationMapper, TQ_SIGNAL(mapped(int) ), + d->view, TQ_SLOT(slotImageExifOrientation(int))); d->imageExifOrientationActionMenu = new TDEActionMenu(i18n("Adjust Exif orientation tag"), actionCollection(), @@ -841,29 +841,29 @@ void DigikamApp::setupActions() d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation7Action); d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation8Action); - connect(d->imageSetExifOrientation1Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation1Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation2Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation2Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation3Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation3Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation4Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation4Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation5Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation5Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation6Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation6Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation7Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation7Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); - connect(d->imageSetExifOrientation8Action, TQT_SIGNAL(activated()), - exifOrientationMapper, TQT_SLOT(map())); + connect(d->imageSetExifOrientation8Action, TQ_SIGNAL(activated()), + exifOrientationMapper, TQ_SLOT(map())); exifOrientationMapper->setMapping(d->imageSetExifOrientation1Action, 1); exifOrientationMapper->setMapping(d->imageSetExifOrientation2Action, 2); @@ -879,66 +879,66 @@ void DigikamApp::setupActions() d->selectAllAction = new TDEAction(i18n("Select All"), 0, CTRL+Key_A, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectAll()), + d->view, + TQ_SLOT(slotSelectAll()), actionCollection(), "selectAll"); d->selectNoneAction = new TDEAction(i18n("Select None"), 0, CTRL+SHIFT+Key_A, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectNone()), + d->view, + TQ_SLOT(slotSelectNone()), actionCollection(), "selectNone"); d->selectInvertAction = new TDEAction(i18n("Invert Selection"), 0, CTRL+Key_Asterisk, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSelectInvert()), + d->view, + TQ_SLOT(slotSelectInvert()), actionCollection(), "selectInvert"); // ----------------------------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------- d->zoomPlusAction = new TDEAction(i18n("Zoom In"), "zoom-in", CTRL+Key_Plus, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomIn()), + d->view, + TQ_SLOT(slotZoomIn()), actionCollection(), "album_zoomin"); d->zoomMinusAction = new TDEAction(i18n("Zoom Out"), "zoom-out", CTRL+Key_Minus, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomOut()), + d->view, + TQ_SLOT(slotZoomOut()), actionCollection(), "album_zoomout"); d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "zoom-original", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - TQT_TQOBJECT(d->view), - TQT_SLOT(slotZoomTo100Percents()), + d->view, + TQ_SLOT(slotZoomTo100Percents()), actionCollection(), "album_zoomto100percents"); d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotFitToWindow()), + d->view, + TQ_SLOT(slotFitToWindow()), actionCollection(), "album_zoomfit2window"); @@ -946,8 +946,8 @@ void DigikamApp::setupActions() d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "view-fullscreen", CTRL+SHIFT+Key_F, - TQT_TQOBJECT(this), - TQT_SLOT(slotToggleFullScreen()), + this, + TQ_SLOT(slotToggleFullScreen()), actionCollection(), "full_screen"); d->fullScreenAction->setWhatsThis(i18n("Switch the window to full screen mode")); @@ -958,61 +958,61 @@ void DigikamApp::setupActions() d->slideShowAction->setDelayed(false); d->slideShowAllAction = new TDEAction(i18n("All"), 0, Key_F9, - TQT_TQOBJECT(d->view), TQT_SLOT(slotSlideShowAll()), + d->view, TQ_SLOT(slotSlideShowAll()), actionCollection(), "slideshow_all"); d->slideShowAction->insert(d->slideShowAllAction); d->slideShowSelectionAction = new TDEAction(i18n("Selection"), 0, ALT+Key_F9, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSlideShowSelection()), + d->view, + TQ_SLOT(slotSlideShowSelection()), actionCollection(), "slideshow_selected"); d->slideShowAction->insert(d->slideShowSelectionAction); d->slideShowRecursiveAction = new TDEAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9, - TQT_TQOBJECT(d->view), - TQT_SLOT(slotSlideShowRecursive()), + d->view, + TQ_SLOT(slotSlideShowRecursive()), actionCollection(), "slideshow_recursive"); d->slideShowAction->insert(d->slideShowRecursiveAction); - d->quitAction = KStdAction::quit(TQT_TQOBJECT(this), - TQT_SLOT(slotExit()), + d->quitAction = KStdAction::quit(this, + TQ_SLOT(slotExit()), actionCollection(), "app_exit"); d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotRawCameraList()), + this, + TQ_SLOT(slotRawCameraList()), actionCollection(), "help_rawcameralist"); d->kipiHelpAction = new TDEAction(i18n("Kipi Plugins Handbook"), "kipi", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotShowKipiHelp()), + this, + TQ_SLOT(slotShowKipiHelp()), actionCollection(), "help_kipi"); - d->tipAction = KStdAction::tipOfDay(TQT_TQOBJECT(this), - TQT_SLOT(slotShowTip()), + d->tipAction = KStdAction::tipOfDay(this, + TQ_SLOT(slotShowTip()), actionCollection(), "help_tipofday"); d->donateMoneyAction = new TDEAction(i18n("Donate..."), 0, 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotDonateMoney()), + this, + TQ_SLOT(slotDonateMoney()), actionCollection(), "help_donatemoney"); d->contributeAction = new TDEAction(i18n("Contribute..."), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), + this, TQ_SLOT(slotContribute()), actionCollection(), "help_contribute"); @@ -1021,50 +1021,50 @@ void DigikamApp::setupActions() // -- Rating actions --------------------------------------------------------------- d->rating0Star = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingNoStar()), + d->view, TQ_SLOT(slotAssignRatingNoStar()), actionCollection(), "ratenostar"); d->rating1Star = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingOneStar()), + d->view, TQ_SLOT(slotAssignRatingOneStar()), actionCollection(), "rateonestar"); d->rating2Star = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingTwoStar()), + d->view, TQ_SLOT(slotAssignRatingTwoStar()), actionCollection(), "ratetwostar"); d->rating3Star = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingThreeStar()), + d->view, TQ_SLOT(slotAssignRatingThreeStar()), actionCollection(), "ratethreestar"); d->rating4Star = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFourStar()), + d->view, TQ_SLOT(slotAssignRatingFourStar()), actionCollection(), "ratefourstar"); d->rating5Star = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFiveStar()), + d->view, TQ_SLOT(slotAssignRatingFiveStar()), actionCollection(), "ratefivestar"); // ----------------------------------------------------------- - TDEAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()), + TDEAction* findAction = KStdAction::find(d->view, TQ_SLOT(slotNewQuickSearch()), actionCollection(), "search_quick"); findAction->setText(i18n("Search...")); findAction->setIconSet(BarIcon("filefind")); - TDEAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()), + TDEAction* advFindAction = KStdAction::find(d->view, TQ_SLOT(slotNewAdvancedSearch()), actionCollection(), "search_advanced"); advFindAction->setText(i18n("Advanced Search...")); advFindAction->setShortcut("Ctrl+Alt+F"); new TDEAction(i18n("Light Table"), "idea", Key_L, - TQT_TQOBJECT(d->view), TQT_SLOT(slotLightTable()), actionCollection(), + d->view, TQ_SLOT(slotLightTable()), actionCollection(), "light_table"); new TDEAction(i18n("Scan for New Images"), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDatabaseRescan()), actionCollection(), + this, TQ_SLOT(slotDatabaseRescan()), actionCollection(), "database_rescan"); new TDEAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbs()), actionCollection(), + this, TQ_SLOT(slotRebuildAllThumbs()), actionCollection(), "thumbs_rebuild"); new TDEAction(i18n("Update Metadata Database..."), "reload_page", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(), + this, TQ_SLOT(slotSyncAllPicturesMetadata()), actionCollection(), "sync_metadata"); // ----------------------------------------------------------- @@ -1350,7 +1350,7 @@ void DigikamApp::slotExit() if (d->fullScreen) { slotToggleFullScreen(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } else close(); @@ -1448,7 +1448,7 @@ void DigikamApp::slotDownloadImages( const TQString& folder) { d->cameraGuiPath = folder; - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDownloadImages())); } } @@ -1482,8 +1482,8 @@ void DigikamApp::slotDownloadImages() i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()), "camera-photo", 0, - TQT_TQOBJECT(this), - TQT_SLOT(slotDownloadImages()), + this, + TQ_SLOT(slotDownloadImages()), actionCollection(), d->cameraGuiPath.latin1() ); @@ -1496,16 +1496,16 @@ void DigikamApp::slotDownloadImages() "directory browse","Fixed", localUrl, TQDateTime::currentDateTime()); cgui->show(); - connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQ_SIGNAL(signalLastDestination(const KURL&)), + d->view, TQ_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); + connect(cgui, TQ_SIGNAL(signalAlbumSettingsChanged()), + this, TQ_SLOT(slotSetupChanged())); } void DigikamApp::slotCameraConnect() { - CameraType* ctype = d->cameraList->find(TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name())); + CameraType* ctype = d->cameraList->find(TQString::fromUtf8(sender()->name())); if (ctype) { @@ -1527,11 +1527,11 @@ void DigikamApp::slotCameraConnect() cgui->show(); - connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), - TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQ_SIGNAL(signalLastDestination(const KURL&)), + d->view, TQ_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); + connect(cgui, TQ_SIGNAL(signalAlbumSettingsChanged()), + this, TQ_SLOT(slotSetupChanged())); } } } @@ -1541,7 +1541,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype) if (!ctype) return; TDEAction *cAction = new TDEAction(ctype->title(), "camera-photo", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()), + this, TQ_SLOT(slotCameraConnect()), actionCollection(), ctype->title().utf8()); d->cameraMenuAction->insert(cAction, 0); @@ -1559,8 +1559,8 @@ void DigikamApp::slotCameraMediaMenu() KURL kurl("media:/"); TDEIO::ListJob *job = TDEIO::listDir(kurl, false, false); - connect( job, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), - TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); + connect( job, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotCameraMediaMenuEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); } void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) @@ -1590,7 +1590,7 @@ void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) d->mediaItems[i] = path; - d->cameraMediaList->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImagesFromMedia(int)), 0, i); + d->cameraMediaList->insertItem(name, this, TQ_SLOT(slotDownloadImagesFromMedia(int)), 0, i); d->cameraMediaList->setItemParameter(i, i); i++; } @@ -1620,7 +1620,7 @@ void DigikamApp::slotCameraAutoDetect() if (!ctype && retry) { - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCameraAutoDetect())); return; } @@ -1804,15 +1804,15 @@ void DigikamApp::loadPlugins() d->splashScreen->message(i18n("Loading Kipi Plugins")); TQStringList ignores; - d->kipiInterface = new DigikamKipiInterface( TQT_TQOBJECT(this), "Digikam_KIPI_interface" ); + d->kipiInterface = new DigikamKipiInterface( this, "Digikam_KIPI_interface" ); ignores.append( "HelloWorld" ); ignores.append( "KameraKlient" ); d->kipiPluginLoader = new KIPI::PluginLoader( ignores, d->kipiInterface ); - connect( d->kipiPluginLoader, TQT_SIGNAL( replug() ), - TQT_TQOBJECT(this), TQT_SLOT( slotKipiPluginPlug() ) ); + connect( d->kipiPluginLoader, TQ_SIGNAL( replug() ), + this, TQ_SLOT( slotKipiPluginPlug() ) ); d->kipiPluginLoader->loadPlugins(); @@ -1821,7 +1821,7 @@ void DigikamApp::loadPlugins() // Setting the initial menu options after all plugins have been loaded d->view->slotAlbumSelected(d->albumManager->currentAlbum()); - d->imagePluginsLoader = new ImagePluginLoader(TQT_TQOBJECT(this), d->splashScreen); + d->imagePluginsLoader = new ImagePluginLoader(this, d->splashScreen); } void DigikamApp::slotKipiPluginPlug() @@ -1925,7 +1925,7 @@ void DigikamApp::loadCameras() d->cameraMenuAction->popupMenu()->insertSeparator(); d->cameraMenuAction->insert(new TDEAction(i18n("Add Camera..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera()), + this, TQ_SLOT(slotSetupCamera()), actionCollection(), "camera_add")); } @@ -1981,8 +1981,8 @@ void DigikamApp::slotRebuildAllThumbs() BatchThumbsGenerator *thumbsGenerator = new BatchThumbsGenerator(this); - connect(thumbsGenerator, TQT_SIGNAL(signalRebuildAllThumbsDone()), - TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbsDone())); + connect(thumbsGenerator, TQ_SIGNAL(signalRebuildAllThumbsDone()), + this, TQ_SLOT(slotRebuildAllThumbsDone())); thumbsGenerator->exec(); } @@ -2001,8 +2001,8 @@ void DigikamApp::slotSyncAllPicturesMetadata() BatchAlbumsSyncMetadata *syncMetadata = new BatchAlbumsSyncMetadata(this); - connect(syncMetadata, TQT_SIGNAL(signalComplete()), - TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadataDone())); + connect(syncMetadata, TQ_SIGNAL(signalComplete()), + this, TQ_SLOT(slotSyncAllPicturesMetadataDone())); syncMetadata->exec(); } diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h index 64864e7..899603d 100644 --- a/digikam/digikam/digikamapp.h +++ b/digikam/digikam/digikamapp.h @@ -54,7 +54,7 @@ class DigikamAppPriv; class DIGIKAM_EXPORT DigikamApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index 8389961..e8921f5 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -43,7 +43,7 @@ class FirstRunWidget; class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 2960282..a8fb42f 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -271,197 +271,197 @@ void DigikamView::setupConnections() { // -- DigikamApp connections ---------------------------------- - connect(d->parent, TQT_SIGNAL(signalEscapePressed()), - this, TQT_SLOT(slotEscapePreview())); + connect(d->parent, TQ_SIGNAL(signalEscapePressed()), + this, TQ_SLOT(slotEscapePreview())); - connect(d->parent, TQT_SIGNAL(signalEscapePressed()), - d->albumWidgetStack, TQT_SLOT(slotEscapePreview())); + connect(d->parent, TQ_SIGNAL(signalEscapePressed()), + d->albumWidgetStack, TQ_SLOT(slotEscapePreview())); - connect(d->parent, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->parent, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->parent, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->parent, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->parent, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->parent, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->parent, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->parent, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); - connect(d->parent, TQT_SIGNAL(signalCopyAlbumItemsSelection()), - d->iconView, TQT_SLOT(slotCopy())); + connect(d->parent, TQ_SIGNAL(signalCopyAlbumItemsSelection()), + d->iconView, TQ_SLOT(slotCopy())); - connect(d->parent, TQT_SIGNAL(signalPasteAlbumItemsSelection()), - d->iconView, TQT_SLOT(slotPaste())); + connect(d->parent, TQ_SIGNAL(signalPasteAlbumItemsSelection()), + d->iconView, TQ_SLOT(slotPaste())); - connect(this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(this, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(this, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(this, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), - this, TQT_SLOT(slotCancelSlideShow())); + connect(d->parent, TQ_SIGNAL(signalCancelButtonPressed()), + this, TQ_SLOT(slotCancelSlideShow())); // -- AlbumManager connections -------------------------------- - connect(d->albumManager, TQT_SIGNAL(signalAlbumCurrentChanged(Album*)), - this, TQT_SLOT(slotAlbumSelected(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumCurrentChanged(Album*)), + this, TQ_SLOT(slotAlbumSelected(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + connect(d->albumManager, TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); - connect(d->albumManager, TQT_SIGNAL(signalAlbumItemsSelected(bool) ), - this, TQT_SLOT(slotImageSelected())); + connect(d->albumManager, TQ_SIGNAL(signalAlbumItemsSelected(bool) ), + this, TQ_SLOT(slotImageSelected())); - connect(d->albumManager, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumManager, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumManager, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumManager, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); // -- IconView Connections ------------------------------------- - connect(d->iconView, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), - d->albumWidgetStack, TQT_SLOT(slotItemsUpdated(const KURL::List&))); + connect(d->iconView, TQ_SIGNAL(signalItemsUpdated(const KURL::List&)), + d->albumWidgetStack, TQ_SLOT(slotItemsUpdated(const KURL::List&))); - connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), - this, TQT_SLOT(slotImageSelected())); + connect(d->iconView, TQ_SIGNAL(signalItemsAdded()), + this, TQ_SLOT(slotImageSelected())); - connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), - this, TQT_SLOT(slotAlbumHighlight())); + connect(d->iconView, TQ_SIGNAL(signalItemsAdded()), + this, TQ_SLOT(slotAlbumHighlight())); - connect(d->iconView, TQT_SIGNAL(signalPreviewItem(AlbumIconItem*)), - this, TQT_SLOT(slotTogglePreviewMode(AlbumIconItem*))); + connect(d->iconView, TQ_SIGNAL(signalPreviewItem(AlbumIconItem*)), + this, TQ_SLOT(slotTogglePreviewMode(AlbumIconItem*))); - //connect(d->iconView, TQT_SIGNAL(signalItemDeleted(AlbumIconItem*)), - // this, TQT_SIGNAL(signalNoCurrentItem())); + //connect(d->iconView, TQ_SIGNAL(signalItemDeleted(AlbumIconItem*)), + // this, TQ_SIGNAL(signalNoCurrentItem())); - connect(d->iconView, TQT_SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), - this, TQT_SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); + connect(d->iconView, TQ_SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), + this, TQ_SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); - connect(d->iconView, TQT_SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), - this, TQT_SLOT(slotGotoDateAndItem(AlbumIconItem *))); + connect(d->iconView, TQ_SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), + this, TQ_SLOT(slotGotoDateAndItem(AlbumIconItem *))); - connect(d->iconView, TQT_SIGNAL(signalGotoTagAndItem(int)), - this, TQT_SLOT(slotGotoTagAndItem(int))); + connect(d->iconView, TQ_SIGNAL(signalGotoTagAndItem(int)), + this, TQ_SLOT(slotGotoTagAndItem(int))); - connect(d->folderView, TQT_SIGNAL(signalAlbumModified()), - d->iconView, TQT_SLOT(slotAlbumModified())); + connect(d->folderView, TQ_SIGNAL(signalAlbumModified()), + d->iconView, TQ_SLOT(slotAlbumModified())); - connect(d->iconView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->iconView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->iconView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->iconView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); // -- Sidebar Connections ------------------------------------- - connect(d->leftSideBar, TQT_SIGNAL(signalChangedTab(TQWidget*)), - this, TQT_SLOT(slotLeftSidebarChangedTab(TQWidget*))); + connect(d->leftSideBar, TQ_SIGNAL(signalChangedTab(TQWidget*)), + this, TQ_SLOT(slotLeftSidebarChangedTab(TQWidget*))); - connect(d->rightSideBar, TQT_SIGNAL(signalFirstItem()), - this, TQT_SLOT(slotFirstItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalFirstItem()), + this, TQ_SLOT(slotFirstItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalLastItem()), - this, TQT_SLOT(slotLastItem())); + connect(d->rightSideBar, TQ_SIGNAL(signalLastItem()), + this, TQ_SLOT(slotLastItem())); - connect(this, TQT_SIGNAL(signalNoCurrentItem()), - d->rightSideBar, TQT_SLOT(slotNoCurrentItem())); + connect(this, TQ_SIGNAL(signalNoCurrentItem()), + d->rightSideBar, TQ_SLOT(slotNoCurrentItem())); - connect(d->rightSideBar, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->rightSideBar, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->rightSideBar, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->rightSideBar, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->tagFilterView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->tagFilterView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFilterView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->tagFilterView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->tagFolderView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(d->tagFolderView, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFolderView, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(d->tagFolderView, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(d->parent, TQT_SIGNAL(signalResetTagFilters()), - d->tagFilterView, TQT_SLOT(slotResetTagFilters())); + connect(d->parent, TQ_SIGNAL(signalResetTagFilters()), + d->tagFilterView, TQ_SLOT(slotResetTagFilters())); // -- Filter Bars Connections --------------------------------- - connect(d->folderSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->folderView, TQT_SLOT(slotTextFolderFilterChanged(const TQString&))); + connect(d->folderSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->folderView, TQ_SLOT(slotTextFolderFilterChanged(const TQString&))); - connect(d->tagSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->tagFolderView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); + connect(d->tagSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->tagFolderView, TQ_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->searchSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->searchFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); + connect(d->searchSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->searchFolderView, TQ_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->tagFilterSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->tagFilterView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); + connect(d->tagFilterSearchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->tagFilterView, TQ_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->folderView, TQT_SIGNAL(signalTextFolderFilterMatch(bool)), - d->folderSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->folderView, TQ_SIGNAL(signalTextFolderFilterMatch(bool)), + d->folderSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->tagFolderView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), - d->tagSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->tagFolderView, TQ_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->searchFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->searchFolderView, TQ_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchSearchBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->tagFilterView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), - d->tagFilterSearchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->tagFilterView, TQ_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagFilterSearchBar, TQ_SLOT(slotSearchResult(bool))); // -- Preview image widget Connections ------------------------ - connect(d->albumWidgetStack, TQT_SIGNAL(signalNextItem()), - this, TQT_SLOT(slotNextItem())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalNextItem()), + this, TQ_SLOT(slotNextItem())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalPrevItem()), - this, TQT_SLOT(slotPrevItem())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalPrevItem()), + this, TQ_SLOT(slotPrevItem())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalEditItem()), - this, TQT_SLOT(slotImageEdit())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalEditItem()), + this, TQ_SLOT(slotImageEdit())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalDeleteItem()), - this, TQT_SLOT(slotImageDelete())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalDeleteItem()), + this, TQ_SLOT(slotImageDelete())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalToggledToPreviewMode(bool)), - this, TQT_SLOT(slotToggledToPreviewMode(bool))); + connect(d->albumWidgetStack, TQ_SIGNAL(signalToggledToPreviewMode(bool)), + this, TQ_SLOT(slotToggledToPreviewMode(bool))); - connect(d->albumWidgetStack, TQT_SIGNAL(signalBack2Album()), - this, TQT_SLOT(slotEscapePreview())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalBack2Album()), + this, TQ_SLOT(slotEscapePreview())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalSlideShow()), - this, TQT_SLOT(slotSlideShowAll())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalSlideShow()), + this, TQ_SLOT(slotSlideShowAll())); - connect(d->albumWidgetStack, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged(double))); + connect(d->albumWidgetStack, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged(double))); - connect(d->albumWidgetStack, TQT_SIGNAL(signalInsert2LightTable()), - this, TQT_SLOT(slotImageAddToLightTable())); + connect(d->albumWidgetStack, TQ_SIGNAL(signalInsert2LightTable()), + this, TQ_SLOT(slotImageAddToLightTable())); // -- Selection timer --------------- - connect(d->selectionTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDispatchImageSelected())); + connect(d->selectionTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDispatchImageSelected())); } void DigikamView::loadViewState() @@ -552,8 +552,8 @@ void DigikamView::slotLastItem(void) void DigikamView::slotAllAlbumsLoaded() { - disconnect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + disconnect(d->albumManager, TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); loadViewState(); Album *album = d->albumManager->findAlbum(d->initialAlbumID); @@ -1058,8 +1058,8 @@ void DigikamView::setThumbSize(int size) } d->thumbSizeTimer = new TQTimer( this ); - connect(d->thumbSizeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotThumbSizeEffect()) ); + connect(d->thumbSizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotThumbSizeEffect()) ); d->thumbSizeTimer->start(300, true); } } @@ -1173,19 +1173,19 @@ void DigikamView::slotAlbumSyncPicturesMetadata() if (!album) return; - BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album); + BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(this, album); - connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), - d->parent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); + connect(syncMetadata, TQ_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->parent, TQ_SLOT(slotProgressBarMode(int, const TQString&))); - connect(syncMetadata, TQT_SIGNAL(signalProgressValue(int)), - d->parent, TQT_SLOT(slotProgressValue(int))); + connect(syncMetadata, TQ_SIGNAL(signalProgressValue(int)), + d->parent, TQ_SLOT(slotProgressValue(int))); - connect(syncMetadata, TQT_SIGNAL(signalComplete()), - this, TQT_SLOT(slotAlbumSyncPicturesMetadataDone())); + connect(syncMetadata, TQ_SIGNAL(signalComplete()), + this, TQ_SLOT(slotAlbumSyncPicturesMetadataDone())); - connect(d->parent, TQT_SIGNAL(signalCancelButtonPressed()), - syncMetadata, TQT_SLOT(slotAbort())); + connect(d->parent, TQ_SIGNAL(signalCancelButtonPressed()), + syncMetadata, TQ_SLOT(slotAbort())); syncMetadata->parseAlbum(); } @@ -1486,8 +1486,8 @@ void DigikamView::slotSlideShowRecursive() } ImageInfoAlbumsJob *job = new ImageInfoAlbumsJob; - connect(job, TQT_SIGNAL(signalCompleted(const ImageInfoList&)), - this, TQT_SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); + connect(job, TQ_SIGNAL(signalCompleted(const ImageInfoList&)), + this, TQ_SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); job->allItemsFromAlbums(albumList); } } diff --git a/digikam/digikam/digikamview.h b/digikam/digikam/digikamview.h index f587602..cf92907 100644 --- a/digikam/digikam/digikamview.h +++ b/digikam/digikam/digikamview.h @@ -46,7 +46,7 @@ class DigikamViewPriv; class DigikamView : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index 857dc03..f9639fc 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -244,8 +244,8 @@ bool running() Watch::Watch(TDEIO::Job* job) { m_runCount++; - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotDone(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotDone(TDEIO::Job*))); } void Watch::slotDone(TDEIO::Job*) diff --git a/digikam/digikam/dio_p.h b/digikam/digikam/dio_p.h index 8ce3c10..660cad0 100644 --- a/digikam/digikam/dio_p.h +++ b/digikam/digikam/dio_p.h @@ -38,7 +38,7 @@ namespace DIO class Watch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/firstrun.h b/digikam/digikam/firstrun.h index d9cd513..e380399 100644 --- a/digikam/digikam/firstrun.h +++ b/digikam/digikam/firstrun.h @@ -41,7 +41,7 @@ namespace Digikam class DIGIKAM_EXPORT FirstRunWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index eae4491..45b875f 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -218,7 +218,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co p->fillRect(0, 0, r, height(), cg.base()); - fv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + fv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, height()), cg, styleflags, TQStyleOption(this)); } diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index ffa5f03..0e2d515 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -83,14 +83,14 @@ FolderView::FolderView(TQWidget *parent, const char *name) d = new FolderViewPriv; - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); - connect(AlbumThumbnailLoader::instance(), TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotIconSizeChanged())); + connect(AlbumThumbnailLoader::instance(), TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotIconSizeChanged())); setColumnAlignment(0, TQt::AlignLeft|TQt::AlignVCenter); setShowSortIndicator(true); @@ -376,8 +376,8 @@ void FolderView::slotThemeChanged() void FolderView::slotAllAlbumsLoaded() { - disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), - this, TQT_SLOT(slotAllAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQ_SIGNAL(signalAllAlbumsLoaded()), + this, TQ_SLOT(slotAllAlbumsLoaded())); loadViewState(); } diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index bc3872a..e32737c 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -50,7 +50,7 @@ class FolderItem; class DIGIKAM_EXPORT FolderView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index e71e103..2dac3da 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -138,18 +138,18 @@ IconView::IconView(TQWidget* parent, const char* name) { viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); - viewport()->setFocusPolicy(TQ_WheelFocus); + viewport()->setFocusPolicy(TQWidget::WheelFocus); viewport()->setMouseTracking(true); d = new IconViewPriv; d->rearrangeTimer = new TQTimer(this); d->toolTipTimer = new TQTimer(this); - connect(d->rearrangeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotRearrange())); + connect(d->rearrangeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotRearrange())); - connect(d->toolTipTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotToolTip())); + connect(d->toolTipTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotToolTip())); setEnableToolTips(true); } @@ -925,7 +925,7 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e) d->rubber = 0; } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { IconItem* item = findItem(e->pos()); if (item) @@ -1067,7 +1067,7 @@ void IconView::drawRubber(TQPainter* p) TQPoint pnt(r.x(), r.y()); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, + style().drawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height() ), colorGroup(), TQStyle::Style_Default, @@ -1125,7 +1125,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) d->toolTipTimer->stop(); slotToolTip(); - if (d->dragging && (e->state() & Qt::LeftButton)) + if (d->dragging && (e->state() & TQt::LeftButton)) { if ( (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) @@ -1240,7 +1240,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) d->rubber = 0; } - if (e->state() == Qt::LeftButton) + if (e->state() == TQt::LeftButton) { if (d->pressedMoved) { diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index 0db4d36..59a4b92 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -48,7 +48,7 @@ class IconViewPriv; class DIGIKAM_EXPORT IconView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/imageattributeswatch.h b/digikam/digikam/imageattributeswatch.h index eed5276..7d37760 100644 --- a/digikam/digikam/imageattributeswatch.h +++ b/digikam/digikam/imageattributeswatch.h @@ -37,7 +37,7 @@ namespace Digikam class ImageAttributesWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 44bf96f..f636f68 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -148,23 +148,23 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) // ------------------------------------------------------------ - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(this, TQT_SIGNAL(signalShowNextImage()), - this, TQT_SIGNAL(signalNextItem())); + connect(this, TQ_SIGNAL(signalShowNextImage()), + this, TQ_SIGNAL(signalNextItem())); - connect(this, TQT_SIGNAL(signalShowPrevImage()), - this, TQT_SIGNAL(signalPrevItem())); + connect(this, TQ_SIGNAL(signalShowPrevImage()), + this, TQ_SIGNAL(signalPrevItem())); - connect(this, TQT_SIGNAL(signalRightButtonClicked()), - this, TQT_SLOT(slotContextMenu())); + connect(this, TQ_SIGNAL(signalRightButtonClicked()), + this, TQ_SLOT(slotContextMenu())); - connect(this, TQT_SIGNAL(signalLeftButtonClicked()), - this, TQT_SIGNAL(signalBack2Album())); + connect(this, TQ_SIGNAL(signalLeftButtonClicked()), + this, TQ_SIGNAL(signalBack2Album())); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -229,14 +229,14 @@ void ImagePreviewView::setImagePath(const TQString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, TQT_SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQ_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -425,11 +425,11 @@ void ImagePreviewView::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), - this, TQT_SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQ_SIGNAL(signalTagActivated(int)), + this, TQ_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -441,8 +441,8 @@ void ImagePreviewView::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotAssignRating(int))); + connect(ratingMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); @@ -572,11 +572,11 @@ void ImagePreviewView::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/digikam/imagepreviewview.h b/digikam/digikam/imagepreviewview.h index 89d9db4..f005880 100644 --- a/digikam/digikam/imagepreviewview.h +++ b/digikam/digikam/imagepreviewview.h @@ -48,7 +48,7 @@ class ImagePreviewViewPriv; class DIGIKAM_EXPORT ImagePreviewView : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 020f77d..1cf4ec4 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -47,7 +47,7 @@ class DateValidator : public TQValidator { public: DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) - : TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) + : TQValidator( parent, name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -89,17 +89,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( lineEnterPressed() ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); @@ -261,7 +261,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) { - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) { + if ( object == lineEdit() ) { // We only process the focus out event if the text has changed // since we got focus if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) { @@ -299,7 +299,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the @@ -320,7 +320,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event ) { - if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { + if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } diff --git a/digikam/digikam/kdateedit.h b/digikam/digikam/kdateedit.h index e283424..9244482 100644 --- a/digikam/digikam/kdateedit.h +++ b/digikam/digikam/kdateedit.h @@ -55,7 +55,7 @@ namespace Digikam */ class KDateEdit : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index b471642..b4cb8bb 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -48,11 +48,11 @@ KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *pare mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), - this, TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + this, TQ_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), - this, TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + this, TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); buildMenu(); @@ -73,19 +73,19 @@ void KDatePickerPopup::buildMenu() if ( mItems & Words ) { - insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); - insertItem( i18n("Y&esterday"), this, TQT_SLOT( slotYesterday() ) ); - insertItem( i18n("Last &Monday"), this, TQT_SLOT( slotPrevMonday() ) ); - insertItem( i18n("Last &Friday"), this, TQT_SLOT( slotPrevFriday() ) ); - insertItem( i18n("Last &Week"), this, TQT_SLOT( slotPrevWeek() ) ); - insertItem( i18n("Last M&onth"), this, TQT_SLOT( slotPrevMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("Y&esterday"), this, TQ_SLOT( slotYesterday() ) ); + insertItem( i18n("Last &Monday"), this, TQ_SLOT( slotPrevMonday() ) ); + insertItem( i18n("Last &Friday"), this, TQ_SLOT( slotPrevFriday() ) ); + insertItem( i18n("Last &Week"), this, TQ_SLOT( slotPrevWeek() ) ); + insertItem( i18n("Last M&onth"), this, TQ_SLOT( slotPrevMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index daa8b1b..e343594 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -55,7 +55,7 @@ namespace Digikam */ class KDatePickerPopup: public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kdatetimeedit.cpp b/digikam/digikam/kdatetimeedit.cpp index fed7cee..e78c5ca 100644 --- a/digikam/digikam/kdatetimeedit.cpp +++ b/digikam/digikam/kdatetimeedit.cpp @@ -40,10 +40,10 @@ KDateTimeEdit::KDateTimeEdit(TQWidget *parent, const char *name) m_datePopUp = new KDateEdit(this, "datepopup"); m_timePopUp = new TQTimeEdit(TQTime::currentTime(), this); - connect(m_datePopUp, TQT_SIGNAL(dateChanged(const TQDate& )), - TQT_SLOT(slotDateTimeChanged()) ); - connect(m_timePopUp, TQT_SIGNAL(valueChanged(const TQTime& )), - TQT_SLOT(slotDateTimeChanged()) ); + connect(m_datePopUp, TQ_SIGNAL(dateChanged(const TQDate& )), + TQ_SLOT(slotDateTimeChanged()) ); + connect(m_timePopUp, TQ_SIGNAL(valueChanged(const TQTime& )), + TQ_SLOT(slotDateTimeChanged()) ); } KDateTimeEdit::~KDateTimeEdit() diff --git a/digikam/digikam/kdatetimeedit.h b/digikam/digikam/kdatetimeedit.h index 090300f..ac0575c 100644 --- a/digikam/digikam/kdatetimeedit.h +++ b/digikam/digikam/kdatetimeedit.h @@ -48,7 +48,7 @@ class KDateEdit; */ class KDateTimeEdit : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 7b30c51..aaf012e 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -544,11 +544,11 @@ DigikamKipiInterface::DigikamKipiInterface( TQObject *parent, const char *name) albumManager_ = AlbumManager::instance(); albumDB_ = albumManager_->albumDB(); - connect( albumManager_, TQT_SIGNAL( signalAlbumItemsSelected( bool ) ), - this, TQT_SLOT( slotSelectionChanged( bool ) ) ); + connect( albumManager_, TQ_SIGNAL( signalAlbumItemsSelected( bool ) ), + this, TQ_SLOT( slotSelectionChanged( bool ) ) ); - connect( albumManager_, TQT_SIGNAL( signalAlbumCurrentChanged(Album*) ), - this, TQT_SLOT( slotCurrentAlbumChanged(Album*) ) ); + connect( albumManager_, TQ_SIGNAL( signalAlbumCurrentChanged(Album*) ), + this, TQ_SLOT( slotCurrentAlbumChanged(Album*) ) ); } DigikamKipiInterface::~DigikamKipiInterface() diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h index 7c1a255..b2974ec 100644 --- a/digikam/digikam/kipiinterface.h +++ b/digikam/digikam/kipiinterface.h @@ -153,7 +153,7 @@ private: class DigikamKipiInterface : public KIPI::Interface { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 23c313a..97ef26a 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -120,8 +120,8 @@ MediaPlayerView::MediaPlayerView(TQWidget *parent) // -------------------------------------------------------------------------- - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } MediaPlayerView::~MediaPlayerView() @@ -187,7 +187,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) DDebug() << "Find KPart library " << library << endl; int error = 0; d->mediaPlayerPart = KParts::ComponentFactory::createPartInstanceFromService - <KParts::ReadOnlyPart>(service, TQT_TQWIDGET(d->mediaPlayerView), 0, TQT_TQOBJECT(d->mediaPlayerView), + <KParts::ReadOnlyPart>(service, d->mediaPlayerView, 0, d->mediaPlayerView, 0, TQStringList(), &error); if (!d->mediaPlayerPart) { diff --git a/digikam/digikam/mediaplayerview.h b/digikam/digikam/mediaplayerview.h index 559e32f..0839917 100644 --- a/digikam/digikam/mediaplayerview.h +++ b/digikam/digikam/mediaplayerview.h @@ -43,7 +43,7 @@ class MediaPlayerViewPriv; class DIGIKAM_EXPORT MediaPlayerView : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/mimefilter.h b/digikam/digikam/mimefilter.h index 4efe225..bddb560 100644 --- a/digikam/digikam/mimefilter.h +++ b/digikam/digikam/mimefilter.h @@ -35,7 +35,7 @@ class MimeFilterPriv; class MimeFilter : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index e6c255f..665318f 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -355,11 +355,11 @@ void MonthWidget::setActive(bool val) if (d->active) { - connect(AlbumLister::instance(), TQT_SIGNAL(signalNewItems(const ImageInfoList&)), - this, TQT_SLOT(slotAddItems(const ImageInfoList&))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalNewItems(const ImageInfoList&)), + this, TQ_SLOT(slotAddItems(const ImageInfoList&))); - connect(AlbumLister::instance(), TQT_SIGNAL(signalDeleteItem(ImageInfo*)), - this, TQT_SLOT(slotDeleteItem(ImageInfo*))); + connect(AlbumLister::instance(), TQ_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQ_SLOT(slotDeleteItem(ImageInfo*))); } else { diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index cf96e15..70988c5 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -39,7 +39,7 @@ class MonthWidgetPriv; class MonthWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 5ae5072..3da11b5 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -92,8 +92,8 @@ PixmapManager::PixmapManager(AlbumIconView* view) d->thumbCacheDir = TQDir::homeDirPath() + "/.thumbnails/"; d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotCompleted())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotCompleted())); } PixmapManager::~PixmapManager() @@ -133,14 +133,14 @@ TQPixmap* PixmapManager::find(const KURL& url) { d->thumbJob = new ThumbnailJob(url, d->size, true, AlbumSettings::instance()->getExifRotate()); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); - connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), - this, TQT_SLOT(slotCompleted())); + connect(d->thumbJob, TQ_SIGNAL(signalCompleted()), + this, TQ_SLOT(slotCompleted())); } return 0; diff --git a/digikam/digikam/pixmapmanager.h b/digikam/digikam/pixmapmanager.h index f3501d4..62da7fa 100644 --- a/digikam/digikam/pixmapmanager.h +++ b/digikam/digikam/pixmapmanager.h @@ -49,7 +49,7 @@ class PixmapManagerPriv; */ class PixmapManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index 9900635..1cfa0bb 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -82,8 +82,8 @@ RatingFilter::RatingFilter(TQWidget* parent) "set rating filter condition.")); // To dispatch signal from parent widget with filter condition. - connect(this, TQT_SIGNAL(signalRatingChanged(int)), - this, TQT_SLOT(slotRatingChanged())); + connect(this, TQ_SIGNAL(signalRatingChanged(int)), + this, TQ_SLOT(slotRatingChanged())); } RatingFilter::~RatingFilter() @@ -132,7 +132,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e) d->dirty = false; - if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton ) + if ( e->button() == TQt::LeftButton || e->button() == TQt::MidButton ) { d->dirty = true; int pos = e->x() / regPixmapWidth() +1; @@ -143,7 +143,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e) setRating(pos); updateRatingTooltip(); } - else if (e->button() == Qt::RightButton) + else if (e->button() == TQt::RightButton) { // Show pop-up menu about Rating Filter condition settings diff --git a/digikam/digikam/ratingfilter.h b/digikam/digikam/ratingfilter.h index 404fee9..ac527e4 100644 --- a/digikam/digikam/ratingfilter.h +++ b/digikam/digikam/ratingfilter.h @@ -37,7 +37,7 @@ class RatingFilterPriv; class RatingFilter : public RatingWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingpopupmenu.h b/digikam/digikam/ratingpopupmenu.h index 2be1257..14b2fef 100644 --- a/digikam/digikam/ratingpopupmenu.h +++ b/digikam/digikam/ratingpopupmenu.h @@ -35,7 +35,7 @@ class RatingPopupMenuPriv; class RatingPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index f22ecb4..3371a2c 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -73,8 +73,8 @@ RatingWidget::RatingWidget(TQWidget* parent) slotThemeChanged(); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } RatingWidget::~RatingWidget() diff --git a/digikam/digikam/ratingwidget.h b/digikam/digikam/ratingwidget.h index 573b532..a6a6ab5 100644 --- a/digikam/digikam/ratingwidget.h +++ b/digikam/digikam/ratingwidget.h @@ -36,7 +36,7 @@ class RatingWidgetPriv; class RatingWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 14781b7..71ea425 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -123,7 +123,7 @@ void ScanLib::startScan() deleteStaleEntries(); AlbumDB* db = AlbumManager::instance()->albumDB(); - db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate)); + db->setSetting("Scanned", TQDateTime::currentDateTime().toString(TQt::ISODate)); } void ScanLib::findFoldersWhichDoNotExist() @@ -278,7 +278,7 @@ void ScanLib::updateItemsWithoutDate() } else { - TQPair<TQString, int> fileID = tqMakePair(fi.fileName(),albumID); + TQPair<TQString, int> fileID = qMakePair(fi.fileName(),albumID); if (m_filesToBeDeleted.findIndex(fileID) == -1) { @@ -393,9 +393,9 @@ void ScanLib::allFiles(const TQString& directory) TQMapIterator<TQString,bool> it; for (it = filesFoundInDB.begin(); it != filesFoundInDB.end(); ++it) { - if (m_filesToBeDeleted.findIndex(tqMakePair(it.key(),albumID)) == -1) + if (m_filesToBeDeleted.findIndex(qMakePair(it.key(),albumID)) == -1) { - m_filesToBeDeleted.append(tqMakePair(it.key(),albumID)); + m_filesToBeDeleted.append(qMakePair(it.key(),albumID)); } } } diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index dff2b55..cb40b87 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -134,7 +134,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules " "by adding/removing criteria.")); - groupbox1->setColumnLayout(0, Qt::Vertical ); + groupbox1->setColumnLayout(0, TQt::Vertical ); groupbox1->layout()->setSpacing( KDialog::spacingHint() ); groupbox1->layout()->setMargin( KDialog::marginHint() ); d->optionsCombo = new TQComboBox(groupbox1); @@ -159,7 +159,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQGroupBox *groupbox2 = new TQGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" ); TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " "from the Search Rule set.")); - groupbox2->setColumnLayout(0, Qt::Vertical); + groupbox2->setColumnLayout(0, TQt::Vertical); groupbox2->layout()->setSpacing( KDialog::spacingHint() ); groupbox2->layout()->setMargin( KDialog::marginHint() ); d->groupButton = new TQPushButton(i18n("&Group"), groupbox2); @@ -174,7 +174,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) // box for saving the search. TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3"); - groupbox3->setColumnLayout(0, Qt::Vertical ); + groupbox3->setColumnLayout(0, TQt::Vertical ); groupbox3->layout()->setSpacing( KDialog::spacingHint() ); groupbox3->setFrameStyle( TQFrame::NoFrame ); TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3); @@ -213,23 +213,23 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) // ---------------------------------------------------------------- - connect(d->addButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddRule())); + connect(d->addButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddRule())); - connect(d->delButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelRules())); + connect(d->delButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelRules())); - connect(d->groupButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGroupRules())); + connect(d->groupButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGroupRules())); - connect(d->ungroupButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUnGroupRules())); + connect(d->ungroupButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUnGroupRules())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); - connect(d->title, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChangeButtonStates())); + connect(d->title, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChangeButtonStates())); } SearchAdvancedDialog::~SearchAdvancedDialog() @@ -253,11 +253,11 @@ void SearchAdvancedDialog::slotAddRule() SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); d->baseList.append(rule); - connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( rule, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); - connect( rule, TQT_SIGNAL( signalPropertyChanged() ), - this, TQT_SLOT(slotPropertyChanged())); + connect( rule, TQ_SIGNAL( signalPropertyChanged() ), + this, TQ_SLOT(slotPropertyChanged())); slotChangeButtonStates(); slotPropertyChanged(); @@ -373,8 +373,8 @@ void SearchAdvancedDialog::slotGroupRules() d->rulesBox->layout()->add((*it)->widget()); } - connect( group, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( group, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); slotChangeButtonStates(); slotPropertyChanged(); @@ -619,11 +619,11 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); rule->setValues( rulesMap[num] ); - connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( rule, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); - connect( rule, TQT_SIGNAL( signalPropertyChanged() ), - this, TQT_SLOT(slotPropertyChanged())); + connect( rule, TQ_SIGNAL( signalPropertyChanged() ), + this, TQ_SLOT(slotPropertyChanged())); if (groupingActive) group->addRule(rule); @@ -643,8 +643,8 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) group = new SearchAdvancedGroup(d->rulesBox); d->baseList.append(group); - connect( group, TQT_SIGNAL( signalBaseItemToggled() ), - this, TQT_SLOT( slotChangeButtonStates() ) ); + connect( group, TQ_SIGNAL( signalBaseItemToggled() ), + this, TQ_SLOT( slotChangeButtonStates() ) ); groupingActive = true; } diff --git a/digikam/digikam/searchadvanceddialog.h b/digikam/digikam/searchadvanceddialog.h index d3080b8..e4f233b 100644 --- a/digikam/digikam/searchadvanceddialog.h +++ b/digikam/digikam/searchadvanceddialog.h @@ -50,7 +50,7 @@ class SearchAdvancedDialogPriv; */ class SearchAdvancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index 5fd23e9..c302d70 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -111,23 +111,23 @@ SearchFolderView::SearchFolderView(TQWidget* parent) m_lastAddedItem = 0; - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(clear())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } SearchFolderView::~SearchFolderView() diff --git a/digikam/digikam/searchfolderview.h b/digikam/digikam/searchfolderview.h index f100b8b..8dab4ca 100644 --- a/digikam/digikam/searchfolderview.h +++ b/digikam/digikam/searchfolderview.h @@ -37,7 +37,7 @@ class SearchFolderItem; class SearchFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 67ca2a6..9cca5df 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -102,14 +102,14 @@ SearchQuickDialog::SearchQuickDialog(TQWidget* parent, KURL& url) grid->addMultiCellWidget(label2, 2, 2, 0, 1); grid->addMultiCellWidget(d->nameEdit, 2, 2, 2, 2); - connect(d->searchEdit, TQT_SIGNAL(signalTextChanged(const TQString&)), - this, TQT_SLOT(slotSearchChanged(const TQString&))); + connect(d->searchEdit, TQ_SIGNAL(signalTextChanged(const TQString&)), + this, TQ_SLOT(slotSearchChanged(const TQString&))); - connect(d->resultsView, TQT_SIGNAL(signalSearchResultsMatch(bool)), - d->searchEdit, TQT_SLOT(slotSearchResult(bool))); + connect(d->resultsView, TQ_SIGNAL(signalSearchResultsMatch(bool)), + d->searchEdit, TQ_SLOT(slotSearchResult(bool))); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); enableButtonOK(false); resize(configDialogSize("QuickSearch Dialog")); diff --git a/digikam/digikam/searchquickdialog.h b/digikam/digikam/searchquickdialog.h index 64f3d90..3412283 100644 --- a/digikam/digikam/searchquickdialog.h +++ b/digikam/digikam/searchquickdialog.h @@ -50,7 +50,7 @@ class SearchQuickDialogPriv; */ class SearchQuickDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index c88f093..968b14a 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -110,11 +110,11 @@ void SearchResultsView::openURL(const KURL& url) d->listJob = new TDEIO::TransferJob(url, TDEIO::CMD_SPECIAL, ba, TQByteArray(), false); - connect(d->listJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*))); + connect(d->listJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*))); - connect(d->listJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(d->listJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void SearchResultsView::clear() @@ -179,11 +179,11 @@ void SearchResultsView::slotData(TDEIO::Job*, const TQByteArray &data) { d->thumbJob = new ThumbnailJob(ulist, 128, true, true); - connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); + connect(d->thumbJob, TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), - this, TQT_SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQ_SIGNAL(signalFailed(const KURL&)), + this, TQ_SLOT(slotFailedThumbnail(const KURL&))); } } diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index b8c48a7..a3846a2 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -51,7 +51,7 @@ class SearchResultsViewPriv; class SearchResultsView : public TQIconView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 6089d54..c930d80 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -142,8 +142,8 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); hline->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), - this, TQT_SLOT( slotLabelDoubleClick() )); + connect( m_label, TQ_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), + this, TQ_SLOT( slotLabelDoubleClick() )); } m_hbox = new TQWidget( m_box ); @@ -176,14 +176,14 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_box->show(); - connect( m_key, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT(slotKeyChanged(int))); - connect( m_key, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); - connect( m_operator, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_key, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT(slotKeyChanged(int))); + connect( m_key, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); + connect( m_operator, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::setValues(const KURL& url) @@ -217,7 +217,7 @@ void SearchAdvancedRule::setValues(const KURL& url) m_lineEdit->setText( value ); if (m_widgetType == DATE) - m_dateEdit->setDate( TQDate::fromString( value, Qt::ISODate) ); + m_dateEdit->setDate( TQDate::fromString( value, TQt::ISODate) ); if (m_widgetType == RATING) { @@ -314,8 +314,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_dateEdit->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_dateEdit->show(); - connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ), - this, TQT_SIGNAL(signalPropertyChanged())); + connect( m_dateEdit, TQ_SIGNAL( dateChanged(const TQDate& ) ), + this, TQ_SIGNAL(signalPropertyChanged())); } else if (newType == LINEEDIT) { @@ -323,8 +323,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_lineEdit->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_lineEdit->show(); - connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ), - this, TQT_SIGNAL(signalPropertyChanged())); + connect( m_lineEdit, TQ_SIGNAL ( textChanged(const TQString&) ), + this, TQ_SIGNAL(signalPropertyChanged())); } else if (newType == ALBUMS) @@ -364,8 +364,8 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } else if (newType == TAGS) { @@ -404,16 +404,16 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } else if (newType == RATING) { m_ratingWidget = new RatingWidget( m_valueBox ); m_ratingWidget->show(); - connect( m_ratingWidget, TQT_SIGNAL( signalRatingChanged(int) ), - this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_ratingWidget, TQ_SIGNAL( signalRatingChanged(int) ), + this, TQ_SIGNAL( signalPropertyChanged() )); } } @@ -448,7 +448,7 @@ TQString SearchAdvancedRule::urlValue() const string = m_lineEdit->text() ; else if (m_widgetType == DATE) - string = m_dateEdit->date().toString(Qt::ISODate) ; + string = m_dateEdit->date().toString(TQt::ISODate) ; else if (m_widgetType == TAGS || m_widgetType == ALBUMS) string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]); @@ -504,8 +504,8 @@ void SearchAdvancedRule::addCheck() m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_check->show(); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::removeCheck() @@ -524,8 +524,8 @@ SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent) m_option = SearchAdvancedRule::NONE; m_box->show(); - connect( m_check, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( signalBaseItemToggled() )); } SearchAdvancedGroup::~SearchAdvancedGroup() diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index dd95563..75ca51c 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -53,7 +53,7 @@ class SqueezedComboBox; */ class SearchRuleLabel: public TQLabel { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ private: */ class SearchAdvancedBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -193,7 +193,7 @@ class SearchAdvancedGroup; */ class SearchAdvancedRule : public SearchAdvancedBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index 44b6829..b350aab 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -105,8 +105,8 @@ bool SyncJob::delPriv(const KURL::List& urls) success_ = true; TDEIO::Job* job = TDEIO::del( urls ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -123,8 +123,8 @@ bool SyncJob::trashPriv(const KURL::List& urls) } TDEIO::Job* job = TDEIO::move( urls, dest ); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -136,8 +136,8 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) TDEIO::FileCopyJob* job = TDEIO::file_move(src, dest, -1, true, false, false); - connect( job, TQT_SIGNAL(result( TDEIO::Job* )), - TQT_SLOT(slotResult( TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job* )), + TQ_SLOT(slotResult( TDEIO::Job*)) ); enter_loop(); return success_; @@ -146,7 +146,7 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) void SyncJob::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -186,11 +186,11 @@ TQPixmap SyncJob::getTagThumbnailPriv(TAlbum *album) } else { - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotLoadThumbnailFailed(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotLoadThumbnailFailed(Album *))); album_ = album; enter_loop(); @@ -230,13 +230,13 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size) false, AlbumSettings::instance()->getExifRotate()); connect(job, - TQT_SIGNAL(signalThumbnail(const KURL&, + TQ_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), - TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, + TQ_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(job, - TQT_SIGNAL(signalFailed(const KURL&)), - TQT_SLOT(slotLoadThumbnailFailed())); + TQ_SIGNAL(signalFailed(const KURL&)), + TQ_SLOT(slotLoadThumbnailFailed())); enter_loop(); job->kill(); diff --git a/digikam/digikam/syncjob.h b/digikam/digikam/syncjob.h index 0039d0a..fca8261 100644 --- a/digikam/digikam/syncjob.h +++ b/digikam/digikam/syncjob.h @@ -54,7 +54,7 @@ class TAlbum; class SyncJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 956fd2e..d77a016 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -179,14 +179,14 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) // -------------------------------------------------------- - connect(d->iconButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotIconChanged())); + connect(d->iconButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotIconChanged())); - connect(d->resetIconButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotIconResetClicked())); + connect(d->resetIconButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotIconResetClicked())); - connect(d->titleEdit->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTitleChanged(const TQString&))); + connect(d->titleEdit->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTitleChanged(const TQString&))); // -------------------------------------------------------- diff --git a/digikam/digikam/tageditdlg.h b/digikam/digikam/tageditdlg.h index d82f1c0..a1bfcfa 100644 --- a/digikam/digikam/tageditdlg.h +++ b/digikam/digikam/tageditdlg.h @@ -44,7 +44,7 @@ class TagEditDlgPriv; class TagEditDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index fe658c0..2bebc2b 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -288,45 +288,45 @@ TagFilterView::TagFilterView(TQWidget* parent) // ------------------------------------------------------------------------ - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotTagAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotTagAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotTagDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotTagDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotTagRenamed(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotTagRenamed(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotClear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotClear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotTagMoved(TAlbum*, TAlbum*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotTagMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); // ------------------------------------------------------------------------ @@ -873,8 +873,8 @@ void TagFilterView::slotContextMenu(TQListViewItem* it, const TQPoint&, int) d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() )); TDEPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters")); @@ -1134,13 +1134,13 @@ void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, cons if (title.isNull()) { - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1165,7 +1165,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) return; TQString title, icon; - if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) + if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) { return; } diff --git a/digikam/digikam/tagfilterview.h b/digikam/digikam/tagfilterview.h index e5395d1..0cd977e 100644 --- a/digikam/digikam/tagfilterview.h +++ b/digikam/digikam/tagfilterview.h @@ -39,7 +39,7 @@ class TagFilterViewPrivate; class TagFilterView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 13629b9..c5d5433 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -195,45 +195,45 @@ TagFolderView::TagFolderView(TQWidget *parent) // ------------------------------------------------------------------------ - connect(d->albumMan, TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), - this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); + connect(d->albumMan, TQ_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQ_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(slotAlbumsCleared())); - connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), - this, TQT_SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQ_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQ_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(d->albumMan, TQ_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQ_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), - this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); + connect(loader, TQ_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQ_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, TQT_SIGNAL(signalFailed(Album *)), - this, TQT_SLOT(slotThumbnailLost(Album *))); + connect(loader, TQ_SIGNAL(signalFailed(Album *)), + this, TQ_SLOT(slotThumbnailLost(Album *))); - connect(loader, TQT_SIGNAL(signalReloadThumbnails()), - this, TQT_SLOT(slotReloadThumbnails())); + connect(loader, TQ_SIGNAL(signalReloadThumbnails()), + this, TQ_SLOT(slotReloadThumbnails())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } TagFolderView::~TagFolderView() @@ -533,8 +533,8 @@ void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int) { d->ABCMenu = new TQPopupMenu; - connect( d->ABCMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotABCContextMenu() ) ); + connect( d->ABCMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotABCContextMenu() ) ); TagFolderViewItem *tag = dynamic_cast<TagFolderViewItem*>(item); @@ -635,13 +635,13 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con if (title.isNull()) { - if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; } TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -667,7 +667,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item) return; TQString title, icon; - if(!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) + if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) return; if(tag->title() != title) diff --git a/digikam/digikam/tagfolderview.h b/digikam/digikam/tagfolderview.h index 483e1d9..27523e9 100644 --- a/digikam/digikam/tagfolderview.h +++ b/digikam/digikam/tagfolderview.h @@ -43,7 +43,7 @@ class TagFolderViewPriv; class TagFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index bb0e052..8b9e464 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -103,7 +103,7 @@ public: TQFont fn = m_popup->font(); TQFontMetrics fm(fn); TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight); - kapp->style().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); + kapp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); } private: @@ -148,11 +148,11 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int TDEIcon::DefaultState, 0, true); - connect(this, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShow())); - connect(this, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int))); } TagsPopupMenu::~TagsPopupMenu() @@ -175,8 +175,8 @@ TQPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) TQPopupMenu* popup = new TQPopupMenu(this); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int))); if (d->mode == ASSIGN) { @@ -290,7 +290,7 @@ void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album) for (Album* a = album->firstChild(); a; a = a->next()) { - sortedTags.push_back(tqMakePair(a->title(), a)); + sortedTags.push_back(qMakePair(a->title(), a)); } qHeapSort(sortedTags); @@ -346,12 +346,12 @@ void TagsPopupMenu::slotActivated(int id) } TQString title, icon; - if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), parent, title, icon)) + if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) return; TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); + TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) emit signalTagActivated((*it)->id()); diff --git a/digikam/digikam/tagspopupmenu.h b/digikam/digikam/tagspopupmenu.h index 942192b..5e74641 100644 --- a/digikam/digikam/tagspopupmenu.h +++ b/digikam/digikam/tagspopupmenu.h @@ -38,7 +38,7 @@ class TagsPopupMenuPriv; class TagsPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index 97225f7..0168b8c 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -97,23 +97,23 @@ TimeLineFolderView::TimeLineFolderView(TQWidget* parent) setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), - this, TQT_SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumAdded(Album*)), + this, TQ_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), - this, TQT_SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumDeleted(Album*)), + this, TQ_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), - this, TQT_SLOT(clear())); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumsCleared()), + this, TQ_SLOT(clear())); - connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), - this, TQT_SLOT(slotAlbumRenamed(Album*))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalAlbumRenamed(Album*)), + this, TQ_SLOT(slotAlbumRenamed(Album*))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); } TimeLineFolderView::~TimeLineFolderView() diff --git a/digikam/digikam/timelinefolderview.h b/digikam/digikam/timelinefolderview.h index e2e02c0..2e8a8a8 100644 --- a/digikam/digikam/timelinefolderview.h +++ b/digikam/digikam/timelinefolderview.h @@ -37,7 +37,7 @@ class TimeLineFolderItem; class TimeLineFolderView : public FolderView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 1951d43..ae8a6bc 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -138,7 +138,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->timeUnitCB->insertItem(i18n("Month"), TimeLineWidget::Month); d->timeUnitCB->insertItem(i18n("Year"), TimeLineWidget::Year); d->timeUnitCB->setCurrentItem((int)TimeLineWidget::Month); - d->timeUnitCB->setFocusPolicy(TQ_NoFocus); + d->timeUnitCB->setFocusPolicy(TQWidget::NoFocus); TQWhatsThis::add(d->timeUnitCB, i18n("<p>Select the histogram time unit here.<p>" "You can change the graph decade to zoom in or zoom out over time.")); @@ -179,7 +179,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->timeLineWidget = new TimeLineWidget(panel); d->scrollBar = new TQScrollBar(panel); - d->scrollBar->setOrientation(Qt::Horizontal); + d->scrollBar->setOrientation(TQt::Horizontal); d->scrollBar->setMinValue(0); d->scrollBar->setLineStep(1); @@ -239,56 +239,56 @@ TimeLineView::TimeLineView(TQWidget *parent) // --------------------------------------------------------------- - connect(AlbumManager::instance(), TQT_SIGNAL(signalDatesMapDirty(const TQMap<TQDateTime, int>&)), - d->timeLineWidget, TQT_SLOT(slotDatesMap(const TQMap<TQDateTime, int>&))); + connect(AlbumManager::instance(), TQ_SIGNAL(signalDatesMapDirty(const TQMap<TQDateTime, int>&)), + d->timeLineWidget, TQ_SLOT(slotDatesMap(const TQMap<TQDateTime, int>&))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalAlbumSelected(SAlbum*)), - this, TQT_SLOT(slotAlbumSelected(SAlbum*))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalAlbumSelected(SAlbum*)), + this, TQ_SLOT(slotAlbumSelected(SAlbum*))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalRenameAlbum(SAlbum*)), - this, TQT_SLOT(slotRenameAlbum(SAlbum*))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalRenameAlbum(SAlbum*)), + this, TQ_SLOT(slotRenameAlbum(SAlbum*))); - connect(d->timeLineFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchDateBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->timeLineFolderView, TQ_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchDateBar, TQ_SLOT(slotSearchResult(bool))); - connect(d->searchDateBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->timeLineFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); + connect(d->searchDateBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->timeLineFolderView, TQ_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->timeUnitCB, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotTimeUnitChanged(int))); + connect(d->timeUnitCB, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotTimeUnitChanged(int))); - connect(d->scaleBG, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotScaleChanged(int))); - connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotInit())); + connect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotInit())); - connect(d->timeLineWidget, TQT_SIGNAL(signalCursorPositionChanged()), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalCursorPositionChanged()), + this, TQ_SLOT(slotCursorPositionChanged())); - connect(d->timeLineWidget, TQT_SIGNAL(signalSelectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalSelectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); - connect(d->timeLineWidget, TQT_SIGNAL(signalRefDateTimeChanged()), - this, TQT_SLOT(slotRefDateTimeChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalRefDateTimeChanged()), + this, TQ_SLOT(slotRefDateTimeChanged())); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateCurrentDateSearchAlbum())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateCurrentDateSearchAlbum())); - connect(d->resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetSelection())); + connect(d->resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetSelection())); - connect(d->saveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveSelection())); + connect(d->saveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveSelection())); - connect(d->scrollBar, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotScrollBarValueChanged(int))); + connect(d->scrollBar, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotScrollBarValueChanged(int))); - connect(d->nameEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCheckAboutSelection())); + connect(d->nameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCheckAboutSelection())); - connect(d->nameEdit, TQT_SIGNAL(returnPressed(const TQString&)), - d->saveButton, TQT_SLOT(animateClick())); + connect(d->nameEdit, TQ_SIGNAL(returnPressed(const TQString&)), + d->saveButton, TQ_SLOT(animateClick())); } TimeLineView::~TimeLineView() @@ -316,11 +316,11 @@ void TimeLineView::slotInit() readConfig(); - disconnect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotInit())); + disconnect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotInit())); - connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQ_SIGNAL(signalDateMapChanged()), + this, TQ_SLOT(slotCursorPositionChanged())); } void TimeLineView::readConfig() @@ -469,10 +469,10 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name) end = (*it).second; url.addQueryItem(TQString("%1.key").arg(i*2+1), TQString("imagedate")); url.addQueryItem(TQString("%1.op").arg(i*2+1), TQString("GT")); - url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(Qt::ISODate)); + url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(TQt::ISODate)); url.addQueryItem(TQString("%1.key").arg(i*2+2), TQString("imagedate")); url.addQueryItem(TQString("%1.op").arg(i*2+2), TQString("LT")); - url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(Qt::ISODate)); + url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(TQt::ISODate)); i++; } @@ -529,14 +529,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) key = TQString("%1.val").arg(TQString::number(i)); it2 = queries.find(key); if (it2 != queries.end()) - start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); + start = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; key = TQString("%1.val").arg(TQString::number(i+1)); it2 = queries.find(key); if (it2 != queries.end()) - end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); + end = TQDateTime(TQDate::fromString(it2.data(), TQt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; @@ -546,8 +546,8 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) /* DateRangeList::iterator it3; for (it3 = list.begin() ; it3 != list.end(); ++it3) - DDebug() << (*it3).first.date().toString(Qt::ISODate) << " :: " - << (*it3).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it3).first.date().toString(TQt::ISODate) << " :: " + << (*it3).second.date().toString(TQt::ISODate) << endl; */ d->timeLineWidget->setSelectedDateRange(list); diff --git a/digikam/digikam/timelineview.h b/digikam/digikam/timelineview.h index 014bc2a..fd67366 100644 --- a/digikam/digikam/timelineview.h +++ b/digikam/digikam/timelineview.h @@ -40,7 +40,7 @@ class TimeLineViewPriv; class TimeLineView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 46aff0e..b9033e4 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -124,8 +124,8 @@ TimeLineWidget::TimeLineWidget(TQWidget *parent) setCursorDateTime(ref); setRefDateTime(ref); - connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), - this, TQT_SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQ_SIGNAL(signalThemeChanged()), + this, TQ_SLOT(slotThemeChanged())); } TimeLineWidget::~TimeLineWidget() @@ -421,8 +421,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) /* for (it = list.begin() ; it != list.end(); ++it) - DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " - << (*it).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: " + << (*it).second.date().toString(TQt::ISODate) << endl; DDebug() << "Total Count of Items = " << totalCount << endl; */ @@ -461,8 +461,8 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) /* for (it = list2.begin() ; it != list2.end(); ++it) - DDebug() << (*it).first.date().toString(Qt::ISODate) << " :: " - << (*it).second.date().toString(Qt::ISODate) << endl; + DDebug() << (*it).first.date().toString(TQt::ISODate) << " :: " + << (*it).second.date().toString(TQt::ISODate) << endl; */ return list2; @@ -1492,7 +1492,7 @@ void TimeLineWidget::wheelEvent(TQWheelEvent* e) void TimeLineWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { TQPoint pt(e->x(), e->y()); diff --git a/digikam/digikam/timelinewidget.h b/digikam/digikam/timelinewidget.h index bc865ae..33aeb7e 100644 --- a/digikam/digikam/timelinewidget.h +++ b/digikam/digikam/timelinewidget.h @@ -44,7 +44,7 @@ class TimeLineWidgetPriv; class TimeLineWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index eef7e74..6327c94 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -50,7 +50,7 @@ namespace Digikam WelcomePageView::WelcomePageView(TQWidget* parent) : TDEHTMLPart(parent) { - widget()->setFocusPolicy(TQ_WheelFocus); + widget()->setFocusPolicy(TQWidget::WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): setPluginsEnabled(false); setJScriptEnabled(false); // just make this explicit. @@ -83,8 +83,8 @@ WelcomePageView::WelcomePageView(TQWidget* parent) end(); show(); - connect(browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - this, TQT_SLOT(slotUrlOpen(const KURL &))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + this, TQ_SLOT(slotUrlOpen(const KURL &))); } WelcomePageView::~WelcomePageView() diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index 2aca456..b69d82a 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -42,7 +42,7 @@ namespace Digikam class DIGIKAM_EXPORT WelcomePageView : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: |