diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:21 -0600 |
| commit | 419fcddc00ceaddb5ec78da0b3eb84a26e3fc4ea (patch) | |
| tree | eefc3fdac16a4ec706222b50a4fa9d7825cc9f46 | |
| parent | c1bbc88281394639e2a92c2d1b43ca4f3e1813aa (diff) | |
| download | digikam-419fcddc00ceaddb5ec78da0b3eb84a26e3fc4ea.tar.gz digikam-419fcddc00ceaddb5ec78da0b3eb84a26e3fc4ea.zip | |
Remove additional unneeded tq method conversions
161 files changed, 899 insertions, 899 deletions
diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index d0b6b19f..73017857 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -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 50960bc1..ed088185 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 21f1d886..a2aba013 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,14 +1019,14 @@ 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), + .arg(escapeString(folder), TQDateTime::currentDateTime().toString(Qt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else @@ -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 d205e2e3..8559660c 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -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 fa722a37..44abf82a 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 16907a21..da0be634 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 538bd6df..18f333e6 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -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 fa45d7cc..6d97e800 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -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()) @@ -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")); @@ -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 diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index a8519791..d6b9f74c 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -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) @@ -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 a258ae74..904c6970 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -113,12 +113,12 @@ 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->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); topLayout->addMultiCellWidget( topLabel, 0, 0, 0, 1 ); diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h index f863dd07..9ebb640b 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 1634a0be..48c47c5e 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 bfecfa73..b5db6001 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -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,7 +1492,7 @@ void DigikamApp::slotDownloadImages() // the CameraUI will delete itself when it has finished CameraUI* cgui = new CameraUI(this, - i18n("Images found in %1").tqarg(d->cameraGuiPath), + i18n("Images found in %1").arg(d->cameraGuiPath), "directory browse","Fixed", localUrl, TQDateTime::currentDateTime()); cgui->show(); @@ -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 8d0acc05..7dd22688 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -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 1da5f5e1..69c8d918 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -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 e8b6646b..fbbd014c 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/folderview.cpp b/digikam/digikam/folderview.cpp index a7d6b711..3c7e1d6c 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -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; } } diff --git a/digikam/digikam/iconitem.cpp b/digikam/digikam/iconitem.cpp index 10aff521..798b96ae 100644 --- a/digikam/digikam/iconitem.cpp +++ b/digikam/digikam/iconitem.cpp @@ -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 6a3e1edd..aa67e209 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 85928651..c4cf1849 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -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(); @@ -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; } @@ -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; } @@ -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; } @@ -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); } } @@ -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/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index a51defcc..2710771f 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -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())); diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 50396581..e05f7578 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/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 2d7a7556..f9ff06b2 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -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(); diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 79688311..06dab231 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 f9f6d8b5..487af2d9 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -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/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index ca89abc4..63aee80e 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 1d2b7727..094b65ef 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -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/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index 8dc6a583..3fdc7faf 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -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 a0fe259e..de16a17e 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()) { @@ -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 2b92942c..0576cf48 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, @@ -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/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index a896e320..23f07526 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 11607b64..47600c85 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -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 39f3b82d..956fc1c0 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -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: diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp index d11565c6..4696d28e 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 44917b5e..ab54e229 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; } diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 88b62177..070d1191 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -402,7 +402,7 @@ void AdjustCurveDialog::slotSpotColorChanged(const Digikam::DColor &color) for (int i = Digikam::ImageHistogram::ValueChannel ; i <= Digikam::ImageHistogram::BlueChannel ; i++) m_curves->curvesCalculateCurve(i); - m_curvesWidget->tqrepaint(false); + m_curvesWidget->repaint(false); // restore previous rendering mode. m_previewWidget->setRenderingPreviewMode(m_currentPreviewMode); @@ -522,16 +522,16 @@ void AdjustCurveDialog::slotChannelChanged(int channel) m_curveType->setButton(m_curves->getCurveType(channel)); - m_curvesWidget->tqrepaint(false); - m_histogramWidget->tqrepaint(false); + m_curvesWidget->repaint(false); + m_histogramWidget->repaint(false); } void AdjustCurveDialog::slotScaleChanged(int scale) { m_curvesWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); - m_curvesWidget->tqrepaint(false); + m_histogramWidget->repaint(false); + m_curvesWidget->repaint(false); } void AdjustCurveDialog::slotCurveTypeChanged(int type) @@ -569,13 +569,13 @@ void AdjustCurveDialog::readUserSettings() for (int i = 0 ; i < 5 ; i++) { m_curves->curvesChannelReset(i); - m_curves->setCurveType(i, (Digikam::ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i), + m_curves->setCurveType(i, (Digikam::ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").arg(i), Digikam::ImageCurves::CURVE_SMOOTH)); for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable); if (m_originalImage.sixteenBit() && p.x() != -1) { @@ -602,7 +602,7 @@ void AdjustCurveDialog::writeUserSettings() for (int i = 0 ; i < 5 ; i++) { - config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curves->getCurveType(i)); + config->writeEntry(TQString("CurveTypeChannel%1").arg(i), m_curves->getCurveType(i)); for (int j = 0 ; j < 17 ; j++) { @@ -614,7 +614,7 @@ void AdjustCurveDialog::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p); } } diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index f4dc531a..cc92c831 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -384,7 +384,7 @@ void AdjustCurvesTool::slotSpotColorChanged(const DColor &color) for (int i = ImageHistogram::ValueChannel ; i <= ImageHistogram::BlueChannel ; i++) m_curvesWidget->curves()->curvesCalculateCurve(i); - m_curvesWidget->tqrepaint(false); + m_curvesWidget->repaint(false); // restore previous rendering mode. m_previewWidget->setRenderingPreviewMode(m_currentPreviewMode); @@ -401,7 +401,7 @@ void AdjustCurvesTool::slotResetCurrentChannel() { m_curvesWidget->curves()->curvesChannelReset(m_channelCB->currentItem()); - m_curvesWidget->tqrepaint(); + m_curvesWidget->repaint(); slotEffect(); m_histogramWidget->reset(); } @@ -503,16 +503,16 @@ void AdjustCurvesTool::slotChannelChanged(int channel) m_curveType->setButton(m_curvesWidget->curves()->getCurveType(channel)); - m_curvesWidget->tqrepaint(false); - m_histogramWidget->tqrepaint(false); + m_curvesWidget->repaint(false); + m_histogramWidget->repaint(false); } void AdjustCurvesTool::slotScaleChanged(int scale) { m_curvesWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); - m_curvesWidget->tqrepaint(false); + m_histogramWidget->repaint(false); + m_curvesWidget->repaint(false); } void AdjustCurvesTool::slotCurveTypeChanged(int type) @@ -550,13 +550,13 @@ void AdjustCurvesTool::readSettings() for (int i = 0 ; i < 5 ; i++) { m_curvesWidget->curves()->curvesChannelReset(i); - m_curvesWidget->curves()->setCurveType(i, (ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i), + m_curvesWidget->curves()->setCurveType(i, (ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").arg(i), ImageCurves::CURVE_SMOOTH)); for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -585,7 +585,7 @@ void AdjustCurvesTool::writeSettings() for (int i = 0 ; i < 5 ; i++) { - config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curvesWidget->curves()->getCurveType(i)); + config->writeEntry(TQString("CurveTypeChannel%1").arg(i), m_curvesWidget->curves()->getCurveType(i)); for (int j = 0 ; j < 17 ; j++) { @@ -597,7 +597,7 @@ void AdjustCurvesTool::writeSettings() p.setY(p.y()/255); } - config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p); } } diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 74a394b2..35e099e8 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -676,16 +676,16 @@ void AdjustLevelDialog::slotChannelChanged(int channel) m_levels->getLevelLowOutputValue(channel), m_levels->getLevelHighOutputValue(channel)); - m_levelsHistogramWidget->tqrepaint(false); - m_histogramWidget->tqrepaint(false); + m_levelsHistogramWidget->repaint(false); + m_histogramWidget->repaint(false); } void AdjustLevelDialog::slotScaleChanged(int scale) { m_levelsHistogramWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); - m_levelsHistogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); + m_levelsHistogramWidget->repaint(false); } void AdjustLevelDialog::readUserSettings() @@ -700,11 +700,11 @@ void AdjustLevelDialog::readUserSettings() { bool sb = m_originalImage.sixteenBit(); int max = sb ? 65535 : 255; - double gamma = config->readDoubleNumEntry(TQString("GammaChannel%1").tqarg(i), 1.0); - int lowInput = config->readNumEntry(TQString("LowInputChannel%1").tqarg(i), 0); - int lowOutput = config->readNumEntry(TQString("LowOutputChannel%1").tqarg(i), 0); - int highInput = config->readNumEntry(TQString("HighInputChannel%1").tqarg(i), max); - int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").tqarg(i), max); + double gamma = config->readDoubleNumEntry(TQString("GammaChannel%1").arg(i), 1.0); + int lowInput = config->readNumEntry(TQString("LowInputChannel%1").arg(i), 0); + int lowOutput = config->readNumEntry(TQString("LowOutputChannel%1").arg(i), 0); + int highInput = config->readNumEntry(TQString("HighInputChannel%1").arg(i), max); + int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").arg(i), max); m_levels->setLevelGammaValue(i, gamma); m_levels->setLevelLowInputValue(i, sb ? lowInput*255 : lowInput); @@ -742,11 +742,11 @@ void AdjustLevelDialog::writeUserSettings() int highInput = m_levels->getLevelHighInputValue(i); int highOutput = m_levels->getLevelHighOutputValue(i); - config->writeEntry(TQString("GammaChannel%1").tqarg(i), gamma); - config->writeEntry(TQString("LowInputChannel%1").tqarg(i), sb ? lowInput/255 : lowInput); - config->writeEntry(TQString("LowOutputChannel%1").tqarg(i), sb ? lowOutput/255 : lowOutput); - config->writeEntry(TQString("HighInputChannel%1").tqarg(i), sb ? highInput/255 : highInput); - config->writeEntry(TQString("HighOutputChannel%1").tqarg(i), sb ? highOutput/255 : highOutput); + config->writeEntry(TQString("GammaChannel%1").arg(i), gamma); + config->writeEntry(TQString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput); + config->writeEntry(TQString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput); + config->writeEntry(TQString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput); + config->writeEntry(TQString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput); } config->sync(); diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index 5c0c6671..aae7cc42 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -658,16 +658,16 @@ void AdjustLevelsTool::slotChannelChanged(int channel) m_levels->getLevelLowOutputValue(channel), m_levels->getLevelHighOutputValue(channel)); - m_levelsHistogramWidget->tqrepaint(false); - m_histogramWidget->tqrepaint(false); + m_levelsHistogramWidget->repaint(false); + m_histogramWidget->repaint(false); } void AdjustLevelsTool::slotScaleChanged(int scale) { m_levelsHistogramWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); - m_levelsHistogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); + m_levelsHistogramWidget->repaint(false); } void AdjustLevelsTool::readSettings() @@ -682,11 +682,11 @@ void AdjustLevelsTool::readSettings() { bool sb = m_originalImage->sixteenBit(); int max = sb ? 65535 : 255; - double gamma = config->readDoubleNumEntry(TQString("GammaChannel%1").tqarg(i), 1.0); - int lowInput = config->readNumEntry(TQString("LowInputChannel%1").tqarg(i), 0); - int lowOutput = config->readNumEntry(TQString("LowOutputChannel%1").tqarg(i), 0); - int highInput = config->readNumEntry(TQString("HighInputChannel%1").tqarg(i), max); - int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").tqarg(i), max); + double gamma = config->readDoubleNumEntry(TQString("GammaChannel%1").arg(i), 1.0); + int lowInput = config->readNumEntry(TQString("LowInputChannel%1").arg(i), 0); + int lowOutput = config->readNumEntry(TQString("LowOutputChannel%1").arg(i), 0); + int highInput = config->readNumEntry(TQString("HighInputChannel%1").arg(i), max); + int highOutput = config->readNumEntry(TQString("HighOutputChannel%1").arg(i), max); m_levels->setLevelGammaValue(i, gamma); m_levels->setLevelLowInputValue(i, sb ? lowInput*255 : lowInput); @@ -724,11 +724,11 @@ void AdjustLevelsTool::writeSettings() int highInput = m_levels->getLevelHighInputValue(i); int highOutput = m_levels->getLevelHighOutputValue(i); - config->writeEntry(TQString("GammaChannel%1").tqarg(i), gamma); - config->writeEntry(TQString("LowInputChannel%1").tqarg(i), sb ? lowInput/255 : lowInput); - config->writeEntry(TQString("LowOutputChannel%1").tqarg(i), sb ? lowOutput/255 : lowOutput); - config->writeEntry(TQString("HighInputChannel%1").tqarg(i), sb ? highInput/255 : highInput); - config->writeEntry(TQString("HighOutputChannel%1").tqarg(i), sb ? highOutput/255 : highOutput); + config->writeEntry(TQString("GammaChannel%1").arg(i), gamma); + config->writeEntry(TQString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput); + config->writeEntry(TQString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput); + config->writeEntry(TQString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput); + config->writeEntry(TQString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput); } m_previewWidget->writeSettings(); diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index 3acef9bf..004f157b 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -512,7 +512,7 @@ void ChannelMixerDialog::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); adjustSliders(); slotEffect(); } @@ -520,7 +520,7 @@ void ChannelMixerDialog::slotChannelChanged(int channel) void ChannelMixerDialog::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ChannelMixerDialog::readUserSettings() diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 26560ad4..0fe5cc5d 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -504,7 +504,7 @@ void ChannelMixerTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); adjustSliders(); slotEffect(); } @@ -512,7 +512,7 @@ void ChannelMixerTool::slotChannelChanged(int channel) void ChannelMixerTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ChannelMixerTool::readSettings() diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index 3755eb3d..e4dc9858 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -300,13 +300,13 @@ void ColorFXTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ColorFXTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ColorFXTool::slotColorSelectedFromTarget(const DColor &color) diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index e18a3b3b..6230c7f6 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -290,13 +290,13 @@ void ImageEffect_ColorFX::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_ColorFX::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_ColorFX::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 2f129e8e..1822f24c 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -276,13 +276,13 @@ void AutoCorrectionTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void AutoCorrectionTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color) diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index 323a4faf..d696adb4 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -250,13 +250,13 @@ void BCGTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void BCGTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void BCGTool::slotColorSelectedFromTarget(const DColor &color) diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index e65831c6..0e00c079 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -92,7 +92,7 @@ public: PreviewPixmapFactory(BWSepiaTool* bwSepia); - void tqinvalidate() { m_previewPixmapMap.clear(); } + void invalidate() { m_previewPixmapMap.clear(); } const TQPixmap* pixmap(int id); @@ -607,15 +607,15 @@ void BWSepiaTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void BWSepiaTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); m_curvesWidget->m_scaleType = scale; - m_curvesWidget->tqrepaint(false); + m_curvesWidget->repaint(false); } void BWSepiaTool::slotSpotColorChanged(const DColor &color) @@ -651,7 +651,7 @@ void BWSepiaTool::readSettings() for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -694,7 +694,7 @@ void BWSepiaTool::writeSettings() p.setY(p.y()/255); } - config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p); } m_previewWidget->writeSettings(); @@ -733,7 +733,7 @@ void BWSepiaTool::slotResetSettings() m_strengthInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->tqinvalidate(); + m_previewPixmapFactory->invalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); @@ -1079,7 +1079,7 @@ void BWSepiaTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Black & White settings text file.") - .tqarg(loadFile.fileName())); + .arg(loadFile.fileName())); file.close(); return; } @@ -1122,7 +1122,7 @@ void BWSepiaTool::slotLoadSettings() m_cInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->tqinvalidate(); + m_previewPixmapFactory->invalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 7442b875..6ab08bd2 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -275,13 +275,13 @@ void HSLTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void HSLTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void HSLTool::slotColorSelectedFromTarget( const DColor &color ) diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 16587140..b33f96a2 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -262,13 +262,13 @@ void ImageEffect_HSL::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_HSL::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_HSL::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 2caa9efc..2fb7ece8 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -594,7 +594,7 @@ void ICCProofTool::readSettings() for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -643,7 +643,7 @@ void ICCProofTool::writeSettings() p.setY(p.y() / 255); } - config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p); } m_previewWidget->writeSettings(); @@ -690,13 +690,13 @@ void ICCProofTool::slotChannelChanged( int channel ) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ICCProofTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ICCProofTool::slotResetSettings() @@ -1202,7 +1202,7 @@ void ICCProofTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Color Management settings text file.") - .tqarg(loadColorManagementFile.fileName())); + .arg(loadColorManagementFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index 8809ce3b..d6fd9b84 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -272,13 +272,13 @@ void ImageEffect_AutoCorrection::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_AutoCorrection::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index 3ae2d479..4e0d8003 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -240,13 +240,13 @@ void ImageEffect_BCG::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_BCG::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index cfa90f47..82028550 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -85,7 +85,7 @@ public: PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia); - void tqinvalidate() { m_previewPixmapMap.clear(); } + void invalidate() { m_previewPixmapMap.clear(); } const TQPixmap* pixmap(int id); @@ -611,15 +611,15 @@ void ImageEffect_BWSepia::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_BWSepia::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); m_curvesWidget->m_scaleType = scale; - m_curvesWidget->tqrepaint(false); + m_curvesWidget->repaint(false); } void ImageEffect_BWSepia::slotSpotColorChanged(const Digikam::DColor &color) @@ -655,7 +655,7 @@ void ImageEffect_BWSepia::readUserSettings() for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -697,7 +697,7 @@ void ImageEffect_BWSepia::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p); } config->sync(); @@ -729,7 +729,7 @@ void ImageEffect_BWSepia::resetValues() m_strengthInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->tqinvalidate(); + m_previewPixmapFactory->invalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); } @@ -791,7 +791,7 @@ void ImageEffect_BWSepia::slotTimer() Digikam::ImageDlgBase::slotTimer(); if (m_previewPixmapFactory && m_bwFilters && m_bwTone) { - m_previewPixmapFactory->tqinvalidate(); + m_previewPixmapFactory->invalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); } @@ -1085,7 +1085,7 @@ void ImageEffect_BWSepia::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Black & White settings text file.") - .tqarg(loadFile.fileName())); + .arg(loadFile.fileName())); file.close(); return; } @@ -1128,7 +1128,7 @@ void ImageEffect_BWSepia::slotUser3() m_cInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->tqinvalidate(); + m_previewPixmapFactory->invalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index 74030bf5..e962bbf3 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -584,7 +584,7 @@ void ImageEffect_ICCProof::readUserSettings() for (int j = 0 ; j < 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -632,7 +632,7 @@ void ImageEffect_ICCProof::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p); } config->sync(); @@ -678,13 +678,13 @@ void ImageEffect_ICCProof::slotChannelChanged( int channel ) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_ICCProof::slotScaleChanged( int scale ) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_ICCProof::resetValues() @@ -1178,7 +1178,7 @@ void ImageEffect_ICCProof::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Color Management settings text file.") - .tqarg(loadColorManagementFile.fileName())); + .arg(loadColorManagementFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index f919c398..a226c502 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -236,7 +236,7 @@ void ImageEffect_RedEye::slotHSChanged(int h, int s) m_VSelector->setHue(h); m_VSelector->setSaturation(s); m_VSelector->updateContents(); - m_VSelector->tqrepaint(false); + m_VSelector->repaint(false); m_VSelector->blockSignals(false); slotTimer(); } @@ -266,13 +266,13 @@ void ImageEffect_RedEye::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_RedEye::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& color) diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index 1fff34f0..bac658dd 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -278,13 +278,13 @@ void ImageEffect_RGB::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_RGB::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index 31a44588..f4d5a11a 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -332,7 +332,7 @@ void ImageSelectionWidget::setCenterSelection(int centerType) // Repaint updatePixmap(); - tqrepaint(false); + repaint(false); regionSelectionChanged(); } @@ -363,21 +363,21 @@ void ImageSelectionWidget::slotGuideLines(int guideLinesType) { d->guideLinesType = guideLinesType; updatePixmap(); - tqrepaint(false); + repaint(false); } void ImageSelectionWidget::slotChangeGuideColor(const TQColor &color) { d->guideColor = color; updatePixmap(); - tqrepaint(false); + repaint(false); } void ImageSelectionWidget::slotChangeGuideSize(int size) { d->guideSize = size; updatePixmap(); - tqrepaint(false); + repaint(false); } void ImageSelectionWidget::setSelectionOrientation(int orient) @@ -647,7 +647,7 @@ void ImageSelectionWidget::applyAspectRatio(bool useHeight, bool repaintWidget) if (repaintWidget) { updatePixmap(); - tqrepaint(false); + repaint(false); } } @@ -673,7 +673,7 @@ void ImageSelectionWidget::regionSelectionMoved() normalizeRegion(); updatePixmap(); - tqrepaint(false); + repaint(false); emit signalSelectionMoved( d->regionSelection ); } @@ -1236,7 +1236,7 @@ void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint ce // Repaint updatePixmap(); - tqrepaint(false); + repaint(false); } void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) @@ -1302,7 +1302,7 @@ void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) d->regionSelection.moveCenter( pmVirtual ); normalizeRegion(); updatePixmap(); - tqrepaint(false); + repaint(false); } } } @@ -1346,7 +1346,7 @@ void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e ) normalizeRegion(); updatePixmap(); - tqrepaint(false); + repaint(false); } else { diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index dfa70298..4dfa4b5d 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -248,7 +248,7 @@ void RedEyeTool::slotHSChanged(int h, int s) m_VSelector->setHue(h); m_VSelector->setSaturation(s); m_VSelector->updateContents(); - m_VSelector->tqrepaint(false); + m_VSelector->repaint(false); m_VSelector->blockSignals(false); slotTimer(); } @@ -278,13 +278,13 @@ void RedEyeTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void RedEyeTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void RedEyeTool::slotColorSelectedFromTarget(const DColor& color) diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index 69382b32..bd3e6167 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -293,13 +293,13 @@ void RGBTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void RGBTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void RGBTool::slotColorSelectedFromTarget(const DColor &color) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 360eb913..a8d26c9a 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -648,7 +648,7 @@ void ImageEffect_Sharpen::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Refocus settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index 68d4ace8..63d571c7 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -693,7 +693,7 @@ void SharpenTool::slotLoadSettings() { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("\"%1\" is not a Photograph Refocus settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index 8dc0fcd8..3b3a0adb 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -113,7 +113,7 @@ DistortionFXTool::DistortionFXTool(TQObject* parent) m_effectType->insertItem(i18n("Tile")); m_effectType->setDefaultItem(DistortionFX::FishEye); TQWhatsThis::add( m_effectType, i18n("<p>Here, select the type of effect to apply to the image.<p>" - "<b>Fish Eyes</b>: warps the photograph around a 3D spherical tqshape to " + "<b>Fish Eyes</b>: warps the photograph around a 3D spherical shape to " "reproduce the common photograph 'Fish Eyes' effect.<p>" "<b>Twirl</b>: spins the photograph to produce a Twirl pattern.<p>" "<b>Cylinder Hor.</b>: warps the photograph around a horizontal cylinder.<p>" diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index 926b4672..c539ff87 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -117,7 +117,7 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent) m_effectType->insertItem( i18n("Unpolar Coordinates") ); m_effectType->insertItem( i18n("Tile") ); TQWhatsThis::add( m_effectType, i18n("<p>Here, select the type of effect to apply to the image.<p>" - "<b>Fish Eyes</b>: warps the photograph around a 3D spherical tqshape to " + "<b>Fish Eyes</b>: warps the photograph around a 3D spherical shape to " "reproduce the common photograph 'Fish Eyes' effect.<p>" "<b>Twirl</b>: spins the photograph to produce a Twirl pattern.<p>" "<b>Cylinder Hor.</b>: warps the photograph around a horizontal cylinder.<p>" diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp index 77fd86f1..35fa8f78 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.cpp +++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp @@ -91,7 +91,7 @@ TQString BlackFrameListViewItem::text(int column)const { // The image size. if (!m_imageSize.isEmpty()) - return (TQString("%1x%2").tqarg(m_imageSize.width()).tqarg(m_imageSize.height())); + return (TQString("%1x%2").arg(m_imageSize.width()).arg(m_imageSize.height())); break; } case 2: @@ -122,7 +122,7 @@ void BlackFrameListViewItem::slotParsed(TQValueList<HotPixel> hotPixels) m_blackFrameDesc = TQString("<p><b>" + m_blackFrameURL.fileName() + "</b>:<p>"); TQValueList <HotPixel>::Iterator end(m_hotPixels.end()); for (TQValueList <HotPixel>::Iterator it = m_hotPixels.begin() ; it != end ; ++it) - m_blackFrameDesc.append( TQString("[%1,%2] ").tqarg((*it).x()).tqarg((*it).y()) ); + m_blackFrameDesc.append( TQString("[%1,%2] ").arg((*it).x()).arg((*it).y()) ); emit parsed(m_hotPixels, m_blackFrameURL); } diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index c351e214..72af11f3 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -429,7 +429,7 @@ void ImageEffect_InPainting_Dialog::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Inpainting settings text file.") - .tqarg(loadInpaintingFile.fileName())); + .arg(loadInpaintingFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index a0a9fe58..a3f713b7 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -394,7 +394,7 @@ void InPaintingTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Inpainting settings text file.") - .tqarg(loadInpaintingFile.fileName())); + .arg(loadInpaintingFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index d274f752..0595d23b 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -91,7 +91,7 @@ void InsertTextWidget::resetEdit() // signal this needs to be filled by makePixmap m_textRect = TQRect(); makePixmap(); - tqrepaint(false); + repaint(false); } void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int alignMode, @@ -137,7 +137,7 @@ void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int al m_textFont = font; makePixmap(); - tqrepaint(false); + repaint(false); } void InsertTextWidget::setPositionHint(TQRect hint) @@ -146,10 +146,10 @@ void InsertTextWidget::setPositionHint(TQRect hint) m_positionHint = hint; if (m_textRect.isValid()) { - // tqinvalidate current position so that hint is certainly interpreted + // invalidate current position so that hint is certainly interpreted m_textRect = TQRect(); makePixmap(); - tqrepaint(); + repaint(); } } @@ -368,7 +368,7 @@ TQRect InsertTextWidget::composeImage(Digikam::DImg *image, TQPainter *destPaint y = TQMAX( (maxHeight - fontHeight) / 2, 0); } - // tqinvalidate position hint, use only once + // invalidate position hint, use only once m_positionHint = TQRect(); } else @@ -602,7 +602,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e ) m_textRect.moveBy(newxpos - m_xpos, newypos - m_ypos); makePixmap(); - tqrepaint(false); + repaint(false); m_xpos = newxpos; m_ypos = newypos; diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 87caaa3a..2e77c30b 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -492,7 +492,7 @@ void ImageEffect_NoiseReduction::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Noise Reduction settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index c42ca451..008483f4 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -477,7 +477,7 @@ void NoiseReductionTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Noise Reduction settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index 02db19df..57ce421a 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -180,7 +180,7 @@ void PerspectiveWidget::reset(void) m_antiAlias = true; updatePixmap(); - tqrepaint(false); + repaint(false); } void PerspectiveWidget::applyPerspectiveAdjustment(void) @@ -210,7 +210,7 @@ void PerspectiveWidget::slotToggleAntiAliasing(bool a) { m_antiAlias = a; updatePixmap(); - tqrepaint(false); + repaint(false); } void PerspectiveWidget::slotToggleDrawWhileMoving(bool draw) @@ -222,21 +222,21 @@ void PerspectiveWidget::slotToggleDrawGrid(bool grid) { m_drawGrid = grid; updatePixmap(); - tqrepaint(false); + repaint(false); } void PerspectiveWidget::slotChangeGuideColor(const TQColor &color) { m_guideColor = color; updatePixmap(); - tqrepaint(false); + repaint(false); } void PerspectiveWidget::slotChangeGuideSize(int size) { m_guideSize = size; updatePixmap(); - tqrepaint(false); + repaint(false); } void PerspectiveWidget::updatePixmap(void) @@ -705,7 +705,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e ) if (!m_drawWhileMoving) { updatePixmap(); - tqrepaint(false); + repaint(false); } } else @@ -713,7 +713,7 @@ void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e ) m_spot.setX(e->x()-m_rect.x()); m_spot.setY(e->y()-m_rect.y()); updatePixmap(); - tqrepaint(false); + repaint(false); } } @@ -818,7 +818,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) } updatePixmap(); - tqrepaint(false); + repaint(false); } } else diff --git a/digikam/imageplugins/perspective/triangle.cpp b/digikam/imageplugins/perspective/triangle.cpp index da4fb2cf..84f80a07 100644 --- a/digikam/imageplugins/perspective/triangle.cpp +++ b/digikam/imageplugins/perspective/triangle.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-01-18 - * Description : triangle tqgeometry calculation class. + * Description : triangle geometry calculation class. * * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * diff --git a/digikam/imageplugins/perspective/triangle.h b/digikam/imageplugins/perspective/triangle.h index 2754c4cd..27fcc087 100644 --- a/digikam/imageplugins/perspective/triangle.h +++ b/digikam/imageplugins/perspective/triangle.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-01-18 - * Description : triangle tqgeometry calculation class. + * Description : triangle geometry calculation class. * * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index f2419191..994f7f46 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -310,7 +310,7 @@ void ImageEffect_Restoration::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Restoration settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 1d5792bf..810083aa 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -317,7 +317,7 @@ void RestorationTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Restoration settings text file.") - .tqarg(loadRestorationFile.fileName())); + .arg(loadRestorationFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index 743491ee..7994db40 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -82,7 +82,7 @@ void SuperImposeWidget::resetEdit(void) m_currentSelection = TQRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, m_rect.width(), m_rect.height()); makePixmap(); - tqrepaint(false); + repaint(false); } void SuperImposeWidget::makePixmap(void) @@ -236,7 +236,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) m_currentSelection = selection; makePixmap(); - tqrepaint(false); + repaint(false); return true; } @@ -297,7 +297,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e ) moveSelection(newxpos - m_xpos, newypos - m_ypos); makePixmap(); - tqrepaint(false); + repaint(false); m_xpos = newxpos; m_ypos = newypos; diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 8a4e10dc..94ce53a9 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -563,7 +563,7 @@ void ImageEffect_WhiteBalance::slotColorSelectedFromTarget( const Digikam::DColo void ImageEffect_WhiteBalance::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_WhiteBalance::slotChannelChanged(int channel) @@ -591,7 +591,7 @@ void ImageEffect_WhiteBalance::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void ImageEffect_WhiteBalance::slotAutoAdjustExposure() @@ -784,7 +784,7 @@ void ImageEffect_WhiteBalance::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a White Color Balance settings text file.") - .tqarg(loadWhiteBalanceFile.fileName())); + .arg(loadWhiteBalanceFile.fileName())); file.close(); return; } diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 069c4046..36c3fcc6 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -568,7 +568,7 @@ void WhiteBalanceTool::slotColorSelectedFromTarget(const DColor& color) void WhiteBalanceTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void WhiteBalanceTool::slotChannelChanged(int channel) @@ -596,7 +596,7 @@ void WhiteBalanceTool::slotChannelChanged(int channel) break; } - m_histogramWidget->tqrepaint(false); + m_histogramWidget->repaint(false); } void WhiteBalanceTool::slotAutoAdjustExposure() @@ -794,7 +794,7 @@ void WhiteBalanceTool::slotLoadSettings() { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a White Color Balance settings text file.") - .tqarg(loadWhiteBalanceFile.fileName())); + .arg(loadWhiteBalanceFile.fileName())); file.close(); return; } diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 35754de1..0e85f6af 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -225,14 +225,14 @@ void kio_digikamalbums::special(const TQByteArray& data) urlWithTrailingSlash = kurl.path(1); m_sqlDB.execSql(TQString("SELECT DISTINCT id, url FROM Albums WHERE url='%1' OR url LIKE '%2\%';") - .tqarg(escapeString(url)).tqarg(escapeString(urlWithTrailingSlash)), &albumvalues); + .arg(escapeString(url)).arg(escapeString(urlWithTrailingSlash)), &albumvalues); } else { // Search for albums m_sqlDB.execSql(TQString("SELECT DISTINCT id, url FROM Albums WHERE url='%1';") - .tqarg(escapeString(url)), &albumvalues); + .arg(escapeString(url)), &albumvalues); } TQDataStream* os = new TQDataStream(ba, IO_WriteOnly); @@ -263,7 +263,7 @@ void kio_digikamalbums::special(const TQByteArray& data) values.clear(); m_sqlDB.execSql(TQString("SELECT id, name, datetime FROM Images " "WHERE dirid = %1;") - .tqarg(albumid), &values); + .arg(albumid), &values); // Loop over all images in each album (specified by its albumid). for (TQStringList::iterator it = values.begin(); it != values.end();) @@ -484,7 +484,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo if (album.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .tqarg(url.directory())); + .arg(url.directory())); return; } @@ -577,7 +577,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo { // couldn't chmod. Eat the error if the filesystem apparently doesn't support it. if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) ) - warning( i18n( "Could not change permissions for\n%1" ).tqarg( url.url() ) ); + warning( i18n( "Could not change permissions for\n%1" ).arg( url.url() ) ); } } @@ -649,7 +649,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if (srcAlbum.id == -1) { error(KIO::ERR_UNKNOWN, TQString("Source album %1 not found in database") - .tqarg(src.directory())); + .arg(src.directory())); return; } @@ -658,7 +658,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if (dstAlbum.id == -1) { error(KIO::ERR_UNKNOWN, TQString("Destination album %1 not found in database") - .tqarg(dst.directory())); + .arg(dst.directory())); return; } @@ -670,12 +670,12 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o // copy metadata of album to destination album m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', " "collection='%3', icon=%4 ") - .tqarg(srcAlbum.date.toString(Qt::ISODate), + .arg(srcAlbum.date.toString(Qt::ISODate), escapeString(srcAlbum.caption), escapeString(srcAlbum.collection), TQString::number(srcAlbum.icon)) + TQString( " WHERE id=%1" ) - .tqarg(dstAlbum.id) ); + .arg(dstAlbum.id) ); finished(); return; } @@ -833,7 +833,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o { // Eat the error if the filesystem apparently doesn't support chmod. if ( KIO::testFileSystemFlag( _dst, KIO::SupportsChmod ) ) - warning( i18n( "Could not change permissions for\n%1" ).tqarg( dst.url() ) ); + warning( i18n( "Could not change permissions for\n%1" ).arg( dst.url() ) ); } } @@ -844,7 +844,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o if ( ::utime( _dst.data(), &ut ) != 0 ) { kdWarning() << TQString::fromLatin1("Couldn't preserve access and modification time for\n%1") - .tqarg( dst.url() ) << endl; + .arg( dst.url() ) << endl; } // now copy the metadata over @@ -880,8 +880,8 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite i18n("Source and Destination have different Album Library Paths.\n" "Source: %1\n" "Destination: %2") - .tqarg(src.user()) - .tqarg(dst.user())); + .arg(src.user()) + .arg(dst.user())); return; } @@ -940,7 +940,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite if (srcAlbum.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .tqarg(src.url())); + .arg(src.url())); return; } } @@ -950,7 +950,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite if (srcAlbum.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .tqarg(src.directory())); + .arg(src.directory())); return; } @@ -958,7 +958,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite if (dstAlbum.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Destination album %1 not found in database") - .tqarg(dst.directory())); + .arg(dst.directory())); return; } } @@ -1123,7 +1123,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) // code similar to AlbumDB::addAlbum m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) " "VALUES('%1','%2')") - .tqarg(escapeString(url.path()), + .arg(escapeString(url.path()), TQDate::currentDate().toString(Qt::ISODate)) ); if ( permissions != -1 ) @@ -1210,7 +1210,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) if (album.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .tqarg(url.directory())); + .arg(url.directory())); return; } @@ -1238,7 +1238,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) if (album.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .tqarg(url.path())); + .arg(url.path())); return; } @@ -1402,7 +1402,7 @@ AlbumInfo kio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExists) m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") - .tqarg(escapeString(url), + .arg(escapeString(url), fi.lastModified().date().toString(Qt::ISODate))); album.id = m_sqlDB.lastInsertedRow(); @@ -1420,7 +1420,7 @@ void kio_digikamalbums::delAlbum(int albumID) { // code duplication from AlbumDB::deleteAlbum m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE id='%1'") - .tqarg(albumID)); + .arg(albumID)); } void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newURL) @@ -1429,13 +1429,13 @@ void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newU // first update the url of the album which was renamed m_sqlDB.execSql( TQString("UPDATE Albums SET url='%1' WHERE url='%2'") - .tqarg(escapeString(newURL), + .arg(escapeString(newURL), escapeString(oldURL))); // now find the list of all subalbums which need to be updated TQStringList values; m_sqlDB.execSql( TQString("SELECT url FROM Albums WHERE url LIKE '%1/%';") - .tqarg(oldURL), &values ); + .arg(oldURL), &values ); // and update their url TQString newChildURL; @@ -1444,7 +1444,7 @@ void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newU newChildURL = *it; newChildURL.replace(oldURL, newURL); m_sqlDB.execSql(TQString("UPDATE Albums SET url='%1' WHERE url='%2'") - .tqarg(escapeString(newChildURL), + .arg(escapeString(newChildURL), escapeString(*it))); } } @@ -1456,8 +1456,8 @@ bool kio_digikamalbums::findImage(int albumID, const TQString& name) const m_sqlDB.execSql( TQString("SELECT name FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(name)), + .arg(albumID) + .arg(escapeString(name)), &values ); return !(values.isEmpty()); @@ -1517,7 +1517,7 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) m_sqlDB.execSql(TQString("REPLACE INTO Images " "(dirid, name, datetime, caption) " "VALUES(%1, '%2', '%3', '%4')") - .tqarg(TQString::number(albumID), + .arg(TQString::number(albumID), escapeString(TQFileInfo(filePath).fileName()), datetime.toString(Qt::ISODate), escapeString(comment))); @@ -1530,9 +1530,9 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) m_sqlDB.execSql(TQString("REPLACE INTO ImageProperties " "(imageid, property, value) " "VALUES(%1, '%2', '%3');") - .tqarg(imageID) - .tqarg("Rating") - .tqarg(rating) ); + .arg(imageID) + .arg("Rating") + .arg(rating) ); } // Set existing tags in database or create new tags if not exist. @@ -1620,8 +1620,8 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) // from AlbumDB::addItemTag m_sqlDB.execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .tqarg(imageID) - .tqarg((*tag).id) ); + .arg(imageID) + .arg((*tag).id) ); foundTag = true; break; } @@ -1683,8 +1683,8 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) // from AlbumDB::addTag m_sqlDB.execSql( TQString("INSERT INTO Tags (pid, name, icon) " "VALUES( %1, '%2', 0)") - .tqarg(parentTagID) - .tqarg(escapeString(*tagName))); + .arg(parentTagID) + .arg(escapeString(*tagName))); tagID = m_sqlDB.lastInsertedRow(); if (tagID == -1) @@ -1707,8 +1707,8 @@ void kio_digikamalbums::addImage(int albumID, const TQString& filePath) // from AlbumDB::addItemTag m_sqlDB.execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .tqarg(imageID) - .tqarg(tagID) ); + .arg(imageID) + .arg(tagID) ); } } } @@ -1719,8 +1719,8 @@ void kio_digikamalbums::delImage(int albumID, const TQString& name) // code duplication from AlbumDB::deleteItem m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(albumID) - .tqarg(escapeString(name)) ); + .arg(albumID) + .arg(escapeString(name)) ); } void kio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName, @@ -1730,13 +1730,13 @@ void kio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName, // first delete any stale entries for the destination file m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(newAlbumID) - .tqarg(escapeString(newName)) ); + .arg(newAlbumID) + .arg(escapeString(newName)) ); // now update the dirid and/or name of the file m_sqlDB.execSql( TQString("UPDATE Images SET dirid=%1, name='%2' " "WHERE dirid=%3 AND name='%4';") - .tqarg(TQString::number(newAlbumID), + .arg(TQString::number(newAlbumID), escapeString(newName), TQString::number(oldAlbumID), escapeString(oldName)) ); @@ -1757,13 +1757,13 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, TQStringList values; m_sqlDB.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()) { error(KIO::ERR_UNKNOWN, i18n("Source image %1 not found in database") - .tqarg(srcName)); + .arg(srcName)); return; } @@ -1772,13 +1772,13 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, // first delete any stale entries for the destination file m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .tqarg(TQString::number(dstAlbumID), escapeString(dstName)) ); + .arg(TQString::number(dstAlbumID), escapeString(dstName)) ); // copy entry in Images table m_sqlDB.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 = m_sqlDB.lastInsertedRow(); @@ -1787,13 +1787,13 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, m_sqlDB.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) m_sqlDB.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)) ); } void kio_digikamalbums::scanAlbum(const TQString& url) @@ -1860,7 +1860,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url) TQFileInfo fi(m_libraryPath + *it); m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") - .tqarg(escapeString(*it), + .arg(escapeString(*it), fi.lastModified().date().toString(Qt::ISODate))); scanAlbum(*it); @@ -1874,7 +1874,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url) TQStringList values; m_sqlDB.execSql( TQString("SELECT id FROM Albums WHERE url='%1'") - .tqarg(escapeString(url)), &values ); + .arg(escapeString(url)), &values ); if (values.isEmpty()) return; @@ -1882,7 +1882,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url) TQStringList currItemList; m_sqlDB.execSql( TQString("SELECT name FROM Images WHERE dirid=%1") - .tqarg(albumID), &currItemList ); + .arg(albumID), &currItemList ); const TQFileInfoList* infoList = dir.entryInfoList(TQDir::Files); if (!infoList) @@ -1939,7 +1939,7 @@ void kio_digikamalbums::removeInvalidAlbums() kdDebug() << "Deleted Album: " << *it << endl; m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE url='%1'") - .tqarg(escapeString(*it))); + .arg(escapeString(*it))); } m_sqlDB.execSql("COMMIT TRANSACTION"); diff --git a/digikam/kioslave/digikamdates.cpp b/digikam/kioslave/digikamdates.cpp index 876051f0..7ef9c5be 100644 --- a/digikam/kioslave/digikamdates.cpp +++ b/digikam/kioslave/digikamdates.cpp @@ -195,10 +195,10 @@ void kio_digikamdates::special(const TQByteArray& data) "AND Images.datetime >= '%3-%4-01' \n " "AND Albums.id=Images.dirid \n " "ORDER BY Albums.id;") - .tqarg(yrEnd, 4) - .tqarg(moEndStr, 2) - .tqarg(yrStart, 4) - .tqarg(moStartStr, 2), + .arg(yrEnd, 4) + .arg(moEndStr, 2) + .arg(yrStart, 4) + .arg(moStartStr, 2), &values, false); TQ_LLONG imageid; diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index d4aa0580..03b98e88 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -661,8 +661,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, return query; query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ") - .tqarg(date.addDays(-1).toString(Qt::ISODate)) - .tqarg(date.addDays( 1).toString(Qt::ISODate)); + .arg(date.addDays(-1).toString(Qt::ISODate)) + .arg(date.addDays( 1).toString(Qt::ISODate)); } return query; @@ -711,7 +711,7 @@ TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const if (1970 <= num && num <= TQDate::currentDate().year()) { // very sure its a year - return TQString("%1-%-%").tqarg(num); + return TQString("%1-%-%").arg(num); } } else diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp index c2c931ed..014b18b8 100644 --- a/digikam/kioslave/digikamtags.cpp +++ b/digikam/kioslave/digikamtags.cpp @@ -195,8 +195,8 @@ void kio_digikamtagsProtocol::special(const TQByteArray& data) " WHERE tagid=%1 \n " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)) \n " " AND Albums.id=Images.dirid \n " ) - .tqarg(tagID) - .tqarg(tagID), &values ); + .arg(tagID) + .arg(tagID), &values ); } else { @@ -208,7 +208,7 @@ void kio_digikamtagsProtocol::special(const TQByteArray& data) " (SELECT imageid FROM ImageTags \n " " WHERE tagid=%1) \n " " AND Albums.id=Images.dirid \n " ) - .tqarg(tagID), &values ); + .arg(tagID), &values ); } TQ_LLONG imageid; diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index cc86b8e4..33ba573f 100644 --- a/digikam/kioslave/digikamthumbnail.cpp +++ b/digikam/kioslave/digikamthumbnail.cpp @@ -179,7 +179,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (img.isNull()) { error(KIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1") - .tqarg(url.prettyURL())); + .arg(url.prettyURL())); kdWarning() << "Cannot create thumbnail for " << url.path() << endl; return; } @@ -512,7 +512,7 @@ bool kio_digikamthumbnailProtocol::loadDImg(TQImage& image, const TQString& path if ( TQMAX(org_width_, org_height_) != cachedSize_ ) { TQSize sz(dimg_im.width(), dimg_im.height()); - sz.tqscale(cachedSize_, cachedSize_, TQSize::ScaleMin); + sz.scale(cachedSize_, cachedSize_, TQSize::ScaleMin); image.scale(sz.width(), sz.height()); } diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp index 7eb6aefe..063a65d6 100644 --- a/digikam/kioslave/sqlitedb.cpp +++ b/digikam/kioslave/sqlitedb.cpp @@ -166,8 +166,8 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values, void SqliteDB::setSetting( const TQString& keyword, const TQString& value ) { execSql( TQString("REPLACE into Settings VALUES ('%1','%2');") - .tqarg( escapeString(keyword) ) - .tqarg( escapeString(value) )); + .arg( escapeString(keyword) ) + .arg( escapeString(value) )); } TQString SqliteDB::getSetting( const TQString& keyword ) @@ -175,7 +175,7 @@ TQString SqliteDB::getSetting( const TQString& keyword ) TQStringList values; execSql( TQString("SELECT value FROM Settings " "WHERE keyword='%1';") - .tqarg(escapeString(keyword)), + .arg(escapeString(keyword)), &values ); if (values.isEmpty()) diff --git a/digikam/libs/curves/imagecurves.cpp b/digikam/libs/curves/imagecurves.cpp index 46115958..c5e067eb 100644 --- a/digikam/libs/curves/imagecurves.cpp +++ b/digikam/libs/curves/imagecurves.cpp @@ -288,7 +288,7 @@ float ImageCurves::curvesLutFunc(int n_channels, int channel, float value) void ImageCurves::curvesPlotCurve(int channel, int p1, int p2, int p3, int p4) { - CRMatrix tqgeometry; + CRMatrix geometry; CRMatrix tmp1, tmp2; CRMatrix deltas; double x, dx, dx2, dx3; @@ -301,20 +301,20 @@ void ImageCurves::curvesPlotCurve(int channel, int p1, int p2, int p3, int p4) if (!d->curves) return; - // Construct the tqgeometry matrix from the segment. + // Construct the geometry matrix from the segment. for (i = 0 ; i < 4 ; i++) { - tqgeometry[i][2] = 0; - tqgeometry[i][3] = 0; + geometry[i][2] = 0; + geometry[i][3] = 0; } for (i = 0 ; i < 2 ; i++) { - tqgeometry[0][i] = d->curves->points[channel][p1][i]; - tqgeometry[1][i] = d->curves->points[channel][p2][i]; - tqgeometry[2][i] = d->curves->points[channel][p3][i]; - tqgeometry[3][i] = d->curves->points[channel][p4][i]; + geometry[0][i] = d->curves->points[channel][p1][i]; + geometry[1][i] = d->curves->points[channel][p2][i]; + geometry[2][i] = d->curves->points[channel][p3][i]; + geometry[3][i] = d->curves->points[channel][p4][i]; } // Subdivide the curve 1000 times. @@ -331,9 +331,9 @@ void ImageCurves::curvesPlotCurve(int channel, int p1, int p2, int p3, int p4) tmp2[2][0] = 6*d3; tmp2[2][1] = 2*d2; tmp2[2][2] = 0; tmp2[2][3] = 0; tmp2[3][0] = 6*d3; tmp2[3][1] = 0; tmp2[3][2] = 0; tmp2[3][3] = 0; - // Compose the basis and tqgeometry matrices. + // Compose the basis and geometry matrices. - curvesCRCompose(CR_basis, tqgeometry, tmp1); + curvesCRCompose(CR_basis, geometry, tmp1); // Compose the above results to get the deltas matrix. diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui index 6eaa7960..52bec31c 100644 --- a/digikam/libs/dialogs/deletedialogbase.ui +++ b/digikam/libs/dialogs/deletedialogbase.ui @@ -75,7 +75,7 @@ <property name="text"> <string>Deletion method placeholder, never shown to user.</string> </property> - <property name="tqalignment" stdset="0"> + <property name="alignment" stdset="0"> <string>WordBreak|AlignCenter</string> </property> </widget> @@ -104,7 +104,7 @@ <property name="text"> <string>Placeholder for number of files, not in GUI</string> </property> - <property name="tqalignment" stdset="0"> + <property name="alignment" stdset="0"> <string>AlignVCenter|AlignRight</string> </property> </widget> diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index a3e47216..62ec2188 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -192,7 +192,7 @@ void ImageDialogPreview::showPreview(const KURL& url) else exposureTime = info.exposureTime; if (info.sensitivity.isEmpty()) sensitivity = unavailable; - else sensitivity = i18n("%1 ISO").tqarg(info.sensitivity); + else sensitivity = i18n("%1 ISO").arg(info.sensitivity); identify = "<table cellspacing=0 cellpadding=0>"; identify += cellBeg + i18n("Make:") + cellMid + make + cellEnd; @@ -281,7 +281,7 @@ ImageDialog::ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect, c // Added RAW file formats supported by dcraw program like a type mime. // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete // or unavailable (see file #121242 in B.K.O). - patternList.append(i18n("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); + patternList.append(i18n("\n%1|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); } #else allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" *.JPE *.TIF")); @@ -290,7 +290,7 @@ ImageDialog::ImageDialog(TQWidget* parent, const KURL &url, bool singleSelect, c // Added RAW file formats supported by dcraw program like a type mime. // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete // or unavailable (see file #121242 in B.K.O). - patternList.append(i18n("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::KDcraw::rawFiles()))); + patternList.append(i18n("\n%1|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles()))); #endif d->fileformats = patternList.join("\n"); diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index 705b2701..3688a1f5 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -107,12 +107,12 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent) header->setText(i18n("<p>Using KDcraw library version %1" "<p>Using Dcraw program version %2" "<p>%3 models in the list") - .tqarg(KDcrawVer).tqarg(dcrawVer).tqarg(list.count())); + .arg(KDcrawVer).arg(dcrawVer).arg(list.count())); #else header->setText(i18n("<p>Using KDcraw library version %1" "<p>Using LibRaw version %2" "<p>%3 models in the list") - .tqarg(KDcrawVer).tqarg(librawVer).tqarg(list.count())); + .arg(KDcrawVer).arg(librawVer).arg(list.count())); #endif // -------------------------------------------------------- diff --git a/digikam/libs/dimg/dimgscale.cpp b/digikam/libs/dimg/dimgscale.cpp index 696554f3..850e36de 100644 --- a/digikam/libs/dimg/dimgscale.cpp +++ b/digikam/libs/dimg/dimgscale.cpp @@ -113,7 +113,7 @@ DImg DImg::smoothScale(int dw, int dh, TQSize::ScaleMode scaleMode) return DImg(); TQSize newSize(w, h); - newSize.tqscale( TQSize(dw, dh), scaleMode ); + newSize.scale( TQSize(dw, dh), scaleMode ); if (!newSize.isValid()) return DImg(); diff --git a/digikam/libs/dimg/loaders/jp2kloader.cpp b/digikam/libs/dimg/loaders/jp2kloader.cpp index 12169575..e485b134 100644 --- a/digikam/libs/dimg/loaders/jp2kloader.cpp +++ b/digikam/libs/dimg/loaders/jp2kloader.cpp @@ -195,7 +195,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) } // ------------------------------------------------------------------- - // Check image tqgeometry. + // Check image geometry. imageWidth() = jas_image_width(jp2_image); imageHeight() = jas_image_height(jp2_image); diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp index d84367ea..ac1fcf83 100644 --- a/digikam/libs/dimg/loaders/pngloader.cpp +++ b/digikam/libs/dimg/loaders/pngloader.cpp @@ -628,7 +628,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) software.append(digikam_version); TQString libpngver(PNG_HEADER_VERSION_STRING); libpngver.replace('\n', ' '); - software.append(TQString(" (%1)").tqarg(libpngver)); + software.append(TQString(" (%1)").arg(libpngver)); png_text text; text.key = (png_charp)("Software"); text.text = (char *)software.ascii(); diff --git a/digikam/libs/dimg/loaders/tiffloader.cpp b/digikam/libs/dimg/loaders/tiffloader.cpp index 024692be..2e554143 100644 --- a/digikam/libs/dimg/loaders/tiffloader.cpp +++ b/digikam/libs/dimg/loaders/tiffloader.cpp @@ -572,7 +572,7 @@ bool TIFFLoader::save(const TQString& filePath, DImgLoaderObserver *observer) TQString soft = metaData.getExifTagString("Exif.Image.Software"); TQString libtiffver(TIFFLIB_VERSION_STR); libtiffver.replace('\n', ' '); - soft.append(TQString(" ( %1 )").tqarg(libtiffver)); + soft.append(TQString(" ( %1 )").arg(libtiffver)); TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii()); // NOTE: All others Exif tags will be written by Exiv2 (<= 0.18) diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h index 3589f7a7..e240f998 100644 --- a/digikam/libs/greycstoration/CImg.h +++ b/digikam/libs/greycstoration/CImg.h @@ -6773,8 +6773,8 @@ namespace cimg_library { then this image is displayed in the current display window. \param list : The list of images to display. \param axis : The axis used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'. - \param align : Defines the relative tqalignment of images when displaying images of different sizes. - Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment). + \param align : Defines the relative alignment of images when displaying images of different sizes. + Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment). **/ template<typename T> CImgDisplay& display(const CImgList<T>& list, const char axis='x', const char align='p') { @@ -14041,7 +14041,7 @@ namespace cimg_library { //! Resize an image. /** - \param src Image giving the tqgeometry of the resize. + \param src Image giving the geometry of the resize. \param interpolation_type Interpolation method : - 1 = raw memory - 0 = no interpolation : additional space is filled with 0. @@ -14067,7 +14067,7 @@ namespace cimg_library { //! Resize an image. /** - \param disp = Display giving the tqgeometry of the resize. + \param disp = Display giving the geometry of the resize. \param interpolation_type = Resizing type : - 0 = no interpolation : additional space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -16021,7 +16021,7 @@ namespace cimg_library { return CImg<Tfloat>(*this,false).distance_hamilton(nb_iter,band_size,precision); } - //! Compute the Euclidean distance map to a tqshape of specified isovalue. + //! Compute the Euclidean distance map to a shape of specified isovalue. CImg<T>& distance(const T isovalue, const float sizex=1, const float sizey=1, const float sizez=1, const bool compute_sqrt=true) { @@ -25481,7 +25481,7 @@ namespace cimg_library { \param sharpness Contour preservation. \param anisotropy Smoothing anisotropy. \param alpha Image pre-blurring (gaussian). - \param sigma Regularity of the tensor-valued tqgeometry. + \param sigma Regularity of the tensor-valued geometry. \param dl Spatial discretization. \param da Angular discretization. \param gauss_prec Precision of the gaussian function. @@ -27671,13 +27671,13 @@ namespace cimg_library { return *this; } - //! Simple interface to select a tqshape from an image. + //! Simple interface to select a shape from an image. /** \param selection Array of 6 values containing the selection result - \param coords_type Determine tqshape type to select (0=point, 1=vector, 2=rectangle, 3=circle) + \param coords_type Determine shape type to select (0=point, 1=vector, 2=rectangle, 3=circle) \param disp Display window used to make the selection \param XYZ Initial XYZ position (for volumetric images only) - \param color Color of the tqshape selector. + \param color Color of the shape selector. **/ CImg<T>& select(CImgDisplay &disp, const int select_type=2, unsigned int *const XYZ=0, @@ -27685,21 +27685,21 @@ namespace cimg_library { return get_select(disp,select_type,XYZ,color).transfer_to(*this); } - //! Simple interface to select a tqshape from an image. + //! Simple interface to select a shape from an image. CImg<T>& select(const char *const title, const int select_type=2, unsigned int *const XYZ=0, const unsigned char *const color=0) { return get_select(title,select_type,XYZ,color).transfer_to(*this); } - //! Simple interface to select a tqshape from an image. + //! Simple interface to select a shape from an image. CImg<intT> get_select(CImgDisplay &disp, const int select_type=2, unsigned int *const XYZ=0, const unsigned char *const color=0) const { return _get_select(disp,0,select_type,XYZ,color,0,0,0); } - //! Simple interface to select a tqshape from an image. + //! Simple interface to select a shape from an image. CImg<intT> get_select(const char *const title, const int select_type=2, unsigned int *const XYZ=0, const unsigned char *const color=0) const { @@ -27737,11 +27737,11 @@ namespace cimg_library { oX = X, oY = Y, oZ = Z; unsigned int old_button = 0, key = 0; - bool tqshape_selected = false, text_down = false; + bool shape_selected = false, text_down = false; CImg<ucharT> visu, visu0; char text[1024] = { 0 }; - while (!key && !disp.is_closed && !tqshape_selected) { + while (!key && !disp.is_closed && !shape_selected) { // Handle mouse motion and selection oX = X; oY = Y; oZ = Z; @@ -27837,10 +27837,10 @@ namespace cimg_library { } if (phase) { - if (!coords_type) tqshape_selected = phase?true:false; + if (!coords_type) shape_selected = phase?true:false; else { - if (depth>1) tqshape_selected = (phase==3)?true:false; - else tqshape_selected = (phase==2)?true:false; + if (depth>1) shape_selected = (phase==3)?true:false; + else shape_selected = (phase==2)?true:false; } } @@ -27986,7 +27986,7 @@ namespace cimg_library { } if (phase || (mx>=0 && my>=0)) visu.draw_text(0,text_down?visu.dimy()-11:0,text,foreground_color,background_color,0.7f,11); disp.display(visu).wait(25); - } else if (!tqshape_selected) disp.wait(); + } else if (!shape_selected) disp.wait(); if (disp.is_resized) { disp.resize(false); old_is_resized = true; disp.is_resized = false; visu0.assign(); } } @@ -27994,7 +27994,7 @@ namespace cimg_library { // Return result CImg<intT> res(1,6,1,1,-1); if (XYZ) { XYZ[0] = (unsigned int)X0; XYZ[1] = (unsigned int)Y0; XYZ[2] = (unsigned int)Z0; } - if (tqshape_selected) { + if (shape_selected) { if (coords_type==2) { if (X0>X1) cimg::swap(X0,X1); if (Y0>Y1) cimg::swap(Y0,Y1); @@ -34714,7 +34714,7 @@ namespace cimg_library { //! Return a single image which is the concatenation of all images of the current CImgList instance. /** \param axis : specify the axis for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A CImg<T> image corresponding to the concatenation is returned. **/ CImg<T> get_append(const char axis, const char align='p') const { @@ -35041,7 +35041,7 @@ namespace cimg_library { The function returns immediately. \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed. \param axis : specify the axis for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgList instance is returned. **/ const CImgList<T>& display(CImgDisplay& disp, const char axis='x', const char align='p') const { @@ -35056,7 +35056,7 @@ namespace cimg_library { The function returns when a key is pressed or the display window is closed by the user. \param title : specify the title of the opening display window. \param axis : specify the axis for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgList instance is returned. **/ const CImgList<T>& display(CImgDisplay &disp, diff --git a/digikam/libs/greycstoration/greycstorationiface.cpp b/digikam/libs/greycstoration/greycstorationiface.cpp index 6b866a6e..4f6c703b 100644 --- a/digikam/libs/greycstoration/greycstorationiface.cpp +++ b/digikam/libs/greycstoration/greycstorationiface.cpp @@ -48,7 +48,7 @@ #include <pthread.h> #endif -/** Number of tqchildren threads used to run Greystoration algorithm +/** Number of children threads used to run Greystoration algorithm For the moment we use only one thread. See B.K.O #186642 for details. Multithreading management need to be fixed into CImg. */ diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 52891cd9..473de224 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -399,8 +399,8 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, date.setTime_t(itemInfo->mtime); d->labelFileDate->setText(KGlobal::locale()->formatDateTime(date, true, true)); - str = i18n("%1 (%2)").tqarg(KIO::convertSize(itemInfo->size)) - .tqarg(KGlobal::locale()->formatNumber(itemInfo->size, 0)); + str = i18n("%1 (%2)").arg(KIO::convertSize(itemInfo->size)) + .arg(KGlobal::locale()->formatNumber(itemInfo->size, 0)); d->labelFileSize->setText(str); // -- Image Properties -------------------------------------------------- @@ -439,7 +439,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, } mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? unknown : i18n("%1x%2 (%3Mpx)") - .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); + .arg(dims.width()).arg(dims.height()).arg(mpixels); d->labelImageDimensions->setText(str); // -- Download information ------------------------------------------ @@ -529,12 +529,12 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, d->labelPhotoFocalLenght->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); else { - str = i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm); + str = i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); d->labelPhotoFocalLenght->setText(str); } d->labelPhotoExposureTime->setText(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime); - d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity)); + d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity)); if (photoInfo.exposureMode.isEmpty() && photoInfo.exposureProgram.isEmpty()) d->labelPhotoExposureMode->setText(unavailable); @@ -544,7 +544,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, d->labelPhotoExposureMode->setText(photoInfo.exposureProgram); else { - str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); + str = TQString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); d->labelPhotoExposureMode->setText(str); } diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 32c24e8c..24394793 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -1105,20 +1105,20 @@ void ImageDescEditTab::tagDelete(TAlbum *album) "tag '%1' that you are about to delete. " "You will need to apply change first " "if you want to delete the tag." ) - .tqarg(album->title())); + .arg(album->title())); return; } // find number of subtags - int tqchildren = 0; + int children = 0; AlbumIterator iter(album); while(iter.current()) { - tqchildren++; + children++; ++iter; } - if(tqchildren) + if(children) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -1129,7 +1129,7 @@ void ImageDescEditTab::tagDelete(TAlbum *album) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - tqchildren).tqarg(album->title())); + children).arg(album->title())); if(result != KMessageBox::Continue) return; @@ -1143,11 +1143,11 @@ void ImageDescEditTab::tagDelete(TAlbum *album) "Do you want to continue?", "Tag '%1' is assigned to %n items. " "Do you want to continue?", - assignedItems.count()).tqarg(album->title()); + assignedItems.count()).arg(album->title()); } else { - message = i18n("Delete '%1' tag?").tqarg(album->title()); + message = i18n("Delete '%1' tag?").arg(album->title()); } int result = KMessageBox::warningContinueCancel(this, message, @@ -1578,7 +1578,7 @@ void ImageDescEditTab::slotTagsSearchChanged(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(tag); while (it.current()) { @@ -1672,7 +1672,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) } // correct visibilities afterwards: - // As TQListViewItem::setVisible works recursively on all it's tqchildren + // As TQListViewItem::setVisible works recursively on all it's children // we have to correct this if (t) { @@ -1685,7 +1685,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) { if (!tag->isRoot()) { - // only if the current item is not marked as tagged, check all tqchildren + // only if the current item is not marked as tagged, check all children MetadataHub::TagStatus status = d->hub.tagStatus(item->album()); bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag) || status == MetadataHub::MetadataDisjoint; diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 74546812..60430d7a 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -664,14 +664,14 @@ void ImagePropertiesColorsTab::slotChannelChanged(int channel) break; } - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); updateStatistiques(); } void ImagePropertiesColorsTab::slotScaleChanged(int scale) { d->histogramWidget->m_scaleType = scale; - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); } void ImagePropertiesColorsTab::slotColorsChanged(int color) @@ -691,14 +691,14 @@ void ImagePropertiesColorsTab::slotColorsChanged(int color) break; } - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); updateStatistiques(); } void ImagePropertiesColorsTab::slotRenderingChanged(int rendering) { d->histogramWidget->m_renderingType = rendering; - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); updateStatistiques(); } diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index f2f6350e..ee2545ef 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -425,11 +425,11 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); d->labelFileModifiedDate->setText(str); - str = TQString("%1 (%2)").tqarg(KIO::convertSize(fi.size())) - .tqarg(KGlobal::locale()->formatNumber(fi.size(), 0)); + str = TQString("%1 (%2)").arg(KIO::convertSize(fi.size())) + .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); d->labelFileSize->setText(str); - d->labelFileOwner->setText( TQString("%1 - %2").tqarg(fi.user()).tqarg(fi.group()) ); + d->labelFileOwner->setText( TQString("%1 - %2").arg(fi.user()).arg(fi.group()) ); d->labelFilePermissions->setText( fi.permissionsString() ); // -- Image Properties -------------------------------------------------- @@ -464,7 +464,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) TQString quality = meta.group("Jpeg EXIF Data").item("JPEG quality").value().toString(); quality.isEmpty() ? compression = unavailable : - compression = i18n("JPEG quality %1").tqarg(quality); + compression = i18n("JPEG quality %1").arg(quality); bitDepth = meta.group("Jpeg EXIF Data").item("BitDepth").value().toString(); colorMode = meta.group("Jpeg EXIF Data").item("ColorMode").value().toString(); } @@ -498,10 +498,10 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) 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); d->labelImageDimensions->setText(str); d->labelImageCompression->setText(compression.isEmpty() ? unavailable : compression); - d->labelImageBitDepth->setText(bitDepth.isEmpty() ? unavailable : i18n("%1 bpp").tqarg(bitDepth)); + d->labelImageBitDepth->setText(bitDepth.isEmpty() ? unavailable : i18n("%1 bpp").arg(bitDepth)); d->labelImageColorMode->setText(colorMode.isEmpty() ? unavailable : colorMode); // -- Photograph information ------------------------------------------ @@ -575,12 +575,12 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) d->labelPhotoFocalLenght->setText(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); else { - str = i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm); + str = i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); d->labelPhotoFocalLenght->setText(str); } d->labelPhotoExposureTime->setText(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime); - d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity)); + d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity)); if (photoInfo.exposureMode.isEmpty() && photoInfo.exposureProgram.isEmpty()) d->labelPhotoExposureMode->setText(unavailable); @@ -590,7 +590,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) d->labelPhotoExposureMode->setText(photoInfo.exposureProgram); else { - str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); + str = TQString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); d->labelPhotoExposureMode->setText(str); } diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index fef26449..2ca4a776 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -97,7 +97,7 @@ void TAlbumCheckListItem::refresh() dynamic_cast<TAlbumCheckListItem*>(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; @@ -109,7 +109,7 @@ void TAlbumCheckListItem::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 @@ -379,7 +379,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("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/libs/lprof/cmshull.cpp b/digikam/libs/lprof/cmshull.cpp index 8815c265..05b8dfa3 100644 --- a/digikam/libs/lprof/cmshull.cpp +++ b/digikam/libs/lprof/cmshull.cpp @@ -1362,9 +1362,9 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) /* set the viewing orientation and distance */ fprintf (fp, "DEF CamTest Group {\n"); - fprintf (fp, "\ttqchildren [\n"); + fprintf (fp, "\tchildren [\n"); fprintf (fp, "\t\tDEF Cameras Group {\n"); - fprintf (fp, "\t\t\ttqchildren [\n"); + fprintf (fp, "\t\t\tchildren [\n"); fprintf (fp, "\t\t\t\tDEF DefaultView Viewpoint {\n"); fprintf (fp, "\t\t\t\t\tposition 0 0 340\n"); fprintf (fp, "\t\t\t\t\torientation 0 0 1 0\n"); @@ -1382,12 +1382,12 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) fprintf (fp, "\t]\n"); fprintf (fp, "}\n"); - /* Output the tqshape stuff */ + /* Output the shape stuff */ fprintf (fp, "Transform {\n"); fprintf (fp, "\tscale 8 8 8\n"); - fprintf (fp, "\ttqchildren [\n"); + fprintf (fp, "\tchildren [\n"); - /* Draw the axes as a tqshape: */ + /* Draw the axes as a shape: */ fprintf (fp, "\t\tShape {\n"); fprintf (fp, "\t\t\tappearance Appearance {\n"); fprintf (fp, "\t\t\t\tmaterial Material {\n"); @@ -1396,7 +1396,7 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) fprintf (fp, "\t\t\t\t\tshininess 0.8\n"); fprintf (fp, "\t\t\t\t}\n"); fprintf (fp, "\t\t\t}\n"); - fprintf (fp, "\t\t\ttqgeometry IndexedLineSet {\n"); + fprintf (fp, "\t\t\tgeometry IndexedLineSet {\n"); fprintf (fp, "\t\t\t\tcoord Coordinate {\n"); fprintf (fp, "\t\t\t\t\tpoint [\n"); fprintf (fp, "\t\t\t\t\t0.0 0.0 0.0,\n"); @@ -1412,7 +1412,7 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) fprintf (fp, "\t\t}\n"); - /* Draw the triangles as a tqshape: */ + /* Draw the triangles as a shape: */ fprintf (fp, "\t\tShape {\n"); fprintf (fp, "\t\t\tappearance Appearance {\n"); fprintf (fp, "\t\t\t\tmaterial Material {\n"); @@ -1421,7 +1421,7 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) fprintf (fp, "\t\t\t\t\tshininess 0.8\n"); fprintf (fp, "\t\t\t\t}\n"); fprintf (fp, "\t\t\t}\n"); - fprintf (fp, "\t\t\ttqgeometry IndexedFaceSet {\n"); + fprintf (fp, "\t\t\tgeometry IndexedFaceSet {\n"); fprintf (fp, "\t\t\t\tsolid false\n"); /* fill in the points here */ diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp index 696d2c70..17d8fcaa 100644 --- a/digikam/libs/lprof/cmslnr.cpp +++ b/digikam/libs/lprof/cmslnr.cpp @@ -66,7 +66,7 @@ void cdecl cmsxApplyLinearizationGamma(WORD In[3], LPGAMMATABLE Gamma[3], WORD O /* */ /* We first assume R', G' and B' does exhibit a non-linear behaviour */ /* that can be separated for each channel as Yr(R'), Yg(G'), Yb(B') */ -/* This is the tqshaper step */ +/* This is the shaper step */ /* */ /* R = Lr(R') */ /* G = Lg(G') */ diff --git a/digikam/libs/lprof/cmsmkmsh.cpp b/digikam/libs/lprof/cmsmkmsh.cpp index 07f84878..c0e3d4c3 100644 --- a/digikam/libs/lprof/cmsmkmsh.cpp +++ b/digikam/libs/lprof/cmsmkmsh.cpp @@ -148,7 +148,7 @@ BOOL ComputePrimary(LPMEASUREMENT Linearized, -/* Does compute a matrix-tqshaper based on patches. */ +/* Does compute a matrix-shaper based on patches. */ static double Clip(double d) diff --git a/digikam/libs/lprof/cmsprf.cpp b/digikam/libs/lprof/cmsprf.cpp index 4b7e93b2..527fc8e8 100644 --- a/digikam/libs/lprof/cmsprf.cpp +++ b/digikam/libs/lprof/cmsprf.cpp @@ -375,7 +375,7 @@ BOOL cmsxChoosePCS(LPPROFILERCOMMONDATA hdr) double gamma_r, gamma_g, gamma_b; cmsCIExyY SourceWhite; - /* At first, compute aproximation on matrix-tqshaper */ + /* At first, compute aproximation on matrix-shaper */ if (!cmsxComputeMatrixShaper(hdr ->ReferenceSheet, hdr ->MeasurementSheet, hdr -> Medium, diff --git a/digikam/libs/lprof/cmssheet.cpp b/digikam/libs/lprof/cmssheet.cpp index 9c53dc71..88ad8d16 100644 --- a/digikam/libs/lprof/cmssheet.cpp +++ b/digikam/libs/lprof/cmssheet.cpp @@ -205,7 +205,7 @@ static char* PredefinedProperties[] = { "ORIGINATOR", /* Required - Identifies the specific system, organization or individual that created the data file. */ "CREATED", /* Required - Indicates date of creation of the data file. */ "DESCRIPTOR", /* Required - Describes the purpose or contents of the data file. */ - "DIFFUSE_GEOMETRY", /* The diffuse tqgeometry used. Allowed values are "sphere" or "opal". */ + "DIFFUSE_GEOMETRY", /* The diffuse geometry used. Allowed values are "sphere" or "opal". */ "MANUFACTURER", "MANUFACTURE", /* Some broken Fuji targets does store this value */ "PROD_DATE", /* Identifies year and month of production of the target in the form yyyy:mm. */ diff --git a/digikam/libs/lprof/lcmsprf.h b/digikam/libs/lprof/lcmsprf.h index 4d93bc42..00c7ac40 100644 --- a/digikam/libs/lprof/lcmsprf.h +++ b/digikam/libs/lprof/lcmsprf.h @@ -340,7 +340,7 @@ double cdecl _cmsxSaturate65535To255(double d); double cdecl _cmsxSaturate255To65535(double d); void cdecl _cmsxClampXYZ100(LPcmsCIEXYZ xyz); -/* Matrix tqshaper profiler API ------------------------------------------------------------- */ +/* Matrix shaper profiler API ------------------------------------------------------------- */ BOOL cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index 97970794..c1a03d99 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -736,12 +736,12 @@ bool ThemeEngine::saveTheme() "\n * GNU General Public License for more details." "\n *" "\n * ============================================================ */\n") - .tqarg(TQDate::currentDate().year()) - .tqarg(TQDate::currentDate().month()) - .tqarg(TQDate::currentDate().day()) - .tqarg(fi.fileName()) - .tqarg(TQDate::currentDate().year()) - .tqarg(user.fullName()); + .arg(TQDate::currentDate().year()) + .arg(TQDate::currentDate().month()) + .arg(TQDate::currentDate().day()) + .arg(fi.fileName()) + .arg(TQDate::currentDate().year()) + .arg(user.fullName()); xmlDoc.appendChild(xmlDoc.createComment(banner)); diff --git a/digikam/libs/threadimageio/previewtask.cpp b/digikam/libs/threadimageio/previewtask.cpp index b0cc3c53..5f277481 100644 --- a/digikam/libs/threadimageio/previewtask.cpp +++ b/digikam/libs/threadimageio/previewtask.cpp @@ -190,7 +190,7 @@ void PreviewLoadingTask::execute() TQSize scaledSize = img.size(); if (needToScale(scaledSize, size)) { - scaledSize.tqscale(size, size, TQSize::ScaleMin); + scaledSize.scale(size, size, TQSize::ScaleMin); img = img.smoothScale(scaledSize.width(), scaledSize.height()); } diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 9559d0f6..cced715e 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -388,12 +388,12 @@ void ThumbBarView::setSelected(ThumbBarItem* item) { ThumbBarItem* item = d->currItem; d->currItem = 0; - item->tqrepaint(); + item->repaint(); } d->currItem = item; if (d->currItem) - item->tqrepaint(); + item->repaint(); } void ThumbBarView::ensureItemVisible(ThumbBarItem* item) @@ -559,11 +559,11 @@ void ThumbBarView::contentsMousePressEvent(TQMouseEvent* e) { ThumbBarItem* item = d->currItem; d->currItem = 0; - item->tqrepaint(); + item->repaint(); } d->currItem = barItem; - barItem->tqrepaint(); + barItem->repaint(); } void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e) @@ -791,7 +791,7 @@ void ThumbBarView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) } item->d->pixmap = new TQPixmap(pix); - item->tqrepaint(); + item->repaint(); } } @@ -811,7 +811,7 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url) } item->d->pixmap = new TQPixmap(pix); - item->tqrepaint(); + item->repaint(); } // ------------------------------------------------------------------------- @@ -875,7 +875,7 @@ TQPixmap* ThumbBarItem::pixmap() const return d->pixmap; } -void ThumbBarItem::tqrepaint() +void ThumbBarItem::repaint() { d->view->repaintItem(this); } @@ -959,8 +959,8 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showFileSize) { tipText += m_cellBeg + i18n("Size:") + m_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)); tipText += str + m_cellEnd; } @@ -1003,7 +1003,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) 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); tipText += m_cellBeg + i18n("Dimensions:") + m_cellMid + str + m_cellEnd; } } @@ -1027,8 +1027,8 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showPhotoMake) { - 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() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; metaStr += m_cellBeg + i18n("Make/Model:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } @@ -1050,9 +1050,9 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) 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() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; metaStr += m_cellBeg + i18n("Aperture/Focal:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; @@ -1060,8 +1060,8 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showPhotoExpo) { - 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() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; metaStr += m_cellBeg + i18n("Exposure/Sensitivity:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } @@ -1076,7 +1076,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) 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() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; metaStr += m_cellBeg + i18n("Mode/Program:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } diff --git a/digikam/libs/thumbbar/thumbbar.h b/digikam/libs/thumbbar/thumbbar.h index 1891597d..86225c4e 100644 --- a/digikam/libs/thumbbar/thumbbar.h +++ b/digikam/libs/thumbbar/thumbbar.h @@ -188,7 +188,7 @@ public: TQRect rect() const; TQPixmap* pixmap() const; - void tqrepaint(); + void repaint(); private: diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index ac70ee39..30065e23 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -184,7 +184,7 @@ void CurvesWidget::reset() d->grabPoint = -1; d->guideVisible = false; - tqrepaint(false); + repaint(false); } ImageCurves* CurvesWidget::curves() const @@ -208,7 +208,7 @@ void CurvesWidget::setLoadingFailed() d->clearFlag = CurvesWidgetPriv::HistogramFailed; d->pos = 0; d->blinkTimer->stop(); - tqrepaint(false); + repaint(false); setCursor(KCursor::arrowCursor()); } @@ -216,7 +216,7 @@ void CurvesWidget::setCurveGuide(const DColor& color) { d->guideVisible = true; d->colorGuide = color; - tqrepaint(false); + repaint(false); } void CurvesWidget::curveTypeChanged() @@ -245,7 +245,7 @@ void CurvesWidget::curveTypeChanged() break; } - tqrepaint(false); + repaint(false); emit signalCurvesChanged(); } @@ -262,7 +262,7 @@ void CurvesWidget::customEvent(TQCustomEvent *event) setCursor(KCursor::waitCursor()); d->clearFlag = CurvesWidgetPriv::HistogramStarted; d->blinkTimer->start(200); - tqrepaint(false); + repaint(false); } else { @@ -271,14 +271,14 @@ void CurvesWidget::customEvent(TQCustomEvent *event) // Repaint histogram d->clearFlag = CurvesWidgetPriv::HistogramCompleted; d->blinkTimer->stop(); - tqrepaint(false); + repaint(false); setCursor(KCursor::arrowCursor()); } else { d->clearFlag = CurvesWidgetPriv::HistogramFailed; d->blinkTimer->stop(); - tqrepaint(false); + repaint(false); setCursor(KCursor::arrowCursor()); emit signalHistogramComputationFailed(); } @@ -298,7 +298,7 @@ void CurvesWidget::stopHistogramComputation() void CurvesWidget::slotBlinkTimerDone() { - tqrepaint(false); + repaint(false); d->blinkTimer->start(200); } @@ -312,7 +312,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.tqbegin(TQT_TQPAINTDEVICE(&anim), this); + p2.begin(TQT_TQPAINTDEVICE(&anim), this); p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); @@ -330,7 +330,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -353,7 +353,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(TQT_TQPAINTDEVICE(&pm), this); int curvePrevVal = 0; @@ -532,7 +532,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) if (d->xMouseOver != -1 && d->yMouseOver != -1) { - TQString string = i18n("x:%1\ny:%2").tqarg(d->xMouseOver).tqarg(d->yMouseOver); + TQString string = i18n("x:%1\ny:%2").arg(d->xMouseOver).arg(d->yMouseOver); TQFontMetrics fontMt(string); TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); rect.moveRight(wWidth); @@ -574,7 +574,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment(); p1.drawLine(xGuide, 0, xGuide, wHeight); - TQString string = i18n("x:%1").tqarg(guidePos); + TQString string = i18n("x:%1").arg(guidePos); TQFontMetrics fontMt( string ); TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); @@ -694,7 +694,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e) } d->curves->curvesCalculateCurve(m_channelType); - tqrepaint(false); + repaint(false); } void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) @@ -707,7 +707,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) setCursor(KCursor::arrowCursor()); d->grabPoint = -1; d->curves->curvesCalculateCurve(m_channelType); - tqrepaint(false); + repaint(false); emit signalCurvesChanged(); } @@ -824,7 +824,7 @@ void CurvesWidget::mouseMoveEvent(TQMouseEvent *e) d->xMouseOver = x; d->yMouseOver = m_imageHistogram->getHistogramSegment()-1 - y; emit signalMouseMoved(d->xMouseOver, d->yMouseOver); - tqrepaint(false); + repaint(false); } void CurvesWidget::leaveEvent(TQEvent*) @@ -832,7 +832,7 @@ void CurvesWidget::leaveEvent(TQEvent*) d->xMouseOver = -1; d->yMouseOver = -1; emit signalMouseMoved(d->xMouseOver, d->yMouseOver); - tqrepaint(false); + repaint(false); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index b88ddb9d..d64391a1 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -192,13 +192,13 @@ void HistogramWidget::setHistogramGuideByColor(const DColor& color) { d->guideVisible = true; d->colorGuide = color; - tqrepaint(false); + repaint(false); } void HistogramWidget::reset() { d->guideVisible = false; - tqrepaint(false); + repaint(false); } void HistogramWidget::customEvent(TQCustomEvent *event) @@ -220,15 +220,15 @@ void HistogramWidget::customEvent(TQCustomEvent *event) { if (d->clearFlag != HistogramWidgetPriv::HistogramDataLoading) { - // enter initial tqrepaint wait, tqrepaint only after waiting + // enter initial repaint wait, repaint only after waiting // a short time so that very fast computation does not create flicker d->inInitialRepaintWait = true; d->blinkTimer->start( 100 ); } else { - // after the initial tqrepaint, we can tqrepaint immediately - tqrepaint(false); + // after the initial repaint, we can repaint immediately + repaint(false); d->blinkTimer->start( 200 ); } } @@ -245,21 +245,21 @@ void HistogramWidget::customEvent(TQCustomEvent *event) // Send signals to refresh information if necessary. // The signals may trigger multiple repaints, avoid this, - // we tqrepaint once afterwards. + // we repaint once afterwards. setUpdatesEnabled(false); notifyValuesChanged(); emit signalHistogramComputationDone(d->sixteenBits); setUpdatesEnabled(true); - tqrepaint(false); + repaint(false); } else { d->clearFlag = HistogramWidgetPriv::HistogramFailed; d->blinkTimer->stop(); d->inInitialRepaintWait = false; - tqrepaint(false); + repaint(false); setCursor( KCursor::arrowCursor() ); // Remove old histogram data from memory. if (m_imageHistogram) @@ -285,7 +285,7 @@ void HistogramWidget::setDataLoading() { setCursor( KCursor::waitCursor() ); d->clearFlag = HistogramWidgetPriv::HistogramDataLoading; - // enter initial tqrepaint wait, tqrepaint only after waiting + // enter initial repaint wait, repaint only after waiting // a short time so that very fast computation does not create flicker d->inInitialRepaintWait = true; d->pos = 0; @@ -299,7 +299,7 @@ void HistogramWidget::setLoadingFailed() d->pos = 0; d->blinkTimer->stop(); d->inInitialRepaintWait = false; - tqrepaint(false); + repaint(false); setCursor( KCursor::arrowCursor() ); } @@ -366,7 +366,7 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h, void HistogramWidget::slotBlinkTimerDone() { d->inInitialRepaintWait = false; - tqrepaint(false); + repaint(false); d->blinkTimer->start( 200 ); } @@ -383,7 +383,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); p1.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background()); p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -405,7 +405,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.tqbegin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this)); + p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this)); p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); @@ -423,7 +423,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -447,7 +447,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -524,7 +524,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); // Drawing selection or all histogram values. @@ -911,7 +911,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment(); p1.drawLine(xGuide, 0, xGuide, wHeight); - TQString string = i18n("x:%1").tqarg(guidePos); + TQString string = i18n("x:%1").arg(guidePos); TQFontMetrics fontMt( string ); TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); @@ -986,7 +986,7 @@ void HistogramWidget::mousePressEvent(TQMouseEvent* e) if (!d->inSelected) { d->inSelected = true; - tqrepaint(false); + repaint(false); } d->xmin = ((double)e->pos().x()) / ((double)width()); @@ -1009,7 +1009,7 @@ void HistogramWidget::mouseReleaseEvent(TQMouseEvent*) //emit signalMinValueChanged( 0 ); //emit signalMaxValueChanged( d->range ); notifyValuesChanged(); - tqrepaint(false); + repaint(false); } } } @@ -1040,7 +1040,7 @@ void HistogramWidget::mouseMoveEvent(TQMouseEvent *e) notifyValuesChanged(); //emit signalMaxValueChanged( d->xmax == 0.0 ? d->range : (int)(d->xmax * d->range) ); - tqrepaint(false); + repaint(false); } } } @@ -1064,7 +1064,7 @@ void HistogramWidget::slotMinValueChanged( int min ) { d->xmin = ((double)min)/d->range; } - tqrepaint(false); + repaint(false); } } @@ -1082,7 +1082,7 @@ void HistogramWidget::slotMaxValueChanged(int max) { d->xmax = ((double)max)/d->range; } - tqrepaint(false); + repaint(false); } } diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index cd917f69..a64ba02a 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -91,7 +91,7 @@ PanIconWidget::~PanIconWidget() void PanIconWidget::setImage(int previewWidth, int previewHeight, const TQImage& image) { TQSize sz(image.width(), image.height()); - sz.tqscale(previewWidth, previewHeight, TQSize::ScaleMin); + sz.scale(previewWidth, previewHeight, TQSize::ScaleMin); m_pixmap = new TQPixmap(previewWidth, previewHeight); m_width = sz.width(); m_height = sz.height(); @@ -120,7 +120,7 @@ void PanIconWidget::slotZoomFactorChanged(double factor) m_zoomedOrgWidth = (int)(m_orgWidth * factor); m_zoomedOrgHeight = (int)(m_orgHeight * factor); updatePixmap(); - tqrepaint(false); + repaint(false); } void PanIconWidget::setRegionSelection(const TQRect& regionSelection) @@ -139,7 +139,7 @@ void PanIconWidget::setRegionSelection(const TQRect& regionSelection) ((float)m_height / (float)m_zoomedOrgHeight)) ); updatePixmap(); - tqrepaint(false); + repaint(false); } TQRect PanIconWidget::getRegionSelection() @@ -166,7 +166,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone) if (targetDone) { updatePixmap(); - tqrepaint(false); + repaint(false); } int x = (int)lround( ((float)m_localRegionSelection.x() - (float)m_rect.x() ) * @@ -286,7 +286,7 @@ void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) m_localRegionSelection.moveBottom(m_rect.bottom()); updatePixmap(); - tqrepaint(false); + repaint(false); regionSelectionMoved(false); return; } @@ -315,7 +315,7 @@ void PanIconWidget::timerEvent(TQTimerEvent * e) { m_flicker = !m_flicker; updatePixmap(); - tqrepaint(false); + repaint(false); } else TQWidget::timerEvent(e); diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index f6795d0c..a7a15f20 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -453,7 +453,7 @@ void PreviewWidget::resizeEvent(TQResizeEvent* e) updateContentsSize(); - // No need to tqrepaint. its called + // No need to repaint. its called // automatically after resize // To be sure than corner widget used to pan image will be hide/show @@ -497,7 +497,7 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) { for (int i = x1 ; i < x2 ; i += d->tileSize) { - TQString key = TQString("%1,%2").tqarg(i).tqarg(j); + TQString key = TQString("%1,%2").arg(i).arg(j); TQPixmap *pix = d->tileCache.find(key); if (!pix) @@ -562,7 +562,7 @@ void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) m_movingInProgress = true; d->midButtonX = e->x(); d->midButtonY = e->y(); - viewport()->tqrepaint(false); + viewport()->repaint(false); viewport()->setCursor(TQt::SizeAllCursor); } return; @@ -596,7 +596,7 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e) { emit signalContentsMovedEvent(true); viewport()->unsetCursor(); - viewport()->tqrepaint(false); + viewport()->repaint(false); } if (e->button() == Qt::RightButton) diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 30c0c7be..5cc07c0c 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -79,13 +79,13 @@ TQString DLineEdit::message() const void DLineEdit::setMessage(const TQString &msg) { d->message = msg; - tqrepaint(); + repaint(); } void DLineEdit::setText(const TQString &txt) { d->drawMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText(txt); } @@ -117,7 +117,7 @@ void DLineEdit::focusInEvent(TQFocusEvent *e) if (d->drawMsg) { d->drawMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent(e); } @@ -127,7 +127,7 @@ void DLineEdit::focusOutEvent(TQFocusEvent *e) if (text().isEmpty()) { d->drawMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent(e); } diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index d2e03b13..e76c1f73 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -141,7 +141,7 @@ TQSplitter* Sidebar::splitter() const void Sidebar::loadViewState() { KConfig *config = kapp->config(); - config->setGroup(TQString("%1").tqarg(name())); + config->setGroup(TQString("%1").arg(name())); int tab = config->readNumEntry("ActiveTab", 0); bool minimized = config->readBoolEntry("Minimized", d->minimizedDefault); @@ -168,7 +168,7 @@ void Sidebar::loadViewState() void Sidebar::saveViewState() { KConfig *config = kapp->config(); - config->setGroup(TQString("%1").tqarg(name())); + config->setGroup(TQString("%1").arg(name())); config->writeEntry("ActiveTab", d->activeTab); config->writeEntry("Minimized", d->minimized); config->sync(); diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 05ae6206..422f80f1 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -53,12 +53,12 @@ public: progressBarSize = 3; state = 0; color = TQt::black; - tqalignment = TQt::AlignLeft; + alignment = TQt::AlignLeft; } int state; int progressBarSize; - int tqalignment; + int alignment; TQString string; @@ -86,22 +86,22 @@ SplashScreen::~SplashScreen() void SplashScreen::animate() { d->state = ((d->state + 1) % (2*d->progressBarSize-1)); - tqrepaint(); + repaint(); } void SplashScreen::setColor(const TQColor& color) { d->color = color; } -void SplashScreen::setAlignment(int tqalignment) +void SplashScreen::setAlignment(int alignment) { - d->tqalignment = tqalignment; + d->alignment = alignment; } void SplashScreen::message(const TQString& message) { d->string = message; - TQSplashScreen::message(d->string, d->tqalignment, d->color); + TQSplashScreen::message(d->string, d->alignment, d->color); animate(); } @@ -154,7 +154,7 @@ void SplashScreen::drawContents(TQPainter* painter) // Draw message at given position, limited to 43 chars // If message is too long, string is truncated if (d->string.length() > 40) {d->string.truncate(39); d->string += "...";} - painter->drawText(r, d->tqalignment, d->string); + painter->drawText(r, d->alignment, d->string); } } // namespace Digikam diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index 294b360c..c1be1272 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -52,7 +52,7 @@ public: SplashScreen(const TQString& splash, WFlags f=0); virtual ~SplashScreen(); - void setAlignment(int tqalignment); + void setAlignment(int alignment); void setColor(const TQColor& color); protected: diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index 9b66e4f7..57a1686e 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -265,7 +265,7 @@ bool CIETongueWidget::setProfileData(const TQByteArray &profileData) d->loadingImageMode = false; d->blinkTimer->stop(); - tqrepaint(false); + repaint(false); return (d->profileDataAvailable); } @@ -295,7 +295,7 @@ bool CIETongueWidget::setProfileFromFile(const KURL& file) } d->blinkTimer->stop(); - tqrepaint(false); + repaint(false); return (d->profileDataAvailable); } @@ -684,7 +684,7 @@ void CIETongueWidget::loadingStarted() d->pos = 0; d->loadingImageMode = true; d->loadingImageSucess = false; - tqrepaint(false); + repaint(false); d->blinkTimer->start(200); } @@ -694,7 +694,7 @@ void CIETongueWidget::loadingFailed() d->pos = 0; d->loadingImageMode = false; d->loadingImageSucess = false; - tqrepaint(false); + repaint(false); } void CIETongueWidget::paintEvent(TQPaintEvent*) @@ -724,7 +724,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.tqbegin(&anim, TQT_TQOBJECT(this)); + p2.begin(&anim, TQT_TQOBJECT(this)); p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); @@ -809,7 +809,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) void CIETongueWidget::slotBlinkTimerDone() { - tqrepaint(false); + repaint(false); d->blinkTimer->start( 200 ); } diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp index eec266d1..7dc82341 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -166,7 +166,7 @@ ICCProfileWidget::ICCProfileWidget(TQWidget* parent, const char* name, int w, in TQWhatsThis::add( d->cieTongue, i18n("<p>This area contains a CIE or chromaticity diagram. " "A CIE diagram is a representation of all the colors " "that a person with normal vision can see. This is represented " - "by the colored sail-tqshaped area. In addition you will see a " + "by the colored sail-shaped area. In addition you will see a " "triangle that is superimposed on the diagram outlined in white. " "This triangle represents the outer boundaries of the color space " "of the device that is characterized by the inspected profile. " diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index 0d84d4d2..eb94089d 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -450,7 +450,7 @@ void ImageGuideWidget::paintEvent(TQPaintEvent*) void ImageGuideWidget::updatePreview() { updatePixmap(); - tqrepaint(false); + repaint(false); } void ImageGuideWidget::timerEvent(TQTimerEvent* e) @@ -608,7 +608,7 @@ void ImageGuideWidget::enterEvent(TQEvent*) { d->onMouseMovePreviewToggled = false; updatePixmap(); - tqrepaint(false); + repaint(false); } } @@ -618,7 +618,7 @@ void ImageGuideWidget::leaveEvent(TQEvent*) { d->onMouseMovePreviewToggled = true; updatePixmap(); - tqrepaint(false); + repaint(false); } } diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index faf63543..48fee35e 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -328,8 +328,8 @@ void ImagePanelWidget::updateSelectionInfo(const TQRect& rect) { TQToolTip::add( d->imagePanIconWidget, i18n("<nobr>(%1,%2)(%3x%4)</nobr>") - .tqarg(rect.left()).tqarg(rect.top()) - .tqarg(rect.width()).tqarg(rect.height())); + .arg(rect.left()).arg(rect.top()) + .arg(rect.width()).arg(rect.height())); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 2d11e709..8fbeb173 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -97,7 +97,7 @@ void ImagePanIconWidget::setHighLightPoints(const TQPointArray& pointsList) { d->hightlightPoints = pointsList; updatePixmap(); - tqrepaint(false); + repaint(false); } void ImagePanIconWidget::updatePixmap() @@ -192,7 +192,7 @@ void ImagePanIconWidget::slotSeparateViewToggled(int t) { d->separateView = t; updatePixmap(); - tqrepaint(false); + repaint(false); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 59fcf007..3efe93ca 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -341,7 +341,7 @@ void ImagePannelWidget::slotZoomFactorChanged(double zoom) int size = (int)((zoom - b) /a); d->zoomBar->setZoomSliderValue(size); - d->zoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); + d->zoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); d->zoomBar->setEnableZoomPlus(true); d->zoomBar->setEnableZoomMinus(true); @@ -470,8 +470,8 @@ void ImagePannelWidget::updateSelectionInfo(const TQRect& rect) { TQToolTip::add( d->imagePanIconWidget, i18n("<nobr>(%1,%2)(%3x%4)</nobr>") - .tqarg(rect.left()).tqarg(rect.top()) - .tqarg(rect.width()).tqarg(rect.height())); + .arg(rect.left()).arg(rect.top()) + .arg(rect.width()).arg(rect.height())); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index c00348aa..3449146e 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -351,7 +351,7 @@ void ImageRegionWidget::backupPixmapRegion() void ImageRegionWidget::restorePixmapRegion() { m_movingInProgress = true; - viewport()->tqrepaint(false); + viewport()->repaint(false); } void ImageRegionWidget::updatePreviewImage(DImg *img) diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index c5e11771..f127621b 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -315,9 +315,9 @@ void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint & { DColor color = col; d->spotInfoLabel->setText(i18n("(%1,%2) RGBA:%3,%4,%5,%6") - .tqarg(point.x()).tqarg(point.y()) - .tqarg(color.red()).tqarg(color.green()) - .tqarg(color.blue()).tqarg(color.alpha()) ); + .arg(point.x()).arg(point.y()) + .arg(color.red()).arg(color.green()) + .arg(color.blue()).arg(color.alpha()) ); } void ImageWidget::readSettings() diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index e4a3261b..a9aff2ec 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -125,9 +125,9 @@ void MetadataListView::slotSelectionChanged(TQListViewItem *item) TQWhatsThis::add(this, i18n("<b>Title: </b><p>%1<p>" "<b>Value: </b><p>%2<p>" "<b>Description: </b><p>%3") - .tqarg(tagTitle) - .tqarg(tagValue) - .tqarg(tagDesc)); + .arg(tagTitle) + .arg(tagValue) + .arg(tagDesc)); } void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& tagsfilter) diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index f9cd9997..7eaad1b6 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -271,7 +271,7 @@ void MetadataWidget::slotModeChanged(int) void MetadataWidget::slotCopy2Clipboard() { - TQString textmetadata = i18n("File name: %1 (%2)").tqarg(d->fileName).tqarg(getMetadataTitle()); + TQString textmetadata = i18n("File name: %1 (%2)").arg(d->fileName).arg(getMetadataTitle()); TQListViewItemIterator it( d->view ); while ( it.current() ) @@ -301,8 +301,8 @@ void MetadataWidget::slotCopy2Clipboard() void MetadataWidget::slotPrintMetadata() { TQString textmetadata = i18n("<p><big><big><b>File name: %1 (%2)</b></big></big>") - .tqarg(d->fileName) - .tqarg(getMetadataTitle()); + .arg(d->fileName) + .arg(getMetadataTitle()); TQListViewItemIterator it( d->view ); while ( it.current() ) diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index d690a390..ae3eeb97 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -147,8 +147,8 @@ void WorldMapWidget::setGPSPosition(double lat, double lng) center(d->xPos, d->yPos); TQString la, lo; - d->latLonPos->setText(TQString("(%1, %2)").tqarg(la.setNum(d->latitude, 'f', 2)) - .tqarg(lo.setNum(d->longitude, 'f', 2))); + d->latLonPos->setText(TQString("(%1, %2)").arg(la.setNum(d->latitude, 'f', 2)) + .arg(lo.setNum(d->longitude, 'f', 2))); moveChild(d->latLonPos, contentsX()+10, contentsY()+10); } diff --git a/digikam/project/NEWS.0.9.1 b/digikam/project/NEWS.0.9.1 index 4e1a8610..3d863a07 100644 --- a/digikam/project/NEWS.0.9.1 +++ b/digikam/project/NEWS.0.9.1 @@ -45,7 +45,7 @@ Image Plugins : Auto Color Correction Tool : add new filter to perform Image Plugins : all plugins : capabilty to remember settings between plugin sessions to store configuration in a settings file. -Image Editor : Add new advanced options to keep ratio and tqalignment about print pictures. +Image Editor : Add new advanced options to keep ratio and alignment about print pictures. Image Editor : Add 2 new advanced options to show under-exposed or over-exposed pixels. Image Editor : Remove View->Histogram menu option. We have a better histogram available in sidebar. @@ -86,7 +86,7 @@ Image Plugins : Perspective Tool : add a grid and vertical/horizontal guide line Image Plugins : Ratio-crop Tool : usability improvements from Jaromir Malenko. Image Plugins : Auto Color Correction Tool : add new filter to perform auto-exposure corrections. -Image Editor : Add new advanced options to keep ratio and tqalignment about print pictures. +Image Editor : Add new advanced options to keep ratio and alignment about print pictures. Image Editor : Add 2 new advanced options to show under-exposed or over-exposed pixels. Image Editor : Remove View->Histogram menu option. We have a better histogram available in sidebar. Image Editor : Color profiles are tested now to avoid invalid files. diff --git a/digikam/project/NEWS.0.9.2 b/digikam/project/NEWS.0.9.2 index bc2a408c..b0b86919 100644 --- a/digikam/project/NEWS.0.9.2 +++ b/digikam/project/NEWS.0.9.2 @@ -149,7 +149,7 @@ digiKam BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 031 ==> 132047 : Faster display of images and/or prefetch wished for. 032 ==> 140131 : No zoom in image preview. 033 ==> 89365 : More standard menu structure. -034 ==> 144214 : The plural form of "child" is "tqchildren", not "childs". +034 ==> 144214 : The plural form of "child" is "children", not "childs". 035 ==> 124487 : No way to pause a slide show. 036 ==> 128975 : "Correct Exif Qt::Orientation Tag" does not change the mtime of the image file. diff --git a/digikam/project/NEWS.0.9.4 b/digikam/project/NEWS.0.9.4 index 04a13ec9..e93ca0a0 100644 --- a/digikam/project/NEWS.0.9.4 +++ b/digikam/project/NEWS.0.9.4 @@ -33,7 +33,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 001 ==> 164301 : Filter Albums sub-tree names too, when using quickfilter on icon view. 002 ==> 164482 : Place filename of image in klipper/paste buffer from thumbnail right mouse button context menu. 003 ==> 164536 : Add adjust mid range color levels. -004 ==> 164615 : Image detail info about tqgeometry (X-pixel / Y-pixel) missed. +004 ==> 164615 : Image detail info about geometry (X-pixel / Y-pixel) missed. 005 ==> 149654 : Fullscreen icon changes image's zoom to 100% (should fit to screen). 006 ==> 162688 : Digikam RC5, can't see scroll bar sliders in dark theme. 007 ==> 161212 : Switch to full screen resets X11. @@ -206,7 +206,7 @@ General : Add capability to display count of items in all Album, Date, Ta Tags Filter Folder View. The number of items contained in virtual or physical albums can be displayed on the right of album name. If a tree branch is collapsed, - parents album sum-up the number of items from all undisplayed tqchildren albums. + parents album sum-up the number of items from all undisplayed children albums. Count of items is performed in background by digiKam KIO-Slaves. A new option from Setup/Album dialog page can toggle on/off this feature. diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index b84b695b..15c44e5f 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -708,7 +708,7 @@ void ShowFoto::slotChanged() TQSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); TQString 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); m_resLabel->setText(str); if (d->currentItem) @@ -790,8 +790,8 @@ void ShowFoto::slotUpdateItemInfo(void) text = d->currentItem->url().filename() + i18n(" (%2 of %3)") - .tqarg(TQString::number(index)) - .tqarg(TQString::number(d->itemsNb)); + .arg(TQString::number(index)) + .arg(TQString::number(d->itemsNb)); setCaption(d->currentItem->url().directory()); } @@ -1102,7 +1102,7 @@ void ShowFoto::slotDeleteCurrentItem() if (!d->deleteItem2Trash) { TQString warnMsg(i18n("About to delete file \"%1\"\nAre you sure?") - .tqarg(urlCurrent.filename())); + .arg(urlCurrent.filename())); if (KMessageBox::warningContinueCancel(this, warnMsg, i18n("Warning"), diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index 2fd533b4..6177e974 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -234,7 +234,7 @@ MainWindow::MainWindow() KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); for (int i=0; i<10; i++) { - FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").tqarg(i)); + FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").arg(i)); folderItem->setPixmap(0, iconLoader->loadIcon("folder", KIcon::NoGroup, 32, KIcon::DefaultState, 0, true)); if (i == 2) diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index d721b151..3e9b802d 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -109,7 +109,7 @@ void BatchAlbumsSyncMetadata::parseAlbum() TQTime t; t = t.addMSecs(d->duration.elapsed()); setLabel(i18n("<b>The metadata of all images has been synchronized with the digiKam database.</b>")); - setTitle(i18n("Duration: %1").tqarg(t.toString())); + setTitle(i18n("Duration: %1").arg(t.toString())); setButtonText(i18n("&Close")); advance(1); abort(); diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index b32b86a1..a2c732c6 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -123,7 +123,7 @@ void BatchThumbsGenerator::slotRebuildAllThumbComplete() TQTime t; t = t.addMSecs(d->duration.elapsed()); setLabel(i18n("<b>The thumbnails database has been updated.</b>")); - setTitle(i18n("Duration: %1").tqarg(t.toString())); + setTitle(i18n("Duration: %1").arg(t.toString())); setButtonText(i18n("&Close")); } diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 54815e7b..42bab306 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -300,7 +300,7 @@ void AlbumSelectDialog::slotUser1() TQString newAlbumName = KInputDialog::getText(i18n("New Album Name"), i18n("Creating new album in '%1'\n" "Enter album name:") - .tqarg(album->prettyURL()), + .arg(album->prettyURL()), d->newAlbumString, &ok, this); if (!ok) return; @@ -380,7 +380,7 @@ void AlbumSelectDialog::slotSearchTextChanged(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()) { diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index 48e55075..9d9f8399 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -87,7 +87,7 @@ void AnimWidget::stop() { d->pos = 0; d->timer->stop(); - tqrepaint(); + repaint(); } void AnimWidget::paintEvent(TQPaintEvent*) @@ -120,7 +120,7 @@ void AnimWidget::paintEvent(TQPaintEvent*) void AnimWidget::slotTimeout() { d->pos = (d->pos + 10) % 360; - tqrepaint(); + repaint(); } bool AnimWidget::running() const diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index d8034a07..ebdd18ca 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -270,13 +270,13 @@ void CameraThread::run() { TQString folder = cmd->map["folder"].asString(); - sendInfo(i18n("The files in %1 have been listed.").tqarg(folder)); + sendInfo(i18n("The files in %1 have been listed.").arg(folder)); GPItemInfoList itemsList; // setting getImageDimensions to false is a huge speedup for UMSCamera if (!d->camera->getItemsInfoList(folder, itemsList, false)) { - sendError(i18n("Failed to list files in %1").tqarg(folder)); + sendError(i18n("Failed to list files in %1").arg(folder)); } if (!itemsList.isEmpty()) @@ -292,7 +292,7 @@ void CameraThread::run() TQApplication::postEvent(parent, event); } - sendInfo(i18n("Listing files in %1 is complete").tqarg(folder)); + sendInfo(i18n("Listing files in %1 is complete").arg(folder)); break; } @@ -324,7 +324,7 @@ void CameraThread::run() TQString folder = cmd->map["folder"].asString(); TQString file = cmd->map["file"].asString(); - sendInfo(i18n("Getting EXIF information for %1/%2...").tqarg(folder).tqarg(file)); + sendInfo(i18n("Getting EXIF information for %1/%2...").arg(folder).arg(file)); char* edata = 0; int esize = 0; @@ -363,7 +363,7 @@ void CameraThread::run() TQString copyright = cmd->map["copyright"].asString(); bool convertJpeg = cmd->map["convertJpeg"].asBool(); TQString losslessFormat = cmd->map["losslessFormat"].asString(); - sendInfo(i18n("Downloading file %1...").tqarg(file)); + sendInfo(i18n("Downloading file %1...").arg(file)); // download to a temp file @@ -375,7 +375,7 @@ void CameraThread::run() KURL tempURL(dest); tempURL = tempURL.upURL(); - tempURL.addPath( TQString(".digikam-camera-tmp1-%1").tqarg(getpid()).append(file)); + tempURL.addPath( TQString(".digikam-camera-tmp1-%1").arg(getpid()).append(file)); DDebug() << "Downloading: " << file << " using (" << tempURL.path() << ")" << endl; TQString temp = tempURL.path(); @@ -386,14 +386,14 @@ void CameraThread::run() if (autoRotate) { DDebug() << "Exif autorotate: " << file << " using (" << tempURL.path() << ")" << endl; - sendInfo(i18n("EXIF rotating file %1...").tqarg(file)); + sendInfo(i18n("EXIF rotating file %1...").arg(file)); exifRotate(tempURL.path(), file); } if (fixDateTime || setPhotographerId || setCredits) { DDebug() << "Set Metadata from: " << file << " using (" << tempURL.path() << ")" << endl; - sendInfo(i18n("Setting Metadata tags to file %1...").tqarg(file)); + sendInfo(i18n("Setting Metadata tags to file %1...").arg(file)); DMetadata metadata(tempURL.path()); if (fixDateTime) @@ -414,11 +414,11 @@ void CameraThread::run() if (convertJpeg) { DDebug() << "Convert to LossLess: " << file << " using (" << tempURL.path() << ")" << endl; - sendInfo(i18n("Converting %1 to lossless file format...").tqarg(file)); + sendInfo(i18n("Converting %1 to lossless file format...").arg(file)); KURL tempURL2(dest); tempURL2 = tempURL2.upURL(); - tempURL2.addPath( TQString(".digikam-camera-tmp2-%1").tqarg(getpid()).append(file)); + tempURL2.addPath( TQString(".digikam-camera-tmp2-%1").arg(getpid()).append(file)); temp = tempURL2.path(); if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat)) @@ -461,7 +461,7 @@ void CameraThread::run() TQString file = cmd->map["file"].asString(); TQString dest = cmd->map["dest"].asString(); - sendInfo(i18n("Retrieving file %1 from camera...").tqarg(file)); + sendInfo(i18n("Retrieving file %1 from camera...").arg(file)); bool result = d->camera->downloadItem(folder, file, dest); @@ -475,7 +475,7 @@ void CameraThread::run() } else { - sendError(i18n("Failed to retrieve file %1 from camera").tqarg(file)); + sendError(i18n("Failed to retrieve file %1 from camera").arg(file)); } break; } @@ -490,7 +490,7 @@ void CameraThread::run() // The source file path to download in camera. TQString src = cmd->map["srcFilePath"].asString(); - sendInfo(i18n("Uploading file %1 to camera...").tqarg(file)); + sendInfo(i18n("Uploading file %1 to camera...").arg(file)); GPItemInfo itemsInfo; @@ -521,7 +521,7 @@ void CameraThread::run() TQString folder = cmd->map["folder"].asString(); TQString file = cmd->map["file"].asString(); - sendInfo(i18n("Deleting file %1...").tqarg(file)); + sendInfo(i18n("Deleting file %1...").arg(file)); bool result = d->camera->deleteItem(folder, file); @@ -547,7 +547,7 @@ void CameraThread::run() TQString file = cmd->map["file"].asString(); bool lock = cmd->map["lock"].asBool(); - sendInfo(i18n("Toggle lock file %1...").tqarg(file)); + sendInfo(i18n("Toggle lock file %1...").arg(file)); bool result = d->camera->setLockItem(folder, file, lock); @@ -996,7 +996,7 @@ void CameraController::customEvent(TQCustomEvent* e) { unlink(TQFile::encodeName(temp)); d->timer->start(50); - emit signalInfoMsg(i18n("Skipped file %1").tqarg(file)); + emit signalInfoMsg(i18n("Skipped file %1").arg(file)); emit signalSkipped(folder, file); return; } @@ -1023,7 +1023,7 @@ void CameraController::customEvent(TQCustomEvent* e) d->timer->stop(); - TQString msg = i18n("Failed to download file \"%1\".").tqarg(file); + TQString msg = i18n("Failed to download file \"%1\".").arg(file); if (!d->canceled) { @@ -1062,7 +1062,7 @@ void CameraController::customEvent(TQCustomEvent* e) d->timer->stop(); - TQString msg = i18n("Failed to upload file \"%1\".").tqarg(file); + TQString msg = i18n("Failed to upload file \"%1\".").arg(file); if (!d->canceled) { @@ -1097,7 +1097,7 @@ void CameraController::customEvent(TQCustomEvent* e) d->timer->stop(); emit signalDeleted(folder, file, false); - TQString msg = i18n("Failed to delete file \"%1\".").tqarg(file); + TQString msg = i18n("Failed to delete file \"%1\".").arg(file); if (!d->canceled) { @@ -1132,7 +1132,7 @@ void CameraController::customEvent(TQCustomEvent* e) d->timer->stop(); emit signalLocked(folder, file, false); - TQString msg = i18n("Failed to toggle lock file \"%1\".").tqarg(file); + TQString msg = i18n("Failed to toggle lock file \"%1\".").arg(file); if (!d->canceled) { @@ -1162,7 +1162,7 @@ void CameraController::customEvent(TQCustomEvent* e) urlList << url; ImageWindow *im = ImageWindow::imagewindow(); - im->loadURL(urlList, url, i18n("Camera \"%1\"").tqarg(d->camera->model()), false); + im->loadURL(urlList, url, i18n("Camera \"%1\"").arg(d->camera->model()), false); if (im->isHidden()) im->show(); diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index ba3b99df..36e08ed4 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -49,7 +49,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV const TQStringList& cameraFolderList, const TQString& cameraName, const TQString& rootPath) : KDialogBase(parent, 0, true, - i18n("%1 - Select Camera Folder").tqarg(cameraName), + i18n("%1 - Select Camera Folder").arg(cameraName), Help|Ok|Cancel, Ok, true) { setHelp("camerainterface.anchor", "digikam"); diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/digikam/utilities/cameragui/camerafolderitem.cpp index 6adc480b..f53508a6 100644 --- a/digikam/utilities/cameragui/camerafolderitem.cpp +++ b/digikam/utilities/cameragui/camerafolderitem.cpp @@ -91,13 +91,13 @@ TQString CameraFolderItem::folderPath() void CameraFolderItem::changeCount(int val) { d->count += val; - setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count))); + setText(0, TQString("%1 (%2)").arg(d->name).arg(TQString::number(d->count))); } void CameraFolderItem::setCount(int val) { d->count = val; - setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count))); + setText(0, TQString("%1 (%2)").arg(d->name).arg(TQString::number(d->count))); } int CameraFolderItem::count() diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index 0529b390..fade8619 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -192,7 +192,7 @@ void CameraIconViewItem::paintItem() void CameraIconViewItem::setDownloadName(const TQString& downloadName) { d->downloadName = downloadName; - tqrepaint(); + repaint(); } TQString CameraIconViewItem::getDownloadName() const @@ -203,7 +203,7 @@ TQString CameraIconViewItem::getDownloadName() const void CameraIconViewItem::setDownloaded(int status) { d->itemInfo->downloaded = status; - tqrepaint(); + repaint(); } bool CameraIconViewItem::isDownloaded() const @@ -218,7 +218,7 @@ void CameraIconViewItem::toggleLock() else d->itemInfo->writePermissions = 0; - tqrepaint(); + repaint(); } void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& downloadName) diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index f717aea0..803e9367 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -375,7 +375,7 @@ void CameraIconView::setThumbnail(const TQString& folder, const TQString& filena return; item->setThumbnail(image); - item->tqrepaint(); + item->repaint(); } void CameraIconView::ensureItemVisible(CameraIconViewItem *item) diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index a9c2519c..07f58051 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -1015,9 +1015,9 @@ void CameraUI::slotUpload() // Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete // or unavailable(dcraw_0)(see file #121242 in B.K.O). #if KDCRAW_VERSION < 0x000106 - patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); + patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); #else - patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::KDcraw::rawFiles()))); + patternList.append(TQString("\n%1|Camera RAW files").arg(TQString(KDcrawIface::KDcraw::rawFiles()))); #endif fileformats = patternList.join("\n"); @@ -1062,7 +1062,7 @@ void CameraUI::slotUploadItems(const KURL::List& urls) { TQString msg(i18n("Camera Folder <b>%1</b> already contains item <b>%2</b><br>" "Please enter a new file name (without extension):") - .tqarg(cameraFolder).tqarg(fi.fileName())); + .arg(cameraFolder).arg(fi.fileName())); #if KDE_IS_VERSION(3,2,0) name = KInputDialog::getText(i18n("File already exists"), msg, name, &ok, this); @@ -1125,8 +1125,8 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) "to download and process selected pictures from camera.\n\n" "Estimated space require: %1\n" "Available free space: %2") - .tqarg(KIO::convertSizeFromKB(dSize)) - .tqarg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); + .arg(KIO::convertSizeFromKB(dSize)) + .arg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); return; } @@ -1621,8 +1621,8 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub, else { errMsg = i18n("A file with same name (%1) exists in folder %2") - .tqarg(sub) - .tqarg(parentURL.path()); + .arg(sub) + .arg(parentURL.path()); return false; } } @@ -1634,7 +1634,7 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const TQString& sub, if (!parent) { errMsg = i18n("Failed to find Album for path '%1'") - .tqarg(parentURL.path()); + .arg(parentURL.path()); return false; } diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index afece0e7..fe80e052 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -109,7 +109,7 @@ void FreeSpaceWidget::setEstimatedDSizeKb(unsigned long dSize) { d->dSizeKb = dSize; updatePixmap(); - tqrepaint(); + repaint(); } unsigned long FreeSpaceWidget::estimatedDSizeKb() @@ -173,7 +173,7 @@ void FreeSpaceWidget::updatePixmap() p.drawRect(gRect); TQRect tRect(fimgPix.height()+2, 1, d->pix.width()-2-fimgPix.width()-2, d->pix.height()-2); - TQString text = TQString("%1%").tqarg(peUsed); + TQString text = TQString("%1%").arg(peUsed); p.setPen(colorGroup().text()); TQFontMetrics fontMt = p.fontMetrics(); TQRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(), @@ -246,7 +246,7 @@ void FreeSpaceWidget::slotAvailableFreeSpace(const unsigned long& kBSize, const d->percentUsed = 100 - (int)(100.0*kBAvail/kBSize); d->isValid = true; updatePixmap(); - tqrepaint(); + repaint(); } } // namespace Digikam diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp index 6e50d0f1..28b7f3e2 100644 --- a/digikam/utilities/cameragui/gpcamera.cpp +++ b/digikam/utilities/cameragui/gpcamera.cpp @@ -962,15 +962,15 @@ bool GPCamera::cameraSummary(TQString& summary) "Upload items: %7\n" "Create directories: %8\n" "Delete directories: %9\n\n") - .tqarg(title()) - .tqarg(model()) - .tqarg(port()) - .tqarg(path()) - .tqarg(thumbnailSupport() ? i18n("yes") : i18n("no")) - .tqarg(deleteSupport() ? i18n("yes") : i18n("no")) - .tqarg(uploadSupport() ? i18n("yes") : i18n("no")) - .tqarg(mkDirSupport() ? i18n("yes") : i18n("no")) - .tqarg(delDirSupport() ? i18n("yes") : i18n("no")); + .arg(title()) + .arg(model()) + .arg(port()) + .arg(path()) + .arg(thumbnailSupport() ? i18n("yes") : i18n("no")) + .arg(deleteSupport() ? i18n("yes") : i18n("no")) + .arg(uploadSupport() ? i18n("yes") : i18n("no")) + .arg(mkDirSupport() ? i18n("yes") : i18n("no")) + .arg(delDirSupport() ? i18n("yes") : i18n("no")); summary.append(TQString(sum.text)); diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 4d6192df..7bc341f5 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -355,7 +355,7 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const name += seq; if (d->addCameraNameBox->isChecked()) - name += TQString("-%1").tqarg(d->cameraTitle.simplifyWhiteSpace().replace(" ", "")); + name += TQString("-%1").arg(d->cameraTitle.simplifyWhiteSpace().replace(" ", "")); name += d->renameCustomSuffix->text(); name += extension; diff --git a/digikam/utilities/cameragui/umscamera.cpp b/digikam/utilities/cameragui/umscamera.cpp index ed5e4163..01e6d982 100644 --- a/digikam/utilities/cameragui/umscamera.cpp +++ b/digikam/utilities/cameragui/umscamera.cpp @@ -491,10 +491,10 @@ bool UMSCamera::cameraSummary(TQString& summary) "Model: %2<br>" "Port: %3<br>" "Path: %4<br>") - .tqarg(title()) - .tqarg(model()) - .tqarg(port()) - .tqarg(path())); + .arg(title()) + .arg(model()) + .arg(port()) + .arg(path())); return true; } diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 06a99b7e..1dec7b41 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -469,7 +469,7 @@ void Canvas::resizeEvent(TQResizeEvent* e) updateContentsSize(false); - // No need to tqrepaint. its called + // No need to repaint. its called // automatically after resize // To be sure than corner widget used to pan image will be hide/show @@ -523,7 +523,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) { for (int i = x1 ; i < x2 ; i += d->tileSize) { - TQString key = TQString("%1,%2").tqarg(i).tqarg(j); + TQString key = TQString("%1,%2").arg(i).arg(j); TQPixmap *pix = d->tileCache.find(key); if (!pix) @@ -690,7 +690,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e) d->pressedMoving = true; d->tileCache.clear(); - viewport()->tqrepaint(false); + viewport()->repaint(false); return; } diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 5bb7f70e..571c7f6e 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -79,10 +79,10 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, TQLabel *logo = new TQLabel(page); TQLabel *message = new TQLabel(page); TQLabel *currentProfileTitle = new TQLabel(i18n("Current workspace color profile:"), page); - TQLabel *currentProfileDesc = new TQLabel(TQString("<b>%1</b>").tqarg(m_iccTrans->getOutpoutProfileDescriptor()), page); + TQLabel *currentProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getOutpoutProfileDescriptor()), page); TQPushButton *currentProfInfo = new TQPushButton(i18n("Info..."), page); TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page); - TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").tqarg(m_iccTrans->getEmbeddedProfileDescriptor()), page); + TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); KSeparator *line = new KSeparator(Qt::Horizontal, page); diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index b9a02ff1..dcc90407 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -337,7 +337,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription } else { - // To tqrepaint image in canvas before to ask about to apply ICC profile. + // To repaint image in canvas before to ask about to apply ICC profile. emit signalImageLoaded(d->filename, valRet); DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); @@ -390,7 +390,7 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DDebug() << "Embedded profile: " << trans.getEmbeddedProfileDescriptor() << endl; - // To tqrepaint image in canvas before to ask about to apply ICC profile. + // To repaint image in canvas before to ask about to apply ICC profile. emit signalImageLoaded(d->filename, valRet); DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index 81c5c349..4323fca0 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -69,8 +69,8 @@ UndoCache::UndoCache() KGlobal::instance()->aboutData()->programName() + '/'); d->cachePrefix = TQString("%1undocache-%2") - .tqarg(cacheDir) - .tqarg(getpid()); + .arg(cacheDir) + .arg(getpid()); } UndoCache::~UndoCache() @@ -99,8 +99,8 @@ void UndoCache::clear() bool UndoCache::putData(int level, int w, int h, int bytesDepth, uchar* data) { TQString cacheFile = TQString("%1-%2.bin") - .tqarg(d->cachePrefix) - .tqarg(level); + .arg(d->cachePrefix) + .arg(level); TQFile file(cacheFile); @@ -129,8 +129,8 @@ bool UndoCache::putData(int level, int w, int h, int bytesDepth, uchar* data) uchar* UndoCache::getData(int level, int& w, int& h, int& bytesDepth, bool del) { TQString cacheFile = TQString("%1-%2.bin") - .tqarg(d->cachePrefix) - .tqarg(level); + .arg(d->cachePrefix) + .arg(level); TQFile file(cacheFile); if (!file.open(IO_ReadOnly)) @@ -166,8 +166,8 @@ uchar* UndoCache::getData(int level, int& w, int& h, int& bytesDepth, bool del) void UndoCache::erase(int level) { TQString cacheFile = TQString("%1-%2.bin") - .tqarg(d->cachePrefix) - .tqarg(level); + .arg(d->cachePrefix) + .arg(level); if(d->cacheFilenames.find(cacheFile) == d->cacheFilenames.end()) return; diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index cb75a31a..a559f33c 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -627,13 +627,13 @@ void EditorWindow::printImage(KURL url) KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, TQString(appName.append(" page")).ascii() )); - if ( printer.setup( this, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) + if ( printer.setup( this, i18n("Print %1").arg(printer.docName().section('/', -1)) ) ) { ImagePrint printOperations(image, printer, url.filename()); if (!printOperations.printImageWithTQt()) { KMessageBox::error(this, i18n("Failed to print file: '%1'") - .tqarg(url.filename())); + .arg(url.filename())); } } } @@ -1167,7 +1167,7 @@ bool EditorWindow::promptForOverWrite() { TQFileInfo fi(m_canvas->currentImageFilePath()); TQString warnMsg(i18n("About to overwrite file \"%1\"\nAre you sure?") - .tqarg(fi.fileName())); + .arg(fi.fileName())); return (KMessageBox::warningContinueCancel(this, warnMsg, i18n("Warning"), @@ -1189,7 +1189,7 @@ bool EditorWindow::promptUserSave(const KURL& url) int result = KMessageBox::warningYesNoCancel(this, i18n("The image '%1' has been modified.\n" "Do you want to save it?") - .tqarg(url.filename()), + .arg(url.filename()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()); @@ -1282,8 +1282,8 @@ void EditorWindow::slotSelected(bool val) // Update status bar if (val) - d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y()) - .tqarg(sel.width()).tqarg(sel.height())); + d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y()) + .arg(sel.width()).arg(sel.height())); else d->selectLabel->setText(i18n("No selection")); } @@ -1350,7 +1350,7 @@ void EditorWindow::slotLoadingFinished(const TQString& filename, bool success) if (!success && filename != TQString()) { TQFileInfo fi(filename); - TQString message = i18n("Failed to load image \"%1\"").tqarg(fi.fileName()); + TQString message = i18n("Failed to load image \"%1\"").arg(fi.fileName()); KMessageBox::error(this, message); DWarning() << "Failed to load image " << fi.fileName() << endl; } @@ -1400,8 +1400,8 @@ void EditorWindow::slotSavingFinished(const TQString& filename, bool success) if (!m_savingContext->abortingSaving) { KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".") - .tqarg(m_savingContext->destinationURL.filename()) - .tqarg(m_savingContext->destinationURL.path())); + .arg(m_savingContext->destinationURL.filename()) + .arg(m_savingContext->destinationURL.path())); } finishSaving(false); return; @@ -1441,8 +1441,8 @@ void EditorWindow::slotSavingFinished(const TQString& filename, bool success) if (!m_savingContext->abortingSaving) { KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".") - .tqarg(m_savingContext->destinationURL.filename()) - .tqarg(m_savingContext->destinationURL.path())); + .arg(m_savingContext->destinationURL.filename()) + .arg(m_savingContext->destinationURL.path())); } finishSaving(false); return; @@ -1609,7 +1609,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) if ( !imgExtPattern.contains( m_savingContext->format.upper() ) ) { KMessageBox::error(this, i18n("Target image file format \"%1\" unsupported.") - .tqarg(m_savingContext->format)); + .arg(m_savingContext->format)); DWarning() << k_funcinfo << "target image file format " << m_savingContext->format << " unsupported!" << endl; return false; } @@ -1619,8 +1619,8 @@ bool EditorWindow::startingSaveAs(const KURL& url) if (!newURL.isValid()) { KMessageBox::error(this, i18n("Failed to save file\n\"%1\" to\n\"%2\".") - .tqarg(newURL.filename()) - .tqarg(newURL.path().section('/', -2, -2))); + .arg(newURL.filename()) + .arg(newURL.path().section('/', -2, -2))); DWarning() << k_funcinfo << "target URL is not valid !" << endl; return false; } @@ -1651,7 +1651,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) KMessageBox::warningYesNo( this, i18n("A file named \"%1\" already " "exists. Are you sure you want " "to overwrite it?") - .tqarg(newURL.filename()), + .arg(newURL.filename()), i18n("Overwrite File?"), i18n("Overwrite"), KStdGuiItem::cancel() ); @@ -1697,7 +1697,7 @@ bool EditorWindow::checkPermissions(const KURL& url) "for the file named \"%1\". " "Are you sure you want " "to overwrite it?") - .tqarg(url.filename()), + .arg(url.filename()), i18n("Overwrite File?"), i18n("Overwrite"), KStdGuiItem::cancel() ); @@ -1867,8 +1867,8 @@ void EditorWindow::slotToggleSlideShow() void EditorWindow::slotSelectionChanged(const TQRect& sel) { - d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y()) - .tqarg(sel.width()).tqarg(sel.height())); + d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y()) + .arg(sel.width()).arg(sel.height())); } void EditorWindow::slotRawCameraList() @@ -1905,7 +1905,7 @@ void EditorWindow::slotChangeTheme(const TQString& theme) void EditorWindow::setToolStartProgress(const TQString& toolName) { m_nameLabel->setProgressValue(0); - m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, TQString("%1: ").tqarg(toolName)); + m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, TQString("%1: ").arg(toolName)); } void EditorWindow::setToolProgress(int progress) diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index e1bedc9f..aa842e07 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -190,7 +190,7 @@ uchar* ImageIface::getPreviewImage() const } TQSize sz(im->width(), im->height()); - sz.tqscale(d->constrainWidth, d->constrainHeight, TQSize::ScaleMin); + sz.scale(d->constrainWidth, d->constrainHeight, TQSize::ScaleMin); d->previewImage = im->smoothScale(sz.width(), sz.height()); d->previewWidth = d->previewImage.width(); diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index 897cba55..b3a14401 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -444,7 +444,7 @@ void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving) } if (!caption.isEmpty()) - setCaption(i18n("Image Editor - %1").tqarg(caption)); + setCaption(i18n("Image Editor - %1").arg(caption)); else setCaption(i18n("Image Editor")); @@ -609,7 +609,7 @@ void ImageWindow::slotChanged() TQSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); TQString 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); m_resLabel->setText(str); if (d->urlCurrent.isValid()) @@ -717,8 +717,8 @@ void ImageWindow::slotUpdateItemInfo() m_rotatedOrFlipped = false; TQString text = d->urlCurrent.filename() + i18n(" (%2 of %3)") - .tqarg(TQString::number(index+1)) - .tqarg(TQString::number(d->urlList.count())); + .arg(TQString::number(index+1)) + .arg(TQString::number(d->urlList.count())); m_nameLabel->setText(text); if (d->urlList.count() == 1) @@ -1178,7 +1178,7 @@ void ImageWindow::dropEvent(TQDropEvent *e) if (talbum) ATitle = talbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").tqarg(ATitle), true); + i18n("Album \"%1\"").arg(ATitle), true); e->accept(); } else if (AlbumDrag::decode(e, urls, albumID)) @@ -1205,7 +1205,7 @@ void ImageWindow::dropEvent(TQDropEvent *e) if (palbum) ATitle = palbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").tqarg(ATitle), true); + i18n("Album \"%1\"").arg(ATitle), true); e->accept(); } else if(TagDrag::canDecode(e)) @@ -1237,7 +1237,7 @@ void ImageWindow::dropEvent(TQDropEvent *e) if (talbum) ATitle = talbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").tqarg(ATitle), true); + i18n("Album \"%1\"").arg(ATitle), true); e->accept(); } else diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index e1581ae7..3bdd5cc8 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -186,7 +186,7 @@ void RawPreview::slotImageLoaded(const LoadingDescription& description, const DI p.drawText(0, 0, pix.width(), pix.height(), TQt::AlignCenter|TQt::WordBreak, i18n("Cannot decode RAW image for\n\"%1\"") - .tqarg(TQFileInfo(d->loadingDesc.filePath).fileName())); + .arg(TQFileInfo(d->loadingDesc.filePath).fileName())); p.end(); // three copies - but the image is small setPostProcessedImage(DImg(pix.convertToImage())); diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 3bc41008..1981276a 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -560,7 +560,7 @@ void RawSettingsBox::readSettings() for (int j = 0 ; j <= 17 ; j++) { TQPoint disable(-1, -1); - TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").arg(j), &disable); if (!d->decodingSettingsBox->sixteenBits() && p != disable) { // Restore point as 16 bits depth. @@ -627,7 +627,7 @@ void RawSettingsBox::writeSettings() p.setX(p.x()*255); p.setY(p.y()*255); } - config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").arg(j), p); } config->writeEntry("Settings Page", d->tabView->currentPage()); @@ -709,13 +709,13 @@ void RawSettingsBox::slotChannelChanged(int channel) break; } - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); } void RawSettingsBox::slotScaleChanged(int scale) { d->histogramWidget->m_scaleType = scale; - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); } void RawSettingsBox::slotColorsChanged(int color) @@ -735,7 +735,7 @@ void RawSettingsBox::slotColorsChanged(int color) break; } - d->histogramWidget->tqrepaint(false); + d->histogramWidget->repaint(false); } } // NameSpace Digikam diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 8589e938..fb29f720 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -175,7 +175,7 @@ bool ImagePrint::printImageWithTQt() : KPrinter::Landscape ); // Scale image to fit pagesize - size.tqscale( w, h, TQSize::ScaleMin ); + size.scale( w, h, TQSize::ScaleMin ); } else { @@ -217,32 +217,32 @@ bool ImagePrint::printImageWithTQt() } else if (resp == KMessageBox::No) { // Shrink - size.tqscale(w, h, TQSize::ScaleMin); + size.scale(w, h, TQSize::ScaleMin); } } } // Align image. - int tqalignment = (m_printer.option("app-imageeditor-tqalignment").isEmpty() ? - TQt::AlignCenter : m_printer.option("app-imageeditor-tqalignment").toInt()); + int alignment = (m_printer.option("app-imageeditor-alignment").isEmpty() ? + TQt::AlignCenter : m_printer.option("app-imageeditor-alignment").toInt()); int x = 0; int y = 0; - // x - tqalignment - if ( tqalignment & TQt::AlignHCenter ) + // x - alignment + if ( alignment & TQt::AlignHCenter ) x = (w - size.width())/2; - else if ( tqalignment & TQt::AlignLeft ) + else if ( alignment & TQt::AlignLeft ) x = 0; - else if ( tqalignment & TQt::AlignRight ) + else if ( alignment & TQt::AlignRight ) x = w - size.width(); - // y - tqalignment - if ( tqalignment & TQt::AlignVCenter ) + // y - alignment + if ( alignment & TQt::AlignVCenter ) y = (h - size.height())/2; - else if ( tqalignment & TQt::AlignTop ) + else if ( alignment & TQt::AlignTop ) y = 0; - else if ( tqalignment & TQt::AlignBottom ) + else if ( alignment & TQt::AlignBottom ) y = h - size.height(); // Perform the actual drawing. @@ -492,7 +492,7 @@ void ImageEditorPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts, boo TQString t = "true"; TQString f = "false"; - opts["app-imageeditor-tqalignment"] = TQString::number(getPosition(d->position->currentText())); + opts["app-imageeditor-alignment"] = TQString::number(getPosition(d->position->currentText())); opts["app-imageeditor-printFilename"] = d->addFileName->isChecked() ? t : f; opts["app-imageeditor-blackwhite"] = d->blackwhite->isChecked() ? t : f; opts["app-imageeditor-scaleToFit"] = d->scaleToFit->isChecked() ? t : f; @@ -514,7 +514,7 @@ void ImageEditorPrintDialogPage::setOptions( const TQMap<TQString,TQString>& opt double dVal; int iVal; - iVal = opts["app-imageeditor-tqalignment"].toInt( &ok ); + iVal = opts["app-imageeditor-alignment"].toInt( &ok ); if (ok) { stVal = setPosition(iVal); @@ -563,92 +563,92 @@ void ImageEditorPrintDialogPage::setOptions( const TQMap<TQString,TQString>& opt } int ImageEditorPrintDialogPage::getPosition(const TQString& align) { - int tqalignment; + int alignment; if (align == i18n("Central-Left")) { - tqalignment = TQt::AlignLeft | TQt::AlignVCenter; + alignment = TQt::AlignLeft | TQt::AlignVCenter; } else if (align == i18n("Central-Right")) { - tqalignment = TQt::AlignRight | TQt::AlignVCenter; + alignment = TQt::AlignRight | TQt::AlignVCenter; } else if (align == i18n("Top-Left")) { - tqalignment = TQt::AlignTop | TQt::AlignLeft; + alignment = TQt::AlignTop | TQt::AlignLeft; } else if (align == i18n("Top-Right")) { - tqalignment = TQt::AlignTop | TQt::AlignRight; + alignment = TQt::AlignTop | TQt::AlignRight; } else if (align == i18n("Bottom-Left")) { - tqalignment = TQt::AlignBottom | TQt::AlignLeft; + alignment = TQt::AlignBottom | TQt::AlignLeft; } else if (align == i18n("Bottom-Right")) { - tqalignment = TQt::AlignBottom | TQt::AlignRight; + alignment = TQt::AlignBottom | TQt::AlignRight; } else if (align == i18n("Top-Central")) { - tqalignment = TQt::AlignTop | TQt::AlignHCenter; + alignment = TQt::AlignTop | TQt::AlignHCenter; } else if (align == i18n("Bottom-Central")) { - tqalignment = TQt::AlignBottom | TQt::AlignHCenter; + alignment = TQt::AlignBottom | TQt::AlignHCenter; } else { // Central - tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter + alignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter } - return tqalignment; + return alignment; } TQString ImageEditorPrintDialogPage::setPosition(int align) { - TQString tqalignment; + TQString alignment; if (align == (TQt::AlignLeft | TQt::AlignVCenter)) { - tqalignment = i18n("Central-Left"); + alignment = i18n("Central-Left"); } else if (align == (TQt::AlignRight | TQt::AlignVCenter)) { - tqalignment = i18n("Central-Right"); + alignment = i18n("Central-Right"); } else if (align == (TQt::AlignTop | TQt::AlignLeft)) { - tqalignment = i18n("Top-Left"); + alignment = i18n("Top-Left"); } else if (align == (TQt::AlignTop | TQt::AlignRight)) { - tqalignment = i18n("Top-Right"); + alignment = i18n("Top-Right"); } else if (align == (TQt::AlignBottom | TQt::AlignLeft)) { - tqalignment = i18n("Bottom-Left"); + alignment = i18n("Bottom-Left"); } else if (align == (TQt::AlignBottom | TQt::AlignRight)) { - tqalignment = i18n("Bottom-Right"); + alignment = i18n("Bottom-Right"); } else if (align == (TQt::AlignTop | TQt::AlignHCenter)) { - tqalignment = i18n("Top-Central"); + alignment = i18n("Top-Central"); } else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) { - tqalignment = i18n("Bottom-Central"); + alignment = i18n("Bottom-Central"); } else { // Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter) - tqalignment = i18n("Central"); + alignment = i18n("Central"); } - return tqalignment; + return alignment; } void ImageEditorPrintDialogPage::toggleScaling( bool enable ) diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 2895c4e6..d473b779 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -617,7 +617,7 @@ void ImageResize::slotUser3() { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Resizing settings text file.") - .tqarg(loadBlowupFile.fileName())); + .arg(loadBlowupFile.fileName())); file.close(); return; } diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index a0b369cf..6a6bf7d5 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -279,7 +279,7 @@ void LightTablePreview::slotGotImagePreview(const LoadingDescription &descriptio p.drawText(0, 0, pix.width(), pix.height(), TQt::AlignCenter|TQt::WordBreak, i18n("Unable to display preview for\n\"%1\"") - .tqarg(info.fileName())); + .arg(info.fileName())); p.end(); setImage(DImg(pix.convertToImage())); diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 3ec827a2..6338db27 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -631,7 +631,7 @@ void LightTableWindow::refreshStatusBar() default: d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, i18n("%1 items on Light Table") - .tqarg(d->barView->countItems())); + .arg(d->barView->countItems())); break; } } @@ -1545,7 +1545,7 @@ void LightTableWindow::slotLeftZoomFactorChanged(double zoom) int size = (int)((zoom - b) /a); d->leftZoomBar->setZoomSliderValue(size); - d->leftZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); + d->leftZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); d->leftZoomBar->setEnableZoomPlus(true); d->leftZoomBar->setEnableZoomMinus(true); @@ -1568,7 +1568,7 @@ void LightTableWindow::slotRightZoomFactorChanged(double zoom) int size = (int)((zoom - b) /a); d->rightZoomBar->setZoomSliderValue(size); - d->rightZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); + d->rightZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); d->rightZoomBar->setEnableZoomPlus(true); d->rightZoomBar->setEnableZoomMinus(true); diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index b76156d1..d68aaa23 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -188,13 +188,13 @@ CameraSelection::CameraSelection( TQWidget* parent ) link->setText(i18n("<p>To set a <b>USB Mass Storage</b> camera<br>" "(which looks like a removable drive when mounted on your desktop), please<br>" "use <a href=\"umscamera\">%1</a> from camera list.</p>") - .tqarg(d->UMSCameraNameShown)); + .arg(d->UMSCameraNameShown)); KActiveLabel* link2 = new KActiveLabel(box2); link2->setText(i18n("<p>To set a <b>Generic PTP USB Device</b><br>" "(which uses the Picture Transfer Protocol), please<br>" "use <a href=\"ptpcamera\">%1</a> from the camera list.</p>") - .tqarg(d->PTPCameraNameShown)); + .arg(d->PTPCameraNameShown)); KActiveLabel* explanation = new KActiveLabel(box2); explanation->setText(i18n("<p>A complete list of camera settings to use is<br>" diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index 77898d11..4d935dbe 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -254,12 +254,12 @@ void SetupCamera::slotAutoDetectCamera() if (d->listView->findItem(model, 1)) { - KMessageBox::information(this, i18n("Camera '%1' (%2) is already in list.").tqarg(model).tqarg(port)); + KMessageBox::information(this, i18n("Camera '%1' (%2) is already in list.").arg(model).arg(port)); } else { KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") - .tqarg(model).tqarg(port)); + .arg(model).arg(port)); new TQListViewItem(d->listView, model, model, port, "/", TQDateTime::currentDateTime().toString(Qt::ISODate)); } diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 0de80c85..fe8cdce2 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -362,7 +362,7 @@ void SlideShow::updatePixmap() if (!photoInfo.exposureTime.isEmpty()) str += TQString(" / "); - str += i18n("%1 ISO").tqarg(photoInfo.sensitivity); + str += i18n("%1 ISO").arg(photoInfo.sensitivity); } printInfoText(p, offset, str); @@ -393,9 +393,9 @@ void SlideShow::updatePixmap() str += TQString(" / "); if (!photoInfo.focalLength.isEmpty()) - str += TQString("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm); + str += TQString("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); else - str += TQString("35mm: %1)").tqarg(photoInfo.focalLength35mm); + str += TQString("35mm: %1)").arg(photoInfo.focalLength35mm); } printInfoText(p, offset, str); @@ -416,9 +416,9 @@ void SlideShow::updatePixmap() if (d->settings.printName) { - str = TQString("%1 (%2/%3)").tqarg(d->currentImage.filename()) - .tqarg(TQString::number(d->fileIndex + 1)) - .tqarg(TQString::number(d->settings.fileList.count())); + str = TQString("%1 (%2/%3)").arg(d->currentImage.filename()) + .arg(TQString::number(d->fileIndex + 1)) + .arg(TQString::number(d->settings.fileList.count())); printInfoText(p, offset, str); } @@ -431,7 +431,7 @@ void SlideShow::updatePixmap() p.drawText(0, 0, d->pixmap.width(), d->pixmap.height(), TQt::AlignCenter|TQt::WordBreak, i18n("Cannot display image\n\"%1\"") - .tqarg(d->currentImage.fileName())); + .arg(d->currentImage.fileName())); } } else |