diff options
Diffstat (limited to 'digikam/digikam')
57 files changed, 605 insertions, 605 deletions
diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index 11402d3..7301785 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -247,7 +247,7 @@ PAlbum::PAlbum(const TQString& title, int id, bool root) setTitle(title); m_caption = ""; m_collection = ""; - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); } PAlbum::~PAlbum() @@ -458,10 +458,10 @@ KURL DAlbum::kurl() const KURL u; u.setProtocol("digikamdates"); u.setPath(TQString("/%1/%2/%3/%4") - .tqarg(m_date.year()) - .tqarg(m_date.month()) - .tqarg(endDate.year()) - .tqarg(endDate.month())); + .arg(m_date.year()) + .arg(m_date.month()) + .arg(endDate.year()) + .arg(endDate.month())); return u; } @@ -516,7 +516,7 @@ AlbumIterator& AlbumIterator::operator++() if ( m_current == m_root ) { // we have reached the root. - // that means no more tqchildren + // that means no more children m_current = 0; break; } diff --git a/digikam/digikam/album.h b/digikam/digikam/album.h index 50960bc..ed08818 100644 --- a/digikam/digikam/album.h +++ b/digikam/digikam/album.h @@ -82,12 +82,12 @@ public: Album* parent() const; /** - * @return the first child of this album or 0 if no tqchildren + * @return the first child of this album or 0 if no children */ Album* firstChild() const; /** - * @return the last child of this album or 0 if no tqchildren + * @return the last child of this album or 0 if no children */ Album* lastChild() const; @@ -250,7 +250,7 @@ protected: /** * @internal use only * - * Remove a Album from the tqchildren list for this album + * Remove a Album from the children list for this album * * @param child the Album to remove */ @@ -413,7 +413,7 @@ private: /** * \class AlbumIterator * - * Iterate over all tqchildren of this Album. + * Iterate over all children of this Album. * \note It will not include the specified album * * Example usage: diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index ddcbdc7..a2aba01 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -432,7 +432,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption, execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) " "VALUES('%1', '%2', '%3', '%4');") - .tqarg(escapeString(url), + .arg(escapeString(url), date.toString(Qt::ISODate), escapeString(caption), escapeString(collection))); @@ -444,29 +444,29 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption, void AlbumDB::setAlbumCaption(int albumID, const TQString& caption) { execSql( TQString("UPDATE Albums SET caption='%1' WHERE id=%2;") - .tqarg(escapeString(caption), + .arg(escapeString(caption), TQString::number(albumID) )); } void AlbumDB::setAlbumCollection(int albumID, const TQString& collection) { execSql( TQString("UPDATE Albums SET collection='%1' WHERE id=%2;") - .tqarg(escapeString(collection), + .arg(escapeString(collection), TQString::number(albumID)) ); } void AlbumDB::setAlbumDate(int albumID, const TQDate& date) { execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;") - .tqarg(date.toString(Qt::ISODate)) - .tqarg(albumID) ); + .arg(date.toString(Qt::ISODate)) + .arg(albumID) ); } void AlbumDB::setAlbumIcon(int albumID, TQ_LLONG iconID) { execSql( TQString("UPDATE Albums SET icon=%1 WHERE id=%2;") - .tqarg(iconID) - .tqarg(albumID) ); + .arg(iconID) + .arg(albumID) ); } @@ -478,7 +478,7 @@ TQString AlbumDB::getAlbumIcon(int albumID) " LEFT OUTER JOIN Images AS I ON I.id=A.icon \n " " LEFT OUTER JOIN Albums AS B ON B.id=I.dirid \n " "WHERE A.id=%1;") - .tqarg(albumID), &values ); + .arg(albumID), &values ); if (values.isEmpty()) return TQString(); @@ -499,7 +499,7 @@ TQString AlbumDB::getAlbumIcon(int albumID) void AlbumDB::deleteAlbum(int albumID) { execSql( TQString("DELETE FROM Albums WHERE id=%1") - .tqarg(albumID) ); + .arg(albumID) ); } int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconKDE, @@ -510,8 +510,8 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK if (!execSql( TQString("INSERT INTO Tags (pid, name) " "VALUES( %1, '%2')") - .tqarg(parentTagID) - .tqarg(escapeString(name)))) + .arg(parentTagID) + .arg(escapeString(name)))) { return -1; } @@ -521,14 +521,14 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK if (!iconKDE.isEmpty()) { execSql( TQString("UPDATE Tags SET iconkde='%1' WHERE id=%2;") - .tqarg(escapeString(iconKDE), + .arg(escapeString(iconKDE), TQString::number(id))); } else { execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;") - .tqarg(iconID) - .tqarg(id)); + .arg(iconID) + .arg(id)); } return id; @@ -537,7 +537,7 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK void AlbumDB::deleteTag(int tagID) { execSql( TQString("DELETE FROM Tags WHERE id=%1") - .tqarg(tagID) ); + .arg(tagID) ); } void AlbumDB::setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID) @@ -545,14 +545,14 @@ void AlbumDB::setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID) if (!iconKDE.isEmpty()) { execSql( TQString("UPDATE Tags SET iconkde='%1', icon=0 WHERE id=%2;") - .tqarg(escapeString(iconKDE), + .arg(escapeString(iconKDE), TQString::number(tagID))); } else { execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;") - .tqarg(iconID) - .tqarg(tagID)); + .arg(iconID) + .arg(tagID)); } } @@ -564,7 +564,7 @@ TQString AlbumDB::getTagIcon(int tagID) " LEFT OUTER JOIN Images AS I ON I.id=T.icon \n " " LEFT OUTER JOIN Albums AS A ON A.id=I.dirid \n " "WHERE T.id=%1;") - .tqarg(tagID), &values ); + .arg(tagID), &values ); if (values.isEmpty()) return TQString(); @@ -597,8 +597,8 @@ TQString AlbumDB::getTagIcon(int tagID) void AlbumDB::setTagParentID(int tagID, int newParentTagID) { execSql( TQString("UPDATE Tags SET pid=%1 WHERE id=%2;") - .tqarg(newParentTagID) - .tqarg(tagID) ); + .arg(newParentTagID) + .arg(tagID) ); } int AlbumDB::addSearch(const TQString& name, const KURL& url) @@ -624,7 +624,7 @@ void AlbumDB::updateSearch(int searchID, const TQString& name, { TQString str = TQString("UPDATE Searches SET name='$$@@$$', url='$$##$$' \n" "WHERE id=%1") - .tqarg(searchID); + .arg(searchID); str.replace("$$@@$$", escapeString(name)); str.replace("$$##$$", escapeString(url.url())); @@ -634,14 +634,14 @@ void AlbumDB::updateSearch(int searchID, const TQString& name, void AlbumDB::deleteSearch(int searchID) { execSql( TQString("DELETE FROM Searches WHERE id=%1") - .tqarg(searchID) ); + .arg(searchID) ); } void AlbumDB::setSetting(const TQString& keyword, const TQString& value ) { execSql( TQString("REPLACE into Settings VALUES ('%1','%2');") - .tqarg(escapeString(keyword), + .arg(escapeString(keyword), escapeString(value) )); } @@ -650,7 +650,7 @@ TQString AlbumDB::getSetting(const TQString& keyword) TQStringList values; execSql( TQString("SELECT value FROM Settings " "WHERE keyword='%1';") - .tqarg(escapeString(keyword)), &values ); + .arg(escapeString(keyword)), &values ); if (values.isEmpty()) return TQString(); @@ -729,7 +729,7 @@ TQString AlbumDB::getItemCaption(TQ_LLONG imageID) execSql( TQString("SELECT caption FROM Images " "WHERE id=%1;") - .tqarg(imageID), + .arg(imageID), &values ); if (!values.isEmpty()) @@ -744,8 +744,8 @@ TQString AlbumDB::getItemCaption(int albumID, const TQString& name) execSql( TQString("SELECT caption FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(name)), + .arg(albumID) + .arg(escapeString(name)), &values ); if (!values.isEmpty()) @@ -760,7 +760,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID) execSql( TQString("SELECT datetime FROM Images " "WHERE id=%1;") - .tqarg(imageID), + .arg(imageID), &values ); if (values.isEmpty()) @@ -775,8 +775,8 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) execSql( TQString("SELECT datetime FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(name)), + .arg(albumID) + .arg(escapeString(name)), &values ); if (values.isEmpty()) @@ -791,8 +791,8 @@ TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name) execSql( TQString("SELECT id FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(name)), + .arg(albumID) + .arg(escapeString(name)), &values ); if (values.isEmpty()) @@ -809,7 +809,7 @@ TQStringList AlbumDB::getItemTagNames(TQ_LLONG imageID) "WHERE id IN (SELECT tagid FROM ImageTags \n " " WHERE imageid=%1) \n " "ORDER BY name;") - .tqarg(imageID), + .arg(imageID), &values ); return values; @@ -821,7 +821,7 @@ IntList AlbumDB::getItemTagIDs(TQ_LLONG imageID) execSql( TQString("SELECT tagid FROM ImageTags \n " "WHERE imageID=%1;") - .tqarg(imageID), + .arg(imageID), &values ); IntList ids; @@ -847,7 +847,7 @@ bool AlbumDB::hasTags(const LLongList& imageIDList) TQString sql = TQString("SELECT count(tagid) FROM ImageTags " "WHERE imageid=%1 ") - .tqarg(imageIDList.first()); + .arg(imageIDList.first()); LLongList::const_iterator iter = imageIDList.begin(); ++iter; @@ -855,7 +855,7 @@ bool AlbumDB::hasTags(const LLongList& imageIDList) while (iter != imageIDList.end()) { sql += TQString(" OR imageid=%2 ") - .tqarg(*iter); + .arg(*iter); ++iter; } @@ -879,7 +879,7 @@ IntList AlbumDB::getItemCommonTagIDs(const LLongList& imageIDList) TQString sql = TQString("SELECT DISTINCT tagid FROM ImageTags " "WHERE imageid=%1 ") - .tqarg(imageIDList.first()); + .arg(imageIDList.first()); LLongList::const_iterator iter = imageIDList.begin(); ++iter; @@ -887,7 +887,7 @@ IntList AlbumDB::getItemCommonTagIDs(const LLongList& imageIDList) while (iter != imageIDList.end()) { sql += TQString(" OR imageid=%2 ") - .tqarg(*iter); + .arg(*iter); ++iter; } @@ -910,7 +910,7 @@ void AlbumDB::setItemCaption(TQ_LLONG imageID,const TQString& caption) execSql( TQString("UPDATE Images SET caption='%1' " "WHERE id=%2;") - .tqarg(escapeString(caption), + .arg(escapeString(caption), TQString::number(imageID) )); } @@ -920,7 +920,7 @@ void AlbumDB::setItemCaption(int albumID, const TQString& name, const TQString& execSql( TQString("UPDATE Images SET caption='%1' " "WHERE dirid=%2 AND name='%3';") - .tqarg(escapeString(caption), + .arg(escapeString(caption), TQString::number(albumID), escapeString(name)) ); } @@ -929,8 +929,8 @@ void AlbumDB::addItemTag(TQ_LLONG imageID, int tagID) { execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .tqarg(imageID) - .tqarg(tagID) ); + .arg(imageID) + .arg(tagID) ); if (!d->recentlyAssignedTags.contains(tagID)) { @@ -945,9 +945,9 @@ void AlbumDB::addItemTag(int albumID, const TQString& name, int tagID) execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) \n " "(SELECT id, %1 FROM Images \n " " WHERE dirid=%2 AND name='%3');") - .tqarg(tagID) - .tqarg(albumID) - .tqarg(escapeString(name)) ); + .arg(tagID) + .arg(albumID) + .arg(escapeString(name)) ); } IntList AlbumDB::getRecentlyAssignedTags() const @@ -959,15 +959,15 @@ void AlbumDB::removeItemTag(TQ_LLONG imageID, int tagID) { execSql( TQString("DELETE FROM ImageTags " "WHERE imageID=%1 AND tagid=%2;") - .tqarg(imageID) - .tqarg(tagID) ); + .arg(imageID) + .arg(tagID) ); } void AlbumDB::removeItemAllTags(TQ_LLONG imageID) { execSql( TQString("DELETE FROM ImageTags " "WHERE imageID=%1;") - .tqarg(imageID) ); + .arg(imageID) ); } TQStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive) @@ -983,14 +983,14 @@ TQStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive) "IN (SELECT DISTINCT id " "FROM Albums " "WHERE url='%1' OR url LIKE '\%%2\%')") - .tqarg(escapeString(url.path())).tqarg(escapeString(url.path(1))), &values); + .arg(escapeString(url.path())).arg(escapeString(url.path(1))), &values); } else { execSql( TQString("SELECT Images.name " "FROM Images " "WHERE Images.dirid=%1") - .tqarg(albumID), &values ); + .arg(albumID), &values ); } return values; } @@ -1019,15 +1019,15 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder) { TQStringList values; execSql( TQString("SELECT id FROM Albums WHERE url ='%1';") - .tqarg( escapeString(folder) ), &values); + .arg( escapeString(folder) ), &values); int albumID; if (values.isEmpty()) { execSql( TQString ("INSERT INTO Albums (url, date) " "VALUES ('%1','%2')") - .tqarg(escapeString(folder), - TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) ); + .arg(escapeString(folder), + TQDateTime::currentDateTime().toString(Qt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else albumID = values[0].toInt(); @@ -1045,7 +1045,7 @@ TQ_LLONG AlbumDB::addItem(int albumID, execSql ( TQString ("REPLACE INTO Images " "( caption , datetime, name, dirid ) " " VALUES ('%1','%2','%3',%4) " ) - .tqarg(escapeString(comment), + .arg(escapeString(comment), datetime.toString(Qt::ISODate), escapeString(name), TQString::number(albumID)) ); @@ -1249,7 +1249,7 @@ int AlbumDB::getItemAlbum(TQ_LLONG imageID) execSql ( TQString ("SELECT dirid FROM Images " "WHERE id=%1;") - .tqarg(imageID), + .arg(imageID), &values); if (!values.isEmpty()) @@ -1264,7 +1264,7 @@ TQString AlbumDB::getItemName(TQ_LLONG imageID) execSql ( TQString ("SELECT name FROM Images " "WHERE id=%1;") - .tqarg(imageID), + .arg(imageID), &values); if (!values.isEmpty()) @@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID, { execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE id=%2;") - .tqarg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(Qt::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';") - .tqarg(datetime.toString(Qt::ISODate), + .arg(datetime.toString(Qt::ISODate), TQString::number(albumID), escapeString(name)) ); @@ -1301,9 +1301,9 @@ void AlbumDB::setItemRating(TQ_LLONG imageID, int rating) execSql ( TQString ("REPLACE INTO ImageProperties " "(imageid, property, value) " "VALUES(%1, '%2', '%3');") - .tqarg(imageID) - .tqarg("Rating") - .tqarg(rating) ); + .arg(imageID) + .arg("Rating") + .arg(rating) ); } int AlbumDB::getItemRating(TQ_LLONG imageID) @@ -1312,8 +1312,8 @@ int AlbumDB::getItemRating(TQ_LLONG imageID) execSql( TQString("SELECT value FROM ImageProperties " "WHERE imageid=%1 and property='%2';") - .tqarg(imageID) - .tqarg("Rating"), + .arg(imageID) + .arg("Rating"), &values); if (!values.isEmpty()) @@ -1337,7 +1337,7 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID) sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid " "ORDER BY Images.name COLLATE NOCASE;") - .tqarg(albumID); + .arg(albumID); break; case AlbumSettings::ByIPath: // Dont collate on the path - this is to maintain the same behaviour @@ -1345,13 +1345,13 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID) sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid " "ORDER BY Albums.url,Images.name;") - .tqarg(albumID); + .arg(albumID); break; case AlbumSettings::ByIDate: sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid " "ORDER BY Images.datetime;") - .tqarg(albumID); + .arg(albumID); break; case AlbumSettings::ByIRating: sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums, ImageProperties " @@ -1359,12 +1359,12 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID) "AND Images.id = ImageProperties.imageid " "AND ImageProperties.property='Rating' " "ORDER BY ImageProperties.value DESC;") - .tqarg(albumID); + .arg(albumID); break; default: sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid;") - .tqarg(albumID); + .arg(albumID); break; } execSql( sqlString, &values ); @@ -1403,14 +1403,14 @@ TQStringList AlbumDB::getItemURLsInTag(int tagID, bool recursive) imagesIdClause = TQString("SELECT imageid FROM ImageTags " " WHERE tagid=%1 " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)") - .tqarg(tagID).tqarg(tagID); + .arg(tagID).arg(tagID); else - imagesIdClause = TQString("SELECT imageid FROM ImageTags WHERE tagid=%1").tqarg(tagID); + imagesIdClause = TQString("SELECT imageid FROM ImageTags WHERE tagid=%1").arg(tagID); execSql( TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Images.id IN (%1) " "AND Albums.id=Images.dirid;") - .tqarg(imagesIdClause), &values ); + .arg(imagesIdClause), &values ); for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { @@ -1429,10 +1429,10 @@ LLongList AlbumDB::getItemIDsInTag(int tagID, bool recursive) execSql( TQString("SELECT imageid FROM ImageTags " " WHERE tagid=%1 " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)") - .tqarg(tagID).tqarg(tagID), &values ); + .arg(tagID).arg(tagID), &values ); else execSql( TQString("SELECT imageid FROM ImageTags WHERE tagid=%1;") - .tqarg(tagID), &values ); + .arg(tagID), &values ); for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { @@ -1446,7 +1446,7 @@ TQString AlbumDB::getAlbumURL(int albumID) { TQStringList values; execSql( TQString("SELECT url from Albums where id=%1") - .tqarg( albumID), &values); + .arg( albumID), &values); return values[0]; } @@ -1455,7 +1455,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID) TQStringList values; execSql( TQString("SELECT MIN(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") - .tqarg( albumID ), &values); + .arg( albumID ), &values); TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); return itemDate; } @@ -1465,7 +1465,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID) TQStringList values; execSql( TQString("SELECT MAX(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") - .tqarg( albumID ), &values); + .arg( albumID ), &values); TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); return itemDate; } @@ -1474,7 +1474,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID) { TQStringList values; execSql( TQString("SELECT datetime FROM Images WHERE dirid=%1") - .tqarg( albumID ), &values); + .arg( albumID ), &values); int differenceInSecs = 0; int amountOfImages = 0; @@ -1508,8 +1508,8 @@ void AlbumDB::deleteItem(int albumID, const TQString& file) { execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(file)) ); + .arg(albumID) + .arg(escapeString(file)) ); } void AlbumDB::setAlbumURL(int albumID, const TQString& url) @@ -1518,17 +1518,17 @@ void AlbumDB::setAlbumURL(int albumID, const TQString& url) // first delete any stale albums left behind execSql( TQString("DELETE FROM Albums WHERE url = '%1'") - .tqarg(u) ); + .arg(u) ); // now update the album url execSql( TQString("UPDATE Albums SET url = '%1' WHERE id = %2;") - .tqarg(u, TQString::number(albumID) )); + .arg(u, TQString::number(albumID) )); } void AlbumDB::setTagName(int tagID, const TQString& name) { execSql( TQString("UPDATE Tags SET name='%1' WHERE id=%2;") - .tqarg(escapeString(name), TQString::number(tagID) )); + .arg(escapeString(name), TQString::number(tagID) )); } void AlbumDB::moveItem(int srcAlbumID, const TQString& srcName, @@ -1540,7 +1540,7 @@ void AlbumDB::moveItem(int srcAlbumID, const TQString& srcName, execSql( TQString("UPDATE Images SET dirid=%1, name='%2' " "WHERE dirid=%3 AND name='%4';") - .tqarg(TQString::number(dstAlbumID), escapeString(dstName), + .arg(TQString::number(dstAlbumID), escapeString(dstName), TQString::number(srcAlbumID), escapeString(srcName)) ); } @@ -1555,7 +1555,7 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName, TQStringList values; execSql( TQString("SELECT id FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(TQString::number(srcAlbumID), escapeString(srcName)), + .arg(TQString::number(srcAlbumID), escapeString(srcName)), &values); if (values.isEmpty()) @@ -1570,7 +1570,7 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName, execSql( TQString("INSERT INTO Images (dirid, name, caption, datetime) " "SELECT %1, '%2', caption, datetime FROM Images " "WHERE id=%3;") - .tqarg(TQString::number(dstAlbumID), escapeString(dstName), + .arg(TQString::number(dstAlbumID), escapeString(dstName), TQString::number(srcId)) ); int dstId = sqlite3_last_insert_rowid(d->dataBase); @@ -1579,13 +1579,13 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName, execSql( TQString("INSERT INTO ImageTags (imageid, tagid) " "SELECT %1, tagid FROM ImageTags " "WHERE imageid=%2;") - .tqarg(TQString::number(dstId), TQString::number(srcId)) ); + .arg(TQString::number(dstId), TQString::number(srcId)) ); // copy properties (rating) execSql( TQString("INSERT INTO ImageProperties (imageid, property, value) " "SELECT %1, property, value FROM ImageProperties " "WHERE imageid=%2;") - .tqarg(TQString::number(dstId), TQString::number(srcId)) ); + .arg(TQString::number(dstId), TQString::number(srcId)) ); return dstId; } diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 6ae8862..8c4a357 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -30,10 +30,10 @@ #include <tqtooltip.h> #include <tqfileinfo.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqdatetime.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqpainter.h> #include <tqapplication.h> @@ -107,14 +107,14 @@ AlbumFileTip::AlbumFileTip(AlbumIconView* view) setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, d->tipBorder+1, 0); + TQVBoxLayout *layout = new TQVBoxLayout(this, d->tipBorder+1, 0); d->label = new TQLabel(this); d->label->setMargin(0); - d->label->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + d->label->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); - tqlayout->addWidget(d->label); - tqlayout->setResizeMode(TQLayout::Fixed); + layout->addWidget(d->label); + layout->setResizeMode(TQLayout::Fixed); renderArrows(); } @@ -206,7 +206,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix0 = d->corners[0]; pix0.resize(w, w); - pix0.fill(tqcolorGroup().background()); + pix0.fill(colorGroup().background()); TQPainter p0(&pix0); p0.setPen(TQPen(TQt::black, 1)); @@ -220,7 +220,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix1 = d->corners[1]; pix1.resize(w, w); - pix1.fill(tqcolorGroup().background()); + pix1.fill(colorGroup().background()); TQPainter p1(&pix1); p1.setPen(TQPen(TQt::black, 1)); @@ -234,7 +234,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix2 = d->corners[2]; pix2.resize(w, w); - pix2.fill(tqcolorGroup().background()); + pix2.fill(colorGroup().background()); TQPainter p2(&pix2); p2.setPen(TQPen(TQt::black, 1)); @@ -248,7 +248,7 @@ void AlbumFileTip::renderArrows() TQPixmap& pix3 = d->corners[3]; pix3.resize(w, w); - pix3.fill(tqcolorGroup().background()); + pix3.fill(colorGroup().background()); TQPainter p3(&pix3); p3.setPen(TQPen(TQt::black, 1)); @@ -365,8 +365,8 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowFileSize()) { tip += cellBeg + i18n("Size:") + cellMid; - str = i18n("%1 (%2)").tqarg(KIO::convertSize(fi.size())) - .tqarg(KGlobal::locale()->formatNumber(fi.size(), 0)); + str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) + .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); tip += str + cellEnd; } @@ -409,7 +409,7 @@ void AlbumFileTip::updateText() TQString mpixels; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); + .arg(dims.width()).arg(dims.height()).arg(mpixels); tip += cellBeg + i18n("Dimensions:") + cellMid + str + cellEnd; } } @@ -434,8 +434,8 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowPhotoMake()) { - str = TQString("%1 / %2").tqarg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) - .tqarg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model); + str = TQString("%1 / %2").arg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) + .arg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; metaStr += cellBeg + i18n("Make/Model:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } @@ -457,9 +457,9 @@ void AlbumFileTip::updateText() str = photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture; if (photoInfo.focalLength35mm.isEmpty()) - str += TQString(" / %1").tqarg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); + str += TQString(" / %1").arg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); else - str += TQString(" / %1").tqarg(i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm)); + str += TQString(" / %1").arg(i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm)); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; metaStr += cellBeg + i18n("Aperture/Focal:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; @@ -467,8 +467,8 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowPhotoExpo()) { - str = TQString("%1 / %2").tqarg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) - .tqarg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity)); + str = TQString("%1 / %2").arg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) + .arg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity)); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; metaStr += cellBeg + i18n("Exposure/Sensitivity:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } @@ -483,7 +483,7 @@ void AlbumFileTip::updateText() else if (photoInfo.exposureMode.isEmpty() && !photoInfo.exposureProgram.isEmpty()) str = photoInfo.exposureProgram; else - str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); + str = TQString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; metaStr += cellBeg + i18n("Mode/Program:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index fa722a3..44abf82 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -153,7 +153,7 @@ void AlbumFolderViewItem::refresh() dynamic_cast<AlbumFolderViewItem*>(parent())) { if (isOpen()) - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(m_count)); else { int countRecursive = m_count; @@ -165,7 +165,7 @@ void AlbumFolderViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); } } else @@ -359,7 +359,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) if (!match) { - // check if any of the tqchildren match the search + // check if any of the children match the search AlbumIterator it(palbum); while (it.current()) { @@ -805,14 +805,14 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) return; // find subalbums - KURL::List tqchildrenList; - addAlbumChildrenToList(tqchildrenList, album); + KURL::List childrenList; + addAlbumChildrenToList(childrenList, album); DeleteDialog dialog(this); // All subalbums will be presented in the list as well - if (!dialog.confirmDeleteList(tqchildrenList, - tqchildrenList.size() == 1 ? + if (!dialog.confirmDeleteList(childrenList, + childrenList.size() == 1 ? DeleteDialogMode::Albums : DeleteDialogMode::Subalbums, DeleteDialogMode::UserPreference)) return; @@ -870,11 +870,11 @@ void AlbumFolderView::albumRename(AlbumFolderViewItem* item) bool ok; #if KDE_IS_VERSION(3,2,0) - TQString title = KInputDialog::getText(i18n("Rename Album (%1)").tqarg(oldTitle), + TQString title = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldTitle), i18n("Enter new album name:"), oldTitle, &ok, this); #else - TQString title = KLineEditDlg::getText(i18n("Rename Item (%1)").tqarg(oldTitle), + TQString title = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(oldTitle), i18n("Enter new album name:"), oldTitle, &ok, this); #endif diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp index 16907a2..da0be63 100644 --- a/digikam/digikam/albumicongroupitem.cpp +++ b/digikam/digikam/albumicongroupitem.cpp @@ -101,8 +101,8 @@ void AlbumIconGroupItem::paintBanner() TQDate date = album->date(); dateAndComments = i18n("%1 %2 - 1 Item", "%1 %2 - %n Items", count()) - .tqarg(KGlobal::locale()->calendar()->monthName(date, false)) - .tqarg(KGlobal::locale()->calendar()->year(date)); + .arg(KGlobal::locale()->calendar()->monthName(date, false)) + .arg(KGlobal::locale()->calendar()->year(date)); if (!album->caption().isEmpty()) { diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 538bd6d..f1f76e6 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <tqpixmap.h> -#include <tqpalette.h> +#include <palette.h> #include <tqstring.h> #include <tqpen.h> #include <tqfontmetrics.h> @@ -296,7 +296,7 @@ void AlbumIconItem::paintItem() p.setFont(d->view->itemFontXtra()); TQString str; dateToString(date, str); - str = i18n("created : %1").tqarg(str); + str = i18n("created : %1").arg(str); p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str)); } @@ -308,7 +308,7 @@ void AlbumIconItem::paintItem() p.setFont(d->view->itemFontXtra()); TQString str; dateToString(date, str); - str = i18n("modified : %1").tqarg(str); + str = i18n("modified : %1").arg(str); p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str)); } @@ -320,7 +320,7 @@ void AlbumIconItem::paintItem() TQString mpixels, resolution; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); resolution = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); + .arg(dims.width()).arg(dims.height()).arg(mpixels); r = d->view->itemResolutionRect(); p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), resolution)); } diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index dba9d20..ecfa4af 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -61,7 +61,7 @@ extern "C" #include <tqdict.h> #include <tqdatastream.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> // KDE includes. @@ -155,7 +155,7 @@ public: TQString albumDate; TQString albumComments; - TQRect tqitemRect; + TQRect itemRect; TQRect itemRatingRect; TQRect itemDateRect; TQRect itemModDateRect; @@ -525,7 +525,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos) TQPopupMenu popmenu(this); KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); - TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { @@ -650,8 +650,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) { KAction* action = *iter; - if (TQString::tqfromLatin1(action->name()) - == TQString::tqfromLatin1("jpeglossless_rotate")) + if (TQString::fromLatin1(action->name()) + == TQString::fromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } @@ -684,7 +684,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) KAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0); KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); - TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data || !TQUriDrag::canDecode(data)) { paste->setEnabled(false); @@ -848,12 +848,12 @@ void AlbumIconView::slotCopy() TQDragObject* drag = 0; drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this); - kapp->tqclipboard()->setData(drag); + kapp->clipboard()->setData(drag); } void AlbumIconView::slotPaste() { - TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); + TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard); if(!data) return; @@ -965,11 +965,11 @@ void AlbumIconView::slotRename(AlbumIconItem* item) bool ok; #if KDE_IS_VERSION(3,2,0) - TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()), + TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").arg(fi.fileName()), i18n("Enter new name (without extension):"), name, &ok, this); #else - TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()), + TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(fi.fileName()), i18n("Enter new name (without extension):"), name, &ok, this); #endif @@ -1170,7 +1170,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) imview->loadImageInfos(imageInfoList, currentImageInfo, - d->currentAlbum ? i18n("Album \"%1\"").tqarg(d->currentAlbum->title()) : TQString(), + d->currentAlbum ? i18n("Album \"%1\"").arg(d->currentAlbum->title()) : TQString(), true); if (imview->isHidden()) @@ -1469,7 +1469,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) } else if(TagDrag::canDecode(event)) { - TQByteArray ba = event->tqencodedData("digikam/tag-id"); + TQByteArray ba = event->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -1499,14 +1499,14 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) if (moreItemsSelected) popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &Selected Items").tqarg(talbum->tagPath().mid(1)), 10); + i18n("Assign '%1' to &Selected Items").arg(talbum->tagPath().mid(1)), 10); if (itemDropped) popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &This Item").tqarg(talbum->tagPath().mid(1)), 12); + i18n("Assign '%1' to &This Item").arg(talbum->tagPath().mid(1)), 12); popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &All Items").tqarg(talbum->tagPath().mid(1)), 11); + i18n("Assign '%1' to &All Items").arg(talbum->tagPath().mid(1)), 11); popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel")); @@ -1554,7 +1554,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event) } else if(TagListDrag::canDecode(event)) { - TQByteArray ba = event->tqencodedData("digikam/taglist"); + TQByteArray ba = event->encodedData("digikam/taglist"); TQDataStream ds(ba, IO_ReadOnly); TQValueList<int> tagIDs; ds >> tagIDs; @@ -1832,7 +1832,7 @@ void AlbumIconView::slotGotThumbnail(const KURL& url) if (!iconItem) return; - iconItem->tqrepaint(); + iconItem->repaint(); } void AlbumIconView::slotSelectionChanged() @@ -1893,7 +1893,7 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) if (faildItems.count() == 1) { KMessageBox::error(0, i18n("Failed to revise Exif orientation for file %1.") - .tqarg(faildItems[0])); + .arg(faildItems[0])); } else @@ -1906,9 +1906,9 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) refreshItems(urlList); } -TQRect AlbumIconView::tqitemRect() const +TQRect AlbumIconView::itemRect() const { - return d->tqitemRect; + return d->itemRect; } TQRect AlbumIconView::itemRatingRect() const @@ -2044,7 +2044,7 @@ void AlbumIconView::updateBannerRectPixmap() void AlbumIconView::updateItemRectsPixmap() { - d->tqitemRect = TQRect(0,0,0,0); + d->itemRect = TQRect(0,0,0,0); d->itemRatingRect = TQRect(0,0,0,0); d->itemDateRect = TQRect(0,0,0,0); d->itemModDateRect = TQRect(0,0,0,0); @@ -2143,13 +2143,13 @@ void AlbumIconView::updateItemRectsPixmap() y = d->itemTagRect.bottom(); } - d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin); + d->itemRect = TQRect(0, 0, w+2*margin, y+margin); - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), + d->itemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), - d->tqitemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), + d->itemRect.height()); } void AlbumIconView::slotThemeChanged() diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index 3ef3304..4ba6397 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -95,7 +95,7 @@ public: void refresh(); void refreshItems(const KURL::List& itemList); - TQRect tqitemRect() const; + TQRect itemRect() const; TQRect itemRatingRect() const; TQRect itemDateRect() const; TQRect itemModDateRect() const; diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index f08d1af..078c57b 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -47,7 +47,7 @@ extern "C" #include <tqdict.h> #include <tqintdict.h> #include <tqcstring.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqdatetime.h> // KDE includes. @@ -326,8 +326,8 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) "continue, click 'Yes' to work with this album. " "Otherwise, click 'No' and correct your " "locale setting before restarting digiKam") - .tqarg(dbLocale) - .tqarg(currLocale)); + .arg(dbLocale) + .arg(currLocale)); if (result != KMessageBox::Yes) exit(0); @@ -341,7 +341,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) KMessageBox::error(0, i18n("Failed to update the old Database to the new Database format\n" "This error can happen if the Album Path '%1' does not exist or is write-protected.\n" "If you have moved your photo collection, you need to adjust the 'Album Path' in digikam's configuration file.") - .tqarg(d->libraryPath)); + .arg(d->libraryPath)); exit(0); } @@ -464,14 +464,14 @@ void AlbumManager::scanPAlbums() // first inform all frontends of the deleted albums for (AlbumMap::iterator it = aMap.begin(); it != aMap.end(); ++it) { - // the albums have to be removed with tqchildren being removed first. + // the albums have to be removed with children being removed first. // removePAlbum takes care of that. // So never delete the PAlbum using it.data(). instead check if the // PAlbum is still in the Album Dict before trying to remove it. // this might look like there is memory leak here, since removePAlbum // doesn't delete albums and looks like child Albums don't get deleted. - // But when the parent album gets deleted, the tqchildren are also deleted. + // But when the parent album gets deleted, the children are also deleted. PAlbum* album = d->pAlbumDict.find(it.key()); if (!album) @@ -727,7 +727,7 @@ void AlbumManager::scanSAlbums() if (sMap.contains(info.id)) continue; - bool simple = (info.url.queryItem("1.key") == TQString::tqfromLatin1("keyword")); + bool simple = (info.url.queryItem("1.key") == TQString::fromLatin1("keyword")); // Its a new album. SAlbum* album = new SAlbum(info.id, info.url, simple, false); @@ -1373,7 +1373,7 @@ void AlbumManager::removePAlbum(PAlbum *album) if (!album) return; - // remove all tqchildren of this album + // remove all children of this album Album* child = album->m_firstChild; while (child) { @@ -1412,7 +1412,7 @@ void AlbumManager::removeTAlbum(TAlbum *album) if (!album) return; - // remove all tqchildren of this album + // remove all children of this album Album* child = album->m_firstChild; while (child) { diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index edfac21..41ef824 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -35,7 +35,7 @@ #include <tqhbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqregexp.h> @@ -113,14 +113,14 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) if (create) { topLabel->setText( i18n( "<qt><b>Create new Album in \"<i>%1</i>\"</b></qt>") - .tqarg(album->title())); + .arg(album->title())); } else { topLabel->setText( i18n( "<qt><b>\"<i>%1</i>\" Album Properties</b></qt>") - .tqarg(album->title())); + .arg(album->title())); } - topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); + topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); topLayout->addMultiCellWidget( topLabel, 0, 0, 0, 1 ); // -------------------------------------------------------- @@ -212,7 +212,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) if (create) { d->titleEdit->setText( i18n("New Album") ); - d->datePicker->setDate( TQDate::tqcurrentDate() ); + d->datePicker->setDate( TQDate::currentDate() ); } else { diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index 16c9e09..1f51c13 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqfile.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> // KDE includes. @@ -110,7 +110,7 @@ bool CameraList::load() TQString model = e.attribute("model"); TQString port = e.attribute("port"); TQString path = e.attribute("path"); - TQDateTime lastAccess = TQDateTime::tqcurrentDateTime(); + TQDateTime lastAccess = TQDateTime::currentDateTime(); if (!e.attribute("lastaccess").isEmpty()) lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); @@ -254,7 +254,7 @@ CameraType* CameraList::autoDetect(bool& retry) if (port.startsWith("usb:")) port = "usb:"; - CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::tqcurrentDateTime()); + CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::currentDateTime()); insert(ctype); return ctype; diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h index f863dd0..9ebb640 100644 --- a/digikam/digikam/daboutdata.h +++ b/digikam/digikam/daboutdata.h @@ -83,19 +83,19 @@ static inline TQString libraryInfo() #endif TQString libInfo = - TQString(I18N_NOOP("Using KExiv2 library version %1")).tqarg(Kexiv2Ver) + + TQString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) + TQString("\n") + - TQString(I18N_NOOP("Using Exiv2 library version %1")).tqarg(Exiv2Ver) + + TQString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) + TQString("\n") + - TQString(I18N_NOOP("Using KDcraw library version %1")).tqarg(KDcrawIface::KDcraw::version()) + + TQString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) + TQString("\n") + #if KDCRAW_VERSION < 0x000106 - TQString(I18N_NOOP("Using Dcraw program version %1")).tqarg(DcrawVer) + + TQString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) + #else - TQString(I18N_NOOP("Using LibRaw version %1")).tqarg(librawVer) + + TQString(I18N_NOOP("Using LibRaw version %1")).arg(librawVer) + #endif TQString("\n") + - TQString(I18N_NOOP("Using PNG library version %1")).tqarg(PNG_LIBPNG_VER_STRING); + TQString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING); return libInfo; } diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 1634a0b..48c47c5 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -117,7 +117,7 @@ DateFolderItem::~DateFolderItem() void DateFolderItem::refresh() { if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount()) - setText(0, TQString("%1 (%2)").tqarg(m_name).tqarg(m_count)); + setText(0, TQString("%1 (%2)").arg(m_name).arg(m_count)); else setText(0, m_name); } diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 52ac8a4..b5db600 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -379,7 +379,7 @@ void DigikamApp::setupView() void DigikamApp::setupStatusBar() { d->statusProgressBar = new StatusProgressBar(statusBar()); - d->statusProgressBar->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); + d->statusProgressBar->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); d->statusProgressBar->setMaximumHeight(fontMetrics().height()+4); statusBar()->addWidget(d->statusProgressBar, 100, true); @@ -1082,7 +1082,7 @@ void DigikamApp::setupActions() loadCameras(); - createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); + createGUI(TQString::fromLatin1( "digikamui.rc" ), false); // Initialize Actions --------------------------------------- @@ -1320,14 +1320,14 @@ void DigikamApp::slotImageSelected(const TQPtrList<ImageInfo>& list, bool hasPre text = selection.first()->kurl().fileName() + i18n(" (%1 of %2)") - .tqarg(TQString::number(index)) - .tqarg(TQString::number(num_images)); + .arg(TQString::number(index)) + .arg(TQString::number(num_images)); d->statusProgressBar->setText(text); break; } default: d->statusProgressBar->setText(i18n("%1/%2 items selected") - .tqarg(selection.count()).tqarg(TQString::number(num_images))); + .arg(selection.count()).arg(TQString::number(num_images))); break; } @@ -1479,7 +1479,7 @@ void DigikamApp::slotDownloadImages() if (!alreadyThere) { KAction *cAction = new KAction( - i18n("Browse %1").tqarg(KURL(d->cameraGuiPath).prettyURL()), + i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()), "camera", 0, TQT_TQOBJECT(this), @@ -1492,8 +1492,8 @@ void DigikamApp::slotDownloadImages() // the CameraUI will delete itself when it has finished CameraUI* cgui = new CameraUI(this, - i18n("Images found in %1").tqarg(d->cameraGuiPath), - "directory browse","Fixed", localUrl, TQDateTime::tqcurrentDateTime()); + i18n("Images found in %1").arg(d->cameraGuiPath), + "directory browse","Fixed", localUrl, TQDateTime::currentDateTime()); cgui->show(); connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), @@ -1725,14 +1725,14 @@ void DigikamApp::slotConfToolbars() if(dlg->exec()) { - createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); + createGUI(TQString::fromLatin1( "digikamui.rc" ), false); applyMainWindowSettings(KGlobal::config()); - plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions ); - plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport ); + plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); + plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); + plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); + plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions ); + plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions ); + plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport ); } delete dlg; @@ -1826,12 +1826,12 @@ void DigikamApp::loadPlugins() void DigikamApp::slotKipiPluginPlug() { - unplugActionList( TQString::tqfromLatin1("file_actions_export") ); - unplugActionList( TQString::tqfromLatin1("file_actions_import") ); - unplugActionList( TQString::tqfromLatin1("image_actions") ); - unplugActionList( TQString::tqfromLatin1("tool_actions") ); - unplugActionList( TQString::tqfromLatin1("batch_actions") ); - unplugActionList( TQString::tqfromLatin1("album_actions") ); + unplugActionList( TQString::fromLatin1("file_actions_export") ); + unplugActionList( TQString::fromLatin1("file_actions_import") ); + unplugActionList( TQString::fromLatin1("image_actions") ); + unplugActionList( TQString::fromLatin1("tool_actions") ); + unplugActionList( TQString::fromLatin1("batch_actions") ); + unplugActionList( TQString::fromLatin1("album_actions") ); d->kipiImageActions.clear(); d->kipiFileActionsExport.clear(); @@ -1906,12 +1906,12 @@ void DigikamApp::slotKipiPluginPlug() // Create GUI menu in according with plugins. - plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport ); - plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions ); + plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport ); + plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); + plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions ); + plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions ); + plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions ); + plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions ); } void DigikamApp::loadCameras() @@ -2040,13 +2040,13 @@ void DigikamApp::slotZoomSliderChanged(int size) void DigikamApp::slotThumbSizeChanged(int size) { d->statusZoomBar->setZoomSliderValue(size); - d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").tqarg(size)); + d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").arg(size)); } void DigikamApp::slotZoomChanged(double zoom, int size) { d->statusZoomBar->setZoomSliderValue(size); - d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); + d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); } void DigikamApp::slotTogglePreview(bool t) diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index 602c14c..c754854 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -42,7 +42,7 @@ extern "C" #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqdir.h> #include <tqfileinfo.h> @@ -92,7 +92,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent, KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); - m_ui->setMinimumSize(450, m_ui->tqsizeHint().height()); + m_ui->setMinimumSize(450, m_ui->sizeHint().height()); } DigikamFirstRun::~DigikamFirstRun() @@ -131,7 +131,7 @@ void DigikamFirstRun::slotOk() "<p><b>%1</b></p>" "Would you like digiKam to create it?</qt>") - .tqarg(albumLibraryFolder), + .arg(albumLibraryFolder), i18n("Create Folder?")); if (rc == KMessageBox::No) @@ -144,7 +144,7 @@ void DigikamFirstRun::slotOk() KMessageBox::sorry(this, i18n("<qt>digiKam could not create the folder shown below. " "Please select a different location." - "<p><b>%1</b></p></qt>").tqarg(albumLibraryFolder), + "<p><b>%1</b></p></qt>").arg(albumLibraryFolder), i18n("Create Folder Failed")); return; } diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 61f0e28..69c8d91 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -180,7 +180,7 @@ DigikamView::DigikamView(TQWidget *parent) d->leftSideBar->setSplitter(d->splitter); d->albumWidgetStack = new AlbumWidgetStack(d->splitter); TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - d->albumWidgetStack->tqsetSizePolicy(rightSzPolicy); + d->albumWidgetStack->setSizePolicy(rightSzPolicy); d->iconView = d->albumWidgetStack->albumIconView(); d->rightSideBar = new ImagePropertiesSideBarDB(this, "Digikam Right Sidebar", d->splitter, @@ -1507,7 +1507,7 @@ void DigikamView::slideShow(ImageInfoList &infoList) float cnt = (float)infoList.count(); emit signalProgressBarMode(StatusProgressBar::CancelProgressBarMode, i18n("Preparing slideshow of %1 images. Please wait...") - .tqarg(infoList.count())); + .arg(infoList.count())); DMetadata meta; SlideShowSettings settings; diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index e8b6646..fbbd014 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -208,7 +208,7 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) } KMessageBox::error(0, i18n("Failed to rename file\n%1") - .tqarg(src.fileName()), i18n("Rename Failed")); + .arg(src.fileName()), i18n("Rename Failed")); return false; */ } diff --git a/digikam/digikam/dragobjects.cpp b/digikam/digikam/dragobjects.cpp index b835faa..14a3545 100644 --- a/digikam/digikam/dragobjects.cpp +++ b/digikam/digikam/dragobjects.cpp @@ -60,9 +60,9 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR if (KURLDrag::decode(e, urls)) { - TQByteArray albumarray = e->tqencodedData("digikam/album-ids"); - TQByteArray imagearray = e->tqencodedData("digikam/image-ids"); - TQByteArray kioarray = e->tqencodedData("digikam/digikamalbums"); + TQByteArray albumarray = e->encodedData("digikam/album-ids"); + TQByteArray imagearray = e->encodedData("digikam/image-ids"); + TQByteArray kioarray = e->encodedData("digikam/digikamalbums"); if (albumarray.size() && imagearray.size() && kioarray.size()) { @@ -97,7 +97,7 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR return false; } -TQByteArray ItemDrag::tqencodedData(const char* mime) const +TQByteArray ItemDrag::encodedData(const char* mime) const { TQCString mimetype(mime); @@ -142,7 +142,7 @@ TQByteArray ItemDrag::tqencodedData(const char* mime) const } else { - return KURLDrag::tqencodedData(mime); + return KURLDrag::encodedData(mime); } } @@ -184,7 +184,7 @@ const char* TagDrag::format( int i ) const return 0; } -TQByteArray TagDrag::tqencodedData( const char* ) const +TQByteArray TagDrag::encodedData( const char* ) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -217,7 +217,7 @@ const char* AlbumDrag::format( int i ) const return 0; } -TQByteArray AlbumDrag::tqencodedData(const char *mime) const +TQByteArray AlbumDrag::encodedData(const char *mime) const { TQCString mimetype( mime ); if(mimetype == "digikam/album-id") @@ -229,7 +229,7 @@ TQByteArray AlbumDrag::tqencodedData(const char *mime) const } else { - return KURLDrag::tqencodedData(mime); + return KURLDrag::encodedData(mime); } } @@ -241,7 +241,7 @@ bool AlbumDrag::decode(const TQMimeSource* e, KURL::List &urls, if(KURLDrag::decode(e, urls)) { - TQByteArray ba = e->tqencodedData("digikam/album-id"); + TQByteArray ba = e->encodedData("digikam/album-id"); if (ba.size()) { TQDataStream ds(ba, IO_ReadOnly); @@ -270,7 +270,7 @@ bool TagListDrag::canDecode(const TQMimeSource* e) return e->provides("digikam/taglist"); } -TQByteArray TagListDrag::tqencodedData(const char*) const +TQByteArray TagListDrag::encodedData(const char*) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -301,7 +301,7 @@ bool CameraItemListDrag::canDecode(const TQMimeSource* e) return e->provides("digikam/cameraItemlist"); } -TQByteArray CameraItemListDrag::tqencodedData(const char*) const +TQByteArray CameraItemListDrag::encodedData(const char*) const { TQByteArray ba; TQDataStream ds(ba, IO_WriteOnly); @@ -350,7 +350,7 @@ bool CameraDragObject::canDecode(const TQMimeSource* e) bool CameraDragObject::decode(const TQMimeSource* e, CameraType& ctype) { - TQByteArray payload = e->tqencodedData("camera/unknown"); + TQByteArray payload = e->encodedData("camera/unknown"); if (payload.size()) { TQString title, model, port, path; diff --git a/digikam/digikam/dragobjects.h b/digikam/digikam/dragobjects.h index 5d5f72e..f0aef04 100644 --- a/digikam/digikam/dragobjects.h +++ b/digikam/digikam/dragobjects.h @@ -74,7 +74,7 @@ public: protected: virtual const char* format(int i) const; - virtual TQByteArray tqencodedData(const char* mime) const; + virtual TQByteArray encodedData(const char* mime) const; private: @@ -99,7 +99,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: @@ -122,7 +122,7 @@ public: int &albumID); protected: - TQByteArray tqencodedData(const char*) const; + TQByteArray encodedData(const char*) const; const char* format(int i) const; private: @@ -145,7 +145,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: @@ -169,7 +169,7 @@ public: protected: - TQByteArray tqencodedData( const char* ) const; + TQByteArray encodedData( const char* ) const; const char* format(int i) const; private: diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp index f354d01..09afb65 100644 --- a/digikam/digikam/firstrun.cpp +++ b/digikam/digikam/firstrun.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqframe.h> #include <kurlrequester.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -48,21 +48,21 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent ) : TQWidget( parent ) { setName( "FirstRunWidget" ); - TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); + TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 ); m_textLabel2 = new TQLabel( this ); - vtqlayout->addWidget( m_textLabel2 ); + vlayout->addWidget( m_textLabel2 ); TQFrame *line1 = new TQFrame( this ); line1->setFrameShape( TQFrame::HLine ); line1->setFrameShadow( TQFrame::Sunken ); line1->setFrameShape( TQFrame::HLine ); - vtqlayout->addWidget( line1 ); + vlayout->addWidget( line1 ); TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 0, 6 ); m_pixLabel = new TQLabel( this ); - m_pixLabel->tqsetAlignment( int( TQLabel::AlignTop ) ); + m_pixLabel->setAlignment( int( TQLabel::AlignTop ) ); grid->addMultiCellWidget( m_pixLabel, 0, 1, 0, 0 ); m_path = new KURLRequester( this ); @@ -71,14 +71,14 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent ) grid->addWidget( m_path, 1, 1 ); m_textLabel1 = new TQLabel( this ); - m_textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); grid->addWidget( m_textLabel1, 0, 1 ); - vtqlayout->addLayout( grid ); - vtqlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); + vlayout->addLayout( grid ); + vlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); languageChange(); - resize( TQSize(479, 149).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(479, 149).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index d658529..5350176 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -123,7 +123,7 @@ void FolderItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int if (m_focus) { p->setPen(cg.link()); - TQRect r = fv->tqitemRect(this); + TQRect r = fv->itemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } @@ -211,7 +211,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co if ((type() == TQCheckListItem::CheckBox) || (type() == TQCheckListItem::CheckBoxController)) { - int boxsize = fv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, fv); + int boxsize = fv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, fv); int x = 3; int y = (height() - boxsize)/2 + margin; r += boxsize + 4; @@ -249,7 +249,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co if (m_focus) { p->setPen(cg.link()); - TQRect r = fv->tqitemRect(this); + TQRect r = fv->itemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index 2a3c152..3c7e1d6 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -120,12 +120,12 @@ int FolderView::itemHeight() const return d->itemHeight; } -TQRect FolderView::tqitemRect(TQListViewItem *item) const +TQRect FolderView::itemRect(TQListViewItem *item) const { if(!item) return TQRect(); - TQRect r = TQListView::tqitemRect(item); + TQRect r = TQListView::itemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); return r; } @@ -276,7 +276,7 @@ void FolderView::contentsDragLeaveEvent(TQDragLeaveEvent * e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->tqrepaint(); + d->oldHighlightItem->repaint(); d->oldHighlightItem = 0; } } @@ -300,7 +300,7 @@ void FolderView::contentsDragMoveEvent(TQDragMoveEvent *e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->tqrepaint(); + d->oldHighlightItem->repaint(); } FolderItem *fitem = dynamic_cast<FolderItem*>(item); @@ -313,7 +313,7 @@ void FolderView::contentsDragMoveEvent(TQDragMoveEvent *e) citem->setFocus(true); } d->oldHighlightItem = item; - item->tqrepaint(); + item->repaint(); } e->accept(acceptDrop(e)); } @@ -333,7 +333,7 @@ void FolderView::contentsDropEvent(TQDropEvent *e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->tqrepaint(); + d->oldHighlightItem->repaint(); d->oldHighlightItem = 0; } } @@ -358,7 +358,7 @@ bool FolderView::mouseInItemRect(TQListViewItem* item, int x) const FolderCheckListItem* citem = dynamic_cast<FolderCheckListItem*>(item); if (citem && ((citem->type() == TQCheckListItem::CheckBox) || (citem->type() == TQCheckListItem::CheckBoxController))) - boxsize = tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, this); + boxsize = tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, this); return (x > (offset + boxsize) && x < (offset + boxsize + width)); } diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index ebc6f29..06ef7bf 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -79,7 +79,7 @@ public: bool active() const; int itemHeight() const; - TQRect tqitemRect(TQListViewItem *item) const; + TQRect itemRect(TQListViewItem *item) const; TQPixmap itemBasePixmapRegular() const; TQPixmap itemBasePixmapSelected() const; diff --git a/digikam/digikam/icongroupitem.cpp b/digikam/digikam/icongroupitem.cpp index 51d91bc..19178db 100644 --- a/digikam/digikam/icongroupitem.cpp +++ b/digikam/digikam/icongroupitem.cpp @@ -28,7 +28,7 @@ // TQt includes. #include <tqpixmap.h> -#include <tqpalette.h> +#include <palette.h> // Local includes. @@ -279,7 +279,7 @@ void IconGroupItem::paintBanner() { TQRect r(rect()); TQPixmap pix(r.width(), r.height()); - pix.fill(d->view->tqcolorGroup().base()); + pix.fill(d->view->colorGroup().base()); r = TQRect(d->view->contentsToViewport(TQPoint(r.x(), r.y())), TQSize(r.width(), r.height())); diff --git a/digikam/digikam/iconitem.cpp b/digikam/digikam/iconitem.cpp index fb7ff2e..798b96a 100644 --- a/digikam/digikam/iconitem.cpp +++ b/digikam/digikam/iconitem.cpp @@ -87,7 +87,7 @@ int IconItem::y() const TQRect IconItem::rect() const { IconView* view = m_group->iconView(); - TQRect r(view->tqitemRect()); + TQRect r(view->itemRect()); r.moveTopLeft(TQPoint(m_x, m_y)); return r; } @@ -127,7 +127,7 @@ bool IconItem::isSelected() const return m_selected; } -void IconItem::tqrepaint(bool force) +void IconItem::repaint(bool force) { if (force) m_group->iconView()->repaintContents(rect()); diff --git a/digikam/digikam/iconitem.h b/digikam/digikam/iconitem.h index 6a3e1ed..aa67e20 100644 --- a/digikam/digikam/iconitem.h +++ b/digikam/digikam/iconitem.h @@ -61,7 +61,7 @@ public: void setSelected(bool val, bool cb=true); bool isSelected() const; - void tqrepaint(bool force=true); + void repaint(bool force=true); IconView* iconView() const; diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index d4e1eb8..c4cf184 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -664,8 +664,8 @@ void IconView::slotRearrange() bool IconView::arrangeItems() { int y = 0; - int itemW = tqitemRect().width(); - int itemH = tqitemRect().height(); + int itemW = itemRect().width(); + int itemH = itemRect().height(); int maxW = 0; int numItemsPerRow = visibleWidth()/(itemW + d->spacing); @@ -720,7 +720,7 @@ bool IconView::arrangeItems() return changed; } -TQRect IconView::tqitemRect() const +TQRect IconView::itemRect() const { return TQRect(0, 0, 100, 100); } @@ -773,7 +773,7 @@ void IconView::viewportPaintEvent(TQPaintEvent* pe) } painter.setClipRegion(paintRegion); - painter.fillRect(r, tqcolorGroup().base()); + painter.fillRect(r, colorGroup().base()); painter.end(); } @@ -934,11 +934,11 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e) d->currItem = item; d->anchorItem = item; if (prevCurrItem) - prevCurrItem->tqrepaint(); + prevCurrItem->repaint(); if (!item->isSelected()) item->setSelected(true, true); - item->tqrepaint(); + item->repaint(); emit signalRightButtonClicked(item, e->globalPos()); } @@ -1017,9 +1017,9 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e) d->anchorItem = item; if (prevCurrItem) - prevCurrItem->tqrepaint(); + prevCurrItem->repaint(); - d->currItem->tqrepaint(); + d->currItem->repaint(); d->dragging = true; d->dragStartPos = e->pos(); @@ -1070,8 +1070,8 @@ void IconView::drawRubber(TQPainter* p) tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height() ), - tqcolorGroup(), TQStyle::Style_Default, - TQStyleOption(tqcolorGroup().base())); + colorGroup(), TQStyle::Style_Default, + TQStyleOption(colorGroup().base())); } void IconView::contentsMouseMoveEvent(TQMouseEvent* e) @@ -1200,7 +1200,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) if (changed) { paintRegion.translate(-contentsX(), -contentsY()); - viewport()->tqrepaint(paintRegion); + viewport()->repaint(paintRegion); } ensureVisible(e->pos().x(), e->pos().y()); @@ -1258,7 +1258,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) d->currItem = item; d->anchorItem = item; if (prevCurrItem) - prevCurrItem->tqrepaint(); + prevCurrItem->repaint(); if (KGlobalSettings::singleClick()) { if (item->clickToOpenRect().contains(e->pos())) @@ -1307,7 +1307,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = firstItem(); d->anchorItem = d->currItem; if (tmp) - tmp->tqrepaint(); + tmp->repaint(); firstItem()->setSelected(true, true); ensureItemVisible(firstItem()); @@ -1321,7 +1321,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = lastItem(); d->anchorItem = d->currItem; if (tmp) - tmp->tqrepaint(); + tmp->repaint(); lastItem()->setSelected(true, true); ensureItemVisible(lastItem()); @@ -1353,8 +1353,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) IconItem* tmp = d->currItem; d->currItem = d->currItem->nextItem(); d->anchorItem = d->currItem; - tmp->tqrepaint(); - d->currItem->tqrepaint(); + tmp->repaint(); + d->currItem->repaint(); item = d->currItem; } @@ -1362,7 +1362,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) { IconItem* tmp = d->currItem; d->currItem = d->currItem->nextItem(); - tmp->tqrepaint(); + tmp->repaint(); // if the anchor is behind us, move forward preserving // the previously selected item. otherwise unselect the @@ -1380,7 +1380,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = d->currItem->nextItem(); d->anchorItem = d->currItem; d->currItem->setSelected(true, true); - tmp->tqrepaint(); + tmp->repaint(); item = d->currItem; } @@ -1412,8 +1412,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) IconItem* tmp = d->currItem; d->currItem = d->currItem->prevItem(); d->anchorItem = d->currItem; - tmp->tqrepaint(); - d->currItem->tqrepaint(); + tmp->repaint(); + d->currItem->repaint(); item = d->currItem; } @@ -1421,7 +1421,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) { IconItem* tmp = d->currItem; d->currItem = d->currItem->prevItem(); - tmp->tqrepaint(); + tmp->repaint(); // if the anchor is ahead of us, move forward preserving // the previously selected item. otherwise unselect the @@ -1439,7 +1439,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = d->currItem->prevItem(); d->anchorItem = d->currItem; d->currItem->setSelected(true, true); - tmp->tqrepaint(); + tmp->repaint(); item = d->currItem; } @@ -1464,7 +1464,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + tqitemRect().width()/2; + int x = d->currItem->x() + itemRect().width()/2; int y = d->currItem->y() - d->spacing*2; IconItem *it = 0; @@ -1482,8 +1482,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) IconItem* tmp = d->currItem; d->currItem = it; d->anchorItem = it; - tmp->tqrepaint(); - d->currItem->tqrepaint(); + tmp->repaint(); + d->currItem->repaint(); item = d->currItem; } @@ -1491,7 +1491,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) { IconItem* tmp = d->currItem; d->currItem = it; - tmp->tqrepaint(); + tmp->repaint(); clearSelection(); if (anchorIsBehind()) @@ -1521,7 +1521,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = it; d->anchorItem = it; d->currItem->setSelected(true, true); - tmp->tqrepaint(); + tmp->repaint(); item = d->currItem; } @@ -1546,8 +1546,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + tqitemRect().width()/2; - int y = d->currItem->y() + tqitemRect().height() + d->spacing*2; + int x = d->currItem->x() + itemRect().width()/2; + int y = d->currItem->y() + itemRect().height() + d->spacing*2; IconItem *it = 0; @@ -1564,8 +1564,8 @@ void IconView::keyPressEvent(TQKeyEvent* e) IconItem* tmp = d->currItem; d->currItem = it; d->anchorItem = it; - tmp->tqrepaint(); - d->currItem->tqrepaint(); + tmp->repaint(); + d->currItem->repaint(); item = d->currItem; } @@ -1573,7 +1573,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) { IconItem* tmp = d->currItem; d->currItem = it; - tmp->tqrepaint(); + tmp->repaint(); clearSelection(); if (anchorIsBehind()) @@ -1603,7 +1603,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = it; d->anchorItem = it; d->currItem->setSelected(true, true); - tmp->tqrepaint(); + tmp->repaint(); item = d->currItem; } @@ -1634,7 +1634,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) if (!ni) { - r = TQRect( 0, d->currItem->y() + tqitemRect().height(), + r = TQRect( 0, d->currItem->y() + itemRect().height(), contentsWidth(), contentsHeight() ); ni = findLastVisibleItem(r, false); } @@ -1645,7 +1645,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = ni; d->anchorItem = ni; item = ni; - tmp->tqrepaint(); + tmp->repaint(); d->currItem->setSelected(true, true); } } @@ -1685,7 +1685,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) d->currItem = ni; d->anchorItem = ni; item = ni; - tmp->tqrepaint(); + tmp->repaint(); d->currItem->setSelected(true, true); } } @@ -1731,7 +1731,7 @@ void IconView::keyPressEvent(TQKeyEvent* e) ensureItemVisible(d->currItem); - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); int h = r.height(); TQPoint p(d->currItem->x() + w / 2, d->currItem->y() + h / 2); @@ -1785,13 +1785,13 @@ void IconView::ensureItemVisible(IconItem *item) if ( item->y() == firstItem()->y() ) { - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); ensureVisible( item->x() + w / 2, 0, w/2+1, 0 ); } else { - TQRect r(tqitemRect()); + TQRect r(itemRect()); int w = r.width(); int h = r.height(); ensureVisible( item->x() + w / 2, item->y() + h / 2, @@ -1905,7 +1905,7 @@ void IconView::drawFrameRaised(TQPainter* p) TQRect r = frameRect(); int lwidth = lineWidth(); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); qDrawShadeRect( p, r, g, false, lwidth, midLineWidth() ); @@ -1916,7 +1916,7 @@ void IconView::drawFrameSunken(TQPainter* p) TQRect r = frameRect(); int lwidth = lineWidth(); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); qDrawShadeRect( p, r, g, true, lwidth, midLineWidth() ); @@ -1948,7 +1948,7 @@ void IconView::itemClickedToOpen(IconItem* item) d->anchorItem = item; if (prevCurrItem) - prevCurrItem->tqrepaint(); + prevCurrItem->repaint(); item->setSelected(true); emit signalDoubleClicked(item); diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index f3ca3e2..47bc051 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -98,7 +98,7 @@ public: IconItem* findFirstVisibleItem(bool useThumbnailRect = true) const; IconItem* findLastVisibleItem(bool useThumbnailRect = true) const; - virtual TQRect tqitemRect() const; + virtual TQRect itemRect() const; virtual TQRect bannerRect() const; TQRect contentsRectToViewport(const TQRect& r) const; diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index cbbf85c..2710771 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -138,7 +138,7 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) if (d->previewSize > 2560) d->previewSize = 2560; - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); @@ -261,7 +261,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description p.drawText(0, 0, pix.width(), pix.height(), TQt::AlignCenter|TQt::WordBreak, i18n("Cannot display preview for\n\"%1\"") - .tqarg(info.fileName())); + .arg(info.fileName())); p.end(); // three copies - but the image is small setImage(DImg(pix.convertToImage())); @@ -397,8 +397,8 @@ void ImagePreviewView::slotContextMenu() { KAction* action = *iter; - if (TQString::tqfromLatin1(action->name()) - == TQString::tqfromLatin1("jpeglossless_rotate")) + if (TQString::fromLatin1(action->name()) + == TQString::fromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index d045df1..d48cf28 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -81,13 +81,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::tqcurrentDate(); + mDate = TQDate::currentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect( lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( lineEnterPressed() ) ); @@ -147,13 +147,13 @@ void KDateEdit::popup() TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->tqsizeHint().height(); + int dateFrameHeight = mPopup->sizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->tqsizeHint().width(); + int dateFrameWidth = mPopup->sizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -166,7 +166,7 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::tqcurrentDate() ); + mPopup->setDate( TQDate::currentDate() ); mPopup->popup( popupPoint ); @@ -230,7 +230,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( text.isEmpty() ) result = TQDate(); else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index bd44476..34e2654 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -114,17 +114,17 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::tqcurrentDate() ); + emit dateChanged( TQDate::currentDate() ); } void KDatePickerPopup::slotYesterday() { - emit dateChanged( TQDate::tqcurrentDate().addDays( -1 ) ); + emit dateChanged( TQDate::currentDate().addDays( -1 ) ); } void KDatePickerPopup::slotPrevFriday() { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); int day = date.dayOfWeek(); if ( day < 6 ) date = date.addDays( 5 - 7 - day ); @@ -136,7 +136,7 @@ void KDatePickerPopup::slotPrevFriday() void KDatePickerPopup::slotPrevMonday() { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); emit dateChanged( date.addDays( 1 - date.dayOfWeek() ) ); } @@ -147,12 +147,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotPrevWeek() { - emit dateChanged( TQDate::tqcurrentDate().addDays( -7 ) ); + emit dateChanged( TQDate::currentDate().addDays( -7 ) ); } void KDatePickerPopup::slotPrevMonth() { - emit dateChanged( TQDate::tqcurrentDate().addMonths( -1 ) ); + emit dateChanged( TQDate::currentDate().addMonths( -1 ) ); } } // namespace Digikam diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index 9dee8f0..c8a02ab 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -75,7 +75,7 @@ public: @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(), + KDatePickerPopup(int items = 2, const TQDate &date = TQDate::currentDate(), TQWidget *parent = 0, const char *name = 0); /** diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 5039658..e05f757 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -291,7 +291,7 @@ TQString DigikamImageCollection::name() { if ( album_->type() == Album::TAG ) { - return i18n("Tag: %1").tqarg(album_->title()); + return i18n("Tag: %1").arg(album_->title()); } else return album_->title(); @@ -307,7 +307,7 @@ TQString DigikamImageCollection::category() else if ( album_->type() == Album::TAG ) { TAlbum *p = dynamic_cast<TAlbum*>(album_); - return i18n("Tag: %1").tqarg(p->tagPath()); + return i18n("Tag: %1").arg(p->tagPath()); } else return TQString(); @@ -658,7 +658,7 @@ bool DigikamKipiInterface::addImage( const KURL& url, TQString& errmsg ) if ( url.isValid() == false ) { - errmsg = i18n("Target URL %1 is not valid.").tqarg(url.path()); + errmsg = i18n("Target URL %1 is not valid.").arg(url.path()); return false; } diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index 25a9a69..641f8a6 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> // KDE includes. @@ -88,7 +88,7 @@ MediaPlayerView::MediaPlayerView(TQWidget *parent) TQGridLayout *grid = new TQGridLayout(d->errorView, 2, 2, KDialogBase::marginHint(), KDialogBase::spacingHint()); - errorMsg->tqsetAlignment(TQt::AlignCenter); + errorMsg->setAlignment(TQt::AlignCenter); d->errorView->setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); d->errorView->setMargin(0); d->errorView->setLineWidth(1); @@ -151,7 +151,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true); KServiceTypeProfile::OfferList services = KServiceTypeProfile::offers(mimePtr->name(), - TQString::tqfromLatin1("KParts/ReadOnlyPart")); + TQString::fromLatin1("KParts/ReadOnlyPart")); DDebug() << "Search a KPart to preview " << url.fileName() << " (" << mimePtr->name() << ") " << endl; @@ -214,7 +214,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) } d->grid->addMultiCellWidget(mediaPlayerWidget, 0, 0, 0, 2); - mediaPlayerWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + mediaPlayerWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->mediaPlayerPart->openURL(url); setPreviewMode(MediaPlayerViewPriv::PlayerView); } diff --git a/digikam/digikam/metadatahub.cpp b/digikam/digikam/metadatahub.cpp index 71102a5..a1ab4d3 100644 --- a/digikam/digikam/metadatahub.cpp +++ b/digikam/digikam/metadatahub.cpp @@ -47,9 +47,9 @@ public: MetadataHubPriv() { - dateTimetqStatus = MetadataHub::MetadataInvalid; - ratingtqStatus = MetadataHub::MetadataInvalid; - commenttqStatus = MetadataHub::MetadataInvalid; + dateTimeStatus = MetadataHub::MetadataInvalid; + ratingStatus = MetadataHub::MetadataInvalid; + commentStatus = MetadataHub::MetadataInvalid; rating = -1; highestRating = -1; @@ -64,9 +64,9 @@ public: tagsChanged = false; } - MetadataHub::tqStatus dateTimetqStatus; - MetadataHub::tqStatus commenttqStatus; - MetadataHub::tqStatus ratingtqStatus; + MetadataHub::Status dateTimeStatus; + MetadataHub::Status commentStatus; + MetadataHub::Status ratingStatus; TQDateTime dateTime; TQDateTime lastDateTime; @@ -76,7 +76,7 @@ public: int count; - TQMap<TAlbum *, MetadataHub::TagtqStatus> tags; + TQMap<TAlbum *, MetadataHub::TagStatus> tags; TQStringList tagList; MetadataHub::DatabaseMode dbmode; @@ -86,8 +86,8 @@ public: bool ratingChanged; bool tagsChanged; - template <class T> void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status); - template <class T> void loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status); + template <class T> void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status); + template <class T> void loadSingleValue(const T &data, T &storage, MetadataHub::Status &status); }; MetadataWriteSettings::MetadataWriteSettings() @@ -256,21 +256,21 @@ void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags) for (TQValueList<TAlbum *>::const_iterator it = loadedTags.begin(); it != loadedTags.end(); ++it) { // that is a reference - TagtqStatus &status = d->tags[*it]; + TagStatus &status = d->tags[*it]; // if it was not contained in the list, the default constructor will mark it as invalid if (status == MetadataInvalid) { if (d->count == 1) // there were no previous sets that could have contained the set - status = TagtqStatus(MetadataAvailable, true); + status = TagStatus(MetadataAvailable, true); else // previous sets did not contain the tag, we do => disjoint - status = TagtqStatus(MetadataDisjoint, true); + status = TagStatus(MetadataDisjoint, true); } - else if (status == TagtqStatus(MetadataAvailable, false)) + else if (status == TagStatus(MetadataAvailable, false)) { // set to explicitly not contained, but we contain it => disjoint - status = TagtqStatus(MetadataDisjoint, true); + status = TagStatus(MetadataDisjoint, true); } // else if mapIt.data() == MetadataAvailable, true: all right, we contain it too // else if mapIt.data() == MetadataDisjoint: it's already disjoint @@ -283,10 +283,10 @@ void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags) // but are not contained in this set, have to be set to MetadataDisjoint for (TQValueList<TAlbum *>::iterator it = previousTags.begin(); it != previousTags.end(); ++it) { - TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(*it); - if (mapIt != d->tags.end() && mapIt.data() == TagtqStatus(MetadataAvailable, true)) + TQMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(*it); + if (mapIt != d->tags.end() && mapIt.data() == TagStatus(MetadataAvailable, true)) { - mapIt.data() = TagtqStatus(MetadataDisjoint, true); + mapIt.data() = TagStatus(MetadataDisjoint, true); } } } @@ -320,16 +320,16 @@ void MetadataHub::load(const TQDateTime &dateTime, const TQString &comment, int { if (dateTime.isValid()) { - d->loadWithInterval<TQDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimetqStatus); + d->loadWithInterval<TQDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimeStatus); } - d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingtqStatus); + d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingStatus); - d->loadSingleValue<TQString>(comment, d->comment, d->commenttqStatus); + d->loadSingleValue<TQString>(comment, d->comment, d->commentStatus); } // template method to share code for dateTime and rating -template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status) +template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status) { switch (status) { @@ -364,7 +364,7 @@ template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &stor } // template method used by comment -template <class T> void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status) +template <class T> void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::Status &status) { switch (status) { @@ -391,11 +391,11 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode) bool changed = false; // find out in advance if we have something to write - needed for FullWriteIfChanged mode - bool saveComment = d->commenttqStatus == MetadataAvailable; - bool saveDateTime = d->dateTimetqStatus == MetadataAvailable; - bool saveRating = d->ratingtqStatus == MetadataAvailable; + bool saveComment = d->commentStatus == MetadataAvailable; + bool saveDateTime = d->dateTimeStatus == MetadataAvailable; + bool saveRating = d->ratingStatus == MetadataAvailable; bool saveTags = false; - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -437,7 +437,7 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode) { if (d->dbmode == ManagedTags) { - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -464,15 +464,15 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata bool dirty = false; // find out in advance if we have something to write - needed for FullWriteIfChanged mode - bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -522,7 +522,7 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata // create list of keywords to be added and to be removed TQStringList newKeywords, oldKeywords; - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { // it is important that MetadataDisjoint keywords are not touched if (it.data() == MetadataAvailable) @@ -609,15 +609,15 @@ bool MetadataHub::needWriteMetadata(WriteMode writeMode, const MetadataWriteSett // This is the same logic as in write(DMetadata) but without actually writing. // Adapt if the method above changes - bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -661,42 +661,42 @@ MetadataWriteSettings MetadataHub::defaultWriteSettings() // -------------------------------------------------- -MetadataHub::tqStatus MetadataHub::dateTimetqStatus() const +MetadataHub::Status MetadataHub::dateTimeStatus() const { - return d->dateTimetqStatus; + return d->dateTimeStatus; } -MetadataHub::tqStatus MetadataHub::commenttqStatus() const +MetadataHub::Status MetadataHub::commentStatus() const { - return d->commenttqStatus; + return d->commentStatus; } -MetadataHub::tqStatus MetadataHub::ratingtqStatus() const +MetadataHub::Status MetadataHub::ratingStatus() const { - return d->ratingtqStatus; + return d->ratingStatus; } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(int albumId) const +MetadataHub::TagStatus MetadataHub::tagStatus(int albumId) const { if (d->dbmode == NewTagsImport) - return TagtqStatus(MetadataInvalid); - return tagtqStatus(AlbumManager::instance()->findTAlbum(albumId)); + return TagStatus(MetadataInvalid); + return tagStatus(AlbumManager::instance()->findTAlbum(albumId)); } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(const TQString &tagPath) const +MetadataHub::TagStatus MetadataHub::tagStatus(const TQString &tagPath) const { if (d->dbmode == NewTagsImport) - return TagtqStatus(MetadataInvalid); - return tagtqStatus(AlbumManager::instance()->findTAlbum(tagPath)); + return TagStatus(MetadataInvalid); + return tagStatus(AlbumManager::instance()->findTAlbum(tagPath)); } -MetadataHub::TagtqStatus MetadataHub::tagtqStatus(TAlbum *album) const +MetadataHub::TagStatus MetadataHub::tagStatus(TAlbum *album) const { if (!album) - return TagtqStatus(MetadataInvalid); - TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(album); + return TagStatus(MetadataInvalid); + TQMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(album); if (mapIt == d->tags.end()) - return TagtqStatus(MetadataInvalid); + return TagStatus(MetadataInvalid); return mapIt.data(); } @@ -738,7 +738,7 @@ int MetadataHub::rating() const void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) const { - switch (d->dateTimetqStatus) + switch (d->dateTimeStatus) { case MetadataInvalid: lowest = highest = TQDateTime(); @@ -755,7 +755,7 @@ void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) cons void MetadataHub::ratingInterval(int &lowest, int &highest) const { - switch (d->ratingtqStatus) + switch (d->ratingStatus) { case MetadataInvalid: lowest = highest = -1; @@ -777,26 +777,26 @@ TQStringList MetadataHub::keywords() const else { TQStringList tagList; - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { - if (it.data() == TagtqStatus(MetadataAvailable, true)) + if (it.data() == TagStatus(MetadataAvailable, true)) tagList.append(it.key()->tagPath(false)); } return tagList; } } -TQMap<TAlbum *, MetadataHub::TagtqStatus> MetadataHub::tags() const +TQMap<TAlbum *, MetadataHub::TagStatus> MetadataHub::tags() const { // DatabaseMode == ManagedTags is assumed return d->tags; } -TQMap<int, MetadataHub::TagtqStatus> MetadataHub::tagIDs() const +TQMap<int, MetadataHub::TagStatus> MetadataHub::tagIDs() const { // DatabaseMode == ManagedTags is assumed - TQMap<int, TagtqStatus> intmap; - for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + TQMap<int, TagStatus> intmap; + for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { intmap.insert(it.key()->id(), it.data()); } @@ -806,35 +806,35 @@ TQMap<int, MetadataHub::TagtqStatus> MetadataHub::tagIDs() const // -------------------------------------------------- -void MetadataHub::setDateTime(const TQDateTime &dateTime, tqStatus status) +void MetadataHub::setDateTime(const TQDateTime &dateTime, Status status) { - d->dateTimetqStatus = status; + d->dateTimeStatus = status; d->dateTime = dateTime; d->dateTimeChanged = true; } -void MetadataHub::setComment(const TQString &comment, tqStatus status) +void MetadataHub::setComment(const TQString &comment, Status status) { - d->commenttqStatus = status; + d->commentStatus = status; d->comment = comment; d->commentChanged = true; } -void MetadataHub::setRating(int rating, tqStatus status) +void MetadataHub::setRating(int rating, Status status) { - d->ratingtqStatus = status; + d->ratingStatus = status; d->rating = rating; d->ratingChanged = true; } -void MetadataHub::setTag(TAlbum *tag, bool hasTag, tqStatus status) +void MetadataHub::setTag(TAlbum *tag, bool hasTag, Status status) { // DatabaseMode == ManagedTags is assumed - d->tags[tag] = TagtqStatus(status, hasTag); + d->tags[tag] = TagStatus(status, hasTag); d->tagsChanged = true; } -void MetadataHub::setTag(int albumID, bool hasTag, tqStatus status) +void MetadataHub::setTag(int albumID, bool hasTag, Status status) { // DatabaseMode == ManagedTags is assumed TAlbum *album = AlbumManager::instance()->findTAlbum(albumID); diff --git a/digikam/digikam/metadatahub.h b/digikam/digikam/metadatahub.h index b0062f1..decb148 100644 --- a/digikam/digikam/metadatahub.h +++ b/digikam/digikam/metadatahub.h @@ -92,7 +92,7 @@ public: If only one set has been added, the status is always MetadataAvailable. If no set has been added, the status is always MetadataInvalid */ - enum tqStatus + enum Status { MetadataInvalid, /// not yet filled with any value MetadataAvailable, /// only one data set has been added, or a common value is available @@ -102,21 +102,21 @@ public: /** Describes the complete status of a Tag: The metadata status, and the fact if it has the tag or not. */ - class TagtqStatus + class TagStatus { public: - TagtqStatus(tqStatus status, bool hasTag = false) : status(status), hasTag(hasTag) {}; - TagtqStatus() : status(MetadataInvalid), hasTag(false) {}; + TagStatus(Status status, bool hasTag = false) : status(status), hasTag(hasTag) {}; + TagStatus() : status(MetadataInvalid), hasTag(false) {}; - tqStatus status; + Status status; bool hasTag; - bool operator==(TagtqStatus otherstatus) + bool operator==(TagStatus otherstatus) { return otherstatus.status == status && otherstatus.hasTag == hasTag; } - bool operator==(tqStatus otherstatus) { return otherstatus == status; } + bool operator==(Status otherstatus) { return otherstatus == status; } }; enum DatabaseMode @@ -251,13 +251,13 @@ public: // -------------------------------------------------- - tqStatus dateTimetqStatus() const; - tqStatus commenttqStatus() const; - tqStatus ratingtqStatus() const; + Status dateTimeStatus() const; + Status commentStatus() const; + Status ratingStatus() const; - TagtqStatus tagtqStatus(TAlbum *album) const; - TagtqStatus tagtqStatus(int albumId) const; - TagtqStatus tagtqStatus(const TQString &tagPath) const; + TagStatus tagStatus(TAlbum *album) const; + TagStatus tagStatus(int albumId) const; + TagStatus tagStatus(const TQString &tagPath) const; /** Returns if the metadata field has been changed @@ -320,23 +320,23 @@ public: sets contained the tag. The hasTag value is true then. If MapMode (set in constructor) is false, returns an empty map. */ - TQMap<TAlbum *, TagtqStatus> tags() const; + TQMap<TAlbum *, TagStatus> tags() const; /** Similar to the method above. This method is less efficient internally. */ - TQMap<int, TagtqStatus> tagIDs() const; + TQMap<int, TagStatus> tagIDs() const; // -------------------------------------------------- /** Set dateTime to the given value, and the dateTime status to MetadataAvailable */ - void setDateTime(const TQDateTime &dateTime, tqStatus status = MetadataAvailable); - void setComment(const TQString &comment, tqStatus status = MetadataAvailable); - void setRating(int rating, tqStatus status = MetadataAvailable); - void setTag(TAlbum *tag, bool hasTag, tqStatus status = MetadataAvailable); - void setTag(int albumID, bool hasTag, tqStatus status = MetadataAvailable); + void setDateTime(const TQDateTime &dateTime, Status status = MetadataAvailable); + void setComment(const TQString &comment, Status status = MetadataAvailable); + void setRating(int rating, Status status = MetadataAvailable); + void setTag(TAlbum *tag, bool hasTag, Status status = MetadataAvailable); + void setTag(int albumID, bool hasTag, Status status = MetadataAvailable); /** Resets the information that metadata fields have been changed with one of the diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 19d6704..f099c6d 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -28,7 +28,7 @@ #include <tqfontmetrics.h> #include <tqpainter.h> #include <tqpixmap.h> -#include <tqpalette.h> +#include <palette.h> // KDE includes. @@ -83,7 +83,7 @@ MonthWidget::MonthWidget(TQWidget* parent) d = new MonthWidgetPriv; init(); - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setYearMonth(date.year(), date.month()); setActive(false); @@ -134,7 +134,7 @@ void MonthWidget::setYearMonth(int year, int month) update(); } -TQSize MonthWidget::tqsizeHint() const +TQSize MonthWidget::sizeHint() const { return TQSize(d->width * 8, d->height * 9); } @@ -153,7 +153,7 @@ void MonthWidget::drawContents(TQPainter *) TQPixmap pix(cr.width(), cr.height()); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); TQFont fnBold(font()); TQFont fnOrig(font()); @@ -261,13 +261,13 @@ void MonthWidget::drawContents(TQPainter *) #if KDE_IS_VERSION(3,2,0) p.drawText(r, TQt::AlignCenter, TQString("%1 %2") - .tqarg(KGlobal::locale()->calendar()->monthName(d->month, false)) - .tqarg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); + .arg(KGlobal::locale()->calendar()->monthName(d->month, false)) + .arg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1)))); #else p.drawText(r, TQt::AlignCenter, TQString("%1 %2") - .tqarg(KGlobal::locale()->monthName(d->month)) - .tqarg(TQString::number(d->year))); + .arg(KGlobal::locale()->monthName(d->month)) + .arg(TQString::number(d->year))); #endif p.end(); @@ -363,7 +363,7 @@ void MonthWidget::setActive(bool val) } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setYearMonth(date.year(), date.month()); AlbumLister::instance()->setDayFilter(TQValueList<TQDateTime>()); diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index 0333050..9b54736 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -48,7 +48,7 @@ public: ~MonthWidget(); void setYearMonth(int year, int month); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setActive(bool val); diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 7968831..06dab23 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -215,7 +215,7 @@ void PixmapManager::slotFailedThumbnail(const KURL& url) // Resize icon to the right size depending of current settings. TQSize size(img.size()); - size.tqscale(d->size, d->size, TQSize::ScaleMin); + size.scale(d->size, d->size, TQSize::ScaleMin); if (size.width() < img.width() && size.height() < img.height()) { // only scale down diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index f9f6d8b..7ac2754 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -25,7 +25,7 @@ // TQt includes. #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpixmap.h> #include <tqcursor.h> #include <tqwhatsthis.h> @@ -184,17 +184,17 @@ void RatingFilter::updateRatingTooltip() { case AlbumLister::GreaterEqualCondition: { - d->ratingTracker->setText(i18n("Rating >= %1").tqarg(rating())); + d->ratingTracker->setText(i18n("Rating >= %1").arg(rating())); break; } case AlbumLister::EqualCondition: { - d->ratingTracker->setText(i18n("Rating = %1").tqarg(rating())); + d->ratingTracker->setText(i18n("Rating = %1").arg(rating())); break; } case AlbumLister::LessEqualCondition: { - d->ratingTracker->setText(i18n("Rating <= %1").tqarg(rating())); + d->ratingTracker->setText(i18n("Rating <= %1").arg(rating())); break; } default: diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index 46c011e..a4e97bb 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -25,7 +25,7 @@ // TQt includes. #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpixmap.h> // KDE includes. @@ -175,7 +175,7 @@ void RatingWidget::slotThemeChanged() TQPainter painter(&d->regPixmap); painter.fillRect(0, 0, d->regPixmap.width(), d->regPixmap.height(), - tqcolorGroup().dark()); + colorGroup().dark()); painter.end(); TQPainter painter2(&d->selPixmap); @@ -185,7 +185,7 @@ void RatingWidget::slotThemeChanged() TQPainter painter3(&d->disPixmap); painter3.fillRect(0, 0, d->disPixmap.width(), d->disPixmap.height(), - tqpalette().disabled().foreground()); + palette().disabled().foreground()); painter3.end(); setFixedSize(TQSize(d->regPixmap.width()*5, d->regPixmap.height())); diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 87456d8..0e16937 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -123,7 +123,7 @@ void ScanLib::startScan() deleteStaleEntries(); AlbumDB* db = AlbumManager::instance()->albumDB(); - db->setSetting("Scanned", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); + db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate)); } void ScanLib::findFoldersWhichDoNotExist() diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index e7af525..cdab2ba 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -28,7 +28,7 @@ // TQt includes. #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqhgroupbox.h> @@ -122,10 +122,10 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) d->rulesBox = new TQVGroupBox(i18n("Search Rules"), page); TQWhatsThis::add(d->rulesBox, i18n("<p>Here you can review the search rules used to filter image-" "searching in album library.")); - d->rulesBox->tqlayout()->setSpacing( spacingHint() ); - d->rulesBox->tqlayout()->setMargin( spacingHint() ); - d->rulesBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - d->rulesBox->tqlayout()->tqsetAlignment( TQt::AlignTop ); + d->rulesBox->layout()->setSpacing( spacingHint() ); + d->rulesBox->layout()->setMargin( spacingHint() ); + d->rulesBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + d->rulesBox->layout()->setAlignment( TQt::AlignTop ); // ---------------------------------------------------------------- // Box for the add/delete @@ -135,8 +135,8 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) "by adding/removing criteria.")); groupbox1->setColumnLayout(0, Qt::Vertical ); - groupbox1->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupbox1->tqlayout()->setMargin( KDialog::marginHint() ); + groupbox1->layout()->setSpacing( KDialog::spacingHint() ); + groupbox1->layout()->setMargin( KDialog::marginHint() ); d->optionsCombo = new TQComboBox(groupbox1); d->optionsCombo->insertItem(i18n("As well as"), 0); d->optionsCombo->insertItem(i18n("Or"), 1); @@ -147,7 +147,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) d->addButton->setIconSet(SmallIcon("add")); d->delButton->setIconSet(SmallIcon("remove")); - TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->tqlayout()); + TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->layout()); box1->addWidget(d->optionsCombo); box1->addWidget(d->addButton); box1->addStretch(10); @@ -160,12 +160,12 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " "from the Search Rule set.")); groupbox2->setColumnLayout(0, Qt::Vertical); - groupbox2->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupbox2->tqlayout()->setMargin( KDialog::marginHint() ); + groupbox2->layout()->setSpacing( KDialog::spacingHint() ); + groupbox2->layout()->setMargin( KDialog::marginHint() ); d->groupButton = new TQPushButton(i18n("&Group"), groupbox2); d->ungroupButton = new TQPushButton(i18n("&Ungroup"), groupbox2); - TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->tqlayout()); + TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->layout()); box2->addWidget(d->groupButton); box2->addStretch(10); box2->addWidget(d->ungroupButton); @@ -175,14 +175,14 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url) TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3"); groupbox3->setColumnLayout(0, Qt::Vertical ); - groupbox3->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupbox3->layout()->setSpacing( KDialog::spacingHint() ); groupbox3->setFrameStyle( TQFrame::NoFrame ); TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3); d->title = new KLineEdit(groupbox3, "searchTitle"); TQWhatsThis::add(d->title, i18n("<p>Enter the name used to save the current search in " "\"My Searches\" view")); - TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->tqlayout()); + TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->layout()); box3->addWidget(label); box3->addWidget(d->title); label->setBuddy(d->title); @@ -369,8 +369,8 @@ void SearchAdvancedDialog::slotGroupRules() for (BaseList::iterator it = d->baseList.begin(); it != d->baseList.end(); ++it) { - d->rulesBox->tqlayout()->remove((*it)->widget()); - d->rulesBox->tqlayout()->add((*it)->widget()); + d->rulesBox->layout()->remove((*it)->widget()); + d->rulesBox->layout()->add((*it)->widget()); } connect( group, TQT_SIGNAL( signalBaseItemToggled() ), @@ -423,8 +423,8 @@ void SearchAdvancedDialog::slotUnGroupRules() for (BaseList::iterator it = d->baseList.begin(); it != d->baseList.end(); ++it) { - d->rulesBox->tqlayout()->remove((*it)->widget()); - d->rulesBox->tqlayout()->add((*it)->widget()); + d->rulesBox->layout()->remove((*it)->widget()); + d->rulesBox->layout()->add((*it)->widget()); } slotChangeButtonStates(); diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index ca89abc..63aee80 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -320,7 +320,7 @@ void SearchFolderView::searchDelete(SAlbum* album) int result = KMessageBox::warningYesNo(this, i18n("Are you sure you want to " "delete the selected search " "\"%1\"?") - .tqarg(album->title()), + .arg(album->title()), i18n("Delete Search?"), i18n("Delete"), KStdGuiItem::cancel()); diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 1d2b772..1ff0aec 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -27,7 +27,7 @@ // TQt includes. #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <tqdatetime.h> #include <tqlabel.h> @@ -168,7 +168,7 @@ void SearchQuickDialog::slotTimeOut() if (count != 0) path += " AND "; - path += TQString(" %1 ").tqarg(count + 1); + path += TQString(" %1 ").arg(count + 1); num = TQString::number(++count); url.addQueryItem(num + ".key", "keyword"); diff --git a/digikam/digikam/searchresultsitem.cpp b/digikam/digikam/searchresultsitem.cpp index 85b02ab..d3f2ab1 100644 --- a/digikam/digikam/searchresultsitem.cpp +++ b/digikam/digikam/searchresultsitem.cpp @@ -41,7 +41,7 @@ SearchResultsItem::SearchResultsItem(TQIconView* view, const TQString& path) if (!m_basePixmap) { m_basePixmap = new TQPixmap(128, 128); - m_basePixmap->fill(view->tqcolorGroup().base()); + m_basePixmap->fill(view->colorGroup().base()); TQPainter p(m_basePixmap); p.setPen(TQt::lightGray); diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 6e2a00b..5b92652 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -35,7 +35,7 @@ #include <tqlineedit.h> #include <tqgroupbox.h> #include <tqvgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> // KDE includes. @@ -126,8 +126,8 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt : SearchAdvancedBase(SearchAdvancedBase::RULE) { m_box = new TQVBox(parent); - m_box->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_box->layout()->setSpacing( KDialog::spacingHint() ); + m_box->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_optionsBox = 0; m_option = option; @@ -139,23 +139,23 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt m_optionsBox); TQFrame* hline = new TQFrame( m_optionsBox ); hline->setFrameStyle( TQFrame::HLine|TQFrame::Sunken ); - m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); - hline->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + hline->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), this, TQT_SLOT( slotLabelDoubleClick() )); } m_hbox = new TQWidget( m_box ); - m_hbox->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_hbox->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_key = new TQComboBox( m_hbox, "key" ); - m_key->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + m_key->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); for (int i=0; i< RuleKeyTableCount; i++) m_key->insertItem( i18n(RuleKeyTable[i].keyText), i ); m_operator = new TQComboBox( m_hbox ); - m_operator->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + m_operator->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); // prepopulate the operator widget to get optimal size for (int i=0; i< RuleOpTableCount; i++) m_operator->insertItem( i18n(RuleOpTable[i].keyText), i ); @@ -311,7 +311,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp if (newType == DATE) { m_dateEdit = new KDateEdit( m_valueBox,"datepicker"); - m_dateEdit->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + m_dateEdit->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_dateEdit->show(); connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ), @@ -320,7 +320,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == LINEEDIT) { m_lineEdit = new TQLineEdit( m_valueBox, "lineedit" ); - m_lineEdit->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_lineEdit->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_lineEdit->show(); connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ), @@ -330,7 +330,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == ALBUMS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "albumscombo" ); - m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList aList = aManager->allPAlbums(); @@ -370,7 +370,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp else if (newType == TAGS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "tagscombo" ); - m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList tList = aManager->allTAlbums(); @@ -477,16 +477,16 @@ void SearchAdvancedRule::addOption(Option option) return; } - m_box->tqlayout()->remove(m_hbox); + m_box->layout()->remove(m_hbox); m_optionsBox = new TQHBox(m_box); new TQLabel(option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox); TQFrame* hline = new TQFrame(m_optionsBox); hline->setFrameStyle(TQFrame::HLine|TQFrame::Sunken); - hline->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); + hline->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); m_optionsBox->show(); - m_box->tqlayout()->add(m_hbox); + m_box->layout()->add(m_hbox); m_option = option; } @@ -500,7 +500,7 @@ void SearchAdvancedRule::removeOption() void SearchAdvancedRule::addCheck() { m_check = new TQCheckBox(m_hbox); - m_check->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_check->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_check->show(); @@ -518,7 +518,7 @@ SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent) : SearchAdvancedBase(SearchAdvancedBase::GROUP) { m_box = new TQHBox(parent); - m_box->tqlayout()->setSpacing(KDialog::spacingHint()); + m_box->layout()->setSpacing(KDialog::spacingHint()); m_groupbox = new TQVGroupBox(m_box); m_check = new TQCheckBox(m_box); m_option = SearchAdvancedRule::NONE; diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 2b675a2..66218bd 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -25,7 +25,7 @@ // TQt includes. #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes. @@ -108,7 +108,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create) logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); d->topLabel = new TQLabel(page); - d->topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); + d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); KSeparator *line = new KSeparator(Qt::Horizontal, page); @@ -250,13 +250,13 @@ void TagEditDlg::slotTitleChanged(const TQString& newtitle) else { d->topLabel->setText(i18n("<qt><b>Create New Tag in<br>" - "<i>\"%1\"</i></b></qt>").tqarg(tagName)); + "<i>\"%1\"</i></b></qt>").arg(tagName)); } } else { d->topLabel->setText(i18n("<qt><b>Properties of Tag<br>" - "<i>\"%1\"</i></b></qt>").tqarg(tagName)); + "<i>\"%1\"</i></b></qt>").arg(tagName)); } enableButtonOK(!newtitle.isEmpty()); @@ -327,9 +327,9 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr TQString tagPath, errMsg; TQString tag = (*it2).stripWhiteSpace(); if (root->isRoot()) - tagPath = TQString("/%1").tqarg(tag); + tagPath = TQString("/%1").arg(tag); else - tagPath = TQString("%1/%2").tqarg(root->tagPath()).tqarg(tag); + tagPath = TQString("%1/%2").arg(root->tagPath()).arg(tag); DDebug() << tag << " :: " << tagPath << endl; diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 962a61d..de16a17 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -137,7 +137,7 @@ void TagFilterViewItem::refresh() if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount()) { if (isOpen()) - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(m_count)); else { int countRecursive = m_count; @@ -149,7 +149,7 @@ void TagFilterViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); } } else @@ -166,9 +166,9 @@ void TagFilterViewItem::stateChange(bool val) have been changed from TQCheckListItem::CheckBoxController to TQCheckListItem::CheckBox. - // All TagFilterViewItems are CheckBoxControllers. If they have no tqchildren, + // All TagFilterViewItems are CheckBoxControllers. If they have no children, // they should be of type CheckBox, but that is not possible with our way of adding items. - // When clicked, tqchildren-less items first change to the NoChange state, and a second + // When clicked, children-less items first change to the NoChange state, and a second // click is necessary to set them to On and make the filter take effect. // So set them to On if the condition is met. if (!firstChild() && state() == NoChange) @@ -393,7 +393,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter) if (!match) { - // check if any of the tqchildren match the search + // check if any of the children match the search AlbumIterator it(talbum); while (it.current()) { @@ -539,7 +539,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e) if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -623,7 +623,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters")); popMenu.insertItem(SmallIcon("tag"), i18n("Assign Tag '%1' to Items") - .tqarg(destAlbum->prettyURL()), 10) ; + .arg(destAlbum->prettyURL()), 10) ; popMenu.insertItem(i18n("Set as Tag Thumbnail"), 11); popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel")); @@ -760,7 +760,7 @@ void TagFilterView::slotTagDeleted(Album* album) if (!item) return; - // NOTE: see B.K.O #158558: unselected tag filter and all tqchildrens before to delete it. + // NOTE: see B.K.O #158558: unselected tag filter and all childrens before to delete it. toggleChildTags(item, false); item->setOn(false); @@ -1201,17 +1201,17 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) return; // find number of subtags - int tqchildren = 0; + int children = 0; AlbumIterator iter(tag); while(iter.current()) { - tqchildren++; + children++; ++iter; } AlbumManager* man = AlbumManager::instance(); - if (tqchildren) + if (children) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -1222,7 +1222,7 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - tqchildren).tqarg(tag->title())); + children).arg(tag->title())); if(result != KMessageBox::Continue) return; @@ -1236,11 +1236,11 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) "Do you want to continue?", "Tag '%1' is assigned to %n items. " "Do you want to continue?", - assignedItems.count()).tqarg(tag->title()); + assignedItems.count()).arg(tag->title()); } else { - message = i18n("Delete '%1' tag?").tqarg(tag->title()); + message = i18n("Delete '%1' tag?").arg(tag->title()); } int result = KMessageBox::warningContinueCancel(0, message, diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index f5be7dc..0576cf4 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -115,7 +115,7 @@ void TagFolderViewItem::refresh() dynamic_cast<TagFolderViewItem*>(parent())) { if (isOpen()) - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(m_count)); else { int countRecursive = m_count; @@ -127,7 +127,7 @@ void TagFolderViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); + setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); } } else @@ -283,7 +283,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter) if (!match) { - // check if any of the tqchildren match the search + // check if any of the children match the search AlbumIterator it(talbum); while (it.current()) { @@ -337,7 +337,7 @@ void TagFolderView::slotAlbumAdded(Album *album) { item = new TagFolderViewItem(this, tag); tag->setExtraData(this, item); - // Toplevel tags are all tqchildren of root, and should always be visible - set root to open + // Toplevel tags are all children of root, and should always be visible - set root to open item->setOpen(true); } else @@ -705,15 +705,15 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) return; // find number of subtags - int tqchildren = 0; + int children = 0; AlbumIterator iter(tag); while(iter.current()) { - tqchildren++; + children++; ++iter; } - if(tqchildren) + if(children) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -724,7 +724,7 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - tqchildren).tqarg(tag->title())); + children).arg(tag->title())); if(result != KMessageBox::Continue) return; @@ -738,11 +738,11 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) "Do you want to continue?", "Tag '%1' is assigned to %n items. " "Do you want to continue?", - assignedItems.count()).tqarg(tag->title()); + assignedItems.count()).arg(tag->title()); } else { - message = i18n("Delete '%1' tag?").tqarg(tag->title()); + message = i18n("Delete '%1' tag?").arg(tag->title()); } int result = KMessageBox::warningContinueCancel(0, message, @@ -822,7 +822,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e) if(TagDrag::canDecode(e)) { - TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQByteArray ba = e->encodedData("digikam/tag-id"); TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -946,7 +946,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags")); popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items") - .tqarg(destAlbum->prettyURL()), 10) ; + .arg(destAlbum->prettyURL()), 10) ; popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index 72b1602..99ccb19 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -67,11 +67,11 @@ public: { } - virtual TQSize tqsizeHint() + virtual TQSize sizeHint() { TQFont fn = m_popup->font(); TQFontMetrics fm(fn); - int w = fm.width(m_txt) + 5 + kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + int w = fm.width(m_txt) + 5 + kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); int h = TQMAX(fm.height(), m_pix.height()); return TQSize( w, h ); } @@ -90,8 +90,8 @@ public: p->drawPixmap( pixRect.topLeft(), m_pix ); } - int checkWidth = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); - int checkHeight = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight, 0); + int checkWidth = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); + int checkHeight = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorHeight, 0); TQStyle::SFlags flags = TQStyle::Style_Default; flags |= TQStyle::Style_On; diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index a896e32..23f0752 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -173,7 +173,7 @@ void TimeLineFolderView::searchDelete(SAlbum* album) int result = KMessageBox::warningYesNo(this, i18n("Are you sure you want to " "delete the selected Date Search " "\"%1\"?") - .tqarg(album->title()), + .arg(album->title()), i18n("Delete Date Search?"), i18n("Delete"), KStdGuiItem::cancel()); diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index 6422485..b4157e2 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqframe.h> #include <tqhbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqpushbutton.h> #include <tqhbuttongroup.h> @@ -185,7 +185,7 @@ TimeLineView::TimeLineView(TQWidget *parent) d->cursorDateLabel = new KSqueezedTextLabel(0, panel); d->cursorCountLabel = new TQLabel(panel); - d->cursorCountLabel->tqsetAlignment(TQt::AlignRight); + d->cursorCountLabel->setAlignment(TQt::AlignRight); // --------------------------------------------------------------- @@ -334,7 +334,7 @@ void TimeLineView::readConfig() d->scaleBG->setButton(config->readNumEntry("Histogram Scale", TimeLineWidget::LinScale)); slotScaleChanged(d->scaleBG->selectedId()); - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); d->timeLineWidget->setCursorDateTime(config->readDateTimeEntry("Cursor Position", &now)); d->timeLineWidget->setCurrentIndex(d->timeLineWidget->indexForCursorDateTime()); } @@ -456,7 +456,7 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name) for (int i = 1 ; i < grp; i++) { path.append(" OR "); - path.append(TQString("%1 AND %2").tqarg(i*2+1).tqarg(i*2+2)); + path.append(TQString("%1 AND %2").arg(i*2+1).arg(i*2+2)); } } url.setPath(path); @@ -467,12 +467,12 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name) { start = (*it).first; end = (*it).second; - url.addQueryItem(TQString("%1.key").tqarg(i*2+1), TQString("imagedate")); - url.addQueryItem(TQString("%1.op").tqarg(i*2+1), TQString("GT")); - url.addQueryItem(TQString("%1.val").tqarg(i*2+1), start.date().toString(Qt::ISODate)); - url.addQueryItem(TQString("%1.key").tqarg(i*2+2), TQString("imagedate")); - url.addQueryItem(TQString("%1.op").tqarg(i*2+2), TQString("LT")); - url.addQueryItem(TQString("%1.val").tqarg(i*2+2), end.date().toString(Qt::ISODate)); + 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.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)); i++; } @@ -526,14 +526,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) DateRangeList list; for (int i = 1 ; i <= count ; i+=2) { - key = TQString("%1.val").tqarg(TQString::number(i)); + key = TQString("%1.val").arg(TQString::number(i)); it2 = queries.find(key); if (it2 != queries.end()) start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; - key = TQString("%1.val").tqarg(TQString::number(i+1)); + 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)); @@ -623,11 +623,11 @@ void TimeLineView::slotRenameAlbum(SAlbum* salbum) bool ok; #if KDE_IS_VERSION(3,2,0) - TQString name = KInputDialog::getText(i18n("Rename Album (%1)").tqarg(oldName), + TQString name = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldName), i18n("Enter new album name:"), oldName, &ok, this); #else - TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").tqarg(oldName), + TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").arg(oldName), i18n("Enter new album name:"), oldName, &ok, this); #endif diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 1c33527..2d175d6 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -120,7 +120,7 @@ TimeLineWidget::TimeLineWidget(TQWidget *parent) setMinimumWidth(256); setMinimumHeight(192); - TQDateTime ref = TQDateTime::tqcurrentDateTime(); + TQDateTime ref = TQDateTime::currentDateTime(); setCursorDateTime(ref); setRefDateTime(ref); @@ -280,16 +280,16 @@ int TimeLineWidget::cursorInfo(TQString& infoDate) case Week: { infoDate = i18n("Week #%1 - %2 %3") - .tqarg(d->calendar->weekNumber(dt.date())) - .tqarg(d->calendar->monthName(dt.date())) - .tqarg(d->calendar->yearString(dt.date(), false)); + .arg(d->calendar->weekNumber(dt.date())) + .arg(d->calendar->monthName(dt.date())) + .arg(d->calendar->yearString(dt.date(), false)); break; } case Month: { infoDate = TQString("%1 %2") - .tqarg(d->calendar->monthName(dt.date())) - .tqarg(d->calendar->yearString(dt.date(), false)); + .arg(d->calendar->monthName(dt.date())) + .arg(d->calendar->yearString(dt.date(), false)); break; } case Year: @@ -610,7 +610,7 @@ void TimeLineWidget::updatePixmap() { // Drawing background and image. d->pixmap = TQPixmap(size()); - d->pixmap.fill(tqpalette().active().background()); + d->pixmap.fill(palette().active().background()); TQPainter p(&d->pixmap); @@ -665,11 +665,11 @@ void TimeLineWidget::updatePixmap() focusRect = barRect; if (ref > d->maxDateTime) - dateColor = tqpalette().active().mid(); + dateColor = palette().active().mid(); else - dateColor = tqpalette().active().foreground(); + dateColor = palette().active().foreground(); - p.setPen(tqpalette().active().foreground()); + p.setPen(palette().active().foreground()); p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor())); p.drawRect(barRect); p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3); @@ -678,12 +678,12 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = tqpalette().active().highlightedText(); + subDateColor = palette().active().highlightedText(); else - subDateColor = tqpalette().active().foreground(); + subDateColor = palette().active().foreground(); } else - subDateColor = tqpalette().active().mid(); + subDateColor = palette().active().mid(); if (sel == Selected || sel == FuzzySelection) { @@ -849,11 +849,11 @@ void TimeLineWidget::updatePixmap() focusRect = barRect; if (ref < d->minDateTime) - dateColor = tqpalette().active().mid(); + dateColor = palette().active().mid(); else - dateColor = tqpalette().active().foreground(); + dateColor = palette().active().foreground(); - p.setPen(tqpalette().active().foreground()); + p.setPen(palette().active().foreground()); p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor())); p.drawRect(barRect); p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3); @@ -862,12 +862,12 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = tqpalette().active().highlightedText(); + subDateColor = palette().active().highlightedText(); else - subDateColor = tqpalette().active().foreground(); + subDateColor = palette().active().foreground(); } else - subDateColor = tqpalette().active().mid(); + subDateColor = palette().active().mid(); if (sel == Selected || sel == FuzzySelection) { @@ -1004,7 +1004,7 @@ void TimeLineWidget::updatePixmap() TQPoint p2(focusRect.right(), height() - d->bottomMargin); focusRect.setBottom(focusRect.bottom() + d->bottomMargin/2); - p.setPen(tqpalette().active().shadow()); + p.setPen(palette().active().shadow()); p.drawLine(p1.x(), p1.y()+1, p2.x(), p2.y()+1); p.drawRect(focusRect); @@ -1018,7 +1018,7 @@ void TimeLineWidget::updatePixmap() p.drawLine(p1.x()-1, p1.y()-1, p2.x()+1, p2.y()-1); focusRect.addCoords(-1,-1, 1, 1); - p.setPen(tqpalette().active().shadow()); + p.setPen(palette().active().shadow()); p.drawRect(focusRect); p.drawLine(p1.x(), p1.y()-2, p2.x(), p2.y()-2); } diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp index d11565c..4696d28 100644 --- a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp +++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp @@ -75,8 +75,8 @@ TQ_LLONG findOrAddImage(AlbumDB* db, int dirid, const TQString& name, TQStringList values; db->execSql(TQString("SELECT id FROM Images WHERE dirid=%1 AND name='%2'") - .tqarg(dirid) - .tqarg(escapeString(name)), &values); + .arg(dirid) + .arg(escapeString(name)), &values); if (!values.isEmpty()) { @@ -85,9 +85,9 @@ TQ_LLONG findOrAddImage(AlbumDB* db, int dirid, const TQString& name, db->execSql(TQString("INSERT INTO Images (dirid, name, caption) \n " "VALUES(%1, '%2', '%3');") - .tqarg(dirid) - .tqarg(escapeString(name)) - .tqarg(escapeString(caption)), &values); + .arg(dirid) + .arg(escapeString(name)) + .arg(escapeString(caption)), &values); return db->lastInsertedRow(); } @@ -185,11 +185,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) db3.execSql(TQString("INSERT INTO Albums (id, url, date, caption, collection) " "VALUES(%1, '%2', '%3', '%4', '%5');") - .tqarg(album.id) - .tqarg(escapeString(album.url)) - .tqarg(escapeString(album.date)) - .tqarg(escapeString(album.caption)) - .tqarg(escapeString(album.collection))); + .arg(album.id) + .arg(escapeString(album.url)) + .arg(escapeString(album.date)) + .arg(escapeString(album.caption)) + .arg(escapeString(album.collection))); } db3.commitTransaction(); @@ -220,9 +220,9 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) db3.execSql(TQString("INSERT INTO Tags (id, pid, name) " "VALUES(%1, %2, '%3');") - .tqarg(tag.id) - .tqarg(tag.pid) - .tqarg(escapeString(tag.name))); + .arg(tag.id) + .arg(tag.pid) + .arg(escapeString(tag.name))); } db3.commitTransaction(); @@ -266,7 +266,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQ_LLONG imageid = findOrAddImage(&db3, dirid, name, TQString()); db3.execSql(TQString("INSERT INTO ImageTags VALUES( %1, %2 )") - .tqarg(imageid).tqarg(tagid)); + .arg(imageid).arg(tagid)); } db3.commitTransaction(); @@ -284,8 +284,8 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQ_LLONG imageid = findOrAddImage(&db3, album.id, album.icon, TQString()); db3.execSql(TQString("UPDATE Albums SET icon=%1 WHERE id=%2") - .tqarg(imageid) - .tqarg(album.id)); + .arg(imageid) + .arg(album.id)); } db3.commitTransaction(); @@ -303,8 +303,8 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) if (fi.isRelative()) { db3.execSql(TQString("UPDATE Tags SET iconkde='%1' WHERE id=%2") - .tqarg(escapeString(tag.icon)) - .tqarg(tag.id)); + .arg(escapeString(tag.icon)) + .arg(tag.id)); continue; } @@ -327,8 +327,8 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQ_LLONG imageid = findOrAddImage(&db3, dirid, name, TQString());; db3.execSql(TQString("UPDATE Tags SET icon=%1 WHERE id=%2") - .tqarg(imageid) - .tqarg(tag.id)); + .arg(imageid) + .arg(tag.id)); } db3.commitTransaction(); @@ -370,11 +370,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) " date='%3' AND \n" " caption='%4' AND \n" " collection='%5';") - .tqarg(album.id) - .tqarg(escapeString(album.url)) - .tqarg(escapeString(album.date)) - .tqarg(escapeString(album.caption)) - .tqarg(escapeString(album.collection)), &list, false); + .arg(album.id) + .arg(escapeString(album.url)) + .arg(escapeString(album.date)) + .arg(escapeString(album.caption)) + .arg(escapeString(album.collection)), &list, false); if (list.size() != 1) { std::cerr << "Failed" << std::endl; @@ -404,9 +404,9 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) " id=%1 AND \n" " pid=%2 AND \n" " name='%3';") - .tqarg(id) - .tqarg(pid) - .tqarg(escapeString(name)), + .arg(id) + .arg(pid) + .arg(escapeString(name)), &list, false); if (list.size() != 1) { @@ -439,9 +439,9 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) "Images.dirid = Albums.id AND \n " "Images.name = '%2' AND \n " "Images.caption = '%3';") - .tqarg(escapeString(url)) - .tqarg(escapeString(name)) - .tqarg(escapeString(caption)), + .arg(escapeString(url)) + .arg(escapeString(name)) + .arg(escapeString(caption)), &list, false); if (list.size() != 1) { @@ -476,9 +476,9 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) "Images.name = '%2' AND \n " "ImageTags.imageid = Images.id AND \n " "ImageTags.tagid = %3;") - .tqarg(escapeString(url)) - .tqarg(escapeString(name)) - .tqarg(tagid), + .arg(escapeString(url)) + .arg(escapeString(name)) + .arg(tagid), &list, false); if (list.size() != 1) { @@ -509,8 +509,8 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) "Albums.url = '%1' AND \n " "Images.id = Albums.icon AND \n " "Images.name = '%2';") - .tqarg(escapeString(url)) - .tqarg(escapeString(icon)), &list); + .arg(escapeString(url)) + .arg(escapeString(icon)), &list); if (list.size() != 1) { @@ -544,8 +544,8 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) db3.execSql(TQString("SELECT id FROM Tags WHERE \n " "id = %1 AND \n " "iconkde = '%2';") - .tqarg(id) - .tqarg(escapeString(icon)), &list); + .arg(id) + .arg(escapeString(icon)), &list); if (list.size() != 1) { @@ -569,7 +569,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) list.clear(); db3.execSql(TQString("SELECT id FROM Albums WHERE url='%1'") - .tqarg(escapeString(url)), &list); + .arg(escapeString(url)), &list); if (list.isEmpty()) { DWarning() << "Tag icon not in Album Library Path, Rejecting " << endl; @@ -583,9 +583,9 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) " Images.name='%2' AND \n " " Tags.id=%3 AND \n " " Tags.icon=Images.id") - .tqarg(escapeString(url)) - .tqarg(escapeString(name)) - .tqarg(id), &list); + .arg(escapeString(url)) + .arg(escapeString(name)) + .arg(id), &list); if (list.size() != 1) { std::cerr << "Failed." << std::endl; diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index 44917b5..ab54e22 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -65,19 +65,19 @@ WelcomePageView::WelcomePageView(TQWidget* parent) TQString locationHtml = locate("data", "digikam/about/main.html"); TQString locationCss = locate("data", "digikam/about/kde_infopage.css"); TQString locationRtl = locate("data", "digikam/about/kde_infopage_rtl.css" ); - TQString rtl = kapp->reverseLayout() ? TQString("@import \"%1\";" ).tqarg(locationRtl) + TQString rtl = kapp->reverseLayout() ? TQString("@import \"%1\";" ).arg(locationRtl) : TQString(); begin(KURL(locationHtml)); TQString content = fileToString(locationHtml); - content = content.tqarg(locationCss) // %1 - .tqarg(rtl) // %2 - .tqarg(fontSize) // %3 - .tqarg(appTitle) // %4 - .tqarg(catchPhrase) // %5 - .tqarg(quickDescription) // %6 - .tqarg(infoPage()); // %7 + content = content.arg(locationCss) // %1 + .arg(rtl) // %2 + .arg(fontSize) // %3 + .arg(appTitle) // %4 + .arg(catchPhrase) // %5 + .arg(quickDescription) // %6 + .arg(infoPage()); // %7 write(content); end(); @@ -127,10 +127,10 @@ TQString WelcomePageView::infoPage() "<p>We hope that you will enjoy digiKam.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The digiKam Team</p>") - .tqarg(digikam_version) // current digiKam version - .tqarg("help:/digikam/index.html") // digiKam help:// URL - .tqarg(Digikam::webProjectUrl()) // digiKam homepage URL - .tqarg("0.8.2"); // previous digiKam release. + .arg(digikam_version) // current digiKam version + .arg("help:/digikam/index.html") // digiKam help:// URL + .arg(Digikam::webProjectUrl()) // digiKam homepage URL + .arg("0.8.2"); // previous digiKam release. TQStringList newFeatures; newFeatures << i18n("16-bit/color/pixel image support"); @@ -157,15 +157,15 @@ TQString WelcomePageView::infoPage() TQString featureItems; for ( uint i = 0 ; i < newFeatures.count() ; i++ ) - featureItems += i18n("<li>%1</li>\n").tqarg( newFeatures[i] ); + featureItems += i18n("<li>%1</li>\n").arg( newFeatures[i] ); - info = info.tqarg( featureItems ); + info = info.arg( featureItems ); // Add first-time user text (only shown on first start). - info = info.tqarg( TQString() ); + info = info.arg( TQString() ); // Generated list of important changes - info = info.tqarg( TQString() ); + info = info.arg( TQString() ); return info; } |