TDE
/
digikam
6
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent ae7d9301db
commit 2b3aa210d1
298 changed files with 2062 additions and 2062 deletions
Show Stats Download Patch File Download Diff File

12
digikam/digikam/album.cpp
Unescape View File

@ -247,7 +247,7 @@ PAlbum::PAlbum(const TQString& title, int id, bool root)
setTitle(title);
m_caption = "";
m_collection = "";
m_date = TQDate::tqcurrentDate();
m_date = TQDate::currentDate();
}
PAlbum::~PAlbum()
@ -458,10 +458,10 @@ KURL DAlbum::kurl() const
KURL u;
u.setProtocol("digikamdates");
u.setPath(TQString("/%1/%2/%3/%4")
.tqarg(m_date.year())
.tqarg(m_date.month())
.tqarg(endDate.year())
.tqarg(endDate.month()));
.arg(m_date.year())
.arg(m_date.month())
.arg(endDate.year())
.arg(endDate.month()));
return u;
}
@ -516,7 +516,7 @@ AlbumIterator& AlbumIterator::operator++()
if ( m_current == m_root )
{
// we have reached the root.
// that means no more tqchildren
// that means no more children
m_current = 0;
break;
}

8
digikam/digikam/album.h
Unescape View File

@ -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:

176
digikam/digikam/albumdb.cpp
Unescape View File

@ -432,7 +432,7 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption,
execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) "
"VALUES('%1', '%2', '%3', '%4');")
.tqarg(escapeString(url),
.arg(escapeString(url),
date.toString(Qt::ISODate),
escapeString(caption),
escapeString(collection)));
@ -444,29 +444,29 @@ int AlbumDB::addAlbum(const TQString& url, const TQString& caption,
void AlbumDB::setAlbumCaption(int albumID, const TQString& caption)
{
execSql( TQString("UPDATE Albums SET caption='%1' WHERE id=%2;")
.tqarg(escapeString(caption),
.arg(escapeString(caption),
TQString::number(albumID) ));
}
void AlbumDB::setAlbumCollection(int albumID, const TQString& collection)
{
execSql( TQString("UPDATE Albums SET collection='%1' WHERE id=%2;")
.tqarg(escapeString(collection),
.arg(escapeString(collection),
TQString::number(albumID)) );
}
void AlbumDB::setAlbumDate(int albumID, const TQDate& date)
{
execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;")
.tqarg(date.toString(Qt::ISODate))
.tqarg(albumID) );
.arg(date.toString(Qt::ISODate))
.arg(albumID) );
}
void AlbumDB::setAlbumIcon(int albumID, TQ_LLONG iconID)
{
execSql( TQString("UPDATE Albums SET icon=%1 WHERE id=%2;")
.tqarg(iconID)
.tqarg(albumID) );
.arg(iconID)
.arg(albumID) );
}
@ -478,7 +478,7 @@ TQString AlbumDB::getAlbumIcon(int albumID)
" LEFT OUTER JOIN Images AS I ON I.id=A.icon \n "
" LEFT OUTER JOIN Albums AS B ON B.id=I.dirid \n "
"WHERE A.id=%1;")
.tqarg(albumID), &values );
.arg(albumID), &values );
if (values.isEmpty())
return TQString();
@ -499,7 +499,7 @@ TQString AlbumDB::getAlbumIcon(int albumID)
void AlbumDB::deleteAlbum(int albumID)
{
execSql( TQString("DELETE FROM Albums WHERE id=%1")
.tqarg(albumID) );
.arg(albumID) );
}
int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconKDE,
@ -510,8 +510,8 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK
if (!execSql( TQString("INSERT INTO Tags (pid, name) "
"VALUES( %1, '%2')")
.tqarg(parentTagID)
.tqarg(escapeString(name))))
.arg(parentTagID)
.arg(escapeString(name))))
{
return -1;
}
@ -521,14 +521,14 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK
if (!iconKDE.isEmpty())
{
execSql( TQString("UPDATE Tags SET iconkde='%1' WHERE id=%2;")
.tqarg(escapeString(iconKDE),
.arg(escapeString(iconKDE),
TQString::number(id)));
}
else
{
execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;")
.tqarg(iconID)
.tqarg(id));
.arg(iconID)
.arg(id));
}
return id;
@ -537,7 +537,7 @@ int AlbumDB::addTag(int parentTagID, const TQString& name, const TQString& iconK
void AlbumDB::deleteTag(int tagID)
{
execSql( TQString("DELETE FROM Tags WHERE id=%1")
.tqarg(tagID) );
.arg(tagID) );
}
void AlbumDB::setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID)
@ -545,14 +545,14 @@ void AlbumDB::setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID)
if (!iconKDE.isEmpty())
{
execSql( TQString("UPDATE Tags SET iconkde='%1', icon=0 WHERE id=%2;")
.tqarg(escapeString(iconKDE),
.arg(escapeString(iconKDE),
TQString::number(tagID)));
}
else
{
execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;")
.tqarg(iconID)
.tqarg(tagID));
.arg(iconID)
.arg(tagID));
}
}
@ -564,7 +564,7 @@ TQString AlbumDB::getTagIcon(int tagID)
" LEFT OUTER JOIN Images AS I ON I.id=T.icon \n "
" LEFT OUTER JOIN Albums AS A ON A.id=I.dirid \n "
"WHERE T.id=%1;")
.tqarg(tagID), &values );
.arg(tagID), &values );
if (values.isEmpty())
return TQString();
@ -597,8 +597,8 @@ TQString AlbumDB::getTagIcon(int tagID)
void AlbumDB::setTagParentID(int tagID, int newParentTagID)
{
execSql( TQString("UPDATE Tags SET pid=%1 WHERE id=%2;")
.tqarg(newParentTagID)
.tqarg(tagID) );
.arg(newParentTagID)
.arg(tagID) );
}
int AlbumDB::addSearch(const TQString& name, const KURL& url)
@ -624,7 +624,7 @@ void AlbumDB::updateSearch(int searchID, const TQString& name,
{
TQString str = TQString("UPDATE Searches SET name='$$@@$$', url='$$##$$' \n"
"WHERE id=%1")
.tqarg(searchID);
.arg(searchID);
str.replace("$$@@$$", escapeString(name));
str.replace("$$##$$", escapeString(url.url()));
@ -634,14 +634,14 @@ void AlbumDB::updateSearch(int searchID, const TQString& name,
void AlbumDB::deleteSearch(int searchID)
{
execSql( TQString("DELETE FROM Searches WHERE id=%1")
.tqarg(searchID) );
.arg(searchID) );
}
void AlbumDB::setSetting(const TQString& keyword,
const TQString& value )
{
execSql( TQString("REPLACE into Settings VALUES ('%1','%2');")
.tqarg(escapeString(keyword),
.arg(escapeString(keyword),
escapeString(value) ));
}
@ -650,7 +650,7 @@ TQString AlbumDB::getSetting(const TQString& keyword)
TQStringList values;
execSql( TQString("SELECT value FROM Settings "
"WHERE keyword='%1';")
.tqarg(escapeString(keyword)), &values );
.arg(escapeString(keyword)), &values );
if (values.isEmpty())
return TQString();
@ -729,7 +729,7 @@ TQString AlbumDB::getItemCaption(TQ_LLONG imageID)
execSql( TQString("SELECT caption FROM Images "
"WHERE id=%1;")
.tqarg(imageID),
.arg(imageID),
&values );
if (!values.isEmpty())
@ -744,8 +744,8 @@ TQString AlbumDB::getItemCaption(int albumID, const TQString& name)
execSql( TQString("SELECT caption FROM Images "
"WHERE dirid=%1 AND name='%2';")
.tqarg(albumID)
.tqarg(escapeString(name)),
.arg(albumID)
.arg(escapeString(name)),
&values );
if (!values.isEmpty())
@ -760,7 +760,7 @@ TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID)
execSql( TQString("SELECT datetime FROM Images "
"WHERE id=%1;")
.tqarg(imageID),
.arg(imageID),
&values );
if (values.isEmpty())
@ -775,8 +775,8 @@ TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name)
execSql( TQString("SELECT datetime FROM Images "
"WHERE dirid=%1 AND name='%2';")
.tqarg(albumID)
.tqarg(escapeString(name)),
.arg(albumID)
.arg(escapeString(name)),
&values );
if (values.isEmpty())
@ -791,8 +791,8 @@ TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name)
execSql( TQString("SELECT id FROM Images "
"WHERE dirid=%1 AND name='%2';")
.tqarg(albumID)
.tqarg(escapeString(name)),
.arg(albumID)
.arg(escapeString(name)),
&values );
if (values.isEmpty())
@ -809,7 +809,7 @@ TQStringList AlbumDB::getItemTagNames(TQ_LLONG imageID)
"WHERE id IN (SELECT tagid FROM ImageTags \n "
" WHERE imageid=%1) \n "
"ORDER BY name;")
.tqarg(imageID),
.arg(imageID),
&values );
return values;
@ -821,7 +821,7 @@ IntList AlbumDB::getItemTagIDs(TQ_LLONG imageID)
execSql( TQString("SELECT tagid FROM ImageTags \n "
"WHERE imageID=%1;")
.tqarg(imageID),
.arg(imageID),
&values );
IntList ids;
@ -847,7 +847,7 @@ bool AlbumDB::hasTags(const LLongList& imageIDList)
TQString sql = TQString("SELECT count(tagid) FROM ImageTags "
"WHERE imageid=%1 ")
.tqarg(imageIDList.first());
.arg(imageIDList.first());
LLongList::const_iterator iter = imageIDList.begin();
++iter;
@ -855,7 +855,7 @@ bool AlbumDB::hasTags(const LLongList& imageIDList)
while (iter != imageIDList.end())
{
sql += TQString(" OR imageid=%2 ")
.tqarg(*iter);
.arg(*iter);
++iter;
}
@ -879,7 +879,7 @@ IntList AlbumDB::getItemCommonTagIDs(const LLongList& imageIDList)
TQString sql = TQString("SELECT DISTINCT tagid FROM ImageTags "
"WHERE imageid=%1 ")
.tqarg(imageIDList.first());
.arg(imageIDList.first());
LLongList::const_iterator iter = imageIDList.begin();
++iter;
@ -887,7 +887,7 @@ IntList AlbumDB::getItemCommonTagIDs(const LLongList& imageIDList)
while (iter != imageIDList.end())
{
sql += TQString(" OR imageid=%2 ")
.tqarg(*iter);
.arg(*iter);
++iter;
}
@ -910,7 +910,7 @@ void AlbumDB::setItemCaption(TQ_LLONG imageID,const TQString& caption)
execSql( TQString("UPDATE Images SET caption='%1' "
"WHERE id=%2;")
.tqarg(escapeString(caption),
.arg(escapeString(caption),
TQString::number(imageID) ));
}
@ -920,7 +920,7 @@ void AlbumDB::setItemCaption(int albumID, const TQString& name, const TQString&
execSql( TQString("UPDATE Images SET caption='%1' "
"WHERE dirid=%2 AND name='%3';")
.tqarg(escapeString(caption),
.arg(escapeString(caption),
TQString::number(albumID),
escapeString(name)) );
}
@ -929,8 +929,8 @@ void AlbumDB::addItemTag(TQ_LLONG imageID, int tagID)
{
execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) "
"VALUES(%1, %2);")
.tqarg(imageID)
.tqarg(tagID) );
.arg(imageID)
.arg(tagID) );
if (!d->recentlyAssignedTags.contains(tagID))
{
@ -945,9 +945,9 @@ void AlbumDB::addItemTag(int albumID, const TQString& name, int tagID)
execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) \n "
"(SELECT id, %1 FROM Images \n "
" WHERE dirid=%2 AND name='%3');")
.tqarg(tagID)
.tqarg(albumID)
.tqarg(escapeString(name)) );
.arg(tagID)
.arg(albumID)
.arg(escapeString(name)) );
}
IntList AlbumDB::getRecentlyAssignedTags() const
@ -959,15 +959,15 @@ void AlbumDB::removeItemTag(TQ_LLONG imageID, int tagID)
{
execSql( TQString("DELETE FROM ImageTags "
"WHERE imageID=%1 AND tagid=%2;")
.tqarg(imageID)
.tqarg(tagID) );
.arg(imageID)
.arg(tagID) );
}
void AlbumDB::removeItemAllTags(TQ_LLONG imageID)
{
execSql( TQString("DELETE FROM ImageTags "
"WHERE imageID=%1;")
.tqarg(imageID) );
.arg(imageID) );
}
TQStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive)
@ -983,14 +983,14 @@ TQStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive)
"IN (SELECT DISTINCT id "
"FROM Albums "
"WHERE url='%1' OR url LIKE '\%%2\%')")
.tqarg(escapeString(url.path())).tqarg(escapeString(url.path(1))), &values);
.arg(escapeString(url.path())).arg(escapeString(url.path(1))), &values);
}
else
{
execSql( TQString("SELECT Images.name "
"FROM Images "
"WHERE Images.dirid=%1")
.tqarg(albumID), &values );
.arg(albumID), &values );
}
return values;
}
@ -1019,15 +1019,15 @@ int AlbumDB::getOrCreateAlbumId(const TQString& folder)
{
TQStringList values;
execSql( TQString("SELECT id FROM Albums WHERE url ='%1';")
.tqarg( escapeString(folder) ), &values);
.arg( escapeString(folder) ), &values);
int albumID;
if (values.isEmpty())
{
execSql( TQString ("INSERT INTO Albums (url, date) "
"VALUES ('%1','%2')")
.tqarg(escapeString(folder),
TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) );
.arg(escapeString(folder),
TQDateTime::currentDateTime().toString(Qt::ISODate)) );
albumID = sqlite3_last_insert_rowid(d->dataBase);
} else
albumID = values[0].toInt();
@ -1045,7 +1045,7 @@ TQ_LLONG AlbumDB::addItem(int albumID,
execSql ( TQString ("REPLACE INTO Images "
"( caption , datetime, name, dirid ) "
" VALUES ('%1','%2','%3',%4) " )
.tqarg(escapeString(comment),
.arg(escapeString(comment),
datetime.toString(Qt::ISODate),
escapeString(name),
TQString::number(albumID)) );
@ -1249,7 +1249,7 @@ int AlbumDB::getItemAlbum(TQ_LLONG imageID)
execSql ( TQString ("SELECT dirid FROM Images "
"WHERE id=%1;")
.tqarg(imageID),
.arg(imageID),
&values);
if (!values.isEmpty())
@ -1264,7 +1264,7 @@ TQString AlbumDB::getItemName(TQ_LLONG imageID)
execSql ( TQString ("SELECT name FROM Images "
"WHERE id=%1;")
.tqarg(imageID),
.arg(imageID),
&values);
if (!values.isEmpty())
@ -1278,7 +1278,7 @@ bool AlbumDB::setItemDate(TQ_LLONG imageID,
{
execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE id=%2;")
.tqarg(datetime.toString(Qt::ISODate),
.arg(datetime.toString(Qt::ISODate),
TQString::number(imageID)) );
return true;
@ -1289,7 +1289,7 @@ bool AlbumDB::setItemDate(int albumID, const TQString& name,
{
execSql ( TQString ("UPDATE Images SET datetime='%1'"
"WHERE dirid=%2 AND name='%3';")
.tqarg(datetime.toString(Qt::ISODate),
.arg(datetime.toString(Qt::ISODate),
TQString::number(albumID),
escapeString(name)) );
@ -1301,9 +1301,9 @@ void AlbumDB::setItemRating(TQ_LLONG imageID, int rating)
execSql ( TQString ("REPLACE INTO ImageProperties "
"(imageid, property, value) "
"VALUES(%1, '%2', '%3');")
.tqarg(imageID)
.tqarg("Rating")
.tqarg(rating) );
.arg(imageID)
.arg("Rating")
.arg(rating) );
}
int AlbumDB::getItemRating(TQ_LLONG imageID)
@ -1312,8 +1312,8 @@ int AlbumDB::getItemRating(TQ_LLONG imageID)
execSql( TQString("SELECT value FROM ImageProperties "
"WHERE imageid=%1 and property='%2';")
.tqarg(imageID)
.tqarg("Rating"),
.arg(imageID)
.arg("Rating"),
&values);
if (!values.isEmpty())
@ -1337,7 +1337,7 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID)
sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums "
"WHERE Albums.id=%1 AND Albums.id=Images.dirid "
"ORDER BY Images.name COLLATE NOCASE;")
.tqarg(albumID);
.arg(albumID);
break;
case AlbumSettings::ByIPath:
// Dont collate on the path - this is to maintain the same behaviour
@ -1345,13 +1345,13 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID)
sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums "
"WHERE Albums.id=%1 AND Albums.id=Images.dirid "
"ORDER BY Albums.url,Images.name;")
.tqarg(albumID);
.arg(albumID);
break;
case AlbumSettings::ByIDate:
sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums "
"WHERE Albums.id=%1 AND Albums.id=Images.dirid "
"ORDER BY Images.datetime;")
.tqarg(albumID);
.arg(albumID);
break;
case AlbumSettings::ByIRating:
sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums, ImageProperties "
@ -1359,12 +1359,12 @@ TQStringList AlbumDB::getItemURLsInAlbum(int albumID)
"AND Images.id = ImageProperties.imageid "
"AND ImageProperties.property='Rating' "
"ORDER BY ImageProperties.value DESC;")
.tqarg(albumID);
.arg(albumID);
break;
default:
sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums "
"WHERE Albums.id=%1 AND Albums.id=Images.dirid;")
.tqarg(albumID);
.arg(albumID);
break;
}
execSql( sqlString, &values );
@ -1403,14 +1403,14 @@ TQStringList AlbumDB::getItemURLsInTag(int tagID, bool recursive)
imagesIdClause = TQString("SELECT imageid FROM ImageTags "
" WHERE tagid=%1 "
" OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)")
.tqarg(tagID).tqarg(tagID);
.arg(tagID).arg(tagID);
else
imagesIdClause = TQString("SELECT imageid FROM ImageTags WHERE tagid=%1").tqarg(tagID);
imagesIdClause = TQString("SELECT imageid FROM ImageTags WHERE tagid=%1").arg(tagID);
execSql( TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums "
"WHERE Images.id IN (%1) "
"AND Albums.id=Images.dirid;")
.tqarg(imagesIdClause), &values );
.arg(imagesIdClause), &values );
for (TQStringList::iterator it = values.begin(); it != values.end(); ++it)
{
@ -1429,10 +1429,10 @@ LLongList AlbumDB::getItemIDsInTag(int tagID, bool recursive)
execSql( TQString("SELECT imageid FROM ImageTags "
" WHERE tagid=%1 "
" OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)")
.tqarg(tagID).tqarg(tagID), &values );
.arg(tagID).arg(tagID), &values );
else
execSql( TQString("SELECT imageid FROM ImageTags WHERE tagid=%1;")
.tqarg(tagID), &values );
.arg(tagID), &values );
for (TQStringList::iterator it = values.begin(); it != values.end(); ++it)
{
@ -1446,7 +1446,7 @@ TQString AlbumDB::getAlbumURL(int albumID)
{
TQStringList values;
execSql( TQString("SELECT url from Albums where id=%1")
.tqarg( albumID), &values);
.arg( albumID), &values);
return values[0];
}
@ -1455,7 +1455,7 @@ TQDate AlbumDB::getAlbumLowestDate(int albumID)
TQStringList values;
execSql( TQString("SELECT MIN(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid")
.tqarg( albumID ), &values);
.arg( albumID ), &values);
TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate );
return itemDate;
}
@ -1465,7 +1465,7 @@ TQDate AlbumDB::getAlbumHighestDate(int albumID)
TQStringList values;
execSql( TQString("SELECT MAX(datetime) FROM Images "
"WHERE dirid=%1 GROUP BY dirid")
.tqarg( albumID ), &values);
.arg( albumID ), &values);
TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate );
return itemDate;
}
@ -1474,7 +1474,7 @@ TQDate AlbumDB::getAlbumAverageDate(int albumID)
{
TQStringList values;
execSql( TQString("SELECT datetime FROM Images WHERE dirid=%1")
.tqarg( albumID ), &values);
.arg( albumID ), &values);
int differenceInSecs = 0;
int amountOfImages = 0;
@ -1508,8 +1508,8 @@ void AlbumDB::deleteItem(int albumID, const TQString& file)
{
execSql( TQString("DELETE FROM Images "
"WHERE dirid=%1 AND name='%2';")
.tqarg(albumID)
.tqarg(escapeString(file)) );
.arg(albumID)
.arg(escapeString(file)) );
}
void AlbumDB::setAlbumURL(int albumID, const TQString& url)
@ -1518,17 +1518,17 @@ void AlbumDB::setAlbumURL(int albumID, const TQString& url)
// first delete any stale albums left behind
execSql( TQString("DELETE FROM Albums WHERE url = '%1'")
.tqarg(u) );
.arg(u) );
// now update the album url
execSql( TQString("UPDATE Albums SET url = '%1' WHERE id = %2;")
.tqarg(u, TQString::number(albumID) ));
.arg(u, TQString::number(albumID) ));
}
void AlbumDB::setTagName(int tagID, const TQString& name)
{
execSql( TQString("UPDATE Tags SET name='%1' WHERE id=%2;")
.tqarg(escapeString(name), TQString::number(tagID) ));
.arg(escapeString(name), TQString::number(tagID) ));
}
void AlbumDB::moveItem(int srcAlbumID, const TQString& srcName,
@ -1540,7 +1540,7 @@ void AlbumDB::moveItem(int srcAlbumID, const TQString& srcName,
execSql( TQString("UPDATE Images SET dirid=%1, name='%2' "
"WHERE dirid=%3 AND name='%4';")
.tqarg(TQString::number(dstAlbumID), escapeString(dstName),
.arg(TQString::number(dstAlbumID), escapeString(dstName),
TQString::number(srcAlbumID), escapeString(srcName)) );
}
@ -1555,7 +1555,7 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName,
TQStringList values;
execSql( TQString("SELECT id FROM Images "
"WHERE dirid=%1 AND name='%2';")
.tqarg(TQString::number(srcAlbumID), escapeString(srcName)),
.arg(TQString::number(srcAlbumID), escapeString(srcName)),
&values);
if (values.isEmpty())
@ -1570,7 +1570,7 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName,
execSql( TQString("INSERT INTO Images (dirid, name, caption, datetime) "
"SELECT %1, '%2', caption, datetime FROM Images "
"WHERE id=%3;")
.tqarg(TQString::number(dstAlbumID), escapeString(dstName),
.arg(TQString::number(dstAlbumID), escapeString(dstName),
TQString::number(srcId)) );
int dstId = sqlite3_last_insert_rowid(d->dataBase);
@ -1579,13 +1579,13 @@ int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName,
execSql( TQString("INSERT INTO ImageTags (imageid, tagid) "
"SELECT %1, tagid FROM ImageTags "
"WHERE imageid=%2;")
.tqarg(TQString::number(dstId), TQString::number(srcId)) );
.arg(TQString::number(dstId), TQString::number(srcId)) );
// copy properties (rating)
execSql( TQString("INSERT INTO ImageProperties (imageid, property, value) "
"SELECT %1, property, value FROM ImageProperties "
"WHERE imageid=%2;")
.tqarg(TQString::number(dstId), TQString::number(srcId)) );
.arg(TQString::number(dstId), TQString::number(srcId)) );
return dstId;
}

40
digikam/digikam/albumfiletip.cpp
Unescape View File

@ -30,10 +30,10 @@
#include <tqtooltip.h>
#include <tqfileinfo.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
#include <tqdatetime.h>
#include <tqstylesheet.h>
#include <stylesheet.h>
#include <tqpainter.h>
#include <tqapplication.h>
@ -107,14 +107,14 @@ AlbumFileTip::AlbumFileTip(AlbumIconView* view)
setFrameStyle(TQFrame::Plain | TQFrame::Box);
setLineWidth(1);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, d->tipBorder+1, 0);
TQVBoxLayout *layout = new TQVBoxLayout(this, d->tipBorder+1, 0);
d->label = new TQLabel(this);
d->label->setMargin(0);
d->label->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->label->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
tqlayout->addWidget(d->label);
tqlayout->setResizeMode(TQLayout::Fixed);
layout->addWidget(d->label);
layout->setResizeMode(TQLayout::Fixed);
renderArrows();
}
@ -206,7 +206,7 @@ void AlbumFileTip::renderArrows()
TQPixmap& pix0 = d->corners[0];
pix0.resize(w, w);
pix0.fill(tqcolorGroup().background());
pix0.fill(colorGroup().background());
TQPainter p0(&pix0);
p0.setPen(TQPen(TQt::black, 1));
@ -220,7 +220,7 @@ void AlbumFileTip::renderArrows()
TQPixmap& pix1 = d->corners[1];
pix1.resize(w, w);
pix1.fill(tqcolorGroup().background());
pix1.fill(colorGroup().background());
TQPainter p1(&pix1);
p1.setPen(TQPen(TQt::black, 1));
@ -234,7 +234,7 @@ void AlbumFileTip::renderArrows()
TQPixmap& pix2 = d->corners[2];
pix2.resize(w, w);
pix2.fill(tqcolorGroup().background());
pix2.fill(colorGroup().background());
TQPainter p2(&pix2);
p2.setPen(TQPen(TQt::black, 1));
@ -248,7 +248,7 @@ void AlbumFileTip::renderArrows()
TQPixmap& pix3 = d->corners[3];
pix3.resize(w, w);
pix3.fill(tqcolorGroup().background());
pix3.fill(colorGroup().background());
TQPainter p3(&pix3);
p3.setPen(TQPen(TQt::black, 1));
@ -365,8 +365,8 @@ void AlbumFileTip::updateText()
if (settings->getToolTipsShowFileSize())
{
tip += cellBeg + i18n("Size:") + cellMid;
str = i18n("%1 (%2)").tqarg(KIO::convertSize(fi.size()))
.tqarg(KGlobal::locale()->formatNumber(fi.size(), 0));
str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size()))
.arg(KGlobal::locale()->formatNumber(fi.size(), 0));
tip += str + cellEnd;
}
@ -409,7 +409,7 @@ void AlbumFileTip::updateText()
TQString mpixels;
mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2);
str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)")
.tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels);
.arg(dims.width()).arg(dims.height()).arg(mpixels);
tip += cellBeg + i18n("Dimensions:") + cellMid + str + cellEnd;
}
}
@ -434,8 +434,8 @@ void AlbumFileTip::updateText()
if (settings->getToolTipsShowPhotoMake())
{
str = TQString("%1 / %2").tqarg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make)
.tqarg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model);
str = TQString("%1 / %2").arg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make)
.arg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model);
if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Make/Model:") + cellMid + TQStyleSheet::escape( str ) + cellEnd;
}
@ -457,9 +457,9 @@ void AlbumFileTip::updateText()
str = photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture;
if (photoInfo.focalLength35mm.isEmpty())
str += TQString(" / %1").tqarg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
str += TQString(" / %1").arg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength);
else
str += TQString(" / %1").tqarg(i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm));
str += TQString(" / %1").arg(i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm));
if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Aperture/Focal:") + cellMid + TQStyleSheet::escape( str ) + cellEnd;
@ -467,8 +467,8 @@ void AlbumFileTip::updateText()
if (settings->getToolTipsShowPhotoExpo())
{
str = TQString("%1 / %2").tqarg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime)
.tqarg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity));
str = TQString("%1 / %2").arg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime)
.arg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity));
if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Exposure/Sensitivity:") + cellMid + TQStyleSheet::escape( str ) + cellEnd;
}
@ -483,7 +483,7 @@ void AlbumFileTip::updateText()
else if (photoInfo.exposureMode.isEmpty() && !photoInfo.exposureProgram.isEmpty())
str = photoInfo.exposureProgram;
else
str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram);
str = TQString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram);
if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "...";
metaStr += cellBeg + i18n("Mode/Program:") + cellMid + TQStyleSheet::escape( str ) + cellEnd;
}

18
digikam/digikam/albumfolderview.cpp
Unescape View File

@ -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

4
digikam/digikam/albumicongroupitem.cpp
Unescape View File

@ -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())
{

8
digikam/digikam/albumiconitem.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqstring.h>
#include <tqpen.h>
#include <tqfontmetrics.h>
@ -296,7 +296,7 @@ void AlbumIconItem::paintItem()
p.setFont(d->view->itemFontXtra());
TQString str;
dateToString(date, str);
str = i18n("created : %1").tqarg(str);
str = i18n("created : %1").arg(str);
p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str));
}
@ -308,7 +308,7 @@ void AlbumIconItem::paintItem()
p.setFont(d->view->itemFontXtra());
TQString str;
dateToString(date, str);
str = i18n("modified : %1").tqarg(str);
str = i18n("modified : %1").arg(str);
p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str));
}
@ -320,7 +320,7 @@ void AlbumIconItem::paintItem()
TQString mpixels, resolution;
mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2);
resolution = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)")
.tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels);
.arg(dims.width()).arg(dims.height()).arg(mpixels);
r = d->view->itemResolutionRect();
p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), resolution));
}

52
digikam/digikam/albumiconview.cpp
Unescape View File

@ -61,7 +61,7 @@ extern "C"
#include <tqdict.h>
#include <tqdatastream.h>
#include <tqtimer.h>
#include <tqclipboard.h>
#include <clipboard.h>
// KDE includes.
@ -155,7 +155,7 @@ public:
TQString albumDate;
TQString albumComments;
TQRect tqitemRect;
TQRect itemRect;
TQRect itemRatingRect;
TQRect itemDateRect;
TQRect itemModDateRect;
@ -525,7 +525,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos)
TQPopupMenu popmenu(this);
KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
{
@ -650,8 +650,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
{
KAction* action = *iter;
if (TQString::tqfromLatin1(action->name())
== TQString::tqfromLatin1("jpeglossless_rotate"))
if (TQString::fromLatin1(action->name())
== TQString::fromLatin1("jpeglossless_rotate"))
{
action->plug(&popmenu);
}
@ -684,7 +684,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
KAction *copy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0);
KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
{
paste->setEnabled(false);
@ -848,12 +848,12 @@ void AlbumIconView::slotCopy()
TQDragObject* drag = 0;
drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this);
kapp->tqclipboard()->setData(drag);
kapp->clipboard()->setData(drag);
}
void AlbumIconView::slotPaste()
{
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data)
return;
@ -965,11 +965,11 @@ void AlbumIconView::slotRename(AlbumIconItem* item)
bool ok;
#if KDE_IS_VERSION(3,2,0)
TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()),
TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").arg(fi.fileName()),
i18n("Enter new name (without extension):"),
name, &ok, this);
#else
TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()),
TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(fi.fileName()),
i18n("Enter new name (without extension):"),
name, &ok, this);
#endif
@ -1170,7 +1170,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item)
imview->loadImageInfos(imageInfoList,
currentImageInfo,
d->currentAlbum ? i18n("Album \"%1\"").tqarg(d->currentAlbum->title()) : TQString(),
d->currentAlbum ? i18n("Album \"%1\"").arg(d->currentAlbum->title()) : TQString(),
true);
if (imview->isHidden())
@ -1469,7 +1469,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
}
else if(TagDrag::canDecode(event))
{
TQByteArray ba = event->tqencodedData("digikam/tag-id");
TQByteArray ba = event->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
@ -1499,14 +1499,14 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
if (moreItemsSelected)
popMenu.insertItem(SmallIcon("tag"),
i18n("Assign '%1' to &Selected Items").tqarg(talbum->tagPath().mid(1)), 10);
i18n("Assign '%1' to &Selected Items").arg(talbum->tagPath().mid(1)), 10);
if (itemDropped)
popMenu.insertItem(SmallIcon("tag"),
i18n("Assign '%1' to &This Item").tqarg(talbum->tagPath().mid(1)), 12);
i18n("Assign '%1' to &This Item").arg(talbum->tagPath().mid(1)), 12);
popMenu.insertItem(SmallIcon("tag"),
i18n("Assign '%1' to &All Items").tqarg(talbum->tagPath().mid(1)), 11);
i18n("Assign '%1' to &All Items").arg(talbum->tagPath().mid(1)), 11);
popMenu.insertSeparator(-1);
popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel"));
@ -1554,7 +1554,7 @@ void AlbumIconView::contentsDropEvent(TQDropEvent *event)
}
else if(TagListDrag::canDecode(event))
{
TQByteArray ba = event->tqencodedData("digikam/taglist");
TQByteArray ba = event->encodedData("digikam/taglist");
TQDataStream ds(ba, IO_ReadOnly);
TQValueList<int> tagIDs;
ds >> tagIDs;
@ -1832,7 +1832,7 @@ void AlbumIconView::slotGotThumbnail(const KURL& url)
if (!iconItem)
return;
iconItem->tqrepaint();
iconItem->repaint();
}
void AlbumIconView::slotSelectionChanged()
@ -1893,7 +1893,7 @@ void AlbumIconView::slotSetExifOrientation( int orientation )
if (faildItems.count() == 1)
{
KMessageBox::error(0, i18n("Failed to revise Exif orientation for file %1.")
.tqarg(faildItems[0]));
.arg(faildItems[0]));
}
else
@ -1906,9 +1906,9 @@ void AlbumIconView::slotSetExifOrientation( int orientation )
refreshItems(urlList);
}
TQRect AlbumIconView::tqitemRect() const
TQRect AlbumIconView::itemRect() const
{
return d->tqitemRect;
return d->itemRect;
}
TQRect AlbumIconView::itemRatingRect() const
@ -2044,7 +2044,7 @@ void AlbumIconView::updateBannerRectPixmap()
void AlbumIconView::updateItemRectsPixmap()
{
d->tqitemRect = TQRect(0,0,0,0);
d->itemRect = TQRect(0,0,0,0);
d->itemRatingRect = TQRect(0,0,0,0);
d->itemDateRect = TQRect(0,0,0,0);
d->itemModDateRect = TQRect(0,0,0,0);
@ -2143,13 +2143,13 @@ void AlbumIconView::updateItemRectsPixmap()
y = d->itemTagRect.bottom();
}
d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin);
d->itemRect = TQRect(0, 0, w+2*margin, y+margin);
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
d->itemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
d->itemRect.height());
}
void AlbumIconView::slotThemeChanged()

2
digikam/digikam/albumiconview.h
Unescape View File

@ -95,7 +95,7 @@ public:
void refresh();
void refreshItems(const KURL::List& itemList);
TQRect tqitemRect() const;
TQRect itemRect() const;
TQRect itemRatingRect() const;
TQRect itemDateRect() const;
TQRect itemModDateRect() const;

18
digikam/digikam/albummanager.cpp
Unescape View File

@ -47,7 +47,7 @@ extern "C"
#include <tqdict.h>
#include <tqintdict.h>
#include <tqcstring.h>
#include <tqtextcodec.h>
#include <textcodec.h>
#include <tqdatetime.h>
// KDE includes.
@ -326,8 +326,8 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash)
"continue, click 'Yes' to work with this album. "
"Otherwise, click 'No' and correct your "
"locale setting before restarting digiKam")
.tqarg(dbLocale)
.tqarg(currLocale));
.arg(dbLocale)
.arg(currLocale));
if (result != KMessageBox::Yes)
exit(0);
@ -341,7 +341,7 @@ void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash)
KMessageBox::error(0, i18n("Failed to update the old Database to the new Database format\n"
"This error can happen if the Album Path '%1' does not exist or is write-protected.\n"
"If you have moved your photo collection, you need to adjust the 'Album Path' in digikam's configuration file.")
.tqarg(d->libraryPath));
.arg(d->libraryPath));
exit(0);
}
@ -464,14 +464,14 @@ void AlbumManager::scanPAlbums()
// first inform all frontends of the deleted albums
for (AlbumMap::iterator it = aMap.begin(); it != aMap.end(); ++it)
{
// the albums have to be removed with tqchildren being removed first.
// the albums have to be removed with children being removed first.
// removePAlbum takes care of that.
// So never delete the PAlbum using it.data(). instead check if the
// PAlbum is still in the Album Dict before trying to remove it.
// this might look like there is memory leak here, since removePAlbum
// doesn't delete albums and looks like child Albums don't get deleted.
// But when the parent album gets deleted, the tqchildren are also deleted.
// But when the parent album gets deleted, the children are also deleted.
PAlbum* album = d->pAlbumDict.find(it.key());
if (!album)
@ -727,7 +727,7 @@ void AlbumManager::scanSAlbums()
if (sMap.contains(info.id))
continue;
bool simple = (info.url.queryItem("1.key") == TQString::tqfromLatin1("keyword"));
bool simple = (info.url.queryItem("1.key") == TQString::fromLatin1("keyword"));
// Its a new album.
SAlbum* album = new SAlbum(info.id, info.url, simple, false);
@ -1373,7 +1373,7 @@ void AlbumManager::removePAlbum(PAlbum *album)
if (!album)
return;
// remove all tqchildren of this album
// remove all children of this album
Album* child = album->m_firstChild;
while (child)
{
@ -1412,7 +1412,7 @@ void AlbumManager::removeTAlbum(TAlbum *album)
if (!album)
return;
// remove all tqchildren of this album
// remove all children of this album
Album* child = album->m_firstChild;
while (child)
{

10
digikam/digikam/albumpropsedit.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqhbox.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
@ -113,14 +113,14 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create)
if (create)
{
topLabel->setText( i18n( "<qt><b>Create new Album in \"<i>%1</i>\"</b></qt>")
.tqarg(album->title()));
.arg(album->title()));
}
else
{
topLabel->setText( i18n( "<qt><b>\"<i>%1</i>\" Album Properties</b></qt>")
.tqarg(album->title()));
.arg(album->title()));
}
topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
topLayout->addMultiCellWidget( topLabel, 0, 0, 0, 1 );
// --------------------------------------------------------
@ -212,7 +212,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create)
if (create)
{
d->titleEdit->setText( i18n("New Album") );
d->datePicker->setDate( TQDate::tqcurrentDate() );
d->datePicker->setDate( TQDate::currentDate() );
}
else
{

6
digikam/digikam/cameralist.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqfile.h>
#include <tqdom.h>
#include <tqtextstream.h>
#include <textstream.h>
// KDE includes.
@ -110,7 +110,7 @@ bool CameraList::load()
TQString model = e.attribute("model");
TQString port = e.attribute("port");
TQString path = e.attribute("path");
TQDateTime lastAccess = TQDateTime::tqcurrentDateTime();
TQDateTime lastAccess = TQDateTime::currentDateTime();
if (!e.attribute("lastaccess").isEmpty())
lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate);
@ -254,7 +254,7 @@ CameraType* CameraList::autoDetect(bool& retry)
if (port.startsWith("usb:"))
port = "usb:";
CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::tqcurrentDateTime());
CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::currentDateTime());
insert(ctype);
return ctype;

12
digikam/digikam/daboutdata.h
Unescape View File

@ -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;
}

2
digikam/digikam/datefolderview.cpp
Unescape View File

@ -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);
}

58
digikam/digikam/digikamapp.cpp
Unescape View File

@ -379,7 +379,7 @@ void DigikamApp::setupView()
void DigikamApp::setupStatusBar()
{
d->statusProgressBar = new StatusProgressBar(statusBar());
d->statusProgressBar->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter);
d->statusProgressBar->setAlignment(TQt::AlignLeft|TQt::AlignVCenter);
d->statusProgressBar->setMaximumHeight(fontMetrics().height()+4);
statusBar()->addWidget(d->statusProgressBar, 100, true);
@ -1082,7 +1082,7 @@ void DigikamApp::setupActions()
loadCameras();
createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false);
createGUI(TQString::fromLatin1( "digikamui.rc" ), false);
// Initialize Actions ---------------------------------------
@ -1320,14 +1320,14 @@ void DigikamApp::slotImageSelected(const TQPtrList<ImageInfo>& list, bool hasPre
text = selection.first()->kurl().fileName()
+ i18n(" (%1 of %2)")
.tqarg(TQString::number(index))
.tqarg(TQString::number(num_images));
.arg(TQString::number(index))
.arg(TQString::number(num_images));
d->statusProgressBar->setText(text);
break;
}
default:
d->statusProgressBar->setText(i18n("%1/%2 items selected")
.tqarg(selection.count()).tqarg(TQString::number(num_images)));
.arg(selection.count()).arg(TQString::number(num_images)));
break;
}
@ -1479,7 +1479,7 @@ void DigikamApp::slotDownloadImages()
if (!alreadyThere)
{
KAction *cAction = new KAction(
i18n("Browse %1").tqarg(KURL(d->cameraGuiPath).prettyURL()),
i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
"camera",
0,
TQT_TQOBJECT(this),
@ -1492,8 +1492,8 @@ void DigikamApp::slotDownloadImages()
// the CameraUI will delete itself when it has finished
CameraUI* cgui = new CameraUI(this,
i18n("Images found in %1").tqarg(d->cameraGuiPath),
"directory browse","Fixed", localUrl, TQDateTime::tqcurrentDateTime());
i18n("Images found in %1").arg(d->cameraGuiPath),
"directory browse","Fixed", localUrl, TQDateTime::currentDateTime());
cgui->show();
connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)),
@ -1725,14 +1725,14 @@ void DigikamApp::slotConfToolbars()
if(dlg->exec())
{
createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false);
createGUI(TQString::fromLatin1( "digikamui.rc" ), false);
applyMainWindowSettings(KGlobal::config());
plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport );
plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions );
plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions );
plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions );
plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions );
plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport );
plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport );
plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions );
plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions );
plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions );
plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions );
plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport );
}
delete dlg;
@ -1826,12 +1826,12 @@ void DigikamApp::loadPlugins()
void DigikamApp::slotKipiPluginPlug()
{
unplugActionList( TQString::tqfromLatin1("file_actions_export") );
unplugActionList( TQString::tqfromLatin1("file_actions_import") );
unplugActionList( TQString::tqfromLatin1("image_actions") );
unplugActionList( TQString::tqfromLatin1("tool_actions") );
unplugActionList( TQString::tqfromLatin1("batch_actions") );
unplugActionList( TQString::tqfromLatin1("album_actions") );
unplugActionList( TQString::fromLatin1("file_actions_export") );
unplugActionList( TQString::fromLatin1("file_actions_import") );
unplugActionList( TQString::fromLatin1("image_actions") );
unplugActionList( TQString::fromLatin1("tool_actions") );
unplugActionList( TQString::fromLatin1("batch_actions") );
unplugActionList( TQString::fromLatin1("album_actions") );
d->kipiImageActions.clear();
d->kipiFileActionsExport.clear();
@ -1906,12 +1906,12 @@ void DigikamApp::slotKipiPluginPlug()
// Create GUI menu in according with plugins.
plugActionList( TQString::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport );
plugActionList( TQString::tqfromLatin1("file_actions_import"), d->kipiFileActionsImport );
plugActionList( TQString::tqfromLatin1("image_actions"), d->kipiImageActions );
plugActionList( TQString::tqfromLatin1("tool_actions"), d->kipiToolsActions );
plugActionList( TQString::tqfromLatin1("batch_actions"), d->kipiBatchActions );
plugActionList( TQString::tqfromLatin1("album_actions"), d->kipiAlbumActions );
plugActionList( TQString::fromLatin1("file_actions_export"), d->kipiFileActionsExport );
plugActionList( TQString::fromLatin1("file_actions_import"), d->kipiFileActionsImport );
plugActionList( TQString::fromLatin1("image_actions"), d->kipiImageActions );
plugActionList( TQString::fromLatin1("tool_actions"), d->kipiToolsActions );
plugActionList( TQString::fromLatin1("batch_actions"), d->kipiBatchActions );
plugActionList( TQString::fromLatin1("album_actions"), d->kipiAlbumActions );
}
void DigikamApp::loadCameras()
@ -2040,13 +2040,13 @@ void DigikamApp::slotZoomSliderChanged(int size)
void DigikamApp::slotThumbSizeChanged(int size)
{
d->statusZoomBar->setZoomSliderValue(size);
d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").tqarg(size));
d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").arg(size));
}
void DigikamApp::slotZoomChanged(double zoom, int size)
{
d->statusZoomBar->setZoomSliderValue(size);
d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0)));
d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0)));
}
void DigikamApp::slotTogglePreview(bool t)

8
digikam/digikam/digikamfirstrun.cpp
Unescape View File

@ -42,7 +42,7 @@ extern "C"
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqstring.h>
#include <tqdir.h>
#include <tqfileinfo.h>
@ -92,7 +92,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent,
KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup,
128, KIcon::DefaultState, 0, true));
m_ui->setMinimumSize(450, m_ui->tqsizeHint().height());
m_ui->setMinimumSize(450, m_ui->sizeHint().height());
}
DigikamFirstRun::~DigikamFirstRun()
@ -131,7 +131,7 @@ void DigikamFirstRun::slotOk()
"<p><b>%1</b></p>"
"Would you like digiKam to create it?</qt>")
.tqarg(albumLibraryFolder),
.arg(albumLibraryFolder),
i18n("Create Folder?"));
if (rc == KMessageBox::No)
@ -144,7 +144,7 @@ void DigikamFirstRun::slotOk()
KMessageBox::sorry(this,
i18n("<qt>digiKam could not create the folder shown below. "
"Please select a different location."
"<p><b>%1</b></p></qt>").tqarg(albumLibraryFolder),
"<p><b>%1</b></p></qt>").arg(albumLibraryFolder),
i18n("Create Folder Failed"));
return;
}

4
digikam/digikam/digikamview.cpp
Unescape View File

@ -180,7 +180,7 @@ DigikamView::DigikamView(TQWidget *parent)
d->leftSideBar->setSplitter(d->splitter);
d->albumWidgetStack = new AlbumWidgetStack(d->splitter);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
d->albumWidgetStack->tqsetSizePolicy(rightSzPolicy);
d->albumWidgetStack->setSizePolicy(rightSzPolicy);
d->iconView = d->albumWidgetStack->albumIconView();
d->rightSideBar = new ImagePropertiesSideBarDB(this, "Digikam Right Sidebar", d->splitter,
@ -1507,7 +1507,7 @@ void DigikamView::slideShow(ImageInfoList &infoList)
float cnt = (float)infoList.count();
emit signalProgressBarMode(StatusProgressBar::CancelProgressBarMode,
i18n("Preparing slideshow of %1 images. Please wait...")
.tqarg(infoList.count()));
.arg(infoList.count()));
DMetadata meta;
SlideShowSettings settings;

2
digikam/digikam/dio.cpp
Unescape View File

@ -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;
*/
}

24
digikam/digikam/dragobjects.cpp
Unescape View File

@ -60,9 +60,9 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR
if (KURLDrag::decode(e, urls))
{
TQByteArray albumarray = e->tqencodedData("digikam/album-ids");
TQByteArray imagearray = e->tqencodedData("digikam/image-ids");
TQByteArray kioarray = e->tqencodedData("digikam/digikamalbums");
TQByteArray albumarray = e->encodedData("digikam/album-ids");
TQByteArray imagearray = e->encodedData("digikam/image-ids");
TQByteArray kioarray = e->encodedData("digikam/digikamalbums");
if (albumarray.size() && imagearray.size() && kioarray.size())
{
@ -97,7 +97,7 @@ bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioUR
return false;
}
TQByteArray ItemDrag::tqencodedData(const char* mime) const
TQByteArray ItemDrag::encodedData(const char* mime) const
{
TQCString mimetype(mime);
@ -142,7 +142,7 @@ TQByteArray ItemDrag::tqencodedData(const char* mime) const
}
else
{
return KURLDrag::tqencodedData(mime);
return KURLDrag::encodedData(mime);
}
}
@ -184,7 +184,7 @@ const char* TagDrag::format( int i ) const
return 0;
}
TQByteArray TagDrag::tqencodedData( const char* ) const
TQByteArray TagDrag::encodedData( const char* ) const
{
TQByteArray ba;
TQDataStream ds(ba, IO_WriteOnly);
@ -217,7 +217,7 @@ const char* AlbumDrag::format( int i ) const
return 0;
}
TQByteArray AlbumDrag::tqencodedData(const char *mime) const
TQByteArray AlbumDrag::encodedData(const char *mime) const
{
TQCString mimetype( mime );
if(mimetype == "digikam/album-id")
@ -229,7 +229,7 @@ TQByteArray AlbumDrag::tqencodedData(const char *mime) const
}
else
{
return KURLDrag::tqencodedData(mime);
return KURLDrag::encodedData(mime);
}
}
@ -241,7 +241,7 @@ bool AlbumDrag::decode(const TQMimeSource* e, KURL::List &urls,
if(KURLDrag::decode(e, urls))
{
TQByteArray ba = e->tqencodedData("digikam/album-id");
TQByteArray ba = e->encodedData("digikam/album-id");
if (ba.size())
{
TQDataStream ds(ba, IO_ReadOnly);
@ -270,7 +270,7 @@ bool TagListDrag::canDecode(const TQMimeSource* e)
return e->provides("digikam/taglist");
}
TQByteArray TagListDrag::tqencodedData(const char*) const
TQByteArray TagListDrag::encodedData(const char*) const
{
TQByteArray ba;
TQDataStream ds(ba, IO_WriteOnly);
@ -301,7 +301,7 @@ bool CameraItemListDrag::canDecode(const TQMimeSource* e)
return e->provides("digikam/cameraItemlist");
}
TQByteArray CameraItemListDrag::tqencodedData(const char*) const
TQByteArray CameraItemListDrag::encodedData(const char*) const
{
TQByteArray ba;
TQDataStream ds(ba, IO_WriteOnly);
@ -350,7 +350,7 @@ bool CameraDragObject::canDecode(const TQMimeSource* e)
bool CameraDragObject::decode(const TQMimeSource* e, CameraType& ctype)
{
TQByteArray payload = e->tqencodedData("camera/unknown");
TQByteArray payload = e->encodedData("camera/unknown");
if (payload.size())
{
TQString title, model, port, path;

10
digikam/digikam/dragobjects.h
Unescape View File

@ -74,7 +74,7 @@ public:
protected:
virtual const char* format(int i) const;
virtual TQByteArray tqencodedData(const char* mime) const;
virtual TQByteArray encodedData(const char* mime) const;
private:
@ -99,7 +99,7 @@ public:
protected:
TQByteArray tqencodedData( const char* ) const;
TQByteArray encodedData( const char* ) const;
const char* format(int i) const;
private:
@ -122,7 +122,7 @@ public:
int &albumID);
protected:
TQByteArray tqencodedData(const char*) const;
TQByteArray encodedData(const char*) const;
const char* format(int i) const;
private:
@ -145,7 +145,7 @@ public:
protected:
TQByteArray tqencodedData( const char* ) const;
TQByteArray encodedData( const char* ) const;
const char* format(int i) const;
private:
@ -169,7 +169,7 @@ public:
protected:
TQByteArray tqencodedData( const char* ) const;
TQByteArray encodedData( const char* ) const;
const char* format(int i) const;
private:

18
digikam/digikam/firstrun.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqframe.h>
#include <kurlrequester.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -48,21 +48,21 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent )
: TQWidget( parent )
{
setName( "FirstRunWidget" );
TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
m_textLabel2 = new TQLabel( this );
vtqlayout->addWidget( m_textLabel2 );
vlayout->addWidget( m_textLabel2 );
TQFrame *line1 = new TQFrame( this );
line1->setFrameShape( TQFrame::HLine );
line1->setFrameShadow( TQFrame::Sunken );
line1->setFrameShape( TQFrame::HLine );
vtqlayout->addWidget( line1 );
vlayout->addWidget( line1 );
TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 0, 6 );
m_pixLabel = new TQLabel( this );
m_pixLabel->tqsetAlignment( int( TQLabel::AlignTop ) );
m_pixLabel->setAlignment( int( TQLabel::AlignTop ) );
grid->addMultiCellWidget( m_pixLabel, 0, 1, 0, 0 );
m_path = new KURLRequester( this );
@ -71,14 +71,14 @@ FirstRunWidget::FirstRunWidget( TQWidget* parent )
grid->addWidget( m_path, 1, 1 );
m_textLabel1 = new TQLabel( this );
m_textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
m_textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
grid->addWidget( m_textLabel1, 0, 1 );
vtqlayout->addLayout( grid );
vtqlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
vlayout->addLayout( grid );
vlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) );
languageChange();
resize( TQSize(479, 149).expandedTo(tqminimumSizeHint()) );
resize( TQSize(479, 149).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
}

6
digikam/digikam/folderitem.cpp
Unescape View File

@ -123,7 +123,7 @@ void FolderItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int
if (m_focus)
{
p->setPen(cg.link());
TQRect r = fv->tqitemRect(this);
TQRect r = fv->itemRect(this);
p->drawRect(0, 0, r.width(), r.height());
}
}
@ -211,7 +211,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co
if ((type() == TQCheckListItem::CheckBox) ||
(type() == TQCheckListItem::CheckBoxController))
{
int boxsize = fv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, fv);
int boxsize = fv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, fv);
int x = 3;
int y = (height() - boxsize)/2 + margin;
r += boxsize + 4;
@ -249,7 +249,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co
if (m_focus)
{
p->setPen(cg.link());
TQRect r = fv->tqitemRect(this);
TQRect r = fv->itemRect(this);
p->drawRect(0, 0, r.width(), r.height());
}
}

14
digikam/digikam/folderview.cpp
Unescape View File

@ -120,12 +120,12 @@ int FolderView::itemHeight() const
return d->itemHeight;
}
TQRect FolderView::tqitemRect(TQListViewItem *item) const
TQRect FolderView::itemRect(TQListViewItem *item) const
{
if(!item)
return TQRect();
TQRect r = TQListView::tqitemRect(item);
TQRect r = TQListView::itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
return r;
}
@ -276,7 +276,7 @@ void FolderView::contentsDragLeaveEvent(TQDragLeaveEvent * e)
if (citem)
citem->setFocus(false);
}
d->oldHighlightItem->tqrepaint();
d->oldHighlightItem->repaint();
d->oldHighlightItem = 0;
}
}
@ -300,7 +300,7 @@ void FolderView::contentsDragMoveEvent(TQDragMoveEvent *e)
if (citem)
citem->setFocus(false);
}
d->oldHighlightItem->tqrepaint();
d->oldHighlightItem->repaint();
}
FolderItem *fitem = dynamic_cast<FolderItem*>(item);
@ -313,7 +313,7 @@ void FolderView::contentsDragMoveEvent(TQDragMoveEvent *e)
citem->setFocus(true);
}
d->oldHighlightItem = item;
item->tqrepaint();
item->repaint();
}
e->accept(acceptDrop(e));
}
@ -333,7 +333,7 @@ void FolderView::contentsDropEvent(TQDropEvent *e)
if (citem)
citem->setFocus(false);
}
d->oldHighlightItem->tqrepaint();
d->oldHighlightItem->repaint();
d->oldHighlightItem = 0;
}
}
@ -358,7 +358,7 @@ bool FolderView::mouseInItemRect(TQListViewItem* item, int x) const
FolderCheckListItem* citem = dynamic_cast<FolderCheckListItem*>(item);
if (citem &&
((citem->type() == TQCheckListItem::CheckBox) || (citem->type() == TQCheckListItem::CheckBoxController)))
boxsize = tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, this);
boxsize = tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, this);
return (x > (offset + boxsize) && x < (offset + boxsize + width));
}

2
digikam/digikam/folderview.h
Unescape View File

@ -79,7 +79,7 @@ public:
bool active() const;
int itemHeight() const;
TQRect tqitemRect(TQListViewItem *item) const;
TQRect itemRect(TQListViewItem *item) const;
TQPixmap itemBasePixmapRegular() const;
TQPixmap itemBasePixmapSelected() const;

4
digikam/digikam/icongroupitem.cpp
Unescape View File

@ -28,7 +28,7 @@
// TQt includes.
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
// Local includes.
@ -279,7 +279,7 @@ void IconGroupItem::paintBanner()
{
TQRect r(rect());
TQPixmap pix(r.width(), r.height());
pix.fill(d->view->tqcolorGroup().base());
pix.fill(d->view->colorGroup().base());
r = TQRect(d->view->contentsToViewport(TQPoint(r.x(), r.y())),
TQSize(r.width(), r.height()));

4
digikam/digikam/iconitem.cpp
Unescape View File

@ -87,7 +87,7 @@ int IconItem::y() const
TQRect IconItem::rect() const
{
IconView* view = m_group->iconView();
TQRect r(view->tqitemRect());
TQRect r(view->itemRect());
r.moveTopLeft(TQPoint(m_x, m_y));
return r;
}
@ -127,7 +127,7 @@ bool IconItem::isSelected() const
return m_selected;
}
void IconItem::tqrepaint(bool force)
void IconItem::repaint(bool force)
{
if (force)
m_group->iconView()->repaintContents(rect());

2
digikam/digikam/iconitem.h
Unescape View File

@ -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;

84
digikam/digikam/iconview.cpp
Unescape View File

@ -664,8 +664,8 @@ void IconView::slotRearrange()
bool IconView::arrangeItems()
{
int y = 0;
int itemW = tqitemRect().width();
int itemH = tqitemRect().height();
int itemW = itemRect().width();
int itemH = itemRect().height();
int maxW = 0;
int numItemsPerRow = visibleWidth()/(itemW + d->spacing);
@ -720,7 +720,7 @@ bool IconView::arrangeItems()
return changed;
}
TQRect IconView::tqitemRect() const
TQRect IconView::itemRect() const
{
return TQRect(0, 0, 100, 100);
}
@ -773,7 +773,7 @@ void IconView::viewportPaintEvent(TQPaintEvent* pe)
}
painter.setClipRegion(paintRegion);
painter.fillRect(r, tqcolorGroup().base());
painter.fillRect(r, colorGroup().base());
painter.end();
}
@ -934,11 +934,11 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e)
d->currItem = item;
d->anchorItem = item;
if (prevCurrItem)
prevCurrItem->tqrepaint();
prevCurrItem->repaint();
if (!item->isSelected())
item->setSelected(true, true);
item->tqrepaint();
item->repaint();
emit signalRightButtonClicked(item, e->globalPos());
}
@ -1017,9 +1017,9 @@ void IconView::contentsMousePressEvent(TQMouseEvent* e)
d->anchorItem = item;
if (prevCurrItem)
prevCurrItem->tqrepaint();
prevCurrItem->repaint();
d->currItem->tqrepaint();
d->currItem->repaint();
d->dragging = true;
d->dragStartPos = e->pos();
@ -1070,8 +1070,8 @@ void IconView::drawRubber(TQPainter* p)
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p,
TQRect( pnt.x(), pnt.y(),
r.width(), r.height() ),
tqcolorGroup(), TQStyle::Style_Default,
TQStyleOption(tqcolorGroup().base()));
colorGroup(), TQStyle::Style_Default,
TQStyleOption(colorGroup().base()));
}
void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
@ -1200,7 +1200,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e)
if (changed)
{
paintRegion.translate(-contentsX(), -contentsY());
viewport()->tqrepaint(paintRegion);
viewport()->repaint(paintRegion);
}
ensureVisible(e->pos().x(), e->pos().y());
@ -1258,7 +1258,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e)
d->currItem = item;
d->anchorItem = item;
if (prevCurrItem)
prevCurrItem->tqrepaint();
prevCurrItem->repaint();
if (KGlobalSettings::singleClick())
{
if (item->clickToOpenRect().contains(e->pos()))
@ -1307,7 +1307,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = firstItem();
d->anchorItem = d->currItem;
if (tmp)
tmp->tqrepaint();
tmp->repaint();
firstItem()->setSelected(true, true);
ensureItemVisible(firstItem());
@ -1321,7 +1321,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = lastItem();
d->anchorItem = d->currItem;
if (tmp)
tmp->tqrepaint();
tmp->repaint();
lastItem()->setSelected(true, true);
ensureItemVisible(lastItem());
@ -1353,8 +1353,8 @@ void IconView::keyPressEvent(TQKeyEvent* e)
IconItem* tmp = d->currItem;
d->currItem = d->currItem->nextItem();
d->anchorItem = d->currItem;
tmp->tqrepaint();
d->currItem->tqrepaint();
tmp->repaint();
d->currItem->repaint();
item = d->currItem;
}
@ -1362,7 +1362,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
{
IconItem* tmp = d->currItem;
d->currItem = d->currItem->nextItem();
tmp->tqrepaint();
tmp->repaint();
// if the anchor is behind us, move forward preserving
// the previously selected item. otherwise unselect the
@ -1380,7 +1380,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = d->currItem->nextItem();
d->anchorItem = d->currItem;
d->currItem->setSelected(true, true);
tmp->tqrepaint();
tmp->repaint();
item = d->currItem;
}
@ -1412,8 +1412,8 @@ void IconView::keyPressEvent(TQKeyEvent* e)
IconItem* tmp = d->currItem;
d->currItem = d->currItem->prevItem();
d->anchorItem = d->currItem;
tmp->tqrepaint();
d->currItem->tqrepaint();
tmp->repaint();
d->currItem->repaint();
item = d->currItem;
}
@ -1421,7 +1421,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
{
IconItem* tmp = d->currItem;
d->currItem = d->currItem->prevItem();
tmp->tqrepaint();
tmp->repaint();
// if the anchor is ahead of us, move forward preserving
// the previously selected item. otherwise unselect the
@ -1439,7 +1439,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = d->currItem->prevItem();
d->anchorItem = d->currItem;
d->currItem->setSelected(true, true);
tmp->tqrepaint();
tmp->repaint();
item = d->currItem;
}
@ -1464,7 +1464,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
if (d->currItem)
{
int x = d->currItem->x() + tqitemRect().width()/2;
int x = d->currItem->x() + itemRect().width()/2;
int y = d->currItem->y() - d->spacing*2;
IconItem *it = 0;
@ -1482,8 +1482,8 @@ void IconView::keyPressEvent(TQKeyEvent* e)
IconItem* tmp = d->currItem;
d->currItem = it;
d->anchorItem = it;
tmp->tqrepaint();
d->currItem->tqrepaint();
tmp->repaint();
d->currItem->repaint();
item = d->currItem;
}
@ -1491,7 +1491,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
{
IconItem* tmp = d->currItem;
d->currItem = it;
tmp->tqrepaint();
tmp->repaint();
clearSelection();
if (anchorIsBehind())
@ -1521,7 +1521,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = it;
d->anchorItem = it;
d->currItem->setSelected(true, true);
tmp->tqrepaint();
tmp->repaint();
item = d->currItem;
}
@ -1546,8 +1546,8 @@ void IconView::keyPressEvent(TQKeyEvent* e)
if (d->currItem)
{
int x = d->currItem->x() + tqitemRect().width()/2;
int y = d->currItem->y() + tqitemRect().height() + d->spacing*2;
int x = d->currItem->x() + itemRect().width()/2;
int y = d->currItem->y() + itemRect().height() + d->spacing*2;
IconItem *it = 0;
@ -1564,8 +1564,8 @@ void IconView::keyPressEvent(TQKeyEvent* e)
IconItem* tmp = d->currItem;
d->currItem = it;
d->anchorItem = it;
tmp->tqrepaint();
d->currItem->tqrepaint();
tmp->repaint();
d->currItem->repaint();
item = d->currItem;
}
@ -1573,7 +1573,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
{
IconItem* tmp = d->currItem;
d->currItem = it;
tmp->tqrepaint();
tmp->repaint();
clearSelection();
if (anchorIsBehind())
@ -1603,7 +1603,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = it;
d->anchorItem = it;
d->currItem->setSelected(true, true);
tmp->tqrepaint();
tmp->repaint();
item = d->currItem;
}
@ -1634,7 +1634,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
if (!ni)
{
r = TQRect( 0, d->currItem->y() + tqitemRect().height(),
r = TQRect( 0, d->currItem->y() + itemRect().height(),
contentsWidth(), contentsHeight() );
ni = findLastVisibleItem(r, false);
}
@ -1645,7 +1645,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = ni;
d->anchorItem = ni;
item = ni;
tmp->tqrepaint();
tmp->repaint();
d->currItem->setSelected(true, true);
}
}
@ -1685,7 +1685,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
d->currItem = ni;
d->anchorItem = ni;
item = ni;
tmp->tqrepaint();
tmp->repaint();
d->currItem->setSelected(true, true);
}
}
@ -1731,7 +1731,7 @@ void IconView::keyPressEvent(TQKeyEvent* e)
ensureItemVisible(d->currItem);
TQRect r(tqitemRect());
TQRect r(itemRect());
int w = r.width();
int h = r.height();
TQPoint p(d->currItem->x() + w / 2, d->currItem->y() + h / 2);
@ -1785,13 +1785,13 @@ void IconView::ensureItemVisible(IconItem *item)
if ( item->y() == firstItem()->y() )
{
TQRect r(tqitemRect());
TQRect r(itemRect());
int w = r.width();
ensureVisible( item->x() + w / 2, 0, w/2+1, 0 );
}
else
{
TQRect r(tqitemRect());
TQRect r(itemRect());
int w = r.width();
int h = r.height();
ensureVisible( item->x() + w / 2, item->y() + h / 2,
@ -1905,7 +1905,7 @@ void IconView::drawFrameRaised(TQPainter* p)
TQRect r = frameRect();
int lwidth = lineWidth();
const TQColorGroup & g = tqcolorGroup();
const TQColorGroup & g = colorGroup();
qDrawShadeRect( p, r, g, false, lwidth,
midLineWidth() );
@ -1916,7 +1916,7 @@ void IconView::drawFrameSunken(TQPainter* p)
TQRect r = frameRect();
int lwidth = lineWidth();
const TQColorGroup & g = tqcolorGroup();
const TQColorGroup & g = colorGroup();
qDrawShadeRect( p, r, g, true, lwidth,
midLineWidth() );
@ -1948,7 +1948,7 @@ void IconView::itemClickedToOpen(IconItem* item)
d->anchorItem = item;
if (prevCurrItem)
prevCurrItem->tqrepaint();
prevCurrItem->repaint();
item->setSelected(true);
emit signalDoubleClicked(item);

2
digikam/digikam/iconview.h
Unescape View File

@ -98,7 +98,7 @@ public:
IconItem* findFirstVisibleItem(bool useThumbnailRect = true) const;
IconItem* findLastVisibleItem(bool useThumbnailRect = true) const;
virtual TQRect tqitemRect() const;
virtual TQRect itemRect() const;
virtual TQRect bannerRect() const;
TQRect contentsRectToViewport(const TQRect& r) const;

8
digikam/digikam/imagepreviewview.cpp
Unescape View File

@ -138,7 +138,7 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent)
if (d->previewSize > 2560)
d->previewSize = 2560;
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->cornerButton = new TQToolButton(this);
d->cornerButton->setIconSet(SmallIcon("move"));
@ -261,7 +261,7 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description
p.drawText(0, 0, pix.width(), pix.height(),
TQt::AlignCenter|TQt::WordBreak,
i18n("Cannot display preview for\n\"%1\"")
.tqarg(info.fileName()));
.arg(info.fileName()));
p.end();
// three copies - but the image is small
setImage(DImg(pix.convertToImage()));
@ -397,8 +397,8 @@ void ImagePreviewView::slotContextMenu()
{
KAction* action = *iter;
if (TQString::tqfromLatin1(action->name())
== TQString::tqfromLatin1("jpeglossless_rotate"))
if (TQString::fromLatin1(action->name())
== TQString::fromLatin1("jpeglossless_rotate"))
{
action->plug(&popmenu);
}

12
digikam/digikam/kdateedit.cpp
Unescape View File

@ -81,13 +81,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
// need at least one entry for popup to work
setMaxCount( 1 );
mDate = TQDate::tqcurrentDate();
mDate = TQDate::currentDate();
TQString today = KGlobal::locale()->formatDate( mDate, true );
insertItem( today );
setCurrentItem( 0 );
changeItem( today, 0 );
setMinimumSize( tqsizeHint() );
setMinimumSize( sizeHint() );
connect( lineEdit(), TQT_SIGNAL( returnPressed() ),
this, TQT_SLOT( lineEnterPressed() ) );
@ -147,13 +147,13 @@ void KDateEdit::popup()
TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) );
int dateFrameHeight = mPopup->tqsizeHint().height();
int dateFrameHeight = mPopup->sizeHint().height();
if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() )
popupPoint.setY( popupPoint.y() - dateFrameHeight );
else
popupPoint.setY( popupPoint.y() + height() );
int dateFrameWidth = mPopup->tqsizeHint().width();
int dateFrameWidth = mPopup->sizeHint().width();
if ( popupPoint.x() + dateFrameWidth > desk.right() )
popupPoint.setX( desk.right() - dateFrameWidth );
@ -166,7 +166,7 @@ void KDateEdit::popup()
if ( mDate.isValid() )
mPopup->setDate( mDate );
else
mPopup->setDate( TQDate::tqcurrentDate() );
mPopup->setDate( TQDate::currentDate() );
mPopup->popup( popupPoint );
@ -230,7 +230,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
if ( text.isEmpty() )
result = TQDate();
else if ( mKeywordMap.contains( text.lower() ) ) {
TQDate today = TQDate::tqcurrentDate();
TQDate today = TQDate::currentDate();
int i = mKeywordMap[ text.lower() ];
if ( i >= 100 ) {
/* A day name has been entered. Convert to offset from today.

12
digikam/digikam/kdatepickerpopup.cpp
Unescape View File

@ -114,17 +114,17 @@ void KDatePickerPopup::slotDateChanged( TQDate date )
void KDatePickerPopup::slotToday()
{
emit dateChanged( TQDate::tqcurrentDate() );
emit dateChanged( TQDate::currentDate() );
}
void KDatePickerPopup::slotYesterday()
{
emit dateChanged( TQDate::tqcurrentDate().addDays( -1 ) );
emit dateChanged( TQDate::currentDate().addDays( -1 ) );
}
void KDatePickerPopup::slotPrevFriday()
{
TQDate date = TQDate::tqcurrentDate();
TQDate date = TQDate::currentDate();
int day = date.dayOfWeek();
if ( day < 6 )
date = date.addDays( 5 - 7 - day );
@ -136,7 +136,7 @@ void KDatePickerPopup::slotPrevFriday()
void KDatePickerPopup::slotPrevMonday()
{
TQDate date = TQDate::tqcurrentDate();
TQDate date = TQDate::currentDate();
emit dateChanged( date.addDays( 1 - date.dayOfWeek() ) );
}
@ -147,12 +147,12 @@ void KDatePickerPopup::slotNoDate()
void KDatePickerPopup::slotPrevWeek()
{
emit dateChanged( TQDate::tqcurrentDate().addDays( -7 ) );
emit dateChanged( TQDate::currentDate().addDays( -7 ) );
}
void KDatePickerPopup::slotPrevMonth()
{
emit dateChanged( TQDate::tqcurrentDate().addMonths( -1 ) );
emit dateChanged( TQDate::currentDate().addMonths( -1 ) );
}
} // namespace Digikam

2
digikam/digikam/kdatepickerpopup.h
Unescape View File

@ -75,7 +75,7 @@ public:
@param parent The object's parent.
@param name The object's name.
*/
KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(),
KDatePickerPopup(int items = 2, const TQDate &date = TQDate::currentDate(),
TQWidget *parent = 0, const char *name = 0);
/**

6
digikam/digikam/kipiinterface.cpp
Unescape View File

@ -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;
}

8
digikam/digikam/mediaplayerview.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqstring.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
// KDE includes.
@ -88,7 +88,7 @@ MediaPlayerView::MediaPlayerView(TQWidget *parent)
TQGridLayout *grid = new TQGridLayout(d->errorView, 2, 2,
KDialogBase::marginHint(), KDialogBase::spacingHint());
errorMsg->tqsetAlignment(TQt::AlignCenter);
errorMsg->setAlignment(TQt::AlignCenter);
d->errorView->setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain);
d->errorView->setMargin(0);
d->errorView->setLineWidth(1);
@ -151,7 +151,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url)
KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true);
KServiceTypeProfile::OfferList services = KServiceTypeProfile::offers(mimePtr->name(),
TQString::tqfromLatin1("KParts/ReadOnlyPart"));
TQString::fromLatin1("KParts/ReadOnlyPart"));
DDebug() << "Search a KPart to preview " << url.fileName() << " (" << mimePtr->name() << ") " << endl;
@ -214,7 +214,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url)
}
d->grid->addMultiCellWidget(mediaPlayerWidget, 0, 0, 0, 2);
mediaPlayerWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
mediaPlayerWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->mediaPlayerPart->openURL(url);
setPreviewMode(MediaPlayerViewPriv::PlayerView);
}

138
digikam/digikam/metadatahub.cpp
Unescape View File

@ -47,9 +47,9 @@ public:
MetadataHubPriv()
{
dateTimetqStatus = MetadataHub::MetadataInvalid;
ratingtqStatus = MetadataHub::MetadataInvalid;
commenttqStatus = MetadataHub::MetadataInvalid;
dateTimeStatus = MetadataHub::MetadataInvalid;
ratingStatus = MetadataHub::MetadataInvalid;
commentStatus = MetadataHub::MetadataInvalid;
rating = -1;
highestRating = -1;
@ -64,9 +64,9 @@ public:
tagsChanged = false;
}
MetadataHub::tqStatus dateTimetqStatus;
MetadataHub::tqStatus commenttqStatus;
MetadataHub::tqStatus ratingtqStatus;
MetadataHub::Status dateTimeStatus;
MetadataHub::Status commentStatus;
MetadataHub::Status ratingStatus;
TQDateTime dateTime;
TQDateTime lastDateTime;
@ -76,7 +76,7 @@ public:
int count;
TQMap<TAlbum *, MetadataHub::TagtqStatus> tags;
TQMap<TAlbum *, MetadataHub::TagStatus> tags;
TQStringList tagList;
MetadataHub::DatabaseMode dbmode;
@ -86,8 +86,8 @@ public:
bool ratingChanged;
bool tagsChanged;
template <class T> void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status);
template <class T> void loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status);
template <class T> void loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status);
template <class T> void loadSingleValue(const T &data, T &storage, MetadataHub::Status &status);
};
MetadataWriteSettings::MetadataWriteSettings()
@ -256,21 +256,21 @@ void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags)
for (TQValueList<TAlbum *>::const_iterator it = loadedTags.begin(); it != loadedTags.end(); ++it)
{
// that is a reference
TagtqStatus &status = d->tags[*it];
TagStatus &status = d->tags[*it];
// if it was not contained in the list, the default constructor will mark it as invalid
if (status == MetadataInvalid)
{
if (d->count == 1)
// there were no previous sets that could have contained the set
status = TagtqStatus(MetadataAvailable, true);
status = TagStatus(MetadataAvailable, true);
else
// previous sets did not contain the tag, we do => disjoint
status = TagtqStatus(MetadataDisjoint, true);
status = TagStatus(MetadataDisjoint, true);
}
else if (status == TagtqStatus(MetadataAvailable, false))
else if (status == TagStatus(MetadataAvailable, false))
{
// set to explicitly not contained, but we contain it => disjoint
status = TagtqStatus(MetadataDisjoint, true);
status = TagStatus(MetadataDisjoint, true);
}
// else if mapIt.data() == MetadataAvailable, true: all right, we contain it too
// else if mapIt.data() == MetadataDisjoint: it's already disjoint
@ -283,10 +283,10 @@ void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags)
// but are not contained in this set, have to be set to MetadataDisjoint
for (TQValueList<TAlbum *>::iterator it = previousTags.begin(); it != previousTags.end(); ++it)
{
TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(*it);
if (mapIt != d->tags.end() && mapIt.data() == TagtqStatus(MetadataAvailable, true))
TQMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(*it);
if (mapIt != d->tags.end() && mapIt.data() == TagStatus(MetadataAvailable, true))
{
mapIt.data() = TagtqStatus(MetadataDisjoint, true);
mapIt.data() = TagStatus(MetadataDisjoint, true);
}
}
}
@ -320,16 +320,16 @@ void MetadataHub::load(const TQDateTime &dateTime, const TQString &comment, int
{
if (dateTime.isValid())
{
d->loadWithInterval<TQDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimetqStatus);
d->loadWithInterval<TQDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimeStatus);
}
d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingtqStatus);
d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingStatus);
d->loadSingleValue<TQString>(comment, d->comment, d->commenttqStatus);
d->loadSingleValue<TQString>(comment, d->comment, d->commentStatus);
}
// template method to share code for dateTime and rating
template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &status)
template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status)
{
switch (status)
{
@ -364,7 +364,7 @@ template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &stor
}
// template method used by comment
template <class T> void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &status)
template <class T> void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::Status &status)
{
switch (status)
{
@ -391,11 +391,11 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode)
bool changed = false;
// find out in advance if we have something to write - needed for FullWriteIfChanged mode
bool saveComment = d->commenttqStatus == MetadataAvailable;
bool saveDateTime = d->dateTimetqStatus == MetadataAvailable;
bool saveRating = d->ratingtqStatus == MetadataAvailable;
bool saveComment = d->commentStatus == MetadataAvailable;
bool saveDateTime = d->dateTimeStatus == MetadataAvailable;
bool saveRating = d->ratingStatus == MetadataAvailable;
bool saveTags = false;
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
if (it.data() == MetadataAvailable)
{
@ -437,7 +437,7 @@ bool MetadataHub::write(ImageInfo *info, WriteMode writeMode)
{
if (d->dbmode == ManagedTags)
{
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
if (it.data() == MetadataAvailable)
{
@ -464,15 +464,15 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata
bool dirty = false;
// find out in advance if we have something to write - needed for FullWriteIfChanged mode
bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable);
bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable);
bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable);
bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable);
bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable);
bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable);
bool saveTags = false;
if (settings.saveIptcTags)
{
saveTags = false;
// find at least one tag to write
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
if (it.data() == MetadataAvailable)
{
@ -522,7 +522,7 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata
// create list of keywords to be added and to be removed
TQStringList newKeywords, oldKeywords;
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
// it is important that MetadataDisjoint keywords are not touched
if (it.data() == MetadataAvailable)
@ -609,15 +609,15 @@ bool MetadataHub::needWriteMetadata(WriteMode writeMode, const MetadataWriteSett
// This is the same logic as in write(DMetadata) but without actually writing.
// Adapt if the method above changes
bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable);
bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable);
bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable);
bool saveComment = (settings.saveComments && d->commentStatus == MetadataAvailable);
bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable);
bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable);
bool saveTags = false;
if (settings.saveIptcTags)
{
saveTags = false;
// find at least one tag to write
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
if (it.data() == MetadataAvailable)
{
@ -661,42 +661,42 @@ MetadataWriteSettings MetadataHub::defaultWriteSettings()
// --------------------------------------------------
MetadataHub::tqStatus MetadataHub::dateTimetqStatus() const
MetadataHub::Status MetadataHub::dateTimeStatus() const
{
return d->dateTimetqStatus;
return d->dateTimeStatus;
}
MetadataHub::tqStatus MetadataHub::commenttqStatus() const
MetadataHub::Status MetadataHub::commentStatus() const
{
return d->commenttqStatus;
return d->commentStatus;
}
MetadataHub::tqStatus MetadataHub::ratingtqStatus() const
MetadataHub::Status MetadataHub::ratingStatus() const
{
return d->ratingtqStatus;
return d->ratingStatus;
}
MetadataHub::TagtqStatus MetadataHub::tagtqStatus(int albumId) const
MetadataHub::TagStatus MetadataHub::tagStatus(int albumId) const
{
if (d->dbmode == NewTagsImport)
return TagtqStatus(MetadataInvalid);
return tagtqStatus(AlbumManager::instance()->findTAlbum(albumId));
return TagStatus(MetadataInvalid);
return tagStatus(AlbumManager::instance()->findTAlbum(albumId));
}
MetadataHub::TagtqStatus MetadataHub::tagtqStatus(const TQString &tagPath) const
MetadataHub::TagStatus MetadataHub::tagStatus(const TQString &tagPath) const
{
if (d->dbmode == NewTagsImport)
return TagtqStatus(MetadataInvalid);
return tagtqStatus(AlbumManager::instance()->findTAlbum(tagPath));
return TagStatus(MetadataInvalid);
return tagStatus(AlbumManager::instance()->findTAlbum(tagPath));
}
MetadataHub::TagtqStatus MetadataHub::tagtqStatus(TAlbum *album) const
MetadataHub::TagStatus MetadataHub::tagStatus(TAlbum *album) const
{
if (!album)
return TagtqStatus(MetadataInvalid);
TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(album);
return TagStatus(MetadataInvalid);
TQMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(album);
if (mapIt == d->tags.end())
return TagtqStatus(MetadataInvalid);
return TagStatus(MetadataInvalid);
return mapIt.data();
}
@ -738,7 +738,7 @@ int MetadataHub::rating() const
void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) const
{
switch (d->dateTimetqStatus)
switch (d->dateTimeStatus)
{
case MetadataInvalid:
lowest = highest = TQDateTime();
@ -755,7 +755,7 @@ void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) cons
void MetadataHub::ratingInterval(int &lowest, int &highest) const
{
switch (d->ratingtqStatus)
switch (d->ratingStatus)
{
case MetadataInvalid:
lowest = highest = -1;
@ -777,26 +777,26 @@ TQStringList MetadataHub::keywords() const
else
{
TQStringList tagList;
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
if (it.data() == TagtqStatus(MetadataAvailable, true))
if (it.data() == TagStatus(MetadataAvailable, true))
tagList.append(it.key()->tagPath(false));
}
return tagList;
}
}
TQMap<TAlbum *, MetadataHub::TagtqStatus> MetadataHub::tags() const
TQMap<TAlbum *, MetadataHub::TagStatus> MetadataHub::tags() const
{
// DatabaseMode == ManagedTags is assumed
return d->tags;
}
TQMap<int, MetadataHub::TagtqStatus> MetadataHub::tagIDs() const
TQMap<int, MetadataHub::TagStatus> MetadataHub::tagIDs() const
{
// DatabaseMode == ManagedTags is assumed
TQMap<int, TagtqStatus> intmap;
for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
TQMap<int, TagStatus> intmap;
for (TQMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it)
{
intmap.insert(it.key()->id(), it.data());
}
@ -806,35 +806,35 @@ TQMap<int, MetadataHub::TagtqStatus> MetadataHub::tagIDs() const
// --------------------------------------------------
void MetadataHub::setDateTime(const TQDateTime &dateTime, tqStatus status)
void MetadataHub::setDateTime(const TQDateTime &dateTime, Status status)
{
d->dateTimetqStatus = status;
d->dateTimeStatus = status;
d->dateTime = dateTime;
d->dateTimeChanged = true;
}
void MetadataHub::setComment(const TQString &comment, tqStatus status)
void MetadataHub::setComment(const TQString &comment, Status status)
{
d->commenttqStatus = status;
d->commentStatus = status;
d->comment = comment;
d->commentChanged = true;
}
void MetadataHub::setRating(int rating, tqStatus status)
void MetadataHub::setRating(int rating, Status status)
{
d->ratingtqStatus = status;
d->ratingStatus = status;
d->rating = rating;
d->ratingChanged = true;
}
void MetadataHub::setTag(TAlbum *tag, bool hasTag, tqStatus status)
void MetadataHub::setTag(TAlbum *tag, bool hasTag, Status status)
{
// DatabaseMode == ManagedTags is assumed
d->tags[tag] = TagtqStatus(status, hasTag);
d->tags[tag] = TagStatus(status, hasTag);
d->tagsChanged = true;
}
void MetadataHub::setTag(int albumID, bool hasTag, tqStatus status)
void MetadataHub::setTag(int albumID, bool hasTag, Status status)
{
// DatabaseMode == ManagedTags is assumed
TAlbum *album = AlbumManager::instance()->findTAlbum(albumID);

40
digikam/digikam/metadatahub.h
Unescape View File

@ -92,7 +92,7 @@ public:
If only one set has been added, the status is always MetadataAvailable.
If no set has been added, the status is always MetadataInvalid
*/
enum tqStatus
enum Status
{
MetadataInvalid, /// not yet filled with any value
MetadataAvailable, /// only one data set has been added, or a common value is available
@ -102,21 +102,21 @@ public:
/**
Describes the complete status of a Tag: The metadata status, and the fact if it has the tag or not.
*/
class TagtqStatus
class TagStatus
{
public:
TagtqStatus(tqStatus status, bool hasTag = false) : status(status), hasTag(hasTag) {};
TagtqStatus() : status(MetadataInvalid), hasTag(false) {};
TagStatus(Status status, bool hasTag = false) : status(status), hasTag(hasTag) {};
TagStatus() : status(MetadataInvalid), hasTag(false) {};
tqStatus status;
Status status;
bool hasTag;
bool operator==(TagtqStatus otherstatus)
bool operator==(TagStatus otherstatus)
{
return otherstatus.status == status &&
otherstatus.hasTag == hasTag;
}
bool operator==(tqStatus otherstatus) { return otherstatus == status; }
bool operator==(Status otherstatus) { return otherstatus == status; }
};
enum DatabaseMode
@ -251,13 +251,13 @@ public:
// --------------------------------------------------
tqStatus dateTimetqStatus() const;
tqStatus commenttqStatus() const;
tqStatus ratingtqStatus() const;
Status dateTimeStatus() const;
Status commentStatus() const;
Status ratingStatus() const;
TagtqStatus tagtqStatus(TAlbum *album) const;
TagtqStatus tagtqStatus(int albumId) const;
TagtqStatus tagtqStatus(const TQString &tagPath) const;
TagStatus tagStatus(TAlbum *album) const;
TagStatus tagStatus(int albumId) const;
TagStatus tagStatus(const TQString &tagPath) const;
/**
Returns if the metadata field has been changed
@ -320,23 +320,23 @@ public:
sets contained the tag. The hasTag value is true then.
If MapMode (set in constructor) is false, returns an empty map.
*/
TQMap<TAlbum *, TagtqStatus> tags() const;
TQMap<TAlbum *, TagStatus> tags() const;
/**
Similar to the method above.
This method is less efficient internally.
*/
TQMap<int, TagtqStatus> tagIDs() const;
TQMap<int, TagStatus> tagIDs() const;
// --------------------------------------------------
/**
Set dateTime to the given value, and the dateTime status to MetadataAvailable
*/
void setDateTime(const TQDateTime &dateTime, tqStatus status = MetadataAvailable);
void setComment(const TQString &comment, tqStatus status = MetadataAvailable);
void setRating(int rating, tqStatus status = MetadataAvailable);
void setTag(TAlbum *tag, bool hasTag, tqStatus status = MetadataAvailable);
void setTag(int albumID, bool hasTag, tqStatus status = MetadataAvailable);
void setDateTime(const TQDateTime &dateTime, Status status = MetadataAvailable);
void setComment(const TQString &comment, Status status = MetadataAvailable);
void setRating(int rating, Status status = MetadataAvailable);
void setTag(TAlbum *tag, bool hasTag, Status status = MetadataAvailable);
void setTag(int albumID, bool hasTag, Status status = MetadataAvailable);
/**
Resets the information that metadata fields have been changed with one of the

18
digikam/digikam/monthwidget.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqfontmetrics.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
// KDE includes.
@ -83,7 +83,7 @@ MonthWidget::MonthWidget(TQWidget* parent)
d = new MonthWidgetPriv;
init();
TQDate date = TQDate::tqcurrentDate();
TQDate date = TQDate::currentDate();
setYearMonth(date.year(), date.month());
setActive(false);
@ -134,7 +134,7 @@ void MonthWidget::setYearMonth(int year, int month)
update();
}
TQSize MonthWidget::tqsizeHint() const
TQSize MonthWidget::sizeHint() const
{
return TQSize(d->width * 8, d->height * 9);
}
@ -153,7 +153,7 @@ void MonthWidget::drawContents(TQPainter *)
TQPixmap pix(cr.width(), cr.height());
TQColorGroup cg = tqcolorGroup();
TQColorGroup cg = colorGroup();
TQFont fnBold(font());
TQFont fnOrig(font());
@ -261,13 +261,13 @@ void MonthWidget::drawContents(TQPainter *)
#if KDE_IS_VERSION(3,2,0)
p.drawText(r, TQt::AlignCenter,
TQString("%1 %2")
.tqarg(KGlobal::locale()->calendar()->monthName(d->month, false))
.tqarg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1))));
.arg(KGlobal::locale()->calendar()->monthName(d->month, false))
.arg(KGlobal::locale()->calendar()->year(TQDate(d->year,d->month,1))));
#else
p.drawText(r, TQt::AlignCenter,
TQString("%1 %2")
.tqarg(KGlobal::locale()->monthName(d->month))
.tqarg(TQString::number(d->year)));
.arg(KGlobal::locale()->monthName(d->month))
.arg(TQString::number(d->year)));
#endif
p.end();
@ -363,7 +363,7 @@ void MonthWidget::setActive(bool val)
}
else
{
TQDate date = TQDate::tqcurrentDate();
TQDate date = TQDate::currentDate();
setYearMonth(date.year(), date.month());
AlbumLister::instance()->setDayFilter(TQValueList<TQDateTime>());

2
digikam/digikam/monthwidget.h
Unescape View File

@ -48,7 +48,7 @@ public:
~MonthWidget();
void setYearMonth(int year, int month);
TQSize tqsizeHint() const;
TQSize sizeHint() const;
void setActive(bool val);

2
digikam/digikam/pixmapmanager.cpp
Unescape View File

@ -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

8
digikam/digikam/ratingfilter.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqpainter.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqpixmap.h>
#include <tqcursor.h>
#include <tqwhatsthis.h>
@ -184,17 +184,17 @@ void RatingFilter::updateRatingTooltip()
{
case AlbumLister::GreaterEqualCondition:
{
d->ratingTracker->setText(i18n("Rating >= %1").tqarg(rating()));
d->ratingTracker->setText(i18n("Rating >= %1").arg(rating()));
break;
}
case AlbumLister::EqualCondition:
{
d->ratingTracker->setText(i18n("Rating = %1").tqarg(rating()));
d->ratingTracker->setText(i18n("Rating = %1").arg(rating()));
break;
}
case AlbumLister::LessEqualCondition:
{
d->ratingTracker->setText(i18n("Rating <= %1").tqarg(rating()));
d->ratingTracker->setText(i18n("Rating <= %1").arg(rating()));
break;
}
default:

6
digikam/digikam/ratingwidget.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqpainter.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqpixmap.h>
// KDE includes.
@ -175,7 +175,7 @@ void RatingWidget::slotThemeChanged()
TQPainter painter(&d->regPixmap);
painter.fillRect(0, 0, d->regPixmap.width(), d->regPixmap.height(),
tqcolorGroup().dark());
colorGroup().dark());
painter.end();
TQPainter painter2(&d->selPixmap);
@ -185,7 +185,7 @@ void RatingWidget::slotThemeChanged()
TQPainter painter3(&d->disPixmap);
painter3.fillRect(0, 0, d->disPixmap.width(), d->disPixmap.height(),
tqpalette().disabled().foreground());
palette().disabled().foreground());
painter3.end();
setFixedSize(TQSize(d->regPixmap.width()*5, d->regPixmap.height()));

2
digikam/digikam/scanlib.cpp
Unescape View File

@ -123,7 +123,7 @@ void ScanLib::startScan()
deleteStaleEntries();
AlbumDB* db = AlbumManager::instance()->albumDB();
db->setSetting("Scanned", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate));
db->setSetting("Scanned", TQDateTime::currentDateTime().toString(Qt::ISODate));
}
void ScanLib::findFoldersWhichDoNotExist()

34
digikam/digikam/searchadvanceddialog.cpp
Unescape View File

@ -28,7 +28,7 @@
// TQt includes.
#include <tqvbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqhgroupbox.h>
@ -122,10 +122,10 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
d->rulesBox = new TQVGroupBox(i18n("Search Rules"), page);
TQWhatsThis::add(d->rulesBox, i18n("<p>Here you can review the search rules used to filter image-"
"searching in album library."));
d->rulesBox->tqlayout()->setSpacing( spacingHint() );
d->rulesBox->tqlayout()->setMargin( spacingHint() );
d->rulesBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
d->rulesBox->tqlayout()->tqsetAlignment( TQt::AlignTop );
d->rulesBox->layout()->setSpacing( spacingHint() );
d->rulesBox->layout()->setMargin( spacingHint() );
d->rulesBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
d->rulesBox->layout()->setAlignment( TQt::AlignTop );
// ----------------------------------------------------------------
// Box for the add/delete
@ -135,8 +135,8 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
"by adding/removing criteria."));
groupbox1->setColumnLayout(0, Qt::Vertical );
groupbox1->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox1->tqlayout()->setMargin( KDialog::marginHint() );
groupbox1->layout()->setSpacing( KDialog::spacingHint() );
groupbox1->layout()->setMargin( KDialog::marginHint() );
d->optionsCombo = new TQComboBox(groupbox1);
d->optionsCombo->insertItem(i18n("As well as"), 0);
d->optionsCombo->insertItem(i18n("Or"), 1);
@ -147,7 +147,7 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
d->addButton->setIconSet(SmallIcon("add"));
d->delButton->setIconSet(SmallIcon("remove"));
TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->tqlayout());
TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->layout());
box1->addWidget(d->optionsCombo);
box1->addWidget(d->addButton);
box1->addStretch(10);
@ -160,12 +160,12 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria "
"from the Search Rule set."));
groupbox2->setColumnLayout(0, Qt::Vertical);
groupbox2->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox2->tqlayout()->setMargin( KDialog::marginHint() );
groupbox2->layout()->setSpacing( KDialog::spacingHint() );
groupbox2->layout()->setMargin( KDialog::marginHint() );
d->groupButton = new TQPushButton(i18n("&Group"), groupbox2);
d->ungroupButton = new TQPushButton(i18n("&Ungroup"), groupbox2);
TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->tqlayout());
TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->layout());
box2->addWidget(d->groupButton);
box2->addStretch(10);
box2->addWidget(d->ungroupButton);
@ -175,14 +175,14 @@ SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* parent, KURL& url)
TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3");
groupbox3->setColumnLayout(0, Qt::Vertical );
groupbox3->tqlayout()->setSpacing( KDialog::spacingHint() );
groupbox3->layout()->setSpacing( KDialog::spacingHint() );
groupbox3->setFrameStyle( TQFrame::NoFrame );
TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3);
d->title = new KLineEdit(groupbox3, "searchTitle");
TQWhatsThis::add(d->title, i18n("<p>Enter the name used to save the current search in "
"\"My Searches\" view"));
TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->tqlayout());
TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->layout());
box3->addWidget(label);
box3->addWidget(d->title);
label->setBuddy(d->title);
@ -369,8 +369,8 @@ void SearchAdvancedDialog::slotGroupRules()
for (BaseList::iterator it = d->baseList.begin();
it != d->baseList.end(); ++it)
{
d->rulesBox->tqlayout()->remove((*it)->widget());
d->rulesBox->tqlayout()->add((*it)->widget());
d->rulesBox->layout()->remove((*it)->widget());
d->rulesBox->layout()->add((*it)->widget());
}
connect( group, TQT_SIGNAL( signalBaseItemToggled() ),
@ -423,8 +423,8 @@ void SearchAdvancedDialog::slotUnGroupRules()
for (BaseList::iterator it = d->baseList.begin();
it != d->baseList.end(); ++it)
{
d->rulesBox->tqlayout()->remove((*it)->widget());
d->rulesBox->tqlayout()->add((*it)->widget());
d->rulesBox->layout()->remove((*it)->widget());
d->rulesBox->layout()->add((*it)->widget());
}
slotChangeButtonStates();

2
digikam/digikam/searchfolderview.cpp
Unescape View File

@ -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());

4
digikam/digikam/searchquickdialog.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqtimer.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
#include <tqlabel.h>
@ -168,7 +168,7 @@ void SearchQuickDialog::slotTimeOut()
if (count != 0)
path += " AND ";
path += TQString(" %1 ").tqarg(count + 1);
path += TQString(" %1 ").arg(count + 1);
num = TQString::number(++count);
url.addQueryItem(num + ".key", "keyword");

2
digikam/digikam/searchresultsitem.cpp
Unescape View File

@ -41,7 +41,7 @@ SearchResultsItem::SearchResultsItem(TQIconView* view, const TQString& path)
if (!m_basePixmap)
{
m_basePixmap = new TQPixmap(128, 128);
m_basePixmap->fill(view->tqcolorGroup().base());
m_basePixmap->fill(view->colorGroup().base());
TQPainter p(m_basePixmap);
p.setPen(TQt::lightGray);

34
digikam/digikam/searchwidgets.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqlineedit.h>
#include <tqgroupbox.h>
#include <tqvgroupbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqdatetime.h>
// KDE includes.
@ -126,8 +126,8 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt
: SearchAdvancedBase(SearchAdvancedBase::RULE)
{
m_box = new TQVBox(parent);
m_box->tqlayout()->setSpacing( KDialog::spacingHint() );
m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_box->layout()->setSpacing( KDialog::spacingHint() );
m_box->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_optionsBox = 0;
m_option = option;
@ -139,23 +139,23 @@ SearchAdvancedRule::SearchAdvancedRule(TQWidget* parent, SearchAdvancedRule::Opt
m_optionsBox);
TQFrame* hline = new TQFrame( m_optionsBox );
hline->setFrameStyle( TQFrame::HLine|TQFrame::Sunken );
m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
hline->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
hline->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ),
this, TQT_SLOT( slotLabelDoubleClick() ));
}
m_hbox = new TQWidget( m_box );
m_hbox->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
m_hbox->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
m_key = new TQComboBox( m_hbox, "key" );
m_key->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
m_key->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
for (int i=0; i< RuleKeyTableCount; i++)
m_key->insertItem( i18n(RuleKeyTable[i].keyText), i );
m_operator = new TQComboBox( m_hbox );
m_operator->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
m_operator->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
// prepopulate the operator widget to get optimal size
for (int i=0; i< RuleOpTableCount; i++)
m_operator->insertItem( i18n(RuleOpTable[i].keyText), i );
@ -311,7 +311,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp
if (newType == DATE)
{
m_dateEdit = new KDateEdit( m_valueBox,"datepicker");
m_dateEdit->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
m_dateEdit->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
m_dateEdit->show();
connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ),
@ -320,7 +320,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp
else if (newType == LINEEDIT)
{
m_lineEdit = new TQLineEdit( m_valueBox, "lineedit" );
m_lineEdit->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_lineEdit->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_lineEdit->show();
connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ),
@ -330,7 +330,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp
else if (newType == ALBUMS)
{
m_valueCombo = new SqueezedComboBox( m_valueBox, "albumscombo" );
m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
AlbumManager* aManager = AlbumManager::instance();
AlbumList aList = aManager->allPAlbums();
@ -370,7 +370,7 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp
else if (newType == TAGS)
{
m_valueCombo = new SqueezedComboBox( m_valueBox, "tagscombo" );
m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
m_valueCombo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
AlbumManager* aManager = AlbumManager::instance();
AlbumList tList = aManager->allTAlbums();
@ -477,16 +477,16 @@ void SearchAdvancedRule::addOption(Option option)
return;
}
m_box->tqlayout()->remove(m_hbox);
m_box->layout()->remove(m_hbox);
m_optionsBox = new TQHBox(m_box);
new TQLabel(option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox);
TQFrame* hline = new TQFrame(m_optionsBox);
hline->setFrameStyle(TQFrame::HLine|TQFrame::Sunken);
hline->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
hline->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
m_optionsBox->show();
m_box->tqlayout()->add(m_hbox);
m_box->layout()->add(m_hbox);
m_option = option;
}
@ -500,7 +500,7 @@ void SearchAdvancedRule::removeOption()
void SearchAdvancedRule::addCheck()
{
m_check = new TQCheckBox(m_hbox);
m_check->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
m_check->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight );
m_check->show();
@ -518,7 +518,7 @@ SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* parent)
: SearchAdvancedBase(SearchAdvancedBase::GROUP)
{
m_box = new TQHBox(parent);
m_box->tqlayout()->setSpacing(KDialog::spacingHint());
m_box->layout()->setSpacing(KDialog::spacingHint());
m_groupbox = new TQVGroupBox(m_box);
m_check = new TQCheckBox(m_box);
m_option = SearchAdvancedRule::NONE;

12
digikam/digikam/tageditdlg.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
// KDE includes.
@ -108,7 +108,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true));
d->topLabel = new TQLabel(page);
d->topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
d->topLabel->setAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine);
KSeparator *line = new KSeparator(Qt::Horizontal, page);
@ -250,13 +250,13 @@ void TagEditDlg::slotTitleChanged(const TQString& newtitle)
else
{
d->topLabel->setText(i18n("<qt><b>Create New Tag in<br>"
"<i>\"%1\"</i></b></qt>").tqarg(tagName));
"<i>\"%1\"</i></b></qt>").arg(tagName));
}
}
else
{
d->topLabel->setText(i18n("<qt><b>Properties of Tag<br>"
"<i>\"%1\"</i></b></qt>").tqarg(tagName));
"<i>\"%1\"</i></b></qt>").arg(tagName));
}
enableButtonOK(!newtitle.isEmpty());
@ -327,9 +327,9 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr
TQString tagPath, errMsg;
TQString tag = (*it2).stripWhiteSpace();
if (root->isRoot())
tagPath = TQString("/%1").tqarg(tag);
tagPath = TQString("/%1").arg(tag);
else
tagPath = TQString("%1/%2").tqarg(root->tagPath()).tqarg(tag);
tagPath = TQString("%1/%2").arg(root->tagPath()).arg(tag);
DDebug() << tag << " :: " << tagPath << endl;

28
digikam/digikam/tagfilterview.cpp
Unescape View File

@ -137,7 +137,7 @@ void TagFilterViewItem::refresh()
if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount())
{
if (isOpen())
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count));
setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(m_count));
else
{
int countRecursive = m_count;
@ -149,7 +149,7 @@ void TagFilterViewItem::refresh()
countRecursive += item->count();
++it;
}
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive));
setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(countRecursive));
}
}
else
@ -166,9 +166,9 @@ void TagFilterViewItem::stateChange(bool val)
have been changed from TQCheckListItem::CheckBoxController
to TQCheckListItem::CheckBox.
// All TagFilterViewItems are CheckBoxControllers. If they have no tqchildren,
// All TagFilterViewItems are CheckBoxControllers. If they have no children,
// they should be of type CheckBox, but that is not possible with our way of adding items.
// When clicked, tqchildren-less items first change to the NoChange state, and a second
// When clicked, children-less items first change to the NoChange state, and a second
// click is necessary to set them to On and make the filter take effect.
// So set them to On if the condition is met.
if (!firstChild() && state() == NoChange)
@ -393,7 +393,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter)
if (!match)
{
// check if any of the tqchildren match the search
// check if any of the children match the search
AlbumIterator it(talbum);
while (it.current())
{
@ -539,7 +539,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e)
if(TagDrag::canDecode(e))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
@ -623,7 +623,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e)
KPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters"));
popMenu.insertItem(SmallIcon("tag"), i18n("Assign Tag '%1' to Items")
.tqarg(destAlbum->prettyURL()), 10) ;
.arg(destAlbum->prettyURL()), 10) ;
popMenu.insertItem(i18n("Set as Tag Thumbnail"), 11);
popMenu.insertSeparator(-1);
popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel"));
@ -760,7 +760,7 @@ void TagFilterView::slotTagDeleted(Album* album)
if (!item)
return;
// NOTE: see B.K.O #158558: unselected tag filter and all tqchildrens before to delete it.
// NOTE: see B.K.O #158558: unselected tag filter and all childrens before to delete it.
toggleChildTags(item, false);
item->setOn(false);
@ -1201,17 +1201,17 @@ void TagFilterView::tagDelete(TagFilterViewItem* item)
return;
// find number of subtags
int tqchildren = 0;
int children = 0;
AlbumIterator iter(tag);
while(iter.current())
{
tqchildren++;
children++;
++iter;
}
AlbumManager* man = AlbumManager::instance();
if (tqchildren)
if (children)
{
int result = KMessageBox::warningContinueCancel(this,
i18n("Tag '%1' has one subtag. "
@ -1222,7 +1222,7 @@ void TagFilterView::tagDelete(TagFilterViewItem* item)
"Deleting this will also delete "
"the subtags. "
"Do you want to continue?",
tqchildren).tqarg(tag->title()));
children).arg(tag->title()));
if(result != KMessageBox::Continue)
return;
@ -1236,11 +1236,11 @@ void TagFilterView::tagDelete(TagFilterViewItem* item)
"Do you want to continue?",
"Tag '%1' is assigned to %n items. "
"Do you want to continue?",
assignedItems.count()).tqarg(tag->title());
assignedItems.count()).arg(tag->title());
}
else
{
message = i18n("Delete '%1' tag?").tqarg(tag->title());
message = i18n("Delete '%1' tag?").arg(tag->title());
}
int result = KMessageBox::warningContinueCancel(0, message,

24
digikam/digikam/tagfolderview.cpp
Unescape View File

@ -115,7 +115,7 @@ void TagFolderViewItem::refresh()
dynamic_cast<TagFolderViewItem*>(parent()))
{
if (isOpen())
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count));
setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(m_count));
else
{
int countRecursive = m_count;
@ -127,7 +127,7 @@ void TagFolderViewItem::refresh()
countRecursive += item->count();
++it;
}
setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive));
setText(0, TQString("%1 (%2)").arg(m_album->title()).arg(countRecursive));
}
}
else
@ -283,7 +283,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter)
if (!match)
{
// check if any of the tqchildren match the search
// check if any of the children match the search
AlbumIterator it(talbum);
while (it.current())
{
@ -337,7 +337,7 @@ void TagFolderView::slotAlbumAdded(Album *album)
{
item = new TagFolderViewItem(this, tag);
tag->setExtraData(this, item);
// Toplevel tags are all tqchildren of root, and should always be visible - set root to open
// Toplevel tags are all children of root, and should always be visible - set root to open
item->setOpen(true);
}
else
@ -705,15 +705,15 @@ void TagFolderView::tagDelete(TagFolderViewItem *item)
return;
// find number of subtags
int tqchildren = 0;
int children = 0;
AlbumIterator iter(tag);
while(iter.current())
{
tqchildren++;
children++;
++iter;
}
if(tqchildren)
if(children)
{
int result = KMessageBox::warningContinueCancel(this,
i18n("Tag '%1' has one subtag. "
@ -724,7 +724,7 @@ void TagFolderView::tagDelete(TagFolderViewItem *item)
"Deleting this will also delete "
"the subtags. "
"Do you want to continue?",
tqchildren).tqarg(tag->title()));
children).arg(tag->title()));
if(result != KMessageBox::Continue)
return;
@ -738,11 +738,11 @@ void TagFolderView::tagDelete(TagFolderViewItem *item)
"Do you want to continue?",
"Tag '%1' is assigned to %n items. "
"Do you want to continue?",
assignedItems.count()).tqarg(tag->title());
assignedItems.count()).arg(tag->title());
}
else
{
message = i18n("Delete '%1' tag?").tqarg(tag->title());
message = i18n("Delete '%1' tag?").arg(tag->title());
}
int result = KMessageBox::warningContinueCancel(0, message,
@ -822,7 +822,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
if(TagDrag::canDecode(e))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
@ -946,7 +946,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
KPopupMenu popMenu(this);
popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags"));
popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items")
.tqarg(destAlbum->prettyURL()), 10) ;
.arg(destAlbum->prettyURL()), 10) ;
popMenu.insertSeparator(-1);
popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );

8
digikam/digikam/tagspopupmenu.cpp
Unescape View File

@ -67,11 +67,11 @@ public:
{
}
virtual TQSize tqsizeHint()
virtual TQSize sizeHint()
{
TQFont fn = m_popup->font();
TQFontMetrics fm(fn);
int w = fm.width(m_txt) + 5 + kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
int w = fm.width(m_txt) + 5 + kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int h = TQMAX(fm.height(), m_pix.height());
return TQSize( w, h );
}
@ -90,8 +90,8 @@ public:
p->drawPixmap( pixRect.topLeft(), m_pix );
}
int checkWidth = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
int checkHeight = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight, 0);
int checkWidth = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
int checkHeight = kapp->tqstyle().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
TQStyle::SFlags flags = TQStyle::Style_Default;
flags |= TQStyle::Style_On;

2
digikam/digikam/timelinefolderview.cpp
Unescape View File

@ -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());

28
digikam/digikam/timelineview.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqtimer.h>
#include <tqframe.h>
#include <tqhbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqhbuttongroup.h>
@ -185,7 +185,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
d->cursorDateLabel = new KSqueezedTextLabel(0, panel);
d->cursorCountLabel = new TQLabel(panel);
d->cursorCountLabel->tqsetAlignment(TQt::AlignRight);
d->cursorCountLabel->setAlignment(TQt::AlignRight);
// ---------------------------------------------------------------
@ -334,7 +334,7 @@ void TimeLineView::readConfig()
d->scaleBG->setButton(config->readNumEntry("Histogram Scale", TimeLineWidget::LinScale));
slotScaleChanged(d->scaleBG->selectedId());
TQDateTime now = TQDateTime::tqcurrentDateTime();
TQDateTime now = TQDateTime::currentDateTime();
d->timeLineWidget->setCursorDateTime(config->readDateTimeEntry("Cursor Position", &now));
d->timeLineWidget->setCurrentIndex(d->timeLineWidget->indexForCursorDateTime());
}
@ -456,7 +456,7 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name)
for (int i = 1 ; i < grp; i++)
{
path.append(" OR ");
path.append(TQString("%1 AND %2").tqarg(i*2+1).tqarg(i*2+2));
path.append(TQString("%1 AND %2").arg(i*2+1).arg(i*2+2));
}
}
url.setPath(path);
@ -467,12 +467,12 @@ void TimeLineView::createNewDateSearchAlbum(const TQString& name)
{
start = (*it).first;
end = (*it).second;
url.addQueryItem(TQString("%1.key").tqarg(i*2+1), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").tqarg(i*2+1), TQString("GT"));
url.addQueryItem(TQString("%1.val").tqarg(i*2+1), start.date().toString(Qt::ISODate));
url.addQueryItem(TQString("%1.key").tqarg(i*2+2), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").tqarg(i*2+2), TQString("LT"));
url.addQueryItem(TQString("%1.val").tqarg(i*2+2), end.date().toString(Qt::ISODate));
url.addQueryItem(TQString("%1.key").arg(i*2+1), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").arg(i*2+1), TQString("GT"));
url.addQueryItem(TQString("%1.val").arg(i*2+1), start.date().toString(Qt::ISODate));
url.addQueryItem(TQString("%1.key").arg(i*2+2), TQString("imagedate"));
url.addQueryItem(TQString("%1.op").arg(i*2+2), TQString("LT"));
url.addQueryItem(TQString("%1.val").arg(i*2+2), end.date().toString(Qt::ISODate));
i++;
}
@ -526,14 +526,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum)
DateRangeList list;
for (int i = 1 ; i <= count ; i+=2)
{
key = TQString("%1.val").tqarg(TQString::number(i));
key = TQString("%1.val").arg(TQString::number(i));
it2 = queries.find(key);
if (it2 != queries.end())
start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate));
//DDebug() << key << " :: " << it2.data() << endl;
key = TQString("%1.val").tqarg(TQString::number(i+1));
key = TQString("%1.val").arg(TQString::number(i+1));
it2 = queries.find(key);
if (it2 != queries.end())
end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate));
@ -623,11 +623,11 @@ void TimeLineView::slotRenameAlbum(SAlbum* salbum)
bool ok;
#if KDE_IS_VERSION(3,2,0)
TQString name = KInputDialog::getText(i18n("Rename Album (%1)").tqarg(oldName),
TQString name = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldName),
i18n("Enter new album name:"),
oldName, &ok, this);
#else
TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").tqarg(oldName),
TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").arg(oldName),
i18n("Enter new album name:"),
oldName, &ok, this);
#endif

42
digikam/digikam/timelinewidget.cpp
Unescape View File

@ -120,7 +120,7 @@ TimeLineWidget::TimeLineWidget(TQWidget *parent)
setMinimumWidth(256);
setMinimumHeight(192);
TQDateTime ref = TQDateTime::tqcurrentDateTime();
TQDateTime ref = TQDateTime::currentDateTime();
setCursorDateTime(ref);
setRefDateTime(ref);
@ -280,16 +280,16 @@ int TimeLineWidget::cursorInfo(TQString& infoDate)
case Week:
{
infoDate = i18n("Week #%1 - %2 %3")
.tqarg(d->calendar->weekNumber(dt.date()))
.tqarg(d->calendar->monthName(dt.date()))
.tqarg(d->calendar->yearString(dt.date(), false));
.arg(d->calendar->weekNumber(dt.date()))
.arg(d->calendar->monthName(dt.date()))
.arg(d->calendar->yearString(dt.date(), false));
break;
}
case Month:
{
infoDate = TQString("%1 %2")
.tqarg(d->calendar->monthName(dt.date()))
.tqarg(d->calendar->yearString(dt.date(), false));
.arg(d->calendar->monthName(dt.date()))
.arg(d->calendar->yearString(dt.date(), false));
break;
}
case Year:
@ -610,7 +610,7 @@ void TimeLineWidget::updatePixmap()
{
// Drawing background and image.
d->pixmap = TQPixmap(size());
d->pixmap.fill(tqpalette().active().background());
d->pixmap.fill(palette().active().background());
TQPainter p(&d->pixmap);
@ -665,11 +665,11 @@ void TimeLineWidget::updatePixmap()
focusRect = barRect;
if (ref > d->maxDateTime)
dateColor = tqpalette().active().mid();
dateColor = palette().active().mid();
else
dateColor = tqpalette().active().foreground();
dateColor = palette().active().foreground();
p.setPen(tqpalette().active().foreground());
p.setPen(palette().active().foreground());
p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor()));
p.drawRect(barRect);
p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3);
@ -678,12 +678,12 @@ void TimeLineWidget::updatePixmap()
if (val)
{
if (sel)
subDateColor = tqpalette().active().highlightedText();
subDateColor = palette().active().highlightedText();
else
subDateColor = tqpalette().active().foreground();
subDateColor = palette().active().foreground();
}
else
subDateColor = tqpalette().active().mid();
subDateColor = palette().active().mid();
if (sel == Selected || sel == FuzzySelection)
{
@ -849,11 +849,11 @@ void TimeLineWidget::updatePixmap()
focusRect = barRect;
if (ref < d->minDateTime)
dateColor = tqpalette().active().mid();
dateColor = palette().active().mid();
else
dateColor = tqpalette().active().foreground();
dateColor = palette().active().foreground();
p.setPen(tqpalette().active().foreground());
p.setPen(palette().active().foreground());
p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor()));
p.drawRect(barRect);
p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3);
@ -862,12 +862,12 @@ void TimeLineWidget::updatePixmap()
if (val)
{
if (sel)
subDateColor = tqpalette().active().highlightedText();
subDateColor = palette().active().highlightedText();
else
subDateColor = tqpalette().active().foreground();
subDateColor = palette().active().foreground();
}
else
subDateColor = tqpalette().active().mid();
subDateColor = palette().active().mid();
if (sel == Selected || sel == FuzzySelection)
{
@ -1004,7 +1004,7 @@ void TimeLineWidget::updatePixmap()
TQPoint p2(focusRect.right(), height() - d->bottomMargin);
focusRect.setBottom(focusRect.bottom() + d->bottomMargin/2);
p.setPen(tqpalette().active().shadow());
p.setPen(palette().active().shadow());
p.drawLine(p1.x(), p1.y()+1, p2.x(), p2.y()+1);
p.drawRect(focusRect);
@ -1018,7 +1018,7 @@ void TimeLineWidget::updatePixmap()
p.drawLine(p1.x()-1, p1.y()-1, p2.x()+1, p2.y()-1);
focusRect.addCoords(-1,-1, 1, 1);
p.setPen(tqpalette().active().shadow());
p.setPen(palette().active().shadow());
p.drawRect(focusRect);
p.drawLine(p1.x(), p1.y()-2, p2.x(), p2.y()-2);
}

84
digikam/digikam/upgradedb_sqlite2tosqlite3.cpp
Unescape View File

@ -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;

32
digikam/digikam/welcomepageview.cpp
Unescape View File

@ -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'>&nbsp; &nbsp; 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;
}

24
digikam/imageplugins/adjustcurves/adjustcurves.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqgroupbox.h>
#include <tqhgroupbox.h>
@ -39,7 +39,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqhbuttongroup.h>
@ -127,7 +127,7 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
TQGridLayout* grid = new TQGridLayout( gboxSettings, 5, 5, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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);
}
}

26
digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqgroupbox.h>
#include <tqhgroupbox.h>
@ -39,7 +39,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqhbuttongroup.h>
@ -118,7 +118,7 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 5, 5);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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);
}
}

34
digikam/imageplugins/adjustlevels/adjustlevels.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqgroupbox.h>
#include <tqhgroupbox.h>
@ -39,7 +39,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqhbuttongroup.h>
@ -126,7 +126,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
TQGridLayout* grid = new TQGridLayout(gboxSettings, 16, 8, spacingHint(), 0);
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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();

34
digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
Unescape View File

@ -34,8 +34,8 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqlayout.h>
#include <layout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
@ -119,7 +119,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 20, 6);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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();

4
digikam/imageplugins/antivignetting/antivignettingtool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
#include <tqpixmap.h>
#include <tqpainter.h>
@ -86,7 +86,7 @@ AntiVignettingTool::AntiVignettingTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 14, 2);
m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
"mask applied to the image.") );

4
digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
#include <tqpixmap.h>
#include <tqpainter.h>
@ -89,7 +89,7 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 13, 2, spacingHint());
m_maskPreviewLabel = new TQLabel( gboxSettings );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting "
"mask applied to the image.") );
gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2);

2
digikam/imageplugins/blurfx/blurfx.cpp
Unescape View File

@ -1050,7 +1050,7 @@ void BlurFX::frostGlass(Digikam::DImg *orgImage, Digikam::DImg *destImage, int F
// Randomize.
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = dt.secsTo(Y2000);

2
digikam/imageplugins/blurfx/blurfxtool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqdatetime.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqslider.h>
#include <tqwhatsthis.h>

2
digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqslider.h>
#include <tqimage.h>
#include <tqcombobox.h>

2
digikam/imageplugins/border/bordertool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

2
digikam/imageplugins/border/imageeffect_border.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>

8
digikam/imageplugins/channelmixer/channelmixer.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <tqvbox.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqcheckbox.h>
@ -124,7 +124,7 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent)
TQGridLayout* grid = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Red") );
m_channelCB->insertItem( i18n("Green") );
@ -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()

8
digikam/imageplugins/channelmixer/channelmixertool.cpp
Unescape View File

@ -40,7 +40,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
@ -118,7 +118,7 @@ ChannelMixerTool::ChannelMixerTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
m_channelCB->insertItem( i18n("Red") );
m_channelCB->insertItem( i18n("Green") );
@ -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()

2
digikam/imageplugins/charcoal/charcoaltool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

2
digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

8
digikam/imageplugins/colorfx/colorfxtool.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqvbox.h>
@ -101,7 +101,7 @@ ColorFXTool::ColorFXTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 9, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -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)

8
digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqvbox.h>
#include <tqtooltip.h>
@ -107,7 +107,7 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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 )

8
digikam/imageplugins/coreplugin/autocorrectiontool.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
@ -101,7 +101,7 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 2, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings->plainPage() );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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)

8
digikam/imageplugins/coreplugin/bcgtool.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqvbox.h>
@ -100,7 +100,7 @@ BCGTool::BCGTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -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)

2
digikam/imageplugins/coreplugin/blurtool.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>

24
digikam/imageplugins/coreplugin/bwsepiatool.cpp
Unescape View File

@ -33,10 +33,10 @@
#include <tqhgroupbox.h>
#include <tqintdict.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtimer.h>
#include <tqtooltip.h>
#include <tqvbox.h>
@ -92,7 +92,7 @@ public:
PreviewPixmapFactory(BWSepiaTool* bwSepia);
void tqinvalidate() { m_previewPixmapMap.clear(); }
void invalidate() { m_previewPixmapMap.clear(); }
const TQPixmap* pixmap(int id);
@ -191,7 +191,7 @@ BWSepiaTool::BWSepiaTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 4, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -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);

8
digikam/imageplugins/coreplugin/hsl/hsltool.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqtimer.h>
#include <tqtooltip.h>
@ -104,7 +104,7 @@ HSLTool::HSLTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 11, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -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 )

8
digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqvbox.h>
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@ -87,7 +87,7 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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 )

18
digikam/imageplugins/coreplugin/iccprooftool.cpp
Unescape View File

@ -34,11 +34,11 @@
#include <tqhbox.h>
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpoint.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtoolbox.h>
#include <tqtooltip.h>
#include <tqvbox.h>
@ -128,7 +128,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
TQGridLayout *gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2);
TQLabel *label1 = new TQLabel(i18n("Channel: "), m_gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -267,7 +267,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
"specific color.</li></ul>"));
KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions);
lcmsLogoLabel->tqsetAlignment(AlignTop | AlignRight);
lcmsLogoLabel->setAlignment(AlignTop | AlignRight);
lcmsLogoLabel->setText(TQString());
lcmsLogoLabel->setURL("http://www.littlecms.com");
KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data");
@ -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;
}

8
digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqvgroupbox.h>
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqvbox.h>
@ -94,7 +94,7 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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 )

8
digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@ -87,7 +87,7 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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 )

2
digikam/imageplugins/coreplugin/imageeffect_blur.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>

26
digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqlistbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@ -40,7 +40,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqintdict.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqfile.h>
#include <tqvbox.h>
@ -85,7 +85,7 @@ public:
PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia);
void tqinvalidate() { m_previewPixmapMap.clear(); }
void invalidate() { m_previewPixmapMap.clear(); }
const TQPixmap* pixmap(int id);
@ -189,7 +189,7 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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);

18
digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqvbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqpoint.h>
#include <tqvbox.h>
@ -44,7 +44,7 @@
#include <tqradiobutton.h>
#include <tqfile.h>
#include <tqtoolbox.h>
#include <tqtextstream.h>
#include <textstream.h>
// KDE includes.
@ -115,7 +115,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
TQGridLayout *gridSettings = new TQGridLayout( gboxSettings, 3, 2, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel: "), gboxSettings);
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, gboxSettings);
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -253,7 +253,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
"specific color.</li></ul>"));
KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions);
lcmsLogoLabel->tqsetAlignment( AlignTop | AlignRight );
lcmsLogoLabel->setAlignment( AlignTop | AlignRight );
lcmsLogoLabel->setText(TQString());
lcmsLogoLabel->setURL("http://www.littlecms.com");
KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data");
@ -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;
}

10
digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@ -86,7 +86,7 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -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)

20
digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqvgroupbox.h>
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqvbox.h>
#include <tqlabel.h>
@ -85,7 +85,7 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 7, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -147,13 +147,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
// -------------------------------------------------------------
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings);
labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider");
m_rSlider->setTickmarks(TQSlider::Below);
m_rSlider->setTickInterval(20);
TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
TQLabel *labelRight = new TQLabel(i18n("Red"), gboxSettings);
labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
m_rInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_rInput");
gridSettings->addMultiCellWidget(labelLeft, 3, 3, 0, 0);
@ -164,13 +164,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
// -------------------------------------------------------------
labelLeft = new TQLabel(i18n("Magenta"), gboxSettings);
labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider");
m_gSlider->setTickmarks(TQSlider::Below);
m_gSlider->setTickInterval(20);
TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
labelRight = new TQLabel(i18n("Green"), gboxSettings);
labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
m_gInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_gInput");
gridSettings->addMultiCellWidget(labelLeft, 4, 4, 0, 0);
@ -181,13 +181,13 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent)
// -------------------------------------------------------------
labelLeft = new TQLabel(i18n("Yellow"), gboxSettings);
labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider");
m_bSlider->setTickmarks(TQSlider::Below);
m_bSlider->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
labelRight = new TQLabel(i18n("Blue"), gboxSettings);
labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
m_bInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_bInput");
gridSettings->addMultiCellWidget(labelLeft, 5, 5, 0, 0);
@ -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 )

6
digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqrect.h>
#include <tqvgroupbox.h>
@ -140,11 +140,11 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent)
// -------------------------------------------------------------
m_customLabel1 = new TQLabel(i18n("Custom ratio:"), cropSelection);
m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter);
m_customLabel1->setAlignment(AlignLeft|AlignVCenter);
m_customRatioNInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection);
TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value."));
m_customLabel2 = new TQLabel(" : ", cropSelection);
m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter);
m_customLabel2->setAlignment(AlignCenter|AlignVCenter);
m_customRatioDInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection);
TQWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value."));

22
digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <tqregion.h>
#include <tqcolor.h>
#include <tqpainter.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqpixmap.h>
#include <tqimage.h>
#include <tqpen.h>
@ -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 );
}
@ -717,7 +717,7 @@ void ImageSelectionWidget::updatePixmap()
d->localRegionSelection.bottom() - 7, 8, 8);
// Drawing background and image.
d->pixmap->fill(tqcolorGroup().background());
d->pixmap->fill(colorGroup().background());
if (d->preview.isNull())
return;
@ -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
{

6
digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqframe.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqrect.h>
#include <tqspinbox.h>
#include <tqtimer.h>
@ -159,14 +159,14 @@ RatioCropTool::RatioCropTool(TQObject* parent)
// -------------------------------------------------------------
m_customLabel1 = new TQLabel(i18n("Custom:"), cropSelection);
m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter);
m_customLabel1->setAlignment(AlignLeft|AlignVCenter);
m_customRatioNInput = new RIntNumInput(cropSelection);
m_customRatioNInput->input()->setRange(1, 10000, 1, false);
m_customRatioNInput->setDefaultValue(1);
TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value."));
m_customLabel2 = new TQLabel(" : ", cropSelection);
m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter);
m_customLabel2->setAlignment(AlignCenter|AlignVCenter);
m_customRatioDInput = new RIntNumInput(cropSelection);
m_customRatioDInput->input()->setRange(1, 10000, 1, false);
m_customRatioDInput->setDefaultValue(1);

10
digikam/imageplugins/coreplugin/redeyetool.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
@ -101,7 +101,7 @@ RedEyeTool::RedEyeTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 11, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -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)

20
digikam/imageplugins/coreplugin/rgbtool.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqslider.h>
#include <tqtooltip.h>
@ -98,7 +98,7 @@ RGBTool::RGBTool(TQObject* parent)
TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 7, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
label1->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage());
m_channelCB->insertItem(i18n("Luminosity"));
m_channelCB->insertItem(i18n("Red"));
@ -160,13 +160,13 @@ RGBTool::RGBTool(TQObject* parent)
// -------------------------------------------------------------
TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage());
labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_rSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider");
m_rSlider->setTickmarks(TQSlider::Below);
m_rSlider->setTickInterval(20);
TQWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image."));
TQLabel *labelRight = new TQLabel(i18n("Red"), m_gboxSettings->plainPage());
labelRight->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
labelRight->setAlignment ( TQt::AlignLeft | TQt::AlignVCenter );
m_rInput = new RIntNumInput(m_gboxSettings->plainPage());
m_rInput->setDefaultValue(0);
m_rInput->input()->setRange(-100, 100, 1, false);
@ -179,13 +179,13 @@ RGBTool::RGBTool(TQObject* parent)
// -------------------------------------------------------------
labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage());
labelLeft->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
labelLeft->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
m_gSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider");
m_gSlider->setTickmarks(TQSlider::Below);
m_gSlider->setTickInterval(20);
TQWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image."));
labelRight = new TQLabel(i18n("Green"), m_gboxSettings->plainPage());
labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
m_gInput = new RIntNumInput(m_gboxSettings->plainPage());
m_gInput->setDefaultValue(0);
m_gInput->input()->setRange(-100, 100, 1, false);
@ -198,13 +198,13 @@ RGBTool::RGBTool(TQObject* parent)
// -------------------------------------------------------------
labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage());
labelLeft->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
labelLeft->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_bSlider = new TQSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider");
m_bSlider->setTickmarks(TQSlider::Below);
m_bSlider->setTickInterval(20);
TQWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image."));
labelRight = new TQLabel(i18n("Blue"), m_gboxSettings->plainPage());
labelRight->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
labelRight->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
m_bInput = new RIntNumInput(m_gboxSettings->plainPage());
m_bInput->setDefaultValue(0);
m_bInput->input()->setRange(-100, 100, 1, false);
@ -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)

4
digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
Unescape View File

@ -29,7 +29,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqcombobox.h>
@ -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;
}

4
digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
Unescape View File

@ -29,7 +29,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqwidgetstack.h>
@ -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;
}

2
digikam/imageplugins/distortionfx/distortionfx.cpp
Unescape View File

@ -815,7 +815,7 @@ void DistortionFX::tile(Digikam::DImg *orgImage, Digikam::DImg *destImage,
int Width = orgImage->width();
int Height = orgImage->height();
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = dt.secsTo(Y2000);

4
digikam/imageplugins/distortionfx/distortionfxtool.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqframe.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqspinbox.h>
#include <tqwhatsthis.h>
@ -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>"

4
digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqimage.h>
#include <tqspinbox.h>
@ -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>"

2
digikam/imageplugins/emboss/embosstool.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

2
digikam/imageplugins/emboss/imageeffect_emboss.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

2
digikam/imageplugins/filmgrain/filmgrain.cpp
Unescape View File

@ -92,7 +92,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility)
else
Shade = 52;
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = (uint) dt.secsTo(Y2000);

2
digikam/imageplugins/filmgrain/filmgraintool.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
#include <tqlcdnumber.h>
#include <tqslider.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
// KDE includes.

2
digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
#include <tqlcdnumber.h>
#include <tqslider.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
// KDE includes.

6
digikam/imageplugins/freerotation/freerotationtool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.
@ -95,11 +95,11 @@ FreeRotationTool::FreeRotationTool(TQObject* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage());

6
digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
#include <tqcombobox.h>
@ -101,11 +101,11 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings);
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings);
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings);
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings);
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0);
gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);

4
digikam/imageplugins/hotpixels/blackframelistview.cpp
Unescape View File

@ -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);
}

2
digikam/imageplugins/hotpixels/hotpixelstool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
#include <tqpointarray.h>

2
digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
#include <tqpointarray.h>

2
digikam/imageplugins/infrared/imageeffect_infrared.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqwhatsthis.h>
#include <tqlcdnumber.h>
#include <tqslider.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqdatetime.h>
#include <tqcheckbox.h>

2
digikam/imageplugins/infrared/infrared.cpp
Unescape View File

@ -162,7 +162,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai
// Create gray grain mask.
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = ((uint) dt.secsTo(Y2000));

2
digikam/imageplugins/infrared/infraredtool.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqwhatsthis.h>
#include <tqlcdnumber.h>
#include <tqslider.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqdatetime.h>
#include <tqcheckbox.h>

8
digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
@ -44,7 +44,7 @@
#include <tqevent.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqfile.h>
// KDE includes.
@ -173,7 +173,7 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent)
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
m_inpaintingTypeCB = new TQComboBox( false, firstPage );
m_inpaintingTypeCB->insertItem( i18n("None") );
m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") );
@ -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;
}

8
digikam/imageplugins/inpainting/inpaintingtool.cpp
Unescape View File

@ -30,14 +30,14 @@
// TQt includes.
#include <tqbrush.h>
#include <brush.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqevent.h>
#include <tqfile.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
@ -121,7 +121,7 @@ InPaintingTool::InPaintingTool(TQObject* parent)
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
m_inpaintingTypeCB = new TQComboBox( false, firstPage );
m_inpaintingTypeCB->insertItem( i18n("None") );
m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") );
@ -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;
}

16
digikam/imageplugins/inserttext/fontchooserwidget.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqfontdatabase.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqscrollbar.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@ -301,8 +301,8 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
setSizeIsRelative( *sizeIsRelativeState );
KConfig *config = KGlobal::config();
KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
}
FontChooserWidget::~FontChooserWidget()
@ -326,7 +326,7 @@ int FontChooserWidget::minimumListWidth( const TQListBox *list )
}
w += list->frameWidth() * 2;
w += list->verticalScrollBar()->tqsizeHint().width();
w += list->verticalScrollBar()->sizeHint().width();
return w;
}
@ -405,9 +405,9 @@ TQButton::ToggleState FontChooserWidget::sizeIsRelative() const
: TQButton::NoChange;
}
TQSize FontChooserWidget::tqsizeHint( void ) const
TQSize FontChooserWidget::sizeHint( void ) const
{
return tqminimumSizeHint();
return minimumSizeHint();
}
void FontChooserWidget::enableColumn( int column, bool state )
@ -696,13 +696,13 @@ void FontChooserWidget::addFont( TQStringList &list, const char *xfont )
if ( !ptr )
return;
TQString font = TQString::tqfromLatin1(ptr + 1);
TQString font = TQString::fromLatin1(ptr + 1);
int pos;
if ( ( pos = font.find( '-' ) ) > 0 ) {
font.truncate( pos );
if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
return;
TQStringList::Iterator it = list.begin();

2
digikam/imageplugins/inserttext/fontchooserwidget.h
Unescape View File

@ -97,7 +97,7 @@ public:
int fontDiffFlags();
void enableColumn( int column, bool state );
virtual TQSize tqsizeHint( void ) const;
virtual TQSize sizeHint( void ) const;
signals:

12
digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
Unescape View File

@ -28,13 +28,13 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqpen.h>
#include <tqfont.h>
#include <tqtimer.h>
@ -299,19 +299,19 @@ void ImageEffect_InsertText::slotAlignModeChanged(int mode)
switch (m_alignTextMode)
{
case ALIGN_LEFT:
m_textEdit->tqsetAlignment( TQt::AlignLeft );
m_textEdit->setAlignment( TQt::AlignLeft );
break;
case ALIGN_RIGHT:
m_textEdit->tqsetAlignment( TQt::AlignRight );
m_textEdit->setAlignment( TQt::AlignRight );
break;
case ALIGN_CENTER:
m_textEdit->tqsetAlignment( TQt::AlignHCenter );
m_textEdit->setAlignment( TQt::AlignHCenter );
break;
case ALIGN_BLOCK:
m_textEdit->tqsetAlignment( TQt::AlignJustify );
m_textEdit->setAlignment( TQt::AlignJustify );
break;
}

12
digikam/imageplugins/inserttext/inserttexttool.cpp
Unescape View File

@ -24,13 +24,13 @@
// TQt includes.
#include <tqbrush.h>
#include <brush.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqframe.h>
#include <tqhbuttongroup.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqpen.h>
#include <tqpixmap.h>
@ -289,19 +289,19 @@ void InsertTextTool::slotAlignModeChanged(int mode)
switch (m_alignTextMode)
{
case ALIGN_LEFT:
m_textEdit->tqsetAlignment( TQt::AlignLeft );
m_textEdit->setAlignment( TQt::AlignLeft );
break;
case ALIGN_RIGHT:
m_textEdit->tqsetAlignment( TQt::AlignRight );
m_textEdit->setAlignment( TQt::AlignRight );
break;
case ALIGN_CENTER:
m_textEdit->tqsetAlignment( TQt::AlignHCenter );
m_textEdit->setAlignment( TQt::AlignHCenter );
break;
case ALIGN_BLOCK:
m_textEdit->tqsetAlignment( TQt::AlignJustify );
m_textEdit->setAlignment( TQt::AlignJustify );
break;
}

16
digikam/imageplugins/inserttext/inserttextwidget.cpp
Unescape View File

@ -61,7 +61,7 @@ InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *parent)
m_w = m_iface->previewWidth();
m_h = m_iface->previewHeight();
m_pixmap = new TQPixmap(w, h);
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
setBackgroundMode(TQt::NoBackground);
setMinimumSize(w, h);
@ -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();
}
}
@ -229,7 +229,7 @@ void InsertTextWidget::makePixmap(void)
// paint pixmap for drawing this widget
// First, fill with background color
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
TQPainter p(m_pixmap);
// Convert image to pixmap and draw it
TQPixmap imagePixmap = image.convertToPixmap();
@ -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;

6
digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
Unescape View File

@ -32,10 +32,10 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqpen.h>
// KDE includes.
@ -96,7 +96,7 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent)
TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 8, 1, spacingHint());
m_maskPreviewLabel = new TQLabel( gboxSettings );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
"applied to a cross pattern.") );
gridSettings->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1);

6
digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
Unescape View File

@ -30,9 +30,9 @@
// TQt includes.
#include <tqbrush.h>
#include <brush.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpainter.h>
#include <tqpen.h>
#include <tqpixmap.h>
@ -90,7 +90,7 @@ LensDistortionTool::LensDistortionTool(TQObject* parent)
TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1);
m_maskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() );
m_maskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
m_maskPreviewLabel->setAlignment ( TQt::AlignHCenter | TQt::AlignVCenter );
TQWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction "
"applied to a cross pattern.") );

6
digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
Unescape View File

@ -30,9 +30,9 @@
#include <tqstring.h>
#include <tqtabwidget.h>
#include <tqimage.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
// KDE includes.
@ -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;
}

6
digikam/imageplugins/noisereduction/noisereductiontool.cpp
Unescape View File

@ -27,10 +27,10 @@
#include <tqfile.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqstring.h>
#include <tqtabwidget.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -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;
}

2
digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqimage.h>
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

2
digikam/imageplugins/oilpaint/oilpainttool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

6
digikam/imageplugins/perspective/imageeffect_perspective.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqspinbox.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqcheckbox.h>
@ -108,11 +108,11 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), gbox2);
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gbox2);
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), gbox2);
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gbox2);
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
gridLayout->addMultiCellWidget(label1, 0, 0, 0, 0);
gridLayout->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);

6
digikam/imageplugins/perspective/perspectivetool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqvgroupbox.h>
#include <tqwhatsthis.h>
@ -99,11 +99,11 @@ PerspectiveTool::PerspectiveTool(TQObject* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
// -------------------------------------------------------------

22
digikam/imageplugins/perspective/perspectivewidget.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <tqregion.h>
#include <tqpainter.h>
#include <tqpen.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqpixmap.h>
#include <tqimage.h>
#include <tqpointarray.h>
@ -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)
@ -270,7 +270,7 @@ void PerspectiveWidget::updatePixmap(void)
// Draw background
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
// if we are resizing with the mouse, compute and draw only if drawWhileMoving is set
if (m_currentResizing == ResizingNone || m_drawWhileMoving)
@ -280,7 +280,7 @@ void PerspectiveWidget::updatePixmap(void)
Digikam::DImg destImage(m_previewImage.width(), m_previewImage.height(),
m_previewImage.sixteenBit(), m_previewImage.hasAlpha());
Digikam::DColor background(tqcolorGroup().background());
Digikam::DColor background(colorGroup().background());
m_transformedCenter = buildPerspective(TQPoint(0, 0), TQPoint(m_w, m_h),
m_topLeftPoint, m_topRightPoint,
@ -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

2
digikam/imageplugins/perspective/triangle.cpp
Unescape View File

@ -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>
*

2
digikam/imageplugins/perspective/triangle.h
Unescape View File

@ -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>
*

2
digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqimage.h>

2
digikam/imageplugins/raindrop/raindrop.cpp
Unescape View File

@ -164,7 +164,7 @@ void RainDrop::rainDropsImage(Digikam::DImg *orgImage, Digikam::DImg *destImage,
// Randomize.
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
uint seed = dt.secsTo(Y2000);

2
digikam/imageplugins/raindrop/raindroptool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqframe.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

6
digikam/imageplugins/restoration/imageeffect_restoration.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqtabwidget.h>
#include <tqfile.h>
@ -105,7 +105,7 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent)
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
m_restorationTypeCB = new TQComboBox( false, firstPage );
m_restorationTypeCB->insertItem( i18n("None") );
m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") );
@ -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;
}

6
digikam/imageplugins/restoration/restorationtool.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqtabwidget.h>
#include <tqfile.h>
@ -96,7 +96,7 @@ RestorationTool::RestorationTool(TQObject* parent)
TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website"));
TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage);
typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter);
typeLabel->setAlignment ( TQt::AlignRight | TQt::AlignVCenter);
m_restorationTypeCB = new TQComboBox(false, firstPage);
m_restorationTypeCB->insertItem( i18n("None") );
m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") );
@ -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;
}

6
digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqimage.h>
// KDE includes.
@ -101,11 +101,11 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings);
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings);
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), gboxSettings);
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings);
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0);
gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2);

6
digikam/imageplugins/sheartool/sheartool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.
@ -93,11 +93,11 @@ ShearTool::ShearTool(TQObject* parent)
TQLabel *label1 = new TQLabel(i18n("New width:"), m_gboxSettings->plainPage());
m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage());
m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newWidthLabel->setAlignment( AlignBottom | AlignRight );
TQLabel *label2 = new TQLabel(i18n("New height:"), m_gboxSettings->plainPage());
m_newHeightLabel = new TQLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage());
m_newHeightLabel->tqsetAlignment( AlignBottom | AlignRight );
m_newHeightLabel->setAlignment( AlignBottom | AlignRight );
KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage());

2
digikam/imageplugins/superimpose/dirselectwidget.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqheader.h>
#include <tqlistview.h>
#include <tqdir.h>

2
digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqpixmap.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqdir.h>
#include <tqfile.h>

2
digikam/imageplugins/superimpose/superimposetool.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqpixmap.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqdir.h>
#include <tqfile.h>

10
digikam/imageplugins/superimpose/superimposewidget.cpp
Unescape View File

@ -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)
@ -91,7 +91,7 @@ void SuperImposeWidget::makePixmap(void)
SuperImpose superimpose(iface.getOriginalImg(), &m_templateScaled, m_currentSelection);
Digikam::DImg image = superimpose.getTargetImage();
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
TQPainter p(m_pixmap);
TQPixmap imagePix = image.convertToPixmap();
p.drawPixmap(m_rect.x(), m_rect.y(), imagePix, 0, 0, m_rect.width(), m_rect.height());
@ -128,7 +128,7 @@ void SuperImposeWidget::resizeEvent(TQResizeEvent * e)
else
{
m_rect = TQRect();
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
}
blockSignals(false);
@ -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;

2
digikam/imageplugins/texture/imageeffect_texture.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqimage.h>

4
digikam/imageplugins/texture/texture.cpp
Unescape View File

@ -100,7 +100,7 @@ void Texture::filterImage(void)
else
blendGain = m_blendGain;
// Make textured transparent tqlayout.
// Make textured transparent layout.
for (int x = 0; !m_cancel && x < w; x++)
{
@ -139,7 +139,7 @@ void Texture::filterImage(void)
postProgress(progress);
}
// Merge tqlayout and image using overlay method.
// Merge layout and image using overlay method.
for (int x = 0; !m_cancel && x < w; x++)
{

2
digikam/imageplugins/texture/texturetool.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqimage.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

18
digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
Unescape View File

@ -31,14 +31,14 @@
#include <tqpushbutton.h>
#include <tqhbuttongroup.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqcombobox.h>
#include <tqtimer.h>
#include <tqtooltip.h>
#include <tqpixmap.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqvbox.h>
// KDE includes.
@ -119,11 +119,11 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
// -------------------------------------------------------------
TQWidget *gboxSettings = new TQWidget(plainPage());
TQVBoxLayout* tqlayout2 = new TQVBoxLayout( gboxSettings, spacingHint() );
TQGridLayout *grid = new TQGridLayout( tqlayout2, 2, 4, spacingHint());
TQVBoxLayout* layout2 = new TQVBoxLayout( gboxSettings, spacingHint() );
TQGridLayout *grid = new TQGridLayout( layout2, 2, 4, spacingHint());
TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, gboxSettings );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -185,7 +185,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
// -------------------------------------------------------------
TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5, spacingHint());
TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5, spacingHint());
m_temperatureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
" (K): </qt>"), gboxSettings);
@ -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;
}

18
digikam/imageplugins/whitebalance/whitebalancetool.cpp
Unescape View File

@ -31,10 +31,10 @@
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtimer.h>
#include <tqtooltip.h>
#include <tqvbox.h>
@ -115,11 +115,11 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
EditorToolSettings::Ok|
EditorToolSettings::Cancel);
TQVBoxLayout* tqlayout2 = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
TQGridLayout *grid = new TQGridLayout(tqlayout2, 2, 4);
TQVBoxLayout* layout2 = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint());
TQGridLayout *grid = new TQGridLayout(layout2, 2, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage());
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() );
m_channelCB->insertItem( i18n("Luminosity") );
m_channelCB->insertItem( i18n("Red") );
@ -182,7 +182,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
// -------------------------------------------------------------
TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5);
TQGridLayout *grid2 = new TQGridLayout(layout2, 13, 5);
m_temperatureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> "
" (K): </qt>"), m_gboxSettings->plainPage());
@ -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;
}

110
digikam/kioslave/digikamalbums.cpp
Unescape View File

@ -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() ) );
}
}
@ -843,8 +843,8 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o
ut.modtime = buff_src.st_mtime;
if ( ::utime( _dst.data(), &ut ) != 0 )
{
kdWarning() << TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1")
.tqarg( dst.url() ) << endl;
kdWarning() << TQString::fromLatin1("Couldn't preserve access and modification time for\n%1")
.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,8 +1123,8 @@ 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()),
TQDate::tqcurrentDate().toString(Qt::ISODate)) );
.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;
}
@ -1336,11 +1336,11 @@ void kio_digikamalbums::createDigikamPropsUDSEntry(KIO::UDSEntry& entry)
entry.append( atom );
atom.m_uds = KIO::UDS_MODIFICATION_TIME;
atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t();
atom.m_long = TQDateTime::currentDateTime().toTime_t();
entry.append( atom );
atom.m_uds = KIO::UDS_ACCESS_TIME;
atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t();
atom.m_long = TQDateTime::currentDateTime().toTime_t();
entry.append( atom );
atom.m_uds = KIO::UDS_NAME;
@ -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");

8
digikam/kioslave/digikamdates.cpp
Unescape View File

@ -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;

54
digikam/kioslave/digikamsearch.cpp
Unescape View File

@ -44,7 +44,7 @@ extern "C"
#include <tqfile.h>
#include <tqdatastream.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqregexp.h>
#include <tqdir.h>
#include <tqvariant.h>
@ -471,8 +471,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key,
query = " (Images.dirid IN "
" (SELECT a.id FROM Albums a, Albums b "
" WHERE a.url $$##$$ '%' || b.url || '%' AND b.id = $$@@$$))";
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(ALBUMNAME):
@ -516,8 +516,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key,
// " (SELECT imageid FROM ImageTags "
// " WHERE tagid $$##$$ $$@@$$)) ";
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
@ -544,8 +544,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key,
" WHERE TagsTree.pid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) "
" OR ImageTags.tagid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) )) ";
// query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
// + TQString::tqfromLatin1("'"));
// query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
// + TQString::fromLatin1("'"));
break;
}
@ -596,57 +596,57 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key,
case(EQ):
{
query.replace("$$##$$", "=");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(NE):
{
query.replace("$$##$$", "<>");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(LT):
{
query.replace("$$##$$", "<");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(GT):
{
query.replace("$$##$$", ">");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(LTE):
{
query.replace("$$##$$", "<=");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(GTE):
{
query.replace("$$##$$", ">=");
query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val)
+ TQString::tqfromLatin1("'"));
query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val)
+ TQString::fromLatin1("'"));
break;
}
case(LIKE):
{
query.replace("$$##$$", "LIKE");
query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val)
+ TQString::tqfromLatin1("%'"));
query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val)
+ TQString::fromLatin1("%'"));
break;
}
case(NLIKE):
{
query.replace("$$##$$", "NOT LIKE");
query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val)
+ TQString::tqfromLatin1("%'"));
query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val)
+ TQString::fromLatin1("%'"));
break;
}
}
@ -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;
@ -708,10 +708,10 @@ TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const
if (ok)
{
// ok. its an int, does it look like a year?
if (1970 <= num && num <= TQDate::tqcurrentDate().year())
if (1970 <= num && num <= TQDate::currentDate().year())
{
// very sure its a year
return TQString("%1-%-%").tqarg(num);
return TQString("%1-%-%").arg(num);
}
}
else

6
digikam/kioslave/digikamtags.cpp
Unescape View File

@ -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;

4
digikam/kioslave/digikamthumbnail.cpp
Unescape View File

@ -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());
}

20
digikam/kioslave/sqlitedb.cpp
Unescape View File

@ -98,7 +98,7 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values,
<< endl;
if (errMsg)
{
*errMsg = TQString::tqfromLatin1("SQLite database not open");
*errMsg = TQString::fromLatin1("SQLite database not open");
}
return false;
}
@ -118,9 +118,9 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values,
<< sql << endl;
if (errMsg)
{
*errMsg = TQString::tqfromLatin1("sqlite_compile error: ") +
TQString::tqfromLatin1(sqlite3_errmsg(m_db)) +
TQString::tqfromLatin1(" on query: ") +
*errMsg = TQString::fromLatin1("sqlite_compile error: ") +
TQString::fromLatin1(sqlite3_errmsg(m_db)) +
TQString::fromLatin1(" on query: ") +
sql;
}
return false;
@ -152,9 +152,9 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values,
<< sql << endl;
if (errMsg)
{
*errMsg = TQString::tqfromLatin1("sqlite_step error: ") +
TQString::tqfromLatin1(sqlite3_errmsg(m_db)) +
TQString::tqfromLatin1(" on query: ") +
*errMsg = TQString::fromLatin1("sqlite_step error: ") +
TQString::fromLatin1(sqlite3_errmsg(m_db)) +
TQString::fromLatin1(" on query: ") +
sql;
}
return false;
@ -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())

20
digikam/libs/curves/imagecurves.cpp
Unescape View File

@ -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.

2
digikam/libs/dialogs/ctrlpaneldlg.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>

2
digikam/libs/dialogs/deletedialog.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes.
#include <tqstringlist.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqtimer.h>

10
digikam/libs/dialogs/deletedialogbase.ui
Unescape View File

@ -23,7 +23,7 @@
<height>374</height>
</rect>
</property>
<property name="tqminimumSize" stdset="0">
<property name="minimumSize" stdset="0">
<size>
<width>420</width>
<height>320</height>
@ -38,7 +38,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -62,7 +62,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -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>

2
digikam/libs/dialogs/dprogressdlg.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
#include <tqheader.h>
#include <tqlabel.h>

14
digikam/libs/dialogs/imagedialog.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqguardedptr.h>
#include <tqtimer.h>
@ -90,8 +90,8 @@ ImageDialogPreview::ImageDialogPreview(TQWidget *parent)
TQVBoxLayout *vlay = new TQVBoxLayout(this);
d->imageLabel = new TQLabel(this);
d->imageLabel->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->imageLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
d->imageLabel->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->imageLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
d->infoLabel = new TQLabel(this);
@ -118,7 +118,7 @@ ImageDialogPreview::~ImageDialogPreview()
delete d;
}
TQSize ImageDialogPreview::tqsizeHint() const
TQSize ImageDialogPreview::sizeHint() const
{
return TQSize(256, 256);
}
@ -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");

2
digikam/libs/dialogs/imagedialog.h
Unescape View File

@ -49,7 +49,7 @@ public:
ImageDialogPreview(TQWidget *parent=0);
~ImageDialogPreview();
TQSize tqsizeHint() const;
TQSize sizeHint() const;
public slots:

6
digikam/libs/dialogs/imagedlgbase.cpp
Unescape View File

@ -5,7 +5,7 @@
*
* Date : 2005-07-23
* Description : simple plugins dialog without threadable
* filter interface. The dialog tqlayout is
* filter interface. The dialog layout is
* designed to accept custom widgets in
* preview and settings area.
*
@ -31,7 +31,7 @@
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
#include <tqtimer.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqsplitter.h>
@ -229,7 +229,7 @@ void ImageDlgBase::setPreviewAreaWidget(TQWidget *w)
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred,
TQSizePolicy::Expanding,
2, 1);
w->tqsetSizePolicy(rightSzPolicy);
w->setSizePolicy(rightSzPolicy);
}
void ImageDlgBase::setUserAreaWidget(TQWidget *w)

2
digikam/libs/dialogs/imagedlgbase.h
Unescape View File

@ -5,7 +5,7 @@
*
* Date : 2005-07-23
* Description : simple plugins dialog without threadable
* filter interface. The dialog tqlayout is
* filter interface. The dialog layout is
* designed to accept custom widgets in
* preview and settings area.
*

4
digikam/libs/dialogs/imageguidedlg.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtimer.h>
#include <tqspinbox.h>
@ -192,7 +192,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
d->splitter->setOpaqueResize(false);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
m_imagePreviewWidget->tqsetSizePolicy(rightSzPolicy);
m_imagePreviewWidget->setSizePolicy(rightSzPolicy);
TQString sbName(d->name + TQString(" Image Plugin Sidebar"));
d->settingsSideBar = new Sidebar(d->hbox, sbName.ascii(), Sidebar::Right);

6
digikam/libs/dialogs/rawcameradlg.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqstringlist.h>
#include <tqstring.h>
#include <tqlabel.h>
@ -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
// --------------------------------------------------------

2
digikam/libs/dimg/README
Unescape View File

@ -60,7 +60,7 @@ the image)
format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to
access the individual colors you need to use bit-shifting to ensure
endian correctness. in DImg, the pixel data is stored as unsigned char.
the color tqlayout is B,G,R,A (blue, green, red, alpha)
the color layout is B,G,R,A (blue, green, red, alpha)
for 8bit images: you can access individual color components like this:

2
digikam/libs/dimg/dimgscale.cpp
Unescape View File

@ -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();

2
digikam/libs/dimg/loaders/jp2kloader.cpp
Unescape View File

@ -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);

2
digikam/libs/dimg/loaders/jp2ksettings.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

2
digikam/libs/dimg/loaders/jpegsettings.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
#include <tqcombobox.h>

2
digikam/libs/dimg/loaders/pngloader.cpp
Unescape View File

@ -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();

2
digikam/libs/dimg/loaders/pngsettings.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

2
digikam/libs/dimg/loaders/tiffloader.cpp
Unescape View File

@ -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)

2
digikam/libs/dimg/loaders/tiffsettings.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.

40
digikam/libs/dmetadata/dmetadata.cpp
Unescape View File

@ -453,7 +453,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
}
TQDomElement rootElem = xmlDoc.documentElement();
if (rootElem.tagName() != TQString::tqfromLatin1("digikamproperties"))
if (rootElem.tagName() != TQString::fromLatin1("digikamproperties"))
return false;
for (TQDomNode node = rootElem.firstChild();
@ -461,34 +461,34 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
{
TQDomElement e = node.toElement();
TQString name = e.tagName();
TQString val = e.attribute(TQString::tqfromLatin1("value"));
TQString val = e.attribute(TQString::fromLatin1("value"));
if (name == TQString::tqfromLatin1("comments"))
if (name == TQString::fromLatin1("comments"))
{
comments = val;
}
else if (name == TQString::tqfromLatin1("date"))
else if (name == TQString::fromLatin1("date"))
{
if (val.isEmpty()) continue;
date = TQDateTime::fromString(val, Qt::ISODate);
}
else if (name == TQString::tqfromLatin1("rating"))
else if (name == TQString::fromLatin1("rating"))
{
if (val.isEmpty()) continue;
bool ok=false;
rating = val.toInt(&ok);
if (!ok) rating = 0;
}
else if (name == TQString::tqfromLatin1("tagslist"))
else if (name == TQString::fromLatin1("tagslist"))
{
for (TQDomNode node2 = e.firstChild();
!node2.isNull(); node2 = node2.nextSibling())
{
TQDomElement e2 = node2.toElement();
TQString name2 = e2.tagName();
TQString val2 = e2.attribute(TQString::tqfromLatin1("path"));
TQString val2 = e2.attribute(TQString::fromLatin1("path"));
if (name2 == TQString::tqfromLatin1("tag"))
if (name2 == TQString::fromLatin1("tag"))
{
if (val2.isEmpty()) continue;
tagsPath.append(val2);
@ -505,32 +505,32 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime
{
TQDomDocument xmlDoc;
xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"),
TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"),
TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
TQDomElement propertiesElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamproperties"));
TQDomElement propertiesElem = xmlDoc.createElement(TQString::fromLatin1("digikamproperties"));
xmlDoc.appendChild( propertiesElem );
TQDomElement c = xmlDoc.createElement(TQString::tqfromLatin1("comments"));
c.setAttribute(TQString::tqfromLatin1("value"), comments);
TQDomElement c = xmlDoc.createElement(TQString::fromLatin1("comments"));
c.setAttribute(TQString::fromLatin1("value"), comments);
propertiesElem.appendChild(c);
TQDomElement d = xmlDoc.createElement(TQString::tqfromLatin1("date"));
d.setAttribute(TQString::tqfromLatin1("value"), date.toString(Qt::ISODate));
TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date"));
d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate));
propertiesElem.appendChild(d);
TQDomElement r = xmlDoc.createElement(TQString::tqfromLatin1("rating"));
r.setAttribute(TQString::tqfromLatin1("value"), rating);
TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating"));
r.setAttribute(TQString::fromLatin1("value"), rating);
propertiesElem.appendChild(r);
TQDomElement tagsElem = xmlDoc.createElement(TQString::tqfromLatin1("tagslist"));
TQDomElement tagsElem = xmlDoc.createElement(TQString::fromLatin1("tagslist"));
propertiesElem.appendChild(tagsElem);
TQStringList path = tagsPath;
for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it )
{
TQDomElement e = xmlDoc.createElement(TQString::tqfromLatin1("tag"));
e.setAttribute(TQString::tqfromLatin1("path"), *it);
TQDomElement e = xmlDoc.createElement(TQString::fromLatin1("tag"));
e.setAttribute(TQString::fromLatin1("path"), *it);
tagsElem.appendChild(e);
}

52
digikam/libs/greycstoration/CImg.h
Unescape View File

@ -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') {
@ -9393,8 +9393,8 @@ namespace cimg_library {
return assign(width,height,title,normalization,!is_fullscreen,false);
}
static OStqStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) {
OStqStatus result = eventNotHandledErr;
static OSStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) {
OSStatus result = eventNotHandledErr;
CImgDisplay* disp = (CImgDisplay*) userData;
(void)myHandler; // Avoid "unused parameter"
cimg::CarbonInfo& c = cimg::CarbonAttr();
@ -9605,7 +9605,7 @@ namespace cimg_library {
MPSignalSemaphore(c.sync_event); // Notify the caller that all goes fine
EventRef theEvent;
EventTargetRef theTarget;
OStqStatus err;
OSStatus err;
CbSerializedQuery* query;
theTarget = GetEventDispatcherTarget();
@ -9617,7 +9617,7 @@ namespace cimg_library {
SendEventToEventTarget (theEvent, theTarget);
ReleaseEvent(theEvent);
} else if (err == eventLoopTimedOutErr) { // There is no event to process, so check if there is new messages to process
OStqStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond);
OSStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond);
if (r!=noErr) continue; //nothing in the queue or an error.., bye
// If we're here, we've something to do now.
if (query) {
@ -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,

2
digikam/libs/greycstoration/greycstorationiface.cpp
Unescape View File

@ -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.
*/

4
digikam/libs/greycstoration/greycstorationwidget.cpp
Unescape View File

@ -25,9 +25,9 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtabwidget.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>

20
digikam/libs/imageproperties/cameraitempropertiestab.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqstyle.h>
#include <tqfile.h>
#include <tqlabel.h>
@ -170,7 +170,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->settingsArea = new TQFrame(sv->viewport());
d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
sv->addChild(d->settingsArea);
m_navigateBarLayout->addWidget(sv);
@ -227,7 +227,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea);
int hgt = fontMetrics().height()-2;
d->title->tqsetAlignment(TQt::AlignCenter);
d->title->setAlignment(TQt::AlignCenter);
d->file->setMaximumHeight(hgt);
d->folder->setMaximumHeight(hgt);
d->date->setMaximumHeight(hgt);
@ -249,7 +249,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
d->labelNewFileName->setMaximumHeight(hgt);
d->labelAlreadyDownloaded->setMaximumHeight(hgt);
d->title2->tqsetAlignment(TQt::AlignCenter);
d->title2->setAlignment(TQt::AlignCenter);
d->make->setMaximumHeight(hgt);
d->model->setMaximumHeight(hgt);
d->photoDate->setMaximumHeight(hgt);
@ -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);
}

48
digikam/libs/imageproperties/imagedescedittab.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqhbox.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtoolbutton.h>
#include <tqpushbutton.h>
#include <tqiconset.h>
@ -688,7 +688,7 @@ void ImageDescEditTab::slotItemStateChanged(TAlbumCheckListItem *item)
d->hub.setTag(item->album(), item->isOn());
d->tagsView->blockSignals(true);
item->settqStatus(d->hub.tagtqStatus(item->album()));
item->setStatus(d->hub.tagStatus(item->album()));
d->tagsView->blockSignals(false);
slotModified();
@ -703,14 +703,14 @@ void ImageDescEditTab::slotCommentChanged()
return;
d->hub.setComment(d->commentsEdit->text());
setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit);
setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit);
slotModified();
}
void ImageDescEditTab::slotDateTimeChanged(const TQDateTime& dateTime)
{
d->hub.setDateTime(dateTime);
setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit);
setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit);
slotModified();
}
@ -743,7 +743,7 @@ void ImageDescEditTab::updateTagsView()
{
TAlbumCheckListItem* tItem = dynamic_cast<TAlbumCheckListItem*>(it.current());
if (tItem)
tItem->settqStatus(d->hub.tagtqStatus(tItem->album()));
tItem->setStatus(d->hub.tagStatus(tItem->album()));
++it;
}
@ -759,14 +759,14 @@ void ImageDescEditTab::updateComments()
{
d->commentsEdit->blockSignals(true);
d->commentsEdit->setText(d->hub.comment());
setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit);
setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit);
d->commentsEdit->blockSignals(false);
}
void ImageDescEditTab::updateRating()
{
d->ratingWidget->blockSignals(true);
if (d->hub.ratingtqStatus() == MetadataHub::MetadataDisjoint)
if (d->hub.ratingStatus() == MetadataHub::MetadataDisjoint)
d->ratingWidget->setRating(0);
else
d->ratingWidget->setRating(d->hub.rating());
@ -777,11 +777,11 @@ void ImageDescEditTab::updateDate()
{
d->dateTimeEdit->blockSignals(true);
d->dateTimeEdit->setDateTime(d->hub.dateTime());
setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit);
setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit);
d->dateTimeEdit->blockSignals(false);
}
void ImageDescEditTab::setMetadataWidgettqStatus(int status, TQWidget *widget)
void ImageDescEditTab::setMetadataWidgetStatus(int status, TQWidget *widget)
{
if (status == MetadataHub::MetadataDisjoint)
{
@ -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())
{
@ -1646,7 +1646,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
{
if (t)
{
MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album());
MetadataHub::TagStatus status = d->hub.tagStatus(item->album());
bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag)
|| status == MetadataHub::MetadataDisjoint;
item->setVisible(tagAssigned);
@ -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,8 +1685,8 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
{
if (!tag->isRoot())
{
// only if the current item is not marked as tagged, check all tqchildren
MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album());
// 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;
if (!tagAssigned)
@ -1698,9 +1698,9 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
while (*tmpIt != nextSibling )
{
TAlbumCheckListItem* tmpItem = dynamic_cast<TAlbumCheckListItem*>(tmpIt.current());
MetadataHub::TagtqStatus tmptqStatus = d->hub.tagtqStatus(tmpItem->album());
bool tmpTagAssigned = (tmptqStatus == MetadataHub::MetadataAvailable && tmptqStatus.hasTag)
|| tmptqStatus == MetadataHub::MetadataDisjoint;
MetadataHub::TagStatus tmpStatus = d->hub.tagStatus(tmpItem->album());
bool tmpTagAssigned = (tmpStatus == MetadataHub::MetadataAvailable && tmpStatus.hasTag)
|| tmpStatus == MetadataHub::MetadataDisjoint;
if(tmpTagAssigned)
{
somethingIsSet = true;

2
digikam/libs/imageproperties/imagedescedittab.h
Unescape View File

@ -93,7 +93,7 @@ private:
void setTagThumbnail(TAlbum *album);
bool singleSelection() const;
void setMetadataWidgettqStatus(int status, TQWidget *widget);
void setMetadataWidgetStatus(int status, TQWidget *widget);
void reloadForMetadataChange(TQ_LLONG imageId);
private slots:

48
digikam/libs/imageproperties/imagepropertiescolorstab.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
@ -165,7 +165,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
sv->addChild(histogramPage);
TQLabel *label1 = new TQLabel(i18n("Channel:"), histogramPage);
label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
d->channelCB = new TQComboBox( false, histogramPage );
d->channelCB->insertItem( i18n("Luminosity") );
d->channelCB->insertItem( i18n("Red") );
@ -210,7 +210,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
logHistoButton->setToggleButton(true);
TQLabel *label10 = new TQLabel(i18n("Colors:"), histogramPage);
label10->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
label10->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
d->colorsCB = new TQComboBox( false, histogramPage );
d->colorsCB->insertItem( i18n("Red") );
d->colorsCB->insertItem( i18n("Green") );
@ -262,7 +262,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
TQHBoxLayout *hlay2 = new TQHBoxLayout(KDialog::spacingHint());
TQLabel *label3 = new TQLabel(i18n("Range:"), histogramPage);
label3->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label3->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->minInterv = new TQSpinBox(0, 255, 1, histogramPage);
d->minInterv->setValue(0);
TQWhatsThis::add(d->minInterv, i18n("<p>Select the minimal intensity "
@ -283,44 +283,44 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
"channels."));
TQLabel *label5 = new TQLabel(i18n("Pixels:"), gbox);
label5->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label5->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelPixelsValue = new TQLabel(gbox);
d->labelPixelsValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelPixelsValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label7 = new TQLabel(i18n("Count:"), gbox);
label7->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label7->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelCountValue = new TQLabel(gbox);
d->labelCountValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelCountValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label4 = new TQLabel(i18n("Mean:"), gbox);
label4->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label4->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelMeanValue = new TQLabel(gbox);
d->labelMeanValue->tqsetAlignment (TQt::AlignRight | TQt::AlignVCenter);
d->labelMeanValue->setAlignment (TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label6 = new TQLabel(i18n("Std. deviation:"), gbox);
label6->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label6->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelStdDevValue = new TQLabel(gbox);
d->labelStdDevValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelStdDevValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label8 = new TQLabel(i18n("Median:"), gbox);
label8->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label8->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelMedianValue = new TQLabel(gbox);
d->labelMedianValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelMedianValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label9 = new TQLabel(i18n("Percentile:"), gbox);
label9->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label9->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelPercentileValue = new TQLabel(gbox);
d->labelPercentileValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelPercentileValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label11 = new TQLabel(i18n("Color depth:"), gbox);
label11->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label11->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelColorDepth = new TQLabel(gbox);
d->labelColorDepth->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelColorDepth->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
TQLabel *label12 = new TQLabel(i18n("Alpha Channel:"), gbox);
label12->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
label12->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->labelAlphaChannel = new TQLabel(gbox);
d->labelAlphaChannel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
d->labelAlphaChannel->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
topLayout->addMultiCellWidget(label1, 1, 1, 0, 0);
topLayout->addMultiCellWidget(d->channelCB, 1, 1, 1, 1);
@ -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();
}

2
digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqfile.h>
#include <tqlabel.h>
#include <tqpixmap.h>

28
digikam/libs/imageproperties/imagepropertiestab.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqstyle.h>
#include <tqfile.h>
#include <tqlabel.h>
@ -183,7 +183,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->settingsArea = new TQFrame(sv->viewport());
d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
sv->addChild(d->settingsArea);
m_navigateBarLayout->addWidget(sv);
@ -248,7 +248,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea);
int hgt = fontMetrics().height()-2;
d->title->tqsetAlignment(TQt::AlignCenter);
d->title->setAlignment(TQt::AlignCenter);
d->file->setMaximumHeight(hgt);
d->folder->setMaximumHeight(hgt);
d->modifiedDate->setMaximumHeight(hgt);
@ -262,7 +262,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->labelFileOwner->setMaximumHeight(hgt);
d->labelFilePermissions->setMaximumHeight(hgt);
d->title2->tqsetAlignment(TQt::AlignCenter);
d->title2->setAlignment(TQt::AlignCenter);
d->mime->setMaximumHeight(hgt);
d->dimensions->setMaximumHeight(hgt);
d->compression->setMaximumHeight(hgt);
@ -274,7 +274,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
d->labelImageBitDepth->setMaximumHeight(hgt);
d->labelImageColorMode->setMaximumHeight(hgt);
d->title3->tqsetAlignment(TQt::AlignCenter);
d->title3->setAlignment(TQt::AlignCenter);
d->make->setMaximumHeight(hgt);
d->model->setMaximumHeight(hgt);
d->photoDate->setMaximumHeight(hgt);
@ -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);
}

4
digikam/libs/imageproperties/navigatebartab.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqwidgetstack.h>
#include <tqlabel.h>
@ -93,7 +93,7 @@ void NavigateBarTab::setupNavigateBar(bool withBar)
this, TQT_SIGNAL(signalLastItem()));
d->label = new TQLabel(d->stack);
d->label->tqsetAlignment(TQt::AlignCenter);
d->label->setAlignment(TQt::AlignCenter);
d->stack->addWidget(d->label);
}
}

2
digikam/libs/imageproperties/navigatebarwidget.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

10
digikam/libs/imageproperties/talbumlistview.cpp
Unescape View File

@ -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
@ -151,7 +151,7 @@ int TAlbumCheckListItem::count()
return m_count;
}
void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status)
void TAlbumCheckListItem::setStatus(MetadataHub::TagStatus status)
{
if (status == MetadataHub::MetadataDisjoint)
{
@ -253,7 +253,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
if(TagDrag::canDecode(e))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
@ -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") );

2
digikam/libs/imageproperties/talbumlistview.h
Unescape View File

@ -47,7 +47,7 @@ public:
TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album);
void settqStatus(MetadataHub::TagtqStatus status);
void setStatus(MetadataHub::TagStatus status);
void refresh();
void setOpen(bool o);
TAlbum* album() const;

8
digikam/libs/jpegutils/jpegutils.cpp
Unescape View File

@ -105,7 +105,7 @@ static void jpegutils_jpeg_output_message(j_common_ptr cinfo)
#endif
}
bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize)
{
TQString format = TQImageIO::imageFormat(path);
if (format !="JPEG") return false;
@ -138,7 +138,7 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
// libjpeg supports 1/1, 1/2, 1/4, 1/8
int scale=1;
while(tqmaximumSize*scale*2<=imgSize)
while(maximumSize*scale*2<=imgSize)
{
scale*=2;
}
@ -229,8 +229,8 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
}
int newMax = TQMAX(cinfo.output_width, cinfo.output_height);
int newx = tqmaximumSize*cinfo.output_width / newMax;
int newy = tqmaximumSize*cinfo.output_height / newMax;
int newx = maximumSize*cinfo.output_width / newMax;
int newy = maximumSize*cinfo.output_height / newMax;
jpeg_destroy_decompress(&cinfo);
fclose(inputFile);

2
digikam/libs/jpegutils/jpegutils.h
Unescape View File

@ -33,7 +33,7 @@
namespace Digikam
{
bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize);
bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize);
bool exifRotate(const TQString& file, const TQString& documentName);
bool jpegConvert(const TQString& src, const TQString& dest, const TQString& documentName,
const TQString& format=TQString("PNG"));

16
digikam/libs/lprof/cmshull.cpp
Unescape View File

@ -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 */

8
digikam/libs/lprof/cmslnr.cpp
Unescape View File

@ -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') */
@ -191,7 +191,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
LCMSHANDLE h;
double ChiSq, OldChiSq;
int i;
BOOL tqStatus = true;
BOOL Status = true;
/* initial guesses */
@ -213,7 +213,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
for(i = 0; i < LEVENBERG_MARTQUARDT_ITERATE_MAX; i++) {
if (!cmsxLevenbergMarquardtIterate(h)) {
tqStatus = false;
Status = false;
break;
}
@ -227,7 +227,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
cmsxLevenbergMarquardtFree(h);
return tqStatus;
return Status;
}
/* Tries to fit gamma as per IEC 61966-2.1 using Levenberg-Marquardt method */

2
digikam/libs/lprof/cmsmkmsh.cpp
Unescape View File

@ -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)

2
digikam/libs/lprof/cmsprf.cpp
Unescape View File

@ -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,

2
digikam/libs/lprof/cmssheet.cpp
Unescape View File

@ -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. */

2
digikam/libs/lprof/lcmsprf.h
Unescape View File

@ -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,

172
digikam/libs/themeengine/themeengine.cpp
Unescape View File

@ -29,9 +29,9 @@
#include <tqfileinfo.h>
#include <tqfile.h>
#include <tqapplication.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqtimer.h>
#include <tqtextstream.h>
#include <textstream.h>
// KDE includes.
@ -325,7 +325,7 @@ void ThemeEngine::changePalette()
plt.setDisabled(cg);
}
kapp->tqsetPalette(plt, true);
kapp->setPalette(plt, true);
}
Theme* ThemeEngine::getCurrentTheme() const
@ -414,7 +414,7 @@ bool ThemeEngine::loadTheme()
}
TQDomElement rootElem = xmlDoc.documentElement();
if (rootElem.tagName() != TQString::tqfromLatin1("digikamtheme"))
if (rootElem.tagName() != TQString::fromLatin1("digikamtheme"))
return false;
TQString resource;
@ -678,7 +678,7 @@ TQString ThemeEngine::resourceValue(const TQDomElement &rootElem, const TQString
{
TQDomElement e = node.toElement();
TQString name = e.tagName();
TQString val = e.attribute(TQString::tqfromLatin1("value"));
TQString val = e.attribute(TQString::fromLatin1("value"));
if (key == name)
{
@ -711,8 +711,8 @@ bool ThemeEngine::saveTheme()
// header ------------------------------------------------------------------
xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::tqfromLatin1("xml"),
TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"")));
xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::fromLatin1("xml"),
TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"")));
TQString banner = TQString("\n/* ============================================================"
"\n *"
@ -736,52 +736,52 @@ bool ThemeEngine::saveTheme()
"\n * GNU General Public License for more details."
"\n *"
"\n * ============================================================ */\n")
.tqarg(TQDate::tqcurrentDate().year())
.tqarg(TQDate::tqcurrentDate().month())
.tqarg(TQDate::tqcurrentDate().day())
.tqarg(fi.fileName())
.tqarg(TQDate::tqcurrentDate().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));
TQDomElement themeElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamtheme"));
TQDomElement themeElem = xmlDoc.createElement(TQString::fromLatin1("digikamtheme"));
xmlDoc.appendChild(themeElem);
// base props --------------------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("name"));
e.setAttribute(TQString::tqfromLatin1("value"), fi.fileName());
e = xmlDoc.createElement(TQString::fromLatin1("name"));
e.setAttribute(TQString::fromLatin1("value"), fi.fileName());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("BaseColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->baseColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("BaseColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->baseColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("TextRegularColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textRegColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("TextRegularColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->textRegColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("TextSelectedColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSelColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("TextSelectedColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSelColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialRegularColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialRegularColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialSelectedColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialSelectedColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper());
themeElem.appendChild(e);
// banner props ------------------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("BannerColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColorTo"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColorTo.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("BannerColorTo"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->bannerBevel)
@ -803,8 +803,8 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBevel"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("BannerBevel"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->bannerGrad)
@ -831,26 +831,26 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerGradient"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("BannerGradient"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorder"));
e.setAttribute(TQString::tqfromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE"));
e = xmlDoc.createElement(TQString::fromLatin1("BannerBorder"));
e.setAttribute(TQString::fromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorderColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerBorderColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("BannerBorderColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerBorderColor.name()).upper());
themeElem.appendChild(e);
// thumbnail.regular props -------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColorTo"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColorTo"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->thumbRegBevel)
@ -872,8 +872,8 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBevel"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBevel"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->thumbRegGrad)
@ -900,26 +900,26 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularGradient"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularGradient"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorder"));
e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE"));
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorder"));
e.setAttribute(TQString::fromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorderColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorderColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper());
themeElem.appendChild(e);
// thumbnail.selected props -------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColorTo"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColorTo"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->thumbSelBevel)
@ -941,8 +941,8 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBevel"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBevel"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->thumbSelGrad)
@ -969,26 +969,26 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedGradient"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedGradient"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorder"));
e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE"));
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorder"));
e.setAttribute(TQString::fromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorderColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorderColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper());
themeElem.appendChild(e);
// listview.regular props -------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColorTo"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColorTo.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColorTo"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->listRegBevel)
@ -1010,8 +1010,8 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBevel"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBevel"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->listRegGrad)
@ -1038,26 +1038,26 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularGradient"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularGradient"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorder"));
e.setAttribute(TQString::tqfromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE"));
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorder"));
e.setAttribute(TQString::fromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorderColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegBorderColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorderColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegBorderColor.name()).upper());
themeElem.appendChild(e);
// listview.selected props -------------------------------------------------
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColor.name()).upper());
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColorTo"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColorTo.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColorTo"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->listSelBevel)
@ -1079,8 +1079,8 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBevel"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBevel"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->listSelGrad)
@ -1107,16 +1107,16 @@ bool ThemeEngine::saveTheme()
}
};
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedGradient"));
e.setAttribute(TQString::tqfromLatin1("value"), val);
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedGradient"));
e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorder"));
e.setAttribute(TQString::tqfromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE"));
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorder"));
e.setAttribute(TQString::fromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorderColor"));
e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelBorderColor.name()).upper());
e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorderColor"));
e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelBorderColor.name()).upper());
themeElem.appendChild(e);
// -------------------------------------------------------------------------

36
digikam/libs/threadimageio/loadsavetask.cpp
Unescape View File

@ -78,7 +78,7 @@ void SavedEvent::notify(LoadSaveThread *thread)
void LoadingTask::execute()
{
if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
DImg img(m_loadingDescription.filePath, this, m_loadingDescription.rawDecodingSettings);
m_thread->taskHasFinished();
@ -92,7 +92,7 @@ LoadingTask::TaskType LoadingTask::type()
void LoadingTask::progressInfo(const DImg *, float progress)
{
if (m_loadingTasktqStatus == LoadingTaskStatusLoading)
if (m_loadingTaskStatus == LoadingTaskStatusLoading)
{
if (m_thread->querySendNotifyEvent())
TQApplication::postEvent(m_thread, new LoadingProgressEvent(m_loadingDescription.filePath, progress));
@ -101,12 +101,12 @@ void LoadingTask::progressInfo(const DImg *, float progress)
bool LoadingTask::continueQuery(const DImg *)
{
return m_loadingTasktqStatus != LoadingTaskStatusStopping;
return m_loadingTaskStatus != LoadingTaskStatusStopping;
}
void LoadingTask::settqStatus(LoadingTasktqStatus status)
void LoadingTask::setStatus(LoadingTaskStatus status)
{
m_loadingTasktqStatus = status;
m_loadingTaskStatus = status;
}
@ -123,7 +123,7 @@ bool LoadingTask::isShuttingDown()
void SharedLoadingTask::execute()
{
if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
// send StartedLoadingEvent from each single Task, not via LoadingProcess list
TQApplication::postEvent(m_thread, new StartedLoadingEvent(m_loadingDescription.filePath));
@ -168,13 +168,13 @@ void SharedLoadingTask::execute()
// has finished.
m_usedProcess->addListener(this);
// break loop when either the loading has completed, or this task is being stopped
while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping )
while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping )
lock.timedWait();
// remove listener from process
m_usedProcess->removeListener(this);
// wake up the process which is waiting until all listeners have removed themselves
lock.wakeAll();
// set to 0, as checked in settqStatus
// set to 0, as checked in setStatus
m_usedProcess = 0;
//DDebug() << "SharedLoadingTask " << this << ": waited" << endl;
return;
@ -186,7 +186,7 @@ void SharedLoadingTask::execute()
cache->addLoadingProcess(this);
// Add this to the list of listeners
addListener(this);
// for use in settqStatus
// for use in setStatus
m_usedProcess = this;
// Notify other processes that we are now loading this image.
// They might be interested - see notifyNewLoadingProcess below
@ -284,14 +284,14 @@ void SharedLoadingTask::execute()
// wait until all listeners have removed themselves
while (m_listeners.count() != 0)
lock.timedWait();
// set to 0, as checked in settqStatus
// set to 0, as checked in setStatus
m_usedProcess = 0;
}
}
void SharedLoadingTask::progressInfo(const DImg *, float progress)
{
if (m_loadingTasktqStatus == LoadingTaskStatusLoading)
if (m_loadingTaskStatus == LoadingTaskStatusLoading)
{
LoadingCache *cache = LoadingCache::cache();
LoadingCache::CacheLock lock(cache);
@ -308,13 +308,13 @@ bool SharedLoadingTask::continueQuery(const DImg *)
{
// If this is called, the thread is currently loading an image.
// In shared loading, we cannot stop until all listeners have been removed as well
return (m_loadingTasktqStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0);
return (m_loadingTaskStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0);
}
void SharedLoadingTask::settqStatus(LoadingTasktqStatus status)
void SharedLoadingTask::setStatus(LoadingTaskStatus status)
{
m_loadingTasktqStatus = status;
if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
m_loadingTaskStatus = status;
if (m_loadingTaskStatus == LoadingTaskStatusStopping)
{
LoadingCache *cache = LoadingCache::cache();
LoadingCache::CacheLock lock(cache);
@ -413,12 +413,12 @@ void SavingTask::progressInfo(const DImg *, float progress)
bool SavingTask::continueQuery(const DImg *)
{
return m_savingTasktqStatus != SavingTaskStatusStopping;
return m_savingTaskStatus != SavingTaskStatusStopping;
}
void SavingTask::settqStatus(SavingTasktqStatus status)
void SavingTask::setStatus(SavingTaskStatus status)
{
m_savingTasktqStatus = status;
m_savingTaskStatus = status;
}
} //namespace Digikam

30
digikam/libs/threadimageio/loadsavetask.h
Unescape View File

@ -208,7 +208,7 @@ class LoadingTask : public LoadSaveTask, public DImgLoaderObserver
{
public:
enum LoadingTasktqStatus
enum LoadingTaskStatus
{
LoadingTaskStatusLoading,
LoadingTaskStatusPreloading,
@ -216,8 +216,8 @@ public:
};
LoadingTask(LoadSaveThread* thread, LoadingDescription description,
LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading)
: LoadSaveTask(thread), m_loadingDescription(description), m_loadingTasktqStatus(loadingTasktqStatus)
LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading)
: LoadSaveTask(thread), m_loadingDescription(description), m_loadingTaskStatus(loadingTaskStatus)
{}
// LoadSaveTask
@ -231,11 +231,11 @@ public:
virtual bool continueQuery(const DImg *);
virtual bool isShuttingDown();
virtual void settqStatus(LoadingTasktqStatus status);
virtual void setStatus(LoadingTaskStatus status);
LoadingTasktqStatus status() const
LoadingTaskStatus status() const
{
return m_loadingTasktqStatus;
return m_loadingTaskStatus;
}
TQString filePath() const
@ -251,7 +251,7 @@ public:
protected:
LoadingDescription m_loadingDescription;
LoadingTasktqStatus m_loadingTasktqStatus;
LoadingTaskStatus m_loadingTaskStatus;
};
//---------------------------------------------------------------------------------------------------
@ -262,15 +262,15 @@ public:
SharedLoadingTask(LoadSaveThread* thread, LoadingDescription description,
LoadSaveThread::AccessMode mode = LoadSaveThread::AccessModeReadWrite,
LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading)
: LoadingTask(thread, description, loadingTasktqStatus),
LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading)
: LoadingTask(thread, description, loadingTaskStatus),
m_accessMode(mode), m_completed(false), m_usedProcess(0)
{}
virtual void execute();
virtual void progressInfo(const DImg *, float progress);
virtual bool continueQuery(const DImg *);
virtual void settqStatus(LoadingTasktqStatus status);
virtual void setStatus(LoadingTaskStatus status);
// LoadingProcess
@ -319,7 +319,7 @@ class SavingTask : public LoadSaveTask, public DImgLoaderObserver
{
public:
enum SavingTasktqStatus
enum SavingTaskStatus
{
SavingTaskStatusSaving,
SavingTaskStatusStopping
@ -335,11 +335,11 @@ public:
virtual void progressInfo(const DImg *, float progress);
virtual bool continueQuery(const DImg *);
virtual void settqStatus(SavingTasktqStatus status);
virtual void setStatus(SavingTaskStatus status);
SavingTasktqStatus status() const
SavingTaskStatus status() const
{
return m_savingTasktqStatus;
return m_savingTaskStatus;
}
TQString filePath() const
@ -352,7 +352,7 @@ private:
DImg m_img;
TQString m_filePath;
TQString m_format;
SavingTasktqStatus m_savingTasktqStatus;
SavingTaskStatus m_savingTaskStatus;
};
} // namespace Digikam

26
digikam/libs/threadimageio/managedloadsavethread.cpp
Unescape View File

@ -46,7 +46,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread()
{
TQMutexLocker lock(&m_mutex);
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterAll);
break;
}
@ -54,7 +54,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread()
{
TQMutexLocker lock(&m_mutex);
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterPreloading);
break;
}
@ -125,13 +125,13 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
// reuse task if it exists
if (existingTask)
{
existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop current task
if (m_currentTask && m_currentTask != existingTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
//DDebug() << "LoadingPolicyFirstRemovePrevious, Existing task " << existingTask <<
//", m_currentTask " << m_currentTask << ", loadingTask " << loadingTask << endl;
@ -153,14 +153,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
case LoadingPolicyPrepend:
if (existingTask)
{
existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop and postpone current task if it is a preloading task
if (m_currentTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
{
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
}
@ -173,14 +173,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
case LoadingPolicyAppend:
if (existingTask)
{
existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop and postpone current task if it is a preloading task
if (m_currentTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
{
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
}
@ -222,13 +222,13 @@ void ManagedLoadSaveThread::loadPreview(LoadingDescription description)
// reuse task if it exists
if (existingTask)
{
existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop current task
if (m_currentTask && m_currentTask != existingTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
// remove all loading tasks
for (LoadSaveTask *task = m_todo.first(); task; task = m_todo.next())
@ -289,7 +289,7 @@ void ManagedLoadSaveThread::stopSaving(const TQString& filePath)
SavingTask *savingTask = (SavingTask *)m_currentTask;
if (filePath.isNull() || savingTask->filePath() == filePath)
{
savingTask->settqStatus(SavingTask::SavingTaskStatusStopping);
savingTask->setStatus(SavingTask::SavingTaskStatusStopping);
}
}
@ -318,7 +318,7 @@ void ManagedLoadSaveThread::removeLoadingTasks(const LoadingDescription &descrip
{
if (description.filePath.isNull() || loadingTask->loadingDescription() == description)
{
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
}
@ -344,7 +344,7 @@ void ManagedLoadSaveThread::save(DImg &image, const TQString& filePath, const TQ
// stop and postpone current task if it is a preloading task
if (m_currentTask && (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)))
{
loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
// append new loading task, put it in front of preloading tasks

12
digikam/libs/threadimageio/previewtask.cpp
Unescape View File

@ -50,7 +50,7 @@ namespace Digikam
void PreviewLoadingTask::execute()
{
if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
LoadingCache *cache = LoadingCache::cache();
@ -106,13 +106,13 @@ void PreviewLoadingTask::execute()
// has finished.
m_usedProcess->addListener(this);
// break loop when either the loading has completed, or this task is being stopped
while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping )
while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping )
lock.timedWait();
// remove listener from process
m_usedProcess->removeListener(this);
// wake up the process which is waiting until all listeners have removed themselves
lock.wakeAll();
// set to 0, as checked in settqStatus
// set to 0, as checked in setStatus
m_usedProcess = 0;
return;
}
@ -123,7 +123,7 @@ void PreviewLoadingTask::execute()
cache->addLoadingProcess(this);
// Add this to the list of listeners
addListener(this);
// for use in settqStatus
// for use in setStatus
m_usedProcess = this;
// Notify other processes that we are now loading this image.
// They might be interested - see notifyNewLoadingProcess below
@ -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());
}
@ -228,7 +228,7 @@ void PreviewLoadingTask::execute()
// wait until all listeners have removed themselves
while (m_listeners.count() != 0)
lock.timedWait();
// set to 0, as checked in settqStatus
// set to 0, as checked in setStatus
m_usedProcess = 0;
}
}

50
digikam/libs/thumbbar/thumbbar.cpp
Unescape View File

@ -42,7 +42,7 @@ extern "C"
#include <tqpainter.h>
#include <tqdict.h>
#include <tqpoint.h>
#include <tqstylesheet.h>
#include <stylesheet.h>
#include <tqdatetime.h>
#include <tqguardedptr.h>
@ -206,13 +206,13 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e)
if (d->orientation ==Qt::Vertical)
{
d->tileSize = width() - 2*d->margin - verticalScrollBar()->tqsizeHint().width();
d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width();
verticalScrollBar()->setLineStep(d->tileSize);
verticalScrollBar()->setPageStep(2*d->tileSize);
}
else
{
d->tileSize = height() - 2*d->margin - horizontalScrollBar()->tqsizeHint().height();
d->tileSize = height() - 2*d->margin - horizontalScrollBar()->sizeHint().height();
horizontalScrollBar()->setLineStep(d->tileSize);
horizontalScrollBar()->setPageStep(2*d->tileSize);
}
@ -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)
@ -480,7 +480,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
x2 = ((x1 + er.width())/ts +1)*ts;
}
bgPix.fill(tqcolorGroup().background());
bgPix.fill(colorGroup().background());
for (ThumbBarItem *item = d->firstItem; item; item = item->d->next)
{
@ -489,9 +489,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
if (y1 <= item->d->pos && item->d->pos <= y2)
{
if (item == d->currItem)
tile.fill(tqcolorGroup().highlight());
tile.fill(colorGroup().highlight());
else
tile.fill(tqcolorGroup().background());
tile.fill(colorGroup().background());
TQPainter p(&tile);
p.setPen(TQt::white);
@ -516,9 +516,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
if (x1 <= item->d->pos && item->d->pos <= x2)
{
if (item == d->currItem)
tile.fill(tqcolorGroup().highlight());
tile.fill(colorGroup().highlight());
else
tile.fill(tqcolorGroup().background());
tile.fill(colorGroup().background());
TQPainter p(&tile);
p.setPen(TQt::white);
@ -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;
}

2
digikam/libs/thumbbar/thumbbar.h
Unescape View File

@ -188,7 +188,7 @@ public:
TQRect rect() const;
TQPixmap* pixmap() const;
void tqrepaint();
void repaint();
private:

4
digikam/libs/widgets/common/colorgradientwidget.cpp
Unescape View File

@ -92,8 +92,8 @@ void ColorGradientWidget::drawContents(TQPainter *p)
// Widget is disable : drawing grayed frame.
if ( !isEnabled() )
{
color1 = tqpalette().disabled().foreground();
color2 = tqpalette().disabled().background();
color1 = palette().disabled().foreground();
color2 = palette().disabled().background();
}
else
{

64
digikam/libs/widgets/common/curveswidget.cpp
Unescape View File

@ -148,7 +148,7 @@ void CurvesWidget::setup(int w, int h, bool readOnly)
m_imageHistogram = 0;
setMouseTracking(true);
setPaletteBackgroundColor(tqcolorGroup().background());
setPaletteBackgroundColor(colorGroup().background());
setMinimumSize(w, h);
d->blinkTimer = new TQTimer( this );
@ -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,12 +312,12 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
p2.tqbegin(TQT_TQPAINTDEVICE(&anim), this);
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.begin(TQT_TQPAINTDEVICE(&anim), this);
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -330,12 +330,12 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.begin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@ -353,11 +353,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.begin(TQT_TQPAINTDEVICE(&pm), this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@ -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;
@ -483,14 +483,14 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing histogram
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
// Drawing curves.
p1.setPen(TQPen(tqpalette().active().link(), 2, TQt::SolidLine));
p1.setPen(TQPen(palette().active().link(), 2, TQt::SolidLine));
p1.drawLine(x - 1, wHeight - ((curvePrevVal * wHeight) / histogram->getHistogramSegment()),
x, wHeight - ((curveVal * wHeight) / histogram->getHistogramSegment()));
@ -518,7 +518,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing black/middle/highlight tone grid separators.
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(wWidth/4, 0, wWidth/4, wHeight);
p1.drawLine(wWidth/2, 0, wWidth/2, wHeight);
p1.drawLine(3*wWidth/4, 0, 3*wWidth/4, wHeight);
@ -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));
@ -601,7 +601,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing frame.
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
@ -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

2
digikam/libs/widgets/common/dcursortracker.cpp
Unescape View File

@ -103,7 +103,7 @@ DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent)
setPalette(TQToolTip::palette());
setFrameStyle(TQFrame::Plain | TQFrame::Box);
setLineWidth(1);
tqsetAlignment(AlignAuto | AlignTop);
setAlignment(AlignAuto | AlignTop);
}
} // namespace Digikam

2
digikam/libs/widgets/common/dlogoaction.cpp
Unescape View File

@ -62,7 +62,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar);
pixmapLogo->setMargin(0);
pixmapLogo->setScaledContents(false);
pixmapLogo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");

14
digikam/libs/widgets/common/dpopupmenu.cpp
Unescape View File

@ -84,7 +84,7 @@ int DPopupMenu::sidePixmapWidth() const
TQRect DPopupMenu::sideImageRect() const
{
return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(),
return TQStyle::visualRect(TQRect(frameWidth(), frameWidth(),
s_dpopupmenu_sidePixmap.width(),
height() - 2*frameWidth()),
this);
@ -93,14 +93,14 @@ TQRect DPopupMenu::sideImageRect() const
TQColor DPopupMenu::calcPixmapColor()
{
TQColor color;
TQColor activeTitle = TQApplication::tqpalette().active().background();
TQColor inactiveTitle = TQApplication::tqpalette().inactive().background();
TQColor activeTitle = TQApplication::palette().active().background();
TQColor inactiveTitle = TQApplication::palette().inactive().background();
// figure out which color is most suitable for recoloring to
int h1, s1, v1, h2, s2, v2, h3, s3, v3;
activeTitle.hsv(&h1, &s1, &v1);
inactiveTitle.hsv(&h2, &s2, &v2);
TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3);
TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))
@ -153,7 +153,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
{
KPopupMenu::resizeEvent(e);
setFrameRect(TQStyle::tqvisualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
width() - s_dpopupmenu_sidePixmap.width(), height()),
this ) );
}
@ -161,7 +161,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
//Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough.
void DPopupMenu::resize(int width, int height)
{
width = kMax(width, tqmaximumSize().width());
width = kMax(width, maximumSize().width());
KPopupMenu::resize(width, height);
}
@ -190,7 +190,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
TQRect(0, 0, width(), height()),
tqcolorGroup(), TQStyle::Style_Default,
colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0));
}

2
digikam/libs/widgets/common/filesaveoptionsbox.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwidget.h>
#include <tqlabel.h>

128
digikam/libs/widgets/common/histogramwidget.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <tqevent.h>
#include <tqtimer.h>
#include <tqcolor.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqrect.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
@ -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,11 +383,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(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.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);
@ -405,12 +405,12 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
p2.tqbegin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -423,12 +423,12 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(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.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
if (d->clearFlag == HistogramWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@ -447,11 +447,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(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.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.setPen(TQPen(tqpalette().active().text()));
p1.setPen(TQPen(palette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@ -524,8 +524,8 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
// Drawing selection or all histogram values.
@ -645,35 +645,35 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
}
else
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
}
else
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
@ -684,9 +684,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
// Witch color must be used on the foreground with all colors channel mode?
switch (m_colorType)
@ -717,16 +717,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -740,16 +740,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -763,16 +763,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -793,16 +793,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -816,16 +816,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -839,16 +839,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@ -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));
@ -973,7 +973,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQToolTip::add( this, tipText);
}
p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);
@ -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);
}
}

14
digikam/libs/widgets/common/paniconwidget.cpp
Unescape View File

@ -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() ) *
@ -192,7 +192,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone)
void PanIconWidget::updatePixmap()
{
// Drawing background and image.
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0);
TQPainter p(m_pixmap);
@ -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);

8
digikam/libs/widgets/common/previewwidget.cpp
Unescape View File

@ -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)

14
digikam/libs/widgets/common/searchtextbar.cpp
Unescape View File

@ -24,10 +24,10 @@
// TQt includes.
#include <tqcolor.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqpainter.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtoolbutton.h>
// KDE includes.
@ -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);
}
@ -172,7 +172,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
kcom->setOrder(KCompletion::Sorted);
d->searchEdit->setCompletionObject(kcom, true);
d->searchEdit->setAutoDeleteCompletionObject(true);
d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
d->searchEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
hlay->setSpacing(0);
hlay->setMargin(0);

4
digikam/libs/widgets/common/sidebar.cpp
Unescape View File

@ -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();

14
digikam/libs/widgets/common/splashscreen.cpp
Unescape View File

@ -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::tqsetAlignment(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

2
digikam/libs/widgets/common/splashscreen.h
Unescape View File

@ -52,7 +52,7 @@ public:
SplashScreen(const TQString& splash, WFlags f=0);
virtual ~SplashScreen();
void tqsetAlignment(int tqalignment);
void setAlignment(int alignment);
void setColor(const TQColor& color);
protected:

4
digikam/libs/widgets/common/squeezedcombobox.cpp
Unescape View File

@ -89,7 +89,7 @@ SqueezedComboBox::~SqueezedComboBox()
delete d;
}
TQSize SqueezedComboBox::tqsizeHint() const
TQSize SqueezedComboBox::sizeHint() const
{
constPolish();
TQFontMetrics fm = fontMetrics();
@ -188,7 +188,7 @@ void SqueezedComboBoxTip::maybeTip(const TQPoint &pos)
TQListBoxItem* selectedItem = listBox->itemAt( pos );
if (selectedItem)
{
TQRect positionToolTip = listBox->tqitemRect(selectedItem);
TQRect positionToolTip = listBox->itemRect(selectedItem);
TQString toolTipText = m_originalWidget->itemHighlighted();
if (!toolTipText.isNull())
tip(positionToolTip, toolTipText);

4
digikam/libs/widgets/common/squeezedcombobox.h
Unescape View File

@ -100,9 +100,9 @@ public:
TQString itemHighlighted();
/**
* Sets the tqsizeHint() of this widget.
* Sets the sizeHint() of this widget.
*/
virtual TQSize tqsizeHint() const;
virtual TQSize sizeHint() const;
private slots:

2
digikam/libs/widgets/common/statusnavigatebar.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>

8
digikam/libs/widgets/common/statusprogressbar.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqwidget.h>
#include <tqpushbutton.h>
@ -86,7 +86,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
setProgressTotalSteps(100);
d->cancelButton = new TQPushButton(d->progressWidget);
d->cancelButton->setFocusPolicy(TQ_NoFocus);
d->cancelButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelButton->setPixmap(SmallIcon("cancel"));
// Parent widget will probably have the wait cursor set.
@ -115,9 +115,9 @@ void StatusProgressBar::setText(const TQString& text)
d->textLabel->setText(text);
}
void StatusProgressBar::tqsetAlignment(int a)
void StatusProgressBar::setAlignment(int a)
{
d->textLabel->tqsetAlignment(a);
d->textLabel->setAlignment(a);
}
int StatusProgressBar::progressValue()

2
digikam/libs/widgets/common/statusprogressbar.h
Unescape View File

@ -58,7 +58,7 @@ public:
StatusProgressBar(TQWidget *parent=0);
~StatusProgressBar();
void tqsetAlignment(int a);
void setAlignment(int a);
void progressBarMode(int mode, const TQString& text=TQString());

28
digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
Unescape View File

@ -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*)
@ -707,8 +707,8 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
if ( !isEnabled() )
{
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background());
d->painter.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
d->painter.fillRect(0, 0, size().width(), size().height(), palette().disabled().background());
d->painter.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.end();
bitBlt(this, 0, 0, &d->pixmap);
@ -724,12 +724,12 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
p2.tqbegin(&anim, TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.begin(&anim, TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
p2.setPen(TQPen(tqpalette().active().text()));
p2.setPen(TQPen(palette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@ -741,9 +741,9 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
// ... and we render busy text.
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background());
d->painter.drawPixmap(width()/2 - asize /2, asize, anim);
d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
i18n("Loading image..."));
@ -758,8 +758,8 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
if (!d->profileDataAvailable || (!d->loadingImageMode && !d->loadingImageSucess))
{
d->painter.begin(&d->pixmap);
d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background());
d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine));
d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background());
d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine));
d->painter.drawRect(0, 0, width(), height());
d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter,
i18n("No profile available..."));
@ -809,7 +809,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*)
void CIETongueWidget::slotBlinkTimerDone()
{
tqrepaint(false);
repaint(false);
d->blinkTimer->start( 200 );
}

6
digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqfileinfo.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
// KDE includes.
@ -45,12 +45,12 @@ namespace Digikam
ICCPreviewWidget::ICCPreviewWidget(TQWidget *parent)
: KPreviewWidgetBase( parent )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
TQVBoxLayout *layout = new TQVBoxLayout( this );
TQVGroupBox *box = new TQVGroupBox( this );
box->setInsideMargin(0);
box->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain);
m_iccProfileWidget = new ICCProfileWidget(box);
tqlayout->addWidget( box );
layout->addWidget( box );
}
ICCPreviewWidget::~ICCPreviewWidget()

4
digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqlabel.h>
@ -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. "

14
digikam/libs/widgets/imageplugins/imageguidewidget.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqrect.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
@ -235,7 +235,7 @@ void ImageGuideWidget::updatePixmap()
TQFontMetrics fontMt = p.fontMetrics();
p.setPen(TQPen(TQt::red, 1)) ;
d->pixmap->fill(tqcolorGroup().background());
d->pixmap->fill(colorGroup().background());
if (d->renderingPreviewMode == PreviewOriginalImage ||
(d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == false ))
@ -303,7 +303,7 @@ void ImageGuideWidget::updatePixmap()
}
// Drawing the information and others stuff.
p.fillRect(d->rect.right(), 0, width(), height(), tqcolorGroup().background());
p.fillRect(d->rect.right(), 0, width(), height(), colorGroup().background());
p.setPen(TQPen(TQt::white, 2, TQt::SolidLine));
p.drawLine(d->rect.x()+d->rect.width()/2-1,
@ -368,7 +368,7 @@ void ImageGuideWidget::updatePixmap()
0, 0, d->rect.width(), d->rect.height()/2);
}
p.fillRect(0, d->rect.bottom(), width(), height(), tqcolorGroup().background());
p.fillRect(0, d->rect.bottom(), width(), height(), colorGroup().background());
p.setPen(TQPen(TQt::white, 2, TQt::SolidLine));
p.drawLine(d->rect.x(),
@ -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);
}
}

6
digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqtimer.h>
#include <tqhbuttongroup.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
// KDE includes.
@ -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

6
digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
Unescape View File

@ -97,13 +97,13 @@ void ImagePanIconWidget::setHighLightPoints(const TQPointArray& pointsList)
{
d->hightlightPoints = pointsList;
updatePixmap();
tqrepaint(false);
repaint(false);
}
void ImagePanIconWidget::updatePixmap()
{
// Drawing background and image.
m_pixmap->fill(tqcolorGroup().background());
m_pixmap->fill(colorGroup().background());
d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height());
TQPainter p(m_pixmap);
@ -192,7 +192,7 @@ void ImagePanIconWidget::slotSeparateViewToggled(int t)
{
d->separateView = t;
updatePixmap();
tqrepaint(false);
repaint(false);
}
} // NameSpace Digikam

10
digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqtimer.h>
#include <tqhbuttongroup.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
// KDE includes.
@ -132,7 +132,7 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
l1->addWidget(d->imageRegionWidget, 0);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
d->previewWidget->tqsetSizePolicy(rightSzPolicy);
d->previewWidget->setSizePolicy(rightSzPolicy);
// -------------------------------------------------------------
@ -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

6
digikam/libs/widgets/imageplugins/imageregionwidget.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqpainter.h>
#include <tqpen.h>
#include <tqimage.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
#include <tqpointarray.h>
@ -87,7 +87,7 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro
d->image = d->iface->getOriginalImg()->copy();
setMinimumSize(wp, hp);
setBackgroundColor(tqcolorGroup().background());
setBackgroundColor(colorGroup().background());
if( !scrollBar )
{
@ -351,7 +351,7 @@ void ImageRegionWidget::backupPixmapRegion()
void ImageRegionWidget::restorePixmapRegion()
{
m_movingInProgress = true;
viewport()->tqrepaint(false);
viewport()->repaint(false);
}
void ImageRegionWidget::updatePreviewImage(DImg *img)

10
digikam/libs/widgets/imageplugins/imagewidget.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqhbuttongroup.h>
#include <tqpushbutton.h>
@ -87,7 +87,7 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
TQGridLayout* grid = new TQGridLayout(this, 2, 3);
d->spotInfoLabel = new KSqueezedTextLabel(this);
d->spotInfoLabel->tqsetAlignment(TQt::AlignRight);
d->spotInfoLabel->setAlignment(TQt::AlignRight);
// -------------------------------------------------------------
@ -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()

16
digikam/libs/widgets/metadata/gpswidget.cpp
Unescape View File

@ -28,7 +28,7 @@ http://www.gpspassion.com/forumsen/topic.asp?TOPIC_ID=16593
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqmap.h>
#include <tqhbox.h>
@ -105,7 +105,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
// --------------------------------------------------------
TQWidget *gpsInfo = new TQWidget(this);
TQGridLayout *tqlayout = new TQGridLayout(gpsInfo, 3, 2);
TQGridLayout *layout = new TQGridLayout(gpsInfo, 3, 2);
d->map = new WorldMapWidget(256, 256, gpsInfo);
// --------------------------------------------------------
@ -114,7 +114,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
box2->setInsideMargin(0);
box2->setInsideSpacing(0);
box2->setFrameStyle( TQFrame::NoFrame );
TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 0, 2, KDialog::spacingHint() );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 0, 2, KDialog::spacingHint() );
d->detailsCombo = new TQComboBox( false, box2 );
d->detailsButton = new TQPushButton(i18n("More Info..."), box2);
@ -129,12 +129,12 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name)
// --------------------------------------------------------
tqlayout->addMultiCellWidget(d->map, 0, 0, 0, 2);
tqlayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
layout->addMultiCellWidget(d->map, 0, 0, 0, 2);
layout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(),
TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 1, 1, 0, 2);
tqlayout->addMultiCellWidget(box2, 2, 2, 0, 0);
tqlayout->setColStretch(2, 10);
tqlayout->setRowStretch(3, 10);
layout->addMultiCellWidget(box2, 2, 2, 0, 0);
layout->setColStretch(2, 10);
layout->setRowStretch(3, 10);
// --------------------------------------------------------

2
digikam/libs/widgets/metadata/mdkeylistviewitem.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqpalette.h>
#include <palette.h>
#include <tqfont.h>
#include <tqpainter.h>

8
digikam/libs/widgets/metadata/metadatalistview.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqtimer.h>
#include <tqptrlist.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqheader.h>
#include <tqwhatsthis.h>
@ -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)

2
digikam/libs/widgets/metadata/metadatalistviewitem.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqpalette.h>
#include <palette.h>
#include <tqfont.h>
#include <tqpainter.h>

16
digikam/libs/widgets/metadata/metadatawidget.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqmap.h>
#include <tqfile.h>
#include <tqmime.h>
@ -34,10 +34,10 @@
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqdragobject.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include <tqsimplerichtext.h>
#include <tqpaintdevicemetrics.h>
#include <tqstylesheet.h>
#include <stylesheet.h>
#include <tqlistview.h>
#include <tqtooltip.h>
@ -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() )
@ -295,14 +295,14 @@ void MetadataWidget::slotCopy2Clipboard()
++it;
}
TQApplication::tqclipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
TQApplication::clipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard);
}
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() )
@ -354,7 +354,7 @@ void MetadataWidget::slotPrintMetadata()
do
{
richText.draw( &p, margin, margin, view, tqcolorGroup() );
richText.draw( &p, margin, margin, view, colorGroup() );
view.moveBy( 0, view.height() );
p.translate( 0 , -view.height() );
p.setFont( font );

10
digikam/libs/widgets/metadata/worldmapwidget.cpp
Unescape View File

@ -81,14 +81,14 @@ WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *parent)
setVScrollBarMode(TQScrollView::AlwaysOff);
setHScrollBarMode(TQScrollView::AlwaysOff);
viewport()->setMouseTracking(true);
viewport()->setPaletteBackgroundColor(tqcolorGroup().background());
viewport()->setPaletteBackgroundColor(colorGroup().background());
setMinimumWidth(w);
setMaximumHeight(h);
resizeContents(worldMapPixmap().width(), worldMapPixmap().height());
d->latLonPos = new TQLabel(viewport());
d->latLonPos->setMaximumHeight(fontMetrics().height());
d->latLonPos->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->latLonPos->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->latLonPos->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
addChild(d->latLonPos);
}
@ -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);
}
@ -170,7 +170,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h)
}
else
{
p->fillRect(x, y, w, h, tqpalette().disabled().background());
p->fillRect(x, y, w, h, palette().disabled().background());
}
}

2
digikam/project/NEWS.0.9.0
Unescape View File

@ -265,7 +265,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b
127 ==> 131550 : digiKam/showfoto can't show jpeg image under PowerPC.
128 ==> 131549 : Endianess problem under Linux-PowerPC (with png images at least).
129 ==> 132011 : Add search criteria to take sub-tags into account.
130 ==> 131920 : Can't create preview folders with tqunicode characters in the name.
130 ==> 131920 : Can't create preview folders with unicode characters in the name.
131 ==> 132113 : Resize dialog limits image width/height to 4 digits.
132 ==> 132081 : Critical: ShowFoto silently aborts saving image when closed.
133 ==> 118535 : Add Border: use percent to designate border size.

6
digikam/project/NEWS.0.9.1
Unescape View File

@ -5,7 +5,7 @@ NEW FEATURES :
General : New native JPEG2000 image loader using Jasper library witch
can support 16 bits color depth pictures.
General : New optimized tqlayout to show Comments & Tags side bar contents.
General : New optimized layout to show Comments & Tags side bar contents.
General : Tags View from Comments & Tags side bar support drag & drop.
General : New Batch tool to sync all images metadata (EXIF/IPTC) with
digiKam database content.
@ -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.

2
digikam/project/NEWS.0.9.2
Unescape View File

@ -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.

4
digikam/project/NEWS.0.9.4
Unescape View File

@ -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.

14
digikam/showfoto/setup/setupeditor.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqhbox.h>
#include <tqvgroupbox.h>
@ -97,7 +97,7 @@ SetupEditor::SetupEditor(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupEditorPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -176,11 +176,11 @@ SetupEditor::SetupEditor(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addWidget(exposureOptionsGroup);
tqlayout->addWidget(ExifGroupOptions);
tqlayout->addWidget(sortOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addWidget(exposureOptionsGroup);
layout->addWidget(ExifGroupOptions);
layout->addWidget(sortOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

12
digikam/showfoto/setup/setuptooltip.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
@ -93,13 +93,13 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
: TQWidget(parent)
{
d = new SetupToolTipPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), parent);
TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when "
"the mouse hovers over a thumbbar item."));
tqlayout->addWidget(d->showToolTipsBox);
layout->addWidget(d->showToolTipsBox);
// --------------------------------------------------------
@ -120,7 +120,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showImageDimBox = new TQCheckBox(i18n("Show image dimensions"), d->fileSettingBox);
TQWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels."));
tqlayout->addWidget(d->fileSettingBox);
layout->addWidget(d->fileSettingBox);
// --------------------------------------------------------
@ -153,8 +153,8 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings "
"used to take the image."));
tqlayout->addWidget(d->photoSettingBox);
tqlayout->addStretch();
layout->addWidget(d->photoSettingBox);
layout->addStretch();
// --------------------------------------------------------

20
digikam/showfoto/showfoto.cpp
Unescape View File

@ -39,7 +39,7 @@ extern "C"
// TQt includes.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqsplitter.h>
#include <tqdir.h>
#include <tqfileinfo.h>
@ -413,14 +413,14 @@ void ShowFoto::setupUserArea()
TQWidget* widget = new TQWidget(this);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar tqlayout
if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar layout
{
TQHBoxLayout *hlay = new TQHBoxLayout(widget);
m_splitter = new TQSplitter(widget);
d->thumbBar = new Digikam::ThumbBarView(m_splitter, Digikam::ThumbBarView::Vertical);
m_stackView = new Digikam::EditorStackView(m_splitter);
m_canvas = new Digikam::Canvas(m_stackView);
m_canvas->tqsetSizePolicy(rightSzPolicy);
m_canvas->setSizePolicy(rightSzPolicy);
d->rightSidebar = new Digikam::ImagePropertiesSideBar(widget, "ShowFoto Sidebar Right", m_splitter,
Digikam::Sidebar::Right);
@ -428,7 +428,7 @@ void ShowFoto::setupUserArea()
hlay->addWidget(m_splitter);
hlay->addWidget(d->rightSidebar);
}
else //Qt::Horizontal thumbbar tqlayout
else //Qt::Horizontal thumbbar layout
{
m_splitter = new TQSplitter(Qt::Horizontal, widget);
TQWidget* widget2 = new TQWidget(m_splitter);
@ -438,7 +438,7 @@ void ShowFoto::setupUserArea()
m_canvas = new Digikam::Canvas(m_stackView);
d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal);
m_canvas->tqsetSizePolicy(rightSzPolicy);
m_canvas->setSizePolicy(rightSzPolicy);
d->vSplitter->setFrameStyle( TQFrame::NoFrame );
d->vSplitter->setFrameShadow( TQFrame::Plain );
@ -522,7 +522,7 @@ void ShowFoto::readSettings()
if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter)
d->vSplitter->setSizes(config->readIntListEntry("Vertical Splitter Sizes"));
else
m_canvas->tqsetSizePolicy(szPolicy);
m_canvas->setSizePolicy(szPolicy);
Digikam::ThemeEngine::instance()->setCurrentTheme(config->readEntry("Theme", i18n("Default")));
}
@ -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"),

22
digikam/themedesigner/mainwindow.cpp
Unescape View File

@ -32,9 +32,9 @@
#include <tqframe.h>
#include <tqsplitter.h>
#include <tqheader.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqfileinfo.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqdatetime.h>
// KDE includes.
@ -78,11 +78,11 @@ MainWindow::MainWindow()
// Actual views ------------------------------------------------
TQGridLayout* tqlayout = new TQGridLayout(this);
TQGridLayout* layout = new TQGridLayout(this);
TQSplitter* splitter = new TQSplitter(this);
splitter->setOrientation( Qt::Horizontal );
splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_folderView = new FolderView(splitter);
m_iconView = new ThemedIconView(splitter);
@ -113,7 +113,7 @@ MainWindow::MainWindow()
m_borderColorLabel = new TQLabel("Border Color: ", groupBox);
m_borderColorBtn = new KColorButton(groupBox);
vlay->tqsetAlignment(TQt::AlignTop);
vlay->setAlignment(TQt::AlignTop);
vlay->setSpacing(5);
vlay->setMargin(5);
vlay->addWidget(label1);
@ -131,10 +131,10 @@ MainWindow::MainWindow()
vlay->addWidget(m_borderColorBtn);
vlay->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
tqlayout->setMargin(5);
tqlayout->setSpacing(5);
tqlayout->addWidget(splitter, 0, 0);
tqlayout->addWidget(groupBox, 0, 1);
layout->setMargin(5);
layout->setSpacing(5);
layout->addWidget(splitter, 0, 0);
layout->addWidget(groupBox, 0, 1);
// -------------------------------------------------------------
@ -216,7 +216,7 @@ MainWindow::MainWindow()
closeButton->setText( "&Close" );
buttonLayout->addWidget( closeButton );
tqlayout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1);
layout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1);
connect(loadButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotLoad()));
@ -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)

4
digikam/themedesigner/themediconitem.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqpen.h>
#include <tqfontmetrics.h>
#include <tqfont.h>
@ -154,7 +154,7 @@ void ThemedIconItem::paintItem()
p.setFont(view->itemFontXtra());
{
TQDateTime date = TQDateTime::tqcurrentDateTime();
TQDateTime date = TQDateTime::currentDateTime();
r = view->itemDateRect();
p.setFont(view->itemFontXtra());

18
digikam/themedesigner/themediconview.cpp
Unescape View File

@ -39,7 +39,7 @@ public:
int thumbSize;
TQRect tqitemRect;
TQRect itemRect;
TQRect itemDateRect;
TQRect itemPixmapRect;
TQRect itemNameRect;
@ -85,9 +85,9 @@ ThemedIconView::~ThemedIconView()
delete d;
}
TQRect ThemedIconView::tqitemRect() const
TQRect ThemedIconView::itemRect() const
{
return d->tqitemRect;
return d->itemRect;
}
TQRect ThemedIconView::itemDateRect() const
@ -224,7 +224,7 @@ void ThemedIconView::updateBannerRectPixmap()
void ThemedIconView::updateItemRectsPixmap()
{
d->tqitemRect = TQRect(0,0,0,0);
d->itemRect = TQRect(0,0,0,0);
d->itemDateRect = TQRect(0,0,0,0);
d->itemPixmapRect = TQRect(0,0,0,0);
d->itemNameRect = TQRect(0,0,0,0);
@ -292,13 +292,13 @@ void ThemedIconView::updateItemRectsPixmap()
y = d->itemTagRect.bottom();
}
d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin);
d->itemRect = TQRect(0, 0, w+2*margin, y+margin);
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
d->itemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
d->itemRect.height());
}
} // NameSpace Digikam

2
digikam/themedesigner/themediconview.h
Unescape View File

@ -47,7 +47,7 @@ public:
ThemedIconView(TQWidget* parent);
~ThemedIconView();
TQRect tqitemRect() const;
TQRect itemRect() const;
TQRect itemDateRect() const;
TQRect itemPixmapRect() const;
TQRect itemNameRect() const;

2
digikam/utilities/batch/batchalbumssyncmetadata.cpp
Unescape View File

@ -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();

2
digikam/utilities/batch/batchthumbsgenerator.cpp
Unescape View File

@ -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"));
}

8
digikam/utilities/cameragui/albumselectdialog.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqframe.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpopupmenu.h>
#include <tqcursor.h>
#include <tqdatetime.h>
@ -300,14 +300,14 @@ 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;
TQString errMsg;
PAlbum* newAlbum = AlbumManager::instance()->createPAlbum(album, newAlbumName,
TQString(), TQDate::tqcurrentDate(),
TQString(), TQDate::currentDate(),
TQString(), errMsg);
if (!newAlbum)
{
@ -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())
{

12
digikam/utilities/cameragui/animwidget.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqcolor.h>
#include <tqtimer.h>
@ -87,24 +87,24 @@ void AnimWidget::stop()
{
d->pos = 0;
d->timer->stop();
tqrepaint();
repaint();
}
void AnimWidget::paintEvent(TQPaintEvent*)
{
d->pix.fill(tqcolorGroup().background());
d->pix.fill(colorGroup().background());
TQPainter p(&d->pix);
p.translate(d->size/2, d->size/2);
if (d->timer->isActive())
{
p.setPen(TQPen(tqcolorGroup().text()));
p.setPen(TQPen(colorGroup().text()));
p.rotate( d->pos );
}
else
{
p.setPen(TQPen(tqcolorGroup().dark()));
p.setPen(TQPen(colorGroup().dark()));
}
for ( int i=0 ; i<12 ; i++ )
@ -120,7 +120,7 @@ void AnimWidget::paintEvent(TQPaintEvent*)
void AnimWidget::slotTimeout()
{
d->pos = (d->pos + 10) % 360;
tqrepaint();
repaint();
}
bool AnimWidget::running() const

42
digikam/utilities/cameragui/cameracontroller.cpp
Unescape View File

@ -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();

4
digikam/utilities/cameragui/camerafolderdialog.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
// KDE includes.
@ -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");

4
digikam/utilities/cameragui/camerafolderitem.cpp
Unescape View File

@ -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()

22
digikam/utilities/cameragui/cameraiconitem.cpp
Unescape View File

@ -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)
@ -229,8 +229,8 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down
d->pixRect = TQRect(0,0,0,0);
d->textRect = TQRect(0,0,0,0);
d->extraRect = TQRect(0,0,0,0);
TQRect tqitemRect = rect();
tqitemRect.moveTopLeft(TQPoint(0, 0));
TQRect itemRect = rect();
itemRect.moveTopLeft(TQPoint(0, 0));
d->pixRect.setWidth(thumbSize);
d->pixRect.setHeight(thumbSize);
@ -264,19 +264,19 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down
int w = TQMAX(d->textRect.width(), d->pixRect.width() );
int h = d->textRect.height() + d->pixRect.height() ;
tqitemRect.setWidth(w+4);
tqitemRect.setHeight(h+4);
itemRect.setWidth(w+4);
itemRect.setHeight(h+4);
// Center the pix and text rect
d->pixRect = TQRect(2, 2, d->pixRect.width(), d->pixRect.height());
d->textRect = TQRect((tqitemRect.width() - d->textRect.width())/2,
tqitemRect.height() - d->textRect.height(),
d->textRect = TQRect((itemRect.width() - d->textRect.width())/2,
itemRect.height() - d->textRect.height(),
d->textRect.width(), d->textRect.height());
if (!d->extraRect.isEmpty())
{
d->extraRect = TQRect((tqitemRect.width() - d->extraRect.width())/2,
tqitemRect.height() - d->extraRect.height(),
d->extraRect = TQRect((itemRect.width() - d->extraRect.width())/2,
itemRect.height() - d->extraRect.height(),
d->extraRect.width(), d->extraRect.height());
}
}

22
digikam/utilities/cameragui/cameraiconview.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqfontmetrics.h>
#include <tqfont.h>
#include <tqdragobject.h>
#include <tqclipboard.h>
#include <clipboard.h>
// KDE includes.
@ -81,7 +81,7 @@ public:
TQDict<CameraIconViewItem> itemDict;
TQRect tqitemRect;
TQRect itemRect;
TQPixmap itemRegPixmap;
TQPixmap itemSelPixmap;
@ -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)
@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
if (d->cameraUI->isBusy())
return;
TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard);
TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
if(!data || !TQUriDrag::canDecode(data))
return;
@ -770,9 +770,9 @@ void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs)
}
}
TQRect CameraIconView::tqitemRect() const
TQRect CameraIconView::itemRect() const
{
return d->tqitemRect;
return d->itemRect;
}
void CameraIconView::setThumbnailSize(const ThumbnailSize& thumbSize)
@ -825,13 +825,13 @@ void CameraIconView::updateItemRectsPixmap()
r.setWidth(TQMAX(TQMAX(pixRect.width(), textRect.width()), extraRect.width()) + 4);
r.setHeight(pixRect.height() + textRect.height() + extraRect.height() + 4);
d->tqitemRect = r;
d->itemRect = r;
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
d->itemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(),
d->tqitemRect.height());
d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
d->itemRect.height());
}
void CameraIconView::slotThemeChanged()

2
digikam/utilities/cameragui/cameraiconview.h
Unescape View File

@ -84,7 +84,7 @@ public:
TQPixmap newPicturePixmap() const;
TQPixmap unknowPicturePixmap() const;
virtual TQRect tqitemRect() const;
virtual TQRect itemRect() const;
TQString defaultDownloadName(CameraIconViewItem *item);

16
digikam/utilities/cameragui/camerainfodialog.cpp
Unescape View File

@ -24,9 +24,9 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqtextedit.h>
#include <textedit.h>
// KDE includes.
@ -50,32 +50,32 @@ CameraInfoDialog::CameraInfoDialog(TQWidget *parent, const TQString& summary, co
// ----------------------------------------------------------
TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) );
TQVBoxLayout *p1tqlayout = new TQVBoxLayout( p1, 0, 6 );
TQVBoxLayout *p1layout = new TQVBoxLayout( p1, 0, 6 );
TQTextEdit *summaryView = new TQTextEdit(summary, TQString(), p1);
summaryView->setWordWrap(TQTextEdit::WidgetWidth);
summaryView->setReadOnly(true);
p1tqlayout->addWidget(summaryView);
p1layout->addWidget(summaryView);
// ----------------------------------------------------------
TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) );
TQVBoxLayout *p2tqlayout = new TQVBoxLayout( p2, 0, 6 );
TQVBoxLayout *p2layout = new TQVBoxLayout( p2, 0, 6 );
TQTextEdit *manualView = new TQTextEdit(manual, TQString(), p2);
manualView->setWordWrap(TQTextEdit::WidgetWidth);
manualView->setReadOnly(true);
p2tqlayout->addWidget(manualView);
p2layout->addWidget(manualView);
// ----------------------------------------------------------
TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) );
TQVBoxLayout *p3tqlayout = new TQVBoxLayout( p3, 0, 6 );
TQVBoxLayout *p3layout = new TQVBoxLayout( p3, 0, 6 );
TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3);
aboutView->setWordWrap(TQTextEdit::WidgetWidth);
aboutView->setReadOnly(true);
p3tqlayout->addWidget(aboutView);
p3layout->addWidget(aboutView);
}
CameraInfoDialog::~CameraInfoDialog()

38
digikam/utilities/cameragui/cameraui.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqvgroupbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
#include <tqiconview.h>
@ -249,7 +249,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->view = new CameraIconView(this, d->splitter);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
d->view->tqsetSizePolicy(rightSzPolicy);
d->view->setSizePolicy(rightSzPolicy);
d->rightSidebar = new ImagePropertiesSideBarCamGui(widget, "CameraGui Sidebar Right", d->splitter,
Sidebar::Right, true);
@ -354,7 +354,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
// -------------------------------------------------------------------------
d->cancelBtn = new TQToolButton(plainPage());
d->cancelBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelBtn->setPixmap( SmallIcon( "cancel" ) );
d->cancelBtn->setEnabled(false);
@ -364,13 +364,13 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->progress->hide();
TQWidget *frame = new TQWidget(plainPage());
TQHBoxLayout* tqlayout = new TQHBoxLayout(frame);
frame->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQHBoxLayout* layout = new TQHBoxLayout(frame);
frame->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), TQString(), frame );
pixmapLogo->setMargin(0);
pixmapLogo->setScaledContents( false );
pixmapLogo->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
@ -379,10 +379,10 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
d->anim = new AnimWidget(frame, pixmapLogo->height()-2);
tqlayout->setMargin(0);
tqlayout->setSpacing(0);
tqlayout->addWidget( pixmapLogo );
tqlayout->addWidget( d->anim );
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget( pixmapLogo );
layout->addWidget( d->anim );
d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100);
@ -739,7 +739,7 @@ void CameraUI::finishDialog()
{
CameraList* clist = CameraList::instance();
if (clist)
clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::tqcurrentDateTime());
clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::currentDateTime());
}
// When a directory is created, a watch is put on it to spot new files
@ -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;
}

14
digikam/utilities/cameragui/freespacewidget.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <tqtooltip.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqpalette.h>
#include <palette.h>
#include <tqcolor.h>
#include <tqtimer.h>
#include <tqfont.h>
@ -109,7 +109,7 @@ void FreeSpaceWidget::setEstimatedDSizeKb(unsigned long dSize)
{
d->dSizeKb = dSize;
updatePixmap();
tqrepaint();
repaint();
}
unsigned long FreeSpaceWidget::estimatedDSizeKb()
@ -151,10 +151,10 @@ void FreeSpaceWidget::updatePixmap()
{
TQPixmap fimgPix = SmallIcon("folder_image");
d->pix = TQPixmap(size());
d->pix.fill(tqcolorGroup().background());
d->pix.fill(colorGroup().background());
TQPainter p(&d->pix);
p.setPen(tqcolorGroup().mid());
p.setPen(colorGroup().mid());
p.drawRect(0, 0, d->pix.width(), d->pix.height());
p.drawPixmap(2, d->pix.height()/2-fimgPix.height()/2,
fimgPix, 0, 0, fimgPix.width(), fimgPix.height());
@ -173,8 +173,8 @@ 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);
p.setPen(tqcolorGroup().text());
TQString text = TQString("%1%").arg(peUsed);
p.setPen(colorGroup().text());
TQFontMetrics fontMt = p.fontMetrics();
TQRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(),
tRect.width(), tRect.height(), 0, text);
@ -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

60
digikam/utilities/cameragui/gpcamera.cpp
Unescape View File

@ -80,19 +80,19 @@ public:
CameraAbilities cameraAbilities;
};
class GPtqStatus
class GPStatus
{
public:
GPtqStatus()
GPStatus()
{
context = gp_context_new();
cancel = false;
gp_context_set_cancel_func(context, cancel_func, 0);
}
~GPtqStatus()
~GPStatus()
{
gp_context_unref(context);
cancel = false;
@ -108,7 +108,7 @@ public:
}
};
bool GPtqStatus::cancel = false;
bool GPStatus::cancel = false;
GPCamera::GPCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path)
: DKCamera(title, model, port, path)
@ -202,7 +202,7 @@ bool GPCamera::doConnect()
m_status = 0;
}
m_status = new GPtqStatus();
m_status = new GPStatus();
gp_abilities_list_new(&abilList);
gp_abilities_list_load(abilList, m_status->context);
@ -271,7 +271,7 @@ bool GPCamera::doConnect()
// -- Now try to initialize the camera -----------------
m_status = new GPtqStatus();
m_status = new GPStatus();
// Try and initialize the camera to see if its connected
errorCode = gp_camera_init(d->camera, m_status->context);
@ -331,7 +331,7 @@ bool GPCamera::getSubFolders(const TQString& folder, TQStringList& subFolderList
delete m_status;
m_status = 0;
}
m_status = new GPtqStatus();
m_status = new GPStatus();
errorCode = gp_camera_folder_list_folders(d->camera, TQFile::encodeName(folder), clist, m_status->context);
if (errorCode != GP_OK)
@ -378,7 +378,7 @@ bool GPCamera::getItemsList(const TQString& folder, TQStringList& itemsList)
delete m_status;
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
gp_list_new(&clist);
@ -429,7 +429,7 @@ bool GPCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& items, b
delete m_status;
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
gp_list_new(&clist);
@ -538,7 +538,7 @@ bool GPCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQ
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@ -588,7 +588,7 @@ bool GPCamera::getExif(const TQString& folder, const TQString& itemName,
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@ -638,7 +638,7 @@ bool GPCamera::downloadItem(const TQString& folder, const TQString& itemName,
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@ -679,7 +679,7 @@ bool GPCamera::setLockItem(const TQString& folder, const TQString& itemName, boo
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
CameraFileInfo info;
errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder),
@ -737,7 +737,7 @@ bool GPCamera::deleteItem(const TQString& folder, const TQString& itemName)
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_file_delete(d->camera, TQFile::encodeName(folder),
TQFile::encodeName(itemName),
@ -786,7 +786,7 @@ bool GPCamera::deleteAllItems(const TQString& folder)
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_folder_delete_all(d->camera, TQFile::encodeName(folder),
m_status->context);
@ -843,7 +843,7 @@ bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, cons
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_folder_put_file(d->camera,
TQFile::encodeName(folder),
@ -941,7 +941,7 @@ bool GPCamera::cameraSummary(TQString& summary)
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_get_summary(d->camera, &sum, m_status->context);
if (errorCode != GP_OK)
@ -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));
@ -990,7 +990,7 @@ bool GPCamera::cameraManual(TQString& manual)
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_get_manual(d->camera, &man, m_status->context);
if (errorCode != GP_OK)
@ -1020,7 +1020,7 @@ bool GPCamera::cameraAbout(TQString& about)
m_status = 0;
}
m_status = new GPtqStatus;
m_status = new GPStatus;
errorCode = gp_camera_get_about(d->camera, &abt, m_status->context);
if (errorCode != GP_OK)
@ -1193,8 +1193,8 @@ int GPCamera::autoDetect(TQString& model, TQString& port)
if (camModel_ && camPort_)
{
model = TQString::tqfromLatin1(camModel_);
port = TQString::tqfromLatin1(camPort_);
model = TQString::fromLatin1(camModel_);
port = TQString::fromLatin1(camPort_);
gp_list_free(camList);
return 0;
}

4
digikam/utilities/cameragui/gpcamera.h
Unescape View File

@ -35,7 +35,7 @@ namespace Digikam
{
class GPCameraPrivate;
class GPtqStatus;
class GPStatus;
// Gphoto2 camera Implementation of abstract type DKCamera
@ -99,7 +99,7 @@ private:
private:
GPCameraPrivate *d;
GPtqStatus *m_status;
GPStatus *m_status;
};
} // namespace Digikam

4
digikam/utilities/cameragui/gpiteminfo.h
Unescape View File

@ -44,7 +44,7 @@ class GPItemInfo
public:
enum DownloadtqStatus
enum DownloadStatus
{
DownloadUnknow = -1,
DownloadedNo = 0,
@ -59,7 +59,7 @@ public:
long size;
int width;
int height;
int downloaded; // See DownloadtqStatus enum.
int downloaded; // See DownloadStatus enum.
int readPermissions;
int writePermissions;

20
digikam/utilities/cameragui/renamecustomizer.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes.
#include <tqdatetime.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
@ -136,7 +136,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
setFrameStyle( TQFrame::NoFrame );
setRadioButtonExclusive(true);
setColumnLayout(0, Qt::Vertical);
TQGridLayout* mainLayout = new TQGridLayout(tqlayout(), 4, 1);
TQGridLayout* mainLayout = new TQGridLayout(layout(), 4, 1);
// ----------------------------------------------------------------
@ -151,17 +151,17 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameDefaultBox->setColumnLayout(0, Qt::Vertical);
d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox );
d->renameDefaultCase->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
d->renameDefaultCase->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
d->renameDefaultCaseType = new TQComboBox( d->renameDefaultBox );
d->renameDefaultCaseType->insertItem(i18n("Leave as Is"), 0);
d->renameDefaultCaseType->insertItem(i18n("Upper"), 1);
d->renameDefaultCaseType->insertItem(i18n("Lower"), 2);
d->renameDefaultCaseType->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
d->renameDefaultCaseType->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred);
TQWhatsThis::add( d->renameDefaultCaseType, i18n("<p>Set the method to use to change the case "
"of image filenames."));
TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->tqlayout() );
TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->layout() );
boxLayout1->addSpacing( 10 );
boxLayout1->addWidget( d->renameDefaultCase );
boxLayout1->addWidget( d->renameDefaultCaseType );
@ -180,7 +180,7 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
d->renameCustomBox->setInsideMargin(0);
d->renameCustomBox->setColumnLayout(0, Qt::Vertical);
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->tqlayout(),
TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->layout(),
6, 2, KDialogBase::spacingHint());
renameCustomBoxLayout->setColSpacing( 0, 10 );
@ -222,9 +222,9 @@ RenameCustomizer::RenameCustomizer(TQWidget* parent, const TQString& cameraTitle
"<p><b>Local Settings</b>: the date format depending on KDE control panel settings.</p>"
"<p><b>Advanced:</b> allows the user to specify a custom date format.</p>"));
d->dateTimeButton = new TQPushButton(SmallIcon("configure"), TQString(), dateTimeWidget);
TQSizePolicy policy = d->dateTimeButton->tqsizePolicy();
TQSizePolicy policy = d->dateTimeButton->sizePolicy();
policy.setHorData(TQSizePolicy::Maximum);
d->dateTimeButton->tqsetSizePolicy(policy);
d->dateTimeButton->setSizePolicy(policy);
TQHBoxLayout *boxLayout2 = new TQHBoxLayout(dateTimeWidget);
boxLayout2->addWidget(d->dateTimeLabel);
boxLayout2->addWidget(d->dateTimeFormat);
@ -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;
@ -389,7 +389,7 @@ void RenameCustomizer::slotRadioButtonClicked(int)
void RenameCustomizer::slotRenameOptionsChanged()
{
d->focusedWidget = tqfocusWidget();
d->focusedWidget = focusWidget();
if (d->addSeqNumberBox->isChecked())
{

8
digikam/utilities/cameragui/umscamera.cpp
Unescape View File

@ -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;
}

14
digikam/utilities/imageeditor/canvas/canvas.cpp
Unescape View File

@ -46,7 +46,7 @@
#include <tqcache.h>
#include <tqcolor.h>
#include <tqdragobject.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include <tqtoolbutton.h>
// KDE includes.
@ -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)
@ -639,8 +639,8 @@ void Canvas::drawRubber()
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
TQRect(pnt.x(), pnt.y(), r.width(), r.height()),
tqcolorGroup(), TQStyle::Style_Default,
TQStyleOption(tqcolorGroup().base()));
colorGroup(), TQStyle::Style_Default,
TQStyleOption(colorGroup().base()));
p.end();
}
@ -690,7 +690,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e)
d->pressedMoving = true;
d->tileCache.clear();
viewport()->tqrepaint(false);
viewport()->repaint(false);
return;
}
@ -1265,7 +1265,7 @@ void Canvas::slotCopy()
delete [] data;
TQImage selImg = selDImg.copyTQImage();
TQApplication::tqclipboard()->setData(new TQImageDrag(selImg), TQClipboard::Clipboard);
TQApplication::clipboard()->setData(new TQImageDrag(selImg), TQClipboard::Clipboard);
TQApplication::restoreOverrideCursor ();
}

6
digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqstring.h>
#include <tqfileinfo.h>
@ -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);

4
digikam/utilities/imageeditor/canvas/dimginterface.cpp
Unescape View File

@ -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);

16
digikam/utilities/imageeditor/canvas/undocache.cpp
Unescape View File

@ -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;

8
digikam/utilities/imageeditor/editor/editortoolsettings.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqhbox.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqstring.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -247,15 +247,15 @@ EditorToolSettings::~EditorToolSettings()
delete d;
}
TQSize EditorToolSettings::tqminimumSizeHint() const
TQSize EditorToolSettings::minimumSizeHint() const
{
// Editor Tools usually require a larger horizontal space than other widgets in right side bar
// Set scroll area to a horizontal minimum size sufficient for the settings.
// Do not touch vertical size hint.
// Limit to 40% of the desktop width.
TQSize hint = TQScrollView::tqminimumSizeHint();
TQSize hint = TQScrollView::minimumSizeHint();
TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox);
hint.setWidth(TQMIN(d->mainVBox->tqminimumSizeHint().width(), desktopRect.width() * 2 / 5));
hint.setWidth(TQMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5));
return hint;
}

2
digikam/utilities/imageeditor/editor/editortoolsettings.h
Unescape View File

@ -88,7 +88,7 @@ public:
KPushButton* button(int buttonCode) const;
void enableButton(int buttonCode, bool state);
virtual TQSize tqminimumSizeHint() const;
virtual TQSize minimumSizeHint() const;
signals:

48
digikam/utilities/imageeditor/editor/editorwindow.cpp
Unescape View File

@ -37,7 +37,7 @@ extern "C"
#include <tqlabel.h>
#include <tqdockarea.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqtoolbutton.h>
#include <tqsplitter.h>
@ -563,18 +563,18 @@ void EditorWindow::setupStandardAccelerators()
void EditorWindow::setupStatusBar()
{
m_nameLabel = new StatusProgressBar(statusBar());
m_nameLabel->tqsetAlignment(TQt::AlignCenter);
m_nameLabel->setAlignment(TQt::AlignCenter);
m_nameLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(m_nameLabel, 100);
d->selectLabel = new TQLabel(i18n("No selection"), statusBar());
d->selectLabel->tqsetAlignment(TQt::AlignCenter);
d->selectLabel->setAlignment(TQt::AlignCenter);
d->selectLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(d->selectLabel, 100);
TQToolTip::add(d->selectLabel, i18n("Information about current selection area"));
m_resLabel = new TQLabel(statusBar());
m_resLabel->tqsetAlignment(TQt::AlignCenter);
m_resLabel->setAlignment(TQt::AlignCenter);
m_resLabel->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(m_resLabel, 100);
TQToolTip::add(m_resLabel, i18n("Information about image size"));
@ -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()));
}
}
}
@ -940,7 +940,7 @@ void EditorWindow::applyStandardSettings()
if(config->hasKey("Splitter Sizes"))
m_splitter->setSizes(config->readIntListEntry("Splitter Sizes"));
else
m_canvas->tqsetSizePolicy(rightSzPolicy);
m_canvas->setSizePolicy(rightSzPolicy);
d->fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false);
@ -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)

2
digikam/utilities/imageeditor/editor/imageiface.cpp
Unescape View File

@ -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();

18
digikam/utilities/imageeditor/editor/imagewindow.cpp
Unescape View File

@ -285,7 +285,7 @@ void ImageWindow::setupUserArea()
m_canvas->makeDefaultEditingCanvas();
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
m_canvas->tqsetSizePolicy(rightSzPolicy);
m_canvas->setSizePolicy(rightSzPolicy);
d->rightSidebar = new ImagePropertiesSideBarDB(widget, "ImageEditor Right Sidebar", m_splitter,
Sidebar::Right, true);
@ -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,12 +1205,12 @@ 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))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;
@ -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

2
digikam/utilities/imageeditor/rawimport/rawimport.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqstring.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>

4
digikam/utilities/imageeditor/rawimport/rawpreview.cpp
Unescape View File

@ -93,7 +93,7 @@ RawPreview::RawPreview(const KURL& url, TQWidget *parent)
d->url = url;
setMinimumWidth(500);
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->cornerButton = new TQToolButton(this);
d->cornerButton->setIconSet(SmallIcon("move"));
@ -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()));

16
digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqstring.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqhbuttongroup.h>
@ -171,7 +171,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
TQGridLayout* gridSettings = new TQGridLayout(plainPage(), 5, 4);
TQLabel *label1 = new TQLabel(i18n("Channel:"), plainPage());
label1->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
label1->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
d->channelCB = new TQComboBox(false, plainPage());
d->channelCB->insertItem( i18n("Luminosity") );
d->channelCB->insertItem( i18n("Red") );
@ -211,7 +211,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
logHistoButton->setToggleButton(true);
TQLabel *label10 = new TQLabel(i18n("Colors:"), plainPage());
label10->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
label10->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
d->colorsCB = new TQComboBox(false, plainPage());
d->colorsCB->insertItem( i18n("Red") );
d->colorsCB->insertItem( i18n("Green") );
@ -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

100
digikam/utilities/imageeditor/tools/imageprint.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqobject.h>
#include <tqpixmap.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
#include <tqstring.h>
@ -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.
@ -369,18 +369,18 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
readSettings();
TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
tqlayout->setMargin( KDialog::marginHint() );
tqlayout->setSpacing( KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this );
layout->setMargin( KDialog::marginHint() );
layout->setSpacing( KDialog::spacingHint() );
// ------------------------------------------------------------------------
TQHBoxLayout *tqlayout2 = new TQHBoxLayout( tqlayout );
tqlayout2->setSpacing(3);
TQHBoxLayout *layout2 = new TQHBoxLayout( layout );
layout2->setSpacing(3);
TQLabel* textLabel = new TQLabel( this, "Image position:" );
textLabel->setText( i18n( "Image position:" ) );
tqlayout2->addWidget( textLabel );
layout2->addWidget( textLabel );
d->position = new KComboBox( false, this, "Print position" );
d->position->clear();
d->position->insertItem( i18n( "Top-Left" ) );
@ -392,21 +392,21 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
d->position->insertItem( i18n( "Bottom-Left" ) );
d->position->insertItem( i18n( "Bottom-Central" ) );
d->position->insertItem( i18n( "Bottom-Right" ) );
tqlayout2->addWidget( d->position );
layout2->addWidget( d->position );
TQSpacerItem *spacer1 = new TQSpacerItem( 101, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout2->addItem( spacer1 );
layout2->addItem( spacer1 );
d->addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
d->addFileName->setChecked( false );
tqlayout->addWidget( d->addFileName );
layout->addWidget( d->addFileName );
d->blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
d->blackwhite->setChecked( false );
tqlayout->addWidget (d->blackwhite );
layout->addWidget (d->blackwhite );
d->autoRotate = new TQCheckBox( i18n("&Auto-rotate page"), this );
d->autoRotate->setChecked( false );
tqlayout->addWidget( d->autoRotate );
layout->addWidget( d->autoRotate );
// ------------------------------------------------------------------------
@ -421,13 +421,13 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *pa
cmbox->setStretchFactor(space, 10);
cmbox->setSpacing(KDialog::spacingHint());
tqlayout->addWidget(cmbox);
layout->addWidget(cmbox);
// ------------------------------------------------------------------------
TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
group->setRadioButtonExclusive( true );
tqlayout->addWidget( group );
layout->addWidget( group );
d->scaleToFit = new TQRadioButton( i18n("Scale image to &fit"), group );
d->scaleToFit->setChecked( true );
@ -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 )

6
digikam/utilities/imageeditor/tools/imageresize.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqframe.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
@ -40,7 +40,7 @@
#include <tqtimer.h>
#include <tqevent.h>
#include <tqpixmap.h>
#include <tqbrush.h>
#include <brush.h>
#include <tqfile.h>
#include <tqimage.h>
@ -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;
}

2
digikam/utilities/lighttable/lighttablebar.cpp
Unescape View File

@ -732,7 +732,7 @@ void LightTableBar::contentsDropEvent(TQDropEvent *e)
}
else if(TagDrag::canDecode(e))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;

6
digikam/utilities/lighttable/lighttablepreview.cpp
Unescape View File

@ -137,7 +137,7 @@ LightTablePreview::LightTablePreview(TQWidget *parent)
setAcceptDrops(true);
slotThemeChanged();
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->cornerButton = new TQToolButton(this);
d->cornerButton->setIconSet(SmallIcon("move"));
@ -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()));
@ -725,7 +725,7 @@ void LightTablePreview::contentsDropEvent(TQDropEvent *e)
}
else if(TagDrag::canDecode(e))
{
TQByteArray ba = e->tqencodedData("digikam/tag-id");
TQByteArray ba = e->encodedData("digikam/tag-id");
TQDataStream ds(ba, IO_ReadOnly);
int tagID;
ds >> tagID;

2
digikam/utilities/lighttable/lighttableview.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

8
digikam/utilities/lighttable/lighttablewindow.cpp
Unescape View File

@ -224,7 +224,7 @@ void LightTableWindow::setupStatusBar()
d->leftZoomBar->setEnabled(false);
d->statusProgressBar = new StatusProgressBar(statusBar());
d->statusProgressBar->tqsetAlignment(TQt::AlignCenter);
d->statusProgressBar->setAlignment(TQt::AlignCenter);
d->statusProgressBar->setMaximumHeight(fontMetrics().height()+2);
statusBar()->addWidget(d->statusProgressBar, 100);
@ -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);

8
digikam/utilities/setup/cameraselection.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqradiobutton.h>
#include <tqlistview.h>
#include <tqvbuttongroup.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
// KDE includes.
@ -176,7 +176,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() );
box2->setFrameStyle( TQFrame::NoFrame );
TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 1, 5 );
TQGridLayout* box2Layout = new TQGridLayout( box2->layout(), 1, 5 );
TQLabel* logo = new TQLabel( box2 );
@ -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>"

14
digikam/utilities/setup/setupcamera.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqgroupbox.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqdatetime.h>
@ -121,7 +121,7 @@ SetupCamera::SetupCamera( TQWidget* parent )
gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) );
TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website"));
groupBoxLayout->tqsetAlignment( TQt::AlignTop );
groupBoxLayout->setAlignment( TQt::AlignTop );
groupBoxLayout->addMultiCellWidget( d->listView, 0, 5, 0, 0 );
groupBoxLayout->addWidget( d->addButton, 0, 1 );
groupBoxLayout->addWidget( d->removeButton, 1, 1 );
@ -254,14 +254,14 @@ 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::tqcurrentDateTime().toString(Qt::ISODate));
TQDateTime::currentDateTime().toString(Qt::ISODate));
}
}
@ -269,7 +269,7 @@ void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model,
const TQString& port, const TQString& path)
{
new TQListViewItem(d->listView, title, model, port, path,
TQDateTime::tqcurrentDateTime().toString(Qt::ISODate));
TQDateTime::currentDateTime().toString(Qt::ISODate));
}
void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model,
@ -297,7 +297,7 @@ void SetupCamera::applySettings()
for ( ; it.current(); ++it )
{
TQListViewItem *item = it.current();
TQDateTime lastAccess = TQDateTime::tqcurrentDateTime();
TQDateTime lastAccess = TQDateTime::currentDateTime();
if (!item->text(4).isEmpty())
lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate);

4
digikam/utilities/setup/setupcollections.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
#include <tqhgroupbox.h>
@ -106,7 +106,7 @@ SetupCollections::SetupCollections(TQWidget* parent )
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
collectionGroupLayout->tqsetAlignment( TQt::AlignTop );
collectionGroupLayout->setAlignment( TQt::AlignTop );
collectionGroupLayout->addMultiCellWidget( d->albumCollectionBox, 0, 4, 0, 0 );
collectionGroupLayout->addWidget( d->addCollectionButton, 0, 1);
collectionGroupLayout->addWidget( d->delCollectionButton, 1, 1);

8
digikam/utilities/setup/setupdcraw.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqcolor.h>
#include <tqhbox.h>
@ -74,13 +74,13 @@ SetupDcraw::SetupDcraw(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupDcrawPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
d->dcrawSettings = new DcrawSettingsWidget(parent, DcrawSettingsWidget::SIXTEENBITS);
d->dcrawSettings->setItemIconSet(0, SmallIconSet("kdcraw"));
d->dcrawSettings->setItemIconSet(1, SmallIconSet("whitebalance"));
d->dcrawSettings->setItemIconSet(2, SmallIconSet("lensdistortion"));
tqlayout->addWidget(d->dcrawSettings);
tqlayout->addStretch();
layout->addWidget(d->dcrawSettings);
layout->addStretch();
connect(d->dcrawSettings, TQT_SIGNAL(signalSixteenBitsImageToggled(bool)),
this, TQT_SLOT(slotSixteenBitsImageToggled(bool)));

10
digikam/utilities/setup/setupeditor.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqhbox.h>
#include <tqvgroupbox.h>
@ -77,7 +77,7 @@ SetupEditor::SetupEditor(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupEditorPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -124,9 +124,9 @@ SetupEditor::SetupEditor(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addWidget(exposureOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addWidget(exposureOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

16
digikam/utilities/setup/setupgeneral.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcombobox.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
@ -105,7 +105,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
{
d = new SetupGeneralPriv;
d->mainDialog = dialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -125,7 +125,7 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
connect(d->albumPathEdit, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(slotPathEdited(const TQString&)) );
tqlayout->addWidget(albumPathBox);
layout->addWidget(albumPathBox);
// --------------------------------------------------------
@ -161,14 +161,14 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
TQWhatsThis::add( d->iconShowResolutionBox, i18n("<p>Set this option to show the image size in pixels "
"below the image thumbnail."));
tqlayout->addWidget(iconTextGroup);
layout->addWidget(iconTextGroup);
// --------------------------------------------------------
TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), parent);
interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical );
interfaceOptionsGroup->tqlayout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->tqlayout(), 3, 4, KDialog::spacingHint());
interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint());
TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint());
d->iconTreeThumbLabel = new TQLabel(i18n("Sidebar thumbnail size:"), interfaceOptionsGroup);
d->iconTreeThumbSize = new TQComboBox(false, interfaceOptionsGroup);
@ -202,11 +202,11 @@ SetupGeneral::SetupGeneral(TQWidget* parent, KDialogBase* dialog )
"to load images, use it only if you have a fast computer."));
ifaceSettingsLayout->addMultiCellWidget(d->previewLoadFullImageSize, 3, 3, 0, 4);
tqlayout->addWidget(interfaceOptionsGroup);
layout->addWidget(interfaceOptionsGroup);
// --------------------------------------------------------
tqlayout->addStretch();
layout->addStretch();
readSettings();
adjustSize();

18
digikam/utilities/setup/setupicc.cpp
Unescape View File

@ -26,7 +26,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
#include <tqhgroupbox.h>
@ -150,12 +150,12 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
{
d = new SetupICCPriv();
d->mainDialog = dialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint());
// --------------------------------------------------------
TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent);
TQGridLayout* grid = new TQGridLayout( colorPolicy->tqlayout(), 1, 2, KDialog::spacingHint());
TQGridLayout* grid = new TQGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint());
d->enableColorManagement = new TQCheckBox(colorPolicy);
d->enableColorManagement->setText(i18n("Enable Color Management"));
@ -193,7 +193,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
grid->addMultiCellWidget(d->behaviourGB, 1, 1, 0, 2);
grid->setColStretch(1, 10);
tqlayout->addWidget(colorPolicy);
layout->addWidget(colorPolicy);
// --------------------------------------------------------
@ -206,12 +206,12 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
TQWhatsThis::add( d->defaultPathKU, i18n("<p>Default path to the color profiles folder. "
"You must store all your color profiles in this directory.</p>"));
tqlayout->addWidget(d->defaultPathGB);
layout->addWidget(d->defaultPathGB);
// --------------------------------------------------------
d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent);
TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->tqlayout(), 4, 3, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint());
grid2->setColStretch(2, 10);
d->managedView = new TQCheckBox(d->profilesGB);
@ -289,7 +289,7 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
grid2->addMultiCellWidget(d->proofProfilesKC, 4, 4, 2, 2);
grid2->addMultiCellWidget(d->infoProofProfiles, 4, 4, 3, 3);
tqlayout->addWidget(d->profilesGB);
layout->addWidget(d->profilesGB);
// --------------------------------------------------------
@ -334,8 +334,8 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
"<p>This intent is most suitable for business graphics such as charts, where it is more important that the "
"colors be vivid and contrast well with each other rather than a specific color.</p></li></ul>"));
tqlayout->addWidget(d->advancedSettingsGB);
tqlayout->addStretch();
layout->addWidget(d->advancedSettingsGB);
layout->addStretch();
// --------------------------------------------------------

16
digikam/utilities/setup/setupidentity.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqhgroupbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@ -70,7 +70,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupIdentityPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -79,7 +79,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this));
TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent);
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid = new TQGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint());
TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup);
d->authorEdit = new KLineEdit(photographerIdGroup);
@ -109,7 +109,7 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// --------------------------------------------------------
TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent);
TQGridLayout* grid2 = new TQGridLayout( creditsGroup->tqlayout(), 2, 1, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint());
TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup);
d->creditEdit = new KLineEdit(creditsGroup);
@ -175,10 +175,10 @@ SetupIdentity::SetupIdentity(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(photographerIdGroup);
tqlayout->addWidget(creditsGroup);
tqlayout->addWidget(note);
tqlayout->addStretch();
layout->addWidget(photographerIdGroup);
layout->addWidget(creditsGroup);
layout->addWidget(note);
layout->addStretch();
readSettings();
}

2
digikam/utilities/setup/setupiofiles.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
// KDE includes.

8
digikam/utilities/setup/setuplighttable.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqcolor.h>
#include <tqhbox.h>
#include <tqvgroupbox.h>
@ -67,7 +67,7 @@ SetupLightTable::SetupLightTable(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupLightTablePriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
// --------------------------------------------------------
@ -93,8 +93,8 @@ SetupLightTable::SetupLightTable(TQWidget* parent )
// --------------------------------------------------------
tqlayout->addWidget(interfaceOptionsGroup);
tqlayout->addStretch();
layout->addWidget(interfaceOptionsGroup);
layout->addStretch();
// --------------------------------------------------------

2
digikam/utilities/setup/setupmetadata.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
#include <tqhgroupbox.h>

22
digikam/utilities/setup/setupmime.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqhbox.h>
#include <tqhgroupbox.h>
#include <tqgroupbox.h>
@ -80,12 +80,12 @@ SetupMime::SetupMime(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupMimePriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
// --------------------------------------------------------
TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent);
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox);
logoLabel1->setPixmap(DesktopIcon("image"));
@ -111,12 +111,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid1->addMultiCellWidget(hbox1, 1, 1, 1, 1);
grid1->setColStretch(1, 10);
tqlayout->addWidget(imageFileFilterBox);
layout->addWidget(imageFileFilterBox);
// --------------------------------------------------------
TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent);
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox);
logoLabel2->setPixmap(DesktopIcon("video"));
@ -142,12 +142,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid2->addMultiCellWidget(hbox2, 1, 1, 1, 1);
grid2->setColStretch(1, 10);
tqlayout->addWidget(movieFileFilterBox);
layout->addWidget(movieFileFilterBox);
// --------------------------------------------------------
TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent);
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox);
logoLabel3->setPixmap(DesktopIcon("sound"));
@ -173,12 +173,12 @@ SetupMime::SetupMime(TQWidget* parent )
grid3->addMultiCellWidget(hbox3, 1, 1, 1, 1);
grid3->setColStretch(1, 10);
tqlayout->addWidget(audioFileFilterBox);
layout->addWidget(audioFileFilterBox);
// --------------------------------------------------------
TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent);
TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint());
TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox);
logoLabel4->setPixmap(DesktopIcon("kdcraw"));
@ -203,8 +203,8 @@ SetupMime::SetupMime(TQWidget* parent )
grid4->addMultiCellWidget(hbox4, 1, 1, 1, 1);
grid4->setColStretch(1, 10);
tqlayout->addWidget(rawFileFilterBox);
tqlayout->addStretch();
layout->addWidget(rawFileFilterBox);
layout->addStretch();
// --------------------------------------------------------

14
digikam/utilities/setup/setupmisc.cpp
Unescape View File

@ -24,7 +24,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqcheckbox.h>
@ -65,31 +65,31 @@ SetupMisc::SetupMisc(TQWidget* parent)
d = new SetupMiscPriv;
TQVBoxLayout *mainLayout = new TQVBoxLayout(parent);
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
// --------------------------------------------------------
d->showTrashDeleteDialogCheck = new TQCheckBox(i18n("Show confirmation dialog when moving items to the &trash"), this);
tqlayout->addWidget(d->showTrashDeleteDialogCheck);
layout->addWidget(d->showTrashDeleteDialogCheck);
// --------------------------------------------------------
d->sidebarApplyDirectlyCheck = new TQCheckBox(i18n("Apply changes in the &right sidebar without confirmation"), this);
tqlayout->addWidget(d->sidebarApplyDirectlyCheck);
layout->addWidget(d->sidebarApplyDirectlyCheck);
// --------------------------------------------------------
d->showSplashCheck = new TQCheckBox(i18n("&Show splash screen at startup"), this);
tqlayout->addWidget(d->showSplashCheck);
layout->addWidget(d->showSplashCheck);
// --------------------------------------------------------
d->scanAtStart = new TQCheckBox(i18n("&Scan for new items on startup (slows down startup)"), this);
tqlayout->addWidget(d->scanAtStart);
layout->addWidget(d->scanAtStart);
// --------------------------------------------------------
tqlayout->addStretch();
layout->addStretch();
readSettings();
adjustSize();
mainLayout->addWidget(this);

14
digikam/utilities/setup/setupplugins.cpp
Unescape View File

@ -27,7 +27,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqstring.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@ -70,18 +70,18 @@ SetupPlugins::SetupPlugins(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupPluginsPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent);
TQVBoxLayout *layout = new TQVBoxLayout(parent);
d->pluginsNumber = new TQLabel(parent);
d->pluginsNumber->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->pluginsNumber->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( parent );
TQString pluginsListHelp = i18n("<p>A list of available Kipi plugins appears below.");
TQWhatsThis::add(d->kipiConfig, pluginsListHelp);
tqlayout->addWidget(d->pluginsNumber);
tqlayout->addWidget(d->kipiConfig);
tqlayout->setMargin(0);
tqlayout->setSpacing(KDialog::spacingHint());
layout->addWidget(d->pluginsNumber);
layout->addWidget(d->kipiConfig);
layout->setMargin(0);
layout->setSpacing(KDialog::spacingHint());
}
SetupPlugins::~SetupPlugins()

24
digikam/utilities/setup/setupslideshow.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
@ -77,7 +77,7 @@ SetupSlideShow::SetupSlideShow(TQWidget* parent )
: TQWidget(parent)
{
d = new SetupSlideShowPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent );
TQVBoxLayout *layout = new TQVBoxLayout( parent );
d->delayInput = new KIntNumInput(5, parent);
d->delayInput->setRange(1, 3600, 1, true );
@ -109,16 +109,16 @@ SetupSlideShow::SetupSlideShow(TQWidget* parent )
d->printComment = new TQCheckBox(i18n("Print image caption"), parent);
TQWhatsThis::add( d->printComment, i18n("<p>Print the image caption at the bottom of the screen."));
tqlayout->addWidget(d->delayInput);
tqlayout->addWidget(d->startWithCurrent);
tqlayout->addWidget(d->loopMode);
tqlayout->addWidget(d->printName);
tqlayout->addWidget(d->printDate);
tqlayout->addWidget(d->printApertureFocal);
tqlayout->addWidget(d->printExpoSensitivity);
tqlayout->addWidget(d->printMakeModel);
tqlayout->addWidget(d->printComment);
tqlayout->addStretch();
layout->addWidget(d->delayInput);
layout->addWidget(d->startWithCurrent);
layout->addWidget(d->loopMode);
layout->addWidget(d->printName);
layout->addWidget(d->printDate);
layout->addWidget(d->printApertureFocal);
layout->addWidget(d->printExpoSensitivity);
layout->addWidget(d->printMakeModel);
layout->addWidget(d->printComment);
layout->addStretch();
readSettings();
}

14
digikam/utilities/setup/setuptooltip.cpp
Unescape View File

@ -23,7 +23,7 @@
// TQt includes.
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
@ -104,13 +104,13 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
: TQWidget(parent)
{
d = new SetupToolTipPriv;
TQVBoxLayout *tqlayout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( parent, 0, KDialog::spacingHint() );
d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), parent);
TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when "
"the mouse hovers over an album item."));
tqlayout->addWidget(d->showToolTipsBox);
layout->addWidget(d->showToolTipsBox);
// --------------------------------------------------------
@ -131,7 +131,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showImageDimBox = new TQCheckBox(i18n("Show image dimensions"), d->fileSettingBox);
TQWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels."));
tqlayout->addWidget(d->fileSettingBox);
layout->addWidget(d->fileSettingBox);
// --------------------------------------------------------
@ -164,7 +164,7 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings "
"used to take the image."));
tqlayout->addWidget(d->photoSettingBox);
layout->addWidget(d->photoSettingBox);
// --------------------------------------------------------
@ -182,8 +182,8 @@ SetupToolTip::SetupToolTip(TQWidget* parent)
d->showRatingBox = new TQCheckBox(i18n("Show image rating"), d->digikamSettingBox);
TQWhatsThis::add( d->showRatingBox, i18n("<p>Set this option to display the image rating."));
tqlayout->addWidget(d->digikamSettingBox);
tqlayout->addStretch();
layout->addWidget(d->digikamSettingBox);
layout->addStretch();
// --------------------------------------------------------

14
digikam/utilities/slideshow/slideshow.cpp
Unescape View File

@ -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

4
digikam/utilities/slideshow/toolbar.cpp
Unescape View File

@ -25,7 +25,7 @@
// TQt includes.
#include <tqtoolbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpixmap.h>
// KDE includes.
@ -88,7 +88,7 @@ ToolBar::ToolBar(TQWidget* parent)
setBackgroundMode(TQt::NoBackground);
adjustSize();
tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
connect(d->playBtn, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotPlayBtnToggled()));

Write Preview
Loading…
Cancel
Save