diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-20 02:53:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-20 02:53:53 +0000 |
| commit | d31c5384fafd8be1afb5eae8d150aa03e1180555 (patch) | |
| tree | aca870c79d6146f309a4120474f126fb75ebaa87 | |
| parent | 9be3ae63454c07422eeeef84a1921e40583d6354 (diff) | |
| download | digikam-d31c5384fafd8be1afb5eae8d150aa03e1180555.tar.gz digikam-d31c5384fafd8be1afb5eae8d150aa03e1180555.zip | |
TQt4 port Digikam
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1232832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
790 files changed, 24083 insertions, 23781 deletions
diff --git a/digikam/data/pics/digikam-splash.xcf b/digikam/data/pics/digikam-splash.xcf Binary files differindex a2f1f80..6acc172 100644 --- a/digikam/data/pics/digikam-splash.xcf +++ b/digikam/data/pics/digikam-splash.xcf diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index 261071e..f419993 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -56,16 +56,16 @@ Album::~Album() clear(); } -void Album::setParent(Album* parent) +void Album::setParent(Album* tqparent) { - if (parent) + if (tqparent) { - m_parent = parent; - parent->insertChild(this); + m_parent = tqparent; + tqparent->insertChild(this); } } -Album* Album::parent() const +Album* Album::tqparent() const { return m_parent; } @@ -183,12 +183,12 @@ int Album::id() const return m_id; } -void Album::setTitle(const QString& title) +void Album::setTitle(const TQString& title) { m_title = title; } -QString Album::title() const +TQString Album::title() const { return m_title; } @@ -200,7 +200,7 @@ Album::Type Album::type() const void Album::setExtraData(const void* key, void* value) { - m_extraMap.replace(key, value); + m_extraMap.tqreplace(key, value); } void Album::removeExtraData(const void* key) @@ -210,8 +210,8 @@ void Album::removeExtraData(const void* key) void* Album::extraData(const void* key) const { - typedef QMap<const void*, void*> Map; - Map::const_iterator it = m_extraMap.find(key); + typedef TQMap<const void*, void*> Map; + Map::const_iterator it = m_extraMap.tqfind(key); if (it == m_extraMap.end()) return 0; @@ -234,27 +234,27 @@ bool Album::isAncestorOf(Album* album) const val = true; break; } - a = a->parent(); + a = a->tqparent(); } return val; } // ------------------------------------------------------------------------------ -PAlbum::PAlbum(const QString& title, int id, bool root) +PAlbum::PAlbum(const TQString& title, int id, bool root) : Album(Album::PHYSICAL, id, root) { setTitle(title); m_caption = ""; m_collection = ""; - m_date = QDate::currentDate(); + m_date = TQDate::tqcurrentDate(); } PAlbum::~PAlbum() { } -void PAlbum::setCaption(const QString& caption) +void PAlbum::setCaption(const TQString& caption) { m_caption = caption; @@ -262,14 +262,14 @@ void PAlbum::setCaption(const QString& caption) db->setAlbumCaption(id(), m_caption); } -void PAlbum::setCollection(const QString& collection) +void PAlbum::setCollection(const TQString& collection) { m_collection = collection; AlbumDB* db = AlbumManager::instance()->albumDB(); db->setAlbumCollection(id(), m_collection); } -void PAlbum::setDate(const QDate& date) +void PAlbum::setDate(const TQDate& date) { m_date = date; @@ -277,31 +277,31 @@ void PAlbum::setDate(const QDate& date) db->setAlbumDate(id(), m_date); } -QString PAlbum::caption() const +TQString PAlbum::caption() const { return m_caption; } -QString PAlbum::collection() const +TQString PAlbum::collection() const { return m_collection; } -QDate PAlbum::date() const +TQDate PAlbum::date() const { return m_date; } -QString PAlbum::url() const +TQString PAlbum::url() const { - QString u(""); + TQString u(""); if (isRoot()) { return "/"; } - else if (parent()) + else if (tqparent()) { - u = ((PAlbum*)parent())->url(); + u = ((PAlbum*)tqparent())->url(); if (!u.endsWith("/")) u += '/'; } @@ -322,13 +322,13 @@ KURL PAlbum::kurl() const return u; } -QString PAlbum::prettyURL() const +TQString PAlbum::prettyURL() const { - QString u = i18n("My Albums") + url(); + TQString u = i18n("My Albums") + url(); return u; } -QString PAlbum::icon() const +TQString PAlbum::icon() const { return m_icon; } @@ -340,7 +340,7 @@ KURL PAlbum::iconKURL() const return u; } -QString PAlbum::folderPath() const +TQString PAlbum::folderPath() const { KURL u(AlbumManager::instance()->getLibraryPath()); u.addPath(url()); @@ -349,7 +349,7 @@ QString PAlbum::folderPath() const // -------------------------------------------------------------------------- -TAlbum::TAlbum(const QString& title, int id, bool root) +TAlbum::TAlbum(const TQString& title, int id, bool root) : Album(Album::TAG, id, root) { setTitle(title); @@ -359,17 +359,17 @@ TAlbum::~TAlbum() { } -QString TAlbum::tagPath(bool leadingSlash) const +TQString TAlbum::tagPath(bool leadingSlash) const { if (isRoot()) return leadingSlash ? "/" : ""; - QString u; + TQString u; - if (parent()) + if (tqparent()) { - u = ((TAlbum*)parent())->tagPath(leadingSlash); - if (!parent()->isRoot()) + u = ((TAlbum*)tqparent())->tagPath(leadingSlash); + if (!tqparent()->isRoot()) u += '/'; } @@ -378,9 +378,9 @@ QString TAlbum::tagPath(bool leadingSlash) const return u; } -QString TAlbum::prettyURL() const +TQString TAlbum::prettyURL() const { - QString u = i18n("My Tags") + tagPath(true); + TQString u = i18n("My Tags") + tagPath(true); return u; } @@ -393,11 +393,11 @@ KURL TAlbum::kurl() const { url.setPath("/"); } - else if (parent()) + else if (tqparent()) { - TAlbum *p = static_cast<TAlbum*>(parent()); + TAlbum *p = static_cast<TAlbum*>(tqparent()); url.setPath(p->kurl().path(1)); - url.addPath(QString::number(id())); + url.addPath(TQString::number(id())); } else { @@ -407,7 +407,7 @@ KURL TAlbum::kurl() const } -QString TAlbum::icon() const +TQString TAlbum::icon() const { return m_icon; } @@ -416,14 +416,14 @@ QString TAlbum::icon() const int DAlbum::m_uniqueID = 0; -DAlbum::DAlbum(const QDate& date, bool root, Range range) +DAlbum::DAlbum(const TQDate& date, bool root, Range range) : Album(Album::DATE, root ? 0 : ++m_uniqueID, root) { m_date = date; m_range = range; // Set the name of the date album - QString dateTitle; + TQString dateTitle; if (m_range == Month) dateTitle = m_date.toString("MMMM yyyy"); @@ -437,7 +437,7 @@ DAlbum::~DAlbum() { } -QDate DAlbum::date() const +TQDate DAlbum::date() const { return m_date; } @@ -449,7 +449,7 @@ DAlbum::Range DAlbum::range() const KURL DAlbum::kurl() const { - QDate endDate; + TQDate endDate; if (m_range == Month) endDate = m_date.addMonths(1); else @@ -457,11 +457,11 @@ KURL DAlbum::kurl() const KURL u; u.setProtocol("digikamdates"); - u.setPath(QString("/%1/%2/%3/%4") - .arg(m_date.year()) - .arg(m_date.month()) - .arg(endDate.year()) - .arg(endDate.month())); + u.setPath(TQString("/%1/%2/%3/%4") + .tqarg(m_date.year()) + .tqarg(m_date.month()) + .tqarg(endDate.year()) + .tqarg(endDate.month())); return u; } @@ -511,12 +511,12 @@ AlbumIterator& AlbumIterator::operator++() { while ( (album = m_current->next()) == 0 ) { - m_current = m_current->parent(); + m_current = m_current->tqparent(); if ( m_current == m_root ) { // we have reached the root. - // that means no more children + // that means no more tqchildren m_current = 0; break; } diff --git a/digikam/digikam/album.h b/digikam/digikam/album.h index 3479904..ed5b1ec 100644 --- a/digikam/digikam/album.h +++ b/digikam/digikam/album.h @@ -27,11 +27,11 @@ #ifndef ALBUM_H #define ALBUM_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatetime.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqmap.h> // KDE includes. @@ -77,17 +77,17 @@ public: void clear(); /** - * @return the parent album for this album + * @return the tqparent album for this album */ - Album* parent() const; + Album* tqparent() const; /** - * @return the first child of this album or 0 if no children + * @return the first child of this album or 0 if no tqchildren */ Album* firstChild() const; /** - * @return the last child of this album or 0 if no children + * @return the last child of this album or 0 if no tqchildren */ Album* lastChild() const; @@ -144,7 +144,7 @@ public: /** * @return the @p title aka name of the album */ - QString title() const; + TQString title() const; /** * @return the kde url of the album @@ -157,7 +157,7 @@ public: bool isRoot() const; /** - * @return true if the @p album is in the parent hierarchy + * @return true if the @p album is in the tqparent hierarchy * * @param album Album to check whether it belongs in the child * hierarchy @@ -227,16 +227,16 @@ protected: * * @param title new title for the album */ - void setTitle(const QString& title); + void setTitle(const TQString& title); /** * @internal use only * - * Set the parent of the album + * Set the tqparent of the album * - * @param parent set the parent album of album to @p parent + * @param tqparent set the tqparent album of album to @p tqparent */ - void setParent(Album* parent); + void setParent(Album* tqparent); /** * @internal use only @@ -250,7 +250,7 @@ protected: /** * @internal use only * - * Remove a Album from the children list for this album + * Remove a Album from the tqchildren list for this album * * @param child the Album to remove */ @@ -270,7 +270,7 @@ private: Type m_type; int m_id; bool m_root; - QString m_title; + TQString m_title; Album* m_parent; Album* m_firstChild; @@ -279,7 +279,7 @@ private: Album* m_prev; bool m_clearing; - QMap<const void*, void*> m_extraMap; + TQMap<const void*, void*> m_extraMap; friend class AlbumManager; }; @@ -294,29 +294,29 @@ class PAlbum : public Album { public: - PAlbum(const QString& title, int id, bool root=false); + PAlbum(const TQString& title, int id, bool root=false); ~PAlbum(); - void setCaption(const QString& caption); - void setCollection(const QString& collection); - void setDate(const QDate& date); + void setCaption(const TQString& caption); + void setCollection(const TQString& collection); + void setDate(const TQDate& date); - QString caption() const; - QString collection() const; - QDate date() const; - QString url() const; - QString prettyURL() const; - QString folderPath() const; + TQString caption() const; + TQString collection() const; + TQDate date() const; + TQString url() const; + TQString prettyURL() const; + TQString folderPath() const; KURL kurl() const; - QString icon() const; + TQString icon() const; KURL iconKURL() const; private: - QString m_collection; - QString m_caption; - QDate m_date; - QString m_icon; + TQString m_collection; + TQString m_caption; + TQDate m_date; + TQString m_icon; friend class AlbumManager; }; @@ -331,7 +331,7 @@ class TAlbum : public Album { public: - TAlbum(const QString& title, int id, bool root=false); + TAlbum(const TQString& title, int id, bool root=false); ~TAlbum(); /** @@ -339,14 +339,14 @@ public: "People/Friend/John" if leadingSlash if false. * The root TAlbum returns "/" resp. "". */ - QString tagPath(bool leadingSlash = true) const; + TQString tagPath(bool leadingSlash = true) const; KURL kurl() const; - QString prettyURL() const; - QString icon() const; + TQString prettyURL() const; + TQString icon() const; private: - QString m_icon; + TQString m_icon; int m_pid; friend class AlbumManager; @@ -368,10 +368,10 @@ public: Year }; - DAlbum(const QDate& date, bool root=false, Range range=Month); + DAlbum(const TQDate& date, bool root=false, Range range=Month); ~DAlbum(); - QDate date() const; + TQDate date() const; Range range() const; KURL kurl() const; @@ -381,7 +381,7 @@ private: Range m_range; - QDate m_date; + TQDate m_date; friend class AlbumManager; }; @@ -413,7 +413,7 @@ private: /** * \class AlbumIterator * - * Iterate over all children of this Album. + * Iterate over all tqchildren of this Album. * \note It will not include the specified album * * Example usage: diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index f4ac459..8beac02 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -39,11 +39,11 @@ extern "C" #include <cstdlib> #include <ctime> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> // KDE includes. @@ -101,7 +101,7 @@ bool AlbumDB::isValid() const return d->valid; } -void AlbumDB::setDBPath(const QString& path) +void AlbumDB::setDBPath(const TQString& path) { if (d->dataBase) { @@ -111,7 +111,7 @@ void AlbumDB::setDBPath(const QString& path) d->valid = false; - sqlite3_open(QFile::encodeName(path), &d->dataBase); + sqlite3_open(TQFile::encodeName(path), &d->dataBase); if (d->dataBase == 0) { DWarning() << "Cannot open database: " @@ -130,9 +130,9 @@ void AlbumDB::initDB() // Check if we have the required tables - QStringList values; + TQStringList values; - if (!execSql( QString("SELECT name FROM sqlite_master" + if (!execSql( TQString("SELECT name FROM sqlite_master" " WHERE type='table'" " ORDER BY name;"), &values )) @@ -140,11 +140,11 @@ void AlbumDB::initDB() return; } - if (!values.contains("Albums")) + if (!values.tqcontains("Albums")) { - if (!execSql( QString("CREATE TABLE Albums\n" + if (!execSql( TQString("CREATE TABLE Albums\n" " (id INTEGER PRIMARY KEY,\n" - " url TEXT NOT NULL UNIQUE,\n" + " url TEXT NOT NULL UNITQUE,\n" " date DATE NOT NULL,\n" " caption TEXT,\n" " collection TEXT,\n" @@ -153,64 +153,64 @@ void AlbumDB::initDB() return; } - if (!execSql( QString("CREATE TABLE Tags\n" + if (!execSql( TQString("CREATE TABLE Tags\n" " (id INTEGER PRIMARY KEY,\n" " pid INTEGER,\n" " name TEXT NOT NULL,\n" " icon INTEGER,\n" " iconkde TEXT,\n" - " UNIQUE (name, pid));") )) + " UNITQUE (name, pid));") )) { return; } - if (!execSql( QString("CREATE TABLE TagsTree\n" + if (!execSql( TQString("CREATE TABLE TagsTree\n" " (id INTEGER NOT NULL,\n" " pid INTEGER NOT NULL,\n" - " UNIQUE (id, pid));") )) + " UNITQUE (id, pid));") )) { return; } - if (!execSql( QString("CREATE TABLE Images\n" + if (!execSql( TQString("CREATE TABLE Images\n" " (id INTEGER PRIMARY KEY,\n" " name TEXT NOT NULL,\n" " dirid INTEGER NOT NULL,\n" " caption TEXT,\n" " datetime DATETIME,\n" - " UNIQUE (name, dirid));") )) + " UNITQUE (name, dirid));") )) { return; } - if (!execSql( QString("CREATE TABLE ImageTags\n" + if (!execSql( TQString("CREATE TABLE ImageTags\n" " (imageid INTEGER NOT NULL,\n" " tagid INTEGER NOT NULL,\n" - " UNIQUE (imageid, tagid));") )) + " UNITQUE (imageid, tagid));") )) { return; } - if (!execSql( QString("CREATE TABLE ImageProperties\n" + if (!execSql( TQString("CREATE TABLE ImageProperties\n" " (imageid INTEGER NOT NULL,\n" " property TEXT NOT NULL,\n" " value TEXT NOT NULL,\n" - " UNIQUE (imageid, property));") )) + " UNITQUE (imageid, property));") )) { return; } - if ( !execSql( QString( "CREATE TABLE Searches \n" + if ( !execSql( TQString( "CREATE TABLE Searches \n" " (id INTEGER PRIMARY KEY, \n" - " name TEXT NOT NULL UNIQUE, \n" + " name TEXT NOT NULL UNITQUE, \n" " url TEXT NOT NULL);" ) ) ) { return; } - if (!execSql( QString("CREATE TABLE Settings \n" - "(keyword TEXT NOT NULL UNIQUE,\n" + if (!execSql( TQString("CREATE TABLE Settings \n" + "(keyword TEXT NOT NULL UNITQUE,\n" " value TEXT);") )) return; else @@ -305,17 +305,17 @@ AlbumInfo::List AlbumDB::scanAlbums() { AlbumInfo::List aList; - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); - QStringList values; + TQStringList values; execSql( "SELECT A.id, A.url, A.date, A.caption, A.collection, B.url, I.name \n " "FROM Albums AS A \n " " LEFT OUTER JOIN Images AS I ON A.icon=I.id \n" " LEFT OUTER JOIN Albums AS B ON B.id=I.dirid;", &values); - QString iconAlbumUrl, iconName; + TQString iconAlbumUrl, iconName; - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { AlbumInfo info; @@ -323,7 +323,7 @@ AlbumInfo::List AlbumDB::scanAlbums() ++it; info.url = *it; ++it; - info.date = QDate::fromString(*it, Qt::ISODate); + info.date = TQDate::fromString(*it, Qt::ISODate); ++it; info.caption = *it; ++it; @@ -349,16 +349,16 @@ TagInfo::List AlbumDB::scanTags() { TagInfo::List tList; - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); - QStringList values; + TQStringList values; execSql( "SELECT T.id, T.pid, T.name, A.url, I.name, T.iconkde \n " "FROM Tags AS T LEFT OUTER JOIN Images AS I ON I.id=T.icon \n " " LEFT OUTER JOIN Albums AS A ON A.id=I.dirid; ", &values ); - QString iconName, iconKDE, albumURL; + TQString iconName, iconKDE, albumURL; - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { TagInfo info; @@ -394,10 +394,10 @@ SearchInfo::List AlbumDB::scanSearches() { SearchInfo::List searchList; - QStringList values; + TQStringList values; execSql( "SELECT id, name, url FROM Searches;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { SearchInfo info; @@ -424,15 +424,15 @@ void AlbumDB::commitTransaction() execSql( "COMMIT TRANSACTION;" ); } -int AlbumDB::addAlbum(const QString& url, const QString& caption, - const QDate& date, const QString& collection) +int AlbumDB::addAlbum(const TQString& url, const TQString& caption, + const TQDate& date, const TQString& collection) { if (!d->dataBase) return -1; - execSql( QString("REPLACE INTO Albums (url, date, caption, collection) " + execSql( TQString("REPLACE INTO Albums (url, date, caption, collection) " "VALUES('%1', '%2', '%3', '%4');") - .arg(escapeString(url), + .tqarg(escapeString(url), date.toString(Qt::ISODate), escapeString(caption), escapeString(collection))); @@ -441,55 +441,55 @@ int AlbumDB::addAlbum(const QString& url, const QString& caption, return id; } -void AlbumDB::setAlbumCaption(int albumID, const QString& caption) +void AlbumDB::setAlbumCaption(int albumID, const TQString& caption) { - execSql( QString("UPDATE Albums SET caption='%1' WHERE id=%2;") - .arg(escapeString(caption), - QString::number(albumID) )); + execSql( TQString("UPDATE Albums SET caption='%1' WHERE id=%2;") + .tqarg(escapeString(caption), + TQString::number(albumID) )); } -void AlbumDB::setAlbumCollection(int albumID, const QString& collection) +void AlbumDB::setAlbumCollection(int albumID, const TQString& collection) { - execSql( QString("UPDATE Albums SET collection='%1' WHERE id=%2;") - .arg(escapeString(collection), - QString::number(albumID)) ); + execSql( TQString("UPDATE Albums SET collection='%1' WHERE id=%2;") + .tqarg(escapeString(collection), + TQString::number(albumID)) ); } -void AlbumDB::setAlbumDate(int albumID, const QDate& date) +void AlbumDB::setAlbumDate(int albumID, const TQDate& date) { - execSql( QString("UPDATE Albums SET date='%1' WHERE id=%2;") - .arg(date.toString(Qt::ISODate)) - .arg(albumID) ); + execSql( TQString("UPDATE Albums SET date='%1' WHERE id=%2;") + .tqarg(date.toString(Qt::ISODate)) + .tqarg(albumID) ); } -void AlbumDB::setAlbumIcon(int albumID, Q_LLONG iconID) +void AlbumDB::setAlbumIcon(int albumID, TQ_LLONG iconID) { - execSql( QString("UPDATE Albums SET icon=%1 WHERE id=%2;") - .arg(iconID) - .arg(albumID) ); + execSql( TQString("UPDATE Albums SET icon=%1 WHERE id=%2;") + .tqarg(iconID) + .tqarg(albumID) ); } -QString AlbumDB::getAlbumIcon(int albumID) +TQString AlbumDB::getAlbumIcon(int albumID) { - QStringList values; - execSql( QString("SELECT B.url, I.name \n " + TQStringList values; + execSql( TQString("SELECT B.url, I.name \n " "FROM Albums AS A \n " " 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;") - .arg(albumID), &values ); + .tqarg(albumID), &values ); if (values.isEmpty()) - return QString(); + return TQString(); - QStringList::iterator it = values.begin(); - QString url = *it; + TQStringList::iterator it = values.begin(); + TQString url = *it; ++it; - QString icon = *it; + TQString icon = *it; if (icon.isEmpty()) - return QString(); + return TQString(); - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); basePath += url; basePath += '/' + icon; @@ -498,20 +498,20 @@ QString AlbumDB::getAlbumIcon(int albumID) void AlbumDB::deleteAlbum(int albumID) { - execSql( QString("DELETE FROM Albums WHERE id=%1") - .arg(albumID) ); + execSql( TQString("DELETE FROM Albums WHERE id=%1") + .tqarg(albumID) ); } -int AlbumDB::addTag(int parentTagID, const QString& name, const QString& iconKDE, - Q_LLONG iconID) +int AlbumDB::addTag(int tqparentTagID, const TQString& name, const TQString& iconKDE, + TQ_LLONG iconID) { if (!d->dataBase) return -1; - if (!execSql( QString("INSERT INTO Tags (pid, name) " + if (!execSql( TQString("INSERT INTO Tags (pid, name) " "VALUES( %1, '%2')") - .arg(parentTagID) - .arg(escapeString(name)))) + .tqarg(tqparentTagID) + .tqarg(escapeString(name)))) { return -1; } @@ -520,15 +520,15 @@ int AlbumDB::addTag(int parentTagID, const QString& name, const QString& iconKDE if (!iconKDE.isEmpty()) { - execSql( QString("UPDATE Tags SET iconkde='%1' WHERE id=%2;") - .arg(escapeString(iconKDE), - QString::number(id))); + execSql( TQString("UPDATE Tags SET iconkde='%1' WHERE id=%2;") + .tqarg(escapeString(iconKDE), + TQString::number(id))); } else { - execSql( QString("UPDATE Tags SET icon=%1 WHERE id=%2;") - .arg(iconID) - .arg(id)); + execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;") + .tqarg(iconID) + .tqarg(id)); } return id; @@ -536,44 +536,44 @@ int AlbumDB::addTag(int parentTagID, const QString& name, const QString& iconKDE void AlbumDB::deleteTag(int tagID) { - execSql( QString("DELETE FROM Tags WHERE id=%1") - .arg(tagID) ); + execSql( TQString("DELETE FROM Tags WHERE id=%1") + .tqarg(tagID) ); } -void AlbumDB::setTagIcon(int tagID, const QString& iconKDE, Q_LLONG iconID) +void AlbumDB::setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID) { if (!iconKDE.isEmpty()) { - execSql( QString("UPDATE Tags SET iconkde='%1', icon=0 WHERE id=%2;") - .arg(escapeString(iconKDE), - QString::number(tagID))); + execSql( TQString("UPDATE Tags SET iconkde='%1', icon=0 WHERE id=%2;") + .tqarg(escapeString(iconKDE), + TQString::number(tagID))); } else { - execSql( QString("UPDATE Tags SET icon=%1 WHERE id=%2;") - .arg(iconID) - .arg(tagID)); + execSql( TQString("UPDATE Tags SET icon=%1 WHERE id=%2;") + .tqarg(iconID) + .tqarg(tagID)); } } -QString AlbumDB::getTagIcon(int tagID) +TQString AlbumDB::getTagIcon(int tagID) { - QStringList values; - execSql( QString("SELECT A.url, I.name, T.iconkde \n " + TQStringList values; + execSql( TQString("SELECT A.url, I.name, T.iconkde \n " "FROM Tags AS T \n " " 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;") - .arg(tagID), &values ); + .tqarg(tagID), &values ); if (values.isEmpty()) - return QString(); + return TQString(); - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); - QString iconName, iconKDE, albumURL, icon; + TQString iconName, iconKDE, albumURL, icon; - QStringList::iterator it = values.begin(); + TQStringList::iterator it = values.begin(); albumURL = *it; ++it; @@ -596,20 +596,20 @@ QString AlbumDB::getTagIcon(int tagID) void AlbumDB::setTagParentID(int tagID, int newParentTagID) { - execSql( QString("UPDATE Tags SET pid=%1 WHERE id=%2;") - .arg(newParentTagID) - .arg(tagID) ); + execSql( TQString("UPDATE Tags SET pid=%1 WHERE id=%2;") + .tqarg(newParentTagID) + .tqarg(tagID) ); } -int AlbumDB::addSearch(const QString& name, const KURL& url) +int AlbumDB::addSearch(const TQString& name, const KURL& url) { if (!d->dataBase) return -1; - QString str("INSERT INTO Searches (name, url) \n" + TQString str("INSERT INTO Searches (name, url) \n" "VALUES('$$@@$$', '$$##$$');"); - str.replace("$$@@$$", escapeString(name)); - str.replace("$$##$$", escapeString(url.url())); + str.tqreplace("$$@@$$", escapeString(name)); + str.tqreplace("$$##$$", escapeString(url.url())); if (!execSql(str)) { @@ -619,46 +619,46 @@ int AlbumDB::addSearch(const QString& name, const KURL& url) return sqlite3_last_insert_rowid(d->dataBase); } -void AlbumDB::updateSearch(int searchID, const QString& name, +void AlbumDB::updateSearch(int searchID, const TQString& name, const KURL& url) { - QString str = QString("UPDATE Searches SET name='$$@@$$', url='$$##$$' \n" + TQString str = TQString("UPDATE Searches SET name='$$@@$$', url='$$##$$' \n" "WHERE id=%1") - .arg(searchID); - str.replace("$$@@$$", escapeString(name)); - str.replace("$$##$$", escapeString(url.url())); + .tqarg(searchID); + str.tqreplace("$$@@$$", escapeString(name)); + str.tqreplace("$$##$$", escapeString(url.url())); execSql(str); } void AlbumDB::deleteSearch(int searchID) { - execSql( QString("DELETE FROM Searches WHERE id=%1") - .arg(searchID) ); + execSql( TQString("DELETE FROM Searches WHERE id=%1") + .tqarg(searchID) ); } -void AlbumDB::setSetting(const QString& keyword, - const QString& value ) +void AlbumDB::setSetting(const TQString& keyword, + const TQString& value ) { - execSql( QString("REPLACE into Settings VALUES ('%1','%2');") - .arg(escapeString(keyword), + execSql( TQString("REPLACE into Settings VALUES ('%1','%2');") + .tqarg(escapeString(keyword), escapeString(value) )); } -QString AlbumDB::getSetting(const QString& keyword) +TQString AlbumDB::getSetting(const TQString& keyword) { - QStringList values; - execSql( QString("SELECT value FROM Settings " + TQStringList values; + execSql( TQString("SELECT value FROM Settings " "WHERE keyword='%1';") - .arg(escapeString(keyword)), &values ); + .tqarg(escapeString(keyword)), &values ); if (values.isEmpty()) - return QString(); + return TQString(); else return values[0]; } -bool AlbumDB::execSql(const QString& sql, QStringList* const values, +bool AlbumDB::execSql(const TQString& sql, TQStringList* const values, const bool debug) { if ( debug ) @@ -666,7 +666,7 @@ bool AlbumDB::execSql(const QString& sql, QStringList* const values, if ( !d->dataBase ) { - DWarning() << k_funcinfo << "SQLite pointer == NULL" + DWarning() << k_funcinfo << "STQLite pointer == NULL" << endl; return false; } @@ -699,7 +699,7 @@ bool AlbumDB::execSql(const QString& sql, QStringList* const values, //iterate over columns for ( int i = 0; values && i < cols; i++ ) { - *values << QString::fromUtf8( (const char*)sqlite3_column_text( stmt, i ) ); + *values << TQString::fromUtf8( (const char*)sqlite3_column_text( stmt, i ) ); } } @@ -717,82 +717,82 @@ bool AlbumDB::execSql(const QString& sql, QStringList* const values, return true; } -QString AlbumDB::escapeString(QString str) const +TQString AlbumDB::escapeString(TQString str) const { - str.replace( "'", "''" ); + str.tqreplace( "'", "''" ); return str; } -QString AlbumDB::getItemCaption(Q_LLONG imageID) +TQString AlbumDB::getItemCaption(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql( QString("SELECT caption FROM Images " + execSql( TQString("SELECT caption FROM Images " "WHERE id=%1;") - .arg(imageID), + .tqarg(imageID), &values ); if (!values.isEmpty()) return values[0]; else - return QString(); + return TQString(); } -QString AlbumDB::getItemCaption(int albumID, const QString& name) +TQString AlbumDB::getItemCaption(int albumID, const TQString& name) { - QStringList values; + TQStringList values; - execSql( QString("SELECT caption FROM Images " + execSql( TQString("SELECT caption FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(name)), + .tqarg(albumID) + .tqarg(escapeString(name)), &values ); if (!values.isEmpty()) return values[0]; else - return QString(); + return TQString(); } -QDateTime AlbumDB::getItemDate(Q_LLONG imageID) +TQDateTime AlbumDB::getItemDate(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql( QString("SELECT datetime FROM Images " + execSql( TQString("SELECT datetime FROM Images " "WHERE id=%1;") - .arg(imageID), + .tqarg(imageID), &values ); if (values.isEmpty()) - return QDateTime(); + return TQDateTime(); else - return QDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], Qt::ISODate); } -QDateTime AlbumDB::getItemDate(int albumID, const QString& name) +TQDateTime AlbumDB::getItemDate(int albumID, const TQString& name) { - QStringList values; + TQStringList values; - execSql( QString("SELECT datetime FROM Images " + execSql( TQString("SELECT datetime FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(name)), + .tqarg(albumID) + .tqarg(escapeString(name)), &values ); if (values.isEmpty()) - return QDateTime(); + return TQDateTime(); else - return QDateTime::fromString(values[0], Qt::ISODate); + return TQDateTime::fromString(values[0], Qt::ISODate); } -Q_LLONG AlbumDB::getImageId(int albumID, const QString& name) +TQ_LLONG AlbumDB::getImageId(int albumID, const TQString& name) { - QStringList values; + TQStringList values; - execSql( QString("SELECT id FROM Images " + execSql( TQString("SELECT id FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(name)), + .tqarg(albumID) + .tqarg(escapeString(name)), &values ); if (values.isEmpty()) @@ -801,27 +801,27 @@ Q_LLONG AlbumDB::getImageId(int albumID, const QString& name) return (values[0]).toLongLong(); } -QStringList AlbumDB::getItemTagNames(Q_LLONG imageID) +TQStringList AlbumDB::getItemTagNames(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql( QString("SELECT name FROM Tags \n " + execSql( TQString("SELECT name FROM Tags \n " "WHERE id IN (SELECT tagid FROM ImageTags \n " " WHERE imageid=%1) \n " "ORDER BY name;") - .arg(imageID), + .tqarg(imageID), &values ); return values; } -IntList AlbumDB::getItemTagIDs(Q_LLONG imageID) +IntList AlbumDB::getItemTagIDs(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql( QString("SELECT tagid FROM ImageTags \n " + execSql( TQString("SELECT tagid FROM ImageTags \n " "WHERE imageID=%1;") - .arg(imageID), + .tqarg(imageID), &values ); IntList ids; @@ -829,7 +829,7 @@ IntList AlbumDB::getItemTagIDs(Q_LLONG imageID) if (values.isEmpty()) return ids; - for (QStringList::iterator it=values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it=values.begin(); it != values.end(); ++it) { ids << (*it).toInt(); } @@ -843,23 +843,23 @@ bool AlbumDB::hasTags(const LLongList& imageIDList) if (imageIDList.isEmpty()) return false; - QStringList values; + TQStringList values; - QString sql = QString("SELECT count(tagid) FROM ImageTags " + TQString sql = TQString("SELECT count(tagid) FROM ImageTags " "WHERE imageid=%1 ") - .arg(imageIDList.first()); + .tqarg(imageIDList.first()); LLongList::const_iterator iter = imageIDList.begin(); ++iter; while (iter != imageIDList.end()) { - sql += QString(" OR imageid=%2 ") - .arg(*iter); + sql += TQString(" OR imageid=%2 ") + .tqarg(*iter); ++iter; } - sql += QString(";"); + sql += TQString(";"); execSql( sql, &values ); if (values[0] == "0") @@ -875,64 +875,64 @@ IntList AlbumDB::getItemCommonTagIDs(const LLongList& imageIDList) if (imageIDList.isEmpty()) return ids; - QStringList values; + TQStringList values; - QString sql = QString("SELECT DISTINCT tagid FROM ImageTags " + TQString sql = TQString("SELECT DISTINCT tagid FROM ImageTags " "WHERE imageid=%1 ") - .arg(imageIDList.first()); + .tqarg(imageIDList.first()); LLongList::const_iterator iter = imageIDList.begin(); ++iter; while (iter != imageIDList.end()) { - sql += QString(" OR imageid=%2 ") - .arg(*iter); + sql += TQString(" OR imageid=%2 ") + .tqarg(*iter); ++iter; } - sql += QString(";"); + sql += TQString(";"); execSql( sql, &values ); if (values.isEmpty()) return ids; - for (QStringList::iterator it=values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it=values.begin(); it != values.end(); ++it) { ids << (*it).toInt(); } return ids; } -void AlbumDB::setItemCaption(Q_LLONG imageID,const QString& caption) +void AlbumDB::setItemCaption(TQ_LLONG imageID,const TQString& caption) { - QStringList values; + TQStringList values; - execSql( QString("UPDATE Images SET caption='%1' " + execSql( TQString("UPDATE Images SET caption='%1' " "WHERE id=%2;") - .arg(escapeString(caption), - QString::number(imageID) )); + .tqarg(escapeString(caption), + TQString::number(imageID) )); } -void AlbumDB::setItemCaption(int albumID, const QString& name, const QString& caption) +void AlbumDB::setItemCaption(int albumID, const TQString& name, const TQString& caption) { - QStringList values; + TQStringList values; - execSql( QString("UPDATE Images SET caption='%1' " + execSql( TQString("UPDATE Images SET caption='%1' " "WHERE dirid=%2 AND name='%3';") - .arg(escapeString(caption), - QString::number(albumID), + .tqarg(escapeString(caption), + TQString::number(albumID), escapeString(name)) ); } -void AlbumDB::addItemTag(Q_LLONG imageID, int tagID) +void AlbumDB::addItemTag(TQ_LLONG imageID, int tagID) { - execSql( QString("REPLACE INTO ImageTags (imageid, tagid) " + execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .arg(imageID) - .arg(tagID) ); + .tqarg(imageID) + .tqarg(tagID) ); - if (!d->recentlyAssignedTags.contains(tagID)) + if (!d->recentlyAssignedTags.tqcontains(tagID)) { d->recentlyAssignedTags.push_front(tagID); if (d->recentlyAssignedTags.size() > 10) @@ -940,14 +940,14 @@ void AlbumDB::addItemTag(Q_LLONG imageID, int tagID) } } -void AlbumDB::addItemTag(int albumID, const QString& name, int tagID) +void AlbumDB::addItemTag(int albumID, const TQString& name, int tagID) { - execSql( QString("REPLACE INTO ImageTags (imageid, tagid) \n " + execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) \n " "(SELECT id, %1 FROM Images \n " " WHERE dirid=%2 AND name='%3');") - .arg(tagID) - .arg(albumID) - .arg(escapeString(name)) ); + .tqarg(tagID) + .tqarg(albumID) + .tqarg(escapeString(name)) ); } IntList AlbumDB::getRecentlyAssignedTags() const @@ -955,58 +955,58 @@ IntList AlbumDB::getRecentlyAssignedTags() const return d->recentlyAssignedTags; } -void AlbumDB::removeItemTag(Q_LLONG imageID, int tagID) +void AlbumDB::removeItemTag(TQ_LLONG imageID, int tagID) { - execSql( QString("DELETE FROM ImageTags " + execSql( TQString("DELETE FROM ImageTags " "WHERE imageID=%1 AND tagid=%2;") - .arg(imageID) - .arg(tagID) ); + .tqarg(imageID) + .tqarg(tagID) ); } -void AlbumDB::removeItemAllTags(Q_LLONG imageID) +void AlbumDB::removeItemAllTags(TQ_LLONG imageID) { - execSql( QString("DELETE FROM ImageTags " + execSql( TQString("DELETE FROM ImageTags " "WHERE imageID=%1;") - .arg(imageID) ); + .tqarg(imageID) ); } -QStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive) +TQStringList AlbumDB::getItemNamesInAlbum(int albumID, bool recurssive) { - QStringList values; + TQStringList values; if (recurssive) { KURL url(getAlbumURL(albumID)); - execSql( QString("SELECT Images.name " + execSql( TQString("SELECT Images.name " "FROM Images " "WHERE Images.dirid " "IN (SELECT DISTINCT id " "FROM Albums " "WHERE url='%1' OR url LIKE '\%%2\%')") - .arg(escapeString(url.path())).arg(escapeString(url.path(1))), &values); + .tqarg(escapeString(url.path())).tqarg(escapeString(url.path(1))), &values); } else { - execSql( QString("SELECT Images.name " + execSql( TQString("SELECT Images.name " "FROM Images " "WHERE Images.dirid=%1") - .arg(albumID), &values ); + .tqarg(albumID), &values ); } return values; } -QStringList AlbumDB::getAllItemURLsWithoutDate() +TQStringList AlbumDB::getAllItemURLsWithoutDate() { - QStringList values; - execSql( QString("SELECT Albums.url||'/'||Images.name " + TQStringList values; + execSql( TQString("SELECT Albums.url||'/'||Images.name " "FROM Images, Albums " "WHERE Images.dirid=Albums.Id " "AND (Images.datetime is null or " " Images.datetime == '');"), &values ); - QString libraryPath = AlbumManager::instance()->getLibraryPath() + '/'; - for (QStringList::iterator it = values.begin(); it != values.end(); + TQString libraryPath = AlbumManager::instance()->getLibraryPath() + '/'; + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { *it = libraryPath + *it; @@ -1015,19 +1015,19 @@ QStringList AlbumDB::getAllItemURLsWithoutDate() return values; } -int AlbumDB::getOrCreateAlbumId(const QString& folder) +int AlbumDB::getOrCreateAlbumId(const TQString& folder) { - QStringList values; - execSql( QString("SELECT id FROM Albums WHERE url ='%1';") - .arg( escapeString(folder) ), &values); + TQStringList values; + execSql( TQString("SELECT id FROM Albums WHERE url ='%1';") + .tqarg( escapeString(folder) ), &values); int albumID; if (values.isEmpty()) { - execSql( QString ("INSERT INTO Albums (url, date) " + execSql( TQString ("INSERT INTO Albums (url, date) " "VALUES ('%1','%2')") - .arg(escapeString(folder), - QDateTime::currentDateTime().toString(Qt::ISODate)) ); + .tqarg(escapeString(folder), + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) ); albumID = sqlite3_last_insert_rowid(d->dataBase); } else albumID = values[0].toInt(); @@ -1035,22 +1035,22 @@ int AlbumDB::getOrCreateAlbumId(const QString& folder) return albumID; } -Q_LLONG AlbumDB::addItem(int albumID, - const QString& name, - const QDateTime& datetime, - const QString& comment, +TQ_LLONG AlbumDB::addItem(int albumID, + const TQString& name, + const TQDateTime& datetime, + const TQString& comment, int rating, - const QStringList &keywordsList) + const TQStringList &keywordsList) { - execSql ( QString ("REPLACE INTO Images " + execSql ( TQString ("REPLACE INTO Images " "( caption , datetime, name, dirid ) " " VALUES ('%1','%2','%3',%4) " ) - .arg(escapeString(comment), + .tqarg(escapeString(comment), datetime.toString(Qt::ISODate), escapeString(name), - QString::number(albumID)) ); + TQString::number(albumID)) ); - Q_LLONG item = sqlite3_last_insert_rowid(d->dataBase); + TQ_LLONG item = sqlite3_last_insert_rowid(d->dataBase); // Set Rating value to item in database. @@ -1071,23 +1071,23 @@ Q_LLONG AlbumDB::addItem(int albumID, return item; } -IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool create) +IntList AlbumDB::getTagsFromTagPaths(const TQStringList &keywordsList, bool create) { if (keywordsList.isEmpty()) return IntList(); IntList tagIDs; - QStringList keywordsList2Create; + TQStringList keywordsList2Create; // Create a list of the tags currently in database TagInfo::List currentTagsList; - QStringList values; + TQStringList values; execSql( "SELECT id, pid, name FROM Tags;", &values ); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { TagInfo info; @@ -1102,17 +1102,17 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat // For every tag in keywordsList, scan taglist to check if tag already exists. - for (QStringList::const_iterator kwd = keywordsList.begin(); + for (TQStringList::const_iterator kwd = keywordsList.begin(); kwd != keywordsList.end(); ++kwd ) { // split full tag "url" into list of single tag names - QStringList tagHierarchy = QStringList::split('/', *kwd); + TQStringList tagHierarchy = TQStringList::split('/', *kwd); if (tagHierarchy.isEmpty()) continue; // last entry in list is the actual tag name bool foundTag = false; - QString tagName = tagHierarchy.back(); + TQString tagName = tagHierarchy.back(); tagHierarchy.pop_back(); for (TagInfo::List::iterator tag = currentTagsList.begin(); @@ -1122,27 +1122,27 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat // hierarchies. We must check them all until we find the correct hierarchy if ((*tag).name == tagName) { - int parentID = (*tag).pid; + int tqparentID = (*tag).pid; // Check hierarchy, from bottom to top bool foundParentTag = true; - QStringList::iterator parentTagName = tagHierarchy.end(); + TQStringList::iterator tqparentTagName = tagHierarchy.end(); - while (foundParentTag && parentTagName != tagHierarchy.begin()) + while (foundParentTag && tqparentTagName != tagHierarchy.begin()) { - --parentTagName; + --tqparentTagName; foundParentTag = false; - for (TagInfo::List::iterator parentTag = currentTagsList.begin(); - parentTag != currentTagsList.end(); ++parentTag ) + for (TagInfo::List::iterator tqparentTag = currentTagsList.begin(); + tqparentTag != currentTagsList.end(); ++tqparentTag ) { // check if name is the same, and if ID is identical - // to the parent ID we got from the child tag - if ( (*parentTag).id == parentID && - (*parentTag).name == (*parentTagName) ) + // to the tqparent ID we got from the child tag + if ( (*tqparentTag).id == tqparentID && + (*tqparentTag).name == (*tqparentTagName) ) { - parentID = (*parentTag).pid; + tqparentID = (*tqparentTag).pid; foundParentTag = true; break; } @@ -1172,35 +1172,35 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat if (create && !keywordsList2Create.isEmpty()) { - for (QStringList::iterator kwd = keywordsList2Create.begin(); + for (TQStringList::iterator kwd = keywordsList2Create.begin(); kwd != keywordsList2Create.end(); ++kwd ) { // split full tag "url" into list of single tag names - QStringList tagHierarchy = QStringList::split('/', *kwd); + TQStringList tagHierarchy = TQStringList::split('/', *kwd); if (tagHierarchy.isEmpty()) continue; - int parentTagID = 0; + int tqparentTagID = 0; int tagID = 0; - bool parentTagExisted = true; + bool tqparentTagExisted = true; // Traverse hierarchy from top to bottom - for (QStringList::iterator tagName = tagHierarchy.begin(); + for (TQStringList::iterator tagName = tagHierarchy.begin(); tagName != tagHierarchy.end(); ++tagName) { tagID = 0; - // if the parent tag did not exist, we need not check if the child exists - if (parentTagExisted) + // if the tqparent tag did not exist, we need not check if the child exists + if (tqparentTagExisted) { for (TagInfo::List::iterator tag = currentTagsList.begin(); tag != currentTagsList.end(); ++tag ) { // find the tag with tag name according to tagHierarchy, - // and parent ID identical to the ID of the tag we found in + // and tqparent ID identical to the ID of the tag we found in // the previous run. - if ((*tag).name == (*tagName) && (*tag).pid == parentTagID) + if ((*tag).name == (*tagName) && (*tag).pid == tqparentTagID) { tagID = (*tag).id; break; @@ -1211,12 +1211,12 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat if (tagID != 0) { // tag already found in DB - parentTagID = tagID; + tqparentTagID = tagID; continue; } // Tag does not yet exist in DB, add it - tagID = addTag(parentTagID, (*tagName), QString(), 0); + tagID = addTag(tqparentTagID, (*tagName), TQString(), 0); if (tagID == -1) { @@ -1227,12 +1227,12 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat // append to our list of existing tags (for following keywords) TagInfo info; info.id = tagID; - info.pid = parentTagID; + info.pid = tqparentTagID; info.name = (*tagName); currentTagsList.append(info); - parentTagID = tagID; - parentTagExisted = false; + tqparentTagID = tagID; + tqparentTagExisted = false; } // add to result list @@ -1243,13 +1243,13 @@ IntList AlbumDB::getTagsFromTagPaths(const QStringList &keywordsList, bool creat return tagIDs; } -int AlbumDB::getItemAlbum(Q_LLONG imageID) +int AlbumDB::getItemAlbum(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql ( QString ("SELECT dirid FROM Images " + execSql ( TQString ("SELECT dirid FROM Images " "WHERE id=%1;") - .arg(imageID), + .tqarg(imageID), &values); if (!values.isEmpty()) @@ -1258,62 +1258,62 @@ int AlbumDB::getItemAlbum(Q_LLONG imageID) return 1; } -QString AlbumDB::getItemName(Q_LLONG imageID) +TQString AlbumDB::getItemName(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql ( QString ("SELECT name FROM Images " + execSql ( TQString ("SELECT name FROM Images " "WHERE id=%1;") - .arg(imageID), + .tqarg(imageID), &values); if (!values.isEmpty()) return values.first(); else - return QString(); + return TQString(); } -bool AlbumDB::setItemDate(Q_LLONG imageID, - const QDateTime& datetime) +bool AlbumDB::setItemDate(TQ_LLONG imageID, + const TQDateTime& datetime) { - execSql ( QString ("UPDATE Images SET datetime='%1'" + execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE id=%2;") - .arg(datetime.toString(Qt::ISODate), - QString::number(imageID)) ); + .tqarg(datetime.toString(Qt::ISODate), + TQString::number(imageID)) ); return true; } -bool AlbumDB::setItemDate(int albumID, const QString& name, - const QDateTime& datetime) +bool AlbumDB::setItemDate(int albumID, const TQString& name, + const TQDateTime& datetime) { - execSql ( QString ("UPDATE Images SET datetime='%1'" + execSql ( TQString ("UPDATE Images SET datetime='%1'" "WHERE dirid=%2 AND name='%3';") - .arg(datetime.toString(Qt::ISODate), - QString::number(albumID), + .tqarg(datetime.toString(Qt::ISODate), + TQString::number(albumID), escapeString(name)) ); return true; } -void AlbumDB::setItemRating(Q_LLONG imageID, int rating) +void AlbumDB::setItemRating(TQ_LLONG imageID, int rating) { - execSql ( QString ("REPLACE INTO ImageProperties " + execSql ( TQString ("REPLACE INTO ImageProperties " "(imageid, property, value) " "VALUES(%1, '%2', '%3');") - .arg(imageID) - .arg("Rating") - .arg(rating) ); + .tqarg(imageID) + .tqarg("Rating") + .tqarg(rating) ); } -int AlbumDB::getItemRating(Q_LLONG imageID) +int AlbumDB::getItemRating(TQ_LLONG imageID) { - QStringList values; + TQStringList values; - execSql( QString("SELECT value FROM ImageProperties " + execSql( TQString("SELECT value FROM ImageProperties " "WHERE imageid=%1 and property='%2';") - .arg(imageID) - .arg("Rating"), + .tqarg(imageID) + .tqarg("Rating"), &values); if (!values.isEmpty()) @@ -1322,54 +1322,54 @@ int AlbumDB::getItemRating(Q_LLONG imageID) return 0; } -QStringList AlbumDB::getItemURLsInAlbum(int albumID) +TQStringList AlbumDB::getItemURLsInAlbum(int albumID) { - QStringList values; + TQStringList values; - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); AlbumSettings::ImageSortOrder order = AlbumSettings::instance()->getImageSortOrder(); - QString sqlString; + TQString sqlString; switch(order) { case AlbumSettings::ByIName: - sqlString = QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " + 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;") - .arg(albumID); + .tqarg(albumID); break; case AlbumSettings::ByIPath: // Dont collate on the path - this is to maintain the same behaviour // that happens when sort order is "By Path" - sqlString = QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " + 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;") - .arg(albumID); + .tqarg(albumID); break; case AlbumSettings::ByIDate: - sqlString = QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " + sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid " "ORDER BY Images.datetime;") - .arg(albumID); + .tqarg(albumID); break; case AlbumSettings::ByIRating: - sqlString = QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums, ImageProperties " + sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums, ImageProperties " "WHERE Albums.id=%1 AND Albums.id=Images.dirid " "AND Images.id = ImageProperties.imageid " "AND ImageProperties.property='Rating' " "ORDER BY ImageProperties.value DESC;") - .arg(albumID); + .tqarg(albumID); break; default: - sqlString = QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " + sqlString = TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Albums.id=%1 AND Albums.id=Images.dirid;") - .arg(albumID); + .tqarg(albumID); break; } execSql( sqlString, &values ); - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { *it = basePath + *it; } @@ -1381,38 +1381,38 @@ LLongList AlbumDB::getItemIDsInAlbum(int albumID) { LLongList itemIDs; - QStringList itemNames = getItemNamesInAlbum(albumID); + TQStringList itemNames = getItemNamesInAlbum(albumID); - for (QStringList::iterator it = itemNames.begin(); it != itemNames.end(); ++it) + for (TQStringList::iterator it = itemNames.begin(); it != itemNames.end(); ++it) { - Q_LLONG id = getImageId(albumID, *it); + TQ_LLONG id = getImageId(albumID, *it); itemIDs.append(id); } return itemIDs; } -QStringList AlbumDB::getItemURLsInTag(int tagID, bool recursive) +TQStringList AlbumDB::getItemURLsInTag(int tagID, bool recursive) { - QStringList values; + TQStringList values; - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQString basePath(AlbumManager::instance()->getLibraryPath()); - QString imagesIdClause; + TQString imagesIdClause; if (recursive) - imagesIdClause = QString("SELECT imageid FROM ImageTags " + imagesIdClause = TQString("SELECT imageid FROM ImageTags " " WHERE tagid=%1 " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)") - .arg(tagID).arg(tagID); + .tqarg(tagID).tqarg(tagID); else - imagesIdClause = QString("SELECT imageid FROM ImageTags WHERE tagid=%1").arg(tagID); + imagesIdClause = TQString("SELECT imageid FROM ImageTags WHERE tagid=%1").tqarg(tagID); - execSql( QString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " + execSql( TQString("SELECT Albums.url||'/'||Images.name FROM Images, Albums " "WHERE Images.id IN (%1) " "AND Albums.id=Images.dirid;") - .arg(imagesIdClause), &values ); + .tqarg(imagesIdClause), &values ); - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { *it = basePath + *it; } @@ -1423,18 +1423,18 @@ QStringList AlbumDB::getItemURLsInTag(int tagID, bool recursive) LLongList AlbumDB::getItemIDsInTag(int tagID, bool recursive) { LLongList itemIDs; - QStringList values; + TQStringList values; if (recursive) - execSql( QString("SELECT imageid FROM ImageTags " + execSql( TQString("SELECT imageid FROM ImageTags " " WHERE tagid=%1 " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)") - .arg(tagID).arg(tagID), &values ); + .tqarg(tagID).tqarg(tagID), &values ); else - execSql( QString("SELECT imageid FROM ImageTags WHERE tagid=%1;") - .arg(tagID), &values ); + execSql( TQString("SELECT imageid FROM ImageTags WHERE tagid=%1;") + .tqarg(tagID), &values ); - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { itemIDs << (*it).toLong(); } @@ -1442,47 +1442,47 @@ LLongList AlbumDB::getItemIDsInTag(int tagID, bool recursive) return itemIDs; } -QString AlbumDB::getAlbumURL(int albumID) +TQString AlbumDB::getAlbumURL(int albumID) { - QStringList values; - execSql( QString("SELECT url from Albums where id=%1") - .arg( albumID), &values); + TQStringList values; + execSql( TQString("SELECT url from Albums where id=%1") + .tqarg( albumID), &values); return values[0]; } -QDate AlbumDB::getAlbumLowestDate(int albumID) +TQDate AlbumDB::getAlbumLowestDate(int albumID) { - QStringList values; - execSql( QString("SELECT MIN(datetime) FROM Images " + TQStringList values; + execSql( TQString("SELECT MIN(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") - .arg( albumID ), &values); - QDate itemDate = QDate::fromString( values[0], Qt::ISODate ); + .tqarg( albumID ), &values); + TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); return itemDate; } -QDate AlbumDB::getAlbumHighestDate(int albumID) +TQDate AlbumDB::getAlbumHighestDate(int albumID) { - QStringList values; - execSql( QString("SELECT MAX(datetime) FROM Images " + TQStringList values; + execSql( TQString("SELECT MAX(datetime) FROM Images " "WHERE dirid=%1 GROUP BY dirid") - .arg( albumID ), &values); - QDate itemDate = QDate::fromString( values[0], Qt::ISODate ); + .tqarg( albumID ), &values); + TQDate itemDate = TQDate::fromString( values[0], Qt::ISODate ); return itemDate; } -QDate AlbumDB::getAlbumAverageDate(int albumID) +TQDate AlbumDB::getAlbumAverageDate(int albumID) { - QStringList values; - execSql( QString("SELECT datetime FROM Images WHERE dirid=%1") - .arg( albumID ), &values); + TQStringList values; + execSql( TQString("SELECT datetime FROM Images WHERE dirid=%1") + .tqarg( albumID ), &values); int differenceInSecs = 0; int amountOfImages = 0; - QDateTime baseDateTime; + TQDateTime baseDateTime; - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { - QDateTime itemDateTime = QDateTime::fromString( *it, Qt::ISODate ); + TQDateTime itemDateTime = TQDateTime::fromString( *it, Qt::ISODate ); if (itemDateTime.isValid()) { ++amountOfImages; @@ -1495,67 +1495,67 @@ QDate AlbumDB::getAlbumAverageDate(int albumID) if ( amountOfImages > 0 ) { - QDateTime averageDateTime; + TQDateTime averageDateTime; averageDateTime.setTime_t( baseDateTime.toTime_t() - (int)( differenceInSecs/amountOfImages ) ); return ( averageDateTime.date() ); } else - return QDate(); + return TQDate(); } -void AlbumDB::deleteItem(int albumID, const QString& file) +void AlbumDB::deleteItem(int albumID, const TQString& file) { - execSql( QString("DELETE FROM Images " + execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(file)) ); + .tqarg(albumID) + .tqarg(escapeString(file)) ); } -void AlbumDB::setAlbumURL(int albumID, const QString& url) +void AlbumDB::setAlbumURL(int albumID, const TQString& url) { - QString u = escapeString(url); + TQString u = escapeString(url); // first delete any stale albums left behind - execSql( QString("DELETE FROM Albums WHERE url = '%1'") - .arg(u) ); + execSql( TQString("DELETE FROM Albums WHERE url = '%1'") + .tqarg(u) ); // now update the album url - execSql( QString("UPDATE Albums SET url = '%1' WHERE id = %2;") - .arg(u, QString::number(albumID) )); + execSql( TQString("UPDATE Albums SET url = '%1' WHERE id = %2;") + .tqarg(u, TQString::number(albumID) )); } -void AlbumDB::setTagName(int tagID, const QString& name) +void AlbumDB::setTagName(int tagID, const TQString& name) { - execSql( QString("UPDATE Tags SET name='%1' WHERE id=%2;") - .arg(escapeString(name), QString::number(tagID) )); + execSql( TQString("UPDATE Tags SET name='%1' WHERE id=%2;") + .tqarg(escapeString(name), TQString::number(tagID) )); } -void AlbumDB::moveItem(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName) +void AlbumDB::moveItem(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName) { // first delete any stale database entries if any deleteItem(dstAlbumID, dstName); - execSql( QString("UPDATE Images SET dirid=%1, name='%2' " + execSql( TQString("UPDATE Images SET dirid=%1, name='%2' " "WHERE dirid=%3 AND name='%4';") - .arg(QString::number(dstAlbumID), escapeString(dstName), - QString::number(srcAlbumID), escapeString(srcName)) ); + .tqarg(TQString::number(dstAlbumID), escapeString(dstName), + TQString::number(srcAlbumID), escapeString(srcName)) ); } -int AlbumDB::copyItem(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName) +int AlbumDB::copyItem(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName) { // check for src == dest if (srcAlbumID == dstAlbumID && srcName == dstName) return -1; // find id of src image - QStringList values; - execSql( QString("SELECT id FROM Images " + TQStringList values; + execSql( TQString("SELECT id FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(QString::number(srcAlbumID), escapeString(srcName)), + .tqarg(TQString::number(srcAlbumID), escapeString(srcName)), &values); if (values.isEmpty()) @@ -1567,30 +1567,30 @@ int AlbumDB::copyItem(int srcAlbumID, const QString& srcName, deleteItem(dstAlbumID, dstName); // copy entry in Images table - execSql( QString("INSERT INTO Images (dirid, name, caption, datetime) " + execSql( TQString("INSERT INTO Images (dirid, name, caption, datetime) " "SELECT %1, '%2', caption, datetime FROM Images " "WHERE id=%3;") - .arg(QString::number(dstAlbumID), escapeString(dstName), - QString::number(srcId)) ); + .tqarg(TQString::number(dstAlbumID), escapeString(dstName), + TQString::number(srcId)) ); int dstId = sqlite3_last_insert_rowid(d->dataBase); // copy tags - execSql( QString("INSERT INTO ImageTags (imageid, tagid) " + execSql( TQString("INSERT INTO ImageTags (imageid, tagid) " "SELECT %1, tagid FROM ImageTags " "WHERE imageid=%2;") - .arg(QString::number(dstId), QString::number(srcId)) ); + .tqarg(TQString::number(dstId), TQString::number(srcId)) ); // copy properties (rating) - execSql( QString("INSERT INTO ImageProperties (imageid, property, value) " + execSql( TQString("INSERT INTO ImageProperties (imageid, property, value) " "SELECT %1, property, value FROM ImageProperties " "WHERE imageid=%2;") - .arg(QString::number(dstId), QString::number(srcId)) ); + .tqarg(TQString::number(dstId), TQString::number(srcId)) ); return dstId; } -Q_LLONG AlbumDB::lastInsertedRow() +TQ_LLONG AlbumDB::lastInsertedRow() { return sqlite3_last_insert_rowid(d->dataBase); } diff --git a/digikam/digikam/albumdb.h b/digikam/digikam/albumdb.h index 0a12f80..ccbd735 100644 --- a/digikam/digikam/albumdb.h +++ b/digikam/digikam/albumdb.h @@ -28,12 +28,12 @@ #ifndef ALBUMDB_H #define ALBUMDB_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> +#include <tqdatetime.h> // KDE includes. @@ -47,8 +47,8 @@ namespace Digikam { -typedef QValueList<int> IntList; -typedef QValueList<Q_LLONG> LLongList; +typedef TQValueList<int> IntList; +typedef TQValueList<TQ_LLONG> LLongList; class AlbumDBPriv; @@ -81,7 +81,7 @@ public: * are available. * @param path The database to open */ - void setDBPath(const QString& path); + void setDBPath(const TQString& path); /** * Returns all albums and their attributes in the database @@ -109,8 +109,8 @@ public: * @param collection the album collection * @return the id of the album added or -1 if it failed */ - int addAlbum(const QString& url, const QString& caption, - const QDate& date, const QString& collection); + int addAlbum(const TQString& url, const TQString& caption, + const TQDate& date, const TQString& collection); /** * Set a new url for the album. This will not affect the url @@ -118,41 +118,41 @@ public: * @param albumID the id of the album * @param url the new url for the album */ - void setAlbumURL(int albumID, const QString& url); + void setAlbumURL(int albumID, const TQString& url); /** * Set a caption for the album. * @param albumID the id of the album * @param caption the new caption for the album */ - void setAlbumCaption(int albumID, const QString& caption); + void setAlbumCaption(int albumID, const TQString& caption); /** * Set a collection for the album. * @param albumID the id of the album * @param collection the new collection for the album */ - void setAlbumCollection(int albumID, const QString& collection); + void setAlbumCollection(int albumID, const TQString& collection); /** * Set a date for the album. * @param albumID the id of the album * @param date the date for the album */ - void setAlbumDate(int albumID, const QDate& date); + void setAlbumDate(int albumID, const TQDate& date); /** * Set the icon for the album. * @param albumID the id of the album * @param iconID the id of the icon file */ - void setAlbumIcon(int albumID, Q_LLONG iconID); + void setAlbumIcon(int albumID, TQ_LLONG iconID); /** * Get the fullpath for the album icon file * @param albumID the id of the album */ - QString getAlbumIcon(int albumID); + TQString getAlbumIcon(int albumID); /** * Deletes an album from the database. This will not delete the @@ -162,8 +162,8 @@ public: void deleteAlbum(int albumID); /** - * Adds a new tag to the database with given name, icon and parent id. - * @param parentTagID the id of the tag which will become the new tags parent + * Adds a new tag to the database with given name, icon and tqparent id. + * @param tqparentTagID the id of the tag which will become the new tags tqparent * @param name the name of the tag * @param iconKDE the name of the icon file (this is filename which kde * iconloader can load up) @@ -171,15 +171,15 @@ public: * Note: if the iconKDE parameter is empty, then the iconID parameter is used * @return the id of the tag added or -1 if it failed */ - int addTag(int parentTagID, const QString& name, - const QString& iconKDE, Q_LLONG iconID); + int addTag(int tqparentTagID, const TQString& name, + const TQString& iconKDE, TQ_LLONG iconID); /** * Set a new name for the tag. * @param tagID the id of the tag * @param name the new name for the tag */ - void setTagName(int tagID, const QString& name); + void setTagName(int tagID, const TQString& name); /** * Set the icon for the tag. @@ -189,7 +189,7 @@ public: * Note: Only one of the iconKDE or iconID parameters is used. * if the iconKDE parameter is empty, then the iconID parameter is used */ - void setTagIcon(int tagID, const QString& iconKDE, Q_LLONG iconID); + void setTagIcon(int tagID, const TQString& iconKDE, TQ_LLONG iconID); /** * Get the icon for the tag. @@ -197,13 +197,13 @@ public: * @return the path for the icon file. this could be either a simple filename * which can be loaded by kiconloader or an absolute filepath to the file */ - QString getTagIcon(int tagID); + TQString getTagIcon(int tagID); /** - * Set the parent tagid for the tag. This is equivalent to reparenting + * Set the tqparent tagid for the tag. This is equivalent to reparenting * the tag * @param tagID the id of the tag - * @param newParentTagID the new parentid for the tag + * @param newParentTagID the new tqparentid for the tag */ void setTagParentID(int tagID, int newParentTagID); @@ -220,7 +220,7 @@ public: * @param url url of the search * @return the id of the album added or -1 if it failed */ - int addSearch(const QString& name, const KURL& url); + int addSearch(const TQString& name, const KURL& url); /** * Updates Search with new attributes @@ -228,7 +228,7 @@ public: * @param name name of the search * @param url url of the search */ - void updateSearch(int searchID, const QString& name, const KURL& url); + void updateSearch(int searchID, const TQString& name, const KURL& url); /** * Delete a search from the database. @@ -246,7 +246,7 @@ public: * @param keyword The keyword * @param value The value */ - void setSetting(const QString& keyword, const QString& value); + void setSetting(const TQString& keyword, const TQString& value); /** * This function returns the value which is stored in the database @@ -254,7 +254,7 @@ public: * @param keyword The keyword for which the value has to be returned. * @return The values which belongs to the keyword. */ - QString getSetting(const QString& keyword); + TQString getSetting(const TQString& keyword); /** * This is simple function to put a new Item in the database, @@ -273,25 +273,25 @@ public: * file. * @return the id of item added or -1 if it fails */ - Q_LLONG addItem(int albumID, const QString& name, - const QDateTime& datetime, - const QString& comment, + TQ_LLONG addItem(int albumID, const TQString& name, + const TQDateTime& datetime, + const TQString& comment, int rating, - const QStringList& keywordsList); + const TQStringList& keywordsList); /** * Find the album of an item * @param imageID The ID of the item * @return The ID of the PAlbum of the item, or -1 if not found */ - int getItemAlbum(Q_LLONG imageID); + int getItemAlbum(TQ_LLONG imageID); /** * Retrieve the name of the item * @param imageID The ID of the item * @return The name of the item, or a null string if not found */ - QString getItemName(Q_LLONG imageID); + TQString getItemName(TQ_LLONG imageID); /** * Update the date of a item to supplied date @@ -300,7 +300,7 @@ public: * the exif-datetime, but if not available the modification date. * @return It will always return true. Maybe that will change. */ - bool setItemDate(Q_LLONG imageID, const QDateTime& datetime); + bool setItemDate(TQ_LLONG imageID, const TQDateTime& datetime); /** * Update the date of a item to supplied date @@ -310,15 +310,15 @@ public: * the exif-datetime, but if not available the modification date. * @return It will always return true. Maybe that will change. */ - bool setItemDate(int albumID, const QString& name, - const QDateTime& datetime); + bool setItemDate(int albumID, const TQString& name, + const TQDateTime& datetime); /** * Set the caption for the item * @param imageID the id of the item * @param caption the caption for the item */ - void setItemCaption(Q_LLONG imageID, const QString& caption); + void setItemCaption(TQ_LLONG imageID, const TQString& caption); /** * Set the caption for the item @@ -326,14 +326,14 @@ public: * @param name the name of the item * @param caption the caption for the item */ - void setItemCaption(int albumID, const QString& name, const QString& caption); + void setItemCaption(int albumID, const TQString& name, const TQString& caption); /** * Add a tag for the item * @param imageID the ID of the item * @param tagID the tagID for the tag */ - void addItemTag(Q_LLONG imageID, int tagID); + void addItemTag(TQ_LLONG imageID, int tagID); /** * Add a tag for the item @@ -341,7 +341,7 @@ public: * @param name the name of the item * @param tagID the tagID for the tag */ - void addItemTag(int albumID, const QString& name, int tagID); + void addItemTag(int albumID, const TQString& name, int tagID); /** * Add tags for the item, create tags with the given paths if they do not yet exist @@ -349,7 +349,7 @@ public: * @param create create new tags if necessary * @returns a list of albumIDs of the tags in tagPaths */ - IntList getTagsFromTagPaths(const QStringList &tagPaths, bool create = true); + IntList getTagsFromTagPaths(const TQStringList &tagPaths, bool create = true); /** * Get a list of recently assigned tags (only last 6 tags are listed) @@ -362,7 +362,7 @@ public: * @param imageID the id of the item * @return the caption for the item */ - QString getItemCaption(Q_LLONG imageID); + TQString getItemCaption(TQ_LLONG imageID); /** * Get the caption for the item @@ -370,14 +370,14 @@ public: * @param name the name of the item * @return the caption for the item */ - QString getItemCaption(int albumID, const QString& name); + TQString getItemCaption(int albumID, const TQString& name); /** * Get the datetime for the item * @param imageID the ID of the item * @return the datetime for the item */ - QDateTime getItemDate(Q_LLONG imageID); + TQDateTime getItemDate(TQ_LLONG imageID); /** * Get the datetime for the item @@ -385,7 +385,7 @@ public: * @param name the name of the item * @return the datetime for the item */ - QDateTime getItemDate(int albumID, const QString& name); + TQDateTime getItemDate(int albumID, const TQString& name); /** * Get the imageId of the item @@ -393,21 +393,21 @@ public: * @param name the name of the item * @return the ImageId for the item */ - Q_LLONG getImageId(int albumID, const QString& name); + TQ_LLONG getImageId(int albumID, const TQString& name); /** * Get a list of names of all the tags for the item * @param imageID the ID of the item * @return the list of names of all tags for the item */ - QStringList getItemTagNames(Q_LLONG imageID); + TQStringList getItemTagNames(TQ_LLONG imageID); /** * Get a list of IDs of all the tags for the item * @param imageID the ID of the item * @return the list of IDs of all tags for the item */ - IntList getItemTagIDs(Q_LLONG imageID); + IntList getItemTagIDs(TQ_LLONG imageID); /** * Given a set of items (identified by their IDs), @@ -430,34 +430,34 @@ public: * @param imageID the ID of the item * @param tagID the tagID for the tag */ - void removeItemTag(Q_LLONG imageID, int tagID); + void removeItemTag(TQ_LLONG imageID, int tagID); /** * Update the rating of a item to supplied value * @param imageID The ID of the item * @param rating The rating value to be stored. */ - void setItemRating(Q_LLONG imageID, int rating); + void setItemRating(TQ_LLONG imageID, int rating); /** * Get the item rating * @param imageID the ID of the item * @return the rating for the item */ - int getItemRating(Q_LLONG imageID); + int getItemRating(TQ_LLONG imageID); /** * Remove all tags for the item * @param imageID the ID of the item */ - void removeItemAllTags(Q_LLONG imageID); + void removeItemAllTags(TQ_LLONG imageID); /** * Deletes an item from the database. * @param albumID The id of the album. * @param file The filename of the file to delete. */ - void deleteItem(int albumID, const QString& file); + void deleteItem(int albumID, const TQString& file); /** * This can be used to find out the albumID for a given @@ -466,7 +466,7 @@ public: * @param folder The folder for which you want the albumID * @return It returns the albumID for that folder. */ - int getOrCreateAlbumId(const QString& folder); + int getOrCreateAlbumId(const TQString& folder); /** * Returns all items for a given albumid. This is used to @@ -474,9 +474,9 @@ public: * in the scanlib class. * @param albumID The albumID for which you want all items. * @param recursive perform a recursive folder hierarchy parsing - * @return It returns a QStringList with the filenames. + * @return It returns a TQStringList with the filenames. */ - QStringList getItemNamesInAlbum(int albumID, bool recurssive=false); + TQStringList getItemNamesInAlbum(int albumID, bool recurssive=false); /** * Given a albumID, get a list of the url of all items in the album @@ -484,7 +484,7 @@ public: * @return a list of urls for the items in the album. The urls are the * absolute path of the items */ - QStringList getItemURLsInAlbum(int albumID); + TQStringList getItemURLsInAlbum(int albumID); /** * Given a albumID, get a list of Ids of all items in the album @@ -501,7 +501,7 @@ public: * @return The path (starting from albumPath and including the * the filename of all items. */ - QStringList getAllItemURLsWithoutDate(); + TQStringList getAllItemURLsWithoutDate(); /** * Given a tagid, get a list of the url of all items in the tag @@ -510,7 +510,7 @@ public: * @return a list of urls for the items in the tag. The urls are the * absolute path of the items */ - QStringList getItemURLsInTag(int tagID, bool recursive = false); + TQStringList getItemURLsInTag(int tagID, bool recursive = false); /** * Given a tagID, get a list of Ids of all items in the tag @@ -525,28 +525,28 @@ public: * @param albumID the id of the albumdb * @return the url of the albumdb */ - QString getAlbumURL(int albumID); + TQString getAlbumURL(int albumID); /** * Returns the lowest/oldest date of all images for that album. * @param albumID the id of the album to calculate * @return the date. */ - QDate getAlbumLowestDate(int albumID); + TQDate getAlbumLowestDate(int albumID); /** * Returns the highest/newest date of all images for that album. * @param albumID the id of the album to calculate * @return the date. */ - QDate getAlbumHighestDate(int albumID); + TQDate getAlbumHighestDate(int albumID); /** * Returns the average date of all images for that album. * @param albumID the id of the album to calculate * @return the date. */ - QDate getAlbumAverageDate(int albumID); + TQDate getAlbumAverageDate(int albumID); /** * Move the attributes of an item to a different item. Useful when @@ -556,8 +556,8 @@ public: * @param srcName the name of the source file * @param dstName the name of the destination file */ - void moveItem(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName); + void moveItem(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName); /** * Copy the attributes of an item to a different item. Useful when @@ -569,8 +569,8 @@ public: * @param dstName the name of the destination file * @return the id of item added or -1 if it fails */ - int copyItem(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName); + int copyItem(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName); /** * This will execute a given SQL statement to the database. @@ -579,14 +579,14 @@ public: * @param debug If true, it will output the SQL statement * @return It will return if the execution of the statement was succesfull */ - bool execSql(const QString& sql, QStringList* const values = 0, + bool execSql(const TQString& sql, TQStringList* const values = 0, const bool debug = false); /** * To be used only if you are sure of what you are doing * @return the last inserted row in one the db table. */ - Q_LLONG lastInsertedRow(); + TQ_LLONG lastInsertedRow(); private: @@ -603,7 +603,7 @@ private: * @param str String to escape * @return The escaped string */ - QString escapeString(QString str) const; + TQString escapeString(TQString str) const; private: diff --git a/digikam/digikam/albumdb_sqlite2.cpp b/digikam/digikam/albumdb_sqlite2.cpp index 7ec804c..a9a2085 100644 --- a/digikam/digikam/albumdb_sqlite2.cpp +++ b/digikam/digikam/albumdb_sqlite2.cpp @@ -35,9 +35,9 @@ extern "C" #include <cstdio> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qfile.h> +#include <tqfile.h> // Local includes. @@ -62,7 +62,7 @@ AlbumDB_Sqlite2::~AlbumDB_Sqlite2() } } -void AlbumDB_Sqlite2::setDBPath(const QString& path) +void AlbumDB_Sqlite2::setDBPath(const TQString& path) { if (m_db) { sqlite_close(m_db); @@ -71,7 +71,7 @@ void AlbumDB_Sqlite2::setDBPath(const QString& path) } char *errMsg = 0; - m_db = sqlite_open(QFile::encodeName(path), 0, &errMsg); + m_db = sqlite_open(TQFile::encodeName(path), 0, &errMsg); if (m_db == 0) { DWarning() << k_funcinfo << "Cannot open database: " @@ -80,19 +80,19 @@ void AlbumDB_Sqlite2::setDBPath(const QString& path) return; } - QStringList values; + TQStringList values; execSql("SELECT * FROM sqlite_master", &values); - m_valid = values.contains("Albums"); + m_valid = values.tqcontains("Albums"); } -bool AlbumDB_Sqlite2::execSql(const QString& sql, QStringList* const values, +bool AlbumDB_Sqlite2::execSql(const TQString& sql, TQStringList* const values, const bool debug) { if ( debug ) DDebug() << "SQL-query: " << sql << endl; if ( !m_db ) { - DWarning() << k_funcinfo << "SQLite pointer == NULL" + DWarning() << k_funcinfo << "STQLite pointer == NULL" << endl; return false; } @@ -123,7 +123,7 @@ bool AlbumDB_Sqlite2::execSql(const QString& sql, QStringList* const values, break; //iterate over columns for ( int i = 0; values && i < number; i++ ) { - *values << QString::fromLocal8Bit( value [i] ); + *values << TQString::fromLocal8Bit( value [i] ); } } diff --git a/digikam/digikam/albumdb_sqlite2.h b/digikam/digikam/albumdb_sqlite2.h index 55ce132..a53cfea 100644 --- a/digikam/digikam/albumdb_sqlite2.h +++ b/digikam/digikam/albumdb_sqlite2.h @@ -21,22 +21,22 @@ * * ============================================================ */ -#ifndef ALBUMDB_SQLITE2_H -#define ALBUMDB_SQLITE2_H +#ifndef ALBUMDB_STQLITE2_H +#define ALBUMDB_STQLITE2_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> +#include <tqdatetime.h> namespace Digikam { typedef struct sqlite sqleet2; // hehe. -typedef QValueList<int> IntList; +typedef TQValueList<int> IntList; /** * This class is responsible for the communication * with the sqlite database. @@ -60,7 +60,7 @@ public: * are available. * @param path The database to open */ - void setDBPath(const QString& path); + void setDBPath(const TQString& path); /** * This will execute a given SQL statement to the database. @@ -69,7 +69,7 @@ public: * @param debug If true, it will output the SQL statement * @return It will return if the execution of the statement was succesfull */ - bool execSql(const QString& sql, QStringList* const values = 0, + bool execSql(const TQString& sql, TQStringList* const values = 0, const bool debug = false); bool isValid() const { return m_valid; } @@ -82,4 +82,4 @@ private: } // namespace Digikam -#endif /* ALBUMDB_SQLITE2_H */ +#endif /* ALBUMDB_STQLITE2_H */ diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index d718e87..307f7c7 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -25,17 +25,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qtooltip.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qdatetime.h> -#include <qstylesheet.h> -#include <qpainter.h> -#include <qapplication.h> +// TQt includes. + +#include <tqtooltip.h> +#include <tqfileinfo.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqdatetime.h> +#include <tqstylesheet.h> +#include <tqpainter.h> +#include <tqapplication.h> // KDE includes. @@ -86,9 +86,9 @@ public: int corner; - QLabel *label; + TQLabel *label; - QPixmap corners[4]; + TQPixmap corners[4]; AlbumIconView *view; @@ -96,25 +96,25 @@ public: }; AlbumFileTip::AlbumFileTip(AlbumIconView* view) - : QFrame(0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | + : TQFrame(0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM) { d = new AlbumFileTipPriv; d->view = view; hide(); - setPalette(QToolTip::palette()); - setFrameStyle(QFrame::Plain | QFrame::Box); + setPalette(TQToolTip::palette()); + setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); - QVBoxLayout *layout = new QVBoxLayout(this, d->tipBorder+1, 0); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, d->tipBorder+1, 0); - d->label = new QLabel(this); + d->label = new TQLabel(this); d->label->setMargin(0); - d->label->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + d->label->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); - layout->addWidget(d->label); - layout->setResizeMode(QLayout::Fixed); + tqlayout->addWidget(d->label); + tqlayout->setResizeMode(TQLayout::Fixed); renderArrows(); } @@ -147,11 +147,11 @@ void AlbumFileTip::reposition() if (!d->iconItem) return; - QRect rect = d->iconItem->clickToOpenRect(); + TQRect rect = d->iconItem->clickToOpenRect(); rect.moveTopLeft(d->view->contentsToViewport(rect.topLeft())); rect.moveTopLeft(d->view->viewport()->mapToGlobal(rect.topLeft())); - QPoint pos = rect.center(); + TQPoint pos = rect.center(); // d->corner: // 0: upperleft // 1: upperright @@ -162,10 +162,10 @@ void AlbumFileTip::reposition() // should the tooltip be shown to the left or to the right of the ivi ? #if KDE_IS_VERSION(3,2,0) - QRect desk = KGlobalSettings::desktopGeometry(rect.center()); + TQRect desk = KGlobalSettings::desktopGeometry(rect.center()); #else - QRect desk = QApplication::desktop()->screenGeometry( - QApplication::desktop()->screenNumber(rect.center()) ); + TQRect desk = TQApplication::desktop()->screenGeometry( + TQApplication::desktop()->screenNumber(rect.center()) ); #endif if (rect.center().x() + width() > desk.right()) @@ -204,12 +204,12 @@ void AlbumFileTip::renderArrows() // -- left top arrow ------------------------------------- - QPixmap& pix0 = d->corners[0]; + TQPixmap& pix0 = d->corners[0]; pix0.resize(w, w); - pix0.fill(colorGroup().background()); + pix0.fill(tqcolorGroup().background()); - QPainter p0(&pix0); - p0.setPen(QPen(Qt::black, 1)); + TQPainter p0(&pix0); + p0.setPen(TQPen(TQt::black, 1)); for (int j=0; j<w; j++) p0.drawLine(0, j, w-j-1, j); @@ -218,12 +218,12 @@ void AlbumFileTip::renderArrows() // -- right top arrow ------------------------------------ - QPixmap& pix1 = d->corners[1]; + TQPixmap& pix1 = d->corners[1]; pix1.resize(w, w); - pix1.fill(colorGroup().background()); + pix1.fill(tqcolorGroup().background()); - QPainter p1(&pix1); - p1.setPen(QPen(Qt::black, 1)); + TQPainter p1(&pix1); + p1.setPen(TQPen(TQt::black, 1)); for (int j=0; j<w; j++) p1.drawLine(j, j, w-1, j); @@ -232,12 +232,12 @@ void AlbumFileTip::renderArrows() // -- left bottom arrow ---------------------------------- - QPixmap& pix2 = d->corners[2]; + TQPixmap& pix2 = d->corners[2]; pix2.resize(w, w); - pix2.fill(colorGroup().background()); + pix2.fill(tqcolorGroup().background()); - QPainter p2(&pix2); - p2.setPen(QPen(Qt::black, 1)); + TQPainter p2(&pix2); + p2.setPen(TQPen(TQt::black, 1)); for (int j=0; j<w; j++) p2.drawLine(0, j, j, j); @@ -246,12 +246,12 @@ void AlbumFileTip::renderArrows() // -- right bottom arrow --------------------------------- - QPixmap& pix3 = d->corners[3]; + TQPixmap& pix3 = d->corners[3]; pix3.resize(w, w); - pix3.fill(colorGroup().background()); + pix3.fill(tqcolorGroup().background()); - QPainter p3(&pix3); - p3.setPen(QPen(Qt::black, 1)); + TQPainter p3(&pix3); + p3.setPen(TQPen(TQt::black, 1)); for (int j=0; j<w; j++) p3.drawLine(w-j-1, j, w-1, j); @@ -259,39 +259,39 @@ void AlbumFileTip::renderArrows() p3.end(); } -bool AlbumFileTip::event(QEvent *e) +bool AlbumFileTip::event(TQEvent *e) { switch ( e->type() ) { - case QEvent::Leave: - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::FocusIn: - case QEvent::FocusOut: - case QEvent::Wheel: + case TQEvent::Leave: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::FocusIn: + case TQEvent::FocusOut: + case TQEvent::Wheel: hide(); default: break; } - return QFrame::event(e); + return TQFrame::event(e); } -void AlbumFileTip::resizeEvent(QResizeEvent* e) +void AlbumFileTip::resizeEvent(TQResizeEvent* e) { - QFrame::resizeEvent(e); + TQFrame::resizeEvent(e); reposition(); } -void AlbumFileTip::drawContents(QPainter *p) +void AlbumFileTip::drawContents(TQPainter *p) { if (d->corner >= 4) { - QFrame::drawContents( p ); + TQFrame::drawContents( p ); return; } - QPixmap &pix = d->corners[d->corner]; + TQPixmap &pix = d->corners[d->corner]; switch ( d->corner ) { @@ -309,33 +309,33 @@ void AlbumFileTip::drawContents(QPainter *p) break; } - QFrame::drawContents(p); + TQFrame::drawContents(p); } void AlbumFileTip::updateText() { - QString tip, str; - QString unavailable(i18n("unavailable")); + TQString tip, str; + TQString unavailable(i18n("unavailable")); - QString headBeg("<tr bgcolor=\"orange\"><td colspan=\"2\">" + TQString headBeg("<tr bgcolor=\"orange\"><td colspan=\"2\">" "<nobr><font size=\"-1\" color=\"black\"><b>"); - QString headEnd("</b></font></nobr></td></tr>"); + TQString headEnd("</b></font></nobr></td></tr>"); - QString cellBeg("<tr><td><nobr><font size=\"-1\" color=\"black\">"); - QString cellMid("</font></nobr></td>" + TQString cellBeg("<tr><td><nobr><font size=\"-1\" color=\"black\">"); + TQString cellMid("</font></nobr></td>" "<td><nobr><font size=\"-1\" color=\"black\">"); - QString cellEnd("</font></nobr></td></tr>"); + TQString cellEnd("</font></nobr></td></tr>"); - QString cellSpecBeg("<tr><td><nobr><font size=\"-1\" color=\"black\">"); - QString cellSpecMid("</font></nobr></td>" + TQString cellSpecBeg("<tr><td><nobr><font size=\"-1\" color=\"black\">"); + TQString cellSpecMid("</font></nobr></td>" "<td><nobr><font size=\"-1\" color=\"steelblue\"><i>"); - QString cellSpecEnd("</i></font></nobr></td></tr>"); + TQString cellSpecEnd("</i></font></nobr></td></tr>"); tip = "<table cellspacing=\"0\" cellpadding=\"0\" width=\"250\" border=\"0\">"; AlbumSettings* settings = AlbumSettings::instance(); const ImageInfo* info = d->iconItem->imageInfo(); - QFileInfo fileInfo(info->kurl().path()); + TQFileInfo fileInfo(info->kurl().path()); KFileItem fi(KFileItem::Unknown, KFileItem::Unknown, info->kurl()); DMetadata metaData(info->kurl().path()); @@ -357,7 +357,7 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowFileDate()) { - QDateTime modifiedDate = fileInfo.lastModified(); + TQDateTime modifiedDate = fileInfo.lastModified(); str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); tip += cellBeg + i18n("Modified:") + cellMid + str + cellEnd; } @@ -365,20 +365,20 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowFileSize()) { tip += cellBeg + i18n("Size:") + cellMid; - str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + str = i18n("%1 (%2)").tqarg(KIO::convertSize(fi.size())) + .tqarg(KGlobal::locale()->formatNumber(fi.size(), 0)); tip += str + cellEnd; } - QSize dims; + TQSize dims; #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) { str = i18n("RAW Image"); dims = metaData.getImageDimensions(); @@ -406,10 +406,10 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowImageDim()) { - QString mpixels; + TQString mpixels; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); tip += cellBeg + i18n("Dimensions:") + cellMid + str + cellEnd; } } @@ -429,15 +429,15 @@ void AlbumFileTip::updateText() if (!photoInfo.isEmpty()) { - QString metaStr; + TQString metaStr; tip += headBeg + i18n("Photograph Properties") + headEnd; if (settings->getToolTipsShowPhotoMake()) { - str = QString("%1 / %2").arg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) - .arg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model); + str = TQString("%1 / %2").tqarg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) + .tqarg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Make/Model:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Make/Model:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } if (settings->getToolTipsShowPhotoDate()) @@ -446,10 +446,10 @@ void AlbumFileTip::updateText() { str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Created:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Created:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } else - metaStr += cellBeg + i18n("Created:") + cellMid + QStyleSheet::escape( unavailable ) + cellEnd; + metaStr += cellBeg + i18n("Created:") + cellMid + TQStyleSheet::escape( unavailable ) + cellEnd; } if (settings->getToolTipsShowPhotoFocal()) @@ -457,20 +457,20 @@ void AlbumFileTip::updateText() str = photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture; if (photoInfo.focalLength35mm.isEmpty()) - str += QString(" / %1").arg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); + str += TQString(" / %1").tqarg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); else - str += QString(" / %1").arg(i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm)); + str += TQString(" / %1").tqarg(i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm)); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Aperture/Focal:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Aperture/Focal:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } if (settings->getToolTipsShowPhotoExpo()) { - str = QString("%1 / %2").arg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) - .arg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity)); + str = TQString("%1 / %2").tqarg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) + .tqarg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity)); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Exposure/Sensitivity:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Exposure/Sensitivity:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } if (settings->getToolTipsShowPhotoMode()) @@ -483,23 +483,23 @@ void AlbumFileTip::updateText() else if (photoInfo.exposureMode.isEmpty() && !photoInfo.exposureProgram.isEmpty()) str = photoInfo.exposureProgram; else - str = QString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); + str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Mode/Program:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Mode/Program:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } if (settings->getToolTipsShowPhotoFlash()) { str = photoInfo.flash.isEmpty() ? unavailable : photoInfo.flash; if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("Flash:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("Flash:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } if (settings->getToolTipsShowPhotoWB()) { str = photoInfo.whiteBalance.isEmpty() ? unavailable : photoInfo.whiteBalance; if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; - metaStr += cellBeg + i18n("White Balance:") + cellMid + QStyleSheet::escape( str ) + cellEnd; + metaStr += cellBeg + i18n("White Balance:") + cellMid + TQStyleSheet::escape( str ) + cellEnd; } tip += metaStr; @@ -525,16 +525,16 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowComments()) { str = info->caption(); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); tip += cellSpecBeg + i18n("Caption:") + cellSpecMid + breakString(str) + cellSpecEnd; } if (settings->getToolTipsShowTags()) { - QStringList tagPaths = info->tagPaths(false); + TQStringList tagPaths = info->tagPaths(false); str = tagPaths.join(", "); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); if (str.length() > d->maxStringLen) str = str.left(d->maxStringLen-3) + "..."; tip += cellSpecBeg + i18n("Tags:") + cellSpecMid + str + cellSpecEnd; } @@ -542,7 +542,7 @@ void AlbumFileTip::updateText() if (settings->getToolTipsShowRating()) { str.fill( 'X', info->rating() ); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); tip += cellSpecBeg + i18n("Rating:") + cellSpecMid + str + cellSpecEnd; } } @@ -552,16 +552,16 @@ void AlbumFileTip::updateText() d->label->setText(tip); } -QString AlbumFileTip::breakString(const QString& input) +TQString AlbumFileTip::breakString(const TQString& input) { - QString str = input.simplifyWhiteSpace(); - str = QStyleSheet::escape(str); + TQString str = input.simplifyWhiteSpace(); + str = TQStyleSheet::escape(str); uint maxLen = d->maxStringLen; if (str.length() <= maxLen) return str; - QString br; + TQString br; uint i = 0; uint count = 0; diff --git a/digikam/digikam/albumfiletip.h b/digikam/digikam/albumfiletip.h index a95ea8b..90c2853 100644 --- a/digikam/digikam/albumfiletip.h +++ b/digikam/digikam/albumfiletip.h @@ -28,10 +28,10 @@ #ifndef ALBUMFILETIP_H #define ALBUMFILETIP_H -// Qt includes. +// TQt includes. -#include <qframe.h> -#include <qstring.h> +#include <tqframe.h> +#include <tqstring.h> namespace Digikam { @@ -40,7 +40,7 @@ class AlbumIconView; class AlbumIconItem; class AlbumFileTipPriv; -class AlbumFileTip : public QFrame +class AlbumFileTip : public TQFrame { public: @@ -51,16 +51,16 @@ public: protected: - bool event(QEvent *e); - void resizeEvent(QResizeEvent* e); - void drawContents(QPainter *p); + bool event(TQEvent *e); + void resizeEvent(TQResizeEvent* e); + void drawContents(TQPainter *p); private: void reposition(); void renderArrows(); void updateText(); - QString breakString(const QString& str); + TQString breakString(const TQString& str); private: diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index 48f2e80..47eb593 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -23,16 +23,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qguardedptr.h> -#include <qdir.h> +#include <tqpixmap.h> +#include <tqguardedptr.h> +#include <tqdir.h> #include <kpopupmenu.h> -#include <qcursor.h> -#include <qdatastream.h> -#include <qvaluelist.h> -#include <qdatetime.h> +#include <tqcursor.h> +#include <tqdatastream.h> +#include <tqvaluelist.h> +#include <tqdatetime.h> // KDE includes. @@ -88,17 +88,17 @@ class AlbumFolderViewItem : public FolderItem public: - AlbumFolderViewItem(QListView *parent, PAlbum *album); - AlbumFolderViewItem(QListViewItem *parent, PAlbum *album); + AlbumFolderViewItem(TQListView *tqparent, PAlbum *album); + AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album); // special group item (collection/dates) - AlbumFolderViewItem(QListViewItem* parent, const QString& name, + AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name, int year, int month); PAlbum* album() const; int id() const; bool isGroupItem() const; - int compare(QListViewItem *i, int col, bool ascending) const; + int compare(TQListViewItem *i, int col, bool ascending) const; void refresh(); void setOpen(bool o); void setCount(int count); @@ -115,8 +115,8 @@ private: PAlbum *m_album; }; -AlbumFolderViewItem::AlbumFolderViewItem(QListView *parent, PAlbum *album) - : FolderItem(parent, album->title()) +AlbumFolderViewItem::AlbumFolderViewItem(TQListView *tqparent, PAlbum *album) + : FolderItem(tqparent, album->title()) { setDragEnabled(true); m_album = album; @@ -124,8 +124,8 @@ AlbumFolderViewItem::AlbumFolderViewItem(QListView *parent, PAlbum *album) m_count = 0; } -AlbumFolderViewItem::AlbumFolderViewItem(QListViewItem *parent, PAlbum *album) - : FolderItem(parent, album->title()) +AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem *tqparent, PAlbum *album) + : FolderItem(tqparent, album->title()) { setDragEnabled(true); m_album = album; @@ -134,9 +134,9 @@ AlbumFolderViewItem::AlbumFolderViewItem(QListViewItem *parent, PAlbum *album) } // special group item (collection/dates) -AlbumFolderViewItem::AlbumFolderViewItem(QListViewItem* parent, const QString& name, +AlbumFolderViewItem::AlbumFolderViewItem(TQListViewItem* tqparent, const TQString& name, int year, int month) - : FolderItem(parent, name, true) + : FolderItem(tqparent, name, true) { m_album = 0; m_year = year; @@ -150,10 +150,10 @@ void AlbumFolderViewItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast<AlbumFolderViewItem*>(parent())) + dynamic_cast<AlbumFolderViewItem*>(tqparent())) { if (isOpen()) - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(m_count)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); else { int countRecursive = m_count; @@ -165,7 +165,7 @@ void AlbumFolderViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); } } else @@ -176,7 +176,7 @@ void AlbumFolderViewItem::refresh() void AlbumFolderViewItem::setOpen(bool o) { - QListViewItem::setOpen(o); + TQListViewItem::setOpen(o); refresh(); } @@ -196,7 +196,7 @@ int AlbumFolderViewItem::id() const else { return ( - (AlbumSettings::instance()->getAlbumCollectionNames() - .findIndex(text(0)) ) ); + .tqfindIndex(text(0)) ) ); } } else @@ -210,10 +210,10 @@ bool AlbumFolderViewItem::isGroupItem() const return m_groupItem; } -int AlbumFolderViewItem::compare(QListViewItem *i, int col, bool ascending) const +int AlbumFolderViewItem::compare(TQListViewItem *i, int col, bool ascending) const { if (!m_groupItem || m_year == 0 || m_month == 0) - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); AlbumFolderViewItem* thatItem = dynamic_cast<AlbumFolderViewItem*>(i); if (!thatItem) @@ -255,58 +255,58 @@ public: AlbumManager *albumMan; ThumbnailJob *iconThumbJob; - QValueList<AlbumFolderViewItem*> groupItems; + TQValueList<AlbumFolderViewItem*> groupItems; }; -AlbumFolderView::AlbumFolderView(QWidget *parent) - : FolderView(parent, "AlbumFolderView") +AlbumFolderView::AlbumFolderView(TQWidget *tqparent) + : FolderView(tqparent, "AlbumFolderView") { d = new AlbumFolderViewPriv(); d->albumMan = AlbumManager::instance(); d->iconThumbJob = 0; addColumn(i18n("My Albums")); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); setAllColumnsShowFocus(true); setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(d->albumMan, SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumsCleared()), - this, SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotAlbumsCleared())); - connect(d->albumMan, SIGNAL(signalAlbumIconChanged(Album*)), - this, SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQT_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, SIGNAL(signalPAlbumsDirty(const QMap<int, int>&)), - this, SLOT(slotRefresh(const QMap<int, int>&))); + connect(d->albumMan, TQT_SIGNAL(signalPAlbumsDirty(const TQMap<int, int>&)), + this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, SIGNAL(signalThumbnail(Album *, const QPixmap&)), - this, SLOT(slotGotThumbnailFromIcon(Album *, const QPixmap&))); + connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, SIGNAL(signalFailed(Album *)), - this, SLOT(slotThumbnailLost(Album *))); + connect(loader, TQT_SIGNAL(signalFailed(Album *)), + this, TQT_SLOT(slotThumbnailLost(Album *))); - connect(loader, SIGNAL(signalReloadThumbnails()), - this, SLOT(slotReloadThumbnails())); + connect(loader, TQT_SIGNAL(signalReloadThumbnails()), + this, TQT_SLOT(slotReloadThumbnails())); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); } AlbumFolderView::~AlbumFolderView() @@ -318,7 +318,7 @@ AlbumFolderView::~AlbumFolderView() delete d; } -void AlbumFolderView::slotTextFolderFilterChanged(const QString& filter) +void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) { if (filter.isEmpty()) { @@ -326,7 +326,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const QString& filter) return; } - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -339,31 +339,31 @@ void AlbumFolderView::slotTextFolderFilterChanged(const QString& filter) if (palbum->isRoot()) continue; - bool match = palbum->title().lower().contains(search); + bool match = palbum->title().lower().tqcontains(search); bool doesExpand = false; if (!match) { - // check if any of the parents match the search - Album* parent = palbum->parent(); - while (parent && !parent->isRoot()) + // check if any of the tqparents match the search + Album* tqparent = palbum->tqparent(); + while (tqparent && !tqparent->isRoot()) { - if (parent->title().lower().contains(search)) + if (tqparent->title().lower().tqcontains(search)) { match = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } if (!match) { - // check if any of the children match the search + // check if any of the tqchildren match the search AlbumIterator it(palbum); while (it.current()) { - if ((*it)->title().lower().contains(search)) + if ((*it)->title().lower().tqcontains(search)) { match = true; doesExpand = true; @@ -408,16 +408,16 @@ void AlbumFolderView::slotAlbumAdded(Album *album) return; bool failed; - AlbumFolderViewItem* parent = findParent(palbum, failed); + AlbumFolderViewItem* tqparent = findParent(palbum, failed); if (failed) { - DWarning() << k_funcinfo << " Failed to find Album parent " + DWarning() << k_funcinfo << " Failed to find Album tqparent " << palbum->url() << endl; return; } AlbumFolderViewItem *item; - if (!parent) + if (!tqparent) { // root album item = new AlbumFolderViewItem(this, palbum); @@ -426,7 +426,7 @@ void AlbumFolderView::slotAlbumAdded(Album *album) } else { - item = new AlbumFolderViewItem(parent, palbum); + item = new AlbumFolderViewItem(tqparent, palbum); palbum->setExtraData(this, item); } @@ -448,7 +448,7 @@ void AlbumFolderView::slotAlbumDeleted(Album *album) AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this); if(item) { - AlbumFolderViewItem *itemParent = dynamic_cast<AlbumFolderViewItem*>(item->parent()); + AlbumFolderViewItem *itemParent = dynamic_cast<AlbumFolderViewItem*>(item->tqparent()); if(itemParent) itemParent->takeItem(item); @@ -469,8 +469,8 @@ void AlbumFolderView::slotAlbumRenamed(Album *album) AlbumFolderViewItem* item = (AlbumFolderViewItem*) palbum->extraData(this); if(item) item->refresh(); - if (item->parent()) - item->parent()->sort(); + if (item->tqparent()) + item->tqparent()->sort(); } void AlbumFolderView::slotAlbumsCleared() @@ -509,7 +509,7 @@ void AlbumFolderView::setCurrentAlbum(Album *album) } void AlbumFolderView::slotGotThumbnailFromIcon(Album *album, - const QPixmap& thumbnail) + const TQPixmap& thumbnail) { if(!album || album->type() != Album::PHYSICAL) return; @@ -550,8 +550,8 @@ void AlbumFolderView::slotSelectionChanged() if (!active()) return; - QListViewItem* selItem = 0; - QListViewItemIterator it(this); + TQListViewItem* selItem = 0; + TQListViewItemIterator it(this); while(it.current()) { if(it.current()->isSelected()) @@ -578,7 +578,7 @@ void AlbumFolderView::slotSelectionChanged() d->albumMan->setCurrentAlbum(albumitem->album()); } -void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, int) +void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &, int) { KActionMenu menuImport(i18n("Import")); KActionMenu menuExport(i18n("Export")); @@ -596,7 +596,7 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } // Root folder only shows "New Album..." - if(item && item->parent()) + if(item && item->tqparent()) { popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 14); popmenu.insertItem(SmallIcon("albumfolder-properties"), i18n("Album Properties..."), 11); @@ -605,10 +605,10 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i // Add KIPI Albums plugins Actions KAction *action; - const QPtrList<KAction>& albumActions = DigikamApp::getinstance()->menuAlbumActions(); + const TQPtrList<KAction>& albumActions = DigikamApp::getinstance()->menuAlbumActions(); if(!albumActions.isEmpty()) { - QPtrListIterator<KAction> it(albumActions); + TQPtrListIterator<KAction> it(albumActions); while((action = it.current())) { action->plug(&popmenu); @@ -617,10 +617,10 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } // Add All Import Actions - const QPtrList<KAction> importActions = DigikamApp::getinstance()->menuImportActions(); + const TQPtrList<KAction> importActions = DigikamApp::getinstance()->menuImportActions(); if(!importActions.isEmpty()) { - QPtrListIterator<KAction> it3(importActions); + TQPtrListIterator<KAction> it3(importActions); while((action = it3.current())) { menuImport.insert(action); @@ -630,10 +630,10 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } // Add All Export Actions - const QPtrList<KAction> exportActions = DigikamApp::getinstance()->menuExportActions(); + const TQPtrList<KAction> exportActions = DigikamApp::getinstance()->menuExportActions(); if(!exportActions.isEmpty()) { - QPtrListIterator<KAction> it4(exportActions); + TQPtrListIterator<KAction> it4(exportActions); while((action = it4.current())) { menuExport.insert(action); @@ -643,10 +643,10 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } // Add KIPI Batch processes plugins Actions - const QPtrList<KAction>& batchActions = DigikamApp::getinstance()->menuBatchActions(); + const TQPtrList<KAction>& batchActions = DigikamApp::getinstance()->menuBatchActions(); if(!batchActions.isEmpty()) { - QPtrListIterator<KAction> it2(batchActions); + TQPtrListIterator<KAction> it2(batchActions); while((action = it2.current())) { menuKIPIBatch.insert(action); @@ -673,7 +673,7 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } } - switch(popmenu.exec((QCursor::pos()))) + switch(popmenu.exec((TQCursor::pos()))) { case 10: { @@ -692,7 +692,7 @@ void AlbumFolderView::slotContextMenu(QListViewItem *listitem, const QPoint &, i } case 13: { - QString err; + TQString err; d->albumMan->updatePAlbumIcon(item->album(), 0, err); break; } @@ -729,7 +729,7 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item) return; } - QDir libraryDir(settings->getAlbumLibraryPath()); + TQDir libraryDir(settings->getAlbumLibraryPath()); if(!libraryDir.exists()) { KMessageBox::error(0, @@ -740,35 +740,35 @@ void AlbumFolderView::albumNew(AlbumFolderViewItem *item) return; } - PAlbum *parent; + PAlbum *tqparent; if(!item) - parent = d->albumMan->findPAlbum(0); + tqparent = d->albumMan->findPAlbum(0); else - parent = item->album(); + tqparent = item->album(); - if (!parent) + if (!tqparent) return; - QString title; - QString comments; - QString collection; - QDate date; - QStringList albumCollections; + TQString title; + TQString comments; + TQString collection; + TQDate date; + TQStringList albumCollections; - if(!AlbumPropsEdit::createNew(parent, title, comments, date, collection, + if(!AlbumPropsEdit::createNew(tqparent, title, comments, date, collection, albumCollections)) return; - QStringList oldAlbumCollections(AlbumSettings::instance()->getAlbumCollectionNames()); + TQStringList oldAlbumCollections(AlbumSettings::instance()->getAlbumCollectionNames()); if(albumCollections != oldAlbumCollections) { AlbumSettings::instance()->setAlbumCollectionNames(albumCollections); resort(); } - QString errMsg; - PAlbum* album = d->albumMan->createPAlbum(parent, title, comments, + TQString errMsg; + PAlbum* album = d->albumMan->createPAlbum(tqparent, title, comments, date, collection, errMsg); if (!album) { @@ -805,14 +805,14 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) return; // find subalbums - KURL::List childrenList; - addAlbumChildrenToList(childrenList, album); + KURL::List tqchildrenList; + addAlbumChildrenToList(tqchildrenList, album); DeleteDialog dialog(this); // All subalbums will be presented in the list as well - if (!dialog.confirmDeleteList(childrenList, - childrenList.size() == 1 ? + if (!dialog.confirmDeleteList(tqchildrenList, + tqchildrenList.size() == 1 ? DeleteDialogMode::Albums : DeleteDialogMode::Subalbums, DeleteDialogMode::UserPreference)) return; @@ -825,8 +825,8 @@ void AlbumFolderView::albumDelete(AlbumFolderViewItem *item) u.setProtocol("file"); u.setPath(album->folderPath()); KIO::Job* job = DIO::del(u, useTrash); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotDIOResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotDIOResult(KIO::Job *))); } void AlbumFolderView::addAlbumChildrenToList(KURL::List &list, Album *album) @@ -866,15 +866,15 @@ void AlbumFolderView::albumRename(AlbumFolderViewItem* item) if (!album) return; - QString oldTitle(album->title()); + TQString oldTitle(album->title()); bool ok; #if KDE_IS_VERSION(3,2,0) - QString title = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldTitle), + TQString title = KInputDialog::getText(i18n("Rename Album (%1)").tqarg(oldTitle), i18n("Enter new album name:"), oldTitle, &ok, this); #else - QString title = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(oldTitle), + TQString title = KLineEditDlg::getText(i18n("Rename Item (%1)").tqarg(oldTitle), i18n("Enter new album name:"), oldTitle, &ok, this); #endif @@ -884,7 +884,7 @@ void AlbumFolderView::albumRename(AlbumFolderViewItem* item) if(title != oldTitle) { - QString errMsg; + TQString errMsg; if (!d->albumMan->renamePAlbum(album, title, errMsg)) KMessageBox::error(0, errMsg); } @@ -908,15 +908,15 @@ void AlbumFolderView::albumEdit(AlbumFolderViewItem* item) if (!album) return; - QString oldTitle(album->title()); - QString oldComments(album->caption()); - QString oldCollection(album->collection()); - QDate oldDate(album->date()); - QStringList oldAlbumCollections(AlbumSettings::instance()->getAlbumCollectionNames()); + TQString oldTitle(album->title()); + TQString oldComments(album->caption()); + TQString oldCollection(album->collection()); + TQDate oldDate(album->date()); + TQStringList oldAlbumCollections(AlbumSettings::instance()->getAlbumCollectionNames()); - QString title, comments, collection; - QDate date; - QStringList albumCollections; + TQString title, comments, collection; + TQDate date; + TQStringList albumCollections; if(AlbumPropsEdit::editProps(album, title, comments, date, collection, albumCollections)) @@ -938,7 +938,7 @@ void AlbumFolderView::albumEdit(AlbumFolderViewItem* item) if(title != oldTitle) { - QString errMsg; + TQString errMsg; if (!d->albumMan->renamePAlbum(album, title, errMsg)) KMessageBox::error(0, errMsg); } @@ -947,7 +947,7 @@ void AlbumFolderView::albumEdit(AlbumFolderViewItem* item) } } -QDragObject* AlbumFolderView::dragObject() +TQDragObject* AlbumFolderView::dragObject() { AlbumFolderViewItem *item = dynamic_cast<AlbumFolderViewItem*>(dragItem()); if(!item) @@ -965,9 +965,9 @@ QDragObject* AlbumFolderView::dragObject() return a; } -bool AlbumFolderView::acceptDrop(const QDropEvent *e) const +bool AlbumFolderView::acceptDrop(const TQDropEvent *e) const { - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); AlbumFolderViewItem *itemDrop = dynamic_cast<AlbumFolderViewItem*>(itemAt(vp)); AlbumFolderViewItem *itemDrag = dynamic_cast<AlbumFolderViewItem*>(dragItem()); @@ -985,7 +985,7 @@ bool AlbumFolderView::acceptDrop(const QDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a parent on its child makes no sense + // Dragging a tqparent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; @@ -1009,7 +1009,7 @@ bool AlbumFolderView::acceptDrop(const QDropEvent *e) const } } - if(itemDrop && !itemDrop->parent()) + if(itemDrop && !itemDrop->tqparent()) { // Do not allow drop images on album root return false; @@ -1031,7 +1031,7 @@ bool AlbumFolderView::acceptDrop(const QDropEvent *e) const return true; } - if(QUriDrag::canDecode(e)) + if(TQUriDrag::canDecode(e)) { return true; } @@ -1039,14 +1039,14 @@ bool AlbumFolderView::acceptDrop(const QDropEvent *e) const return false; } -void AlbumFolderView::contentsDropEvent(QDropEvent *e) +void AlbumFolderView::contentsDropEvent(TQDropEvent *e) { FolderView::contentsDropEvent(e); if(!acceptDrop(e)) return; - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); AlbumFolderViewItem *itemDrop = dynamic_cast<AlbumFolderViewItem*>(itemAt(vp)); if(AlbumDrag::canDecode(e)) @@ -1065,7 +1065,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel"), 20); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); if(id == 10) { @@ -1082,8 +1082,8 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) destAlbum = itemDrop->album(); } KIO::Job* job = DIO::move(album->kurl(), destAlbum->kurl()); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); } } else if (AlbumSettings::instance()->getAlbumSortOrder() @@ -1115,8 +1115,8 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (!ItemDrag::decode(e, urls, kioURLs, albumIDs, imageIDs)) return; @@ -1128,7 +1128,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) // This can be the case with reccursive content album mode. KURL::List extUrls; ImageInfoList extImgInfList; - for (QValueList<int>::iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) + for (TQValueList<int>::iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); if (info->albumID() != destAlbum->id()) @@ -1164,12 +1164,12 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if(id == 12) { - QString errMsg; + TQString errMsg; d->albumMan->updatePAlbumIcon(destAlbum, imageIDs.first(), errMsg); } return; @@ -1200,7 +1200,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } switch(id) @@ -1208,28 +1208,28 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) case 10: { KIO::Job* job = DIO::move(extUrls, destAlbum->kurl()); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); // In recurssive album contents mode, we need to force AlbumLister to take a care about // moved items. This will have no incidence in normal mode. ImageInfo* item; for (ImageInfoListIterator it(extImgInfList); (item = it.current()) ; ++it) { - AlbumLister::instance()->invalidateItem(item); + AlbumLister::instance()->tqinvalidateItem(item); } break; } case 11: { KIO::Job* job = DIO::copy(extUrls, destAlbum->kurl()); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } case 12: { - QString errMsg; + TQString errMsg; d->albumMan->updatePAlbumIcon(destAlbum, imageIDs.first(), errMsg); } default: @@ -1256,7 +1256,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel")); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: // Download from camera @@ -1277,7 +1277,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) // -- DnD from an external source ---------------------------------------- - if(QUriDrag::canDecode(e)) + if(TQUriDrag::canDecode(e)) { PAlbum* destAlbum = 0; @@ -1326,7 +1326,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } switch(id) @@ -1334,15 +1334,15 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) case 10: { KIO::Job* job = DIO::move(srcURLs, destAlbum->kurl()); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } case 11: { KIO::Job* job = DIO::copy(srcURLs, destAlbum->kurl()); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } default: @@ -1356,7 +1356,7 @@ void AlbumFolderView::contentsDropEvent(QDropEvent *e) void AlbumFolderView::albumImportFolder() { AlbumSettings* settings = AlbumSettings::instance(); - QDir libraryDir(settings->getAlbumLibraryPath()); + TQDir libraryDir(settings->getAlbumLibraryPath()); if(!libraryDir.exists()) { KMessageBox::error(0, @@ -1367,34 +1367,34 @@ void AlbumFolderView::albumImportFolder() return; } - PAlbum* parent = 0; + PAlbum* tqparent = 0; if(selectedItem()) { AlbumFolderViewItem *folderItem = dynamic_cast<AlbumFolderViewItem*>(selectedItem()); Album *album = folderItem->album(); if (album && album->type() == Album::PHYSICAL) { - parent = dynamic_cast<PAlbum*>(album); + tqparent = dynamic_cast<PAlbum*>(album); } } - if(!parent) - parent = dynamic_cast<PAlbum*>(d->albumMan->findPAlbum(0)); + if(!tqparent) + tqparent = dynamic_cast<PAlbum*>(d->albumMan->findPAlbum(0)); - QString libraryPath = parent->folderPath(); + TQString libraryPath = tqparent->folderPath(); - KFileDialog dlg(QString::null, "inode/directory", this, "importFolder", true); + KFileDialog dlg(TQString(), "inode/directory", this, "importFolder", true); dlg.setCaption(i18n("Select folders to import")); dlg.setMode(KFile::Directory | KFile::Files); - if(dlg.exec() != QDialog::Accepted) + if(dlg.exec() != TQDialog::Accepted) return; KURL::List urls = dlg.selectedURLs(); if(urls.empty()) return; - KIO::Job* job = DIO::copy(urls, parent->kurl()); - connect(job, SIGNAL(result(KIO::Job *)), - this, SLOT(slotDIOResult(KIO::Job *))); + KIO::Job* job = DIO::copy(urls, tqparent->kurl()); + connect(job, TQT_SIGNAL(result(KIO::Job *)), + this, TQT_SLOT(slotDIOResult(KIO::Job *))); } void AlbumFolderView::selectItem(int id) @@ -1441,80 +1441,80 @@ AlbumFolderViewItem* AlbumFolderView::findParent(PAlbum* album, bool& failed) AlbumFolderViewItem* AlbumFolderView::findParentByFolder(PAlbum* album, bool& failed) { - AlbumFolderViewItem* parent = - (AlbumFolderViewItem*) album->parent()->extraData(this); - if (!parent) + AlbumFolderViewItem* tqparent = + (AlbumFolderViewItem*) album->tqparent()->extraData(this); + if (!tqparent) { failed = true; return 0; } failed = false; - return parent; + return tqparent; } AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool& failed) { - QStringList collectionList = AlbumSettings::instance()->getAlbumCollectionNames(); - QString collection = album->collection(); + TQStringList collectionList = AlbumSettings::instance()->getAlbumCollectionNames(); + TQString collection = album->collection(); - if (collection.isEmpty() || !collectionList.contains(collection)) + if (collection.isEmpty() || !collectionList.tqcontains(collection)) collection = i18n("Uncategorized Albums"); - AlbumFolderViewItem* parent = 0; + AlbumFolderViewItem* tqparent = 0; - for (QValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); + for (TQValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); it != d->groupItems.end(); ++it) { AlbumFolderViewItem* groupItem = *it; if (groupItem->text(0) == collection) { - parent = groupItem; + tqparent = groupItem; break; } } - // Need to create a new parent item - if (!parent) + // Need to create a new tqparent item + if (!tqparent) { - parent = new AlbumFolderViewItem(firstChild(), collection, 0, 0); - d->groupItems.append(parent); + tqparent = new AlbumFolderViewItem(firstChild(), collection, 0, 0); + d->groupItems.append(tqparent); } failed = false; - return parent; + return tqparent; } AlbumFolderViewItem* AlbumFolderView::findParentByDate(PAlbum* album, bool& failed) { - QDate date = album->date(); + TQDate date = album->date(); - QString timeString = QString::number(date.year()) + ", " + + TQString timeString = TQString::number(date.year()) + ", " + KGlobal::locale()->calendar()->monthName(date, false); - AlbumFolderViewItem* parent = 0; + AlbumFolderViewItem* tqparent = 0; - for (QValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); + for (TQValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); it != d->groupItems.end(); ++it) { AlbumFolderViewItem* groupItem = *it; if (groupItem->text(0) == timeString) { - parent = groupItem; + tqparent = groupItem; break; } } - // Need to create a new parent item - if (!parent) + // Need to create a new tqparent item + if (!tqparent) { - parent = new AlbumFolderViewItem(firstChild(), timeString, + tqparent = new AlbumFolderViewItem(firstChild(), timeString, date.year(), date.month()); - d->groupItems.append(parent); + d->groupItems.append(tqparent); } failed = false; - return parent; + return tqparent; } void AlbumFolderView::resort() @@ -1552,7 +1552,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem) if (!album || album->isRoot()) return; - AlbumFolderViewItem* oldParent = dynamic_cast<AlbumFolderViewItem*>(folderItem->parent()); + AlbumFolderViewItem* oldParent = dynamic_cast<AlbumFolderViewItem*>(folderItem->tqparent()); bool failed; AlbumFolderViewItem* newParent = findParent(album, failed); @@ -1567,7 +1567,7 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem) else removeItem(folderItem); - // insert into new parent + // insert into new tqparent if (newParent) newParent->insertItem(folderItem); else @@ -1576,9 +1576,9 @@ void AlbumFolderView::reparentItem(AlbumFolderViewItem* folderItem) void AlbumFolderView::clearEmptyGroupItems() { - QValueList<AlbumFolderViewItem*> deleteItems; + TQValueList<AlbumFolderViewItem*> deleteItems; - for (QValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); + for (TQValueList<AlbumFolderViewItem*>::iterator it=d->groupItems.begin(); it != d->groupItems.end(); ++it) { AlbumFolderViewItem* groupItem = *it; @@ -1589,7 +1589,7 @@ void AlbumFolderView::clearEmptyGroupItems() } } - for (QValueList<AlbumFolderViewItem*>::iterator it=deleteItems.begin(); + for (TQValueList<AlbumFolderViewItem*>::iterator it=deleteItems.begin(); it != deleteItems.end(); ++it) { d->groupItems.remove(*it); @@ -1599,7 +1599,7 @@ void AlbumFolderView::clearEmptyGroupItems() void AlbumFolderView::refresh() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1610,9 +1610,9 @@ void AlbumFolderView::refresh() } } -void AlbumFolderView::slotRefresh(const QMap<int, int>& albumsStatMap) +void AlbumFolderView::slotRefresh(const TQMap<int, int>& albumsStatMap) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1622,7 +1622,7 @@ void AlbumFolderView::slotRefresh(const QMap<int, int>& albumsStatMap) if (item->album()) { int id = item->id(); - QMap<int, int>::const_iterator it2 = albumsStatMap.find(id); + TQMap<int, int>::const_iterator it2 = albumsStatMap.tqfind(id); if ( it2 != albumsStatMap.end() ) item->setCount(it2.data()); } diff --git a/digikam/digikam/albumfolderview.h b/digikam/digikam/albumfolderview.h index bbbd0bc..08a10d7 100644 --- a/digikam/digikam/albumfolderview.h +++ b/digikam/digikam/albumfolderview.h @@ -35,7 +35,7 @@ #include "folderview.h" -class QPixmap; +class TQPixmap; class KURL; @@ -50,10 +50,11 @@ class AlbumFolderViewPriv; class AlbumFolderView : public FolderView { Q_OBJECT + TQ_OBJECT public: - AlbumFolderView(QWidget *parent); + AlbumFolderView(TQWidget *tqparent); ~AlbumFolderView(); void albumImportFolder(); @@ -76,11 +77,11 @@ signals: public slots: - void slotTextFolderFilterChanged(const QString&); + void slotTextFolderFilterChanged(const TQString&); private slots: - void slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail); + void slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail); void slotThumbnailLost(Album *album); void slotReloadThumbnails(); void slotSelectionChanged(); @@ -91,17 +92,17 @@ private slots: void slotAlbumIconChanged(Album* album); void slotAlbumRenamed(Album *album); - void slotContextMenu(QListViewItem*, const QPoint&, int); + void slotContextMenu(TQListViewItem*, const TQPoint&, int); void slotDIOResult(KIO::Job* job); - void slotRefresh(const QMap<int, int>&); + void slotRefresh(const TQMap<int, int>&); protected: - void contentsDropEvent(QDropEvent *e); - QDragObject* dragObject(); - bool acceptDrop(const QDropEvent *e) const; + void contentsDropEvent(TQDropEvent *e); + TQDragObject* dragObject(); + bool acceptDrop(const TQDropEvent *e) const; void selectItem(int id); diff --git a/digikam/digikam/albumhistory.cpp b/digikam/digikam/albumhistory.cpp index 54a17d7..174c879 100644 --- a/digikam/digikam/albumhistory.cpp +++ b/digikam/digikam/albumhistory.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> // Local includes. @@ -50,7 +50,7 @@ public: widget = 0; }; - HistoryItem(Album *a, QWidget *w) + HistoryItem(Album *a, TQWidget *w) { album = a; widget = w; @@ -62,7 +62,7 @@ public: } Album *album; - QWidget *widget; + TQWidget *widget; }; AlbumHistory::AlbumHistory() @@ -97,7 +97,7 @@ void AlbumHistory::clearHistory() m_moving = false; } -void AlbumHistory::addAlbum(Album *album, QWidget *widget) +void AlbumHistory::addAlbum(Album *album, TQWidget *widget) { if(!album || !widget || m_moving) { @@ -217,7 +217,7 @@ void AlbumHistory::deleteAlbum(Album *album) forward(); } -void AlbumHistory::getBackwardHistory(QStringList &list) const +void AlbumHistory::getBackwardHistory(TQStringList &list) const { if(m_backwardStack->isEmpty()) return; @@ -229,7 +229,7 @@ void AlbumHistory::getBackwardHistory(QStringList &list) const } } -void AlbumHistory::getForwardHistory(QStringList &list) const +void AlbumHistory::getForwardHistory(TQStringList &list) const { if(m_forwardStack->isEmpty()) return; @@ -241,7 +241,7 @@ void AlbumHistory::getForwardHistory(QStringList &list) const } } -void AlbumHistory::back(Album **album, QWidget **widget, unsigned int steps) +void AlbumHistory::back(Album **album, TQWidget **widget, unsigned int steps) { *album = 0; *widget = 0; @@ -265,7 +265,7 @@ void AlbumHistory::back(Album **album, QWidget **widget, unsigned int steps) } } -void AlbumHistory::forward(Album **album, QWidget **widget, unsigned int steps) +void AlbumHistory::forward(Album **album, TQWidget **widget, unsigned int steps) { *album = 0; *widget = 0; @@ -305,7 +305,7 @@ HistoryItem* AlbumHistory::getCurrentAlbum() const return m_backwardStack->last(); } -void AlbumHistory::getCurrentAlbum(Album **album, QWidget **widget) const +void AlbumHistory::getCurrentAlbum(Album **album, TQWidget **widget) const { *album = 0; *widget = 0; diff --git a/digikam/digikam/albumhistory.h b/digikam/digikam/albumhistory.h index 80777f0..5b3edda 100644 --- a/digikam/digikam/albumhistory.h +++ b/digikam/digikam/albumhistory.h @@ -26,11 +26,11 @@ /** @file albumhistory.h */ -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> namespace Digikam { @@ -44,24 +44,25 @@ class HistoryItem; * The user is able to navigate through the albums, he has * opened during a session. */ -class AlbumHistory : public QObject +class AlbumHistory : public TQObject { Q_OBJECT + TQ_OBJECT public: AlbumHistory(); ~AlbumHistory(); - void addAlbum(Album *album, QWidget *widget = 0); + void addAlbum(Album *album, TQWidget *widget = 0); void deleteAlbum(Album *album); void clearHistory(); - void back(Album **album, QWidget **widget, unsigned int steps=1); - void forward(Album **album, QWidget **widget, unsigned int steps=1); - void getCurrentAlbum(Album **album, QWidget **widget) const; + void back(Album **album, TQWidget **widget, unsigned int steps=1); + void forward(Album **album, TQWidget **widget, unsigned int steps=1); + void getCurrentAlbum(Album **album, TQWidget **widget) const; - void getBackwardHistory(QStringList &list) const; - void getForwardHistory(QStringList &list) const; + void getBackwardHistory(TQStringList &list) const; + void getForwardHistory(TQStringList &list) const; bool isForwardEmpty() const; bool isBackwardEmpty() const; @@ -71,7 +72,7 @@ private: HistoryItem* getCurrentAlbum() const; void forward(unsigned int steps=1); - typedef QValueList<HistoryItem*> AlbumStack; + typedef TQValueList<HistoryItem*> AlbumStack; AlbumStack *m_backwardStack; AlbumStack *m_forwardStack; diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp index 387b48c..2186d39 100644 --- a/digikam/digikam/albumicongroupitem.cpp +++ b/digikam/digikam/albumicongroupitem.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqpainter.h> // KDE includes. @@ -93,31 +93,31 @@ void AlbumIconGroupItem::paintBanner() AlbumManager* man = AlbumManager::instance(); PAlbum* album = man->findPAlbum(m_albumID); - QString dateAndComments; - QString prettyURL; + TQString dateAndComments; + TQString prettyURL; if (album) { - QDate date = album->date(); + TQDate date = album->date(); dateAndComments = i18n("%1 %2 - 1 Item", "%1 %2 - %n Items", count()) - .arg(KGlobal::locale()->calendar()->monthName(date, false)) - .arg(KGlobal::locale()->calendar()->year(date)); + .tqarg(KGlobal::locale()->calendar()->monthName(date, false)) + .tqarg(KGlobal::locale()->calendar()->year(date)); if (!album->caption().isEmpty()) { - QString caption = album->caption(); - dateAndComments += " - " + caption.replace("\n", " "); + TQString caption = album->caption(); + dateAndComments += " - " + caption.tqreplace("\n", " "); } prettyURL = album->prettyURL(); } - QRect r(0, 0, rect().width(), rect().height()); + TQRect r(0, 0, rect().width(), rect().height()); - QPixmap pix(m_view->bannerPixmap()); + TQPixmap pix(m_view->bannerPixmap()); - QFont fn(m_view->font()); + TQFont fn(m_view->font()); fn.setBold(true); int fnSize = fn.pointSize(); bool usePointSize; @@ -133,13 +133,13 @@ void AlbumIconGroupItem::paintBanner() usePointSize = false; } - QPainter p(&pix); + TQPainter p(&pix); p.setPen(ThemeEngine::instance()->textSelColor()); p.setFont(fn); - QRect tr; + TQRect tr; p.drawText(5, 5, r.width(), r.height(), - Qt::AlignLeft | Qt::AlignTop, prettyURL, + TQt::AlignLeft | TQt::AlignTop, prettyURL, -1, &tr); r.setY(tr.height() + 2); @@ -153,13 +153,13 @@ void AlbumIconGroupItem::paintBanner() p.setFont(fn); p.drawText(5, r.y(), r.width(), r.height(), - Qt::AlignLeft | Qt::AlignVCenter, dateAndComments); + TQt::AlignLeft | TQt::AlignVCenter, dateAndComments); p.end(); r = rect(); - r = QRect(iconView()->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(iconView()->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(iconView()->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 78f869c..92236b1 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -22,17 +22,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qpainter.h> -#include <qpixmap.h> -#include <qpalette.h> -#include <qstring.h> -#include <qpen.h> -#include <qfontmetrics.h> -#include <qfont.h> -#include <qdatetime.h> -#include <qstringlist.h> +// TQt includes. + +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpalette.h> +#include <tqstring.h> +#include <tqpen.h> +#include <tqfontmetrics.h> +#include <tqfont.h> +#include <tqdatetime.h> +#include <tqstringlist.h> // KDE includes. @@ -68,23 +68,23 @@ public: bool dirty; - QRect tightPixmapRect; + TQRect tightPixmapRect; ImageInfo *info; AlbumIconView *view; }; -static void dateToString(const QDateTime& datetime, QString& str) +static void dateToString(const TQDateTime& datetime, TQString& str) { str = KGlobal::locale()->formatDateTime(datetime, true, false); } -AlbumIconItem::AlbumIconItem(IconGroupItem* parent, ImageInfo* info) - : IconItem(parent) +AlbumIconItem::AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info) + : IconItem(tqparent) { d = new AlbumIconItemPriv; - d->view = (AlbumIconView*) parent->iconView(); + d->view = (AlbumIconView*) tqparent->iconView(); d->info = info; } @@ -93,17 +93,17 @@ AlbumIconItem::~AlbumIconItem() delete d; } -QString AlbumIconItem::squeezedText(QPainter* p, int width, const QString& text) +TQString AlbumIconItem::squeezedText(TQPainter* p, int width, const TQString& text) { - QString fullText(text); - fullText.replace("\n"," "); - QFontMetrics fm(p->fontMetrics()); + TQString fullText(text); + fullText.tqreplace("\n"," "); + TQFontMetrics fm(p->fontMetrics()); int textWidth = fm.width(fullText); if (textWidth > width) { // start with the dots only - QString squeezedText = "..."; + TQString squeezedText = "..."; int squeezedWidth = fm.width(squeezedText); // estimate how many letters we can add to the dots on both sides @@ -210,13 +210,13 @@ int AlbumIconItem::compare(IconItem *item) return 0; } -QRect AlbumIconItem::clickToOpenRect() +TQRect AlbumIconItem::clickToOpenRect() { if (d->tightPixmapRect.isNull()) return rect(); - QRect pixmapRect = d->tightPixmapRect; - QRect r = rect(); + TQRect pixmapRect = d->tightPixmapRect; + TQRect r = rect(); pixmapRect.moveBy(r.x(), r.y()); return pixmapRect; @@ -224,8 +224,8 @@ QRect AlbumIconItem::clickToOpenRect() void AlbumIconItem::paintItem() { - QPixmap pix; - QRect r; + TQPixmap pix; + TQRect r; const AlbumSettings *settings = d->view->settings(); if (isSelected()) @@ -235,13 +235,13 @@ void AlbumIconItem::paintItem() ThemeEngine* te = ThemeEngine::instance(); - QPainter p(&pix); + TQPainter p(&pix); p.setPen(isSelected() ? te->textSelColor() : te->textRegColor()); d->dirty = true; - QPixmap *thumbnail = d->view->pixmapManager()->find(d->info->kurl()); + TQPixmap *thumbnail = d->view->pixmapManager()->tqfind(d->info->kurl()); if (thumbnail) { r = d->view->itemPixmapRect(); @@ -257,7 +257,7 @@ void AlbumIconItem::paintItem() if (settings->getIconShowRating()) { r = d->view->itemRatingRect(); - QPixmap ratingPixmap = d->view->ratingPixmap(); + TQPixmap ratingPixmap = d->view->ratingPixmap(); int rating = d->info->rating(); @@ -272,7 +272,7 @@ void AlbumIconItem::paintItem() { r = d->view->itemNameRect(); p.setFont(d->view->itemFontReg()); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), d->info->name())); } @@ -280,56 +280,56 @@ void AlbumIconItem::paintItem() if (settings->getIconShowComments()) { - QString comments = d->info->caption(); + TQString comments = d->info->caption(); r = d->view->itemCommentsRect(); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), comments)); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), comments)); } p.setFont(d->view->itemFontXtra()); if (settings->getIconShowDate()) { - QDateTime date(d->info->dateTime()); + TQDateTime date(d->info->dateTime()); r = d->view->itemDateRect(); p.setFont(d->view->itemFontXtra()); - QString str; + TQString str; dateToString(date, str); - str = i18n("created : %1").arg(str); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), str)); + str = i18n("created : %1").tqarg(str); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str)); } if (settings->getIconShowModDate()) { - QDateTime date(d->info->modDateTime()); + TQDateTime date(d->info->modDateTime()); r = d->view->itemModDateRect(); p.setFont(d->view->itemFontXtra()); - QString str; + TQString str; dateToString(date, str); - str = i18n("modified : %1").arg(str); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), str)); + str = i18n("modified : %1").tqarg(str); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str)); } if (settings->getIconShowResolution()) { - QSize dims = d->info->dimensions(); + TQSize dims = d->info->dimensions(); if (dims.isValid()) { - QString mpixels, resolution; + TQString mpixels, resolution; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); resolution = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); r = d->view->itemResolutionRect(); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), resolution)); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), resolution)); } } if (settings->getIconShowSize()) { r = d->view->itemSizeRect(); - p.drawText(r, Qt::AlignCenter, + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), KIO::convertSize(d->info->fileSize()))); } @@ -339,34 +339,34 @@ void AlbumIconItem::paintItem() if (settings->getIconShowTags()) { - QString tags = d->info->tagNames().join(", "); + TQString tags = d->info->tagNames().join(", "); r = d->view->itemTagRect(); - p.drawText(r, Qt::AlignCenter, + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), tags)); } if (this == d->view->currentItem()) { - p.setPen(QPen(isSelected() ? te->textSelColor() : te->textRegColor(), - 0, Qt::DotLine)); + p.setPen(TQPen(isSelected() ? te->textSelColor() : te->textRegColor(), + 0, TQt::DotLine)); p.drawRect(1, 1, pix.width()-2, pix.height()-2); } p.end(); r = rect(); - r = QRect(d->view->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(d->view->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(d->view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); } -QRect AlbumIconItem::thumbnailRect() const +TQRect AlbumIconItem::thumbnailRect() const { - QRect pixmapRect = d->view->itemPixmapRect(); - QRect r = rect(); + TQRect pixmapRect = d->view->itemPixmapRect(); + TQRect r = rect(); pixmapRect.moveBy(r.x(), r.y()); return pixmapRect; diff --git a/digikam/digikam/albumiconitem.h b/digikam/digikam/albumiconitem.h index 1387896..be3c5ba 100644 --- a/digikam/digikam/albumiconitem.h +++ b/digikam/digikam/albumiconitem.h @@ -25,16 +25,16 @@ #ifndef ALBUMICONITEM_H #define ALBUMICONITEM_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Local includes. #include "iconitem.h" -class QPainter; -class QString; +class TQPainter; +class TQString; namespace Digikam { @@ -48,19 +48,19 @@ class AlbumIconItem : public IconItem public: - AlbumIconItem(IconGroupItem* parent, ImageInfo* info); + AlbumIconItem(IconGroupItem* tqparent, ImageInfo* info); ~AlbumIconItem(); ImageInfo* imageInfo() const; - QRect thumbnailRect() const; + TQRect thumbnailRect() const; bool isDirty(); - static QString squeezedText(QPainter* p, int width, const QString& text); + static TQString squeezedText(TQPainter* p, int width, const TQString& text); virtual int compare(IconItem *item); - virtual QRect clickToOpenRect(); + virtual TQRect clickToOpenRect(); protected: diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index 13d983c..6b8286d 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -40,28 +40,28 @@ extern "C" #include <cstdio> -// Qt includes. - -#include <qpixmap.h> -#include <qimage.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpainter.h> -#include <qpoint.h> -#include <qpopupmenu.h> -#include <qdatetime.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qdragobject.h> -#include <qcursor.h> -#include <qvaluevector.h> -#include <qptrlist.h> -#include <qintdict.h> -#include <qdict.h> -#include <qdatastream.h> -#include <qtimer.h> -#include <qclipboard.h> +// TQt includes. + +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqpoint.h> +#include <tqpopupmenu.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqdragobject.h> +#include <tqcursor.h> +#include <tqvaluevector.h> +#include <tqptrlist.h> +#include <tqintdict.h> +#include <tqdict.h> +#include <tqdatastream.h> +#include <tqtimer.h> +#include <tqclipboard.h> // KDE includes. @@ -151,39 +151,39 @@ public: toolTip = 0; } - QString albumTitle; - QString albumDate; - QString albumComments; + TQString albumTitle; + TQString albumDate; + TQString albumComments; - QRect itemRect; - QRect itemRatingRect; - QRect itemDateRect; - QRect itemModDateRect; - QRect itemPixmapRect; - QRect itemNameRect; - QRect itemCommentsRect; - QRect itemResolutionRect; - QRect itemSizeRect; - QRect itemTagRect; - QRect bannerRect; + TQRect tqitemRect; + TQRect itemRatingRect; + TQRect itemDateRect; + TQRect itemModDateRect; + TQRect itemPixmapRect; + TQRect itemNameRect; + TQRect itemCommentsRect; + TQRect itemResolutionRect; + TQRect itemSizeRect; + TQRect itemTagRect; + TQRect bannerRect; - QPixmap itemRegPixmap; - QPixmap itemSelPixmap; - QPixmap bannerPixmap; - QPixmap ratingPixmap; + TQPixmap itemRegPixmap; + TQPixmap itemSelPixmap; + TQPixmap bannerPixmap; + TQPixmap ratingPixmap; - QFont fnReg; - QFont fnCom; - QFont fnXtra; + TQFont fnReg; + TQFont fnCom; + TQFont fnXtra; - QDict<AlbumIconItem> itemDict; + TQDict<AlbumIconItem> itemDict; KURL itemUrlToFind; AlbumLister *imageLister; Album *currentAlbum; const AlbumSettings *albumSettings; - QIntDict<AlbumIconGroupItem> albumDict; + TQIntDict<AlbumIconGroupItem> albumDict; PixmapManager *pixMan; ThumbnailSize thumbSize; @@ -191,8 +191,8 @@ public: AlbumFileTip *toolTip; }; -AlbumIconView::AlbumIconView(QWidget* parent) - : IconView(parent) +AlbumIconView::AlbumIconView(TQWidget* tqparent) + : IconView(tqparent) { d = new AlbumIconViewPrivate; d->init(); @@ -207,74 +207,74 @@ AlbumIconView::AlbumIconView(QWidget* parent) KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; - d->ratingPixmap = QPixmap(ratingPixPath); + d->ratingPixmap = TQPixmap(ratingPixPath); - QPainter painter(&d->ratingPixmap); + TQPainter painter(&d->ratingPixmap); painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(), ThemeEngine::instance()->textSpecialRegColor()); painter.end(); // -- ImageLister connections ------------------------------------- - connect(d->imageLister, SIGNAL(signalNewFilteredItems(const ImageInfoList&)), - this, SLOT(slotImageListerNewItems(const ImageInfoList&))); + connect(d->imageLister, TQT_SIGNAL(signalNewFilteredItems(const ImageInfoList&)), + this, TQT_SLOT(slotImageListerNewItems(const ImageInfoList&))); - connect(d->imageLister, SIGNAL(signalDeleteFilteredItem(ImageInfo*)), - this, SLOT(slotImageListerDeleteItem(ImageInfo*)) ); + connect(d->imageLister, TQT_SIGNAL(signalDeleteFilteredItem(ImageInfo*)), + this, TQT_SLOT(slotImageListerDeleteItem(ImageInfo*)) ); - connect(d->imageLister, SIGNAL(signalClear()), - this, SLOT(slotImageListerClear())); + connect(d->imageLister, TQT_SIGNAL(signalClear()), + this, TQT_SLOT(slotImageListerClear())); // -- Icon connections -------------------------------------------- - connect(this, SIGNAL(signalDoubleClicked(IconItem*)), - this, SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQT_SLOT(slotDoubleClicked(IconItem*))); - connect(this, SIGNAL(signalReturnPressed(IconItem*)), - this, SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQT_SIGNAL(signalReturnPressed(IconItem*)), + this, TQT_SLOT(slotDoubleClicked(IconItem*))); - connect(this, SIGNAL(signalRightButtonClicked(IconItem*, const QPoint &)), - this, SLOT(slotRightButtonClicked(IconItem*, const QPoint &))); + connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(IconItem*, const TQPoint &))); - connect(this, SIGNAL(signalRightButtonClicked(const QPoint &)), - this, SLOT(slotRightButtonClicked(const QPoint &))); + connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, SIGNAL(signalSelectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(signalSelectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); - connect(this, SIGNAL(signalShowToolTip(IconItem*)), - this, SLOT(slotShowToolTip(IconItem*))); + connect(this, TQT_SIGNAL(signalShowToolTip(IconItem*)), + this, TQT_SLOT(slotShowToolTip(IconItem*))); // -- ThemeEngine connections --------------------------------------- - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + TQT_SLOT(slotThemeChanged())); // -- Pixmap manager connections ------------------------------------ - connect(d->pixMan, SIGNAL(signalPixmap(const KURL&)), - SLOT(slotGotThumbnail(const KURL&))); + connect(d->pixMan, TQT_SIGNAL(signalPixmap(const KURL&)), + TQT_SLOT(slotGotThumbnail(const KURL&))); // -- ImageAttributesWatch connections ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, SIGNAL(signalImageTagsChanged(Q_LLONG)), - this, SLOT(slotImageAttributesChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImagesChanged(int)), - this, SLOT(slotAlbumImagesChanged(int))); + connect(watch, TQT_SIGNAL(signalImagesChanged(int)), + this, TQT_SLOT(slotAlbumImagesChanged(int))); - connect(watch, SIGNAL(signalImageRatingChanged(Q_LLONG)), - this, SLOT(slotImageAttributesChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImageDateChanged(Q_LLONG)), - this, SLOT(slotImageAttributesChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImageCaptionChanged(Q_LLONG)), - this, SLOT(slotImageAttributesChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageAttributesChanged(TQ_LLONG))); } AlbumIconView::~AlbumIconView() @@ -388,12 +388,12 @@ void AlbumIconView::slotImageListerNewItems(const ImageInfoList& itemList) KURL url( item->kurl() ); url.cleanPath(); - if (AlbumIconItem *oldItem = d->itemDict.find(url.url())) + if (AlbumIconItem *oldItem = d->itemDict.tqfind(url.url())) { slotImageListerDeleteItem(oldItem->imageInfo()); } - AlbumIconGroupItem* group = d->albumDict.find(item->albumID()); + AlbumIconGroupItem* group = d->albumDict.tqfind(item->albumID()); if (!group) { group = new AlbumIconGroupItem(this, item->albumID()); @@ -511,7 +511,7 @@ void AlbumIconView::slotDoubleClicked(IconItem *item) } } -void AlbumIconView::slotRightButtonClicked(const QPoint& pos) +void AlbumIconView::slotRightButtonClicked(const TQPoint& pos) { if (!d->currentAlbum) return; @@ -523,11 +523,11 @@ void AlbumIconView::slotRightButtonClicked(const QPoint& pos) return; } - QPopupMenu popmenu(this); - KAction *paste = KStdAction::paste(this, SLOT(slotPaste()), 0); - QMimeSource *data = kapp->clipboard()->data(QClipboard::Clipboard); + TQPopupMenu popmenu(this); + KAction *paste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0); + TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); - if(!data || !QUriDrag::canDecode(data)) + if(!data || !TQUriDrag::canDecode(data)) { paste->setEnabled(false); } @@ -537,7 +537,7 @@ void AlbumIconView::slotRightButtonClicked(const QPoint& pos) delete paste; } -void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) +void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos) { if (!item) return; @@ -548,10 +548,10 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) KMimeType::Ptr mimePtr = KMimeType::findByURL(iconItem->imageInfo()->kurl(), 0, true, true); - QValueVector<KService::Ptr> serviceVector; + TQValueVector<KService::Ptr> serviceVector; KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'"); - QPopupMenu openWithMenu; + TQPopupMenu openWithMenu; KTrader::OfferList::Iterator iter; KService::Ptr ptr; @@ -567,7 +567,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) // Obtain a list of all selected images. // This is needed both for the goto tags submenu here and also // for the "move to trash" and further actions below. - QValueList<Q_LLONG> selectedImageIDs; + TQValueList<TQ_LLONG> selectedImageIDs; for (IconItem *it = firstItem(); it; it=it->nextItem()) { @@ -580,7 +580,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) // -------------------------------------------------------- // Provide Goto folder and/or date pop-up menu - QPopupMenu gotoMenu; + TQPopupMenu gotoMenu; gotoMenu.insertItem(SmallIcon("folder_image"), i18n("Album"), 20); gotoMenu.insertItem(SmallIcon("date"), i18n("Date"), 21); @@ -593,8 +593,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) if (!man->albumDB()->hasTags(selectedImageIDs)) gotoMenu.setItemEnabled(gotoTagId, false); - connect(gotoTagsPopup, SIGNAL(signalTagActivated(int)), - this, SLOT(slotGotoTag(int))); + connect(gotoTagsPopup, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotGotoTag(int))); if (d->currentAlbum->type() == Album::PHYSICAL ) { @@ -650,8 +650,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) { KAction* action = *iter; - if (QString::fromLatin1(action->name()) - == QString::fromLatin1("jpeglossless_rotate")) + if (TQString::tqfromLatin1(action->name()) + == TQString::tqfromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } @@ -682,10 +682,10 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) // -------------------------------------------------------- - KAction *copy = KStdAction::copy(this, SLOT(slotCopy()), 0); - KAction *paste = KStdAction::paste(this, SLOT(slotPaste()), 0); - QMimeSource *data = kapp->clipboard()->data(QClipboard::Clipboard); - if(!data || !QUriDrag::canDecode(data)) + 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); + if(!data || !TQUriDrag::canDecode(data)) { paste->setEnabled(false); } @@ -706,11 +706,11 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) TagsPopupMenu* assignTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::ASSIGN); TagsPopupMenu* removeTagsPopup = new TagsPopupMenu(selectedImageIDs, 1000, TagsPopupMenu::REMOVE); - connect(assignTagsPopup, SIGNAL(signalTagActivated(int)), - this, SLOT(slotAssignTag(int))); + connect(assignTagsPopup, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotAssignTag(int))); - connect(removeTagsPopup, SIGNAL(signalTagActivated(int)), - this, SLOT(slotRemoveTag(int))); + connect(removeTagsPopup, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotRemoveTag(int))); popmenu.insertItem(i18n("Assign Tag"), assignTagsPopup); @@ -728,8 +728,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) RatingPopupMenu ratingMenu; - connect(&ratingMenu, SIGNAL(activated(int)), - this, SLOT(slotAssignRating(int))); + connect(&ratingMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), &ratingMenu); @@ -778,14 +778,14 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const QPoint& pos) case 20: // goto album { - // send a signal to the parent widget (digikamview.cpp) + // send a signal to the tqparent widget (digikamview.cpp) emit signalGotoAlbumAndItem(iconItem); break; } case 21: // goto date { - // send a signal to the parent widget (digikamview.cpp) + // send a signal to the tqparent widget (digikamview.cpp) emit signalGotoDateAndItem(iconItem); break; } @@ -827,8 +827,8 @@ void AlbumIconView::slotCopy() KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; for (IconItem *it = firstItem(); it; it=it->nextItem()) { @@ -845,15 +845,15 @@ void AlbumIconView::slotCopy() if (urls.isEmpty()) return; - QDragObject* drag = 0; + TQDragObject* drag = 0; drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this); - kapp->clipboard()->setData(drag); + kapp->tqclipboard()->setData(drag); } void AlbumIconView::slotPaste() { - QMimeSource *data = kapp->clipboard()->data(QClipboard::Clipboard); + TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); if(!data) return; @@ -862,7 +862,7 @@ void AlbumIconView::slotPaste() // Check if we working on grouped items view. if (groupCount() > 1) { - AlbumIconGroupItem *grp = dynamic_cast<AlbumIconGroupItem*>(findGroup(QCursor::pos())); + AlbumIconGroupItem *grp = dynamic_cast<AlbumIconGroupItem*>(findGroup(TQCursor::pos())); if (grp) { if(d->currentAlbum->type() == Album::PHYSICAL) @@ -874,7 +874,7 @@ void AlbumIconView::slotPaste() if (!album) album = d->currentAlbum; - if(d->currentAlbum->type() == Album::PHYSICAL && QUriDrag::canDecode(data)) + if(d->currentAlbum->type() == Album::PHYSICAL && TQUriDrag::canDecode(data)) { PAlbum* palbum = (PAlbum*)album; @@ -888,8 +888,8 @@ void AlbumIconView::slotPaste() KURLDrag::decode(data, srcURLs); KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); } else if(d->currentAlbum->type() == Album::TAG && ItemDrag::canDecode(data)) { @@ -901,8 +901,8 @@ void AlbumIconView::slotPaste() KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (!ItemDrag::decode(data, urls, kioURLs, albumIDs, imageIDs)) return; @@ -910,15 +910,15 @@ void AlbumIconView::slotPaste() if (urls.isEmpty() || kioURLs.isEmpty() || albumIDs.isEmpty() || imageIDs.isEmpty()) return; - QPtrList<ImageInfo> list; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + TQPtrList<ImageInfo> list; + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); list.append(info); } - changeTagOnImageInfos(list, QValueList<int>() << talbum->id(), true, true); + changeTagOnImageInfos(list, TQValueList<int>() << talbum->id(), true, true); } } @@ -931,7 +931,7 @@ void AlbumIconView::slotSetAlbumThumbnail(AlbumIconItem *iconItem) { PAlbum *album = static_cast<PAlbum*>(d->currentAlbum); - QString err; + TQString err; AlbumManager::instance()->updatePAlbumIcon( album, iconItem->imageInfo()->id(), err ); @@ -940,9 +940,9 @@ void AlbumIconView::slotSetAlbumThumbnail(AlbumIconItem *iconItem) { TAlbum *album = static_cast<TAlbum*>(d->currentAlbum); - QString err; + TQString err; AlbumManager::instance()->updateTAlbumIcon( album, - QString(), + TQString(), iconItem->imageInfo()->id(), err ); } @@ -957,19 +957,19 @@ void AlbumIconView::slotRename(AlbumIconItem* item) // in the dialog, we cannot be sure about the item's status. ImageInfo renameInfo(*item->imageInfo()); - QFileInfo fi(item->imageInfo()->name()); - QString ext = QString(".") + fi.extension(false); - QString name = fi.fileName(); + TQFileInfo fi(item->imageInfo()->name()); + TQString ext = TQString(".") + fi.extension(false); + TQString name = fi.fileName(); name.truncate(fi.fileName().length() - ext.length()); bool ok; #if KDE_IS_VERSION(3,2,0) - QString newName = KInputDialog::getText(i18n("Rename Item (%1)").arg(fi.fileName()), + TQString newName = KInputDialog::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()), i18n("Enter new name (without extension):"), name, &ok, this); #else - QString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").arg(fi.fileName()), + TQString newName = KLineEditDlg::getText(i18n("Rename Item (%1)").tqarg(fi.fileName()), i18n("Enter new name (without extension):"), name, &ok, this); #endif @@ -982,16 +982,16 @@ void AlbumIconView::slotRename(AlbumIconItem* item) newURL.setFileName(newName + ext); KIO::CopyJob* job = DIO::rename(oldURL, newURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); - connect(job, SIGNAL(copyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)), - this, SLOT(slotRenamed(KIO::Job*, const KURL &, const KURL&))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(copyingDone(KIO::Job *, const KURL &, const KURL &, bool, bool)), + this, TQT_SLOT(slotRenamed(KIO::Job*, const KURL &, const KURL&))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). // Usually the AlbumLister will ignore changes to already listed items. - // So the renamed item need explicitly be invalidated. - d->imageLister->invalidateItem(&renameInfo); + // So the renamed item need explicitly be tqinvalidated. + d->imageLister->tqinvalidateItem(&renameInfo); } void AlbumIconView::slotRenamed(KIO::Job*, const KURL &, const KURL&newURL) @@ -1038,8 +1038,8 @@ void AlbumIconView::slotDeleteSelectedItems(bool deletePermanently) // trash does not like non-local URLs, put is not implemented KIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList, useTrash); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); // The AlbumManager KDirWatch will trigger a DIO::scan. // When this is completed, DIO will call AlbumLister::instance()->refresh(). @@ -1069,8 +1069,8 @@ void AlbumIconView::slotDeleteSelectedItemsDirectly(bool useTrash) // trash does not like non-local URLs, put is not implemented KIO::Job* job = DIO::del(useTrash ? urlList : kioUrlList , useTrash); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); } void AlbumIconView::slotFilesModified() @@ -1098,8 +1098,8 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) if (!settings) return; - QString currentFileExtension = item->imageInfo()->name().section( '.', -1 ); - QString imagefilter = settings->getImageFileFilter().lower() + + TQString currentFileExtension = item->imageInfo()->name().section( '.', -1 ); + TQString imagefilter = settings->getImageFileFilter().lower() + settings->getImageFileFilter().upper(); #if KDCRAW_VERSION < 0x000106 @@ -1116,7 +1116,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) #endif // If the current item is not an image file. - if ( !imagefilter.contains(currentFileExtension) ) + if ( !imagefilter.tqcontains(currentFileExtension) ) { KMimeType::Ptr mimePtr = KMimeType::findByURL(item->imageInfo()->kurl(), 0, true, true); @@ -1140,9 +1140,9 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) for (IconItem *it = firstItem() ; it ; it = it->nextItem()) { AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it); - QString fileExtension = iconItem->imageInfo()->kurl().fileName().section( '.', -1 ); + TQString fileExtension = iconItem->imageInfo()->kurl().fileName().section( '.', -1 ); - if ( imagefilter.find(fileExtension) != -1 ) + if ( imagefilter.tqfind(fileExtension) != -1 ) { ImageInfo *info = new ImageInfo(*iconItem->imageInfo()); info->setViewItem(0); @@ -1156,21 +1156,21 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) imview->disconnect(this); - connect(imview, SIGNAL(signalFileAdded(const KURL&)), - this, SLOT(slotFilesModified())); + connect(imview, TQT_SIGNAL(signalFileAdded(const KURL&)), + this, TQT_SLOT(slotFilesModified())); - connect(imview, SIGNAL(signalFileModified(const KURL&)), - this, SLOT(slotFilesModified(const KURL&))); + connect(imview, TQT_SIGNAL(signalFileModified(const KURL&)), + this, TQT_SLOT(slotFilesModified(const KURL&))); - connect(imview, SIGNAL(signalFileDeleted(const KURL&)), - this, SLOT(slotFilesModified())); + connect(imview, TQT_SIGNAL(signalFileDeleted(const KURL&)), + this, TQT_SLOT(slotFilesModified())); - connect(imview, SIGNAL(signalURLChanged(const KURL&)), - this, SLOT(slotImageWindowURLChanged(const KURL &))); + connect(imview, TQT_SIGNAL(signalURLChanged(const KURL&)), + this, TQT_SLOT(slotImageWindowURLChanged(const KURL &))); imview->loadImageInfos(imageInfoList, currentImageInfo, - d->currentAlbum ? i18n("Album \"%1\"").arg(d->currentAlbum->title()) : QString(), + d->currentAlbum ? i18n("Album \"%1\"").tqarg(d->currentAlbum->title()) : TQString(), true); if (imview->isHidden()) @@ -1207,11 +1207,11 @@ void AlbumIconView::insertToLightTable(const ImageInfoList& list, ImageInfo* cur ltview->disconnect(this); - connect(ltview, SIGNAL(signalFileDeleted(const KURL&)), - this, SLOT(slotFilesModified())); + connect(ltview, TQT_SIGNAL(signalFileDeleted(const KURL&)), + this, TQT_SLOT(slotFilesModified())); - connect(this, SIGNAL(signalItemsUpdated(const KURL::List&)), - ltview, SLOT(slotItemsUpdated(const KURL::List&))); + connect(this, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), + ltview, TQT_SLOT(slotItemsUpdated(const KURL::List&))); if (ltview->isHidden()) ltview->show(); @@ -1251,7 +1251,7 @@ ThumbnailSize AlbumIconView::thumbnailSize() const return d->thumbSize; } -void AlbumIconView::resizeEvent(QResizeEvent *e) +void AlbumIconView::resizeEvent(TQResizeEvent *e) { IconView::resizeEvent(e); @@ -1268,8 +1268,8 @@ void AlbumIconView::startDrag() KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; for (IconItem *it = firstItem(); it; it=it->nextItem()) { @@ -1286,30 +1286,30 @@ void AlbumIconView::startDrag() if (urls.isEmpty()) return; - QPixmap icon(DesktopIcon("image", 48)); + TQPixmap icon(DesktopIcon("image", 48)); int w = icon.width(); int h = icon.height(); - QPixmap pix(w+4,h+4); - QString text(QString::number(urls.count())); + TQPixmap pix(w+4,h+4); + TQString text(TQString::number(urls.count())); - QPainter p(&pix); - p.fillRect(0, 0, w+4, h+4, QColor(Qt::white)); - p.setPen(QPen(Qt::black, 1)); + TQPainter p(&pix); + p.fillRect(0, 0, w+4, h+4, TQColor(TQt::white)); + p.setPen(TQPen(TQt::black, 1)); p.drawRect(0, 0, w+4, h+4); p.drawPixmap(2, 2, icon); - QRect r = p.boundingRect(2,2,w,h,Qt::AlignLeft|Qt::AlignTop,text); - r.setWidth(QMAX(r.width(),r.height())); - r.setHeight(QMAX(r.width(),r.height())); - p.fillRect(r, QColor(0,80,0)); - p.setPen(Qt::white); - QFont f(font()); + TQRect r = p.boundingRect(2,2,w,h,TQt::AlignLeft|TQt::AlignTop,text); + r.setWidth(TQMAX(r.width(),r.height())); + r.setHeight(TQMAX(r.width(),r.height())); + p.fillRect(r, TQColor(0,80,0)); + p.setPen(TQt::white); + TQFont f(font()); f.setBold(true); p.setFont(f); - p.drawText(r, Qt::AlignCenter, text); + p.drawText(r, TQt::AlignCenter, text); p.end(); - QDragObject* drag = 0; + TQDragObject* drag = 0; drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this); if (drag) @@ -1319,10 +1319,10 @@ void AlbumIconView::startDrag() } } -void AlbumIconView::contentsDragMoveEvent(QDragMoveEvent *event) +void AlbumIconView::contentsDragMoveEvent(TQDragMoveEvent *event) { if (!d->currentAlbum || (AlbumDrag::canDecode(event) || - !QUriDrag::canDecode(event) && + !TQUriDrag::canDecode(event) && !CameraDragObject::canDecode(event) && !TagListDrag::canDecode(event) && !TagDrag::canDecode(event) && @@ -1335,10 +1335,10 @@ void AlbumIconView::contentsDragMoveEvent(QDragMoveEvent *event) event->accept(); } -void AlbumIconView::contentsDropEvent(QDropEvent *event) +void AlbumIconView::contentsDropEvent(TQDropEvent *event) { if (!d->currentAlbum || (AlbumDrag::canDecode(event) || - !QUriDrag::canDecode(event) && + !TQUriDrag::canDecode(event) && !CameraDragObject::canDecode(event) && !TagListDrag::canDecode(event) && !TagDrag::canDecode(event) && @@ -1354,7 +1354,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) // Check if we working on grouped items view. if (groupCount() > 1) { - AlbumIconGroupItem *grp = dynamic_cast<AlbumIconGroupItem*>(findGroup(QCursor::pos())); + AlbumIconGroupItem *grp = dynamic_cast<AlbumIconGroupItem*>(findGroup(TQCursor::pos())); if (grp) { if(d->currentAlbum->type() == Album::PHYSICAL) @@ -1368,8 +1368,8 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (ItemDrag::decode(event, urls, kioURLs, albumIDs, imageIDs)) { @@ -1378,7 +1378,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) // Check if items dropped come from outside current album. KURL::List extUrls; ImageInfoList extImgInfList; - for (QValueList<int>::iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) + for (TQValueList<int>::iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); if (info->albumID() != album->id()) @@ -1401,28 +1401,28 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) KURL::List srcURLs; KURLDrag::decode(event, srcURLs); - QPopupMenu popMenu(this); + TQPopupMenu popMenu(this); popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 ); popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: { KIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } case 11: { KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } default: @@ -1430,7 +1430,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) } } } - else if (QUriDrag::canDecode(event) && album->type() == Album::PHYSICAL) + else if (TQUriDrag::canDecode(event) && album->type() == Album::PHYSICAL) { // Drag & drop outside of digiKam PAlbum* palbum = (PAlbum*)album; @@ -1439,28 +1439,28 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) KURL::List srcURLs; KURLDrag::decode(event, srcURLs); - QPopupMenu popMenu(this); + TQPopupMenu popMenu(this); popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 ); popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 ); popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: { KIO::Job* job = DIO::move(srcURLs, destURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } case 11: { KIO::Job* job = DIO::copy(srcURLs, destURL); - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDIOResult(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDIOResult(KIO::Job*))); break; } default: @@ -1469,8 +1469,8 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) } else if(TagDrag::canDecode(event)) { - QByteArray ba = event->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = event->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -1479,7 +1479,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) if (talbum) { - QPopupMenu popMenu(this); + TQPopupMenu popMenu(this); bool moreItemsSelected = false; bool itemDropped = false; @@ -1499,20 +1499,20 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) if (moreItemsSelected) popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &Selected Items").arg(talbum->tagPath().mid(1)), 10); + i18n("Assign '%1' to &Selected Items").tqarg(talbum->tagPath().mid(1)), 10); if (itemDropped) popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &This Item").arg(talbum->tagPath().mid(1)), 12); + i18n("Assign '%1' to &This Item").tqarg(talbum->tagPath().mid(1)), 12); popMenu.insertItem(SmallIcon("tag"), - i18n("Assign '%1' to &All Items").arg(talbum->tagPath().mid(1)), 11); + i18n("Assign '%1' to &All Items").tqarg(talbum->tagPath().mid(1)), 11); popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel")); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: // Selected Items @@ -1521,9 +1521,9 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) i18n("Assigning image tags. Please wait...")); // always give a copy of the image infos (the "true"). Else there were crashes reported. - changeTagOnImageInfos(selectedImageInfos(true), QValueList<int>() << tagID, true, true); + changeTagOnImageInfos(selectedImageInfos(true), TQValueList<int>() << tagID, true, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); break; } case 11: // All Items @@ -1531,9 +1531,9 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) emit signalProgressBarMode(StatusProgressBar::ProgressBarMode, i18n("Assigning image tags. Please wait...")); - changeTagOnImageInfos(allImageInfos(true), QValueList<int>() << tagID, true, true); + changeTagOnImageInfos(allImageInfos(true), TQValueList<int>() << tagID, true, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); break; } case 12: // Dropped Item only. @@ -1541,9 +1541,9 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) AlbumIconItem *albumItem = findItem(event->pos()); if (albumItem) { - QPtrList<ImageInfo> infos; + TQPtrList<ImageInfo> infos; infos.append(albumItem->imageInfo()); - changeTagOnImageInfos(infos, QValueList<int>() << tagID, true, false); + changeTagOnImageInfos(infos, TQValueList<int>() << tagID, true, false); } break; } @@ -1554,12 +1554,12 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) } else if(TagListDrag::canDecode(event)) { - QByteArray ba = event->encodedData("digikam/taglist"); - QDataStream ds(ba, IO_ReadOnly); - QValueList<int> tagIDs; + TQByteArray ba = event->tqencodedData("digikam/taglist"); + TQDataStream ds(ba, IO_ReadOnly); + TQValueList<int> tagIDs; ds >> tagIDs; - QPopupMenu popMenu(this); + TQPopupMenu popMenu(this); bool moreItemsSelected = false; bool itemDropped = false; @@ -1589,7 +1589,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel")); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: // Selected Items @@ -1599,7 +1599,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) changeTagOnImageInfos(selectedImageInfos(true), tagIDs, true, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); break; } case 11: // All Items @@ -1609,7 +1609,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) changeTagOnImageInfos(allImageInfos(true), tagIDs, true, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); break; } case 12: // Dropped item only. @@ -1617,7 +1617,7 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) AlbumIconItem *albumItem = findItem(event->pos()); if (albumItem) { - QPtrList<ImageInfo> infos; + TQPtrList<ImageInfo> infos; infos.append(albumItem->imageInfo()); changeTagOnImageInfos(infos, tagIDs, true, false); } @@ -1632,13 +1632,13 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) CameraUI *ui = dynamic_cast<CameraUI*>(event->source()); if (ui) { - QPopupMenu popMenu(this); + TQPopupMenu popMenu(this); popMenu.insertItem(SmallIcon("down"), i18n("Download from camera"), 10); popMenu.insertItem(SmallIcon("down"), i18n("Download && Delete from camera"), 11); popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("&Cancel")); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: // Download from camera @@ -1662,20 +1662,20 @@ void AlbumIconView::contentsDropEvent(QDropEvent *event) } } -void AlbumIconView::changeTagOnImageInfos(const QPtrList<ImageInfo> &list, const QValueList<int> &tagIDs, bool addOrRemove, bool progress) +void AlbumIconView::changeTagOnImageInfos(const TQPtrList<ImageInfo> &list, const TQValueList<int> &tagIDs, bool addOrRemove, bool progress) { float cnt = list.count(); int i = 0; d->imageLister->blockSignals(true); AlbumManager::instance()->albumDB()->beginTransaction(); - for (QPtrList<ImageInfo>::const_iterator it = list.begin(); it != list.end(); ++it) + for (TQPtrList<ImageInfo>::const_iterator it = list.begin(); it != list.end(); ++it) { MetadataHub hub; hub.load(*it); - for (QValueList<int>::const_iterator tagIt = tagIDs.begin(); tagIt != tagIDs.end(); ++tagIt) + for (TQValueList<int>::const_iterator tagIt = tagIDs.begin(); tagIt != tagIDs.end(); ++tagIt) { hub.setTag(*tagIt, addOrRemove); } @@ -1699,11 +1699,11 @@ void AlbumIconView::changeTagOnImageInfos(const QPtrList<ImageInfo> &list, const updateContents(); } -bool AlbumIconView::acceptToolTip(IconItem *item, const QPoint &mousePos) +bool AlbumIconView::acceptToolTip(IconItem *item, const TQPoint &mousePos) { AlbumIconItem *iconItem = dynamic_cast<AlbumIconItem*>(item); - if (iconItem && iconItem->clickToOpenRect().contains(mousePos)) + if (iconItem && iconItem->clickToOpenRect().tqcontains(mousePos)) { return true; } @@ -1747,11 +1747,11 @@ KURL::List AlbumIconView::selectedItems() return itemList; } -QPtrList<ImageInfo> AlbumIconView::allImageInfos(bool copy) const +TQPtrList<ImageInfo> AlbumIconView::allImageInfos(bool copy) const { // Returns the list of ImageInfos of all items, // with the extra feature that the currentItem is the first in the list. - QPtrList<ImageInfo> list; + TQPtrList<ImageInfo> list; for (IconItem *it = firstItem(); it; it = it->nextItem()) { AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it); @@ -1767,11 +1767,11 @@ QPtrList<ImageInfo> AlbumIconView::allImageInfos(bool copy) const return list; } -QPtrList<ImageInfo> AlbumIconView::selectedImageInfos(bool copy) const +TQPtrList<ImageInfo> AlbumIconView::selectedImageInfos(bool copy) const { // Returns the list of ImageInfos of currently selected items, // with the extra feature that the currentItem is the first in the list. - QPtrList<ImageInfo> list; + TQPtrList<ImageInfo> list; for (IconItem *it = firstItem(); it; it = it->nextItem()) { AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it); @@ -1832,7 +1832,7 @@ void AlbumIconView::slotGotThumbnail(const KURL& url) if (!iconItem) return; - iconItem->repaint(); + iconItem->tqrepaint(); } void AlbumIconView::slotSelectionChanged() @@ -1859,15 +1859,15 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) if (urlList.count() <= 0) return; - QStringList faildItems; + TQStringList faildItems; KURL::List::Iterator it; float cnt = (float)urlList.count(); emit signalProgressBarMode(StatusProgressBar::ProgressBarMode, - i18n("Revising Exif Orientation tags. Please wait...")); + i18n("Revising Exif Qt::Orientation tags. Please wait...")); for( it = urlList.begin(); it != urlList.end(); ++it ) { - DDebug() << "Setting Exif Orientation tag to " << orientation << endl; + DDebug() << "Setting Exif Qt::Orientation tag to " << orientation << endl; DMetadata metadata((*it).path()); DMetadata::ImageOrientation o = (DMetadata::ImageOrientation)orientation; @@ -1886,14 +1886,14 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) kapp->processEvents(); } - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); if (!faildItems.isEmpty()) { if (faildItems.count() == 1) { KMessageBox::error(0, i18n("Failed to revise Exif orientation for file %1.") - .arg(faildItems[0])); + .tqarg(faildItems[0])); } else @@ -1906,102 +1906,102 @@ void AlbumIconView::slotSetExifOrientation( int orientation ) refreshItems(urlList); } -QRect AlbumIconView::itemRect() const +TQRect AlbumIconView::tqitemRect() const { - return d->itemRect; + return d->tqitemRect; } -QRect AlbumIconView::itemRatingRect() const +TQRect AlbumIconView::itemRatingRect() const { return d->itemRatingRect; } -QRect AlbumIconView::itemDateRect() const +TQRect AlbumIconView::itemDateRect() const { return d->itemDateRect; } -QRect AlbumIconView::itemModDateRect() const +TQRect AlbumIconView::itemModDateRect() const { return d->itemModDateRect; } -QRect AlbumIconView::itemPixmapRect() const +TQRect AlbumIconView::itemPixmapRect() const { return d->itemPixmapRect; } -QRect AlbumIconView::itemNameRect() const +TQRect AlbumIconView::itemNameRect() const { return d->itemNameRect; } -QRect AlbumIconView::itemCommentsRect() const +TQRect AlbumIconView::itemCommentsRect() const { return d->itemCommentsRect; } -QRect AlbumIconView::itemResolutionRect() const +TQRect AlbumIconView::itemResolutionRect() const { return d->itemResolutionRect; } -QRect AlbumIconView::itemTagRect() const +TQRect AlbumIconView::itemTagRect() const { return d->itemTagRect; } -QRect AlbumIconView::itemSizeRect() const +TQRect AlbumIconView::itemSizeRect() const { return d->itemSizeRect; } -QRect AlbumIconView::bannerRect() const +TQRect AlbumIconView::bannerRect() const { return d->bannerRect; } -QPixmap* AlbumIconView::itemBaseRegPixmap() const +TQPixmap* AlbumIconView::itemBaseRegPixmap() const { return &d->itemRegPixmap; } -QPixmap* AlbumIconView::itemBaseSelPixmap() const +TQPixmap* AlbumIconView::itemBaseSelPixmap() const { return &d->itemSelPixmap; } -QPixmap AlbumIconView::bannerPixmap() const +TQPixmap AlbumIconView::bannerPixmap() const { return d->bannerPixmap; } -QPixmap AlbumIconView::ratingPixmap() const +TQPixmap AlbumIconView::ratingPixmap() const { return d->ratingPixmap; } -QFont AlbumIconView::itemFontReg() const +TQFont AlbumIconView::itemFontReg() const { return d->fnReg; } -QFont AlbumIconView::itemFontCom() const +TQFont AlbumIconView::itemFontCom() const { return d->fnCom; } -QFont AlbumIconView::itemFontXtra() const +TQFont AlbumIconView::itemFontXtra() const { return d->fnXtra; } void AlbumIconView::updateBannerRectPixmap() { - d->bannerRect = QRect(0, 0, 0, 0); + d->bannerRect = TQRect(0, 0, 0, 0); // Title -------------------------------------------------------- - QFont fn(font()); + TQFont fn(font()); int fnSize = fn.pointSize(); bool usePointSize; if (fnSize > 0) @@ -2017,9 +2017,9 @@ void AlbumIconView::updateBannerRectPixmap() } fn.setBold(true); - QFontMetrics fm(fn); - QRect tr = fm.boundingRect(0, 0, frameRect().width(), - 0xFFFFFFFF, Qt::AlignLeft | Qt::AlignVCenter, + TQFontMetrics fm(fn); + TQRect tr = fm.boundingRect(0, 0, frameRect().width(), + 0xFFFFFFFF, TQt::AlignLeft | TQt::AlignVCenter, "XXX"); d->bannerRect.setHeight(tr.height()); @@ -2029,10 +2029,10 @@ void AlbumIconView::updateBannerRectPixmap() fn.setPixelSize(font().pixelSize()); fn.setBold(false); - fm = QFontMetrics(fn); + fm = TQFontMetrics(fn); tr = fm.boundingRect(0, 0, frameRect().width(), - 0xFFFFFFFF, Qt::AlignLeft | Qt::AlignVCenter, + 0xFFFFFFFF, TQt::AlignLeft | TQt::AlignVCenter, "XXX"); d->bannerRect.setHeight(d->bannerRect.height() + tr.height() + 10); @@ -2044,16 +2044,16 @@ void AlbumIconView::updateBannerRectPixmap() void AlbumIconView::updateItemRectsPixmap() { - d->itemRect = QRect(0,0,0,0); - d->itemRatingRect = QRect(0,0,0,0); - d->itemDateRect = QRect(0,0,0,0); - d->itemModDateRect = QRect(0,0,0,0); - d->itemPixmapRect = QRect(0,0,0,0); - d->itemNameRect = QRect(0,0,0,0); - d->itemCommentsRect = QRect(0,0,0,0); - d->itemResolutionRect = QRect(0,0,0,0); - d->itemSizeRect = QRect(0,0,0,0); - d->itemTagRect = QRect(0,0,0,0); + d->tqitemRect = 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); + d->itemPixmapRect = TQRect(0,0,0,0); + d->itemNameRect = TQRect(0,0,0,0); + d->itemCommentsRect = TQRect(0,0,0,0); + d->itemResolutionRect = TQRect(0,0,0,0); + d->itemSizeRect = TQRect(0,0,0,0); + d->itemTagRect = TQRect(0,0,0,0); d->fnReg = font(); d->fnCom = font(); @@ -2076,85 +2076,85 @@ void AlbumIconView::updateItemRectsPixmap() int margin = 5; int w = d->thumbSize.size() + 2*margin; - QFontMetrics fm(d->fnReg); - QRect oneRowRegRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + TQFontMetrics fm(d->fnReg); + TQRect oneRowRegRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); - fm = QFontMetrics(d->fnCom); - QRect oneRowComRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + fm = TQFontMetrics(d->fnCom); + TQRect oneRowComRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); - fm = QFontMetrics(d->fnXtra); - QRect oneRowXtraRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + fm = TQFontMetrics(d->fnXtra); + TQRect oneRowXtraRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); int y = margin; - d->itemPixmapRect = QRect(margin, y, w, d->thumbSize.size()+margin); + d->itemPixmapRect = TQRect(margin, y, w, d->thumbSize.size()+margin); y = d->itemPixmapRect.bottom(); if (d->albumSettings->getIconShowRating()) { - d->itemRatingRect = QRect(margin, y, w, d->ratingPixmap.height()); + d->itemRatingRect = TQRect(margin, y, w, d->ratingPixmap.height()); y = d->itemRatingRect.bottom(); } if (d->albumSettings->getIconShowName()) { - d->itemNameRect = QRect(margin, y, w, oneRowRegRect.height()); + d->itemNameRect = TQRect(margin, y, w, oneRowRegRect.height()); y = d->itemNameRect.bottom(); } if (d->albumSettings->getIconShowComments()) { - d->itemCommentsRect = QRect(margin, y, w, oneRowComRect.height()); + d->itemCommentsRect = TQRect(margin, y, w, oneRowComRect.height()); y = d->itemCommentsRect.bottom(); } if (d->albumSettings->getIconShowDate()) { - d->itemDateRect = QRect(margin, y, w, oneRowXtraRect.height()); + d->itemDateRect = TQRect(margin, y, w, oneRowXtraRect.height()); y = d->itemDateRect.bottom(); } if (d->albumSettings->getIconShowModDate()) { - d->itemModDateRect = QRect(margin, y, w, oneRowXtraRect.height()); + d->itemModDateRect = TQRect(margin, y, w, oneRowXtraRect.height()); y = d->itemModDateRect.bottom(); } if (d->albumSettings->getIconShowResolution()) { - d->itemResolutionRect = QRect(margin, y, w, oneRowXtraRect.height()); + d->itemResolutionRect = TQRect(margin, y, w, oneRowXtraRect.height()); y = d->itemResolutionRect.bottom() ; } if (d->albumSettings->getIconShowSize()) { - d->itemSizeRect = QRect(margin, y, w, oneRowXtraRect.height()); + d->itemSizeRect = TQRect(margin, y, w, oneRowXtraRect.height()); y = d->itemSizeRect.bottom(); } if (d->albumSettings->getIconShowTags()) { - d->itemTagRect = QRect(margin, y, w, oneRowComRect.height()); + d->itemTagRect = TQRect(margin, y, w, oneRowComRect.height()); y = d->itemTagRect.bottom(); } - d->itemRect = QRect(0, 0, w+2*margin, y+margin); + d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin); - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); } void AlbumIconView::slotThemeChanged() { - QPainter painter(&d->ratingPixmap); + TQPainter painter(&d->ratingPixmap); painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(), ThemeEngine::instance()->textSpecialRegColor()); painter.end(); @@ -2165,19 +2165,19 @@ void AlbumIconView::slotThemeChanged() viewport()->update(); } -AlbumIconItem* AlbumIconView::findItem(const QPoint& pos) +AlbumIconItem* AlbumIconView::findItem(const TQPoint& pos) { return dynamic_cast<AlbumIconItem*>(IconView::findItem(pos)); } -AlbumIconItem* AlbumIconView::findItem(const QString& url) const +AlbumIconItem* AlbumIconView::findItem(const TQString& url) const { - return d->itemDict.find(url); + return d->itemDict.tqfind(url); } AlbumIconItem* AlbumIconView::nextItemToThumbnail() const { - QRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); + TQRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); IconItem *fItem = findFirstVisibleItem(r); IconItem *lItem = findLastVisibleItem(r); if (!fItem || !lItem) @@ -2216,7 +2216,7 @@ void AlbumIconView::slotAlbumModified() void AlbumIconView::slotGotoTag(int tagID) { - // send a signal to the parent widget (digikamview.cpp) to change + // send a signal to the tqparent widget (digikamview.cpp) to change // to Tag view and the corresponding item emit signalGotoTagAndItem(tagID); @@ -2227,9 +2227,9 @@ void AlbumIconView::slotAssignTag(int tagID) emit signalProgressBarMode(StatusProgressBar::ProgressBarMode, i18n("Assigning image tags. Please wait...")); - changeTagOnImageInfos(selectedImageInfos(true), QValueList<int>() << tagID, true, true); + changeTagOnImageInfos(selectedImageInfos(true), TQValueList<int>() << tagID, true, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } void AlbumIconView::slotRemoveTag(int tagID) @@ -2237,9 +2237,9 @@ void AlbumIconView::slotRemoveTag(int tagID) emit signalProgressBarMode(StatusProgressBar::ProgressBarMode, i18n("Removing image tags. Please wait...")); - changeTagOnImageInfos(selectedImageInfos(true), QValueList<int>() << tagID, false, true); + changeTagOnImageInfos(selectedImageInfos(true), TQValueList<int>() << tagID, false, true); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } void AlbumIconView::slotAssignRating(int rating) @@ -2249,7 +2249,7 @@ void AlbumIconView::slotAssignRating(int rating) int i = 0; float cnt = (float)countSelected(); - rating = QMIN(RatingMax, QMAX(RatingMin, rating)); + rating = TQMIN(RatingMax, TQMAX(RatingMin, rating)); MetadataHub hub; d->imageLister->blockSignals(true); @@ -2276,7 +2276,7 @@ void AlbumIconView::slotAssignRating(int rating) d->imageLister->blockSignals(false); AlbumManager::instance()->albumDB()->commitTransaction(); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); updateContents(); } @@ -2316,7 +2316,7 @@ void AlbumIconView::slotDIOResult(KIO::Job* job) job->showErrorDialog(this); } -void AlbumIconView::slotImageAttributesChanged(Q_LLONG imageId) +void AlbumIconView::slotImageAttributesChanged(TQ_LLONG imageId) { AlbumIconItem *firstItem = static_cast<AlbumIconItem *>(findFirstVisibleItem()); AlbumIconItem *lastItem = static_cast<AlbumIconItem *>(findLastVisibleItem()); diff --git a/digikam/digikam/albumiconview.h b/digikam/digikam/albumiconview.h index 508c1c4..f1b99ae 100644 --- a/digikam/digikam/albumiconview.h +++ b/digikam/digikam/albumiconview.h @@ -28,8 +28,8 @@ // KDE includes. -#include <qrect.h> -#include <qfont.h> +#include <tqrect.h> +#include <tqfont.h> // Local includes. @@ -37,12 +37,12 @@ #include "imageinfo.h" #include "albumitemhandler.h" -class QResizeEvent; -class QDragMoveEvent; -class QDropEvent; -class QPoint; -class QString; -class QPixmap; +class TQResizeEvent; +class TQDragMoveEvent; +class TQDropEvent; +class TQPoint; +class TQString; +class TQPixmap; namespace KIO { @@ -63,10 +63,11 @@ class AlbumIconView : public IconView, public AlbumItemHandler { Q_OBJECT + TQ_OBJECT public: - AlbumIconView(QWidget* parent); + AlbumIconView(TQWidget* tqparent); ~AlbumIconView(); void setAlbum(Album* album); @@ -88,37 +89,37 @@ public: KURL::List allItems(); KURL::List selectedItems(); - QPtrList<ImageInfo> allImageInfos(bool copy) const; - QPtrList<ImageInfo> selectedImageInfos(bool copy) const; + TQPtrList<ImageInfo> allImageInfos(bool copy) const; + TQPtrList<ImageInfo> selectedImageInfos(bool copy) const; void refresh(); void refreshItems(const KURL::List& itemList); - QRect itemRect() const; - QRect itemRatingRect() const; - QRect itemDateRect() const; - QRect itemModDateRect() const; - QRect itemPixmapRect() const; - QRect itemNameRect() const; - QRect itemCommentsRect() const; - QRect itemResolutionRect() const; - QRect itemSizeRect() const; - QRect itemTagRect() const; - QRect bannerRect() const; - - QPixmap* itemBaseRegPixmap() const; - QPixmap* itemBaseSelPixmap() const; - QPixmap bannerPixmap() const; - QPixmap ratingPixmap() const; - - QFont itemFontReg() const; - QFont itemFontCom() const; - QFont itemFontXtra() const; + TQRect tqitemRect() const; + TQRect itemRatingRect() const; + TQRect itemDateRect() const; + TQRect itemModDateRect() const; + TQRect itemPixmapRect() const; + TQRect itemNameRect() const; + TQRect itemCommentsRect() const; + TQRect itemResolutionRect() const; + TQRect itemSizeRect() const; + TQRect itemTagRect() const; + TQRect bannerRect() const; + + TQPixmap* itemBaseRegPixmap() const; + TQPixmap* itemBaseSelPixmap() const; + TQPixmap bannerPixmap() const; + TQPixmap ratingPixmap() const; + + TQFont itemFontReg() const; + TQFont itemFontCom() const; + TQFont itemFontXtra() const; void clear(bool update=true); - AlbumIconItem* findItem(const QPoint& pos); - AlbumIconItem* findItem(const QString& url) const; + AlbumIconItem* findItem(const TQPoint& pos); + AlbumIconItem* findItem(const TQString& url) const; AlbumIconItem* nextItemToThumbnail() const; PixmapManager* pixmapManager() const; @@ -131,7 +132,7 @@ signals: void signalItemsAdded(); void signalItemDeleted(AlbumIconItem*); void signalCleared(); - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalItemsUpdated(const KURL::List&); void signalGotoAlbumAndItem(AlbumIconItem *); @@ -160,14 +161,14 @@ public slots: protected: - void resizeEvent(QResizeEvent* e); + void resizeEvent(TQResizeEvent* e); // DnD void startDrag(); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDropEvent(QDropEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDropEvent(TQDropEvent *e); - bool acceptToolTip(IconItem *item, const QPoint &mousePos); + bool acceptToolTip(IconItem *item, const TQPoint &mousePos); private slots: @@ -176,8 +177,8 @@ private slots: void slotImageListerClear(); void slotDoubleClicked(IconItem *item); - void slotRightButtonClicked(const QPoint& pos); - void slotRightButtonClicked(IconItem *item, const QPoint& pos); + void slotRightButtonClicked(const TQPoint& pos); + void slotRightButtonClicked(IconItem *item, const TQPoint& pos); void slotGotThumbnail(const KURL& url); void slotSelectionChanged(); @@ -198,14 +199,14 @@ private slots: void slotDIOResult(KIO::Job* job); void slotRenamed(KIO::Job*, const KURL &, const KURL&); - void slotImageAttributesChanged(Q_LLONG imageId); + void slotImageAttributesChanged(TQ_LLONG imageId); void slotAlbumImagesChanged(int albumId); private: void updateBannerRectPixmap(); void updateItemRectsPixmap(); - void changeTagOnImageInfos(const QPtrList<ImageInfo> &list, const QValueList<int> &tagIDs, bool addOrRemove, bool progress); + void changeTagOnImageInfos(const TQPtrList<ImageInfo> &list, const TQValueList<int> &tagIDs, bool addOrRemove, bool progress); private: diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index 64a384e..b9ed289 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -66,15 +66,15 @@ public: RatingFilter *ratingFilter; }; -AlbumIconViewFilter::AlbumIconViewFilter(QWidget* parent) - : QHBox(parent) +AlbumIconViewFilter::AlbumIconViewFilter(TQWidget* tqparent) + : TQHBox(tqparent) { d = new AlbumIconViewFilterPriv; d->led = new StatusLed(this); d->led->installEventFilter(this); d->led->setLedColor(StatusLed::Gray); - QWhatsThis::add(d->led, i18n("This LED indicates the global image filter status, " + TQWhatsThis::add(d->led, i18n("This LED indicates the global image filter status, " "encompassing all status-bar filters and all tag filters from the right sidebar.\n\n" "GRAY: no filter is active, all items are visible.\n" "RED: filtering is on, but no items match.\n" @@ -83,8 +83,8 @@ AlbumIconViewFilter::AlbumIconViewFilter(QWidget* parent) d->textFilter = new SearchTextBar(this, "AlbumIconViewFilterTextFilter"); d->textFilter->setEnableTextQueryCompletion(true); - QToolTip::add(d->textFilter, i18n("Text quick filter (search)")); - QWhatsThis::add(d->textFilter, i18n("Enter search patterns to quickly filter this view on file names, " + TQToolTip::add(d->textFilter, i18n("Text quick filter (search)")); + TQWhatsThis::add(d->textFilter, i18n("Enter search patterns to quickly filter this view on file names, " "captions (comments), and tags")); d->mimeFilter = new MimeFilter(this); @@ -93,20 +93,20 @@ AlbumIconViewFilter::AlbumIconViewFilter(QWidget* parent) setSpacing(KDialog::spacingHint()); setMargin(0); - connect(d->ratingFilter, SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), - this, SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); + connect(d->ratingFilter, TQT_SIGNAL(signalRatingFilterChanged(int, AlbumLister::RatingCondition)), + this, TQT_SLOT(slotRatingFilterChanged(int, AlbumLister::RatingCondition))); - connect(d->mimeFilter, SIGNAL(activated(int)), - this, SLOT(slotMimeTypeFilterChanged(int))); + connect(d->mimeFilter, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotMimeTypeFilterChanged(int))); - connect(d->textFilter, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotTextFilterChanged(const QString&))); + connect(d->textFilter, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotTextFilterChanged(const TQString&))); - connect(AlbumLister::instance(), SIGNAL(signalItemsTextFilterMatch(bool)), - d->textFilter, SLOT(slotSearchResult(bool))); + connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsTextFilterMatch(bool)), + d->textFilter, TQT_SLOT(slotSearchResult(bool))); - connect(AlbumLister::instance(), SIGNAL(signalItemsFilterMatch(bool)), - this, SLOT(slotItemsFilterMatch(bool))); + connect(AlbumLister::instance(), TQT_SIGNAL(signalItemsFilterMatch(bool)), + this, TQT_SLOT(slotItemsFilterMatch(bool))); } AlbumIconViewFilter::~AlbumIconViewFilter() @@ -143,15 +143,15 @@ void AlbumIconViewFilter::slotMimeTypeFilterChanged(int mimeTypeFilter) AlbumLister::instance()->setMimeTypeFilter(mimeTypeFilter); } -void AlbumIconViewFilter::slotTextFilterChanged(const QString& text) +void AlbumIconViewFilter::slotTextFilterChanged(const TQString& text) { AlbumLister::instance()->setTextFilter(text); } void AlbumIconViewFilter::slotItemsFilterMatch(bool match) { - QStringList filtersList; - QString message; + TQStringList filtersList; + TQString message; if (!d->textFilter->text().isEmpty()) filtersList.append(i18n("<br><nobr><i>Text</i></nobr>")); @@ -170,31 +170,31 @@ void AlbumIconViewFilter::slotItemsFilterMatch(bool match) else message = i18n("<nobr><b>Active filter:</b></nobr>"); - message.append(filtersList.join(QString())); + message.append(filtersList.join(TQString())); if (filtersList.isEmpty()) { - QToolTip::add(d->led, i18n("No active filter")); + TQToolTip::add(d->led, i18n("No active filter")); d->led->setLedColor(StatusLed::Gray); } else { - QToolTip::add(d->led, message); + TQToolTip::add(d->led, message); d->led->setLedColor(match ? StatusLed::Green : StatusLed::Red); } } -bool AlbumIconViewFilter::eventFilter(QObject *object, QEvent *e) +bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e) { - QWidget *widget = static_cast<QWidget*>(object); + TQWidget *widget = TQT_TQWIDGET(object); - if (e->type() == QEvent::MouseButtonRelease) + if (e->type() == TQEvent::MouseButtonRelease) { - QMouseEvent* event = static_cast<QMouseEvent*>(e); - if ( widget->rect().contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) + TQMouseEvent* event = TQT_TQMOUSEEVENT(e); + if ( TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) && d->led->ledColor() != StatusLed::Gray) { // Reset all filters settings. - d->textFilter->setText(QString()); + d->textFilter->setText(TQString()); d->ratingFilter->setRating(0); d->ratingFilter->setRatingFilterCondition(AlbumLister::GreaterEqualCondition); d->mimeFilter->setMimeFilter(MimeFilter::AllFiles); diff --git a/digikam/digikam/albumiconviewfilter.h b/digikam/digikam/albumiconviewfilter.h index d343fd7..16ce714 100644 --- a/digikam/digikam/albumiconviewfilter.h +++ b/digikam/digikam/albumiconviewfilter.h @@ -24,30 +24,31 @@ #ifndef ALBUMICONVIEWFILTER_H #define ALBUMICONVIEWFILTER_H -// Qt includes. +// TQt includes. -#include "qhbox.h" -#include "qstring.h" +#include "tqhbox.h" +#include "tqstring.h" // Local includes. #include "albumlister.h" -class QEvent; -class QObject; +class TQEvent; +class TQObject; namespace Digikam { class AlbumIconViewFilterPriv; -class AlbumIconViewFilter : public QHBox +class AlbumIconViewFilter : public TQHBox { Q_OBJECT + TQ_OBJECT public: - AlbumIconViewFilter(QWidget* parent); + AlbumIconViewFilter(TQWidget* tqparent); ~AlbumIconViewFilter(); void readSettings(); @@ -61,12 +62,12 @@ private slots: void slotRatingFilterChanged(int, AlbumLister::RatingCondition); void slotMimeTypeFilterChanged(int); - void slotTextFilterChanged(const QString&); + void slotTextFilterChanged(const TQString&); void slotItemsFilterMatch(bool); private: - bool eventFilter(QObject *object, QEvent *e); + bool eventFilter(TQObject *object, TQEvent *e); private: diff --git a/digikam/digikam/albuminfo.h b/digikam/digikam/albuminfo.h index e40d1a0..17e191e 100644 --- a/digikam/digikam/albuminfo.h +++ b/digikam/digikam/albuminfo.h @@ -26,11 +26,11 @@ /** @file albuminfo.h */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qvaluelist.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqdatetime.h> // KDE includes. @@ -48,14 +48,14 @@ class AlbumInfo { public: - typedef QValueList<AlbumInfo> List; + typedef TQValueList<AlbumInfo> List; int id; - QString url; - QString caption; - QString collection; - QDate date; - QString icon; + TQString url; + TQString caption; + TQString collection; + TQDate date; + TQString icon; /** * needed for sorting @@ -75,12 +75,12 @@ class TagInfo { public: - typedef QValueList<TagInfo> List; + typedef TQValueList<TagInfo> List; int id; int pid; - QString name; - QString icon; + TQString name; + TQString icon; }; /** @@ -92,10 +92,10 @@ class SearchInfo { public: - typedef QValueList<SearchInfo> List; + typedef TQValueList<SearchInfo> List; int id; - QString name; + TQString name; KURL url; /** diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp index 33be5c1..c6b385c 100644 --- a/digikam/digikam/albumlister.cpp +++ b/digikam/digikam/albumlister.cpp @@ -35,17 +35,17 @@ extern "C" #include <cstdio> #include <ctime> -// Qt includes. - -#include <qstring.h> -#include <qcstring.h> -#include <qdatastream.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qmap.h> -#include <qpair.h> -#include <qvaluelist.h> -#include <qtimer.h> +// TQt includes. + +#include <tqstring.h> +#include <tqcstring.h> +#include <tqdatastream.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqmap.h> +#include <tqpair.h> +#include <tqvaluelist.h> +#include <tqtimer.h> // KDE includes. @@ -92,16 +92,16 @@ public: int recurseAlbums; int recurseTags; - QString namesFilter; - QString textFilter; + TQString namesFilter; + TQString textFilter; - QMap<Q_LLONG, ImageInfo*> itemMap; - QMap<int, int> invalidatedItems; - QMap<QDateTime, bool> dayFilter; + TQMap<TQ_LLONG, ImageInfo*> itemMap; + TQMap<int, int> tqinvalidatedItems; + TQMap<TQDateTime, bool> dayFilter; - QValueList<int> tagFilter; + TQValueList<int> tagFilter; - QTimer *filterTimer; + TQTimer *filterTimer; KIO::TransferJob *job; @@ -132,10 +132,10 @@ AlbumLister::AlbumLister() d = new AlbumListerPriv; d->itemList.setAutoDelete(true); - d->filterTimer = new QTimer(this); + d->filterTimer = new TQTimer(this); - connect(d->filterTimer, SIGNAL(timeout()), - this, SLOT(slotFilterItems())); + connect(d->filterTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotFilterItems())); } AlbumLister::~AlbumLister() @@ -162,8 +162,8 @@ void AlbumLister::openAlbum(Album *album) if (!album) return; - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << AlbumManager::instance()->getLibraryPath(); ds << album->kurl(); ds << d->namesFilter; @@ -173,13 +173,13 @@ void AlbumLister::openAlbum(Album *album) // Protocol = digikamalbums -> kio_digikamalbums d->job = new KIO::TransferJob(album->kurl(), KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); - connect(d->job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotResult(KIO::Job*))); - connect(d->job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotData(KIO::Job*, const QByteArray&))); + connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); } void AlbumLister::refresh() @@ -202,8 +202,8 @@ void AlbumLister::refresh() d->itemMap.insert(item->id(), item); } - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << AlbumManager::instance()->getLibraryPath(); ds << d->currAlbum->kurl(); ds << d->namesFilter; @@ -212,20 +212,20 @@ void AlbumLister::refresh() ds << d->recurseTags; d->job = new KIO::TransferJob(d->currAlbum->kurl(), KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); - connect(d->job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotResult(KIO::Job*))); - connect(d->job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotData(KIO::Job*, const QByteArray&))); + connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); } -void AlbumLister::setDayFilter(const QValueList<QDateTime>& days) +void AlbumLister::setDayFilter(const TQValueList<TQDateTime>& days) { d->dayFilter.clear(); - for (QValueList<QDateTime>::const_iterator it = days.begin(); it != days.end(); ++it) + for (TQValueList<TQDateTime>::const_iterator it = days.begin(); it != days.end(); ++it) d->dayFilter.insert(*it, true); d->filterTimer->start(100, true); @@ -239,7 +239,7 @@ bool AlbumLister::tagFiltersIsActive() return false; } -void AlbumLister::setTagFilter(const QValueList<int>& tags, const MatchingCondition& matchingCond, +void AlbumLister::setTagFilter(const TQValueList<int>& tags, const MatchingCondition& matchingCond, bool showUnTagged) { d->tagFilter = tags; @@ -261,7 +261,7 @@ void AlbumLister::setMimeTypeFilter(int mimeTypeFilter) d->filterTimer->start(100, true); } -void AlbumLister::setTextFilter(const QString& text) +void AlbumLister::setTextFilter(const TQString& text) { d->textFilter = text; d->filterTimer->start(100, true); @@ -289,14 +289,14 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) if (!d->tagFilter.isEmpty()) { - QValueList<int> tagIDs = info->tagIDs(); - QValueList<int>::iterator it; + TQValueList<int> tagIDs = info->tagIDs(); + TQValueList<int>::iterator it; if (d->matchingCond == OrCondition) { for (it = d->tagFilter.begin(); it != d->tagFilter.end(); ++it) { - if (tagIDs.contains(*it)) + if (tagIDs.tqcontains(*it)) { match = true; break; @@ -309,7 +309,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) for (it = d->tagFilter.begin(); it != d->tagFilter.end(); ++it) { - if (!tagIDs.contains(*it)) + if (!tagIDs.tqcontains(*it)) break; } @@ -330,7 +330,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) if (!d->dayFilter.isEmpty()) { - match &= d->dayFilter.contains(QDateTime(info->dateTime().date(), QTime())); + match &= d->dayFilter.tqcontains(TQDateTime(info->dateTime().date(), TQTime())); } //-- Filter by rating --------------------------------------------------------- @@ -365,63 +365,63 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) // -- Filter by mime type ----------------------------------------------------- - QFileInfo fi(info->filePath()); - QString mimeType = fi.extension(false).upper(); + TQFileInfo fi(info->filePath()); + TQString mimeType = fi.extension(false).upper(); switch(d->mimeTypeFilter) { case MimeFilter::ImageFiles: { - QString imageFilesExt(AlbumSettings::instance()->getImageFileFilter()); + TQString imageFilesExt(AlbumSettings::instance()->getImageFileFilter()); imageFilesExt.append(AlbumSettings::instance()->getRawFileFilter()); - if (!imageFilesExt.upper().contains(mimeType)) + if (!imageFilesExt.upper().tqcontains(mimeType)) match = false; break; } case MimeFilter::JPGFiles: { - if (mimeType != QString("JPG") && mimeType != QString("JPE") && - mimeType != QString("JPEG")) + if (mimeType != TQString("JPG") && mimeType != TQString("JPE") && + mimeType != TQString("JPEG")) match = false; break; } case MimeFilter::PNGFiles: { - if (mimeType != QString("PNG")) + if (mimeType != TQString("PNG")) match = false; break; } case MimeFilter::TIFFiles: { - if (mimeType != QString("TIF") && mimeType != QString("TIFF")) + if (mimeType != TQString("TIF") && mimeType != TQString("TIFF")) match = false; break; } case MimeFilter::NoRAWFiles: { - QString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); - if (rawFilesExt.upper().contains(mimeType)) + TQString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); + if (rawFilesExt.upper().tqcontains(mimeType)) match = false; break; } case MimeFilter::RAWFiles: { - QString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); - if (!rawFilesExt.upper().contains(mimeType)) + TQString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); + if (!rawFilesExt.upper().tqcontains(mimeType)) match = false; break; } case MimeFilter::MoviesFiles: { - QString moviesFilesExt(AlbumSettings::instance()->getMovieFileFilter()); - if (!moviesFilesExt.upper().contains(mimeType)) + TQString moviesFilesExt(AlbumSettings::instance()->getMovieFileFilter()); + if (!moviesFilesExt.upper().tqcontains(mimeType)) match = false; break; } case MimeFilter::AudioFiles: { - QString audioFilesExt(AlbumSettings::instance()->getAudioFileFilter()); - if (!audioFilesExt.upper().contains(mimeType)) + TQString audioFilesExt(AlbumSettings::instance()->getAudioFileFilter()); + if (!audioFilesExt.upper().tqcontains(mimeType)) match = false; break; } @@ -434,21 +434,21 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) if (!d->textFilter.isEmpty()) { foundText = false; - if (info->name().lower().contains(d->textFilter.lower())) + if (info->name().lower().tqcontains(d->textFilter.lower())) { foundText = true; } - if (info->caption().lower().contains(d->textFilter.lower())) + if (info->caption().lower().tqcontains(d->textFilter.lower())) foundText = true; - QStringList tags = info->tagNames(); - for (QStringList::const_iterator it = tags.constBegin() ; it != tags.constEnd() ; ++it) + TQStringList tags = info->tagNames(); + for (TQStringList::const_iterator it = tags.constBegin() ; it != tags.constEnd() ; ++it) { - if ((*it).lower().contains(d->textFilter.lower())) + if ((*it).lower().tqcontains(d->textFilter.lower())) foundText = true; } // check for folder names PAlbum* palbum = AlbumManager::instance()->findPAlbum(info->albumID()); - if ((palbum && palbum->title().lower().contains(d->textFilter.lower()))) + if ((palbum && palbum->title().lower().tqcontains(d->textFilter.lower()))) { foundText = true; } @@ -474,14 +474,14 @@ void AlbumLister::stop() } } -void AlbumLister::setNamesFilter(const QString& namesFilter) +void AlbumLister::setNamesFilter(const TQString& namesFilter) { d->namesFilter = namesFilter; } -void AlbumLister::invalidateItem(const ImageInfo *item) +void AlbumLister::tqinvalidateItem(const ImageInfo *item) { - d->invalidatedItems.insert(item->id(), item->id()); + d->tqinvalidatedItems.insert(item->id(), item->id()); } void AlbumLister::slotFilterItems() @@ -492,8 +492,8 @@ void AlbumLister::slotFilterItems() return; } - QPtrList<ImageInfo> newFilteredItemsList; - QPtrList<ImageInfo> deleteFilteredItemsList; + TQPtrList<ImageInfo> newFilteredItemsList; + TQPtrList<ImageInfo> deleteFilteredItemsList; ImageInfo *item = 0; bool matchForText = false; bool match = false; @@ -548,11 +548,11 @@ void AlbumLister::slotResult(KIO::Job* job) { DWarning() << "Failed to list url: " << job->errorString() << endl; d->itemMap.clear(); - d->invalidatedItems.clear(); + d->tqinvalidatedItems.clear(); return; } - typedef QMap<Q_LLONG, ImageInfo*> ImMap; + typedef TQMap<TQ_LLONG, ImageInfo*> ImMap; for (ImMap::iterator it = d->itemMap.begin(); it != d->itemMap.end(); ++it) @@ -563,27 +563,27 @@ void AlbumLister::slotResult(KIO::Job* job) } d->itemMap.clear(); - d->invalidatedItems.clear(); + d->tqinvalidatedItems.clear(); emit signalCompleted(); } -void AlbumLister::slotData(KIO::Job*, const QByteArray& data) +void AlbumLister::slotData(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; - Q_LLONG imageID; + TQ_LLONG imageID; int albumID; - QString name; - QString date; + TQString name; + TQString date; size_t size; - QSize dims; + TQSize dims; ImageInfoList newItemsList; ImageInfoList newFilteredItemsList; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); while (!ds.atEnd()) { @@ -596,12 +596,12 @@ void AlbumLister::slotData(KIO::Job*, const QByteArray& data) ds >> size; ds >> dims; - if (d->itemMap.contains(imageID)) + if (d->itemMap.tqcontains(imageID)) { ImageInfo* info = d->itemMap[imageID]; d->itemMap.remove(imageID); - if (d->invalidatedItems.contains(imageID)) + if (d->tqinvalidatedItems.tqcontains(imageID)) { emit signalDeleteItem(info); emit signalDeleteFilteredItem(info); @@ -618,7 +618,7 @@ void AlbumLister::slotData(KIO::Job*, const QByteArray& data) } ImageInfo* info = new ImageInfo(imageID, albumID, name, - QDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, Qt::ISODate), size, dims); if (matchesFilter(info, foundText)) diff --git a/digikam/digikam/albumlister.h b/digikam/digikam/albumlister.h index 25b2400..9229986 100644 --- a/digikam/digikam/albumlister.h +++ b/digikam/digikam/albumlister.h @@ -28,10 +28,10 @@ /** @file albumlister.h */ -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qcstring.h> +#include <tqobject.h> +#include <tqcstring.h> // Local includes. @@ -57,9 +57,10 @@ class AlbumListerPriv; * to connect to the AlbumLister for notifications of new Images, deletion of * Images or refreshing of currently listed Image. */ -class AlbumLister : public QObject +class AlbumLister : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -99,18 +100,18 @@ public: */ void refresh(); - void setNamesFilter(const QString& namesFilter); + void setNamesFilter(const TQString& namesFilter); - void setDayFilter(const QValueList<QDateTime>& days); + void setDayFilter(const TQValueList<TQDateTime>& days); - void setTagFilter(const QValueList<int>& tags, const MatchingCondition& matchingCond, + void setTagFilter(const TQValueList<int>& tags, const MatchingCondition& matchingCond, bool showUnTagged=false); void setRatingFilter(int rating, const RatingCondition& ratingCond); void setMimeTypeFilter(int mimeTypeFilter); - void setTextFilter(const QString& text); + void setTextFilter(const TQString& text); void setRecurseAlbums(bool recursive); void setRecurseTags(bool recursive); @@ -119,7 +120,7 @@ public: * Trigger a recreation of the given ImageInfo object * for the next refresh. */ - void invalidateItem(const ImageInfo *item); + void tqinvalidateItem(const ImageInfo *item); bool tagFiltersIsActive(); @@ -139,7 +140,7 @@ private slots: void slotFilterItems(); void slotResult(KIO::Job* job); - void slotData(KIO::Job* job, const QByteArray& data); + void slotData(KIO::Job* job, const TQByteArray& data); private: diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index 28ee62f..ebbfca9 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -40,15 +40,15 @@ extern "C" #include <cstdio> #include <cerrno> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qdir.h> -#include <qdict.h> -#include <qintdict.h> -#include <qcstring.h> -#include <qtextcodec.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqdict.h> +#include <tqintdict.h> +#include <tqcstring.h> +#include <tqtextcodec.h> +#include <tqdatetime.h> // KDE includes. @@ -79,9 +79,9 @@ extern "C" namespace Digikam { -typedef QDict<PAlbum> PAlbumDict; -typedef QIntDict<Album> AlbumIntDict; -typedef QValueList<QDateTime> DDateList; +typedef TQDict<PAlbum> PAlbumDict; +typedef TQIntDict<Album> AlbumIntDict; +typedef TQValueList<TQDateTime> DDateList; class AlbumManagerPriv { @@ -106,8 +106,8 @@ public: bool changed; - QString libraryPath; - QStringList dirtyAlbums; + TQString libraryPath; + TQStringList dirtyAlbums; DDateList dbPathModificationDateList; @@ -129,15 +129,15 @@ public: AlbumDB *db; AlbumItemHandler *itemHandler; - QValueList<QDateTime> buildDirectoryModList(const QFileInfo &dbFile) + TQValueList<TQDateTime> buildDirectoryModList(const TQFileInfo &dbFile) { // retrieve modification dates of all files in the database-file dir - QValueList<QDateTime> modList; - const QFileInfoList *fileInfoList = dbFile.dir().entryInfoList(QDir::Files | QDir::Dirs ); + TQValueList<TQDateTime> modList; + const TQFileInfoList *fileInfoList = dbFile.dir().entryInfoList(TQDir::Files | TQDir::Dirs ); // build list - QFileInfoListIterator it(*fileInfoList); - QFileInfo *fi; + TQFileInfoListIterator it(*fileInfoList); + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -206,9 +206,9 @@ AlbumDB* AlbumManager::albumDB() return d->db; } -void AlbumManager::setLibraryPath(const QString& path, SplashScreen *splash) +void AlbumManager::setLibraryPath(const TQString& path, SplashScreen *splash) { - QString cleanPath = QDir::cleanDirPath(path); + TQString cleanPath = TQDir::cleanDirPath(path); if (cleanPath == d->libraryPath) return; @@ -255,18 +255,18 @@ void AlbumManager::setLibraryPath(const QString& path, SplashScreen *splash) d->libraryPath = cleanPath; - QString dbPath = cleanPath + "/digikam3.db"; + TQString dbPath = cleanPath + "/digikam3.db"; #ifdef NFS_HACK - dbPath = locateLocal("appdata", KIO::encodeFileName(QDir::cleanDirPath(dbPath))); + dbPath = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(dbPath))); #endif d->db->setDBPath(dbPath); // -- Locale Checking --------------------------------------------------------- - QString currLocale(QTextCodec::codecForLocale()->name()); - QString dbLocale = d->db->getSetting("Locale"); + TQString currLocale(TQTextCodec::codecForLocale()->name()); + TQString dbLocale = d->db->getSetting("Locale"); // guilty until proven innocent bool localeChanged = true; @@ -288,7 +288,7 @@ void AlbumManager::setLibraryPath(const QString& path, SplashScreen *splash) // locale info LC_ALL (for eg: en_US.UTF-8) earlier, // we now save only the encoding (UTF-8) - QString oldConfigLocale = ::setlocale(0, 0); + TQString oldConfigLocale = ::setlocale(0, 0); if (oldConfigLocale == dbLocale) { @@ -326,8 +326,8 @@ void AlbumManager::setLibraryPath(const QString& path, SplashScreen *splash) "continue, click 'Yes' to work with this album. " "Otherwise, click 'No' and correct your " "locale setting before restarting digiKam") - .arg(dbLocale) - .arg(currLocale)); + .tqarg(dbLocale) + .tqarg(currLocale)); if (result != KMessageBox::Yes) exit(0); @@ -341,13 +341,13 @@ void AlbumManager::setLibraryPath(const QString& 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.") - .arg(d->libraryPath)); + .tqarg(d->libraryPath)); exit(0); } // set an initial modification list to filter out KDirWatch signals // caused by database operations - QFileInfo dbFile(dbPath); + TQFileInfo dbFile(dbPath); d->dbPathModificationDateList = d->buildDirectoryModList(dbFile); // -- Check if we need to do scanning ------------------------------------- @@ -362,7 +362,7 @@ void AlbumManager::setLibraryPath(const QString& path, SplashScreen *splash) } } -QString AlbumManager::getLibraryPath() const +TQString AlbumManager::getLibraryPath() const { return d->libraryPath; } @@ -374,17 +374,17 @@ void AlbumManager::startScan() d->changed = false; d->dirWatch = new KDirWatch(this); - connect(d->dirWatch, SIGNAL(dirty(const QString&)), - this, SLOT(slotDirty(const QString&))); + connect(d->dirWatch, TQT_SIGNAL(dirty(const TQString&)), + this, TQT_SLOT(slotDirty(const TQString&))); KDirWatch::Method m = d->dirWatch->internalMethod(); - QString mName("FAM"); + TQString mName("FAM"); if (m == KDirWatch::DNotify) - mName = QString("DNotify"); + mName = TQString("DNotify"); else if (m == KDirWatch::Stat) - mName = QString("Stat"); + mName = TQString("Stat"); else if (m == KDirWatch::INotify) - mName = QString("INotify"); + mName = TQString("INotify"); DDebug() << "KDirWatch method = " << mName << endl; d->dirWatch->addDir(d->libraryPath); @@ -397,7 +397,7 @@ void AlbumManager::startScan() d->rootSAlbum = new SAlbum(0, KURL(), true, true); - d->rootDAlbum = new DAlbum(QDate(), true); + d->rootDAlbum = new DAlbum(TQDate(), true); refresh(); @@ -425,7 +425,7 @@ void AlbumManager::refresh() void AlbumManager::scanPAlbums() { // first insert all the current PAlbums into a map for quick lookup - typedef QMap<QString, PAlbum*> AlbumMap; + typedef TQMap<TQString, PAlbum*> AlbumMap; AlbumMap aMap; AlbumIterator it(d->rootPAlbum); @@ -446,9 +446,9 @@ void AlbumManager::scanPAlbums() for (AlbumInfo::List::iterator it = aList.begin(); it != aList.end(); ++it) { AlbumInfo info = *it; - info.url = QDir::cleanDirPath(info.url); + info.url = TQDir::cleanDirPath(info.url); - if (!aMap.contains(info.url)) + if (!aMap.tqcontains(info.url)) { newAlbumList.append(info); } @@ -464,16 +464,16 @@ 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 children being removed first. + // the albums have to be removed with tqchildren 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 children are also deleted. + // But when the tqparent album gets deleted, the tqchildren are also deleted. - PAlbum* album = d->pAlbumDict.find(it.key()); + PAlbum* album = d->pAlbumDict.tqfind(it.key()); if (!album) continue; @@ -488,18 +488,18 @@ void AlbumManager::scanPAlbums() if (info.url.isEmpty() || info.url == "/") continue; - // Despite its name info.url is a QString. + // Despite its name info.url is a TQString. // setPath takes care for escaping characters that are valid for files but not for URLs ('#') KURL u; u.setPath(info.url); - QString name = u.fileName(); - // Get its parent - QString purl = u.upURL().path(-1); + TQString name = u.fileName(); + // Get its tqparent + TQString purl = u.upURL().path(-1); - PAlbum* parent = d->pAlbumDict.find(purl); - if (!parent) + PAlbum* tqparent = d->pAlbumDict.tqfind(purl); + if (!tqparent) { - DWarning() << k_funcinfo << "Could not find parent with url: " + DWarning() << k_funcinfo << "Could not find tqparent with url: " << purl << " for: " << info.url << endl; continue; } @@ -511,7 +511,7 @@ void AlbumManager::scanPAlbums() album->m_date = info.date; album->m_icon = info.icon; - album->setParent(parent); + album->setParent(tqparent); d->dirWatch->addDir(album->folderPath()); insertPAlbum(album); @@ -532,8 +532,8 @@ void AlbumManager::scanPAlbums() u.setProtocol("digikamalbums"); u.setPath("/"); - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << d->libraryPath; ds << KURL(); ds << AlbumSettings::instance()->getAllFileFilter(); @@ -542,21 +542,21 @@ void AlbumManager::scanPAlbums() ds << 0; // recursive sub-tags (not needed here) d->albumListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); d->albumListJob->addMetaData("folders", "yes"); - connect(d->albumListJob, SIGNAL(result(KIO::Job*)), - this, SLOT(slotAlbumsJobResult(KIO::Job*))); + connect(d->albumListJob, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotAlbumsJobResult(KIO::Job*))); - connect(d->albumListJob, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotAlbumsJobData(KIO::Job*, const QByteArray&))); + connect(d->albumListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotAlbumsJobData(KIO::Job*, const TQByteArray&))); } void AlbumManager::scanTAlbums() { // list TAlbums directly from the db // first insert all the current TAlbums into a map for quick lookup - typedef QMap<int, TAlbum*> TagMap; + typedef TQMap<int, TAlbum*> TagMap; TagMap tmap; tmap.insert(0, d->rootTAlbum); @@ -573,11 +573,11 @@ void AlbumManager::scanTAlbums() TagInfo::List tList = d->db->scanTags(); // sort the list. needed because we want the tags can be read in any order, - // but we want to make sure that we are ensure to find the parent TAlbum + // but we want to make sure that we are ensure to find the tqparent TAlbum // for a new TAlbum { - QIntDict<TAlbum> tagDict; + TQIntDict<TAlbum> tagDict; tagDict.setAutoDelete(false); // insert items into a dict for quick lookup @@ -596,21 +596,21 @@ void AlbumManager::scanTAlbums() tagDict.insert(0, rootTag); // build tree - QIntDictIterator<TAlbum> iter(tagDict); + TQIntDictIterator<TAlbum> iter(tagDict); for ( ; iter.current(); ++iter ) { TAlbum* album = iter.current(); if (album->m_id == 0) continue; - TAlbum* parent = tagDict.find(album->m_pid); - if (parent) + TAlbum* tqparent = tagDict.tqfind(album->m_pid); + if (tqparent) { - album->setParent(parent); + album->setParent(tqparent); } else { - DWarning() << "Failed to find parent tag for tag " + DWarning() << "Failed to find tqparent tag for tag " << iter.current()->m_title << " with pid " << iter.current()->m_pid << endl; @@ -640,29 +640,29 @@ void AlbumManager::scanTAlbums() TagInfo info = *it; // check if we have already added this tag - if (tmap.contains(info.id)) + if (tmap.tqcontains(info.id)) continue; - // Its a new album. Find the parent of the album - TagMap::iterator iter = tmap.find(info.pid); + // Its a new album. Find the tqparent of the album + TagMap::iterator iter = tmap.tqfind(info.pid); if (iter == tmap.end()) { - DWarning() << "Failed to find parent tag for tag " + DWarning() << "Failed to find tqparent tag for tag " << info.name << " with pid " << info.pid << endl; continue; } - TAlbum* parent = iter.data(); + TAlbum* tqparent = iter.data(); // Create the new TAlbum TAlbum* album = new TAlbum(info.name, info.id, false); album->m_icon = info.icon; - album->setParent(parent); + album->setParent(tqparent); insertTAlbum(album); - // also insert it in the map we are doing lookup of parent tags + // also insert it in the map we are doing lookup of tqparent tags tmap.insert(info.id, album); } @@ -681,8 +681,8 @@ void AlbumManager::scanTAlbums() u.setProtocol("digikamtags"); u.setPath("/"); - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << d->libraryPath; ds << KURL(); ds << AlbumSettings::instance()->getAllFileFilter(); @@ -691,21 +691,21 @@ void AlbumManager::scanTAlbums() ds << 0; // recursive sub-tags (not needed here) d->tagListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); d->tagListJob->addMetaData("folders", "yes"); - connect(d->tagListJob, SIGNAL(result(KIO::Job*)), - this, SLOT(slotTagsJobResult(KIO::Job*))); + connect(d->tagListJob, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotTagsJobResult(KIO::Job*))); - connect(d->tagListJob, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotTagsJobData(KIO::Job*, const QByteArray&))); + connect(d->tagListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotTagsJobData(KIO::Job*, const TQByteArray&))); } void AlbumManager::scanSAlbums() { // list SAlbums directly from the db // first insert all the current SAlbums into a map for quick lookup - typedef QMap<int, SAlbum*> SearchMap; + typedef TQMap<int, SAlbum*> SearchMap; SearchMap sMap; AlbumIterator it(d->rootSAlbum); @@ -724,10 +724,10 @@ void AlbumManager::scanSAlbums() SearchInfo info = *it; // check if we have already added this search - if (sMap.contains(info.id)) + if (sMap.tqcontains(info.id)) continue; - bool simple = (info.url.queryItem("1.key") == QString::fromLatin1("keyword")); + bool simple = (info.url.queryItem("1.key") == TQString::tqfromLatin1("keyword")); // Its a new album. SAlbum* album = new SAlbum(info.id, info.url, simple, false); @@ -751,8 +751,8 @@ void AlbumManager::scanDAlbums() u.setProtocol("digikamdates"); u.setPath("/"); - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << d->libraryPath; ds << KURL(); ds << AlbumSettings::instance()->getAllFileFilter(); @@ -761,14 +761,14 @@ void AlbumManager::scanDAlbums() ds << 0; // recursive sub-tags (not needed here) d->dateListJob = new KIO::TransferJob(u, KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); d->dateListJob->addMetaData("folders", "yes"); - connect(d->dateListJob, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDatesJobResult(KIO::Job*))); + connect(d->dateListJob, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDatesJobResult(KIO::Job*))); - connect(d->dateListJob, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotDatesJobData(KIO::Job*, const QByteArray&))); + connect(d->dateListJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotDatesJobData(KIO::Job*, const TQByteArray&))); } AlbumList AlbumManager::allPAlbums() const @@ -848,11 +848,11 @@ Album* AlbumManager::currentAlbum() const PAlbum* AlbumManager::findPAlbum(const KURL& url) const { - QString path = url.path(); + TQString path = url.path(); path.remove(d->libraryPath); - path = QDir::cleanDirPath(path); + path = TQDir::cleanDirPath(path); - return d->pAlbumDict.find(path); + return d->pAlbumDict.tqfind(path); } PAlbum* AlbumManager::findPAlbum(int id) const @@ -862,7 +862,7 @@ PAlbum* AlbumManager::findPAlbum(int id) const int gid = d->rootPAlbum->globalID() + id; - return (PAlbum*)(d->albumIntDict.find(gid)); + return (PAlbum*)(d->albumIntDict.tqfind(gid)); } TAlbum* AlbumManager::findTAlbum(int id) const @@ -872,7 +872,7 @@ TAlbum* AlbumManager::findTAlbum(int id) const int gid = d->rootTAlbum->globalID() + id; - return (TAlbum*)(d->albumIntDict.find(gid)); + return (TAlbum*)(d->albumIntDict.tqfind(gid)); } SAlbum* AlbumManager::findSAlbum(int id) const @@ -882,7 +882,7 @@ SAlbum* AlbumManager::findSAlbum(int id) const int gid = d->rootSAlbum->globalID() + id; - return (SAlbum*)(d->albumIntDict.find(gid)); + return (SAlbum*)(d->albumIntDict.tqfind(gid)); } DAlbum* AlbumManager::findDAlbum(int id) const @@ -892,15 +892,15 @@ DAlbum* AlbumManager::findDAlbum(int id) const int gid = d->rootDAlbum->globalID() + id; - return (DAlbum*)(d->albumIntDict.find(gid)); + return (DAlbum*)(d->albumIntDict.tqfind(gid)); } Album* AlbumManager::findAlbum(int gid) const { - return d->albumIntDict.find(gid); + return d->albumIntDict.tqfind(gid); } -TAlbum* AlbumManager::findTAlbum(const QString &tagPath) const +TAlbum* AlbumManager::findTAlbum(const TQString &tagPath) const { // handle gracefully with or without leading slash bool withLeadingSlash = tagPath.startsWith("/"); @@ -917,16 +917,16 @@ TAlbum* AlbumManager::findTAlbum(const QString &tagPath) const } -PAlbum* AlbumManager::createPAlbum(PAlbum* parent, - const QString& name, - const QString& caption, - const QDate& date, - const QString& collection, - QString& errMsg) +PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, + const TQString& name, + const TQString& caption, + const TQDate& date, + const TQString& collection, + TQString& errMsg) { - if (!parent) + if (!tqparent) { - errMsg = i18n("No parent found for album."); + errMsg = i18n("No tqparent found for album."); return 0; } @@ -937,14 +937,14 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* parent, return 0; } - if (name.contains("/")) + if (name.tqcontains("/")) { errMsg = i18n("Album name cannot contain '/'."); return 0; } // first check if we have another album with the same name - Album *child = parent->m_firstChild; + Album *child = tqparent->m_firstChild; while (child) { if (child->title() == name) @@ -955,13 +955,13 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* parent, child = child->m_next; } - QString path = parent->folderPath(); + TQString path = tqparent->folderPath(); path += '/' + name; - path = QDir::cleanDirPath(path); + path = TQDir::cleanDirPath(path); // make the directory synchronously, so that we can add the // album info to the database directly - if (::mkdir(QFile::encodeName(path), 0777) != 0) + if (::mkdir(TQFile::encodeName(path), 0777) != 0) { if (errno == EEXIST) errMsg = i18n("Another file or folder with same name exists"); @@ -992,7 +992,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* parent, album->m_collection = collection; album->m_date = date; - album->setParent(parent); + album->setParent(tqparent); d->dirWatch->addDir(album->folderPath()); @@ -1001,8 +1001,8 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* parent, return album; } -bool AlbumManager::renamePAlbum(PAlbum* album, const QString& newName, - QString& errMsg) +bool AlbumManager::renamePAlbum(PAlbum* album, const TQString& newName, + TQString& errMsg) { if (!album) { @@ -1016,7 +1016,7 @@ bool AlbumManager::renamePAlbum(PAlbum* album, const QString& newName, return false; } - if (newName.contains("/")) + if (newName.tqcontains("/")) { errMsg = i18n("Album name cannot contain '/'"); return false; @@ -1035,14 +1035,14 @@ bool AlbumManager::renamePAlbum(PAlbum* album, const QString& newName, sibling = sibling->m_next; } - QString oldURL = album->url(); + TQString oldURL = album->url(); KURL u = KURL::fromPathOrURL(album->folderPath()).upURL(); u.addPath(newName); u.cleanPath(); - if (::rename(QFile::encodeName(album->folderPath()), - QFile::encodeName(u.path(-1))) != 0) + if (::rename(TQFile::encodeName(album->folderPath()), + TQFile::encodeName(u.path(-1))) != 0) { errMsg = i18n("Failed to rename Album"); return false; @@ -1083,7 +1083,7 @@ bool AlbumManager::renamePAlbum(PAlbum* album, const QString& newName, return true; } -bool AlbumManager::updatePAlbumIcon(PAlbum *album, Q_LLONG iconID, QString& errMsg) +bool AlbumManager::updatePAlbumIcon(PAlbum *album, TQ_LLONG iconID, TQString& errMsg) { if (!album) { @@ -1105,12 +1105,12 @@ bool AlbumManager::updatePAlbumIcon(PAlbum *album, Q_LLONG iconID, QString& errM return true; } -TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const QString& name, - const QString& iconkde, QString& errMsg) +TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, + const TQString& iconkde, TQString& errMsg) { - if (!parent) + if (!tqparent) { - errMsg = i18n("No parent found for tag"); + errMsg = i18n("No tqparent found for tag"); return 0; } @@ -1121,14 +1121,14 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const QString& name, return 0; } - if (name.contains("/")) + if (name.tqcontains("/")) { errMsg = i18n("Tag name cannot contain '/'"); return 0; } // first check if we have another album with the same name - Album *child = parent->m_firstChild; + Album *child = tqparent->m_firstChild; while (child) { if (child->title() == name) @@ -1139,7 +1139,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const QString& name, child = child->m_next; } - int id = d->db->addTag(parent->id(), name, iconkde, 0); + int id = d->db->addTag(tqparent->id(), name, iconkde, 0); if (id == -1) { errMsg = i18n("Failed to add tag to database"); @@ -1148,14 +1148,14 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* parent, const QString& name, TAlbum *album = new TAlbum(name, id, false); album->m_icon = iconkde; - album->setParent(parent); + album->setParent(tqparent); insertTAlbum(album); return album; } -AlbumList AlbumManager::findOrCreateTAlbums(const QStringList &tagPaths) +AlbumList AlbumManager::findOrCreateTAlbums(const TQStringList &tagPaths) { IntList tagIDs; @@ -1175,7 +1175,7 @@ AlbumList AlbumManager::findOrCreateTAlbums(const QStringList &tagPaths) return resultList; } -bool AlbumManager::deleteTAlbum(TAlbum* album, QString& errMsg) +bool AlbumManager::deleteTAlbum(TAlbum* album, TQString& errMsg) { if (!album) { @@ -1207,8 +1207,8 @@ bool AlbumManager::deleteTAlbum(TAlbum* album, QString& errMsg) return true; } -bool AlbumManager::renameTAlbum(TAlbum* album, const QString& name, - QString& errMsg) +bool AlbumManager::renameTAlbum(TAlbum* album, const TQString& name, + TQString& errMsg) { if (!album) { @@ -1222,7 +1222,7 @@ bool AlbumManager::renameTAlbum(TAlbum* album, const QString& name, return false; } - if (name.contains("/")) + if (name.tqcontains("/")) { errMsg = i18n("Tag name cannot contain '/'"); return false; @@ -1248,7 +1248,7 @@ bool AlbumManager::renameTAlbum(TAlbum* album, const QString& name, return true; } -bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, QString &errMsg) +bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, TQString &errMsg) { if (!album) { @@ -1263,7 +1263,7 @@ bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, QString &errMsg) } d->db->setTagParentID(album->id(), newParent->id()); - album->parent()->removeChild(album); + album->tqparent()->removeChild(album); album->setParent(newParent); emit signalTAlbumMoved(album, newParent); @@ -1271,8 +1271,8 @@ bool AlbumManager::moveTAlbum(TAlbum* album, TAlbum *newParent, QString &errMsg) return true; } -bool AlbumManager::updateTAlbumIcon(TAlbum* album, const QString& iconKDE, - Q_LLONG iconID, QString& errMsg) +bool AlbumManager::updateTAlbumIcon(TAlbum* album, const TQString& iconKDE, + TQ_LLONG iconID, TQString& errMsg) { if (!album) { @@ -1296,7 +1296,7 @@ bool AlbumManager::updateTAlbumIcon(TAlbum* album, const QString& iconKDE, SAlbum* AlbumManager::createSAlbum(const KURL& url, bool simple) { - QString name = url.queryItem("name"); + TQString name = url.queryItem("name"); // first iterate through all the search albums and see if there's an existing // SAlbum with same name. (Remember, SAlbums are arranged in a flat list) @@ -1332,7 +1332,7 @@ bool AlbumManager::updateSAlbum(SAlbum* album, const KURL& newURL) d->db->updateSearch(album->id(), newURL.queryItem("name"), newURL); - QString oldName = album->title(); + TQString oldName = album->title(); album->m_kurl = newURL; album->setTitle(newURL.queryItem("name")); @@ -1373,7 +1373,7 @@ void AlbumManager::removePAlbum(PAlbum *album) if (!album) return; - // remove all children of this album + // remove all tqchildren of this album Album* child = album->m_firstChild; while (child) { @@ -1412,7 +1412,7 @@ void AlbumManager::removeTAlbum(TAlbum *album) if (!album) return; - // remove all children of this album + // remove all tqchildren of this album Album* child = album->m_firstChild; while (child) { @@ -1466,13 +1466,13 @@ void AlbumManager::slotAlbumsJobResult(KIO::Job* job) } } -void AlbumManager::slotAlbumsJobData(KIO::Job*, const QByteArray& data) +void AlbumManager::slotAlbumsJobData(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; - QMap<int, int> albumsStatMap; - QDataStream ds(data, IO_ReadOnly); + TQMap<int, int> albumsStatMap; + TQDataStream ds(data, IO_ReadOnly); ds >> albumsStatMap; emit signalPAlbumsDirty(albumsStatMap); @@ -1489,13 +1489,13 @@ void AlbumManager::slotTagsJobResult(KIO::Job* job) } } -void AlbumManager::slotTagsJobData(KIO::Job*, const QByteArray& data) +void AlbumManager::slotTagsJobData(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; - QMap<int, int> tagsStatMap; - QDataStream ds(data, IO_ReadOnly); + TQMap<int, int> tagsStatMap; + TQDataStream ds(data, IO_ReadOnly); ds >> tagsStatMap; emit signalTAlbumsDirty(tagsStatMap); @@ -1514,14 +1514,14 @@ void AlbumManager::slotDatesJobResult(KIO::Job* job) emit signalAllDAlbumsLoaded(); } -void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) +void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; // insert all the DAlbums into a qmap for quick access - QMap<QDate, DAlbum*> mAlbumMap; - QMap<int, DAlbum*> yAlbumMap; + TQMap<TQDate, DAlbum*> mAlbumMap; + TQMap<int, DAlbum*> yAlbumMap; AlbumIterator it(d->rootDAlbum); while (it.current()) @@ -1534,41 +1534,41 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) ++it; } - QMap<QDateTime, int> datesStatMap; - QDataStream ds(data, IO_ReadOnly); + TQMap<TQDateTime, int> datesStatMap; + TQDataStream ds(data, IO_ReadOnly); ds >> datesStatMap; - QMap<YearMonth, int> yearMonthMap; - for ( QMap<QDateTime, int>::iterator it = datesStatMap.begin(); + TQMap<YearMonth, int> yearMonthMap; + for ( TQMap<TQDateTime, int>::iterator it = datesStatMap.begin(); it != datesStatMap.end(); ++it ) { - QMap<YearMonth, int>::iterator it2 = yearMonthMap.find(YearMonth(it.key().date().year(), it.key().date().month())); + TQMap<YearMonth, int>::iterator it2 = yearMonthMap.tqfind(YearMonth(it.key().date().year(), it.key().date().month())); if ( it2 == yearMonthMap.end() ) { yearMonthMap.insert( YearMonth(it.key().date().year(), it.key().date().month()), it.data() ); } else { - yearMonthMap.replace( YearMonth(it.key().date().year(), it.key().date().month()), it2.data() + it.data() ); + yearMonthMap.tqreplace( YearMonth(it.key().date().year(), it.key().date().month()), it2.data() + it.data() ); } } int year, month; - for ( QMap<YearMonth, int>::iterator it = yearMonthMap.begin(); + for ( TQMap<YearMonth, int>::iterator it = yearMonthMap.begin(); it != yearMonthMap.end(); ++it ) { year = it.key().first; month = it.key().second; - QDate md(year, month, 1); + TQDate md(year, month, 1); // Do we already have this Month album - if (mAlbumMap.contains(md)) + if (mAlbumMap.tqcontains(md)) { // already there. remove Month album from map mAlbumMap.remove(md); - if (yAlbumMap.contains(year)) + if (yAlbumMap.tqcontains(year)) { // already there. remove from map yAlbumMap.remove(year); @@ -1583,7 +1583,7 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) while (it.current()) { DAlbum* a = (DAlbum*)(*it); - if (a->date() == QDate(year, 1, 1) && a->range() == DAlbum::Year) + if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year) { yAlbum = a; break; @@ -1594,7 +1594,7 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) // If no, create Year album. if (!yAlbum) { - yAlbum = new DAlbum(QDate(year, 1, 1), false, DAlbum::Year); + yAlbum = new DAlbum(TQDate(year, 1, 1), false, DAlbum::Year); yAlbum->setParent(d->rootDAlbum); d->albumIntDict.insert(yAlbum->globalID(), yAlbum); emit signalAlbumAdded(yAlbum); @@ -1609,7 +1609,7 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) // Now the items contained in the maps are the ones which // have been deleted. - for (QMap<QDate, DAlbum*>::iterator it = mAlbumMap.begin(); + for (TQMap<TQDate, DAlbum*>::iterator it = mAlbumMap.begin(); it != mAlbumMap.end(); ++it) { DAlbum* album = it.data(); @@ -1618,7 +1618,7 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) delete album; } - for (QMap<int, DAlbum*>::iterator it = yAlbumMap.begin(); + for (TQMap<int, DAlbum*>::iterator it = yAlbumMap.begin(); it != yAlbumMap.end(); ++it) { DAlbum* album = it.data(); @@ -1631,24 +1631,24 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const QByteArray& data) emit signalDatesMapDirty(datesStatMap); } -void AlbumManager::slotDirty(const QString& path) +void AlbumManager::slotDirty(const TQString& path) { DDebug() << "Noticed file change in directory " << path << endl; - QString url = QDir::cleanDirPath(path); - url = QDir::cleanDirPath(url.remove(d->libraryPath)); + TQString url = TQDir::cleanDirPath(path); + url = TQDir::cleanDirPath(url.remove(d->libraryPath)); if (url.isEmpty()) url = "/"; - if (d->dirtyAlbums.contains(url)) + if (d->dirtyAlbums.tqcontains(url)) return; // is the signal for the directory containing the database file? if (url == "/") { // retrieve modification dates - QFileInfo dbFile(d->libraryPath); - QValueList<QDateTime> modList = d->buildDirectoryModList(dbFile); + TQFileInfo dbFile(d->libraryPath); + TQValueList<TQDateTime> modList = d->buildDirectoryModList(dbFile); // check for equality if (modList == d->dbPathModificationDateList) diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 77313df..54c6272 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -27,14 +27,14 @@ #ifndef ALBUMMANAGER_H #define ALBUMMANAGER_H -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qobject.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qmap.h> -#include <qptrlist.h> +#include <tqdatetime.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqmap.h> +#include <tqptrlist.h> // KDE includes. @@ -44,7 +44,7 @@ #include "digikam_export.h" -class QDate; +class TQDate; namespace KIO { @@ -64,8 +64,8 @@ class AlbumItemHandler; class SplashScreen; class AlbumManagerPriv; -typedef QValueList<Album*> AlbumList; -typedef QPair<int, int> YearMonth; +typedef TQValueList<Album*> AlbumList; +typedef TQPair<int, int> YearMonth; /** * \class AlbumManager @@ -84,9 +84,10 @@ typedef QPair<int, int> YearMonth; * updating icons and moving Albums. * */ -class DIGIKAM_EXPORT AlbumManager : public QObject +class DIGIKAM_EXPORT AlbumManager : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -122,12 +123,12 @@ public: * @param path the new libraryPath * @see startScan */ - void setLibraryPath(const QString& path, SplashScreen *splash=0); + void setLibraryPath(const TQString& path, SplashScreen *splash=0); /** * @return the current libraryPath */ - QString getLibraryPath() const; + TQString getLibraryPath() const; /** * starts scanning the libraryPath and listing the albums. If the @@ -187,7 +188,7 @@ public: */ //@{ /** - * Given a complete file url (kde url with file protocol), it will try to find + * Given a complete file url (kde url with file protocol), it will try to tqfind * a PAlbum corresponding to it. * \warning This should not be used, unless really necessary * @return PAlbum correspoding to supplied @p url @@ -229,21 +230,21 @@ public: * @return a TAlbum with given tag path, or 0 if not found * @param tagPath the tag path ("People/Friend/John") */ - TAlbum* findTAlbum(const QString &tagPath) const; + TAlbum* findTAlbum(const TQString &tagPath) const; //@} /** @name Operations on PAlbum */ //@{ /** - * Create a new PAlbum with supplied properties as a child of the parent + * Create a new PAlbum with supplied properties as a child of the tqparent * This is equivalent to creating a new folder on the disk with supplied - * name in the parent's folder path. Also the supplied attributes are written + * name in the tqparent's folder path. Also the supplied attributes are written * out to the database * \note the signalAlbumAdded will be fired before this function returns. Its * recommended to connect to that signal to get notification of new album added * @return the newly created PAlbum or 0 if it fails - * @param parent the parent album under which to create the new Album + * @param tqparent the tqparent album under which to create the new Album * @param name the name of the new album * @param caption the caption for the new album * @param date the date for the new album @@ -251,10 +252,10 @@ public: * @param errMsg this will contain the error message describing why the * operation failed */ - PAlbum* createPAlbum(PAlbum* parent, const QString& name, - const QString& caption, const QDate& date, - const QString& collection, - QString& errMsg); + PAlbum* createPAlbum(PAlbum* tqparent, const TQString& name, + const TQString& caption, const TQDate& date, + const TQString& collection, + TQString& errMsg); /** * Renames a PAlbum. This is equivalent to actually renaming the corresponding @@ -265,8 +266,8 @@ public: * @param errMsg this will contain the error message describing why the * operation failed */ - bool renamePAlbum(PAlbum* album, const QString& newName, - QString& errMsg); + bool renamePAlbum(PAlbum* album, const TQString& newName, + TQString& errMsg); /** * Update the icon for an album. The @p icon is the name (and not full path) @@ -277,27 +278,27 @@ public: * @param errMsg if the operation fails, this will contain the error message * describing why the operation failed */ - bool updatePAlbumIcon(PAlbum *album, Q_LLONG iconID, QString& errMsg); + bool updatePAlbumIcon(PAlbum *album, TQ_LLONG iconID, TQString& errMsg); //@} /** @name Operations on TAlbum */ //@{ /** - * Create a new TAlbum with supplied properties as a child of the parent + * Create a new TAlbum with supplied properties as a child of the tqparent * The tag is added to the database * \note the signalAlbumAdded will be fired before this function returns. Its * recommended to connect to that signal to get notification of new album added * @return the newly created TAlbum or 0 if it fails - * @param parent the parent album under which to create the new Album + * @param tqparent the tqparent album under which to create the new Album * @param name the name of the new album * @param iconkde the iconkde for the new album (this is a filename which * kde iconloader can load up * @param errMsg this will contain the error message describing why the * operation failed */ - TAlbum* createTAlbum(TAlbum* parent, const QString& name, - const QString& iconkde, QString& errMsg); + TAlbum* createTAlbum(TAlbum* tqparent, const TQString& name, + const TQString& iconkde, TQString& errMsg); /** * A list of tag paths is supplied. @@ -305,7 +306,7 @@ public: * @param tagPath A list of tag paths * @returns A list of all TAlbums for the list (already existing or newly created) */ - AlbumList findOrCreateTAlbums(const QStringList &tagPaths); + AlbumList findOrCreateTAlbums(const TQStringList &tagPaths); /** * Delete a TAlbum. @@ -317,7 +318,7 @@ public: * @param errMsg this will contain the error message describing why the * operation failed */ - bool deleteTAlbum(TAlbum* album, QString& errMsg); + bool deleteTAlbum(TAlbum* album, TQString& errMsg); /** * Renames a TAlbum. @@ -328,18 +329,18 @@ public: * @param errMsg this will contain the error message describing why the * operation failed */ - bool renameTAlbum(TAlbum* album, const QString& name, QString& errMsg); + bool renameTAlbum(TAlbum* album, const TQString& name, TQString& errMsg); /** - * Move a TAlbum to a new parent. - * This updates the tag parent ID in the database + * Move a TAlbum to a new tqparent. + * This updates the tag tqparent ID in the database * @return true if the operation succeeds, false otherwise * @param album the Album which should be moved * @param newParent the Parent Album to which album should be moved * @param errMsg this will contain the error message describing why the * operation failed */ - bool moveTAlbum(TAlbum* album, TAlbum *newParent, QString &errMsg); + bool moveTAlbum(TAlbum* album, TAlbum *newParent, TQString &errMsg); /** * Update the icon for a TAlbum. @@ -351,10 +352,10 @@ public: * operation failed * \note if iconKDE is not empty then iconID is used. So if you want to set * the icon to a file which can be loaded by KIconLoader, pass it in as - * iconKDE. otherwise pass a null QString to iconKDE and set iconID + * iconKDE. otherwise pass a null TQString to iconKDE and set iconID */ - bool updateTAlbumIcon(TAlbum* album, const QString& iconKDE, - Q_LLONG iconID, QString& errMsg); + bool updateTAlbumIcon(TAlbum* album, const TQString& iconKDE, + TQ_LLONG iconID, TQString& errMsg); //@} /** @name Operations on SAlbum @@ -410,20 +411,20 @@ signals: void signalAlbumRenamed(Album* album); void signalTAlbumMoved(TAlbum* album, TAlbum* newParent); void signalPAlbumDirty(PAlbum* album); - void signalPAlbumsDirty(const QMap<int, int>&); - void signalTAlbumsDirty(const QMap<int, int>&); - void signalDAlbumsDirty(const QMap<YearMonth, int>&); - void signalDatesMapDirty(const QMap<QDateTime, int>&); + void signalPAlbumsDirty(const TQMap<int, int>&); + void signalTAlbumsDirty(const TQMap<int, int>&); + void signalDAlbumsDirty(const TQMap<YearMonth, int>&); + void signalDatesMapDirty(const TQMap<TQDateTime, int>&); private slots: void slotDatesJobResult(KIO::Job* job); - void slotDatesJobData(KIO::Job* job, const QByteArray& data); + void slotDatesJobData(KIO::Job* job, const TQByteArray& data); void slotAlbumsJobResult(KIO::Job* job); - void slotAlbumsJobData(KIO::Job* job, const QByteArray& data); + void slotAlbumsJobData(KIO::Job* job, const TQByteArray& data); void slotTagsJobResult(KIO::Job* job); - void slotTagsJobData(KIO::Job* job, const QByteArray& data); - void slotDirty(const QString& path); + void slotTagsJobData(KIO::Job* job, const TQByteArray& data); + void slotDirty(const TQString& path); private: diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index caac13c..8b027a1 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -23,23 +23,23 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qdatetime.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qregexp.h> -#include <qvalidator.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqdatetime.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> +#include <tqregexp.h> +#include <tqvalidator.h> // KDE includes. @@ -84,9 +84,9 @@ public: album = 0; } - QStringList albumCollections; + TQStringList albumCollections; - QComboBox *collectionCombo; + TQComboBox *collectionCombo; KLineEdit *titleEdit; @@ -106,33 +106,33 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) d->album = album; setHelp("albumpropsedit.anchor", "digikam"); - QGridLayout *topLayout = new QGridLayout( plainPage(), 2, 6, + TQGridLayout *topLayout = new TQGridLayout( plainPage(), 2, 6, 0, spacingHint() ); - QLabel *topLabel = new QLabel( plainPage() ); + TQLabel *topLabel = new TQLabel( plainPage() ); if (create) { topLabel->setText( i18n( "<qt><b>Create new Album in \"<i>%1</i>\"</b></qt>") - .arg(album->title())); + .tqarg(album->title())); } else { topLabel->setText( i18n( "<qt><b>\"<i>%1</i>\" Album Properties</b></qt>") - .arg(album->title())); + .tqarg(album->title())); } - topLabel->setAlignment(Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine); + topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); topLayout->addMultiCellWidget( topLabel, 0, 0, 0, 1 ); // -------------------------------------------------------- - QFrame *topLine = new QFrame( plainPage() ); - topLine->setFrameShape( QFrame::HLine ); - topLine->setFrameShadow( QFrame::Sunken ); + TQFrame *topLine = new TQFrame( plainPage() ); + topLine->setFrameShape( TQFrame::HLine ); + topLine->setFrameShadow( TQFrame::Sunken ); topLayout->addMultiCellWidget( topLine, 1, 1, 0, 1 ); // -------------------------------------------------------- - QLabel *titleLabel = new QLabel( plainPage( ) ); + TQLabel *titleLabel = new TQLabel( plainPage( ) ); titleLabel->setText( i18n( "&Title:" ) ); topLayout->addWidget( titleLabel, 2, 0 ); @@ -140,46 +140,46 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) topLayout->addWidget( d->titleEdit, 2, 1 ); titleLabel->setBuddy( d->titleEdit ); - QRegExp titleRx("[^/]+"); - QValidator *titleValidator = new QRegExpValidator(titleRx, this); + TQRegExp titleRx("[^/]+"); + TQValidator *titleValidator = new TQRegExpValidator(titleRx, TQT_TQOBJECT(this)); d->titleEdit->setValidator(titleValidator); - QLabel *collectionLabel = new QLabel( plainPage( ) ); + TQLabel *collectionLabel = new TQLabel( plainPage( ) ); collectionLabel->setText( i18n( "Co&llection:" ) ); topLayout->addWidget( collectionLabel, 3, 0 ); - d->collectionCombo = new QComboBox( plainPage( ) ); + d->collectionCombo = new TQComboBox( plainPage( ) ); d->collectionCombo->setEditable(true); topLayout->addWidget( d->collectionCombo, 3, 1 ); collectionLabel->setBuddy( d->collectionCombo ); - QLabel *commentsLabel = new QLabel( plainPage( ) ); + TQLabel *commentsLabel = new TQLabel( plainPage( ) ); commentsLabel->setText( i18n( "Ca&ption:" ) ); - topLayout->addWidget( commentsLabel, 4, 0, Qt::AlignAuto|Qt::AlignTop ); + topLayout->addWidget( commentsLabel, 4, 0, TQt::AlignAuto|TQt::AlignTop ); d->commentsEdit = new KTextEdit( plainPage( ) ); topLayout->addWidget( d->commentsEdit, 4, 1 ); commentsLabel->setBuddy( d->commentsEdit ); d->commentsEdit->setCheckSpellingEnabled(true); - d->commentsEdit->setWordWrap(QTextEdit::WidgetWidth); - d->commentsEdit->setWrapPolicy(QTextEdit::AtWhiteSpace); + d->commentsEdit->setWordWrap(TQTextEdit::WidgetWidth); + d->commentsEdit->setWrapPolicy(TQTextEdit::AtWhiteSpace); - QLabel *dateLabel = new QLabel( plainPage( ) ); + TQLabel *dateLabel = new TQLabel( plainPage( ) ); dateLabel->setText( i18n( "Album &date:" ) ); - topLayout->addWidget( dateLabel, 5, 0, Qt::AlignAuto|Qt::AlignTop ); + topLayout->addWidget( dateLabel, 5, 0, TQt::AlignAuto|TQt::AlignTop ); d->datePicker = new KDatePicker( plainPage( ) ); topLayout->addWidget( d->datePicker, 5, 1 ); dateLabel->setBuddy( d->datePicker ); - QHBox *buttonRow = new QHBox( plainPage( ) ); - QPushButton *dateLowButton = new QPushButton( + TQHBox *buttonRow = new TQHBox( plainPage( ) ); + TQPushButton *dateLowButton = new TQPushButton( i18n("Selects the date of the oldest image", "&Oldest" ), buttonRow ); - QPushButton *dateAvgButton = new QPushButton( + TQPushButton *dateAvgButton = new TQPushButton( i18n("Calculates the average date", "&Average" ), buttonRow ); - QPushButton *dateHighButton = new QPushButton( + TQPushButton *dateHighButton = new TQPushButton( i18n("Selects the date of the newest image", "Newest" ), buttonRow ); @@ -197,10 +197,10 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) AlbumSettings *settings = AlbumSettings::instance(); if (settings) { - d->collectionCombo->insertItem( QString() ); - QStringList collections = settings->getAlbumCollectionNames(); + d->collectionCombo->insertItem( TQString() ); + TQStringList collections = settings->getAlbumCollectionNames(); d->collectionCombo->insertStringList( collections ); - int collectionIndex = collections.findIndex( album->collection() ); + int collectionIndex = collections.tqfindIndex( album->collection() ); if ( collectionIndex != -1 ) { @@ -212,7 +212,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) if (create) { d->titleEdit->setText( i18n("New Album") ); - d->datePicker->setDate( QDate::currentDate() ); + d->datePicker->setDate( TQDate::tqcurrentDate() ); } else { @@ -223,17 +223,17 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) // -- slots connections ------------------------------------------- - connect(d->titleEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(slotTitleChanged(const QString&))); + connect(d->titleEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotTitleChanged(const TQString&))); - connect(dateLowButton, SIGNAL( clicked() ), - this, SLOT( slotDateLowButtonClicked())); + connect(dateLowButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotDateLowButtonClicked())); - connect(dateAvgButton, SIGNAL( clicked() ), - this, SLOT( slotDateAverageButtonClicked())); + connect(dateAvgButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotDateAverageButtonClicked())); - connect(dateHighButton, SIGNAL( clicked() ), - this, SLOT( slotDateHighButtonClicked())); + connect(dateHighButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotDateHighButtonClicked())); adjustSize(); } @@ -243,24 +243,24 @@ AlbumPropsEdit::~AlbumPropsEdit() delete d; } -QString AlbumPropsEdit::title() const +TQString AlbumPropsEdit::title() const { return d->titleEdit->text(); } -QString AlbumPropsEdit::comments() const +TQString AlbumPropsEdit::comments() const { return d->commentsEdit->text(); } -QDate AlbumPropsEdit::date() const +TQDate AlbumPropsEdit::date() const { return d->datePicker->date(); } -QString AlbumPropsEdit::collection() const +TQString AlbumPropsEdit::collection() const { - QString name = d->collectionCombo->currentText(); + TQString name = d->collectionCombo->currentText(); if (name.isEmpty()) { @@ -270,17 +270,17 @@ QString AlbumPropsEdit::collection() const return name; } -QStringList AlbumPropsEdit::albumCollections() const +TQStringList AlbumPropsEdit::albumCollections() const { - QStringList collections; + TQStringList collections; AlbumSettings *settings = AlbumSettings::instance(); if (settings) { collections = settings->getAlbumCollectionNames(); } - QString currentCollection = d->collectionCombo->currentText(); - if ( collections.findIndex( currentCollection ) == -1 ) + TQString currentCollection = d->collectionCombo->currentText(); + if ( collections.tqfindIndex( currentCollection ) == -1 ) { collections.append(currentCollection); } @@ -289,13 +289,13 @@ QStringList AlbumPropsEdit::albumCollections() const return collections; } -bool AlbumPropsEdit::editProps(PAlbum *album, QString& title, - QString& comments, QDate& date, QString& collection, - QStringList& albumCollections) +bool AlbumPropsEdit::editProps(PAlbum *album, TQString& title, + TQString& comments, TQDate& date, TQString& collection, + TQStringList& albumCollections) { AlbumPropsEdit dlg(album); - bool ok = dlg.exec() == QDialog::Accepted; + bool ok = dlg.exec() == TQDialog::Accepted; title = dlg.title(); comments = dlg.comments(); @@ -306,16 +306,16 @@ bool AlbumPropsEdit::editProps(PAlbum *album, QString& title, return ok; } -bool AlbumPropsEdit::createNew(PAlbum *parent, - QString& title, - QString& comments, - QDate& date, - QString& collection, - QStringList& albumCollections) +bool AlbumPropsEdit::createNew(PAlbum *tqparent, + TQString& title, + TQString& comments, + TQDate& date, + TQString& collection, + TQStringList& albumCollections) { - AlbumPropsEdit dlg(parent, true); + AlbumPropsEdit dlg(tqparent, true); - bool ok = dlg.exec() == QDialog::Accepted; + bool ok = dlg.exec() == TQDialog::Accepted; title = dlg.title(); comments = dlg.comments(); @@ -326,7 +326,7 @@ bool AlbumPropsEdit::createNew(PAlbum *parent, return ok; } -void AlbumPropsEdit::slotTitleChanged(const QString& newtitle) +void AlbumPropsEdit::slotTitleChanged(const TQString& newtitle) { enableButtonOK(!newtitle.isEmpty()); } @@ -336,7 +336,7 @@ void AlbumPropsEdit::slotDateLowButtonClicked() setCursor( KCursor::waitCursor() ); AlbumDB* db = AlbumManager::instance()->albumDB(); - QDate avDate = db->getAlbumLowestDate( d->album->id() ); + TQDate avDate = db->getAlbumLowestDate( d->album->id() ); setCursor( KCursor::arrowCursor() ); if ( avDate.isValid() ) @@ -348,7 +348,7 @@ void AlbumPropsEdit::slotDateHighButtonClicked() setCursor( KCursor::waitCursor() ); AlbumDB* db = AlbumManager::instance()->albumDB(); - QDate avDate = db->getAlbumHighestDate( d->album->id() ); + TQDate avDate = db->getAlbumHighestDate( d->album->id() ); setCursor( KCursor::arrowCursor() ); if ( avDate.isValid() ) @@ -360,7 +360,7 @@ void AlbumPropsEdit::slotDateAverageButtonClicked() setCursor( KCursor::waitCursor() ); AlbumDB* db = AlbumManager::instance()->albumDB(); - QDate avDate = db->getAlbumAverageDate( d->album->id() ); + TQDate avDate = db->getAlbumAverageDate( d->album->id() ); setCursor( KCursor::arrowCursor() ); if ( avDate.isValid() ) diff --git a/digikam/digikam/albumpropsedit.h b/digikam/digikam/albumpropsedit.h index e91695a..072a653 100644 --- a/digikam/digikam/albumpropsedit.h +++ b/digikam/digikam/albumpropsedit.h @@ -26,11 +26,11 @@ #ifndef ALBUMPROPSEDIT_H #define ALBUMPROPSEDIT_H -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqstringlist.h> // KDE includes. @@ -45,35 +45,36 @@ class AlbumPropsEditPriv; class AlbumPropsEdit : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AlbumPropsEdit(PAlbum* album, bool create=false); ~AlbumPropsEdit(); - QString title() const; - QString comments() const; - QDate date() const; - QString collection() const; - QStringList albumCollections() const; + TQString title() const; + TQString comments() const; + TQDate date() const; + TQString collection() const; + TQStringList albumCollections() const; static bool editProps(PAlbum *album, - QString& title, - QString& comments, - QDate& date, - QString& collection, - QStringList& albumCollections); - - static bool createNew(PAlbum *parent, - QString& title, - QString& comments, - QDate& date, - QString& collection, - QStringList& albumCollections); + TQString& title, + TQString& comments, + TQDate& date, + TQString& collection, + TQStringList& albumCollections); + + static bool createNew(PAlbum *tqparent, + TQString& title, + TQString& comments, + TQDate& date, + TQString& collection, + TQStringList& albumCollections); private slots: - void slotTitleChanged(const QString& newtitle); + void slotTitleChanged(const TQString& newtitle); void slotDateLowButtonClicked(); void slotDateAverageButtonClicked(); void slotDateHighButtonClicked(); diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp index 99386cd..5eb7c28 100644 --- a/digikam/digikam/albumsettings.cpp +++ b/digikam/digikam/albumsettings.cpp @@ -23,9 +23,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -112,24 +112,24 @@ public: int treeThumbnailSize; int ratingFilterCond; - QString currentTheme; - QString albumLibraryPath; - QString imageFilefilter; - QString movieFilefilter; - QString audioFilefilter; - QString rawFilefilter; - QString defaultImageFilefilter; - QString defaultMovieFilefilter; - QString defaultAudioFilefilter; - QString defaultRawFilefilter; - - QString author; - QString authorTitle; - QString credit; - QString source; - QString copyright; - - QStringList albumCollectionNames; + TQString currentTheme; + TQString albumLibraryPath; + TQString imageFilefilter; + TQString movieFilefilter; + TQString audioFilefilter; + TQString rawFilefilter; + TQString defaultImageFilefilter; + TQString defaultMovieFilefilter; + TQString defaultAudioFilefilter; + TQString defaultRawFilefilter; + + TQString author; + TQString authorTitle; + TQString credit; + TQString source; + TQString copyright; + + TQStringList albumCollectionNames; KConfig *config; @@ -190,9 +190,9 @@ void AlbumSettings::init() // RAW files estentions supported by dcraw program and // defines to digikam/libs/dcraw/rawfiles.h #if KDCRAW_VERSION < 0x000106 - d->defaultRawFilefilter = QString(KDcrawIface::DcrawBinary::instance()->rawFiles()); + d->defaultRawFilefilter = TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - d->defaultRawFilefilter = QString(KDcrawIface::KDcraw::rawFiles()); + d->defaultRawFilefilter = TQString(KDcrawIface::KDcraw::rawFiles()); #endif d->imageFilefilter = d->defaultImageFilefilter; @@ -264,9 +264,9 @@ void AlbumSettings::readSettings() config->setGroup("Album Settings"); - d->albumLibraryPath = config->readPathEntry("Album Path", QString()); + d->albumLibraryPath = config->readPathEntry("Album Path", TQString()); - QStringList collectionList = config->readListEntry("Album Collections"); + TQStringList collectionList = config->readListEntry("Album Collections"); if (!collectionList.isEmpty()) { collectionList.sort(); @@ -333,7 +333,7 @@ void AlbumSettings::readSettings() config->setGroup("EXIF Settings"); d->exifRotate = config->readBoolEntry("EXIF Rotate", true); - d->exifSetOrientation = config->readBoolEntry("EXIF Set Orientation", true); + d->exifSetOrientation = config->readBoolEntry("EXIF Set Qt::Orientation", true); // --------------------------------------------------------------------- @@ -347,11 +347,11 @@ void AlbumSettings::readSettings() d->saveDateTime = config->readBoolEntry("Save Date Time", false); d->saveRating = config->readBoolEntry("Save Rating", false); - d->author = config->readEntry("IPTC Author", QString()); - d->authorTitle = config->readEntry("IPTC Author Title", QString()); - d->credit = config->readEntry("IPTC Credit", QString()); - d->source = config->readEntry("IPTC Source", QString()); - d->copyright = config->readEntry("IPTC Copyright", QString()); + d->author = config->readEntry("IPTC Author", TQString()); + d->authorTitle = config->readEntry("IPTC Author Title", TQString()); + d->credit = config->readEntry("IPTC Credit", TQString()); + d->source = config->readEntry("IPTC Source", TQString()); + d->copyright = config->readEntry("IPTC Copyright", TQString()); // --------------------------------------------------------------------- @@ -381,8 +381,8 @@ void AlbumSettings::saveSettings() config->writeEntry("Movie File Filter", d->movieFilefilter); config->writeEntry("Audio File Filter", d->audioFilefilter); config->writeEntry("Raw File Filter", d->rawFilefilter); - config->writeEntry("Default Icon Size", QString::number(d->thumbnailSize)); - config->writeEntry("Default Tree Icon Size", QString::number(d->treeThumbnailSize)); + config->writeEntry("Default Icon Size", TQString::number(d->thumbnailSize)); + config->writeEntry("Default Tree Icon Size", TQString::number(d->treeThumbnailSize)); config->writeEntry("Rating Filter Condition", d->ratingFilterCond); config->writeEntry("Theme", d->currentTheme); @@ -425,7 +425,7 @@ void AlbumSettings::saveSettings() config->setGroup("EXIF Settings"); config->writeEntry("EXIF Rotate", d->exifRotate); - config->writeEntry("EXIF Set Orientation", d->exifSetOrientation); + config->writeEntry("EXIF Set Qt::Orientation", d->exifSetOrientation); // --------------------------------------------------------------------- @@ -458,12 +458,12 @@ void AlbumSettings::saveSettings() config->sync(); } -void AlbumSettings::setAlbumLibraryPath(const QString& path) +void AlbumSettings::setAlbumLibraryPath(const TQString& path) { d->albumLibraryPath = path; } -QString AlbumSettings::getAlbumLibraryPath() const +TQString AlbumSettings::getAlbumLibraryPath() const { return d->albumLibraryPath; } @@ -488,26 +488,26 @@ bool AlbumSettings::getScanAtStart() const return d->scanAtStart; } -void AlbumSettings::setAlbumCollectionNames(const QStringList& list) +void AlbumSettings::setAlbumCollectionNames(const TQStringList& list) { d->albumCollectionNames = list; } -QStringList AlbumSettings::getAlbumCollectionNames() +TQStringList AlbumSettings::getAlbumCollectionNames() { return d->albumCollectionNames; } -bool AlbumSettings::addAlbumCollectionName(const QString& name) +bool AlbumSettings::addAlbumCollectionName(const TQString& name) { - if (d->albumCollectionNames.contains(name)) + if (d->albumCollectionNames.tqcontains(name)) return false; d->albumCollectionNames.append(name); return true; } -bool AlbumSettings::delAlbumCollectionName(const QString& name) +bool AlbumSettings::delAlbumCollectionName(const TQString& name) { uint count = d->albumCollectionNames.remove(name); return (count > 0) ? true : false; @@ -543,59 +543,59 @@ AlbumSettings::ItemRightClickAction AlbumSettings::getItemRightClickAction() con return d->itemRightClickAction; } -void AlbumSettings::setImageFileFilter(const QString& filter) +void AlbumSettings::setImageFileFilter(const TQString& filter) { d->imageFilefilter = filter; } -QString AlbumSettings::getImageFileFilter() const +TQString AlbumSettings::getImageFileFilter() const { return d->imageFilefilter; } -void AlbumSettings::setMovieFileFilter(const QString& filter) +void AlbumSettings::setMovieFileFilter(const TQString& filter) { d->movieFilefilter = filter; } -QString AlbumSettings::getMovieFileFilter() const +TQString AlbumSettings::getMovieFileFilter() const { return d->movieFilefilter; } -void AlbumSettings::setAudioFileFilter(const QString& filter) +void AlbumSettings::setAudioFileFilter(const TQString& filter) { d->audioFilefilter = filter; } -QString AlbumSettings::getAudioFileFilter() const +TQString AlbumSettings::getAudioFileFilter() const { return d->audioFilefilter; } -void AlbumSettings::setRawFileFilter(const QString& filter) +void AlbumSettings::setRawFileFilter(const TQString& filter) { d->rawFilefilter = filter; } -QString AlbumSettings::getRawFileFilter() const +TQString AlbumSettings::getRawFileFilter() const { return d->rawFilefilter; } -bool AlbumSettings::addImageFileExtension(const QString& newExt) +bool AlbumSettings::addImageFileExtension(const TQString& newExt) { - if ( QStringList::split(" ", d->imageFilefilter).contains(newExt) || - QStringList::split(" ", d->movieFilefilter).contains(newExt) || - QStringList::split(" ", d->audioFilefilter).contains(newExt) || - QStringList::split(" ", d->rawFilefilter ).contains(newExt) ) + if ( TQStringList::split(" ", d->imageFilefilter).tqcontains(newExt) || + TQStringList::split(" ", d->movieFilefilter).tqcontains(newExt) || + TQStringList::split(" ", d->audioFilefilter).tqcontains(newExt) || + TQStringList::split(" ", d->rawFilefilter ).tqcontains(newExt) ) return false; d->imageFilefilter = d->imageFilefilter + ' ' + newExt; return true; } -QString AlbumSettings::getAllFileFilter() const +TQString AlbumSettings::getAllFileFilter() const { return d->imageFilefilter + ' ' + d->movieFilefilter + ' ' @@ -763,52 +763,52 @@ bool AlbumSettings::getSaveIptcCredits() const return d->saveIptcCredits; } -void AlbumSettings::setIptcAuthor(const QString& author) +void AlbumSettings::setIptcAuthor(const TQString& author) { d->author = author; } -QString AlbumSettings::getIptcAuthor() const +TQString AlbumSettings::getIptcAuthor() const { return d->author; } -void AlbumSettings::setIptcAuthorTitle(const QString& authorTitle) +void AlbumSettings::setIptcAuthorTitle(const TQString& authorTitle) { d->authorTitle = authorTitle; } -QString AlbumSettings::getIptcAuthorTitle() const +TQString AlbumSettings::getIptcAuthorTitle() const { return d->authorTitle; } -void AlbumSettings::setIptcCredit(const QString& credit) +void AlbumSettings::setIptcCredit(const TQString& credit) { d->credit = credit; } -QString AlbumSettings::getIptcCredit() const +TQString AlbumSettings::getIptcCredit() const { return d->credit; } -void AlbumSettings::setIptcSource(const QString& source) +void AlbumSettings::setIptcSource(const TQString& source) { d->source = source; } -QString AlbumSettings::getIptcSource() const +TQString AlbumSettings::getIptcSource() const { return d->source; } -void AlbumSettings::setIptcCopyright(const QString& copyright) +void AlbumSettings::setIptcCopyright(const TQString& copyright) { d->copyright = copyright; } -QString AlbumSettings::getIptcCopyright() const +TQString AlbumSettings::getIptcCopyright() const { return d->copyright; } @@ -1013,12 +1013,12 @@ bool AlbumSettings::getToolTipsShowRating() const return d->tooltipShowRating; } -void AlbumSettings::setCurrentTheme(const QString& theme) +void AlbumSettings::setCurrentTheme(const TQString& theme) { d->currentTheme = theme; } -QString AlbumSettings::getCurrentTheme() const +TQString AlbumSettings::getCurrentTheme() const { return d->currentTheme; } @@ -1079,22 +1079,22 @@ bool AlbumSettings::showToolTipsIsValid() const return false; } -QString AlbumSettings::getDefaultImageFileFilter() const +TQString AlbumSettings::getDefaultImageFileFilter() const { return d->defaultImageFilefilter; } -QString AlbumSettings::getDefaultMovieFileFilter() const +TQString AlbumSettings::getDefaultMovieFileFilter() const { return d->defaultMovieFilefilter; } -QString AlbumSettings::getDefaultAudioFileFilter() const +TQString AlbumSettings::getDefaultAudioFileFilter() const { return d->defaultAudioFilefilter; } -QString AlbumSettings::getDefaultRawFileFilter() const +TQString AlbumSettings::getDefaultRawFileFilter() const { return d->defaultRawFilefilter; } diff --git a/digikam/digikam/albumsettings.h b/digikam/digikam/albumsettings.h index 5a08288..c3e3dcb 100644 --- a/digikam/digikam/albumsettings.h +++ b/digikam/digikam/albumsettings.h @@ -26,10 +26,10 @@ #ifndef ALBUMSETTINGS_H #define ALBUMSETTINGS_H -// Qt includes. +// TQt includes. -#include <qstringlist.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqstring.h> // Local includes. @@ -74,8 +74,8 @@ public: bool showToolTipsIsValid() const; - void setAlbumLibraryPath(const QString& path); - QString getAlbumLibraryPath() const; + void setAlbumLibraryPath(const TQString& path); + TQString getAlbumLibraryPath() const; void setShowSplashScreen(bool val); bool getShowSplashScreen() const; @@ -83,11 +83,11 @@ public: void setScanAtStart(bool val); bool getScanAtStart() const; - void setAlbumCollectionNames(const QStringList& list); - QStringList getAlbumCollectionNames(); + void setAlbumCollectionNames(const TQStringList& list); + TQStringList getAlbumCollectionNames(); - bool addAlbumCollectionName(const QString& name); - bool delAlbumCollectionName(const QString& name); + bool addAlbumCollectionName(const TQString& name); + bool delAlbumCollectionName(const TQString& name); void setAlbumSortOrder(const AlbumSortOrder order); AlbumSortOrder getAlbumSortOrder() const; @@ -98,20 +98,20 @@ public: void setItemRightClickAction(const ItemRightClickAction action); ItemRightClickAction getItemRightClickAction() const; - void setImageFileFilter(const QString& filter); - QString getImageFileFilter() const; + void setImageFileFilter(const TQString& filter); + TQString getImageFileFilter() const; - void setMovieFileFilter(const QString& filter); - QString getMovieFileFilter() const; + void setMovieFileFilter(const TQString& filter); + TQString getMovieFileFilter() const; - void setAudioFileFilter(const QString& filter); - QString getAudioFileFilter() const; + void setAudioFileFilter(const TQString& filter); + TQString getAudioFileFilter() const; - void setRawFileFilter(const QString& filter); - QString getRawFileFilter() const; + void setRawFileFilter(const TQString& filter); + TQString getRawFileFilter() const; - bool addImageFileExtension(const QString& ext); - QString getAllFileFilter() const; + bool addImageFileExtension(const TQString& ext); + TQString getAllFileFilter() const; void setDefaultIconSize(int val); int getDefaultIconSize() const; @@ -161,20 +161,20 @@ public: void setSaveIptcCredits(bool val); bool getSaveIptcCredits() const; - void setIptcAuthor(const QString& author); - QString getIptcAuthor() const; + void setIptcAuthor(const TQString& author); + TQString getIptcAuthor() const; - void setIptcAuthorTitle(const QString& authorTitle); - QString getIptcAuthorTitle() const; + void setIptcAuthorTitle(const TQString& authorTitle); + TQString getIptcAuthorTitle() const; - void setIptcCredit(const QString& credit); - QString getIptcCredit() const; + void setIptcCredit(const TQString& credit); + TQString getIptcCredit() const; - void setIptcSource(const QString& source); - QString getIptcSource() const; + void setIptcSource(const TQString& source); + TQString getIptcSource() const; - void setIptcCopyright(const QString& copyright); - QString getIptcCopyright() const; + void setIptcCopyright(const TQString& copyright); + TQString getIptcCopyright() const; void setSaveComments(bool val); bool getSaveComments() const; @@ -236,8 +236,8 @@ public: void setToolTipsShowRating(bool val); bool getToolTipsShowRating() const; - void setCurrentTheme(const QString& theme); - QString getCurrentTheme() const; + void setCurrentTheme(const TQString& theme); + TQString getCurrentTheme() const; void setUseTrash(bool val); bool getUseTrash() const; @@ -248,10 +248,10 @@ public: void setApplySidebarChangesDirectly(bool val); bool getApplySidebarChangesDirectly() const; - QString getDefaultImageFileFilter() const; - QString getDefaultMovieFileFilter() const; - QString getDefaultAudioFileFilter() const; - QString getDefaultRawFileFilter() const; + TQString getDefaultImageFileFilter() const; + TQString getDefaultMovieFileFilter() const; + TQString getDefaultAudioFileFilter() const; + TQString getDefaultRawFileFilter() const; void setPreviewLoadFullImageSize(bool val); bool getPreviewLoadFullImageSize() const; diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp index 1078a4b..cf8bead 100644 --- a/digikam/digikam/albumthumbnailloader.cpp +++ b/digikam/digikam/albumthumbnailloader.cpp @@ -25,11 +25,11 @@ #include <math.h> -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qpainter.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqpainter.h> +#include <tqvaluelist.h> // KDE includes. @@ -51,8 +51,8 @@ namespace Digikam { -typedef QMap<KURL, QValueList<int> > UrlAlbumMap; -typedef QMap<int, QPixmap> TagThumbnailMap; +typedef TQMap<KURL, TQValueList<int> > UrlAlbumMap; +typedef TQMap<int, TQPixmap> TagThumbnailMap; class AlbumThumbnailLoaderPrivate { @@ -63,7 +63,7 @@ public: minBlendSize = 20; iconAlbumThumbJob = 0; iconTagThumbJob = 0; - //cache = new QCache<QPixmap>(101, 211); + //cache = new TQCache<TQPixmap>(101, 211); } int iconSize; @@ -77,19 +77,19 @@ public: TagThumbnailMap tagThumbnailMap; - //QCache<QPixmap> *cache; + //TQCache<TQPixmap> *cache; }; -class AlbumThumbnailLoaderEvent : public QCustomEvent +class AlbumThumbnailLoaderEvent : public TQCustomEvent { public: - AlbumThumbnailLoaderEvent(int albumID, const QPixmap &thumbnail) - : QCustomEvent(QEvent::User), + AlbumThumbnailLoaderEvent(int albumID, const TQPixmap &thumbnail) + : TQCustomEvent(TQEvent::User), albumID(albumID), thumbnail(thumbnail) {}; int albumID; - QPixmap thumbnail; + TQPixmap thumbnail; }; AlbumThumbnailLoader *AlbumThumbnailLoader::m_instance = 0; @@ -110,11 +110,11 @@ AlbumThumbnailLoader::AlbumThumbnailLoader() { d = new AlbumThumbnailLoaderPrivate; - connect(AlbumManager::instance(), SIGNAL(signalAlbumIconChanged(Album*)), - this, SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQT_SLOT(slotIconChanged(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotIconChanged(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotIconChanged(Album*))); } @@ -132,17 +132,17 @@ AlbumThumbnailLoader::~AlbumThumbnailLoader() m_instance = 0; } -QPixmap AlbumThumbnailLoader::getStandardTagIcon(RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardTagIcon(RelativeSize relativeSize) { return loadIcon("tag", computeIconSize(relativeSize)); } -QPixmap AlbumThumbnailLoader::getStandardTagRootIcon(RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardTagRootIcon(RelativeSize relativeSize) { return loadIcon("tag-folder", computeIconSize(relativeSize)); } -QPixmap AlbumThumbnailLoader::getStandardTagIcon(TAlbum *album, RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardTagIcon(TAlbum *album, RelativeSize relativeSize) { if (album->isRoot()) return getStandardTagRootIcon(relativeSize); @@ -150,17 +150,17 @@ QPixmap AlbumThumbnailLoader::getStandardTagIcon(TAlbum *album, RelativeSize rel return getStandardTagIcon(relativeSize); } -QPixmap AlbumThumbnailLoader::getStandardAlbumIcon(RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardAlbumIcon(RelativeSize relativeSize) { return loadIcon("folder", computeIconSize(relativeSize)); } -QPixmap AlbumThumbnailLoader::getStandardAlbumRootIcon(RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardAlbumRootIcon(RelativeSize relativeSize) { return loadIcon("folder_image", computeIconSize(relativeSize)); } -QPixmap AlbumThumbnailLoader::getStandardAlbumIcon(PAlbum *album, RelativeSize relativeSize) +TQPixmap AlbumThumbnailLoader::getStandardAlbumIcon(PAlbum *album, RelativeSize relativeSize) { if (album->isRoot()) return getStandardAlbumRootIcon(relativeSize); @@ -178,17 +178,17 @@ int AlbumThumbnailLoader::computeIconSize(RelativeSize relativeSize) return d->iconSize; } -QRect AlbumThumbnailLoader::computeBlendRect(int iconSize) +TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize) { // when drawing a 20x20 thumbnail in a 32x32 icon, starting point was (6,9). Scale. double largerSize = iconSize; double x = 6.0 / 32.0 * largerSize; double y = 9.0 / 32.0 * largerSize; double size = 20.0 / 32.0 * largerSize; - return QRect(lround(x), lround(y), lround(size), lround(size)); + return TQRect(lround(x), lround(y), lround(size), lround(size)); } -QPixmap AlbumThumbnailLoader::loadIcon(const QString &name, int size) +TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size) { KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); return iconLoader->loadIcon(name, KIcon::NoGroup, @@ -196,13 +196,13 @@ QPixmap AlbumThumbnailLoader::loadIcon(const QString &name, int size) 0, true); } -bool AlbumThumbnailLoader::getTagThumbnail(TAlbum *album, QPixmap &icon) +bool AlbumThumbnailLoader::getTagThumbnail(TAlbum *album, TQPixmap &icon) { int size = computeIconSize(SmallerSize); /* if (size >= d->minBlendSize) { - QRect rect = computeBlendRect(size); + TQRect rect = computeBlendRect(size); size = rect.width(); } */ @@ -214,7 +214,7 @@ bool AlbumThumbnailLoader::getTagThumbnail(TAlbum *album, QPixmap &icon) KURL iconKURL; iconKURL.setPath(album->icon()); addURL(album, iconKURL); - icon = QPixmap(); + icon = TQPixmap(); return true; } else @@ -225,7 +225,7 @@ bool AlbumThumbnailLoader::getTagThumbnail(TAlbum *album, QPixmap &icon) } else { - icon = QPixmap(); + icon = TQPixmap(); return false; } } @@ -247,7 +247,7 @@ bool AlbumThumbnailLoader::getAlbumThumbnail(PAlbum *album) void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) { /* - QPixmap* pix = d->cache->find(album->iconKURL().path()); + TQPixmap* pix = d->cache->tqfind(album->iconKURL().path()); if (pix) return pix; */ @@ -255,18 +255,18 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) // First check cached thumbnails. // At startup, this is not relevant, as the views will add their requests in a row. // This is to speed up context menu and IE imagedescedit - TagThumbnailMap::iterator ttit = d->tagThumbnailMap.find(album->globalID()); + TagThumbnailMap::iterator ttit = d->tagThumbnailMap.tqfind(album->globalID()); if (ttit != d->tagThumbnailMap.end()) { // It is not necessary to return cached icon asynchronously - they could be // returned by getTagThumbnail already - but this would make the API // less elegant, it feels much better this way. - QApplication::postEvent(this, new AlbumThumbnailLoaderEvent(album->globalID(), *ttit)); + TQApplication::postEvent(this, new AlbumThumbnailLoaderEvent(album->globalID(), *ttit)); return; } // Check if the URL has already been added (ThumbnailJob will _not_ check this) - UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); if (it == d->urlAlbumMap.end()) { @@ -281,11 +281,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconTagThumbJob, - SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - SLOT(slotGotThumbnailFromIcon(const KURL&, const QPixmap&))); + TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconTagThumbJob, - SIGNAL(signalFailed(const KURL&)), - SLOT(slotThumbnailLost(const KURL&))); + TQT_SIGNAL(signalFailed(const KURL&)), + TQT_SLOT(slotThumbnailLost(const KURL&))); } else { @@ -301,11 +301,11 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) true, AlbumSettings::instance()->getExifRotate()); connect(d->iconAlbumThumbJob, - SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - SLOT(slotGotThumbnailFromIcon(const KURL&, const QPixmap&))); + TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, const TQPixmap&))); connect(d->iconAlbumThumbJob, - SIGNAL(signalFailed(const KURL&)), - SLOT(slotThumbnailLost(const KURL&))); + TQT_SIGNAL(signalFailed(const KURL&)), + TQT_SLOT(slotThumbnailLost(const KURL&))); } else { @@ -314,7 +314,7 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) } // insert new entry to map, add album globalID - QValueList<int> &list = d->urlAlbumMap[url]; + TQValueList<int> &list = d->urlAlbumMap[url]; list.remove(album->globalID()); list.push_back(album->globalID()); } @@ -357,19 +357,19 @@ int AlbumThumbnailLoader::thumbnailSize() const return d->iconSize; } -void AlbumThumbnailLoader::slotGotThumbnailFromIcon(const KURL &url, const QPixmap &thumbnail) +void AlbumThumbnailLoader::slotGotThumbnailFromIcon(const KURL &url, const TQPixmap &thumbnail) { // We need to find all albums for which the given url has been requested, // and emit a signal for each album. - UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); if (it != d->urlAlbumMap.end()) { - QPixmap tagThumbnail; + TQPixmap tagThumbnail; AlbumManager *manager = AlbumManager::instance(); - for (QValueList<int>::iterator vit = (*it).begin(); vit != (*it).end(); ++vit) + for (TQValueList<int>::iterator vit = (*it).begin(); vit != (*it).end(); ++vit) { // look up with global id Album *album = manager->findAlbum(*vit); @@ -398,7 +398,7 @@ void AlbumThumbnailLoader::slotGotThumbnailFromIcon(const KURL &url, const QPixm } -void AlbumThumbnailLoader::customEvent(QCustomEvent *e) +void AlbumThumbnailLoader::customEvent(TQCustomEvent *e) { // for cached thumbnails @@ -422,16 +422,16 @@ void AlbumThumbnailLoader::slotIconChanged(Album* album) d->tagThumbnailMap.remove(album->globalID()); } -QPixmap AlbumThumbnailLoader::createTagThumbnail(const QPixmap &albumThumbnail) +TQPixmap AlbumThumbnailLoader::createTagThumbnail(const TQPixmap &albumThumbnail) { // tag thumbnails are cropped - QPixmap tagThumbnail; - int thumbSize = QMAX(albumThumbnail.width(), albumThumbnail.height()); + TQPixmap tagThumbnail; + int thumbSize = TQMAX(albumThumbnail.width(), albumThumbnail.height()); if(!albumThumbnail.isNull() && thumbSize >= d->minBlendSize) { - QRect rect = computeBlendRect(thumbSize); + TQRect rect = computeBlendRect(thumbSize); int w1 = albumThumbnail.width(); int w2 = rect.width(); int h1 = albumThumbnail.height(); @@ -451,12 +451,12 @@ void AlbumThumbnailLoader::slotThumbnailLost(const KURL &url) { // Same code as above, only different signal - UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); if (it != d->urlAlbumMap.end()) { AlbumManager *manager = AlbumManager::instance(); - for (QValueList<int>::iterator vit = (*it).begin(); vit != (*it).end(); ++vit) + for (TQValueList<int>::iterator vit = (*it).begin(); vit != (*it).end(); ++vit) { Album *album = manager->findAlbum(*vit); if (album) @@ -467,16 +467,16 @@ void AlbumThumbnailLoader::slotThumbnailLost(const KURL &url) } } -QPixmap AlbumThumbnailLoader::blendIcons(QPixmap dstIcon, const QPixmap &tagIcon) +TQPixmap AlbumThumbnailLoader::blendIcons(TQPixmap dstIcon, const TQPixmap &tagIcon) { - int dstIconSize = QMAX(dstIcon.width(), dstIcon.height()); + int dstIconSize = TQMAX(dstIcon.width(), dstIcon.height()); if (dstIconSize >= d->minBlendSize) { if(!tagIcon.isNull()) { - QRect rect = computeBlendRect(dstIconSize); - QPainter p(&dstIcon); + TQRect rect = computeBlendRect(dstIconSize); + TQPainter p(&dstIcon); p.drawPixmap(rect.x(), rect.y(), tagIcon, 0, 0, rect.width(), rect.height()); p.end(); } diff --git a/digikam/digikam/albumthumbnailloader.h b/digikam/digikam/albumthumbnailloader.h index c2c9a25..16e0fc9 100644 --- a/digikam/digikam/albumthumbnailloader.h +++ b/digikam/digikam/albumthumbnailloader.h @@ -24,16 +24,16 @@ #ifndef TAGTHUMBNAILLOADER_H #define TAGTHUMBNAILLOADER_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqpixmap.h> // KDE includes. #include <kurl.h> -class QCustomEvent; +class TQCustomEvent; namespace Digikam { @@ -43,9 +43,10 @@ class TAlbum; class PAlbum; class AlbumThumbnailLoaderPrivate; -class AlbumThumbnailLoader : public QObject +class AlbumThumbnailLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -105,27 +106,27 @@ public: * obtained below, or used as is when SmallerSize is requested anyway. * @return Returns true if icon is loaded asynchronously. */ - bool getTagThumbnail(TAlbum *album, QPixmap &icon); + bool getTagThumbnail(TAlbum *album, TQPixmap &icon); /** * Return standard tag and album icons. * The third methods check if album is the root, * and returns the standard icon or the root standard icon. */ - QPixmap getStandardTagIcon(RelativeSize size = NormalSize); - QPixmap getStandardTagRootIcon(RelativeSize size = NormalSize); - QPixmap getStandardTagIcon(TAlbum *album, RelativeSize size = NormalSize); + TQPixmap getStandardTagIcon(RelativeSize size = NormalSize); + TQPixmap getStandardTagRootIcon(RelativeSize size = NormalSize); + TQPixmap getStandardTagIcon(TAlbum *album, RelativeSize size = NormalSize); - QPixmap getStandardAlbumIcon(RelativeSize size = NormalSize); - QPixmap getStandardAlbumRootIcon(RelativeSize size = NormalSize); - QPixmap getStandardAlbumIcon(PAlbum *album, RelativeSize size = NormalSize); + TQPixmap getStandardAlbumIcon(RelativeSize size = NormalSize); + TQPixmap getStandardAlbumRootIcon(RelativeSize size = NormalSize); + TQPixmap getStandardAlbumIcon(PAlbum *album, RelativeSize size = NormalSize); /** * Blend tagIcon centered on dstIcon, where dstIcon is a standard * icon of variable size and tagIcon is 12 pixels smaller. * If height(dstIcon) < minBlendSize we return tagIcon verbatim. */ - QPixmap blendIcons(QPixmap dstIcon, const QPixmap &tagIcon); + TQPixmap blendIcons(TQPixmap dstIcon, const TQPixmap &tagIcon); signals: @@ -136,7 +137,7 @@ signals: * This class is a singleton, so any object connected to this * signal might not actually have requested a thumbnail for given url */ - void signalThumbnail(Album *album, const QPixmap&); + void signalThumbnail(Album *album, const TQPixmap&); /** This signal is emitted if thumbnail generation for given album failed. * Same considerations as above. @@ -151,13 +152,13 @@ signals: protected slots: - void slotGotThumbnailFromIcon(const KURL&, const QPixmap&); + void slotGotThumbnailFromIcon(const KURL&, const TQPixmap&); void slotThumbnailLost(const KURL&); void slotIconChanged(Album* album); protected: - void customEvent(QCustomEvent *e); + void customEvent(TQCustomEvent *e); private: @@ -167,10 +168,10 @@ private: static AlbumThumbnailLoader *m_instance; void addURL(Album *album, const KURL &url); - QPixmap loadIcon(const QString &name, int size = 0); - QPixmap createTagThumbnail(const QPixmap &albumThumbnail); + TQPixmap loadIcon(const TQString &name, int size = 0); + TQPixmap createTagThumbnail(const TQPixmap &albumThumbnail); int computeIconSize(RelativeSize size); - QRect computeBlendRect(int iconSize); + TQRect computeBlendRect(int iconSize); }; } // namespace Digikam diff --git a/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp index 248954b..b391cbd 100644 --- a/digikam/digikam/albumwidgetstack.cpp +++ b/digikam/digikam/albumwidgetstack.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfileinfo.h> +#include <tqfileinfo.h> // KDE includes. @@ -66,8 +66,8 @@ public: MediaPlayerView *mediaPlayerView; }; -AlbumWidgetStack::AlbumWidgetStack(QWidget *parent) - : QWidgetStack(parent, 0, Qt::WDestructiveClose) +AlbumWidgetStack::AlbumWidgetStack(TQWidget *tqparent) + : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) { d = new AlbumWidgetStackPriv; @@ -85,29 +85,29 @@ AlbumWidgetStack::AlbumWidgetStack(QWidget *parent) // ----------------------------------------------------------------- - connect(d->imagePreviewView, SIGNAL(signalNextItem()), - this, SIGNAL(signalNextItem())); + connect(d->imagePreviewView, TQT_SIGNAL(signalNextItem()), + this, TQT_SIGNAL(signalNextItem())); - connect(d->imagePreviewView, SIGNAL(signalPrevItem()), - this, SIGNAL(signalPrevItem())); + connect(d->imagePreviewView, TQT_SIGNAL(signalPrevItem()), + this, TQT_SIGNAL(signalPrevItem())); - connect(d->imagePreviewView, SIGNAL(signalEditItem()), - this, SIGNAL(signalEditItem())); + connect(d->imagePreviewView, TQT_SIGNAL(signalEditItem()), + this, TQT_SIGNAL(signalEditItem())); - connect(d->imagePreviewView, SIGNAL(signalDeleteItem()), - this, SIGNAL(signalDeleteItem())); + connect(d->imagePreviewView, TQT_SIGNAL(signalDeleteItem()), + this, TQT_SIGNAL(signalDeleteItem())); - connect(d->imagePreviewView, SIGNAL(signalBack2Album()), - this, SIGNAL(signalBack2Album())); + connect(d->imagePreviewView, TQT_SIGNAL(signalBack2Album()), + this, TQT_SIGNAL(signalBack2Album())); - connect(d->imagePreviewView, SIGNAL(signalSlideShow()), - this, SIGNAL(signalSlideShow())); + connect(d->imagePreviewView, TQT_SIGNAL(signalSlideShow()), + this, TQT_SIGNAL(signalSlideShow())); - connect(d->imagePreviewView, SIGNAL(signalZoomFactorChanged(double)), - this, SLOT(slotZoomFactorChanged(double))); + connect(d->imagePreviewView, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SLOT(slotZoomFactorChanged(double))); - connect(d->imagePreviewView, SIGNAL(signalInsert2LightTable()), - this, SIGNAL(signalInsert2LightTable())); + connect(d->imagePreviewView, TQT_SIGNAL(signalInsert2LightTable()), + this, TQT_SIGNAL(signalInsert2LightTable())); } AlbumWidgetStack::~AlbumWidgetStack() @@ -145,12 +145,12 @@ void AlbumWidgetStack::setPreviewItem(ImageInfo* info, ImageInfo *previous, Imag else { AlbumSettings *settings = AlbumSettings::instance(); - QString currentFileExtension = QFileInfo(info->kurl().path()).extension(false); - QString mediaplayerfilter = settings->getMovieFileFilter().lower() + + TQString currentFileExtension = TQFileInfo(info->kurl().path()).extension(false); + TQString mediaplayerfilter = settings->getMovieFileFilter().lower() + settings->getMovieFileFilter().upper() + settings->getAudioFileFilter().lower() + settings->getAudioFileFilter().upper(); - if (mediaplayerfilter.contains(currentFileExtension) ) + if (mediaplayerfilter.tqcontains(currentFileExtension) ) { setPreviewMode(MediaPlayerMode); d->mediaPlayerView->setMediaPlayerFromUrl(info->kurl()); @@ -215,7 +215,7 @@ void AlbumWidgetStack::slotItemsUpdated(const KURL::List& list) previewMode() == MediaPlayerMode) // What we can do with media player ? return; - if (list.contains(imagePreviewView()->getImageInfo()->kurl())) + if (list.tqcontains(imagePreviewView()->getImageInfo()->kurl())) d->imagePreviewView->reload(); } diff --git a/digikam/digikam/albumwidgetstack.h b/digikam/digikam/albumwidgetstack.h index f9c6c2e..77b039d 100644 --- a/digikam/digikam/albumwidgetstack.h +++ b/digikam/digikam/albumwidgetstack.h @@ -27,9 +27,9 @@ // KDE includes. -#include <qwidgetstack.h> -#include <qcstring.h> -#include <qstring.h> +#include <tqwidgetstack.h> +#include <tqcstring.h> +#include <tqstring.h> // Local includes. @@ -45,9 +45,10 @@ class AlbumIconView; class ImagePreviewView; class AlbumWidgetStackPriv; -class DIGIKAM_EXPORT AlbumWidgetStack : public QWidgetStack +class DIGIKAM_EXPORT AlbumWidgetStack : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: @@ -61,7 +62,7 @@ public: public: - AlbumWidgetStack(QWidget *parent=0); + AlbumWidgetStack(TQWidget *tqparent=0); ~AlbumWidgetStack(); AlbumIconView *albumIconView(); diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index 8d59a0e..84b86a9 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qstring.h> -#include <qfile.h> -#include <qdom.h> -#include <qtextstream.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqdom.h> +#include <tqtextstream.h> // KDE includes. @@ -58,12 +58,12 @@ public: bool modified; - QPtrList<CameraType> clist; - QString file; + TQPtrList<CameraType> clist; + TQString file; }; -CameraList::CameraList(QObject *parent, const QString& file) - : QObject(parent) +CameraList::CameraList(TQObject *tqparent, const TQString& file) + : TQObject(tqparent) { d = new CameraListPrivate; d->clist.setAutoDelete(true); @@ -86,34 +86,34 @@ bool CameraList::load() { d->modified = false; - QFile cfile(d->file); + TQFile cfile(d->file); if (!cfile.open(IO_ReadOnly)) return false; - QDomDocument doc("cameralist"); + TQDomDocument doc("cameralist"); if (!doc.setContent(&cfile)) return false; - QDomElement docElem = doc.documentElement(); + TQDomElement docElem = doc.documentElement(); if (docElem.tagName()!="cameralist") return false; - for (QDomNode n = docElem.firstChild(); + for (TQDomNode n = docElem.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if (e.isNull()) continue; if (e.tagName() != "item") continue; - QString title = e.attribute("title"); - QString model = e.attribute("model"); - QString port = e.attribute("port"); - QString path = e.attribute("path"); - QDateTime lastAccess = QDateTime::currentDateTime(); + TQString title = e.attribute("title"); + TQString model = e.attribute("model"); + TQString port = e.attribute("port"); + TQString path = e.attribute("path"); + TQDateTime lastAccess = TQDateTime::tqcurrentDateTime(); if (!e.attribute("lastaccess").isEmpty()) - lastAccess = QDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); + lastAccess = TQDateTime::fromString(e.attribute("lastaccess"), Qt::ISODate); CameraType *ctype = new CameraType(title, model, port, path, lastAccess); insertPrivate(ctype); @@ -128,15 +128,15 @@ bool CameraList::save() if (!d->modified) return true; - QDomDocument doc("cameralist"); - doc.setContent(QString("<!DOCTYPE XMLCameraList><cameralist version=\"1.1\" client=\"digikam\"/>")); + TQDomDocument doc("cameralist"); + doc.setContent(TQString("<!DOCTYPE XMLCameraList><cameralist version=\"1.1\" client=\"digikam\"/>")); - QDomElement docElem=doc.documentElement(); + TQDomElement docElem=doc.documentElement(); for (CameraType *ctype = d->clist.first(); ctype; ctype = d->clist.next()) { - QDomElement elem = doc.createElement("item"); + TQDomElement elem = doc.createElement("item"); elem.setAttribute("title", ctype->title()); elem.setAttribute("model", ctype->model()); elem.setAttribute("port", ctype->port()); @@ -145,21 +145,21 @@ bool CameraList::save() docElem.appendChild(elem); } - QFile cfile(d->file); + TQFile cfile(d->file); if (!cfile.open(IO_WriteOnly)) return false; - QTextStream stream(&cfile); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&cfile); + stream.setEncoding(TQTextStream::UnicodeUTF8); stream << doc.toString(); cfile.close(); return true; } -bool CameraList::changeCameraAccessTime(const QString& cameraTitle, const QDateTime& newDate) +bool CameraList::changeCameraAccessTime(const TQString& cameraTitle, const TQDateTime& newDate) { - CameraType* cam = find(cameraTitle); + CameraType* cam = tqfind(cameraTitle); if (cam) { cam->setLastAccess(newDate); @@ -201,12 +201,12 @@ void CameraList::removePrivate(CameraType* ctype) d->clist.remove(ctype); } -QPtrList<CameraType>* CameraList::cameraList() +TQPtrList<CameraType>* CameraList::cameraList() { return &d->clist; } -CameraType* CameraList::find(const QString& title) +CameraType* CameraList::tqfind(const TQString& title) { for (CameraType *ctype = d->clist.first(); ctype; ctype = d->clist.next()) @@ -221,7 +221,7 @@ CameraType* CameraList::autoDetect(bool& retry) { retry = false; - QString model, port; + TQString model, port; if (GPCamera::autoDetect(model, port) != 0) { retry = ( KMessageBox::warningYesNo(0, i18n("Failed to auto-detect camera; " @@ -254,7 +254,7 @@ CameraType* CameraList::autoDetect(bool& retry) if (port.startsWith("usb:")) port = "usb:"; - CameraType* ctype = new CameraType(model, model, port, "/", QDateTime::currentDateTime()); + CameraType* ctype = new CameraType(model, model, port, "/", TQDateTime::tqcurrentDateTime()); insert(ctype); return ctype; diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index 36496e8..a36ca39 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -25,12 +25,12 @@ #ifndef CAMERALIST_H #define CAMERALIST_H -// Qt includes. +// TQt includes. -#include <qptrlist.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqobject.h> -class QString; +class TQString; namespace Digikam { @@ -38,13 +38,14 @@ namespace Digikam class CameraType; class CameraListPrivate; -class CameraList : public QObject +class CameraList : public TQObject { Q_OBJECT + TQ_OBJECT public: - CameraList(QObject *parent, const QString& file); + CameraList(TQObject *tqparent, const TQString& file); ~CameraList(); bool load(); @@ -54,11 +55,11 @@ public: void insert(CameraType* ctype); void remove(CameraType* ctype); - CameraType* find(const QString& title); + CameraType* tqfind(const TQString& title); CameraType* autoDetect(bool& retry); - QPtrList<CameraType>* cameraList(); + TQPtrList<CameraType>* cameraList(); - bool changeCameraAccessTime(const QString& cameraTitle, const QDateTime& newDate); + bool changeCameraAccessTime(const TQString& cameraTitle, const TQDateTime& newDate); static CameraList* instance(); diff --git a/digikam/digikam/cameratype.cpp b/digikam/digikam/cameratype.cpp index d572f7f..486805f 100644 --- a/digikam/digikam/cameratype.cpp +++ b/digikam/digikam/cameratype.cpp @@ -43,17 +43,17 @@ public: action = 0; } - QString title; - QString model; - QString port; - QString path; + TQString title; + TQString model; + TQString port; + TQString path; - QDateTime lastAccess; + TQDateTime lastAccess; KAction *action; bool valid; - QGuardedPtr<CameraUI> currentCameraUI; + TQGuardedPtr<CameraUI> currentCameraUI; }; CameraType::CameraType() @@ -62,9 +62,9 @@ CameraType::CameraType() d->valid = false; } -CameraType::CameraType(const QString& title, const QString& model, - const QString& port, const QString& path, - const QDateTime& lastAccess, KAction *action) +CameraType::CameraType(const TQString& title, const TQString& model, + const TQString& port, const TQString& path, + const TQDateTime& lastAccess, KAction *action) { d = new CameraTypePrivate; d->title = title; @@ -108,27 +108,27 @@ CameraType& CameraType::operator=(const CameraType& ctype) return *this; } -void CameraType::setTitle(const QString& title) +void CameraType::setTitle(const TQString& title) { d->title = title; } -void CameraType::setModel(const QString& model) +void CameraType::setModel(const TQString& model) { d->model = model; } -void CameraType::setPort(const QString& port) +void CameraType::setPort(const TQString& port) { d->port = port; } -void CameraType::setPath(const QString& path) +void CameraType::setPath(const TQString& path) { d->path = path; } -void CameraType::setLastAccess(const QDateTime& lastAccess) +void CameraType::setLastAccess(const TQDateTime& lastAccess) { d->lastAccess = lastAccess; } @@ -148,27 +148,27 @@ void CameraType::setCurrentCameraUI(CameraUI *cameraui) d->currentCameraUI = cameraui; } -QString CameraType::title() const +TQString CameraType::title() const { return d->title; } -QString CameraType::model() const +TQString CameraType::model() const { return d->model; } -QString CameraType::port() const +TQString CameraType::port() const { return d->port; } -QString CameraType::path() const +TQString CameraType::path() const { return d->path; } -QDateTime CameraType::lastAccess() const +TQDateTime CameraType::lastAccess() const { return d->lastAccess; } diff --git a/digikam/digikam/cameratype.h b/digikam/digikam/cameratype.h index 2dc1b85..47cd71c 100644 --- a/digikam/digikam/cameratype.h +++ b/digikam/digikam/cameratype.h @@ -25,11 +25,11 @@ #ifndef CAMERATYPE_H #define CAMERATYPE_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatetime.h> -#include <qguardedptr.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqguardedptr.h> class KAction; @@ -45,28 +45,28 @@ public: CameraType(); - CameraType(const QString& title, const QString& model, - const QString& port, const QString& path, - const QDateTime& lastAccess, KAction* action=0); + CameraType(const TQString& title, const TQString& model, + const TQString& port, const TQString& path, + const TQDateTime& lastAccess, KAction* action=0); ~CameraType(); CameraType(const CameraType& ctype); CameraType& operator=(const CameraType& type); - void setTitle(const QString& title); - void setModel(const QString& model); - void setPort(const QString& port); - void setPath(const QString& path); - void setLastAccess(const QDateTime& lastAccess); + void setTitle(const TQString& title); + void setModel(const TQString& model); + void setPort(const TQString& port); + void setPath(const TQString& path); + void setLastAccess(const TQDateTime& lastAccess); void setAction(KAction *action); void setValid(bool valid); void setCurrentCameraUI(CameraUI *cameraui); - QString title() const; - QString model() const; - QString port() const; - QString path() const; - QDateTime lastAccess() const; + TQString title() const; + TQString model() const; + TQString port() const; + TQString path() const; + TQDateTime lastAccess() const; KAction* action() const; bool valid() const; CameraUI *currentCameraUI() const; diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h index 5fb101c..f863dd0 100644 --- a/digikam/digikam/daboutdata.h +++ b/digikam/digikam/daboutdata.h @@ -36,9 +36,9 @@ extern "C" #include <png.h> } -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Libkexiv2 includes. @@ -64,38 +64,38 @@ static const char showfoto_version[] = "0.9.6"; namespace Digikam { -static inline QString libraryInfo() +static inline TQString libraryInfo() { #if KDCRAW_VERSION < 0x000106 - QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion(); + TQString DcrawVer = KDcrawIface::DcrawBinary::internalVersion(); #else - QString librawVer = KDcrawIface::KDcraw::librawVersion(); + TQString librawVer = KDcrawIface::KDcraw::librawVersion(); #endif - QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version(); + TQString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version(); - QString Kexiv2Ver; + TQString Kexiv2Ver; #if KEXIV2_VERSION <= 0x000106 - Kexiv2Ver = QString(kexiv2_version); + Kexiv2Ver = TQString(kexiv2_version); #else Kexiv2Ver = KExiv2Iface::KExiv2::version(); #endif - QString libInfo = - QString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) + - QString("\n") + - QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) + - QString("\n") + - QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) + - QString("\n") + + TQString libInfo = + TQString(I18N_NOOP("Using KExiv2 library version %1")).tqarg(Kexiv2Ver) + + TQString("\n") + + TQString(I18N_NOOP("Using Exiv2 library version %1")).tqarg(Exiv2Ver) + + TQString("\n") + + TQString(I18N_NOOP("Using KDcraw library version %1")).tqarg(KDcrawIface::KDcraw::version()) + + TQString("\n") + #if KDCRAW_VERSION < 0x000106 - QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) + + TQString(I18N_NOOP("Using Dcraw program version %1")).tqarg(DcrawVer) + #else - QString(I18N_NOOP("Using LibRaw version %1")).arg(librawVer) + + TQString(I18N_NOOP("Using LibRaw version %1")).tqarg(librawVer) + #endif - QString("\n") + - QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING); + TQString("\n") + + TQString(I18N_NOOP("Using PNG library version %1")).tqarg(PNG_LIBPNG_VER_STRING); return libInfo; } diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 7b6bf64..1d26dc5 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -22,14 +22,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qlistview.h> -#include <qfont.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qfileinfo.h> +#include <tqdatetime.h> +#include <tqlistview.h> +#include <tqfont.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqfileinfo.h> // KDE includes. @@ -63,16 +63,16 @@ class DateFolderItem : public FolderItem public: - DateFolderItem(QListView* parent, DAlbum* album); - DateFolderItem(QListViewItem* parent, DAlbum* album); + DateFolderItem(TQListView* tqparent, DAlbum* album); + DateFolderItem(TQListViewItem* tqparent, DAlbum* album); ~DateFolderItem(); void refresh(); - int compare(QListViewItem *i, int, bool) const; - QString date() const; - QString name() const; + int compare(TQListViewItem *i, int, bool) const; + TQString date() const; + TQString name() const; DAlbum* album() const; @@ -83,22 +83,22 @@ private: int m_count; - QString m_name; + TQString m_name; DAlbum *m_album; }; -DateFolderItem::DateFolderItem(QListView* parent, DAlbum* album) - : FolderItem(parent, QString(), true) +DateFolderItem::DateFolderItem(TQListView* tqparent, DAlbum* album) + : FolderItem(tqparent, TQString(), true) { m_count = 0; m_album = album; - m_name = QString::number(album->date().year()); + m_name = TQString::number(album->date().year()); setText(0, m_name); } -DateFolderItem::DateFolderItem(QListViewItem* parent, DAlbum* album) - : FolderItem(parent, QString()) +DateFolderItem::DateFolderItem(TQListViewItem* tqparent, DAlbum* album) + : FolderItem(tqparent, TQString()) { m_count = 0; m_album = album; @@ -117,12 +117,12 @@ DateFolderItem::~DateFolderItem() void DateFolderItem::refresh() { if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount()) - setText(0, QString("%1 (%2)").arg(m_name).arg(m_count)); + setText(0, TQString("%1 (%2)").tqarg(m_name).tqarg(m_count)); else setText(0, m_name); } -int DateFolderItem::compare(QListViewItem* i, int , bool ) const +int DateFolderItem::compare(TQListViewItem* i, int , bool ) const { if (!i) return 0; @@ -136,12 +136,12 @@ int DateFolderItem::compare(QListViewItem* i, int , bool ) const return -1; } -QString DateFolderItem::date() const +TQString DateFolderItem::date() const { return m_album->date().toString(); } -QString DateFolderItem::name() const +TQString DateFolderItem::name() const { return m_name; } @@ -177,41 +177,41 @@ public: bool active; - QString selected; + TQString selected; FolderView *listview; MonthWidget *monthview; }; -DateFolderView::DateFolderView(QWidget* parent) - : QVBox(parent, "DateFolderView") +DateFolderView::DateFolderView(TQWidget* tqparent) + : TQVBox(tqparent, "DateFolderView") { d = new DateFolderViewPriv; d->listview = new FolderView(this, "DateListView"); d->monthview = new MonthWidget(this); d->listview->addColumn(i18n("My Calendar")); - d->listview->setResizeMode(QListView::LastColumn); + d->listview->setResizeMode(TQListView::LastColumn); d->listview->setRootIsDecorated(true); - connect(AlbumManager::instance(), SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAllDAlbumsLoaded()), - this, SLOT(slotAllDAlbumsLoaded())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), + this, TQT_SLOT(slotAllDAlbumsLoaded())); - connect(AlbumManager::instance(), SIGNAL(signalAlbumsCleared()), - d->listview, SLOT(clear())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), + d->listview, TQT_SLOT(clear())); - connect(AlbumManager::instance(), SIGNAL(signalDAlbumsDirty(const QMap<YearMonth, int>&)), - this, SLOT(slotRefresh(const QMap<YearMonth, int>&))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalDAlbumsDirty(const TQMap<YearMonth, int>&)), + this, TQT_SLOT(slotRefresh(const TQMap<YearMonth, int>&))); - connect(d->listview, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(d->listview, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); } DateFolderView::~DateFolderView() @@ -238,8 +238,8 @@ void DateFolderView::setActive(bool val) void DateFolderView::slotAllDAlbumsLoaded() { - disconnect(AlbumManager::instance(), SIGNAL(signalAllDAlbumsLoaded()), - this, SLOT(slotAllDAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllDAlbumsLoaded()), + this, TQT_SLOT(slotAllDAlbumsLoaded())); loadViewState(); } @@ -249,7 +249,7 @@ void DateFolderView::slotAlbumAdded(Album* a) return; DAlbum* album = (DAlbum*)a; - QDate date = album->date(); + TQDate date = album->date(); if (album->range() == DAlbum::Year) { @@ -259,12 +259,12 @@ void DateFolderView::slotAlbumAdded(Album* a) return; } - QString yr = QString::number(date.year()); - QListViewItem* parent = findRootItemByYear(yr); + TQString yr = TQString::number(date.year()); + TQListViewItem* tqparent = findRootItemByYear(yr); - if (parent) + if (tqparent) { - DateFolderItem* item = new DateFolderItem(parent, album); + DateFolderItem* item = new DateFolderItem(tqparent, album); item->setPixmap(0, SmallIcon("date", AlbumSettings::instance()->getDefaultTreeIconSize())); album->setExtraData(this, item); } @@ -292,8 +292,8 @@ void DateFolderView::slotSelectionChanged() d->monthview->setActive(false); - QListViewItem* selItem = 0; - QListViewItemIterator it( d->listview ); + TQListViewItem* selItem = 0; + TQListViewItemIterator it( d->listview ); while (it.current()) { if (it.current()->isSelected()) @@ -321,7 +321,7 @@ void DateFolderView::slotSelectionChanged() if (dateItem->album()->range() == DAlbum::Month) { - QDate date = dateItem->album()->date(); + TQDate date = dateItem->album()->date(); d->monthview->setActive(true); d->monthview->setYearMonth(date.year(), date.month()); } @@ -332,26 +332,26 @@ void DateFolderView::loadViewState() KConfig *config = kapp->config(); config->setGroup(name()); - QString selected; + TQString selected; if(config->hasKey("Last Selected Date")) { selected = config->readEntry("Last Selected Date"); } - QStringList openFolders; + TQStringList openFolders; if(config->hasKey("Open Date Folders")) { openFolders = config->readListEntry("Open Date Folders"); } DateFolderItem *item; - QString id; - QListViewItemIterator it(d->listview); + TQString id; + TQListViewItemIterator it(d->listview); for( ; it.current(); ++it) { item = dynamic_cast<DateFolderItem*>(it.current()); id = item->date(); - if(openFolders.contains(id)) + if(openFolders.tqcontains(id)) d->listview->setOpen(item, true); else d->listview->setOpen(item, false); @@ -370,8 +370,8 @@ void DateFolderView::saveViewState() if(item) config->writeEntry("Last Selected Date", item->date()); - QStringList openFolders; - QListViewItemIterator it(d->listview); + TQStringList openFolders; + TQListViewItemIterator it(d->listview); item = dynamic_cast<DateFolderItem*>(d->listview->firstChild()); while(item) { @@ -383,15 +383,15 @@ void DateFolderView::saveViewState() config->writeEntry("Open Date Folders", openFolders); } -void DateFolderView::gotoDate(const QDate& dt) +void DateFolderView::gotoDate(const TQDate& dt) { DateFolderItem *item = 0; - QDate id; + TQDate id; - QDate date = QDate(dt.year(), dt.month(), 1); + TQDate date = TQDate(dt.year(), dt.month(), 1); // Find that date in the side-bar list. - QListViewItemIterator it(d->listview); + TQListViewItemIterator it(d->listview); for( ; it.current(); ++it) { item = dynamic_cast<DateFolderItem*>(it.current()); @@ -407,7 +407,7 @@ void DateFolderView::gotoDate(const QDate& dt) } } -void DateFolderView::setSelected(QListViewItem *item) +void DateFolderView::setSelected(TQListViewItem *item) { if(!item) return; @@ -416,9 +416,9 @@ void DateFolderView::setSelected(QListViewItem *item) d->listview->ensureItemVisible(item); } -QListViewItem *DateFolderView::findRootItemByYear(const QString& year) +TQListViewItem *DateFolderView::findRootItemByYear(const TQString& year) { - QListViewItemIterator it(d->listview); + TQListViewItemIterator it(d->listview); while (it.current()) { @@ -435,7 +435,7 @@ QListViewItem *DateFolderView::findRootItemByYear(const QString& year) void DateFolderView::refresh() { - QListViewItemIterator it(d->listview); + TQListViewItemIterator it(d->listview); while (it.current()) { @@ -446,27 +446,27 @@ void DateFolderView::refresh() } } -void DateFolderView::slotRefresh(const QMap<YearMonth, int>& yearMonthMap) +void DateFolderView::slotRefresh(const TQMap<YearMonth, int>& yearMonthMap) { - QListViewItemIterator it(d->listview); + TQListViewItemIterator it(d->listview); while (it.current()) { DateFolderItem* item = dynamic_cast<DateFolderItem*>(*it); if (item) { - QDate date = item->album()->date(); + TQDate date = item->album()->date(); if (item->album()->range() == DAlbum::Month) { - QMap<YearMonth, int>::const_iterator it2 = yearMonthMap.find(YearMonth(date.year(), date.month())); + TQMap<YearMonth, int>::const_iterator it2 = yearMonthMap.tqfind(YearMonth(date.year(), date.month())); if ( it2 != yearMonthMap.end() ) item->setCount(it2.data()); } else { int count = 0; - for ( QMap<YearMonth, int>::const_iterator it2 = yearMonthMap.begin(); + for ( TQMap<YearMonth, int>::const_iterator it2 = yearMonthMap.begin(); it2 != yearMonthMap.end(); ++it2 ) { if (it2.key().first == date.year()) diff --git a/digikam/digikam/datefolderview.h b/digikam/digikam/datefolderview.h index 43a0191..b06c857 100644 --- a/digikam/digikam/datefolderview.h +++ b/digikam/digikam/datefolderview.h @@ -25,16 +25,16 @@ #ifndef DATEFOLDERVIEW_H #define DATEFOLDERVIEW_H -// Qt includes. +// TQt includes. -#include <qvbox.h> +#include <tqvbox.h> // Local includes. #include "albummanager.h" #include "folderitem.h" -class QListViewItem; +class TQListViewItem; namespace Digikam { @@ -42,20 +42,21 @@ namespace Digikam class DateFolderViewPriv; class DAlbum; -class DateFolderView : public QVBox +class DateFolderView : public TQVBox { Q_OBJECT + TQ_OBJECT public: - DateFolderView(QWidget* parent); + DateFolderView(TQWidget* tqparent); ~DateFolderView(); void setActive(bool val); - void setSelected(QListViewItem *item); + void setSelected(TQListViewItem *item); - void gotoDate(const QDate& dt); + void gotoDate(const TQDate& dt); void refresh(); private slots: @@ -64,7 +65,7 @@ private slots: void slotAlbumAdded(Album* album); void slotAlbumDeleted(Album* album); void slotSelectionChanged(); - void slotRefresh(const QMap<YearMonth, int>&); + void slotRefresh(const TQMap<YearMonth, int>&); private: @@ -78,7 +79,7 @@ private: */ void saveViewState(); - QListViewItem *findRootItemByYear(const QString& year); + TQListViewItem *findRootItemByYear(const TQString& year); DateFolderViewPriv* d; }; diff --git a/digikam/digikam/dcopiface.cpp b/digikam/digikam/dcopiface.cpp index 49021a2..bd7f6b4 100644 --- a/digikam/digikam/dcopiface.cpp +++ b/digikam/digikam/dcopiface.cpp @@ -29,8 +29,8 @@ namespace Digikam { -DCOPIface::DCOPIface(QObject *parent, const char *name) - : QObject(parent, name), DCOPObject(name) +DCOPIface::DCOPIface(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), DCOPObject(name) { } @@ -43,7 +43,7 @@ void DCOPIface::detectCamera() emit signalCameraAutoDetect(); } -void DCOPIface::downloadFrom( const QString &folder) +void DCOPIface::downloadFrom( const TQString &folder) { emit signalDownloadImages( folder ); } diff --git a/digikam/digikam/dcopiface.h b/digikam/digikam/dcopiface.h index 0db59e5..b959c3a 100644 --- a/digikam/digikam/dcopiface.h +++ b/digikam/digikam/dcopiface.h @@ -25,9 +25,9 @@ #ifndef DCOPIFACE_H #define DCOPIFACE_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> #include <dcopobject.h> namespace Digikam @@ -41,19 +41,20 @@ namespace Digikam * @author Leonid Zeitlin */ -class DCOPIface : public QObject, public DCOPObject +class DCOPIface : public TQObject, public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: /** * Standard constructor. - * @param parent Parent object reference, passed to @ref QObject constructor - * @param name Specifis the name of the object, passed to @ref QObject constructor + * @param tqparent Parent object reference, passed to @ref TQObject constructor + * @param name Specifis the name of the object, passed to @ref TQObject constructor */ - DCOPIface(QObject *parent = 0, const char *name = 0); + DCOPIface(TQObject *tqparent = 0, const char *name = 0); /** * Standard destructor @@ -71,7 +72,7 @@ signals: * This signal is emitted when @ref downloadFrom() is called via DCOP * @param folder the path passed tp downloadFrom earlier */ - void signalDownloadImages( const QString& folder); + void signalDownloadImages( const TQString& folder); public: @@ -88,7 +89,7 @@ k_dcop: * show DigiKam camera dialog. For example, a hotplug script can call it * when a USB camera is attached to the computer */ - ASYNC downloadFrom( const QString &folder ); + ASYNC downloadFrom( const TQString &folder ); }; } // namespace Digikam diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index 0dc490f..c911caa 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -23,16 +23,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatastream.h> -#include <qlabel.h> -#include <qstringlist.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qsignalmapper.h> -#include <qdockarea.h> -#include <qhbox.h> +#include <tqdatastream.h> +#include <tqlabel.h> +#include <tqstringlist.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqsignalmapper.h> +#include <tqdockarea.h> +#include <tqhbox.h> // KDE includes. @@ -138,16 +138,16 @@ DigikamApp::DigikamApp() d->cameraMediaList = new KPopupMenu; - connect(d->cameraMediaList, SIGNAL( aboutToShow() ), - this, SLOT(slotCameraMediaMenu())); + connect(d->cameraMediaList, TQT_SIGNAL( aboutToShow() ), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenu())); - d->cameraList = new CameraList(this, locateLocal("appdata", "cameras.xml")); + d->cameraList = new CameraList(TQT_TQOBJECT(this), locateLocal("appdata", "cameras.xml")); - connect(d->cameraList, SIGNAL(signalCameraAdded(CameraType *)), - this, SLOT(slotCameraAdded(CameraType *))); + connect(d->cameraList, TQT_SIGNAL(signalCameraAdded(CameraType *)), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraAdded(CameraType *))); - connect(d->cameraList, SIGNAL(signalCameraRemoved(CameraType *)), - this, SLOT(slotCameraRemoved(CameraType *))); + connect(d->cameraList, TQT_SIGNAL(signalCameraRemoved(CameraType *)), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraRemoved(CameraType *))); setupView(); setupStatusBar(); @@ -191,13 +191,13 @@ DigikamApp::DigikamApp() setAutoSaveSettings(); - d->dcopIface = new DCOPIface(this, "camera"); + d->dcopIface = new DCOPIface(TQT_TQOBJECT(this), "camera"); - connect(d->dcopIface, SIGNAL(signalCameraAutoDetect()), - this, SLOT(slotDcopCameraAutoDetect())); + connect(d->dcopIface, TQT_SIGNAL(signalCameraAutoDetect()), + TQT_TQOBJECT(this), TQT_SLOT(slotDcopCameraAutoDetect())); - connect(d->dcopIface, SIGNAL(signalDownloadImages( const QString & )), - this, SLOT(slotDcopDownloadImages(const QString &))); + connect(d->dcopIface, TQT_SIGNAL(signalDownloadImages( const TQString & )), + TQT_TQOBJECT(this), TQT_SLOT(slotDcopDownloadImages(const TQString &))); } DigikamApp::~DigikamApp() @@ -262,7 +262,7 @@ void DigikamApp::show() if(!d->validIccPath) { - QString message = i18n("<qt><p>ICC profiles path seems to be invalid.</p>" + TQString message = i18n("<qt><p>ICC profiles path seems to be invalid.</p>" "<p>If you want to set it now, select \"Yes\", otherwise " "select \"No\". In this case, \"Color Management\" feature " "will be disabled until you solve this issue</p></qt>"); @@ -293,31 +293,31 @@ void DigikamApp::show() slotThumbSizeChanged(d->albumSettings->getDefaultIconSize()); } -const QPtrList<KAction>& DigikamApp::menuImageActions() +const TQPtrList<KAction>& DigikamApp::menuImageActions() { return d->kipiImageActions; } -const QPtrList<KAction>& DigikamApp::menuBatchActions() +const TQPtrList<KAction>& DigikamApp::menuBatchActions() { return d->kipiBatchActions; } -const QPtrList<KAction>& DigikamApp::menuAlbumActions() +const TQPtrList<KAction>& DigikamApp::menuAlbumActions() { return d->kipiAlbumActions; } -const QPtrList<KAction> DigikamApp::menuImportActions() +const TQPtrList<KAction> DigikamApp::menuImportActions() { - QPtrList<KAction> importMenu; + TQPtrList<KAction> importMenu; importMenu = d->kipiFileActionsImport; importMenu.append( d->albumImportAction ); importMenu.append( d->addImagesAction ); return importMenu; } -const QPtrList<KAction> DigikamApp::menuExportActions() +const TQPtrList<KAction> DigikamApp::menuExportActions() { return d->kipiFileActionsExport; } @@ -329,10 +329,10 @@ void DigikamApp::autoDetect() if(d->splashScreen) d->splashScreen->message(i18n("Auto-detect camera")); - QTimer::singleShot(0, this, SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); } -void DigikamApp::downloadFrom(const QString &cameraGuiPath) +void DigikamApp::downloadFrom(const TQString &cameraGuiPath) { // Called from main if command line option is set @@ -343,7 +343,7 @@ void DigikamApp::downloadFrom(const QString &cameraGuiPath) if(d->splashScreen) d->splashScreen->message(i18n("Opening Download Dialog")); - QTimer::singleShot(0, this, SLOT(slotDownloadImages())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); } } @@ -366,20 +366,20 @@ void DigikamApp::setupView() setCentralWidget(d->view); d->view->applySettings(); - connect(d->view, SIGNAL(signalAlbumSelected(bool)), - this, SLOT(slotAlbumSelected(bool))); + connect(d->view, TQT_SIGNAL(signalAlbumSelected(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotAlbumSelected(bool))); - connect(d->view, SIGNAL(signalTagSelected(bool)), - this, SLOT(slotTagSelected(bool))); + connect(d->view, TQT_SIGNAL(signalTagSelected(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotTagSelected(bool))); - connect(d->view, SIGNAL(signalImageSelected(const QPtrList<ImageInfo>&, bool, bool, const KURL::List&)), - this, SLOT(slotImageSelected(const QPtrList<ImageInfo>&, bool, bool, const KURL::List&))); + connect(d->view, TQT_SIGNAL(signalImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&)), + TQT_TQOBJECT(this), TQT_SLOT(slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&))); } void DigikamApp::setupStatusBar() { d->statusProgressBar = new StatusProgressBar(statusBar()); - d->statusProgressBar->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + d->statusProgressBar->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); d->statusProgressBar->setMaximumHeight(fontMetrics().height()+4); statusBar()->addWidget(d->statusProgressBar, 100, true); @@ -403,41 +403,41 @@ void DigikamApp::setupStatusBar() //------------------------------------------------------------------------------ - connect(d->statusZoomBar, SIGNAL(signalZoomMinusClicked()), - d->view, SLOT(slotZoomOut())); + connect(d->statusZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomOut())); - connect(d->statusZoomBar, SIGNAL(signalZoomPlusClicked()), - d->view, SLOT(slotZoomIn())); + connect(d->statusZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotZoomIn())); - connect(d->statusZoomBar, SIGNAL(signalZoomSliderChanged(int)), - this, SLOT(slotZoomSliderChanged(int))); + connect(d->statusZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderChanged(int))); - connect(d->view, SIGNAL(signalThumbSizeChanged(int)), - this, SLOT(slotThumbSizeChanged(int))); + connect(d->view, TQT_SIGNAL(signalThumbSizeChanged(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotThumbSizeChanged(int))); - connect(d->view, SIGNAL(signalZoomChanged(double, int)), - this, SLOT(slotZoomChanged(double, int))); + connect(d->view, TQT_SIGNAL(signalZoomChanged(double, int)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(double, int))); - connect(d->view, SIGNAL(signalTogglePreview(bool)), - this, SLOT(slotTogglePreview(bool))); + connect(d->view, TQT_SIGNAL(signalTogglePreview(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotTogglePreview(bool))); - connect(d->albumIconViewFilter, SIGNAL(signalResetTagFilters()), - this, SIGNAL(signalResetTagFilters())); + connect(d->albumIconViewFilter, TQT_SIGNAL(signalResetTagFilters()), + TQT_TQOBJECT(this), TQT_SIGNAL(signalResetTagFilters())); - connect(d->statusNavigateBar, SIGNAL(signalFirstItem()), - d->view, SLOT(slotFirstItem())); + connect(d->statusNavigateBar, TQT_SIGNAL(signalFirstItem()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotFirstItem())); - connect(d->statusNavigateBar, SIGNAL(signalNextItem()), - d->view, SLOT(slotNextItem())); + connect(d->statusNavigateBar, TQT_SIGNAL(signalNextItem()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotNextItem())); - connect(d->statusNavigateBar, SIGNAL(signalPrevItem()), - d->view, SLOT(slotPrevItem())); + connect(d->statusNavigateBar, TQT_SIGNAL(signalPrevItem()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevItem())); - connect(d->statusNavigateBar, SIGNAL(signalLastItem()), - d->view, SLOT(slotLastItem())); + connect(d->statusNavigateBar, TQT_SIGNAL(signalLastItem()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotLastItem())); - connect(d->statusProgressBar, SIGNAL(signalCancelButtonPressed()), - this, SIGNAL(signalCancelButtonPressed())); + connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), + TQT_TQOBJECT(this), TQT_SIGNAL(signalCancelButtonPressed())); } void DigikamApp::setupAccelerators() @@ -446,52 +446,52 @@ void DigikamApp::setupAccelerators() d->accelerators->insert("Exit Preview Mode", i18n("Exit Preview"), i18n("Exit preview mode"), - Key_Escape, this, SIGNAL(signalEscapePressed()), + Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(signalEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Next Image"), - Key_Space, this, SIGNAL(signalNextItem()), + Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Previous Image"), - SHIFT+Key_Space, this, SIGNAL(signalPrevItem()), + SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Previous Image"), - Key_Backspace, this, SIGNAL(signalPrevItem()), + Key_Backspace, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Next Image"), - Key_Next, this, SIGNAL(signalNextItem()), + Key_Next, TQT_TQOBJECT(this), TQT_SIGNAL(signalNextItem()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Previous Image"), - Key_Prior, this, SIGNAL(signalPrevItem()), + Key_Prior, TQT_TQOBJECT(this), TQT_SIGNAL(signalPrevItem()), false, true); d->accelerators->insert("First Image Key_Home", i18n("First Image"), i18n("First Image"), - Key_Home, this, SIGNAL(signalFirstItem()), + Key_Home, TQT_TQOBJECT(this), TQT_SIGNAL(signalFirstItem()), false, true); d->accelerators->insert("Last Image Key_End", i18n("Last Image"), i18n("Last Image"), - Key_End, this, SIGNAL(signalLastItem()), + Key_End, TQT_TQOBJECT(this), TQT_SIGNAL(signalLastItem()), false, true); d->accelerators->insert("Copy Album Items Selection CTRL+Key_C", i18n("Copy Album Items Selection"), i18n("Copy Album Items Selection"), - CTRL+Key_C, this, SIGNAL(signalCopyAlbumItemsSelection()), + CTRL+Key_C, TQT_TQOBJECT(this), TQT_SIGNAL(signalCopyAlbumItemsSelection()), false, true); d->accelerators->insert("Paste Album Items Selection CTRL+Key_V", i18n("Paste Album Items Selection"), i18n("Paste Album Items Selection"), - CTRL+Key_V, this, SIGNAL(signalPasteAlbumItemsSelection()), + CTRL+Key_V, TQT_TQOBJECT(this), TQT_SIGNAL(signalPasteAlbumItemsSelection()), false, true); } @@ -508,49 +508,49 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- d->themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, SIGNAL(activated(const QString&)), - this, SLOT(slotChangeTheme(const QString&))); + connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); // ----------------------------------------------------------------- d->backwardActionMenu = new KToolBarPopupAction(i18n("&Back"), "back", ALT+Key_Left, - d->view, - SLOT(slotAlbumHistoryBack()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumHistoryBack()), actionCollection(), "album_back"); d->backwardActionMenu->setEnabled(false); - connect(d->backwardActionMenu->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShowBackwardMenu())); + connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowBackwardMenu())); - connect(d->backwardActionMenu->popupMenu(), SIGNAL(activated(int)), - d->view, SLOT(slotAlbumHistoryBack(int))); + connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryBack(int))); d->forwardActionMenu = new KToolBarPopupAction(i18n("Forward"), "forward", ALT+Key_Right, - d->view, - SLOT(slotAlbumHistoryForward()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumHistoryForward()), actionCollection(), "album_forward"); d->forwardActionMenu->setEnabled(false); - connect(d->forwardActionMenu->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShowForwardMenu())); + connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowForwardMenu())); - connect(d->forwardActionMenu->popupMenu(), SIGNAL(activated(int)), - d->view, SLOT(slotAlbumHistoryForward(int))); + connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryForward(int))); d->newAction = new KAction(i18n("&New..."), "albumfolder-new", KStdAccel::shortcut(KStdAccel::New), - d->view, - SLOT(slotNewAlbum()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotNewAlbum()), actionCollection(), "album_new"); d->newAction->setWhatsThis(i18n("Creates a new empty Album in the database.")); @@ -561,11 +561,11 @@ void DigikamApp::setupActions() actionCollection(), "album_sort"); - connect(d->albumSortAction, SIGNAL(activated(int)), - d->view, SLOT(slotSortAlbums(int))); + connect(d->albumSortAction, TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotSortAlbums(int))); // Use same list order as in albumsettings enum - QStringList sortActionList; + TQStringList sortActionList; sortActionList.append(i18n("By Folder")); sortActionList.append(i18n("By Collection")); sortActionList.append(i18n("By Date")); @@ -573,41 +573,41 @@ void DigikamApp::setupActions() d->recurseAlbumsAction = new KToggleAction(i18n("Include Album Sub-Tree"), 0, - this, + TQT_TQOBJECT(this), 0, actionCollection(), "albums_recursive"); d->recurseAlbumsAction->setWhatsThis(i18n("Activate this option to recursively show all sub-albums below " "the current album.")); - connect(d->recurseAlbumsAction, SIGNAL(toggled(bool)), - this, SLOT(slotRecurseAlbums(bool))); + connect(d->recurseAlbumsAction, TQT_SIGNAL(toggled(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotRecurseAlbums(bool))); d->recurseTagsAction = new KToggleAction(i18n("Include Tag Sub-Tree"), 0, - this, + TQT_TQOBJECT(this), 0, actionCollection(), "tags_recursive"); d->recurseTagsAction->setWhatsThis(i18n("Activate this option to show all images marked by the given tag " "and its all its sub-tags.")); - connect(d->recurseTagsAction, SIGNAL(toggled(bool)), - this, SLOT(slotRecurseTags(bool))); + connect(d->recurseTagsAction, TQT_SIGNAL(toggled(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool))); d->deleteAction = new KAction(i18n("Delete"), "editdelete", 0, - d->view, - SLOT(slotDeleteAlbum()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotDeleteAlbum()), actionCollection(), "album_delete"); d->addImagesAction = new KAction( i18n("Add Images..."), "albumfolder-importimages", CTRL+Key_I, - this, - SLOT(slotAlbumAddImages()), + TQT_TQOBJECT(this), + TQT_SLOT(slotAlbumAddImages()), actionCollection(), "album_addImages"); d->addImagesAction->setWhatsThis(i18n("Adds new items to the current Album.")); @@ -615,16 +615,16 @@ void DigikamApp::setupActions() d->albumImportAction = new KAction( i18n("Add Folders..."), "albumfolder-importdir", 0, - d->view, - SLOT(slotAlbumImportFolder()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumImportFolder()), actionCollection(), "album_importFolder"); d->propsEditAction = new KAction( i18n("Properties..."), "albumfolder-properties", 0, - d->view, - SLOT(slotAlbumPropsEdit()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumPropsEdit()), actionCollection(), "album_propsEdit"); d->propsEditAction->setWhatsThis(i18n("Edit Album Properties and Collection information.")); @@ -632,8 +632,8 @@ void DigikamApp::setupActions() d->refreshAlbumAction = new KAction( i18n("Refresh"), "rebuild", Key_F5, - d->view, - SLOT(slotAlbumRefresh()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumRefresh()), actionCollection(), "album_refresh"); d->refreshAlbumAction->setWhatsThis(i18n("Refresh all album contents")); @@ -641,8 +641,8 @@ void DigikamApp::setupActions() d->syncAlbumMetadataAction = new KAction( i18n("Synchronize Images with Database"), "rebuild", 0, - d->view, - SLOT(slotAlbumSyncPicturesMetadata()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumSyncPicturesMetadata()), actionCollection(), "album_syncmetadata"); d->syncAlbumMetadataAction->setWhatsThis(i18n("Updates all image metadata of the current " @@ -652,23 +652,23 @@ void DigikamApp::setupActions() d->openInKonquiAction = new KAction( i18n("Open in File Manager"), "konqueror", 0, - d->view, - SLOT(slotAlbumOpenInKonqui()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotAlbumOpenInKonqui()), actionCollection(), "album_openinkonqui"); // ----------------------------------------------------------- d->newTagAction = new KAction(i18n("New &Tag..."), "tag-new", - 0, d->view, SLOT(slotNewTag()), + 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); d->editTagAction = new KAction(i18n("Edit Tag Properties..."), "tag-properties", - 0, d->view, SLOT(slotEditTag()), + 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotEditTag()), actionCollection(), "tag_edit"); d->deleteTagAction = new KAction(i18n("Delete Tag"), "tag-delete", - 0, d->view, SLOT(slotDeleteTag()), + 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotDeleteTag()), actionCollection(), "tag_delete"); // ----------------------------------------------------------- @@ -676,16 +676,16 @@ void DigikamApp::setupActions() d->imagePreviewAction = new KToggleAction(i18n("View..."), "viewimage", Key_F3, - d->view, - SLOT(slotImagePreview()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImagePreview()), actionCollection(), "image_view"); d->imageViewAction = new KAction(i18n("Edit..."), "editimage", Key_F4, - d->view, - SLOT(slotImageEdit()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageEdit()), actionCollection(), "image_edit"); d->imageViewAction->setWhatsThis(i18n("Open the selected item in the image editor.")); @@ -693,8 +693,8 @@ void DigikamApp::setupActions() d->imageLightTableAction = new KAction(i18n("Place onto Light Table"), "lighttable", CTRL+Key_L, - d->view, - SLOT(slotImageLightTable()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageLightTable()), actionCollection(), "image_lighttable"); d->imageLightTableAction->setWhatsThis(i18n("Place the selected items on the light table thumbbar.")); @@ -702,8 +702,8 @@ void DigikamApp::setupActions() d->imageAddLightTableAction = new KAction(i18n("Add to Light Table"), "lighttableadd", SHIFT+CTRL+Key_L, - d->view, - SLOT(slotImageAddToLightTable()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageAddToLightTable()), actionCollection(), "image_add_to_lighttable"); d->imageAddLightTableAction->setWhatsThis(i18n("Add selected items to the light table thumbbar.")); @@ -711,8 +711,8 @@ void DigikamApp::setupActions() d->imageRenameAction = new KAction(i18n("Rename..."), "pencil", Key_F2, - d->view, - SLOT(slotImageRename()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageRename()), actionCollection(), "image_rename"); d->imageRenameAction->setWhatsThis(i18n("Change the filename of the currently selected item.")); @@ -721,8 +721,8 @@ void DigikamApp::setupActions() d->imageDeleteAction = new KAction(i18n("Delete"), "edittrash", Key_Delete, - d->view, - SLOT(slotImageDelete()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageDelete()), actionCollection(), "image_delete"); @@ -730,8 +730,8 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyAction = new KAction(i18n("Delete permanently"), "editdelete", SHIFT+Key_Delete, - d->view, - SLOT(slotImageDeletePermanently()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageDeletePermanently()), actionCollection(), "image_delete_permanently"); @@ -740,16 +740,16 @@ void DigikamApp::setupActions() d->imageDeletePermanentlyDirectlyAction = new KAction(i18n("Delete permanently without confirmation"), "editdelete", 0, - d->view, - SLOT(slotImageDeletePermanentlyDirectly()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageDeletePermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); d->imageTrashDirectlyAction = new KAction(i18n("Move to trash without confirmation"), "edittrash", 0, - d->view, - SLOT(slotImageTrashDirectly()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotImageTrashDirectly()), actionCollection(), "image_trash_directly"); @@ -759,11 +759,11 @@ void DigikamApp::setupActions() actionCollection(), "image_sort"); - connect(d->imageSortAction, SIGNAL(activated(int)), - d->view, SLOT(slotSortImages(int))); + connect(d->imageSortAction, TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotSortImages(int))); // Use same list order as in albumsettings enum - QStringList sortImagesActionList; + TQStringList sortImagesActionList; sortImagesActionList.append(i18n("By Name")); sortImagesActionList.append(i18n("By Path")); sortImagesActionList.append(i18n("By Date")); @@ -773,10 +773,10 @@ void DigikamApp::setupActions() // ----------------------------------------------------------------- - QSignalMapper *exifOrientationMapper = new QSignalMapper( d->view ); + TQSignalMapper *exifOrientationMapper = new TQSignalMapper( TQT_TQOBJECT(d->view) ); - connect(exifOrientationMapper, SIGNAL(mapped(int) ), - d->view, SLOT(slotImageExifOrientation(int))); + connect(exifOrientationMapper, TQT_SIGNAL(mapped(int) ), + TQT_TQOBJECT(d->view), TQT_SLOT(slotImageExifOrientation(int))); d->imageExifOrientationActionMenu = new KActionMenu(i18n("Adjust Exif orientation tag"), actionCollection(), @@ -789,7 +789,7 @@ void DigikamApp::setupActions() 0, actionCollection(), "image_set_exif_orientation_normal"); - d->imageSetExifOrientation2Action = new KAction(i18n("Flipped Horizontally"), + d->imageSetExifOrientation2Action = new KAction(i18n("FlippedQt::Horizontally"), 0, d->imageExifOrientationActionMenu, 0, @@ -801,7 +801,7 @@ void DigikamApp::setupActions() 0, actionCollection(), "image_set_exif_orientation_rotated_upside_down"); - d->imageSetExifOrientation4Action = new KAction(i18n("Flipped Vertically"), + d->imageSetExifOrientation4Action = new KAction(i18n("FlippedQt::Vertically"), 0, d->imageExifOrientationActionMenu, 0, @@ -841,29 +841,29 @@ void DigikamApp::setupActions() d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation7Action); d->imageExifOrientationActionMenu->insert(d->imageSetExifOrientation8Action); - connect(d->imageSetExifOrientation1Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation1Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation2Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation2Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation3Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation3Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation4Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation4Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation5Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation5Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation6Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation6Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation7Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation7Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); - connect(d->imageSetExifOrientation8Action, SIGNAL(activated()), - exifOrientationMapper, SLOT(map())); + connect(d->imageSetExifOrientation8Action, TQT_SIGNAL(activated()), + exifOrientationMapper, TQT_SLOT(map())); exifOrientationMapper->setMapping(d->imageSetExifOrientation1Action, 1); exifOrientationMapper->setMapping(d->imageSetExifOrientation2Action, 2); @@ -879,66 +879,66 @@ void DigikamApp::setupActions() d->selectAllAction = new KAction(i18n("Select All"), 0, CTRL+Key_A, - d->view, - SLOT(slotSelectAll()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotSelectAll()), actionCollection(), "selectAll"); d->selectNoneAction = new KAction(i18n("Select None"), 0, CTRL+SHIFT+Key_A, - d->view, - SLOT(slotSelectNone()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotSelectNone()), actionCollection(), "selectNone"); d->selectInvertAction = new KAction(i18n("Invert Selection"), 0, CTRL+Key_Asterisk, - d->view, - SLOT(slotSelectInvert()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotSelectInvert()), actionCollection(), "selectInvert"); // ----------------------------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------- d->zoomPlusAction = new KAction(i18n("Zoom In"), "viewmag+", CTRL+Key_Plus, - d->view, - SLOT(slotZoomIn()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotZoomIn()), actionCollection(), "album_zoomin"); d->zoomMinusAction = new KAction(i18n("Zoom Out"), "viewmag-", CTRL+Key_Minus, - d->view, - SLOT(slotZoomOut()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotZoomOut()), actionCollection(), "album_zoomout"); d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - d->view, - SLOT(slotZoomTo100Percents()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotZoomTo100Percents()), actionCollection(), "album_zoomto100percents"); d->zoomFitToWindowAction = new KAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, - d->view, - SLOT(slotFitToWindow()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotFitToWindow()), actionCollection(), "album_zoomfit2window"); @@ -946,8 +946,8 @@ void DigikamApp::setupActions() d->fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen", CTRL+SHIFT+Key_F, - this, - SLOT(slotToggleFullScreen()), + TQT_TQOBJECT(this), + TQT_SLOT(slotToggleFullScreen()), actionCollection(), "full_screen"); d->fullScreenAction->setWhatsThis(i18n("Switch the window to full screen mode")); @@ -958,61 +958,61 @@ void DigikamApp::setupActions() d->slideShowAction->setDelayed(false); d->slideShowAllAction = new KAction(i18n("All"), 0, Key_F9, - d->view, SLOT(slotSlideShowAll()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotSlideShowAll()), actionCollection(), "slideshow_all"); d->slideShowAction->insert(d->slideShowAllAction); d->slideShowSelectionAction = new KAction(i18n("Selection"), 0, ALT+Key_F9, - d->view, - SLOT(slotSlideShowSelection()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotSlideShowSelection()), actionCollection(), "slideshow_selected"); d->slideShowAction->insert(d->slideShowSelectionAction); d->slideShowRecursiveAction = new KAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9, - d->view, - SLOT(slotSlideShowRecursive()), + TQT_TQOBJECT(d->view), + TQT_SLOT(slotSlideShowRecursive()), actionCollection(), "slideshow_recursive"); d->slideShowAction->insert(d->slideShowRecursiveAction); - d->quitAction = KStdAction::quit(this, - SLOT(slotExit()), + d->quitAction = KStdAction::quit(TQT_TQOBJECT(this), + TQT_SLOT(slotExit()), actionCollection(), "app_exit"); d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - this, - SLOT(slotRawCameraList()), + TQT_TQOBJECT(this), + TQT_SLOT(slotRawCameraList()), actionCollection(), "help_rawcameralist"); d->kipiHelpAction = new KAction(i18n("Kipi Plugins Handbook"), "kipi", 0, - this, - SLOT(slotShowKipiHelp()), + TQT_TQOBJECT(this), + TQT_SLOT(slotShowKipiHelp()), actionCollection(), "help_kipi"); - d->tipAction = KStdAction::tipOfDay(this, - SLOT(slotShowTip()), + d->tipAction = KStdAction::tipOfDay(TQT_TQOBJECT(this), + TQT_SLOT(slotShowTip()), actionCollection(), "help_tipofday"); d->donateMoneyAction = new KAction(i18n("Donate..."), 0, 0, - this, - SLOT(slotDonateMoney()), + TQT_TQOBJECT(this), + TQT_SLOT(slotDonateMoney()), actionCollection(), "help_donatemoney"); d->contributeAction = new KAction(i18n("Contribute..."), 0, 0, - this, SLOT(slotContribute()), + TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), actionCollection(), "help_contribute"); @@ -1021,50 +1021,50 @@ void DigikamApp::setupActions() // -- Rating actions --------------------------------------------------------------- d->rating0Star = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - d->view, SLOT(slotAssignRatingNoStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingNoStar()), actionCollection(), "ratenostar"); d->rating1Star = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - d->view, SLOT(slotAssignRatingOneStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingOneStar()), actionCollection(), "rateonestar"); d->rating2Star = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - d->view, SLOT(slotAssignRatingTwoStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingTwoStar()), actionCollection(), "ratetwostar"); d->rating3Star = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - d->view, SLOT(slotAssignRatingThreeStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingThreeStar()), actionCollection(), "ratethreestar"); d->rating4Star = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - d->view, SLOT(slotAssignRatingFourStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFourStar()), actionCollection(), "ratefourstar"); d->rating5Star = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - d->view, SLOT(slotAssignRatingFiveStar()), + TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFiveStar()), actionCollection(), "ratefivestar"); // ----------------------------------------------------------- - KAction* findAction = KStdAction::find(d->view, SLOT(slotNewQuickSearch()), + KAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()), actionCollection(), "search_quick"); findAction->setText(i18n("Search...")); - findAction->setIconSet(BarIcon("filefind")); + findAction->setIconSet(BarIcon("filetqfind")); - KAction* advFindAction = KStdAction::find(d->view, SLOT(slotNewAdvancedSearch()), + KAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()), actionCollection(), "search_advanced"); advFindAction->setText(i18n("Advanced Search...")); advFindAction->setShortcut("Ctrl+Alt+F"); new KAction(i18n("Light Table"), "idea", Key_L, - d->view, SLOT(slotLightTable()), actionCollection(), + TQT_TQOBJECT(d->view), TQT_SLOT(slotLightTable()), actionCollection(), "light_table"); new KAction(i18n("Scan for New Images"), "reload_page", 0, - this, SLOT(slotDatabaseRescan()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotDatabaseRescan()), actionCollection(), "database_rescan"); new KAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0, - this, SLOT(slotRebuildAllThumbs()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbs()), actionCollection(), "thumbs_rebuild"); new KAction(i18n("Update Metadata Database..."), "reload_page", 0, - this, SLOT(slotSyncAllPicturesMetadata()), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(), "sync_metadata"); // ----------------------------------------------------------- @@ -1082,7 +1082,7 @@ void DigikamApp::setupActions() loadCameras(); - createGUI(QString::fromLatin1( "digikamui.rc" ), false); + createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); // Initialize Actions --------------------------------------- @@ -1138,12 +1138,12 @@ void DigikamApp::enableAlbumForwardHistory(bool enable) void DigikamApp::slotAboutToShowBackwardMenu() { d->backwardActionMenu->popupMenu()->clear(); - QStringList titles; + TQStringList titles; d->view->getBackwardHistory(titles); if(!titles.isEmpty()) { int id = 1; - QStringList::Iterator iter = titles.begin(); + TQStringList::Iterator iter = titles.begin(); for(; iter != titles.end(); ++iter,++id) { d->backwardActionMenu->popupMenu()->insertItem(*iter, id); @@ -1154,13 +1154,13 @@ void DigikamApp::slotAboutToShowBackwardMenu() void DigikamApp::slotAboutToShowForwardMenu() { d->forwardActionMenu->popupMenu()->clear(); - QStringList titles; + TQStringList titles; d->view->getForwardHistory(titles); if(!titles.isEmpty()) { int id = 1; - QStringList::Iterator iter = titles.begin(); + TQStringList::Iterator iter = titles.begin(); for(; iter != titles.end(); ++iter,++id) { d->forwardActionMenu->popupMenu()->insertItem(*iter, id); @@ -1281,14 +1281,14 @@ void DigikamApp::slotTagSelected(bool val) } } -void DigikamApp::slotImageSelected(const QPtrList<ImageInfo>& list, bool hasPrev, bool hasNext, +void DigikamApp::slotImageSelected(const TQPtrList<ImageInfo>& list, bool hasPrev, bool hasNext, const KURL::List& listAll) { - QPtrList<ImageInfo> selection = list; + TQPtrList<ImageInfo> selection = list; KURL::List all = listAll; int num_images = listAll.count(); bool val = selection.isEmpty() ? false : true; - QString text; + TQString text; int index = 1; d->imageViewAction->setEnabled(val); @@ -1320,14 +1320,14 @@ void DigikamApp::slotImageSelected(const QPtrList<ImageInfo>& list, bool hasPrev text = selection.first()->kurl().fileName() + i18n(" (%1 of %2)") - .arg(QString::number(index)) - .arg(QString::number(num_images)); + .tqarg(TQString::number(index)) + .tqarg(TQString::number(num_images)); d->statusProgressBar->setText(text); break; } default: d->statusProgressBar->setText(i18n("%1/%2 items selected") - .arg(selection.count()).arg(QString::number(num_images))); + .tqarg(selection.count()).tqarg(TQString::number(num_images))); break; } @@ -1335,7 +1335,7 @@ void DigikamApp::slotImageSelected(const QPtrList<ImageInfo>& list, bool hasPrev d->statusNavigateBar->setNavigateBarState(hasPrev, hasNext); } -void DigikamApp::slotProgressBarMode(int mode, const QString& text) +void DigikamApp::slotProgressBarMode(int mode, const TQString& text) { d->statusProgressBar->progressBarMode(mode, text); } @@ -1350,13 +1350,13 @@ void DigikamApp::slotExit() if (d->fullScreen) { slotToggleFullScreen(); - QTimer::singleShot(0, this, SLOT(close())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(close())); } else close(); } -QString DigikamApp::convertToLocalUrl( const QString& folder ) +TQString DigikamApp::convertToLocalUrl( const TQString& folder ) { // This function is copied from k3b. @@ -1371,7 +1371,7 @@ QString DigikamApp::convertToLocalUrl( const QString& folder ) DWarning() << folder << " mlu " << mlu << endl; - QString path = mlu.path(); + TQString path = mlu.path(); if ( mlu.protocol() == "system" && path.startsWith("/media") ) path = path.mid(7); @@ -1384,7 +1384,7 @@ QString DigikamApp::convertToLocalUrl( const QString& folder ) DCOPRef ref("kded", "mediamanager"); DCOPReply reply = ref.call("properties", path); if (reply.isValid()) { - QStringList slreply; + TQStringList slreply; reply.get(slreply); if ((slreply.count()>=9) && !slreply[9].isEmpty()) return slreply[9]; @@ -1419,7 +1419,7 @@ QString DigikamApp::convertToLocalUrl( const QString& folder ) return url.path(); } -void DigikamApp::slotDcopDownloadImages( const QString& folder ) +void DigikamApp::slotDcopDownloadImages( const TQString& folder ) { if (!folder.isNull()) { @@ -1442,13 +1442,13 @@ void DigikamApp::slotDcopCameraAutoDetect() slotCameraAutoDetect(); } -void DigikamApp::slotDownloadImages( const QString& folder) +void DigikamApp::slotDownloadImages( const TQString& folder) { if (!folder.isNull()) { d->cameraGuiPath = folder; - QTimer::singleShot(0, this, SLOT(slotDownloadImages())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImages())); } } @@ -1462,7 +1462,7 @@ void DigikamApp::slotDownloadImages() KIO::ListJob *job = KIO::listDir(KURL(d->cameraGuiPath), false, false); KIO::NetAccess::synchronousRun(job,0); - QString localUrl = convertToLocalUrl(d->cameraGuiPath); + TQString localUrl = convertToLocalUrl(d->cameraGuiPath); DDebug() << "slotDownloadImages: convertToLocalUrl " << d->cameraGuiPath << " to " << localUrl << endl; if (localUrl.isNull()) @@ -1479,11 +1479,11 @@ void DigikamApp::slotDownloadImages() if (!alreadyThere) { KAction *cAction = new KAction( - i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()), + i18n("Browse %1").tqarg(KURL(d->cameraGuiPath).prettyURL()), "camera", 0, - this, - SLOT(slotDownloadImages()), + TQT_TQOBJECT(this), + TQT_SLOT(slotDownloadImages()), actionCollection(), d->cameraGuiPath.latin1() ); @@ -1492,20 +1492,20 @@ void DigikamApp::slotDownloadImages() // the CameraUI will delete itself when it has finished CameraUI* cgui = new CameraUI(this, - i18n("Images found in %1").arg(d->cameraGuiPath), - "directory browse","Fixed", localUrl, QDateTime::currentDateTime()); + i18n("Images found in %1").tqarg(d->cameraGuiPath), + "directory browse","Fixed", localUrl, TQDateTime::tqcurrentDateTime()); cgui->show(); - connect(cgui, SIGNAL(signalLastDestination(const KURL&)), - d->view, SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, SIGNAL(signalAlbumSettingsChanged()), - this, SLOT(slotSetupChanged())); + connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); } void DigikamApp::slotCameraConnect() { - CameraType* ctype = d->cameraList->find(QString::fromUtf8(sender()->name())); + CameraType* ctype = d->cameraList->tqfind(TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name())); if (ctype) { @@ -1527,11 +1527,11 @@ void DigikamApp::slotCameraConnect() cgui->show(); - connect(cgui, SIGNAL(signalLastDestination(const KURL&)), - d->view, SLOT(slotSelectAlbum(const KURL&))); + connect(cgui, TQT_SIGNAL(signalLastDestination(const KURL&)), + TQT_TQOBJECT(d->view), TQT_SLOT(slotSelectAlbum(const KURL&))); - connect(cgui, SIGNAL(signalAlbumSettingsChanged()), - this, SLOT(slotSetupChanged())); + connect(cgui, TQT_SIGNAL(signalAlbumSettingsChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotSetupChanged())); } } } @@ -1541,7 +1541,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype) if (!ctype) return; KAction *cAction = new KAction(ctype->title(), "camera", 0, - this, SLOT(slotCameraConnect()), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()), actionCollection(), ctype->title().utf8()); d->cameraMenuAction->insert(cAction, 0); @@ -1559,8 +1559,8 @@ void DigikamApp::slotCameraMediaMenu() KURL kurl("media:/"); KIO::ListJob *job = KIO::listDir(kurl, false, false); - connect( job, SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)), - this, SLOT(slotCameraMediaMenuEntries(KIO::Job*,const KIO::UDSEntryList&)) ); + connect( job, TQT_SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)), + TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenuEntries(KIO::Job*,const KIO::UDSEntryList&)) ); } void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) @@ -1569,8 +1569,8 @@ void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) for(KIO::UDSEntryList::ConstIterator it = list.begin() ; it != list.end() ; ++it) { - QString name; - QString path; + TQString name; + TQString path; for ( UDSEntry::const_iterator et = (*it).begin() ; et != (*it).end() ; ++et ) { @@ -1590,7 +1590,7 @@ void DigikamApp::slotCameraMediaMenuEntries( Job *, const UDSEntryList & list ) d->mediaItems[i] = path; - d->cameraMediaList->insertItem(name, this, SLOT(slotDownloadImagesFromMedia(int)), 0, i); + d->cameraMediaList->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadImagesFromMedia(int)), 0, i); d->cameraMediaList->setItemParameter(i, i); i++; } @@ -1620,7 +1620,7 @@ void DigikamApp::slotCameraAutoDetect() if (!ctype && retry) { - QTimer::singleShot(0, this, SLOT(slotCameraAutoDetect())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotCameraAutoDetect())); return; } @@ -1644,7 +1644,7 @@ bool DigikamApp::setup(bool iccSetupPage) KIPI::PluginLoader::PluginList list = d->kipiPluginLoader->pluginList(); setup.kipiPluginsPage()->initPlugins((int)list.count()); - if (setup.exec() != QDialog::Accepted) + if (setup.exec() != TQDialog::Accepted) return false; setup.kipiPluginsPage()->applyPlugins(); @@ -1663,7 +1663,7 @@ void DigikamApp::slotSetupCamera() KIPI::PluginLoader::PluginList list = d->kipiPluginLoader->pluginList(); setup.kipiPluginsPage()->initPlugins((int)list.count()); - if (setup.exec() != QDialog::Accepted) + if (setup.exec() != TQDialog::Accepted) return; setup.kipiPluginsPage()->applyPlugins(); @@ -1725,14 +1725,14 @@ void DigikamApp::slotConfToolbars() if(dlg->exec()) { - createGUI(QString::fromLatin1( "digikamui.rc" ), false); + createGUI(TQString::tqfromLatin1( "digikamui.rc" ), false); applyMainWindowSettings(KGlobal::config()); - plugActionList( QString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( QString::fromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( QString::fromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( QString::fromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( QString::fromLatin1("album_actions"), d->kipiAlbumActions ); - plugActionList( QString::fromLatin1("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::tqfromLatin1("file_actions_export"), d->kipiFileActionsExport ); } delete dlg; @@ -1742,11 +1742,7 @@ void DigikamApp::slotToggleFullScreen() { if (d->fullScreen) { -#if QT_VERSION >= 0x030300 setWindowState( windowState() & ~WindowFullScreen ); -#else - showNormal(); -#endif menuBar()->show(); statusBar()->show(); topDock()->show(); @@ -1780,7 +1776,7 @@ void DigikamApp::slotToggleFullScreen() void DigikamApp::slotShowTip() { #if KDE_IS_VERSION(3,2,0) - QStringList tipsFiles; + TQStringList tipsFiles; tipsFiles.append("digikam/tips"); tipsFiles.append("kipi/tips"); @@ -1793,7 +1789,7 @@ void DigikamApp::slotShowTip() void DigikamApp::slotShowKipiHelp() { - KApplication::kApplication()->invokeHelp( QString(), "kipi-plugins" ); + KApplication::kApplication()->invokeHelp( TQString(), "kipi-plugins" ); } void DigikamApp::slotRawCameraList() @@ -1807,16 +1803,16 @@ void DigikamApp::loadPlugins() if(d->splashScreen) d->splashScreen->message(i18n("Loading Kipi Plugins")); - QStringList ignores; - d->kipiInterface = new DigikamKipiInterface( this, "Digikam_KIPI_interface" ); + TQStringList ignores; + d->kipiInterface = new DigikamKipiInterface( TQT_TQOBJECT(this), "Digikam_KIPI_interface" ); ignores.append( "HelloWorld" ); ignores.append( "KameraKlient" ); d->kipiPluginLoader = new KIPI::PluginLoader( ignores, d->kipiInterface ); - connect( d->kipiPluginLoader, SIGNAL( replug() ), - this, SLOT( slotKipiPluginPlug() ) ); + connect( d->kipiPluginLoader, TQT_SIGNAL( replug() ), + TQT_TQOBJECT(this), TQT_SLOT( slotKipiPluginPlug() ) ); d->kipiPluginLoader->loadPlugins(); @@ -1825,17 +1821,17 @@ void DigikamApp::loadPlugins() // Setting the initial menu options after all plugins have been loaded d->view->slotAlbumSelected(d->albumManager->currentAlbum()); - d->imagePluginsLoader = new ImagePluginLoader(this, d->splashScreen); + d->imagePluginsLoader = new ImagePluginLoader(TQT_TQOBJECT(this), d->splashScreen); } void DigikamApp::slotKipiPluginPlug() { - unplugActionList( QString::fromLatin1("file_actions_export") ); - unplugActionList( QString::fromLatin1("file_actions_import") ); - unplugActionList( QString::fromLatin1("image_actions") ); - unplugActionList( QString::fromLatin1("tool_actions") ); - unplugActionList( QString::fromLatin1("batch_actions") ); - unplugActionList( QString::fromLatin1("album_actions") ); + 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") ); d->kipiImageActions.clear(); d->kipiFileActionsExport.clear(); @@ -1858,15 +1854,15 @@ void DigikamApp::slotKipiPluginPlug() ++cpt; plugin->setup( this ); - QPtrList<KAction>* popup = 0; + TQPtrList<KAction>* popup = 0; // Plugin category identification using KAction method based. KActionPtrList actions = plugin->actions(); // List of obsolete kipi-plugins to not load. - QStringList pluginActionsDisabled; - pluginActionsDisabled << QString("raw_converter_single"); // Obsolete Since 0.9.5 and new Raw Import tool. + TQStringList pluginActionsDisabled; + pluginActionsDisabled << TQString("raw_converter_single"); // Obsolete Since 0.9.5 and new Raw Import tool. for( KActionPtrList::Iterator it2 = actions.begin(); it2 != actions.end(); ++it2 ) { @@ -1888,13 +1884,13 @@ void DigikamApp::slotKipiPluginPlug() else if ( plugin->category(*it2) == KIPI::COLLECTIONSPLUGIN ) popup = &d->kipiAlbumActions; - QString actionName((*it2)->name()); + TQString actionName((*it2)->name()); // Plug the KIPI plugins actions in according with the KAction method. if (popup) { - if (!pluginActionsDisabled.contains(actionName)) + if (!pluginActionsDisabled.tqcontains(actionName)) popup->append( *it2 ); else DDebug() << "Plugin '" << actionName << "' disabled." << endl; @@ -1910,12 +1906,12 @@ void DigikamApp::slotKipiPluginPlug() // Create GUI menu in according with plugins. - plugActionList( QString::fromLatin1("file_actions_export"), d->kipiFileActionsExport ); - plugActionList( QString::fromLatin1("file_actions_import"), d->kipiFileActionsImport ); - plugActionList( QString::fromLatin1("image_actions"), d->kipiImageActions ); - plugActionList( QString::fromLatin1("tool_actions"), d->kipiToolsActions ); - plugActionList( QString::fromLatin1("batch_actions"), d->kipiBatchActions ); - plugActionList( QString::fromLatin1("album_actions"), d->kipiAlbumActions ); + 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 ); } void DigikamApp::loadCameras() @@ -1929,7 +1925,7 @@ void DigikamApp::loadCameras() d->cameraMenuAction->popupMenu()->insertSeparator(); d->cameraMenuAction->insert(new KAction(i18n("Add Camera..."), 0, - this, SLOT(slotSetupCamera()), + TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera()), actionCollection(), "camera_add")); } @@ -1945,7 +1941,7 @@ void DigikamApp::populateThemes() ThemeEngine::instance()->slotChangeTheme(d->themeMenuAction->currentText()); } -void DigikamApp::slotChangeTheme(const QString& theme) +void DigikamApp::slotChangeTheme(const TQString& theme) { d->albumSettings->setCurrentTheme(theme); ThemeEngine::instance()->slotChangeTheme(theme); @@ -1953,10 +1949,10 @@ void DigikamApp::slotChangeTheme(const QString& theme) void DigikamApp::slotThemeChanged() { - QStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.findIndex(d->albumSettings->getCurrentTheme()); + TQStringList themes(ThemeEngine::instance()->themeNames()); + int index = themes.tqfindIndex(d->albumSettings->getCurrentTheme()); if (index == -1) - index = themes.findIndex(i18n("Default")); + index = themes.tqfindIndex(i18n("Default")); d->themeMenuAction->setCurrentItem(index); } @@ -1977,7 +1973,7 @@ void DigikamApp::slotDatabaseRescan() void DigikamApp::slotRebuildAllThumbs() { - QString msg = i18n("Rebuilding all image thumbnails can take some time.\n" + TQString msg = i18n("Rebuilding all image thumbnails can take some time.\n" "Do you want to continue?"); int result = KMessageBox::warningContinueCancel(this, msg); if (result != KMessageBox::Continue) @@ -1985,8 +1981,8 @@ void DigikamApp::slotRebuildAllThumbs() BatchThumbsGenerator *thumbsGenerator = new BatchThumbsGenerator(this); - connect(thumbsGenerator, SIGNAL(signalRebuildAllThumbsDone()), - this, SLOT(slotRebuildAllThumbsDone())); + connect(thumbsGenerator, TQT_SIGNAL(signalRebuildAllThumbsDone()), + TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbsDone())); thumbsGenerator->exec(); } @@ -1998,15 +1994,15 @@ void DigikamApp::slotRebuildAllThumbsDone() void DigikamApp::slotSyncAllPicturesMetadata() { - QString msg = i18n("Updating the metadata database can take some time. \nDo you want to continue?"); + TQString msg = i18n("Updating the metadata database can take some time. \nDo you want to continue?"); int result = KMessageBox::warningContinueCancel(this, msg); if (result != KMessageBox::Continue) return; BatchAlbumsSyncMetadata *syncMetadata = new BatchAlbumsSyncMetadata(this); - connect(syncMetadata, SIGNAL(signalComplete()), - this, SLOT(slotSyncAllPicturesMetadataDone())); + connect(syncMetadata, TQT_SIGNAL(signalComplete()), + TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadataDone())); syncMetadata->exec(); } @@ -2044,13 +2040,13 @@ void DigikamApp::slotZoomSliderChanged(int size) void DigikamApp::slotThumbSizeChanged(int size) { d->statusZoomBar->setZoomSliderValue(size); - d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").arg(size)); + d->statusZoomBar->setZoomTrackerText(i18n("Size: %1").tqarg(size)); } void DigikamApp::slotZoomChanged(double zoom, int size) { d->statusZoomBar->setZoomSliderValue(size); - d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); + d->statusZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); } void DigikamApp::slotTogglePreview(bool t) @@ -2077,7 +2073,7 @@ void DigikamApp::slotTogglePreview(bool t) void DigikamApp::slotAlbumAddImages() { - QString path = KFileDialog::getExistingDirectory(KGlobalSettings::documentPath(), this, + TQString path = KFileDialog::getExistingDirectory(KGlobalSettings::documentPath(), this, i18n("Select folder to parse")); if(path.isEmpty()) diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h index fabf318..df9b668 100644 --- a/digikam/digikam/digikamapp.h +++ b/digikam/digikam/digikamapp.h @@ -30,9 +30,9 @@ #include <config.h> #endif -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -55,6 +55,7 @@ class DigikamAppPriv; class DIGIKAM_EXPORT DigikamApp : public KMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -66,15 +67,15 @@ public: static DigikamApp* getinstance(); // KIPI Actions collections access. - const QPtrList<KAction>& menuImageActions(); - const QPtrList<KAction>& menuBatchActions(); - const QPtrList<KAction>& menuAlbumActions(); + const TQPtrList<KAction>& menuImageActions(); + const TQPtrList<KAction>& menuBatchActions(); + const TQPtrList<KAction>& menuAlbumActions(); - const QPtrList<KAction> menuImportActions(); - const QPtrList<KAction> menuExportActions(); + const TQPtrList<KAction> menuImportActions(); + const TQPtrList<KAction> menuExportActions(); void autoDetect(); - void downloadFrom(const QString &cameraGuiPath); + void downloadFrom(const TQString &cameraGuiPath); void enableZoomPlusAction(bool val); void enableZoomMinusAction(bool val); void enableAlbumBackwardHistory(bool enable); @@ -116,7 +117,7 @@ private slots: void slotAlbumAddImages(); void slotAlbumSelected(bool val); void slotTagSelected(bool val); - void slotImageSelected(const QPtrList<ImageInfo>&, bool, bool, const KURL::List&); + void slotImageSelected(const TQPtrList<ImageInfo>&, bool, bool, const KURL::List&); void slotExit(); void slotShowTip(); void slotShowKipiHelp(); @@ -136,8 +137,8 @@ private slots: void slotKipiPluginPlug(); - QString convertToLocalUrl( const QString& folder ); - void slotDownloadImages( const QString& folder ); + TQString convertToLocalUrl( const TQString& folder ); + void slotDownloadImages( const TQString& folder ); void slotDownloadImages(); void slotCameraConnect(); void slotCameraMediaMenu(); @@ -145,7 +146,7 @@ private slots: void slotCameraAdded(CameraType *ctype); void slotCameraRemoved(CameraType *ctype); void slotCameraAutoDetect(); - void slotDcopDownloadImages(const QString& folder); + void slotDcopDownloadImages(const TQString& folder); void slotDcopCameraAutoDetect(); void slotEditKeys(); void slotConfToolbars(); @@ -158,10 +159,10 @@ private slots: void slotSyncAllPicturesMetadata(); void slotSyncAllPicturesMetadataDone(); - void slotChangeTheme(const QString& theme); + void slotChangeTheme(const TQString& theme); void slotThemeChanged(); - void slotProgressBarMode(int, const QString&); + void slotProgressBarMode(int, const TQString&); void slotProgressValue(int); void slotZoomSliderChanged(int); diff --git a/digikam/digikam/digikamappprivate.h b/digikam/digikam/digikamappprivate.h index 8266589..0439132 100644 --- a/digikam/digikam/digikamappprivate.h +++ b/digikam/digikam/digikamappprivate.h @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcstring.h> -#include <qstring.h> -#include <qmap.h> -#include <qtoolbutton.h> -#include <qtimer.h> +#include <tqcstring.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqtoolbutton.h> +#include <tqtimer.h> // KDE includes. @@ -158,16 +158,16 @@ public: bool validIccPath; // KIPI plugins support - QPtrList<KAction> kipiFileActionsExport; - QPtrList<KAction> kipiFileActionsImport; - QPtrList<KAction> kipiImageActions; - QPtrList<KAction> kipiToolsActions; - QPtrList<KAction> kipiBatchActions; - QPtrList<KAction> kipiAlbumActions; + TQPtrList<KAction> kipiFileActionsExport; + TQPtrList<KAction> kipiFileActionsImport; + TQPtrList<KAction> kipiImageActions; + TQPtrList<KAction> kipiToolsActions; + TQPtrList<KAction> kipiBatchActions; + TQPtrList<KAction> kipiAlbumActions; - QMap<int, QString> mediaItems; + TQMap<int, TQString> mediaItems; - QString cameraGuiPath; + TQString cameraGuiPath; KPopupMenu *cameraMediaList; diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp index f2ce20d..807a450 100644 --- a/digikam/digikam/digikamfirstrun.cpp +++ b/digikam/digikam/digikamfirstrun.cpp @@ -35,17 +35,17 @@ extern "C" #include <iostream> -// Qt includes. - -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qstring.h> -#include <qdir.h> -#include <qfileinfo.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqfileinfo.h> // KDE includes. @@ -72,9 +72,9 @@ namespace Digikam using namespace std; -DigikamFirstRun::DigikamFirstRun(KConfig* config, QWidget* parent, +DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - : KDialogBase(parent, name, modal, i18n( "Album Library Path" ), + : KDialogBase(tqparent, name, modal, i18n( "Album Library Path" ), Help|Ok|Cancel, Ok, true ) { @@ -84,7 +84,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, QWidget* parent, m_config = config; m_ui = new FirstRunWidget(this); setMainWidget(m_ui); - m_ui->m_path->setURL(QDir::homeDirPath() + + m_ui->m_path->setURL(TQDir::homeDirPath() + i18n("This is a path name so you should " "include the slash in the translation","/Pictures")); m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly); @@ -92,7 +92,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, QWidget* 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->sizeHint().height()); + m_ui->setMinimumSize(450, m_ui->tqsizeHint().height()); } DigikamFirstRun::~DigikamFirstRun() @@ -101,7 +101,7 @@ DigikamFirstRun::~DigikamFirstRun() void DigikamFirstRun::slotOk() { - QString albumLibraryFolder = m_ui->m_path->url(); + TQString albumLibraryFolder = m_ui->m_path->url(); if (albumLibraryFolder.isEmpty()) { @@ -112,17 +112,17 @@ void DigikamFirstRun::slotOk() if (!albumLibraryFolder.startsWith("/")) { - albumLibraryFolder.prepend(QDir::homeDirPath()); + albumLibraryFolder.prepend(TQDir::homeDirPath()); } - if (KURL(albumLibraryFolder).equals(KURL(QDir::homeDirPath()), true)) + if (KURL(albumLibraryFolder).equals(KURL(TQDir::homeDirPath()), true)) { KMessageBox::sorry(this, i18n("digiKam cannot use your home folder as " "the Album Library folder.")); return; } - QDir targetPath(albumLibraryFolder); + TQDir targetPath(albumLibraryFolder); if (!targetPath.exists()) { @@ -131,7 +131,7 @@ void DigikamFirstRun::slotOk() "<p><b>%1</b></p>" "Would you like digiKam to create it?</qt>") - .arg(albumLibraryFolder), + .tqarg(albumLibraryFolder), i18n("Create Folder?")); if (rc == KMessageBox::No) @@ -144,13 +144,13 @@ 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>").arg(albumLibraryFolder), + "<p><b>%1</b></p></qt>").tqarg(albumLibraryFolder), i18n("Create Folder Failed")); return; } } - QFileInfo path(albumLibraryFolder); + TQFileInfo path(albumLibraryFolder); if (!path.isWritable()) { @@ -169,7 +169,7 @@ void DigikamFirstRun::slotOk() KDialogBase::accept(); - QString ErrorMsg, URL; + TQString ErrorMsg, URL; if (kapp->startServiceByDesktopName("digikam", URL , &ErrorMsg) > 0) { diff --git a/digikam/digikam/digikamfirstrun.h b/digikam/digikam/digikamfirstrun.h index 075a539..b796e85 100644 --- a/digikam/digikam/digikamfirstrun.h +++ b/digikam/digikam/digikamfirstrun.h @@ -44,10 +44,11 @@ class FirstRunWidget; class DIGIKAM_EXPORT DigikamFirstRun : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DigikamFirstRun(KConfig* config, QWidget* parent = 0, const char* name = 0, + DigikamFirstRun(KConfig* config, TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = WDestructiveClose); ~DigikamFirstRun(); diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 7116168..7488848 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -22,21 +22,21 @@ * * ============================================================ */ -// Qt includes. - -#include <qvbox.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qstrlist.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qlabel.h> -#include <qimage.h> -#include <qevent.h> -#include <qapplication.h> -#include <qsplitter.h> -#include <qtimer.h> -#include <qlistview.h> +// TQt includes. + +#include <tqvbox.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqstrlist.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqlabel.h> +#include <tqimage.h> +#include <tqevent.h> +#include <tqapplication.h> +#include <tqsplitter.h> +#include <tqtimer.h> +#include <tqlistview.h> // KDE includes. @@ -104,7 +104,7 @@ public: searchSearchBar = 0; tagFilterSearchBar = 0; splitter = 0; - parent = 0; + tqparent = 0; iconView = 0; folderView = 0; albumManager = 0; @@ -130,22 +130,22 @@ public: int initialAlbumID; int thumbSize; - QSplitter *splitter; + TQSplitter *splitter; - QTimer *selectionTimer; - QTimer *thumbSizeTimer; + TQTimer *selectionTimer; + TQTimer *thumbSizeTimer; - QVBox *folderBox; - QVBox *tagBox; - QVBox *searchBox; - QVBox *tagFilterBox; + TQVBox *folderBox; + TQVBox *tagBox; + TQVBox *searchBox; + TQVBox *tagFilterBox; SearchTextBar *folderSearchBar; SearchTextBar *tagSearchBar; SearchTextBar *searchSearchBar; SearchTextBar *tagFilterSearchBar; - DigikamApp *parent; + DigikamApp *tqparent; AlbumIconView *iconView; AlbumFolderView *folderView; @@ -163,24 +163,24 @@ public: TagFilterView *tagFilterView; }; -DigikamView::DigikamView(QWidget *parent) - : QHBox(parent) +DigikamView::DigikamView(TQWidget *tqparent) + : TQHBox(tqparent) { d = new DigikamViewPriv; - d->parent = static_cast<DigikamApp *>(parent); + d->tqparent = static_cast<DigikamApp *>(tqparent); d->albumManager = AlbumManager::instance(); d->leftSideBar = new Sidebar(this, "Digikam Left Sidebar", Sidebar::Left); - d->splitter = new QSplitter(this); - d->splitter->setFrameStyle( QFrame::NoFrame ); - d->splitter->setFrameShadow( QFrame::Plain ); - d->splitter->setFrameShape( QFrame::NoFrame ); + d->splitter = new TQSplitter(this); + d->splitter->setFrameStyle( TQFrame::NoFrame ); + d->splitter->setFrameShadow( TQFrame::Plain ); + d->splitter->setFrameShape( TQFrame::NoFrame ); d->splitter->setOpaqueResize(false); d->leftSideBar->setSplitter(d->splitter); d->albumWidgetStack = new AlbumWidgetStack(d->splitter); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); - d->albumWidgetStack->setSizePolicy(rightSzPolicy); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); + d->albumWidgetStack->tqsetSizePolicy(rightSzPolicy); d->iconView = d->albumWidgetStack->albumIconView(); d->rightSideBar = new ImagePropertiesSideBarDB(this, "Digikam Right Sidebar", d->splitter, @@ -189,21 +189,21 @@ DigikamView::DigikamView(QWidget *parent) // To the left. // Folders sidebar tab contents. - d->folderBox = new QVBox(this); + d->folderBox = new TQVBox(this); d->folderView = new AlbumFolderView(d->folderBox); d->folderSearchBar = new SearchTextBar(d->folderBox, "DigikamViewFolderSearchBar"); d->folderBox->setSpacing(KDialog::spacingHint()); d->folderBox->setMargin(0); // Tags sidebar tab contents. - d->tagBox = new QVBox(this); + d->tagBox = new TQVBox(this); d->tagFolderView = new TagFolderView(d->tagBox); d->tagSearchBar = new SearchTextBar(d->tagBox, "DigikamViewTagSearchBar"); d->tagBox->setSpacing(KDialog::spacingHint()); d->tagBox->setMargin(0); // Search sidebar tab contents. - d->searchBox = new QVBox(this); + d->searchBox = new TQVBox(this); d->searchFolderView = new SearchFolderView(d->searchBox); d->searchSearchBar = new SearchTextBar(d->searchBox, "DigikamViewSearchSearchBar"); d->searchBox->setSpacing(KDialog::spacingHint()); @@ -216,12 +216,12 @@ DigikamView::DigikamView(QWidget *parent) d->leftSideBar->appendTab(d->dateFolderView, SmallIcon("date"), i18n("Calendar")); d->leftSideBar->appendTab(d->tagBox, SmallIcon("tag"), i18n("Tags")); d->leftSideBar->appendTab(d->timeLineView, SmallIcon("clock"), i18n("Timeline")); - d->leftSideBar->appendTab(d->searchBox, SmallIcon("find"), i18n("Searches")); + d->leftSideBar->appendTab(d->searchBox, SmallIcon("tqfind"), i18n("Searches")); // To the right. // Tags Filter sidebar tab contents. - d->tagFilterBox = new QVBox(this); + d->tagFilterBox = new TQVBox(this); d->tagFilterView = new TagFilterView(d->tagFilterBox); d->tagFilterSearchBar = new SearchTextBar(d->tagFilterBox, "DigikamViewTagFilterSearchBar"); d->tagFilterBox->setSpacing(KDialog::spacingHint()); @@ -229,7 +229,7 @@ DigikamView::DigikamView(QWidget *parent) d->rightSideBar->appendTab(d->tagFilterBox, SmallIcon("tag-assigned"), i18n("Tag Filters")); - d->selectionTimer = new QTimer(this); + d->selectionTimer = new TQTimer(this); setupConnections(); @@ -270,197 +270,197 @@ void DigikamView::setupConnections() { // -- DigikamApp connections ---------------------------------- - connect(d->parent, SIGNAL(signalEscapePressed()), - this, SLOT(slotEscapePreview())); + connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()), + this, TQT_SLOT(slotEscapePreview())); - connect(d->parent, SIGNAL(signalEscapePressed()), - d->albumWidgetStack, SLOT(slotEscapePreview())); + connect(d->tqparent, TQT_SIGNAL(signalEscapePressed()), + d->albumWidgetStack, TQT_SLOT(slotEscapePreview())); - connect(d->parent, SIGNAL(signalNextItem()), - this, SLOT(slotNextItem())); + connect(d->tqparent, TQT_SIGNAL(signalNextItem()), + this, TQT_SLOT(slotNextItem())); - connect(d->parent, SIGNAL(signalPrevItem()), - this, SLOT(slotPrevItem())); + connect(d->tqparent, TQT_SIGNAL(signalPrevItem()), + this, TQT_SLOT(slotPrevItem())); - connect(d->parent, SIGNAL(signalFirstItem()), - this, SLOT(slotFirstItem())); + connect(d->tqparent, TQT_SIGNAL(signalFirstItem()), + this, TQT_SLOT(slotFirstItem())); - connect(d->parent, SIGNAL(signalLastItem()), - this, SLOT(slotLastItem())); + connect(d->tqparent, TQT_SIGNAL(signalLastItem()), + this, TQT_SLOT(slotLastItem())); - connect(d->parent, SIGNAL(signalCopyAlbumItemsSelection()), - d->iconView, SLOT(slotCopy())); + connect(d->tqparent, TQT_SIGNAL(signalCopyAlbumItemsSelection()), + d->iconView, TQT_SLOT(slotCopy())); - connect(d->parent, SIGNAL(signalPasteAlbumItemsSelection()), - d->iconView, SLOT(slotPaste())); + connect(d->tqparent, TQT_SIGNAL(signalPasteAlbumItemsSelection()), + d->iconView, TQT_SLOT(slotPaste())); - connect(this, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(this, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(this, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); - connect(d->parent, SIGNAL(signalCancelButtonPressed()), - this, SLOT(slotCancelSlideShow())); + connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()), + this, TQT_SLOT(slotCancelSlideShow())); // -- AlbumManager connections -------------------------------- - connect(d->albumManager, SIGNAL(signalAlbumCurrentChanged(Album*)), - this, SLOT(slotAlbumSelected(Album*))); + connect(d->albumManager, TQT_SIGNAL(signalAlbumCurrentChanged(Album*)), + this, TQT_SLOT(slotAlbumSelected(Album*))); - connect(d->albumManager, SIGNAL(signalAllAlbumsLoaded()), - this, SLOT(slotAllAlbumsLoaded())); + connect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), + this, TQT_SLOT(slotAllAlbumsLoaded())); - connect(d->albumManager, SIGNAL(signalAlbumItemsSelected(bool) ), - this, SLOT(slotImageSelected())); + connect(d->albumManager, TQT_SIGNAL(signalAlbumItemsSelected(bool) ), + this, TQT_SLOT(slotImageSelected())); - connect(d->albumManager, SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(d->albumManager, TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(d->albumManager, SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(d->albumManager, TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumManager, SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotAlbumRenamed(Album*))); + connect(d->albumManager, TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumManager, SIGNAL(signalAlbumsCleared()), - this, SLOT(slotAlbumsCleared())); + connect(d->albumManager, TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotAlbumsCleared())); // -- IconView Connections ------------------------------------- - connect(d->iconView, SIGNAL(signalItemsUpdated(const KURL::List&)), - d->albumWidgetStack, SLOT(slotItemsUpdated(const KURL::List&))); + connect(d->iconView, TQT_SIGNAL(signalItemsUpdated(const KURL::List&)), + d->albumWidgetStack, TQT_SLOT(slotItemsUpdated(const KURL::List&))); - connect(d->iconView, SIGNAL(signalItemsAdded()), - this, SLOT(slotImageSelected())); + connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), + this, TQT_SLOT(slotImageSelected())); - connect(d->iconView, SIGNAL(signalItemsAdded()), - this, SLOT(slotAlbumHighlight())); + connect(d->iconView, TQT_SIGNAL(signalItemsAdded()), + this, TQT_SLOT(slotAlbumHighlight())); - connect(d->iconView, SIGNAL(signalPreviewItem(AlbumIconItem*)), - this, SLOT(slotTogglePreviewMode(AlbumIconItem*))); + connect(d->iconView, TQT_SIGNAL(signalPreviewItem(AlbumIconItem*)), + this, TQT_SLOT(slotTogglePreviewMode(AlbumIconItem*))); - //connect(d->iconView, SIGNAL(signalItemDeleted(AlbumIconItem*)), - // this, SIGNAL(signalNoCurrentItem())); + //connect(d->iconView, TQT_SIGNAL(signalItemDeleted(AlbumIconItem*)), + // this, TQT_SIGNAL(signalNoCurrentItem())); - connect(d->iconView, SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), - this, SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); + connect(d->iconView, TQT_SIGNAL(signalGotoAlbumAndItem(AlbumIconItem *)), + this, TQT_SLOT(slotGotoAlbumAndItem(AlbumIconItem *))); - connect(d->iconView, SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), - this, SLOT(slotGotoDateAndItem(AlbumIconItem *))); + connect(d->iconView, TQT_SIGNAL(signalGotoDateAndItem(AlbumIconItem *)), + this, TQT_SLOT(slotGotoDateAndItem(AlbumIconItem *))); - connect(d->iconView, SIGNAL(signalGotoTagAndItem(int)), - this, SLOT(slotGotoTagAndItem(int))); + connect(d->iconView, TQT_SIGNAL(signalGotoTagAndItem(int)), + this, TQT_SLOT(slotGotoTagAndItem(int))); - connect(d->folderView, SIGNAL(signalAlbumModified()), - d->iconView, SLOT(slotAlbumModified())); + connect(d->folderView, TQT_SIGNAL(signalAlbumModified()), + d->iconView, TQT_SLOT(slotAlbumModified())); - connect(d->iconView, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(d->iconView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->iconView, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(d->iconView, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); // -- Sidebar Connections ------------------------------------- - connect(d->leftSideBar, SIGNAL(signalChangedTab(QWidget*)), - this, SLOT(slotLeftSidebarChangedTab(QWidget*))); + connect(d->leftSideBar, TQT_SIGNAL(signalChangedTab(TQWidget*)), + this, TQT_SLOT(slotLeftSidebarChangedTab(TQWidget*))); - connect(d->rightSideBar, SIGNAL(signalFirstItem()), - this, SLOT(slotFirstItem())); + connect(d->rightSideBar, TQT_SIGNAL(signalFirstItem()), + this, TQT_SLOT(slotFirstItem())); - connect(d->rightSideBar, SIGNAL(signalNextItem()), - this, SLOT(slotNextItem())); + connect(d->rightSideBar, TQT_SIGNAL(signalNextItem()), + this, TQT_SLOT(slotNextItem())); - connect(d->rightSideBar, SIGNAL(signalPrevItem()), - this, SLOT(slotPrevItem())); + connect(d->rightSideBar, TQT_SIGNAL(signalPrevItem()), + this, TQT_SLOT(slotPrevItem())); - connect(d->rightSideBar, SIGNAL(signalLastItem()), - this, SLOT(slotLastItem())); + connect(d->rightSideBar, TQT_SIGNAL(signalLastItem()), + this, TQT_SLOT(slotLastItem())); - connect(this, SIGNAL(signalNoCurrentItem()), - d->rightSideBar, SLOT(slotNoCurrentItem())); + connect(this, TQT_SIGNAL(signalNoCurrentItem()), + d->rightSideBar, TQT_SLOT(slotNoCurrentItem())); - connect(d->rightSideBar, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(d->rightSideBar, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->rightSideBar, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(d->rightSideBar, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); - connect(d->tagFilterView, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(d->tagFilterView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFilterView, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(d->tagFilterView, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); - connect(d->tagFolderView, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(d->tagFolderView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(d->tagFolderView, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(d->tagFolderView, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); - connect(d->parent, SIGNAL(signalResetTagFilters()), - d->tagFilterView, SLOT(slotResetTagFilters())); + connect(d->tqparent, TQT_SIGNAL(signalResetTagFilters()), + d->tagFilterView, TQT_SLOT(slotResetTagFilters())); // -- Filter Bars Connections --------------------------------- - connect(d->folderSearchBar, SIGNAL(signalTextChanged(const QString&)), - d->folderView, SLOT(slotTextFolderFilterChanged(const QString&))); + connect(d->folderSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->folderView, TQT_SLOT(slotTextFolderFilterChanged(const TQString&))); - connect(d->tagSearchBar, SIGNAL(signalTextChanged(const QString&)), - d->tagFolderView, SLOT(slotTextTagFilterChanged(const QString&))); + connect(d->tagSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->tagFolderView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->searchSearchBar, SIGNAL(signalTextChanged(const QString&)), - d->searchFolderView, SLOT(slotTextSearchFilterChanged(const QString&))); + connect(d->searchSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->searchFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->tagFilterSearchBar, SIGNAL(signalTextChanged(const QString&)), - d->tagFilterView, SLOT(slotTextTagFilterChanged(const QString&))); + connect(d->tagFilterSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->tagFilterView, TQT_SLOT(slotTextTagFilterChanged(const TQString&))); - connect(d->folderView, SIGNAL(signalTextFolderFilterMatch(bool)), - d->folderSearchBar, SLOT(slotSearchResult(bool))); + connect(d->folderView, TQT_SIGNAL(signalTextFolderFilterMatch(bool)), + d->folderSearchBar, TQT_SLOT(slotSearchResult(bool))); - connect(d->tagFolderView, SIGNAL(signalTextTagFilterMatch(bool)), - d->tagSearchBar, SLOT(slotSearchResult(bool))); + connect(d->tagFolderView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagSearchBar, TQT_SLOT(slotSearchResult(bool))); - connect(d->searchFolderView, SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchSearchBar, SLOT(slotSearchResult(bool))); + connect(d->searchFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchSearchBar, TQT_SLOT(slotSearchResult(bool))); - connect(d->tagFilterView, SIGNAL(signalTextTagFilterMatch(bool)), - d->tagFilterSearchBar, SLOT(slotSearchResult(bool))); + connect(d->tagFilterView, TQT_SIGNAL(signalTextTagFilterMatch(bool)), + d->tagFilterSearchBar, TQT_SLOT(slotSearchResult(bool))); // -- Preview image widget Connections ------------------------ - connect(d->albumWidgetStack, SIGNAL(signalNextItem()), - this, SLOT(slotNextItem())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalNextItem()), + this, TQT_SLOT(slotNextItem())); - connect(d->albumWidgetStack, SIGNAL(signalPrevItem()), - this, SLOT(slotPrevItem())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalPrevItem()), + this, TQT_SLOT(slotPrevItem())); - connect(d->albumWidgetStack, SIGNAL(signalEditItem()), - this, SLOT(slotImageEdit())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalEditItem()), + this, TQT_SLOT(slotImageEdit())); - connect(d->albumWidgetStack, SIGNAL(signalDeleteItem()), - this, SLOT(slotImageDelete())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalDeleteItem()), + this, TQT_SLOT(slotImageDelete())); - connect(d->albumWidgetStack, SIGNAL(signalToggledToPreviewMode(bool)), - this, SLOT(slotToggledToPreviewMode(bool))); + connect(d->albumWidgetStack, TQT_SIGNAL(signalToggledToPreviewMode(bool)), + this, TQT_SLOT(slotToggledToPreviewMode(bool))); - connect(d->albumWidgetStack, SIGNAL(signalBack2Album()), - this, SLOT(slotEscapePreview())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalBack2Album()), + this, TQT_SLOT(slotEscapePreview())); - connect(d->albumWidgetStack, SIGNAL(signalSlideShow()), - this, SLOT(slotSlideShowAll())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalSlideShow()), + this, TQT_SLOT(slotSlideShowAll())); - connect(d->albumWidgetStack, SIGNAL(signalZoomFactorChanged(double)), - this, SLOT(slotZoomFactorChanged(double))); + connect(d->albumWidgetStack, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SLOT(slotZoomFactorChanged(double))); - connect(d->albumWidgetStack, SIGNAL(signalInsert2LightTable()), - this, SLOT(slotImageAddToLightTable())); + connect(d->albumWidgetStack, TQT_SIGNAL(signalInsert2LightTable()), + this, TQT_SLOT(slotImageAddToLightTable())); // -- Selection timer --------------- - connect(d->selectionTimer, SIGNAL(timeout()), - this, SLOT(slotDispatchImageSelected())); + connect(d->selectionTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotDispatchImageSelected())); } void DigikamView::loadViewState() @@ -551,8 +551,8 @@ void DigikamView::slotLastItem(void) void DigikamView::slotAllAlbumsLoaded() { - disconnect(d->albumManager, SIGNAL(signalAllAlbumsLoaded()), - this, SLOT(slotAllAlbumsLoaded())); + disconnect(d->albumManager, TQT_SIGNAL(signalAllAlbumsLoaded()), + this, TQT_SLOT(slotAllAlbumsLoaded())); loadViewState(); Album *album = d->albumManager->findAlbum(d->initialAlbumID); @@ -655,7 +655,7 @@ void DigikamView::slotAlbumDeleted(Album *album) /* // For what is this needed? Album *a; - QWidget *widget; + TQWidget *widget; d->albumHistory->getCurrentAlbum(&a, &widget); changeAlbumFromHistory(a, widget); @@ -752,7 +752,7 @@ void DigikamView::slotAlbumsCleared() void DigikamView::slotAlbumHistoryBack(int steps) { Album *album; - QWidget *widget; + TQWidget *widget; d->albumHistory->back(&album, &widget, steps); @@ -762,25 +762,25 @@ void DigikamView::slotAlbumHistoryBack(int steps) void DigikamView::slotAlbumHistoryForward(int steps) { Album *album; - QWidget *widget; + TQWidget *widget; d->albumHistory->forward(&album, &widget, steps); changeAlbumFromHistory(album, widget); } -void DigikamView::changeAlbumFromHistory(Album *album, QWidget *widget) +void DigikamView::changeAlbumFromHistory(Album *album, TQWidget *widget) { if (album && widget) { - QListViewItem *item = 0; + TQListViewItem *item = 0; // Check if widget is a vbox used to host folderview, tagview or searchview. - if (QVBox *v = dynamic_cast<QVBox*>(widget)) + if (TQVBox *v = dynamic_cast<TQVBox*>(widget)) { if (v == d->folderBox) { - item = (QListViewItem*)album->extraData(d->folderView); + item = (TQListViewItem*)album->extraData(d->folderView); if(!item) return; d->folderView->setSelected(item, true); @@ -788,7 +788,7 @@ void DigikamView::changeAlbumFromHistory(Album *album, QWidget *widget) } else if (v == d->tagBox) { - item = (QListViewItem*)album->extraData(d->tagFolderView); + item = (TQListViewItem*)album->extraData(d->tagFolderView); if(!item) return; d->tagFolderView->setSelected(item, true); @@ -796,7 +796,7 @@ void DigikamView::changeAlbumFromHistory(Album *album, QWidget *widget) } else if (v == d->searchBox) { - item = (QListViewItem*)album->extraData(d->searchFolderView); + item = (TQListViewItem*)album->extraData(d->searchFolderView); if(!item) return; d->searchFolderView->setSelected(item, true); @@ -805,13 +805,13 @@ void DigikamView::changeAlbumFromHistory(Album *album, QWidget *widget) } else if (DateFolderView *v = dynamic_cast<DateFolderView*>(widget)) { - item = (QListViewItem*)album->extraData(v); + item = (TQListViewItem*)album->extraData(v); if(!item) return; v->setSelected(item); } else if (TimeLineView *v = dynamic_cast<TimeLineView*>(widget)) { - item = (QListViewItem*)album->extraData(v->folderView()); + item = (TQListViewItem*)album->extraData(v->folderView()); if(!item) return; v->folderView()->setSelected(item, true); @@ -820,24 +820,24 @@ void DigikamView::changeAlbumFromHistory(Album *album, QWidget *widget) d->leftSideBar->setActiveTab(widget); - d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); } } void DigikamView::clearHistory() { d->albumHistory->clearHistory(); - d->parent->enableAlbumBackwardHistory(false); - d->parent->enableAlbumForwardHistory(false); + d->tqparent->enableAlbumBackwardHistory(false); + d->tqparent->enableAlbumForwardHistory(false); } -void DigikamView::getBackwardHistory(QStringList &titles) +void DigikamView::getBackwardHistory(TQStringList &titles) { d->albumHistory->getBackwardHistory(titles); } -void DigikamView::getForwardHistory(QStringList &titles) +void DigikamView::getForwardHistory(TQStringList &titles) { d->albumHistory->getForwardHistory(titles); } @@ -854,8 +854,8 @@ void DigikamView::slotSelectAlbum(const KURL &) AlbumFolderItem_Deprecated *item; item = static_cast<AlbumFolderItem_Deprecated*>(album->getViewItem()); mFolderView_Deprecated->setSelected(item); - d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); } */ } @@ -890,7 +890,7 @@ void DigikamView::slotGotoDateAndItem(AlbumIconItem* iconItem) { KURL url( iconItem->imageInfo()->kurl() ); url.cleanPath(); - QDate date = iconItem->imageInfo()->dateTime().date(); + TQDate date = iconItem->imageInfo()->dateTime().date(); emit signalNoCurrentItem(); @@ -954,8 +954,8 @@ void DigikamView::slotAlbumSelected(Album* album) } d->albumHistory->addAlbum(album, d->leftSideBar->getActiveTab()); - d->parent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); - d->parent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); + d->tqparent->enableAlbumBackwardHistory(!d->albumHistory->isBackwardEmpty()); + d->tqparent->enableAlbumForwardHistory(!d->albumHistory->isForwardEmpty()); d->iconView->setAlbum(album); if (album->isRoot()) @@ -992,7 +992,7 @@ void DigikamView::slotDispatchImageSelected() if (d->needDispatchSelection) { // the list of copies of ImageInfos of currently selected items, currentItem first - QPtrList<ImageInfo> list = d->iconView->selectedImageInfos(true); + TQPtrList<ImageInfo> list = d->iconView->selectedImageInfos(true); // no copy needed for this one, as this list is just used for counting // the total number of images KURL::List listAll = d->iconView->allItems(); @@ -1056,9 +1056,9 @@ void DigikamView::setThumbSize(int size) delete d->thumbSizeTimer; } - d->thumbSizeTimer = new QTimer( this ); - connect(d->thumbSizeTimer, SIGNAL(timeout()), - this, SLOT(slotThumbSizeEffect()) ); + d->thumbSizeTimer = new TQTimer( this ); + connect(d->thumbSizeTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotThumbSizeEffect()) ); d->thumbSizeTimer->start(300, true); } } @@ -1080,25 +1080,25 @@ void DigikamView::toggleZoomActions() { if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewImageMode) { - d->parent->enableZoomMinusAction(true); - d->parent->enableZoomPlusAction(true); + d->tqparent->enableZoomMinusAction(true); + d->tqparent->enableZoomPlusAction(true); if (d->albumWidgetStack->maxZoom()) - d->parent->enableZoomPlusAction(false); + d->tqparent->enableZoomPlusAction(false); if (d->albumWidgetStack->minZoom()) - d->parent->enableZoomMinusAction(false); + d->tqparent->enableZoomMinusAction(false); } else if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode) { - d->parent->enableZoomMinusAction(true); - d->parent->enableZoomPlusAction(true); + d->tqparent->enableZoomMinusAction(true); + d->tqparent->enableZoomPlusAction(true); if (d->thumbSize >= ThumbnailSize::Huge) - d->parent->enableZoomPlusAction(false); + d->tqparent->enableZoomPlusAction(false); if (d->thumbSize <= ThumbnailSize::Small) - d->parent->enableZoomMinusAction(false); + d->tqparent->enableZoomMinusAction(false); } } @@ -1172,19 +1172,19 @@ void DigikamView::slotAlbumSyncPicturesMetadata() if (!album) return; - BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(this, album); + BatchSyncMetadata *syncMetadata = new BatchSyncMetadata(TQT_TQOBJECT(this), album); - connect(syncMetadata, SIGNAL(signalProgressBarMode(int, const QString&)), - d->parent, SLOT(slotProgressBarMode(int, const QString&))); + connect(syncMetadata, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + d->tqparent, TQT_SLOT(slotProgressBarMode(int, const TQString&))); - connect(syncMetadata, SIGNAL(signalProgressValue(int)), - d->parent, SLOT(slotProgressValue(int))); + connect(syncMetadata, TQT_SIGNAL(signalProgressValue(int)), + d->tqparent, TQT_SLOT(slotProgressValue(int))); - connect(syncMetadata, SIGNAL(signalComplete()), - this, SLOT(slotAlbumSyncPicturesMetadataDone())); + connect(syncMetadata, TQT_SIGNAL(signalComplete()), + this, TQT_SLOT(slotAlbumSyncPicturesMetadataDone())); - connect(d->parent, SIGNAL(signalCancelButtonPressed()), - syncMetadata, SLOT(slotAbort())); + connect(d->tqparent, TQT_SIGNAL(signalCancelButtonPressed()), + syncMetadata, TQT_SLOT(slotAbort())); syncMetadata->parseAlbum(); } @@ -1395,7 +1395,7 @@ void DigikamView::slotSortImages(int order) d->iconView->slotRearrange(); } -void DigikamView::slotLeftSidebarChangedTab(QWidget* w) +void DigikamView::slotLeftSidebarChangedTab(TQWidget* w) { // setActive means that selection changes are propagated, nothing more. // Additionally, when it is set to true, the selectionChanged signal will be emitted. @@ -1485,8 +1485,8 @@ void DigikamView::slotSlideShowRecursive() } ImageInfoAlbumsJob *job = new ImageInfoAlbumsJob; - connect(job, SIGNAL(signalCompleted(const ImageInfoList&)), - this, SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); + connect(job, TQT_SIGNAL(signalCompleted(const ImageInfoList&)), + this, TQT_SLOT(slotItemsInfoFromAlbums(const ImageInfoList&))); job->allItemsFromAlbums(albumList); } } @@ -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...") - .arg(infoList.count())); + .tqarg(infoList.count())); DMetadata meta; SlideShowSettings settings; @@ -1545,7 +1545,7 @@ void DigikamView::slideShow(ImageInfoList &infoList) kapp->processEvents(); } - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); if (!d->cancelSlideShow) { diff --git a/digikam/digikam/digikamview.h b/digikam/digikam/digikamview.h index be972db..3e57ea6 100644 --- a/digikam/digikam/digikamview.h +++ b/digikam/digikam/digikamview.h @@ -25,11 +25,11 @@ #ifndef DIGIKAMVIEW_H #define DIGIKAMVIEW_H -// Qt includes. +// TQt includes. -#include <qhbox.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqhbox.h> +#include <tqstringlist.h> +#include <tqmap.h> // Local includes. @@ -44,20 +44,21 @@ class AlbumSettings; class Album; class DigikamViewPriv; -class DigikamView : public QHBox +class DigikamView : public TQHBox { Q_OBJECT + TQ_OBJECT public: - DigikamView(QWidget *parent); + DigikamView(TQWidget *tqparent); ~DigikamView(); void applySettings(); void refreshView(); void clearHistory(); - void getForwardHistory(QStringList &titles); - void getBackwardHistory(QStringList &titles); + void getForwardHistory(TQStringList &titles); + void getBackwardHistory(TQStringList &titles); void showSideBars(); void hideSideBars(); void setThumbSize(int size); @@ -66,10 +67,10 @@ signals: void signalAlbumSelected(bool val); void signalTagSelected(bool val); - void signalImageSelected(const QPtrList<ImageInfo>& list, bool, bool, + void signalImageSelected(const TQPtrList<ImageInfo>& list, bool, bool, const KURL::List& listAll); void signalNoCurrentItem(); - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalThumbSizeChanged(int); void signalZoomChanged(double, int); @@ -77,7 +78,7 @@ signals: void signalGotoAlbumAndItem(AlbumIconItem *); void signalGotoDateAndItem(AlbumIconItem *); void signalGotoTagAndItem(int tagID); - void signalChangedTab(QWidget*); + void signalChangedTab(TQWidget*); public slots: @@ -154,7 +155,7 @@ private: void setupConnections(); void loadViewState(); void saveViewState(); - void changeAlbumFromHistory(Album *album, QWidget *widget); + void changeAlbumFromHistory(Album *album, TQWidget *widget); void imageEdit(AlbumIconItem* iconItem=0); void slideShow(ImageInfoList &infoList); @@ -170,7 +171,7 @@ private slots: void slotDispatchImageSelected(); void slotItemsInfoFromAlbums(const ImageInfoList&); - void slotLeftSidebarChangedTab(QWidget* w); + void slotLeftSidebarChangedTab(TQWidget* w); void slotFirstItem(void); void slotPrevItem(void); diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp index 46e1077..e8b6646 100644 --- a/digikam/digikam/dio.cpp +++ b/digikam/digikam/dio.cpp @@ -34,11 +34,11 @@ extern "C" #include <cstdio> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qcstring.h> -#include <qdatastream.h> +#include <tqfile.h> +#include <tqcstring.h> +#include <tqdatastream.h> // KDE includes. @@ -163,14 +163,14 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) return false; } - QString srcPath = Digikam::AlbumManager::instance()->getLibraryPath() + src.path(); - QString dstPath = Digikam::AlbumManager::instance()->getLibraryPath() + dest.path(); - QString newDstPath; + TQString srcPath = Digikam::AlbumManager::instance()->getLibraryPath() + src.path(); + TQString dstPath = Digikam::AlbumManager::instance()->getLibraryPath() + dest.path(); + TQString newDstPath; bool overwrite = false; struct stat stbuf; - while (::stat(QFile::encodeName(dstPath), &stbuf) == 0) + while (::stat(TQFile::encodeName(dstPath), &stbuf) == 0) { KIO::RenameDlg_Result result = KIO::open_RenameDlg(i18n("Rename File"), srcPath, dstPath, @@ -200,7 +200,7 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) } Digikam::AlbumDB* db = Digikam::AlbumManager::instance()->albumDB(); - if (::rename(QFile::encodeName(srcPath), QFile::encodeName(dstPath)) == 0) + if (::rename(TQFile::encodeName(srcPath), TQFile::encodeName(dstPath)) == 0) { db->moveItem(srcAlbum->id(), src.fileName(), dstAlbum->id(), KURL(dstPath).fileName()); @@ -208,18 +208,18 @@ KIO::CopyJob *rename(const KURL& src, const KURL& dest) } KMessageBox::error(0, i18n("Failed to rename file\n%1") - .arg(src.fileName()), i18n("Rename Failed")); + .tqarg(src.fileName()), i18n("Rename Failed")); return false; */ } KIO::Job* scan(const KURL& albumURL) { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << Digikam::AlbumManager::instance()->getLibraryPath(); ds << albumURL; - ds << QString(); + ds << TQString(); ds << 0; ds << 0; ds << 0; @@ -229,7 +229,7 @@ KIO::Job* scan(const KURL& albumURL) KIO::Job* job = new KIO::TransferJob(albumURL, KIO::CMD_SPECIAL, - ba, QByteArray(), + ba, TQByteArray(), false); new Watch(job); @@ -244,8 +244,8 @@ bool running() Watch::Watch(KIO::Job* job) { m_runCount++; - connect(job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotDone(KIO::Job*))); + connect(job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotDone(KIO::Job*))); } void Watch::slotDone(KIO::Job*) diff --git a/digikam/digikam/dio_p.h b/digikam/digikam/dio_p.h index 0aa34c8..b608190 100644 --- a/digikam/digikam/dio_p.h +++ b/digikam/digikam/dio_p.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-05-17 - * Description : Qt Object to follow low level files management. + * Description : TQt Object to follow low level files management. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * @@ -24,9 +24,9 @@ #ifndef DIO_P_H #define DIO_P_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> namespace KIO { @@ -36,9 +36,10 @@ class Job; namespace DIO { -class Watch : public QObject +class Watch : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/digikam/dragobjects.cpp b/digikam/digikam/dragobjects.cpp index cb45060..b835faa 100644 --- a/digikam/digikam/dragobjects.cpp +++ b/digikam/digikam/dragobjects.cpp @@ -33,16 +33,16 @@ namespace Digikam ItemDrag::ItemDrag(const KURL::List &urls, const KURL::List &kioURLs, - const QValueList<int>& albumIDs, - const QValueList<int>& imageIDs, - QWidget* dragSource, const char* name) + const TQValueList<int>& albumIDs, + const TQValueList<int>& imageIDs, + TQWidget* dragSource, const char* name) : KURLDrag(urls, dragSource, name), m_kioURLs(kioURLs), m_albumIDs(albumIDs), m_imageIDs(imageIDs) { } -bool ItemDrag::canDecode(const QMimeSource* e) +bool ItemDrag::canDecode(const TQMimeSource* e) { return e->provides("digikam/item-ids") || e->provides("digikam/album-ids") || @@ -50,8 +50,8 @@ bool ItemDrag::canDecode(const QMimeSource* e) e->provides("digikam/digikamalbums"); } -bool ItemDrag::decode(const QMimeSource* e, KURL::List &urls, KURL::List &kioURLs, - QValueList<int>& albumIDs, QValueList<int>& imageIDs) +bool ItemDrag::decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioURLs, + TQValueList<int>& albumIDs, TQValueList<int>& imageIDs) { urls.clear(); kioURLs.clear(); @@ -60,22 +60,22 @@ bool ItemDrag::decode(const QMimeSource* e, KURL::List &urls, KURL::List &kioURL if (KURLDrag::decode(e, urls)) { - QByteArray albumarray = e->encodedData("digikam/album-ids"); - QByteArray imagearray = e->encodedData("digikam/image-ids"); - QByteArray kioarray = e->encodedData("digikam/digikamalbums"); + TQByteArray albumarray = e->tqencodedData("digikam/album-ids"); + TQByteArray imagearray = e->tqencodedData("digikam/image-ids"); + TQByteArray kioarray = e->tqencodedData("digikam/digikamalbums"); if (albumarray.size() && imagearray.size() && kioarray.size()) { int id; - QDataStream dsAlbums(albumarray, IO_ReadOnly); + TQDataStream dsAlbums(albumarray, IO_ReadOnly); while (!dsAlbums.atEnd()) { dsAlbums >> id; albumIDs.append(id); } - QDataStream dsImages(imagearray, IO_ReadOnly); + TQDataStream dsImages(imagearray, IO_ReadOnly); while (!dsImages.atEnd()) { dsImages >> id; @@ -83,7 +83,7 @@ bool ItemDrag::decode(const QMimeSource* e, KURL::List &urls, KURL::List &kioURL } KURL u; - QDataStream dsKio(kioarray, IO_ReadOnly); + TQDataStream dsKio(kioarray, IO_ReadOnly); while (!dsKio.atEnd()) { dsKio >> u; @@ -97,16 +97,16 @@ bool ItemDrag::decode(const QMimeSource* e, KURL::List &urls, KURL::List &kioURL return false; } -QByteArray ItemDrag::encodedData(const char* mime) const +TQByteArray ItemDrag::tqencodedData(const char* mime) const { - QCString mimetype(mime); + TQCString mimetype(mime); if (mimetype == "digikam/album-ids") { - QByteArray byteArray; - QDataStream ds(byteArray, IO_WriteOnly); + TQByteArray byteArray; + TQDataStream ds(byteArray, IO_WriteOnly); - QValueList<int>::const_iterator it; + TQValueList<int>::const_iterator it; for (it = m_albumIDs.begin(); it != m_albumIDs.end(); ++it) { ds << (*it); @@ -116,10 +116,10 @@ QByteArray ItemDrag::encodedData(const char* mime) const } else if (mimetype == "digikam/image-ids") { - QByteArray byteArray; - QDataStream ds(byteArray, IO_WriteOnly); + TQByteArray byteArray; + TQDataStream ds(byteArray, IO_WriteOnly); - QValueList<int>::const_iterator it; + TQValueList<int>::const_iterator it; for (it = m_imageIDs.begin(); it != m_imageIDs.end(); ++it) { ds << (*it); @@ -129,8 +129,8 @@ QByteArray ItemDrag::encodedData(const char* mime) const } else if (mimetype == "digikam/digikamalbums") { - QByteArray byteArray; - QDataStream ds(byteArray, IO_WriteOnly); + TQByteArray byteArray; + TQDataStream ds(byteArray, IO_WriteOnly); KURL::List::const_iterator it; for (it = m_kioURLs.begin(); it != m_kioURLs.end(); ++it) @@ -142,7 +142,7 @@ QByteArray ItemDrag::encodedData(const char* mime) const } else { - return KURLDrag::encodedData(mime); + return KURLDrag::tqencodedData(mime); } } @@ -164,14 +164,14 @@ const char* ItemDrag::format(int i) const // ------------------------------------------------------------------------ -TagDrag::TagDrag( int albumid, QWidget *dragSource, +TagDrag::TagDrag( int albumid, TQWidget *dragSource, const char *name ) : - QDragObject( dragSource, name ) + TQDragObject( dragSource, name ) { mAlbumID = albumid; } -bool TagDrag::canDecode( const QMimeSource* e ) +bool TagDrag::canDecode( const TQMimeSource* e ) { return e->provides("digikam/tag-id"); } @@ -184,10 +184,10 @@ const char* TagDrag::format( int i ) const return 0; } -QByteArray TagDrag::encodedData( const char* ) const +TQByteArray TagDrag::tqencodedData( const char* ) const { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << mAlbumID; return ba; } @@ -195,14 +195,14 @@ QByteArray TagDrag::encodedData( const char* ) const // ------------------------------------------------------------------------ AlbumDrag::AlbumDrag(const KURL &url, int albumid, - QWidget *dragSource, + TQWidget *dragSource, const char *name) : KURLDrag(url, dragSource, name) { mAlbumID = albumid; } -bool AlbumDrag::canDecode( const QMimeSource* e ) +bool AlbumDrag::canDecode( const TQMimeSource* e ) { return e->provides("digikam/album-id"); } @@ -217,23 +217,23 @@ const char* AlbumDrag::format( int i ) const return 0; } -QByteArray AlbumDrag::encodedData(const char *mime) const +TQByteArray AlbumDrag::tqencodedData(const char *mime) const { - QCString mimetype( mime ); + TQCString mimetype( mime ); if(mimetype == "digikam/album-id") { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << mAlbumID; return ba; } else { - return KURLDrag::encodedData(mime); + return KURLDrag::tqencodedData(mime); } } -bool AlbumDrag::decode(const QMimeSource* e, KURL::List &urls, +bool AlbumDrag::decode(const TQMimeSource* e, KURL::List &urls, int &albumID) { urls.clear(); @@ -241,10 +241,10 @@ bool AlbumDrag::decode(const QMimeSource* e, KURL::List &urls, if(KURLDrag::decode(e, urls)) { - QByteArray ba = e->encodedData("digikam/album-id"); + TQByteArray ba = e->tqencodedData("digikam/album-id"); if (ba.size()) { - QDataStream ds(ba, IO_ReadOnly); + TQDataStream ds(ba, IO_ReadOnly); if(!ds.atEnd()) { ds >> albumID; @@ -258,22 +258,22 @@ bool AlbumDrag::decode(const QMimeSource* e, KURL::List &urls, // ------------------------------------------------------------------------ -TagListDrag::TagListDrag(const QValueList<int>& tagIDs, QWidget *dragSource, +TagListDrag::TagListDrag(const TQValueList<int>& tagIDs, TQWidget *dragSource, const char *name) - : QDragObject( dragSource, name ) + : TQDragObject( dragSource, name ) { m_tagIDs = tagIDs; } -bool TagListDrag::canDecode(const QMimeSource* e) +bool TagListDrag::canDecode(const TQMimeSource* e) { return e->provides("digikam/taglist"); } -QByteArray TagListDrag::encodedData(const char*) const +TQByteArray TagListDrag::tqencodedData(const char*) const { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << m_tagIDs; return ba; } @@ -288,23 +288,23 @@ const char* TagListDrag::format(int i) const // ------------------------------------------------------------------------ -CameraItemListDrag::CameraItemListDrag(const QStringList& cameraItemPaths, - QWidget *dragSource, +CameraItemListDrag::CameraItemListDrag(const TQStringList& cameraItemPaths, + TQWidget *dragSource, const char *name) - : QDragObject( dragSource, name ) + : TQDragObject( dragSource, name ) { m_cameraItemPaths = cameraItemPaths; } -bool CameraItemListDrag::canDecode(const QMimeSource* e) +bool CameraItemListDrag::canDecode(const TQMimeSource* e) { return e->provides("digikam/cameraItemlist"); } -QByteArray CameraItemListDrag::encodedData(const char*) const +TQByteArray CameraItemListDrag::tqencodedData(const char*) const { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << m_cameraItemPaths; return ba; } @@ -319,8 +319,8 @@ const char* CameraItemListDrag::format(int i) const // ------------------------------------------------------------------------ -CameraDragObject::CameraDragObject(const CameraType& ctype, QWidget *dragSource) - : QStoredDrag("camera/unknown", dragSource) +CameraDragObject::CameraDragObject(const CameraType& ctype, TQWidget *dragSource) + : TQStoredDrag("camera/unknown", dragSource) { setCameraType(ctype); } @@ -331,8 +331,8 @@ CameraDragObject::~CameraDragObject() void CameraDragObject::setCameraType(const CameraType& ctype) { - QByteArray byteArray; - QDataStream ds(byteArray, IO_WriteOnly); + TQByteArray byteArray; + TQDataStream ds(byteArray, IO_WriteOnly); ds << ctype.title(); ds << ctype.model(); @@ -343,20 +343,20 @@ void CameraDragObject::setCameraType(const CameraType& ctype) setEncodedData(byteArray); } -bool CameraDragObject::canDecode(const QMimeSource* e) +bool CameraDragObject::canDecode(const TQMimeSource* e) { return e->provides("camera/unknown"); } -bool CameraDragObject::decode(const QMimeSource* e, CameraType& ctype) +bool CameraDragObject::decode(const TQMimeSource* e, CameraType& ctype) { - QByteArray payload = e->encodedData("camera/unknown"); + TQByteArray payload = e->tqencodedData("camera/unknown"); if (payload.size()) { - QString title, model, port, path; - QDateTime lastAccess; + TQString title, model, port, path; + TQDateTime lastAccess; - QDataStream ds(payload, IO_ReadOnly); + TQDataStream ds(payload, IO_ReadOnly); ds >> title; ds >> model; ds >> port; diff --git a/digikam/digikam/dragobjects.h b/digikam/digikam/dragobjects.h index 0b6dd4e..5d5f72e 100644 --- a/digikam/digikam/dragobjects.h +++ b/digikam/digikam/dragobjects.h @@ -26,11 +26,11 @@ #ifndef DRAGOBJECTS_H #define DRAGOBJECTS_H -// Qt includes. +// TQt includes. -#include <qdragobject.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqdragobject.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> // KDE includes. @@ -40,7 +40,7 @@ #include "cameratype.h" -class QWidget; +class TQWidget; namespace Digikam { @@ -60,27 +60,27 @@ class ItemDrag : public KURLDrag public: ItemDrag(const KURL::List& urls, const KURL::List& kioURLs, - const QValueList<int>& albumIDs, - const QValueList<int>& imageIDs, - QWidget* dragSource=0, const char* name=0); + const TQValueList<int>& albumIDs, + const TQValueList<int>& imageIDs, + TQWidget* dragSource=0, const char* name=0); - static bool canDecode(const QMimeSource* e); - static bool decode(const QMimeSource* e, + static bool canDecode(const TQMimeSource* e); + static bool decode(const TQMimeSource* e, KURL::List &urls, KURL::List &kioURLs, - QValueList<int>& albumIDs, - QValueList<int>& imageIDs); + TQValueList<int>& albumIDs, + TQValueList<int>& imageIDs); protected: virtual const char* format(int i) const; - virtual QByteArray encodedData(const char* mime) const; + virtual TQByteArray tqencodedData(const char* mime) const; private: KURL::List m_kioURLs; - QValueList<int> m_albumIDs; - QValueList<int> m_imageIDs; + TQValueList<int> m_albumIDs; + TQValueList<int> m_imageIDs; }; @@ -90,16 +90,16 @@ private: * When a tag is moved through drag'n'drop an object of this class * is created. */ -class TagDrag : public QDragObject +class TagDrag : public TQDragObject { public: - TagDrag(int albumid, QWidget *dragSource = 0, const char *name = 0); - static bool canDecode(const QMimeSource* e); + TagDrag(int albumid, TQWidget *dragSource = 0, const char *name = 0); + static bool canDecode(const TQMimeSource* e); protected: - QByteArray encodedData( const char* ) const; + TQByteArray tqencodedData( const char* ) const; const char* format(int i) const; private: @@ -116,13 +116,13 @@ class AlbumDrag : public KURLDrag { public: AlbumDrag(const KURL &url, int albumid, - QWidget *dragSource = 0, const char *name = 0); - static bool canDecode(const QMimeSource* e); - static bool decode(const QMimeSource* e, KURL::List &urls, + TQWidget *dragSource = 0, const char *name = 0); + static bool canDecode(const TQMimeSource* e); + static bool decode(const TQMimeSource* e, KURL::List &urls, int &albumID); protected: - QByteArray encodedData(const char*) const; + TQByteArray tqencodedData(const char*) const; const char* format(int i) const; private: @@ -135,22 +135,22 @@ private: * When a tag is moved through drag'n'drop an object of this class * is created. */ -class TagListDrag : public QDragObject +class TagListDrag : public TQDragObject { public: - TagListDrag(const QValueList<int>& tagIDs, QWidget *dragSource = 0, + TagListDrag(const TQValueList<int>& tagIDs, TQWidget *dragSource = 0, const char *name = 0); - static bool canDecode(const QMimeSource* e); + static bool canDecode(const TQMimeSource* e); protected: - QByteArray encodedData( const char* ) const; + TQByteArray tqencodedData( const char* ) const; const char* format(int i) const; private: - QValueList<int> m_tagIDs; + TQValueList<int> m_tagIDs; }; /** @@ -159,22 +159,22 @@ private: * When a camera item is moved through drag'n'drop an object of this class * is created. */ -class CameraItemListDrag : public QDragObject +class CameraItemListDrag : public TQDragObject { public: - CameraItemListDrag(const QStringList& cameraItemPaths, QWidget *dragSource = 0, + CameraItemListDrag(const TQStringList& cameraItemPaths, TQWidget *dragSource = 0, const char *name = 0); - static bool canDecode(const QMimeSource* e); + static bool canDecode(const TQMimeSource* e); protected: - QByteArray encodedData( const char* ) const; + TQByteArray tqencodedData( const char* ) const; const char* format(int i) const; private: - QStringList m_cameraItemPaths; + TQStringList m_cameraItemPaths; }; /** @@ -183,16 +183,16 @@ private: * When a camera object is moved through drag'n'drop an object of this class * is created. */ -class CameraDragObject : public QStoredDrag +class CameraDragObject : public TQStoredDrag { public: - CameraDragObject(const CameraType& ctype, QWidget* dragSource=0); + CameraDragObject(const CameraType& ctype, TQWidget* dragSource=0); ~CameraDragObject(); - static bool canDecode(const QMimeSource* e); - static bool decode(const QMimeSource* e, CameraType& ctype); + static bool canDecode(const TQMimeSource* e); + static bool decode(const TQMimeSource* e, CameraType& ctype); private: diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp index c1d4bd2..d471e73 100644 --- a/digikam/digikam/firstrun.cpp +++ b/digikam/digikam/firstrun.cpp @@ -21,15 +21,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qvariant.h> -#include <qlabel.h> -#include <qframe.h> +#include <tqvariant.h> +#include <tqlabel.h> +#include <tqframe.h> #include <kurlrequester.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -44,25 +44,25 @@ namespace Digikam { -FirstRunWidget::FirstRunWidget( QWidget* parent ) - : QWidget( parent ) +FirstRunWidget::FirstRunWidget( TQWidget* tqparent ) + : TQWidget( tqparent ) { setName( "FirstRunWidget" ); - QVBoxLayout *vlayout = new QVBoxLayout( this, 0, 6 ); + TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); - m_textLabel2 = new QLabel( this ); - vlayout->addWidget( m_textLabel2 ); + m_textLabel2 = new TQLabel( this ); + vtqlayout->addWidget( m_textLabel2 ); - QFrame *line1 = new QFrame( this ); - line1->setFrameShape( QFrame::HLine ); - line1->setFrameShadow( QFrame::Sunken ); - line1->setFrameShape( QFrame::HLine ); - vlayout->addWidget( line1 ); + TQFrame *line1 = new TQFrame( this ); + line1->setFrameShape( TQFrame::HLine ); + line1->setFrameShadow( TQFrame::Sunken ); + line1->setFrameShape( TQFrame::HLine ); + vtqlayout->addWidget( line1 ); - QGridLayout *grid = new QGridLayout( 0, 1, 1, 0, 6 ); + TQGridLayout *grid = new TQGridLayout( 0, 1, 1, 0, 6 ); - m_pixLabel = new QLabel( this ); - m_pixLabel->setAlignment( int( QLabel::AlignTop ) ); + m_pixLabel = new TQLabel( this ); + m_pixLabel->tqsetAlignment( int( TQLabel::AlignTop ) ); grid->addMultiCellWidget( m_pixLabel, 0, 1, 0, 0 ); m_path = new KURLRequester( this ); @@ -70,15 +70,15 @@ FirstRunWidget::FirstRunWidget( QWidget* parent ) grid->addWidget( m_path, 1, 1 ); - m_textLabel1 = new QLabel( this ); - m_textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + m_textLabel1 = new TQLabel( this ); + m_textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); grid->addWidget( m_textLabel1, 0, 1 ); - vlayout->addLayout( grid ); - vlayout->addItem( new QSpacerItem( 16, 16, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding ) ); + vtqlayout->addLayout( grid ); + vtqlayout->addItem( new TQSpacerItem( 16, 16, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); languageChange(); - resize( QSize(479, 149).expandedTo(minimumSizeHint()) ); + resize( TQSize(479, 149).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } @@ -89,7 +89,7 @@ FirstRunWidget::~FirstRunWidget() void FirstRunWidget::languageChange() { m_textLabel2->setText( i18n( "<b>Albums Library Folder</b>" ) ); - m_pixLabel->setText( QString() ); + m_pixLabel->setText( TQString() ); m_textLabel1->setText( i18n( "<p>digiKam will store the photo albums which you create in a " "common <b>Albums Library Folder</b>. " "Below, please select which folder you would like " diff --git a/digikam/digikam/firstrun.h b/digikam/digikam/firstrun.h index 4d96c22..cff54ce 100644 --- a/digikam/digikam/firstrun.h +++ b/digikam/digikam/firstrun.h @@ -24,33 +24,34 @@ #ifndef DIGIKAMFIRSTFIRSTRUNWIDGET_H #define DIGIKAMFIRSTFIRSTRUNWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. #include "digikam_export.h" -class QLabel; +class TQLabel; class KURLRequester; namespace Digikam { -class DIGIKAM_EXPORT FirstRunWidget : public QWidget +class DIGIKAM_EXPORT FirstRunWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FirstRunWidget( QWidget* parent = 0 ); + FirstRunWidget( TQWidget* tqparent = 0 ); ~FirstRunWidget(); public: - QLabel *m_pixLabel; + TQLabel *m_pixLabel; KURLRequester *m_path; protected slots: @@ -59,8 +60,8 @@ protected slots: private: - QLabel *m_textLabel1; - QLabel *m_textLabel2; + TQLabel *m_textLabel1; + TQLabel *m_textLabel2; }; } // namespace Digikam diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index 4fde8ff..ed7ba61 100644 --- a/digikam/digikam/folderitem.cpp +++ b/digikam/digikam/folderitem.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfont.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qstyle.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> // Local includes. @@ -40,15 +40,15 @@ namespace Digikam { -FolderItem::FolderItem(QListView* parent, const QString& text, bool special) - : QListViewItem(parent, text) +FolderItem::FolderItem(TQListView* tqparent, const TQString& text, bool special) + : TQListViewItem(tqparent, text) { m_special = special; m_focus = false; } -FolderItem::FolderItem(QListViewItem* parent, const QString& text, bool special) - : QListViewItem(parent, text) +FolderItem::FolderItem(TQListViewItem* tqparent, const TQString& text, bool special) + : TQListViewItem(tqparent, text) { m_special = special; m_focus = false; @@ -68,18 +68,18 @@ bool FolderItem::focus() const return m_focus; } -void FolderItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int) +void FolderItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int) { FolderView *fv = dynamic_cast<FolderView*>(listView()); if (!fv) return; - QFontMetrics fm(p->fontMetrics()); + TQFontMetrics fm(p->fontMetrics()); - QString t = text(column); + TQString t = text(column); int margin = fv->itemMargin(); int r = margin; - const QPixmap* icon = pixmap(column); + const TQPixmap* icon = pixmap(column); if (isSelected()) { @@ -104,16 +104,16 @@ void FolderItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int w if (m_special) { - QFont f(p->font()); + TQFont f(p->font()); f.setItalic(true); p->setFont(f); - p->setPen(isSelected() ? cg.color(QColorGroup::LinkVisited) : - cg.color(QColorGroup::Link)); + p->setPen(isSelected() ? cg.color(TQColorGroup::LinkVisited) : + cg.color(TQColorGroup::Link)); } - QRect br; - p->drawText(r, 0, width-margin-r, height(), Qt::AlignLeft|Qt::AlignVCenter, t, -1, &br); + TQRect br; + p->drawText(r, 0, width-margin-r, height(), TQt::AlignLeft|TQt::AlignVCenter, t, -1, &br); if (m_special) { @@ -123,7 +123,7 @@ void FolderItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int w if (m_focus) { p->setPen(cg.link()); - QRect r = fv->itemRect(this); + TQRect r = fv->tqitemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } @@ -147,16 +147,16 @@ int FolderItem::id() const // ------------------------------------------------------------------------------------ -FolderCheckListItem::FolderCheckListItem(QListView* parent, const QString& text, - QCheckListItem::Type tt) - : QCheckListItem(parent, text, tt) +FolderCheckListItem::FolderCheckListItem(TQListView* tqparent, const TQString& text, + TQCheckListItem::Type tt) + : TQCheckListItem(tqparent, text, tt) { m_focus = false; } -FolderCheckListItem::FolderCheckListItem(QListViewItem* parent, const QString& text, - QCheckListItem::Type tt) - : QCheckListItem(parent, text, tt) +FolderCheckListItem::FolderCheckListItem(TQListViewItem* tqparent, const TQString& text, + TQCheckListItem::Type tt) + : TQCheckListItem(tqparent, text, tt) { m_focus = false; } @@ -175,52 +175,52 @@ bool FolderCheckListItem::focus() const return m_focus; } -void FolderCheckListItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int) +void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int) { FolderView *fv = dynamic_cast<FolderView*>(listView()); if (!fv) return; - QFontMetrics fm(p->fontMetrics()); + TQFontMetrics fm(p->fontMetrics()); - QString t = text(column); + TQString t = text(column); int margin = fv->itemMargin(); int r = margin; - const QPixmap* icon = pixmap(column); + const TQPixmap* icon = pixmap(column); - int styleflags = QStyle::Style_Default; + int styleflags = TQStyle::Style_Default; switch (state()) { - case(QCheckListItem::Off): - styleflags |= QStyle::Style_Off; + case(TQCheckListItem::Off): + styleflags |= TQStyle::Style_Off; break; - case(QCheckListItem::NoChange): - styleflags |= QStyle::Style_NoChange; + case(TQCheckListItem::NoChange): + styleflags |= TQStyle::Style_NoChange; break; - case(QCheckListItem::On): - styleflags |= QStyle::Style_On; + case(TQCheckListItem::On): + styleflags |= TQStyle::Style_On; break; } if (isSelected()) - styleflags |= QStyle::Style_Selected; + styleflags |= TQStyle::Style_Selected; if (isEnabled() && fv->isEnabled()) - styleflags |= QStyle::Style_Enabled; + styleflags |= TQStyle::Style_Enabled; - if ((type() == QCheckListItem::CheckBox) || - (type() == QCheckListItem::CheckBoxController)) + if ((type() == TQCheckListItem::CheckBox) || + (type() == TQCheckListItem::CheckBoxController)) { - int boxsize = fv->style().pixelMetric(QStyle::PM_CheckListButtonSize, fv); + int boxsize = fv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, fv); int x = 3; int y = (height() - boxsize)/2 + margin; r += boxsize + 4; p->fillRect(0, 0, r, height(), cg.base()); - fv->style().drawPrimitive(QStyle::PE_CheckListIndicator, p, - QRect(x, y, boxsize, height()), - cg, styleflags, QStyleOption(this)); + fv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + TQRect(x, y, boxsize, height()), + cg, styleflags, TQStyleOption(this)); } if (isSelected()) @@ -244,12 +244,12 @@ void FolderCheckListItem::paintCell(QPainter* p, const QColorGroup& cg, int colu r += icon->width() + fv->itemMargin(); } - p->drawText(r, 0, width-margin-r, height(), Qt::AlignLeft|Qt::AlignVCenter, t); + p->drawText(r, 0, width-margin-r, height(), TQt::AlignLeft|TQt::AlignVCenter, t); if (m_focus) { p->setPen(cg.link()); - QRect r = fv->itemRect(this); + TQRect r = fv->tqitemRect(this); p->drawRect(0, 0, r.width(), r.height()); } } diff --git a/digikam/digikam/folderitem.h b/digikam/digikam/folderitem.h index 73b0ec6..4966a4b 100644 --- a/digikam/digikam/folderitem.h +++ b/digikam/digikam/folderitem.h @@ -25,9 +25,9 @@ #ifndef FOLDERITEM_H #define FOLDERITEM_H -// Qt includes. +// TQt includes. -#include <qlistview.h> +#include <tqlistview.h> // Local includes. @@ -36,12 +36,12 @@ namespace Digikam { -class DIGIKAM_EXPORT FolderItem : public QListViewItem +class DIGIKAM_EXPORT FolderItem : public TQListViewItem { public: - FolderItem(QListView* parent, const QString& text, bool special=false); - FolderItem(QListViewItem* parent, const QString& text, bool special=false); + FolderItem(TQListView* tqparent, const TQString& text, bool special=false); + FolderItem(TQListViewItem* tqparent, const TQString& text, bool special=false); virtual ~FolderItem(); @@ -52,7 +52,7 @@ public: protected: - void paintCell(QPainter* p, const QColorGroup & cg, int column, int width, int align); + void paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align); void setup(); private: @@ -63,14 +63,14 @@ private: // ------------------------------------------------------------------------------------ -class FolderCheckListItem : public QCheckListItem +class FolderCheckListItem : public TQCheckListItem { public: - FolderCheckListItem(QListView* parent, const QString& text, - QCheckListItem::Type tt); - FolderCheckListItem(QListViewItem* parent, const QString& text, - QCheckListItem::Type tt); + FolderCheckListItem(TQListView* tqparent, const TQString& text, + TQCheckListItem::Type tt); + FolderCheckListItem(TQListViewItem* tqparent, const TQString& text, + TQCheckListItem::Type tt); virtual ~FolderCheckListItem(); void setFocus(bool b); @@ -78,7 +78,7 @@ public: protected: - void paintCell(QPainter* p, const QColorGroup & cg, int column, int width, int align); + void paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align); void setup(); private: diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index a9acfe1..f7d1c2c 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -23,11 +23,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qstyle.h> -#include <qvaluelist.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqvaluelist.h> // KDE includes. @@ -66,33 +66,33 @@ public: int itemHeight; - QPixmap itemRegPix; - QPixmap itemSelPix; + TQPixmap itemRegPix; + TQPixmap itemSelPix; - QPoint dragStartPos; + TQPoint dragStartPos; - QListViewItem *dragItem; - QListViewItem *oldHighlightItem; + TQListViewItem *dragItem; + TQListViewItem *oldHighlightItem; }; //----------------------------------------------------------------------------- -FolderView::FolderView(QWidget *parent, const char *name) - : QListView(parent, name) +FolderView::FolderView(TQWidget *tqparent, const char *name) + : TQListView(tqparent, name) { d = new FolderViewPriv; - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); - connect(AlbumManager::instance(), SIGNAL(signalAllAlbumsLoaded()), - this, SLOT(slotAllAlbumsLoaded())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), + this, TQT_SLOT(slotAllAlbumsLoaded())); - connect(AlbumThumbnailLoader::instance(), SIGNAL(signalReloadThumbnails()), - this, SLOT(slotIconSizeChanged())); + connect(AlbumThumbnailLoader::instance(), TQT_SIGNAL(signalReloadThumbnails()), + this, TQT_SLOT(slotIconSizeChanged())); - setColumnAlignment(0, Qt::AlignLeft|Qt::AlignVCenter); + setColumnAlignment(0, TQt::AlignLeft|TQt::AlignVCenter); setShowSortIndicator(true); fontChange(font()); } @@ -120,29 +120,29 @@ int FolderView::itemHeight() const return d->itemHeight; } -QRect FolderView::itemRect(QListViewItem *item) const +TQRect FolderView::tqitemRect(TQListViewItem *item) const { if(!item) - return QRect(); + return TQRect(); - QRect r = QListView::itemRect(item); + TQRect r = TQListView::tqitemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); return r; } -QPixmap FolderView::itemBasePixmapRegular() const +TQPixmap FolderView::itemBasePixmapRegular() const { return d->itemRegPix; } -QPixmap FolderView::itemBasePixmapSelected() const +TQPixmap FolderView::itemBasePixmapSelected() const { return d->itemSelPix; } -void FolderView::resizeEvent(QResizeEvent* e) +void FolderView::resizeEvent(TQResizeEvent* e) { - QListView::resizeEvent(e); + TQListView::resizeEvent(e); int w = frameRect().width(); int h = itemHeight(); @@ -153,31 +153,31 @@ void FolderView::resizeEvent(QResizeEvent* e) } } -void FolderView::fontChange(const QFont& oldFont) +void FolderView::fontChange(const TQFont& oldFont) { // this is bad, since the settings value might not always be the _real_ height of the thumbnail. // (e.g. when it is blended, as for the tags) - d->itemHeight = QMAX(AlbumThumbnailLoader::instance()->thumbnailSize() + 2*itemMargin(), fontMetrics().height()); - QListView::fontChange(oldFont); + d->itemHeight = TQMAX(AlbumThumbnailLoader::instance()->thumbnailSize() + 2*itemMargin(), fontMetrics().height()); + TQListView::fontChange(oldFont); slotThemeChanged(); } void FolderView::slotIconSizeChanged() { - d->itemHeight = QMAX(AlbumThumbnailLoader::instance()->thumbnailSize() + 2*itemMargin(), fontMetrics().height()); + d->itemHeight = TQMAX(AlbumThumbnailLoader::instance()->thumbnailSize() + 2*itemMargin(), fontMetrics().height()); slotThemeChanged(); } -void FolderView::contentsMouseMoveEvent(QMouseEvent *e) +void FolderView::contentsMouseMoveEvent(TQMouseEvent *e) { - QListView::contentsMouseMoveEvent(e); + TQListView::contentsMouseMoveEvent(e); - if(e->state() == NoButton) + if(e->state() == Qt::NoButton) { if(KGlobalSettings::changeCursorOverIcon()) { - QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt(vp); + TQPoint vp = contentsToViewport(e->pos()); + TQListViewItem *item = itemAt(vp); if (mouseInItemRect(item, vp.x())) setCursor(KCursor::handCursor()); else @@ -187,10 +187,10 @@ void FolderView::contentsMouseMoveEvent(QMouseEvent *e) } if(d->dragItem && - (d->dragStartPos - e->pos()).manhattanLength() > QApplication::startDragDistance()) + (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance()) { - QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt(vp); + TQPoint vp = contentsToViewport(e->pos()); + TQListViewItem *item = itemAt(vp); if(!item) { d->dragItem = 0; @@ -199,24 +199,24 @@ void FolderView::contentsMouseMoveEvent(QMouseEvent *e) } } -void FolderView::contentsMousePressEvent(QMouseEvent *e) +void FolderView::contentsMousePressEvent(TQMouseEvent *e) { - QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt(vp); + TQPoint vp = contentsToViewport(e->pos()); + TQListViewItem *item = itemAt(vp); // With Check Box item, we will toggle on/off item using middle mouse button. // See B.K.O #130906 FolderCheckListItem *citem = dynamic_cast<FolderCheckListItem*>(item); - if(citem && e->button() == MidButton && mouseInItemRect(item, e->pos().x())) + if(citem && e->button() == Qt::MidButton && mouseInItemRect(item, e->pos().x())) { - QListView::contentsMousePressEvent(e); + TQListView::contentsMousePressEvent(e); citem->setOn(!citem->isOn()); return; } - QListView::contentsMousePressEvent(e); + TQListView::contentsMousePressEvent(e); - if(item && e->button() == LeftButton) + if(item && e->button() == Qt::LeftButton) { // Prepare D&D if necessary d->dragStartPos = e->pos(); @@ -225,14 +225,14 @@ void FolderView::contentsMousePressEvent(QMouseEvent *e) } } -void FolderView::contentsMouseReleaseEvent(QMouseEvent *e) +void FolderView::contentsMouseReleaseEvent(TQMouseEvent *e) { - QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt(vp); + TQPoint vp = contentsToViewport(e->pos()); + TQListViewItem *item = itemAt(vp); - QListView::contentsMouseReleaseEvent(e); + TQListView::contentsMouseReleaseEvent(e); - if(item && e->button() == LeftButton) + if(item && e->button() == Qt::LeftButton) { // See B.K.O #126871: collapse/expand treeview using left mouse button single click. if (mouseInItemRect(item, e->pos().x())) @@ -244,26 +244,26 @@ void FolderView::contentsMouseReleaseEvent(QMouseEvent *e) void FolderView::startDrag() { - QDragObject *o = dragObject(); + TQDragObject *o = dragObject(); if(o) o->drag(); } -QListViewItem* FolderView::dragItem() const +TQListViewItem* FolderView::dragItem() const { return d->dragItem; } -void FolderView::contentsDragEnterEvent(QDragEnterEvent *e) +void FolderView::contentsDragEnterEvent(TQDragEnterEvent *e) { - QListView::contentsDragEnterEvent(e); + TQListView::contentsDragEnterEvent(e); e->accept(acceptDrop(e)); } -void FolderView::contentsDragLeaveEvent(QDragLeaveEvent * e) +void FolderView::contentsDragLeaveEvent(TQDragLeaveEvent * e) { - QListView::contentsDragLeaveEvent(e); + TQListView::contentsDragLeaveEvent(e); if(d->oldHighlightItem) { @@ -276,17 +276,17 @@ void FolderView::contentsDragLeaveEvent(QDragLeaveEvent * e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->repaint(); + d->oldHighlightItem->tqrepaint(); d->oldHighlightItem = 0; } } -void FolderView::contentsDragMoveEvent(QDragMoveEvent *e) +void FolderView::contentsDragMoveEvent(TQDragMoveEvent *e) { - QListView::contentsDragMoveEvent(e); + TQListView::contentsDragMoveEvent(e); - QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt(vp); + TQPoint vp = contentsToViewport(e->pos()); + TQListViewItem *item = itemAt(vp); if(item) { if(d->oldHighlightItem) @@ -300,7 +300,7 @@ void FolderView::contentsDragMoveEvent(QDragMoveEvent *e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->repaint(); + d->oldHighlightItem->tqrepaint(); } FolderItem *fitem = dynamic_cast<FolderItem*>(item); @@ -313,14 +313,14 @@ void FolderView::contentsDragMoveEvent(QDragMoveEvent *e) citem->setFocus(true); } d->oldHighlightItem = item; - item->repaint(); + item->tqrepaint(); } e->accept(acceptDrop(e)); } -void FolderView::contentsDropEvent(QDropEvent *e) +void FolderView::contentsDropEvent(TQDropEvent *e) { - QListView::contentsDropEvent(e); + TQListView::contentsDropEvent(e); if(d->oldHighlightItem) { @@ -333,17 +333,17 @@ void FolderView::contentsDropEvent(QDropEvent *e) if (citem) citem->setFocus(false); } - d->oldHighlightItem->repaint(); + d->oldHighlightItem->tqrepaint(); d->oldHighlightItem = 0; } } -bool FolderView::acceptDrop(const QDropEvent *) const +bool FolderView::acceptDrop(const TQDropEvent *) const { return false; } -bool FolderView::mouseInItemRect(QListViewItem* item, int x) const +bool FolderView::mouseInItemRect(TQListViewItem* item, int x) const { if (!item) return false; @@ -357,8 +357,8 @@ bool FolderView::mouseInItemRect(QListViewItem* item, int x) const int boxsize = 0; FolderCheckListItem* citem = dynamic_cast<FolderCheckListItem*>(item); if (citem && - ((citem->type() == QCheckListItem::CheckBox) || (citem->type() == QCheckListItem::CheckBoxController))) - boxsize = style().pixelMetric(QStyle::PM_CheckListButtonSize, this); + ((citem->type() == TQCheckListItem::CheckBox) || (citem->type() == TQCheckListItem::CheckBoxController))) + boxsize = tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, this); return (x > (offset + boxsize) && x < (offset + boxsize + width)); } @@ -376,8 +376,8 @@ void FolderView::slotThemeChanged() void FolderView::slotAllAlbumsLoaded() { - disconnect(AlbumManager::instance(), SIGNAL(signalAllAlbumsLoaded()), - this, SLOT(slotAllAlbumsLoaded())); + disconnect(AlbumManager::instance(), TQT_SIGNAL(signalAllAlbumsLoaded()), + this, TQT_SLOT(slotAllAlbumsLoaded())); loadViewState(); } @@ -388,7 +388,7 @@ void FolderView::loadViewState() int selectedItem = config->readNumEntry("LastSelectedItem", 0); - QValueList<int> openFolders; + TQValueList<int> openFolders; if(config->hasKey("OpenFolders")) { openFolders = config->readIntListEntry("OpenFolders"); @@ -396,7 +396,7 @@ void FolderView::loadViewState() FolderItem *item = 0; FolderItem *foundItem = 0; - QListViewItemIterator it(this->lastItem()); + TQListViewItemIterator it(this->lastItem()); for( ; it.current(); --it) { @@ -405,7 +405,7 @@ void FolderView::loadViewState() continue; // Start the album root always open - if(openFolders.contains(item->id()) || item->id() == 0) + if(openFolders.tqcontains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); @@ -420,7 +420,7 @@ void FolderView::loadViewState() // Important note: this cannot be done inside the previous loop // because opening folders prevents the visibility. // Fixes bug #144815. - // (Looks a bit like a bug in Qt to me ...) + // (Looks a bit like a bug in TQt to me ...) if (foundItem) { setSelected(foundItem, true); @@ -439,8 +439,8 @@ void FolderView::saveViewState() else config->writeEntry("LastSelectedItem", 0); - QValueList<int> openFolders; - QListViewItemIterator it(this); + TQValueList<int> openFolders; + TQListViewItemIterator it(this); for( ; it.current(); ++it) { item = dynamic_cast<FolderItem*>(it.current()); @@ -452,7 +452,7 @@ void FolderView::saveViewState() void FolderView::slotSelectionChanged() { - QListView::selectionChanged(); + TQListView::selectionChanged(); } void FolderView::selectItem(int) @@ -462,7 +462,7 @@ void FolderView::selectItem(int) void FolderView::collapseView(CollapseMode mode) { // collapse the whole list first - QListViewItemIterator iter(this); + TQListViewItemIterator iter(this); while (iter.current()) { iter.current()->setOpen(false); @@ -480,7 +480,7 @@ void FolderView::collapseView(CollapseMode mode) } case RestoreCurrentAlbum: { - QListViewItemIterator iter(this); + TQListViewItemIterator iter(this); FolderItem* restoredItem = 0; while (iter.current()) diff --git a/digikam/digikam/folderview.h b/digikam/digikam/folderview.h index d14dcca..15a98f8 100644 --- a/digikam/digikam/folderview.h +++ b/digikam/digikam/folderview.h @@ -27,9 +27,9 @@ #ifndef _FOLDERVIEW_H_ #define _FOLDERVIEW_H_ -// Qt includes. +// TQt includes. -#include <qlistview.h> +#include <tqlistview.h> // Local includes. @@ -48,9 +48,10 @@ class FolderItem; */ -class DIGIKAM_EXPORT FolderView : public QListView +class DIGIKAM_EXPORT FolderView : public TQListView { Q_OBJECT + TQ_OBJECT public: @@ -71,36 +72,36 @@ public: OmitRoot }; - FolderView(QWidget *parent, const char *name = "FolderView"); + FolderView(TQWidget *tqparent, const char *name = "FolderView"); virtual ~FolderView(); void setActive(bool val); bool active() const; int itemHeight() const; - QRect itemRect(QListViewItem *item) const; - QPixmap itemBasePixmapRegular() const; - QPixmap itemBasePixmapSelected() const; + TQRect tqitemRect(TQListViewItem *item) const; + TQPixmap itemBasePixmapRegular() const; + TQPixmap itemBasePixmapSelected() const; virtual void collapseView(CollapseMode mode = RestoreCurrentAlbum); protected: - void contentsMousePressEvent(QMouseEvent *e); - void contentsMouseReleaseEvent(QMouseEvent *e); - void contentsMouseMoveEvent(QMouseEvent *e); - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDragLeaveEvent(QDragLeaveEvent * e); - void contentsDropEvent(QDropEvent *e); + void contentsMousePressEvent(TQMouseEvent *e); + void contentsMouseReleaseEvent(TQMouseEvent *e); + void contentsMouseMoveEvent(TQMouseEvent *e); + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDragLeaveEvent(TQDragLeaveEvent * e); + void contentsDropEvent(TQDropEvent *e); - virtual bool acceptDrop(const QDropEvent *e) const; + virtual bool acceptDrop(const TQDropEvent *e) const; void startDrag(); - QListViewItem* dragItem() const; + TQListViewItem* dragItem() const; - void resizeEvent(QResizeEvent* e); - void fontChange(const QFont& oldFont); + void resizeEvent(TQResizeEvent* e); + void fontChange(const TQFont& oldFont); virtual void selectItem(int id); @@ -126,7 +127,7 @@ private slots: private: - bool mouseInItemRect(QListViewItem* item, int x) const; + bool mouseInItemRect(TQListViewItem* item, int x) const; FolderViewPriv *d; }; diff --git a/digikam/digikam/icongroupitem.cpp b/digikam/digikam/icongroupitem.cpp index f21a898..218017b 100644 --- a/digikam/digikam/icongroupitem.cpp +++ b/digikam/digikam/icongroupitem.cpp @@ -25,10 +25,10 @@ #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpalette.h> +#include <tqpixmap.h> +#include <tqpalette.h> // Local includes. @@ -68,14 +68,14 @@ public: }; }; -IconGroupItem::IconGroupItem(IconView* parent) +IconGroupItem::IconGroupItem(IconView* tqparent) { d = new IconGroupItemPriv; - d->view = parent; + d->view = tqparent; m_next = 0; m_prev = 0; - parent->insertGroup(this); + tqparent->insertGroup(this); } IconGroupItem::~IconGroupItem() @@ -100,9 +100,9 @@ IconGroupItem* IconGroupItem::prevGroup() const return m_prev; } -QRect IconGroupItem::rect() const +TQRect IconGroupItem::rect() const { - QRect r = d->view->bannerRect(); + TQRect r = d->view->bannerRect(); r.moveBy(0, d->y); return r; } @@ -277,12 +277,12 @@ bool IconGroupItem::move(int y) void IconGroupItem::paintBanner() { - QRect r(rect()); - QPixmap pix(r.width(), r.height()); - pix.fill(d->view->colorGroup().base()); + TQRect r(rect()); + TQPixmap pix(r.width(), r.height()); + pix.fill(d->view->tqcolorGroup().base()); - r = QRect(d->view->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(d->view->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(d->view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); diff --git a/digikam/digikam/icongroupitem.h b/digikam/digikam/icongroupitem.h index 2ee83a5..e7e550f 100644 --- a/digikam/digikam/icongroupitem.h +++ b/digikam/digikam/icongroupitem.h @@ -24,9 +24,9 @@ #ifndef ICONGROUPITEM_H #define ICONGROUPITEM_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Local includes. @@ -45,7 +45,7 @@ class DIGIKAM_EXPORT IconGroupItem public: - IconGroupItem(IconView* parent); + IconGroupItem(IconView* tqparent); virtual ~IconGroupItem(); IconView* iconView() const; @@ -53,7 +53,7 @@ public: IconGroupItem* nextGroup() const; IconGroupItem* prevGroup() const; - QRect rect() const; + TQRect rect() const; int y() const; bool move(int y); diff --git a/digikam/digikam/iconitem.cpp b/digikam/digikam/iconitem.cpp index d643005..b7b422b 100644 --- a/digikam/digikam/iconitem.cpp +++ b/digikam/digikam/iconitem.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqpainter.h> // Local includes. @@ -35,8 +35,8 @@ namespace Digikam { -IconItem::IconItem(IconGroupItem* parent) - : m_group(parent) +IconItem::IconItem(IconGroupItem* tqparent) + : m_group(tqparent) { m_next = 0; m_prev = 0; @@ -84,15 +84,15 @@ int IconItem::y() const return m_y; } -QRect IconItem::rect() const +TQRect IconItem::rect() const { IconView* view = m_group->iconView(); - QRect r(view->itemRect()); - r.moveTopLeft(QPoint(m_x, m_y)); + TQRect r(view->tqitemRect()); + r.moveTopLeft(TQPoint(m_x, m_y)); return r; } -QRect IconItem::clickToOpenRect() +TQRect IconItem::clickToOpenRect() { return rect(); } @@ -127,10 +127,10 @@ bool IconItem::isSelected() const return m_selected; } -void IconItem::repaint(bool force) +void IconItem::tqrepaint(bool force) { if (force) - m_group->iconView()->repaintContents(rect()); + m_group->iconView()->tqrepaintContents(rect()); else m_group->iconView()->updateContents(rect()); } @@ -149,20 +149,20 @@ void IconItem::paintItem() { IconView* view = m_group->iconView(); - QRect r(rect()); - QPixmap pix(r.width(), r.height()); - pix.fill(m_selected ? Qt::blue : Qt::gray); + TQRect r(rect()); + TQPixmap pix(r.width(), r.height()); + pix.fill(m_selected ? TQt::blue : TQt::gray); if (this == iconView()->currentItem()) { - QPainter p(&pix); - p.setPen(QPen(m_selected ? Qt::white : Qt::black, 1, Qt::DotLine)); + TQPainter p(&pix); + p.setPen(TQPen(m_selected ? TQt::white : TQt::black, 1, TQt::DotLine)); p.drawRect(2, 2, r.width()-4, r.width()-4); p.end(); } - r = QRect(view->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(view->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); diff --git a/digikam/digikam/iconitem.h b/digikam/digikam/iconitem.h index cdd1a94..6933709 100644 --- a/digikam/digikam/iconitem.h +++ b/digikam/digikam/iconitem.h @@ -24,10 +24,10 @@ #ifndef ICONITEM_H #define ICONITEM_H -// Qt includes. +// TQt includes. -#include <qrect.h> -#include <qstring.h> +#include <tqrect.h> +#include <tqstring.h> // Local includes. @@ -46,7 +46,7 @@ class DIGIKAM_EXPORT IconItem public: - IconItem(IconGroupItem* parent); + IconItem(IconGroupItem* tqparent); virtual ~IconItem(); IconItem* nextItem() const; @@ -54,19 +54,19 @@ public: int x() const; int y() const; - QRect rect() const; + TQRect rect() const; bool move(int x, int y); void setSelected(bool val, bool cb=true); bool isSelected() const; - void repaint(bool force=true); + void tqrepaint(bool force=true); IconView* iconView() const; virtual int compare(IconItem *item); - virtual QRect clickToOpenRect(); + virtual TQRect clickToOpenRect(); protected: diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index ad2d642..3a86f11 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -28,15 +28,15 @@ #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qpainter.h> -#include <qvaluelist.h> -#include <qptrdict.h> -#include <qstyle.h> -#include <qapplication.h> -#include <qdrawutil.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqvaluelist.h> +#include <tqptrdict.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqdrawutil.h> // KDE includes. @@ -91,15 +91,15 @@ public: int spacing; - QPtrDict<IconItem> selectedItems; - QPtrDict<IconItem> prevSelectedItems; + TQPtrDict<IconItem> selectedItems; + TQPtrDict<IconItem> prevSelectedItems; - QRect* rubber; + TQRect* rubber; - QPoint dragStartPos; + TQPoint dragStartPos; - QTimer* rearrangeTimer; - QTimer* toolTipTimer; + TQTimer* rearrangeTimer; + TQTimer* toolTipTimer; IconItem* toolTipItem; IconItem* currItem; @@ -113,7 +113,7 @@ public: struct ItemContainer { - ItemContainer(ItemContainer *p, ItemContainer *n, const QRect &r) + ItemContainer(ItemContainer *p, ItemContainer *n, const TQRect &r) : prev(p), next(n), rect(r) { if (prev) @@ -123,8 +123,8 @@ public: } ItemContainer *prev, *next; - QRect rect; - QValueList<IconItem*> items; + TQRect rect; + TQValueList<IconItem*> items; } *firstContainer, *lastContainer; struct SortableItem @@ -133,23 +133,23 @@ public: }; }; -IconView::IconView(QWidget* parent, const char* name) - : QScrollView(parent, name, Qt::WStaticContents|Qt::WNoAutoErase) +IconView::IconView(TQWidget* tqparent, const char* name) + : TQScrollView(tqparent, name, TQt::WStaticContents|TQt::WNoAutoErase) { - viewport()->setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setFocusProxy(this); - viewport()->setFocusPolicy(QWidget::WheelFocus); + viewport()->setFocusPolicy(TQ_WheelFocus); viewport()->setMouseTracking(true); d = new IconViewPriv; - d->rearrangeTimer = new QTimer(this); - d->toolTipTimer = new QTimer(this); + d->rearrangeTimer = new TQTimer(this); + d->toolTipTimer = new TQTimer(this); - connect(d->rearrangeTimer, SIGNAL(timeout()), - this, SLOT(slotRearrange())); + connect(d->rearrangeTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotRearrange())); - connect(d->toolTipTimer, SIGNAL(timeout()), - this, SLOT(slotToolTip())); + connect(d->toolTipTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotToolTip())); setEnableToolTips(true); } @@ -207,18 +207,18 @@ void IconView::setCurrentItem(IconItem* item) } } -IconItem* IconView::findItem(const QPoint& pos) +IconItem* IconView::findItem(const TQPoint& pos) { IconViewPriv::ItemContainer *c = d->firstContainer; for (; c; c = c->next) { - if ( c->rect.contains(pos) ) + if ( c->rect.tqcontains(pos) ) { - for (QValueList<IconItem*>::iterator it = c->items.begin(); + for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem* item = *it; - if (item->rect().contains(pos)) + if (item->rect().tqcontains(pos)) return item; } } @@ -227,12 +227,12 @@ IconItem* IconView::findItem(const QPoint& pos) return 0; } -IconGroupItem* IconView::findGroup(const QPoint& pos) +IconGroupItem* IconView::findGroup(const TQPoint& pos) { - QPoint p = viewportToContents(viewport()->mapFromGlobal(pos)); + TQPoint p = viewportToContents(viewport()->mapFromGlobal(pos)); for (IconGroupItem* group = d->firstGroup; group; group = group->nextGroup()) { - QRect rect = group->rect(); + TQRect rect = group->rect(); int bottom; if (group == d->lastGroup) bottom = contentsHeight(); @@ -241,7 +241,7 @@ IconGroupItem* IconView::findGroup(const QPoint& pos) rect.setBottom(bottom); - if ( rect.contains(p) ) + if ( rect.tqcontains(p) ) { return group; } @@ -331,8 +331,8 @@ void IconView::clearSelection() if (!wasBlocked) blockSignals(true); - QPtrDict<IconItem> selItems = d->selectedItems; - QPtrDictIterator<IconItem> it( selItems ); + TQPtrDict<IconItem> selItems = d->selectedItems; + TQPtrDictIterator<IconItem> it( selItems ); for ( ; it.current(); ++it ) it.current()->setSelected(false, false); @@ -397,7 +397,7 @@ void IconView::selectItem(IconItem* item, bool select) if (select) { - d->selectedItems.replace(item, item); + d->selectedItems.tqreplace(item, item); } else { @@ -664,8 +664,8 @@ void IconView::slotRearrange() bool IconView::arrangeItems() { int y = 0; - int itemW = itemRect().width(); - int itemH = itemRect().height(); + int itemW = tqitemRect().width(); + int itemH = tqitemRect().height(); int maxW = 0; int numItemsPerRow = visibleWidth()/(itemW + d->spacing); @@ -696,7 +696,7 @@ bool IconView::arrangeItems() col = 0; } - maxW = QMAX(maxW, x + itemW); + maxW = TQMAX(maxW, x + itemW); item = item->m_next; } @@ -720,32 +720,32 @@ bool IconView::arrangeItems() return changed; } -QRect IconView::itemRect() const +TQRect IconView::tqitemRect() const { - return QRect(0, 0, 100, 100); + return TQRect(0, 0, 100, 100); } -QRect IconView::bannerRect() const +TQRect IconView::bannerRect() const { - return QRect(0, 0, visibleWidth(), 0); + return TQRect(0, 0, visibleWidth(), 0); } -void IconView::viewportPaintEvent(QPaintEvent* pe) +void IconView::viewportPaintEvent(TQPaintEvent* pe) { - QRect r(pe->rect()); - QRegion paintRegion(pe->region()); + TQRect r(pe->rect()); + TQRegion paintRegion(pe->region()); - QPainter painter(viewport()); + TQPainter painter(viewport()); painter.setClipRegion(paintRegion); // paint any group banners which intersect this paintevent rect for (IconGroupItem* group = d->firstGroup; group; group = group->nextGroup()) { - QRect br(contentsRectToViewport(group->rect())); + TQRect br(contentsRectToViewport(group->rect())); if (r.intersects(br)) { group->paintBanner(); - paintRegion -= QRegion(br); + paintRegion -= TQRegion(br); } } @@ -753,39 +753,39 @@ void IconView::viewportPaintEvent(QPaintEvent* pe) for (IconViewPriv::ItemContainer* c = d->firstContainer; c; c = c->next) { - QRect cr(contentsRectToViewport(c->rect)); + TQRect cr(contentsRectToViewport(c->rect)); if (r.intersects(cr)) { - for (QValueList<IconItem*>::iterator it = c->items.begin(); + for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem* item = *it; - QRect ir(contentsRectToViewport(item->rect())); + TQRect ir(contentsRectToViewport(item->rect())); if (r.intersects(ir)) { item->paintItem(); - paintRegion -= QRegion(ir); + paintRegion -= TQRegion(ir); } } } } painter.setClipRegion(paintRegion); - painter.fillRect(r, colorGroup().base()); + painter.fillRect(r, tqcolorGroup().base()); painter.end(); } -QRect IconView::contentsRectToViewport(const QRect& r) const +TQRect IconView::contentsRectToViewport(const TQRect& r) const { - QRect vr = QRect(contentsToViewport(QPoint(r.x(), r.y())), r.size()); + TQRect vr = TQRect(contentsToViewport(TQPoint(r.x(), r.y())), r.size()); return vr; } -void IconView::resizeEvent(QResizeEvent* e) +void IconView::resizeEvent(TQResizeEvent* e) { - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); triggerRearrangement(); } @@ -802,7 +802,7 @@ void IconView::rebuildContainers() IconViewPriv::ItemContainer* c = d->lastContainer; while (item) { - if (c->rect.contains(item->rect())) + if (c->rect.tqcontains(item->rect())) { c->items.append(item); item = item->nextItem(); @@ -842,18 +842,18 @@ void IconView::rebuildContainers() void IconView::appendContainer() { - QSize s( INT_MAX - 1, RECT_EXTENSION ); + TQSize s( INT_MAX - 1, RECT_EXTENSION ); if (!d->firstContainer) { d->firstContainer = - new IconViewPriv::ItemContainer(0, 0, QRect(QPoint(0, 0), s)); + new IconViewPriv::ItemContainer(0, 0, TQRect(TQPoint(0, 0), s)); d->lastContainer = d->firstContainer; } else { d->lastContainer = new IconViewPriv::ItemContainer( - d->lastContainer, 0, QRect(d->lastContainer->rect.bottomLeft(), s)); + d->lastContainer, 0, TQRect(d->lastContainer->rect.bottomLeft(), s)); } } @@ -872,7 +872,7 @@ void IconView::deleteContainers() d->firstContainer = d->lastContainer = 0; } -void IconView::leaveEvent(QEvent *e) +void IconView::leaveEvent(TQEvent *e) { // hide tooltip d->toolTipItem = 0; @@ -883,25 +883,25 @@ void IconView::leaveEvent(QEvent *e) // anymore d->dragging = false; - QScrollView::leaveEvent(e); + TQScrollView::leaveEvent(e); } -void IconView::focusOutEvent(QFocusEvent* e) +void IconView::focusOutEvent(TQFocusEvent* e) { // hide tooltip d->toolTipItem = 0; d->toolTipTimer->stop(); slotToolTip(); - QScrollView::focusOutEvent(e); + TQScrollView::focusOutEvent(e); } -bool IconView::acceptToolTip(IconItem*, const QPoint&) +bool IconView::acceptToolTip(IconItem*, const TQPoint&) { return true; } -void IconView::contentsMousePressEvent(QMouseEvent* e) +void IconView::contentsMousePressEvent(TQMouseEvent* e) { d->pressedMoved = false; @@ -913,10 +913,10 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) // Delete any existing rubber ------------------------------- if ( d->rubber ) { - QPainter p; + TQPainter p; p.begin(viewport()); p.setRasterOp(NotROP); - p.setPen(QPen(color0, 1)); + p.setPen(TQPen(color0, 1)); p.setBrush(NoBrush); drawRubber(&p); @@ -934,11 +934,11 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) d->currItem = item; d->anchorItem = item; if (prevCurrItem) - prevCurrItem->repaint(); + prevCurrItem->tqrepaint(); if (!item->isSelected()) item->setSelected(true, true); - item->repaint(); + item->tqrepaint(); emit signalRightButtonClicked(item, e->globalPos()); } @@ -953,11 +953,11 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) IconItem *item = findItem(e->pos()); if (item) { - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { item->setSelected(!item->isSelected(), false); } - else if (e->state() & Qt::ShiftButton) + else if (e->state() & TQt::ShiftButton) { blockSignals(true); @@ -1017,9 +1017,9 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) d->anchorItem = item; if (prevCurrItem) - prevCurrItem->repaint(); + prevCurrItem->tqrepaint(); - d->currItem->repaint(); + d->currItem->tqrepaint(); d->dragging = true; d->dragStartPos = e->pos(); @@ -1028,7 +1028,7 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) } // Press outside any item. - if (!(e->state() & Qt::ControlButton)) + if (!(e->state() & TQt::ControlButton)) { // unselect all if the ctrl button is not pressed clearSelection(); @@ -1037,7 +1037,7 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) { // ctrl is pressed. make sure our current selection is not lost d->prevSelectedItems.clear(); - QPtrDictIterator<IconItem> it( d->selectedItems ); + TQPtrDictIterator<IconItem> it( d->selectedItems ); for ( ; it.current(); ++it ) { @@ -1045,38 +1045,38 @@ void IconView::contentsMousePressEvent(QMouseEvent* e) } } - d->rubber = new QRect( e->x(), e->y(), 0, 0 ); + d->rubber = new TQRect( e->x(), e->y(), 0, 0 ); - QPainter p; + TQPainter p; p.begin( viewport() ); p.setRasterOp( NotROP ); - p.setPen( QPen( color0, 1 ) ); + p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); drawRubber( &p ); p.end(); } -void IconView::drawRubber(QPainter* p) +void IconView::drawRubber(TQPainter* p) { if ( !p || !d->rubber ) return; - QRect r(d->rubber->normalize()); + TQRect r(d->rubber->normalize()); r = contentsRectToViewport(r); - QPoint pnt(r.x(), r.y()); + TQPoint pnt(r.x(), r.y()); - style().drawPrimitive(QStyle::PE_FocusRect, p, - QRect( pnt.x(), pnt.y(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, + TQRect( pnt.x(), pnt.y(), r.width(), r.height() ), - colorGroup(), QStyle::Style_Default, - QStyleOption(colorGroup().base())); + tqcolorGroup(), TQStyle::Style_Default, + TQStyleOption(tqcolorGroup().base())); } -void IconView::contentsMouseMoveEvent(QMouseEvent* e) +void IconView::contentsMouseMoveEvent(TQMouseEvent* e) { - if (e->state() == NoButton) + if (e->state() == Qt::NoButton) { IconItem* item = findItem(e->pos()); @@ -1113,7 +1113,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) if (KGlobalSettings::changeCursorOverIcon()) { - if (item && item->clickToOpenRect().contains(e->pos())) + if (item && item->clickToOpenRect().tqcontains(e->pos())) setCursor(KCursor::handCursor()); else unsetCursor(); @@ -1128,7 +1128,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) if (d->dragging && (e->state() & Qt::LeftButton)) { if ( (d->dragStartPos - e->pos()).manhattanLength() - > QApplication::startDragDistance() ) + > TQApplication::startDragDistance() ) { startDrag(); } @@ -1138,17 +1138,17 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) if (!d->rubber) return; - QRect oldRubber = QRect(*d->rubber); + TQRect oldRubber = TQRect(*d->rubber); d->rubber->setRight( e->pos().x() ); d->rubber->setBottom( e->pos().y() ); - QRect nr = d->rubber->normalize(); - QRect rubberUnion = nr.unite(oldRubber.normalize()); + TQRect nr = d->rubber->normalize(); + TQRect rubberUnion = nr.unite(oldRubber.normalize()); bool changed = false; - QRegion paintRegion; + TQRegion paintRegion; viewport()->setUpdatesEnabled(false); blockSignals(true); @@ -1157,7 +1157,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) { if ( rubberUnion.intersects(c->rect) ) { - for (QValueList<IconItem*>::iterator it = c->items.begin(); + for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem* item = *it; @@ -1167,16 +1167,16 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) { item->setSelected(true, false); changed = true; - paintRegion += QRect(item->rect()); + paintRegion += TQRect(item->rect()); } } else { - if (item->isSelected() && !d->prevSelectedItems.find(item)) + if (item->isSelected() && !d->prevSelectedItems.tqfind(item)) { item->setSelected(false, false); changed = true; - paintRegion += QRect(item->rect()); + paintRegion += TQRect(item->rect()); } } } @@ -1186,13 +1186,13 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) blockSignals(false); viewport()->setUpdatesEnabled(true); - QRect r = *d->rubber; + TQRect r = *d->rubber; *d->rubber = oldRubber; - QPainter p; + TQPainter p; p.begin( viewport() ); p.setRasterOp( NotROP ); - p.setPen( QPen( color0, 1 ) ); + p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); drawRubber( &p ); p.end(); @@ -1200,7 +1200,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) if (changed) { paintRegion.translate(-contentsX(), -contentsY()); - viewport()->repaint(paintRegion); + viewport()->tqrepaint(paintRegion); } ensureVisible(e->pos().x(), e->pos().y()); @@ -1209,7 +1209,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) p.begin(viewport()); p.setRasterOp(NotROP); - p.setPen(QPen(color0, 1)); + p.setPen(TQPen(color0, 1)); p.setBrush(NoBrush); drawRubber(&p); p.end(); @@ -1220,17 +1220,17 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e) emit signalSelectionChanged(); } -void IconView::contentsMouseReleaseEvent(QMouseEvent* e) +void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) { d->dragging = false; d->prevSelectedItems.clear(); if (d->rubber) { - QPainter p; + TQPainter p; p.begin( viewport() ); p.setRasterOp( NotROP ); - p.setPen( QPen( color0, 1 ) ); + p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); drawRubber( &p ); @@ -1258,10 +1258,10 @@ void IconView::contentsMouseReleaseEvent(QMouseEvent* e) d->currItem = item; d->anchorItem = item; if (prevCurrItem) - prevCurrItem->repaint(); + prevCurrItem->tqrepaint(); if (KGlobalSettings::singleClick()) { - if (item->clickToOpenRect().contains(e->pos())) + if (item->clickToOpenRect().tqcontains(e->pos())) { itemClickedToOpen(item); } @@ -1270,17 +1270,17 @@ void IconView::contentsMouseReleaseEvent(QMouseEvent* e) } } -void IconView::contentsWheelEvent(QWheelEvent* e) +void IconView::contentsWheelEvent(TQWheelEvent* e) { d->toolTipItem = 0; d->toolTipTimer->stop(); slotToolTip(); viewport()->update(); - QScrollView::contentsWheelEvent(e); + TQScrollView::contentsWheelEvent(e); } -void IconView::contentsMouseDoubleClickEvent(QMouseEvent *e) +void IconView::contentsMouseDoubleClickEvent(TQMouseEvent *e) { if (KGlobalSettings::singleClick()) return; @@ -1292,7 +1292,7 @@ void IconView::contentsMouseDoubleClickEvent(QMouseEvent *e) } } -void IconView::keyPressEvent(QKeyEvent* e) +void IconView::keyPressEvent(TQKeyEvent* e) { bool handled = false; @@ -1307,7 +1307,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = firstItem(); d->anchorItem = d->currItem; if (tmp) - tmp->repaint(); + tmp->tqrepaint(); firstItem()->setSelected(true, true); ensureItemVisible(firstItem()); @@ -1321,7 +1321,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = lastItem(); d->anchorItem = d->currItem; if (tmp) - tmp->repaint(); + tmp->tqrepaint(); lastItem()->setSelected(true, true); ensureItemVisible(lastItem()); @@ -1348,21 +1348,21 @@ void IconView::keyPressEvent(QKeyEvent* e) { if (d->currItem->nextItem()) { - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { IconItem* tmp = d->currItem; d->currItem = d->currItem->nextItem(); d->anchorItem = d->currItem; - tmp->repaint(); - d->currItem->repaint(); + tmp->tqrepaint(); + d->currItem->tqrepaint(); item = d->currItem; } - else if (e->state() & Qt::ShiftButton) + else if (e->state() & TQt::ShiftButton) { IconItem* tmp = d->currItem; d->currItem = d->currItem->nextItem(); - tmp->repaint(); + tmp->tqrepaint(); // if the anchor is behind us, move forward preserving // the previously selected item. otherwise unselect the @@ -1380,7 +1380,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = d->currItem->nextItem(); d->anchorItem = d->currItem; d->currItem->setSelected(true, true); - tmp->repaint(); + tmp->tqrepaint(); item = d->currItem; } @@ -1407,21 +1407,21 @@ void IconView::keyPressEvent(QKeyEvent* e) { if (d->currItem->prevItem()) { - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { IconItem* tmp = d->currItem; d->currItem = d->currItem->prevItem(); d->anchorItem = d->currItem; - tmp->repaint(); - d->currItem->repaint(); + tmp->tqrepaint(); + d->currItem->tqrepaint(); item = d->currItem; } - else if (e->state() & Qt::ShiftButton) + else if (e->state() & TQt::ShiftButton) { IconItem* tmp = d->currItem; d->currItem = d->currItem->prevItem(); - tmp->repaint(); + tmp->tqrepaint(); // if the anchor is ahead of us, move forward preserving // the previously selected item. otherwise unselect the @@ -1439,7 +1439,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = d->currItem->prevItem(); d->anchorItem = d->currItem; d->currItem->setSelected(true, true); - tmp->repaint(); + tmp->tqrepaint(); item = d->currItem; } @@ -1464,34 +1464,34 @@ void IconView::keyPressEvent(QKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + itemRect().width()/2; + int x = d->currItem->x() + tqitemRect().width()/2; int y = d->currItem->y() - d->spacing*2; IconItem *it = 0; while (!it && y > 0) { - it = findItem(QPoint(x,y)); + it = findItem(TQPoint(x,y)); y -= d->spacing * 2; } if (it) { - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { IconItem* tmp = d->currItem; d->currItem = it; d->anchorItem = it; - tmp->repaint(); - d->currItem->repaint(); + tmp->tqrepaint(); + d->currItem->tqrepaint(); item = d->currItem; } - else if (e->state() & Qt::ShiftButton) + else if (e->state() & TQt::ShiftButton) { IconItem* tmp = d->currItem; d->currItem = it; - tmp->repaint(); + tmp->tqrepaint(); clearSelection(); if (anchorIsBehind()) @@ -1521,7 +1521,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = it; d->anchorItem = it; d->currItem->setSelected(true, true); - tmp->repaint(); + tmp->tqrepaint(); item = d->currItem; } @@ -1546,34 +1546,34 @@ void IconView::keyPressEvent(QKeyEvent* e) if (d->currItem) { - int x = d->currItem->x() + itemRect().width()/2; - int y = d->currItem->y() + itemRect().height() + d->spacing*2; + int x = d->currItem->x() + tqitemRect().width()/2; + int y = d->currItem->y() + tqitemRect().height() + d->spacing*2; IconItem *it = 0; while (!it && y < contentsHeight()) { - it = findItem(QPoint(x,y)); + it = findItem(TQPoint(x,y)); y += d->spacing * 2; } if (it) { - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { IconItem* tmp = d->currItem; d->currItem = it; d->anchorItem = it; - tmp->repaint(); - d->currItem->repaint(); + tmp->tqrepaint(); + d->currItem->tqrepaint(); item = d->currItem; } - else if (e->state() & Qt::ShiftButton) + else if (e->state() & TQt::ShiftButton) { IconItem* tmp = d->currItem; d->currItem = it; - tmp->repaint(); + tmp->tqrepaint(); clearSelection(); if (anchorIsBehind()) @@ -1603,7 +1603,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = it; d->anchorItem = it; d->currItem->setSelected(true, true); - tmp->repaint(); + tmp->tqrepaint(); item = d->currItem; } @@ -1628,13 +1628,13 @@ void IconView::keyPressEvent(QKeyEvent* e) if (d->currItem) { - QRect r( 0, d->currItem->y() + visibleHeight(), + TQRect r( 0, d->currItem->y() + visibleHeight(), contentsWidth(), visibleHeight() ); IconItem *ni = findFirstVisibleItem(r, false); if (!ni) { - r = QRect( 0, d->currItem->y() + itemRect().height(), + r = TQRect( 0, d->currItem->y() + tqitemRect().height(), contentsWidth(), contentsHeight() ); ni = findLastVisibleItem(r, false); } @@ -1645,7 +1645,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = ni; d->anchorItem = ni; item = ni; - tmp->repaint(); + tmp->tqrepaint(); d->currItem->setSelected(true, true); } } @@ -1668,14 +1668,14 @@ void IconView::keyPressEvent(QKeyEvent* e) if (d->currItem) { - QRect r(0, d->currItem->y() - visibleHeight(), + TQRect r(0, d->currItem->y() - visibleHeight(), contentsWidth(), visibleHeight() ); IconItem *ni = findFirstVisibleItem(r, false); if (!ni) { - r = QRect( 0, 0, contentsWidth(), d->currItem->y() ); + r = TQRect( 0, 0, contentsWidth(), d->currItem->y() ); ni = findFirstVisibleItem(r, false); } @@ -1685,7 +1685,7 @@ void IconView::keyPressEvent(QKeyEvent* e) d->currItem = ni; d->anchorItem = ni; item = ni; - tmp->repaint(); + tmp->tqrepaint(); d->currItem->setSelected(true, true); } } @@ -1708,7 +1708,7 @@ void IconView::keyPressEvent(QKeyEvent* e) { if (d->currItem) { - if ( (e->state() & Qt::ControlButton) || (e->state() & Qt::ShiftButton) ) + if ( (e->state() & TQt::ControlButton) || (e->state() & TQt::ShiftButton) ) { d->currItem->setSelected(!d->currItem->isSelected(), false); } @@ -1731,10 +1731,10 @@ void IconView::keyPressEvent(QKeyEvent* e) ensureItemVisible(d->currItem); - QRect r(itemRect()); + TQRect r(tqitemRect()); int w = r.width(); int h = r.height(); - QPoint p(d->currItem->x() + w / 2, d->currItem->y() + h / 2); + TQPoint p(d->currItem->x() + w / 2, d->currItem->y() + h / 2); emit signalRightButtonClicked(d->currItem, mapToGlobal(contentsToViewport(p))); } @@ -1785,13 +1785,13 @@ void IconView::ensureItemVisible(IconItem *item) if ( item->y() == firstItem()->y() ) { - QRect r(itemRect()); + TQRect r(tqitemRect()); int w = r.width(); ensureVisible( item->x() + w / 2, 0, w/2+1, 0 ); } else { - QRect r(itemRect()); + TQRect r(tqitemRect()); int w = r.width(); int h = r.height(); ensureVisible( item->x() + w / 2, item->y() + h / 2, @@ -1801,17 +1801,17 @@ void IconView::ensureItemVisible(IconItem *item) IconItem* IconView::findFirstVisibleItem(bool useThumbnailRect) const { - QRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); + TQRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); return findFirstVisibleItem(r, useThumbnailRect); } IconItem* IconView::findLastVisibleItem(bool useThumbnailRect) const { - QRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); + TQRect r(contentsX(), contentsY(), visibleWidth(), visibleHeight()); return findLastVisibleItem(r, useThumbnailRect); } -IconItem* IconView::findFirstVisibleItem(const QRect& r, bool useThumbnailRect) const +IconItem* IconView::findFirstVisibleItem(const TQRect& r, bool useThumbnailRect) const { IconViewPriv::ItemContainer *c = d->firstContainer; bool alreadyIntersected = false; @@ -1821,7 +1821,7 @@ IconItem* IconView::findFirstVisibleItem(const QRect& r, bool useThumbnailRect) if ( c->rect.intersects( r ) ) { alreadyIntersected = true; - for (QValueList<IconItem*>::iterator it = c->items.begin(); + for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem *item = *it; @@ -1836,8 +1836,8 @@ IconItem* IconView::findFirstVisibleItem(const QRect& r, bool useThumbnailRect) } else { - QRect r2 = item->rect(); - QRect r3 = i->rect(); + TQRect r2 = item->rect(); + TQRect r3 = i->rect(); if ( r2.y() < r3.y() ) i = item; else if ( r2.y() == r3.y() && @@ -1857,7 +1857,7 @@ IconItem* IconView::findFirstVisibleItem(const QRect& r, bool useThumbnailRect) return i; } -IconItem* IconView::findLastVisibleItem(const QRect& r, bool useThumbnailRect) const +IconItem* IconView::findLastVisibleItem(const TQRect& r, bool useThumbnailRect) const { IconViewPriv::ItemContainer *c = d->firstContainer; IconItem *i = 0; @@ -1867,7 +1867,7 @@ IconItem* IconView::findLastVisibleItem(const QRect& r, bool useThumbnailRect) c if ( c->rect.intersects( r ) ) { alreadyIntersected = true; - for (QValueList<IconItem*>::iterator it = c->items.begin(); + for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem *item = *it; @@ -1880,8 +1880,8 @@ IconItem* IconView::findLastVisibleItem(const QRect& r, bool useThumbnailRect) c } else { - QRect r2 = item->rect(); - QRect r3 = i->rect(); + TQRect r2 = item->rect(); + TQRect r3 = i->rect(); if ( r2.y() > r3.y() ) i = item; else if ( r2.y() == r3.y() && @@ -1900,23 +1900,23 @@ IconItem* IconView::findLastVisibleItem(const QRect& r, bool useThumbnailRect) c return i; } -void IconView::drawFrameRaised(QPainter* p) +void IconView::drawFrameRaised(TQPainter* p) { - QRect r = frameRect(); + TQRect r = frameRect(); int lwidth = lineWidth(); - const QColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); qDrawShadeRect( p, r, g, false, lwidth, midLineWidth() ); } -void IconView::drawFrameSunken(QPainter* p) +void IconView::drawFrameSunken(TQPainter* p) { - QRect r = frameRect(); + TQRect r = frameRect(); int lwidth = lineWidth(); - const QColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); qDrawShadeRect( p, r, g, true, lwidth, midLineWidth() ); @@ -1948,7 +1948,7 @@ void IconView::itemClickedToOpen(IconItem* item) d->anchorItem = item; if (prevCurrItem) - prevCurrItem->repaint(); + prevCurrItem->tqrepaint(); item->setSelected(true); emit signalDoubleClicked(item); diff --git a/digikam/digikam/iconview.h b/digikam/digikam/iconview.h index 0529be2..1cdf9d8 100644 --- a/digikam/digikam/iconview.h +++ b/digikam/digikam/iconview.h @@ -25,19 +25,19 @@ #ifndef ICONVIEW_H #define ICONVIEW_H -// Qt includes. +// TQt includes. -#include <qscrollview.h> +#include <tqscrollview.h> // Local includes. #include "digikam_export.h" -class QPainter; -class QMouseEvent; -class QPaintEvent; -class QDropEvent; -class QPoint; +class TQPainter; +class TQMouseEvent; +class TQPaintEvent; +class TQDropEvent; +class TQPoint; namespace Digikam { @@ -46,23 +46,24 @@ class IconItem; class IconGroupItem; class IconViewPriv; -class DIGIKAM_EXPORT IconView : public QScrollView +class DIGIKAM_EXPORT IconView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - IconView(QWidget* parent=0, const char* name=0); + IconView(TQWidget* tqparent=0, const char* name=0); virtual ~IconView(); IconGroupItem* firstGroup() const; IconGroupItem* lastGroup() const; - IconGroupItem* findGroup(const QPoint& pos); + IconGroupItem* findGroup(const TQPoint& pos); IconItem* firstItem() const; IconItem* lastItem() const; IconItem* currentItem() const; - IconItem* findItem(const QPoint& pos); + IconItem* findItem(const TQPoint& pos); void setCurrentItem(IconItem* item); @@ -92,15 +93,15 @@ public: void takeItem(IconItem* item); void ensureItemVisible(IconItem *item); - IconItem* findFirstVisibleItem(const QRect& r, bool useThumbnailRect = true) const; - IconItem* findLastVisibleItem(const QRect& r, bool useThumbnailRect = true) const; + IconItem* findFirstVisibleItem(const TQRect& r, bool useThumbnailRect = true) const; + IconItem* findLastVisibleItem(const TQRect& r, bool useThumbnailRect = true) const; IconItem* findFirstVisibleItem(bool useThumbnailRect = true) const; IconItem* findLastVisibleItem(bool useThumbnailRect = true) const; - virtual QRect itemRect() const; - virtual QRect bannerRect() const; + virtual TQRect tqitemRect() const; + virtual TQRect bannerRect() const; - QRect contentsRectToViewport(const QRect& r) const; + TQRect contentsRectToViewport(const TQRect& r) const; void setEnableToolTips(bool val); @@ -108,23 +109,23 @@ public: protected: - virtual void viewportPaintEvent(QPaintEvent* pe); - virtual void resizeEvent(QResizeEvent* e); - virtual void contentsMousePressEvent(QMouseEvent* e); - virtual void contentsMouseMoveEvent(QMouseEvent* e); - virtual void contentsMouseReleaseEvent(QMouseEvent* e); - virtual void contentsMouseDoubleClickEvent(QMouseEvent *e); - virtual void contentsWheelEvent(QWheelEvent* e); - virtual void leaveEvent(QEvent *e); - virtual void focusOutEvent(QFocusEvent* e); - virtual void keyPressEvent(QKeyEvent* e); + virtual void viewportPaintEvent(TQPaintEvent* pe); + virtual void resizeEvent(TQResizeEvent* e); + virtual void contentsMousePressEvent(TQMouseEvent* e); + virtual void contentsMouseMoveEvent(TQMouseEvent* e); + virtual void contentsMouseReleaseEvent(TQMouseEvent* e); + virtual void contentsMouseDoubleClickEvent(TQMouseEvent *e); + virtual void contentsWheelEvent(TQWheelEvent* e); + virtual void leaveEvent(TQEvent *e); + virtual void focusOutEvent(TQFocusEvent* e); + virtual void keyPressEvent(TQKeyEvent* e); virtual void startDrag(); - void drawFrameRaised(QPainter* p); - void drawFrameSunken(QPainter* p); + void drawFrameRaised(TQPainter* p); + void drawFrameSunken(TQPainter* p); - virtual bool acceptToolTip(IconItem* , const QPoint&); + virtual bool acceptToolTip(IconItem* , const TQPoint&); private: @@ -133,7 +134,7 @@ private: void appendContainer(); void deleteContainers(); - void drawRubber(QPainter* p); + void drawRubber(TQPainter* p); void itemClickedToOpen(IconItem* item); @@ -146,8 +147,8 @@ private: signals: void signalSelectionChanged(); - void signalRightButtonClicked(IconItem* item, const QPoint& pos); - void signalRightButtonClicked(const QPoint& pos); + void signalRightButtonClicked(IconItem* item, const TQPoint& pos); + void signalRightButtonClicked(const TQPoint& pos); void signalDoubleClicked(IconItem* item); void signalReturnPressed(IconItem* item); void signalShowToolTip(IconItem* item); diff --git a/digikam/digikam/imageattributeswatch.cpp b/digikam/digikam/imageattributeswatch.cpp index 700fc31..a91e4de 100644 --- a/digikam/digikam/imageattributeswatch.cpp +++ b/digikam/digikam/imageattributeswatch.cpp @@ -55,7 +55,7 @@ ImageAttributesWatch *ImageAttributesWatch::instance() return m_instance; } -void ImageAttributesWatch::imageTagsChanged(Q_LLONG imageId) +void ImageAttributesWatch::imageTagsChanged(TQ_LLONG imageId) { emit signalImageTagsChanged(imageId); } @@ -65,17 +65,17 @@ void ImageAttributesWatch::imagesChanged(int albumId) emit signalImagesChanged(albumId); } -void ImageAttributesWatch::imageRatingChanged(Q_LLONG imageId) +void ImageAttributesWatch::imageRatingChanged(TQ_LLONG imageId) { emit signalImageRatingChanged(imageId); } -void ImageAttributesWatch::imageDateChanged(Q_LLONG imageId) +void ImageAttributesWatch::imageDateChanged(TQ_LLONG imageId) { emit signalImageDateChanged(imageId); } -void ImageAttributesWatch::imageCaptionChanged(Q_LLONG imageId) +void ImageAttributesWatch::imageCaptionChanged(TQ_LLONG imageId) { emit signalImageCaptionChanged(imageId); } diff --git a/digikam/digikam/imageattributeswatch.h b/digikam/digikam/imageattributeswatch.h index 8d46a5b..9d4fd57 100644 --- a/digikam/digikam/imageattributeswatch.h +++ b/digikam/digikam/imageattributeswatch.h @@ -24,9 +24,9 @@ #ifndef IMAGEATTRIBUTESWATCH_H #define IMAGEATTRIBUTESWATCH_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> // KDE includes. @@ -35,9 +35,10 @@ namespace Digikam { -class ImageAttributesWatch : public QObject +class ImageAttributesWatch : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -45,12 +46,12 @@ public: static void cleanUp(); static void shutDown(); - void imageTagsChanged(Q_LLONG imageId); + void imageTagsChanged(TQ_LLONG imageId); void imagesChanged(int albumId); - void imageRatingChanged(Q_LLONG imageId); - void imageDateChanged(Q_LLONG imageId); - void imageCaptionChanged(Q_LLONG imageId); + void imageRatingChanged(TQ_LLONG imageId); + void imageDateChanged(TQ_LLONG imageId); + void imageCaptionChanged(TQ_LLONG imageId); void fileMetadataChanged(const KURL &url); @@ -61,7 +62,7 @@ signals: There is no guarantee that the tags were actually changed. This signal, the signal below, or both may be sent. */ - void signalImageTagsChanged(Q_LLONG imageId); + void signalImageTagsChanged(TQ_LLONG imageId); /** Indicates that images in the given album id may have changed their tags. @@ -73,9 +74,9 @@ signals: of the image with given imageId was set. There is no guarantee that it actually changed. */ - void signalImageRatingChanged(Q_LLONG imageId); - void signalImageDateChanged(Q_LLONG imageId); - void signalImageCaptionChanged(Q_LLONG imageId); + void signalImageRatingChanged(TQ_LLONG imageId); + void signalImageDateChanged(TQ_LLONG imageId); + void signalImageCaptionChanged(TQ_LLONG imageId); /** Indicates that the metadata if the given file diff --git a/digikam/digikam/imageinfo.cpp b/digikam/digikam/imageinfo.cpp index a7072d8..f32d306 100644 --- a/digikam/digikam/imageinfo.cpp +++ b/digikam/digikam/imageinfo.cpp @@ -23,10 +23,10 @@ /** @file imageinfo.cpp */ -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> // Local includes. @@ -48,9 +48,9 @@ ImageInfo::ImageInfo() { } -ImageInfo::ImageInfo(Q_LLONG ID, int albumID, const QString& name, - const QDateTime& datetime, size_t size, - const QSize& dims) +ImageInfo::ImageInfo(TQ_LLONG ID, int albumID, const TQString& name, + const TQDateTime& datetime, size_t size, + const TQSize& dims) : m_ID(ID), m_albumID(albumID), m_name(name), m_datetime(datetime), m_size(size), m_dims(dims), m_viewitem(0) { @@ -60,7 +60,7 @@ ImageInfo::ImageInfo(Q_LLONG ID, int albumID, const QString& name, } } -ImageInfo::ImageInfo(Q_LLONG ID) +ImageInfo::ImageInfo(TQ_LLONG ID) : m_ID(ID), m_size(0), m_viewitem(0) { if (!m_man) @@ -83,12 +83,12 @@ bool ImageInfo::isNull() const return m_ID != -1; } -QString ImageInfo::name() const +TQString ImageInfo::name() const { return m_name; } -void ImageInfo::setName(const QString& newName) +void ImageInfo::setName(const TQString& newName) { /* KURL src = kurlForKIO(); @@ -113,13 +113,13 @@ size_t ImageInfo::fileSize() const { if (m_size == 0) { - QFileInfo info(filePath()); + TQFileInfo info(filePath()); m_size = info.size(); } return m_size; } -QDateTime ImageInfo::dateTime() const +TQDateTime ImageInfo::dateTime() const { if (!m_datetime.isValid()) { @@ -129,23 +129,23 @@ QDateTime ImageInfo::dateTime() const return m_datetime; } -QDateTime ImageInfo::modDateTime() const +TQDateTime ImageInfo::modDateTime() const { if (!m_modDatetime.isValid()) { - QFileInfo fileInfo(filePath()); + TQFileInfo fileInfo(filePath()); m_modDatetime = fileInfo.lastModified(); } return m_modDatetime; } -QSize ImageInfo::dimensions() const +TQSize ImageInfo::dimensions() const { return m_dims; } -Q_LLONG ImageInfo::id() const +TQ_LLONG ImageInfo::id() const { return m_ID; } @@ -175,16 +175,16 @@ KURL ImageInfo::kurl() const return u; } -QString ImageInfo::filePath() const +TQString ImageInfo::filePath() const { PAlbum* a = album(); if (!a) { DWarning() << "No album found for ID: " << m_albumID << endl; - return QString(); + return TQString(); } - QString path = m_man->getLibraryPath(); + TQString path = m_man->getLibraryPath(); path += a->url() + '/' + m_name; return path; } @@ -213,7 +213,7 @@ void* ImageInfo::getViewItem() const return m_viewitem; } -void ImageInfo::setDateTime(const QDateTime& dateTime) +void ImageInfo::setDateTime(const TQDateTime& dateTime) { if (dateTime.isValid()) { @@ -224,28 +224,28 @@ void ImageInfo::setDateTime(const QDateTime& dateTime) } } -void ImageInfo::setCaption(const QString& caption) +void ImageInfo::setCaption(const TQString& caption) { AlbumDB* db = m_man->albumDB(); db->setItemCaption(m_ID, caption); ImageAttributesWatch::instance()->imageCaptionChanged(m_ID); } -QString ImageInfo::caption() const +TQString ImageInfo::caption() const { AlbumDB* db = m_man->albumDB(); return db->getItemCaption(m_ID); } -QStringList ImageInfo::tagNames() const +TQStringList ImageInfo::tagNames() const { AlbumDB* db = m_man->albumDB(); return db->getItemTagNames(m_ID); } -QStringList ImageInfo::tagPaths(bool leadingSlash) const +TQStringList ImageInfo::tagPaths(bool leadingSlash) const { - QStringList tagPaths; + TQStringList tagPaths; AlbumDB* db = m_man->albumDB(); IntList tagIDs = db->getItemTagIDs(m_ID); @@ -261,7 +261,7 @@ QStringList ImageInfo::tagPaths(bool leadingSlash) const return tagPaths; } -QValueList<int> ImageInfo::tagIDs() const +TQValueList<int> ImageInfo::tagIDs() const { AlbumDB* db = m_man->albumDB(); return db->getItemTagIDs(m_ID); @@ -288,7 +288,7 @@ void ImageInfo::removeAllTags() ImageAttributesWatch::instance()->imageTagsChanged(m_ID); } -void ImageInfo::addTagPaths(const QStringList &tagPaths) +void ImageInfo::addTagPaths(const TQStringList &tagPaths) { AlbumDB *db = m_man->albumDB(); AlbumList list = m_man->findOrCreateTAlbums(tagPaths); @@ -311,7 +311,7 @@ void ImageInfo::setRating(int value) ImageAttributesWatch::instance()->imageRatingChanged(m_ID); } -ImageInfo ImageInfo::copyItem(PAlbum *dstAlbum, const QString &dstFileName) +ImageInfo ImageInfo::copyItem(PAlbum *dstAlbum, const TQString &dstFileName) { DDebug() << "ImageInfo::copyItem " << m_albumID << " " << m_name << " to " << dstAlbum->id() << " " << dstFileName << endl; @@ -339,7 +339,7 @@ void ImageInfo::refresh() { m_datetime = m_man->albumDB()->getItemDate(m_ID); - QFileInfo fileInfo(filePath()); + TQFileInfo fileInfo(filePath()); m_size = fileInfo.size(); m_modDatetime = fileInfo.lastModified(); } diff --git a/digikam/digikam/imageinfo.h b/digikam/digikam/imageinfo.h index 4d544bc..826061e 100644 --- a/digikam/digikam/imageinfo.h +++ b/digikam/digikam/imageinfo.h @@ -26,12 +26,12 @@ #ifndef IMAGEINFO_H #define IMAGEINFO_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatetime.h> -#include <qptrlist.h> -#include <qsize.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqptrlist.h> +#include <tqsize.h> // KDE includes. @@ -76,15 +76,15 @@ public: * @param size filesize of the image * @param dims dimensions of the image */ - ImageInfo(Q_LLONG ID, int albumID, const QString& name, - const QDateTime& datetime, size_t size, - const QSize& dims=QSize()); + ImageInfo(TQ_LLONG ID, int albumID, const TQString& name, + const TQDateTime& datetime, size_t size, + const TQSize& dims=TQSize()); /** * Constructor * @param ID unique ID for this image */ - ImageInfo(Q_LLONG ID); + ImageInfo(TQ_LLONG ID); /** * Destructor @@ -99,23 +99,23 @@ public: /** * @return the name of the image */ - QString name() const; + TQString name() const; /** * Set a new name for the image. * @param newName new name for the image */ - void setName(const QString& newName); + void setName(const TQString& newName); /** * @return the datetime of the image */ - QDateTime dateTime() const; + TQDateTime dateTime() const; /** * @return the modification datetime of the image */ - QDateTime modDateTime() const; + TQDateTime modDateTime() const; /** * @return the filesize of the image @@ -126,7 +126,7 @@ public: * @return the dimensions of the image (valid only if dimensions * have been requested) */ - QSize dimensions() const; + TQSize dimensions() const; /** * @return the standard KDE url with file protocol. The path for @@ -141,7 +141,7 @@ public: /** * @return the absolute file path of the image */ - QString filePath() const; + TQString filePath() const; /** * @return the kurl for KIO or rather DIO. Use this instead of kurl() @@ -153,7 +153,7 @@ public: /** * @return the unique image id for this item */ - Q_LLONG id() const; + TQ_LLONG id() const; /** * @return the id of the PAlbum to which this item belongs @@ -168,32 +168,32 @@ public: /** * @return the caption for this item */ - QString caption() const; + TQString caption() const; /** * Set the caption (writes it to database) * @param caption the new caption for this item */ - void setCaption(const QString& caption); + void setCaption(const TQString& caption); /** * Set the date and time (write it to database) * @param dateTime the new date and time. */ - void setDateTime(const QDateTime& dateTime); + void setDateTime(const TQDateTime& dateTime); /** * @return a list of names of all tags assigned to this item * @see tagPaths */ - QStringList tagNames() const; + TQStringList tagNames() const; /** * @return a list of complete path of all tags assigned to this item. The * complete path for a tag is a '/' separated string of its hierarchy * @see tagPaths */ - QStringList tagPaths(bool leadingSlash = true) const; + TQStringList tagPaths(bool leadingSlash = true) const; /** * @return a list of IDs of tags assigned to this item @@ -201,7 +201,7 @@ public: * @see tagPaths * @see Album::id() */ - QValueList<int> tagIDs() const; + TQValueList<int> tagIDs() const; /** * Adds a tag to the item (writes it to database) @@ -213,7 +213,7 @@ public: * Adds tags in the list to the item. * Tags are created if they do not yet exist */ - void addTagPaths(const QStringList &tagPaths); + void addTagPaths(const TQStringList &tagPaths); /** * Remove a tag from the item (removes it from database) @@ -236,7 +236,7 @@ public: * @param dstFileName new filename * @return an ImageInfo object of the new item */ - ImageInfo copyItem(PAlbum *dstAlbum, const QString &dstFileName); + ImageInfo copyItem(PAlbum *dstAlbum, const TQString &dstFileName); /** * Assign a viewitem for this item. This is useful when a view has a @@ -261,19 +261,19 @@ public: private: - Q_LLONG m_ID; + TQ_LLONG m_ID; int m_albumID; - QString m_name; - mutable QDateTime m_datetime; - mutable QDateTime m_modDatetime; + TQString m_name; + mutable TQDateTime m_datetime; + mutable TQDateTime m_modDatetime; mutable size_t m_size; - QSize m_dims; + TQSize m_dims; void* m_viewitem; static AlbumManager* m_man; }; -typedef QPtrList<ImageInfo> ImageInfoList; -typedef QPtrListIterator<ImageInfo> ImageInfoListIterator; +typedef TQPtrList<ImageInfo> ImageInfoList; +typedef TQPtrListIterator<ImageInfo> ImageInfoListIterator; } // namespace Digikam diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp index 2f2243f..305d549 100644 --- a/digikam/digikam/imagepreviewview.cpp +++ b/digikam/digikam/imagepreviewview.cpp @@ -21,16 +21,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qcursor.h> -#include <qstring.h> -#include <qvaluevector.h> -#include <qfileinfo.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqcursor.h> +#include <tqstring.h> +#include <tqvaluevector.h> +#include <tqfileinfo.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqpixmap.h> // KDE includes. @@ -88,7 +88,7 @@ public: previewThread = 0; previewPreloadThread = 0; imageInfo = 0; - parent = 0; + tqparent = 0; hasPrev = false; hasNext = false; loadFullImageSize = false; @@ -104,11 +104,11 @@ public: double currentFitWindowZoom; - QString path; - QString nextPath; - QString previousPath; + TQString path; + TQString nextPath; + TQString previousPath; - QToolButton *cornerButton; + TQToolButton *cornerButton; KPopupFrame *panIconPopup; @@ -121,50 +121,50 @@ public: PreviewLoadThread *previewThread; PreviewLoadThread *previewPreloadThread; - AlbumWidgetStack *parent; + AlbumWidgetStack *tqparent; }; -ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent) - : PreviewWidget(parent) +ImagePreviewView::ImagePreviewView(AlbumWidgetStack *tqparent) + : PreviewWidget(tqparent) { d = new ImagePreviewViewPriv; - d->parent = parent; + d->tqparent = tqparent; - // get preview size from screen size, but limit from VGA to WQXGA - d->previewSize = QMAX(KApplication::desktop()->height(), + // get preview size from screen size, but limit from VGA to WTQXGA + d->previewSize = TQMAX(KApplication::desktop()->height(), KApplication::desktop()->width()); if (d->previewSize < 640) d->previewSize = 640; if (d->previewSize > 2560) d->previewSize = 2560; - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - d->cornerButton = new QToolButton(this); + d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); d->cornerButton->hide(); - QToolTip::add(d->cornerButton, i18n("Pan the image to a region")); + TQToolTip::add(d->cornerButton, i18n("Pan the image to a region")); setCornerWidget(d->cornerButton); // ------------------------------------------------------------ - connect(d->cornerButton, SIGNAL(pressed()), - this, SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(slotCornerButtonPressed())); - connect(this, SIGNAL(signalShowNextImage()), - this, SIGNAL(signalNextItem())); + connect(this, TQT_SIGNAL(signalShowNextImage()), + this, TQT_SIGNAL(signalNextItem())); - connect(this, SIGNAL(signalShowPrevImage()), - this, SIGNAL(signalPrevItem())); + connect(this, TQT_SIGNAL(signalShowPrevImage()), + this, TQT_SIGNAL(signalPrevItem())); - connect(this, SIGNAL(signalRightButtonClicked()), - this, SLOT(slotContextMenu())); + connect(this, TQT_SIGNAL(signalRightButtonClicked()), + this, TQT_SLOT(slotContextMenu())); - connect(this, SIGNAL(signalLeftButtonClicked()), - this, SIGNAL(signalBack2Album())); + connect(this, TQT_SIGNAL(signalLeftButtonClicked()), + this, TQT_SIGNAL(signalBack2Album())); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -205,19 +205,19 @@ void ImagePreviewView::reload() setImagePath(d->path); } -void ImagePreviewView::setPreviousNextPaths(const QString& previous, const QString &next) +void ImagePreviewView::setPreviousNextPaths(const TQString& previous, const TQString &next) { d->nextPath = next; d->previousPath = previous; } -void ImagePreviewView::setImagePath(const QString& path) +void ImagePreviewView::setImagePath(const TQString& path) { setCursor( KCursor::waitCursor() ); d->path = path; - d->nextPath = QString(); - d->previousPath = QString(); + d->nextPath = TQString(); + d->previousPath = TQString(); if (d->path.isEmpty()) { @@ -229,14 +229,14 @@ void ImagePreviewView::setImagePath(const QString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQT_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -252,20 +252,20 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description if (preview.isNull()) { - d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); - QPixmap pix(visibleWidth(), visibleHeight()); + d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); + TQPixmap pix(visibleWidth(), visibleHeight()); pix.fill(ThemeEngine::instance()->baseColor()); - QPainter p(&pix); - QFileInfo info(d->path); - p.setPen(QPen(ThemeEngine::instance()->textRegColor())); + TQPainter p(&pix); + TQFileInfo info(d->path); + p.setPen(TQPen(ThemeEngine::instance()->textRegColor())); p.drawText(0, 0, pix.width(), pix.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Cannot display preview for\n\"%1\"") - .arg(info.fileName())); + .tqarg(info.fileName())); p.end(); // three copies - but the image is small setImage(DImg(pix.convertToImage())); - d->parent->previewLoaded(); + d->tqparent->previewLoaded(); emit signalPreviewLoaded(false); } else @@ -273,9 +273,9 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description DImg img(preview); if (AlbumSettings::instance()->getExifRotate()) d->previewThread->exifRotate(img, description.filePath); - d->parent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); + d->tqparent->setPreviewMode(AlbumWidgetStack::PreviewImageMode); setImage(img); - d->parent->previewLoaded(); + d->tqparent->previewLoaded(); emit signalPreviewLoaded(true); } @@ -285,16 +285,16 @@ void ImagePreviewView::slotGotImagePreview(const LoadingDescription &description void ImagePreviewView::slotNextPreload() { - QString loadPath; + TQString loadPath; if (!d->nextPath.isNull()) { loadPath = d->nextPath; - d->nextPath = QString(); + d->nextPath = TQString(); } else if (!d->previousPath.isNull()) { loadPath = d->previousPath; - d->previousPath = QString(); + d->previousPath = TQString(); } else return; @@ -318,8 +318,8 @@ void ImagePreviewView::setImageInfo(ImageInfo* info, ImageInfo *previous, ImageI else setImagePath(); - setPreviousNextPaths(previous ? previous->filePath() : QString(), - next ? next->filePath() : QString()); + setPreviousNextPaths(previous ? previous->filePath() : TQString(), + next ? next->filePath() : TQString()); } ImageInfo* ImagePreviewView::getImageInfo() const @@ -341,10 +341,10 @@ void ImagePreviewView::slotContextMenu() KURL url(d->imageInfo->kurl().path()); KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true); - QValueVector<KService::Ptr> serviceVector; + TQValueVector<KService::Ptr> serviceVector; KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'"); - QPopupMenu openWithMenu; + TQPopupMenu openWithMenu; KTrader::OfferList::Iterator iter; KService::Ptr ptr; @@ -397,8 +397,8 @@ void ImagePreviewView::slotContextMenu() { KAction* action = *iter; - if (QString::fromLatin1(action->name()) - == QString::fromLatin1("jpeglossless_rotate")) + if (TQString::tqfromLatin1(action->name()) + == TQString::tqfromLatin1("jpeglossless_rotate")) { action->plug(&popmenu); } @@ -413,8 +413,8 @@ void ImagePreviewView::slotContextMenu() // Bulk assignment/removal of tags -------------------------- - Q_LLONG id = d->imageInfo->id(); - QValueList<Q_LLONG> idList; + TQ_LLONG id = d->imageInfo->id(); + TQValueList<TQ_LLONG> idList; idList.append(id); assignTagsMenu = new TagsPopupMenu(idList, 1000, TagsPopupMenu::ASSIGN); @@ -425,11 +425,11 @@ void ImagePreviewView::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -441,14 +441,14 @@ void ImagePreviewView::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, SIGNAL(activated(int)), - this, SLOT(slotAssignRating(int))); + connect(ratingMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); // -------------------------------------------------------- - int idm = popmenu.exec(QCursor::pos()); + int idm = popmenu.exec(TQCursor::pos()); switch(idm) { @@ -537,7 +537,7 @@ void ImagePreviewView::slotRemoveTag(int tagID) void ImagePreviewView::slotAssignRating(int rating) { - rating = QMIN(5, QMAX(0, rating)); + rating = TQMIN(5, TQMAX(0, rating)); if (d->imageInfo) { MetadataHub hub; @@ -567,21 +567,21 @@ void ImagePreviewView::slotCornerButtonPressed() pan->setImage(180, 120, getImage()); d->panIconPopup->setMainWidget(pan); - QRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), + TQRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), (int)(visibleWidth() / zoomFactor()), (int)(visibleHeight() / zoomFactor())); pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotPanIconSelectionMoved(const QRect&, bool))); + connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, SIGNAL(signalHiden()), - this, SLOT(slotPanIconHiden())); + connect(pan, TQT_SIGNAL(signalHiden()), + this, TQT_SLOT(slotPanIconHiden())); - QPoint g = mapToGlobal(viewport()->pos()); + TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); g.setY(g.y()+ viewport()->size().height()); - d->panIconPopup->popup(QPoint(g.x() - d->panIconPopup->width(), + d->panIconPopup->popup(TQPoint(g.x() - d->panIconPopup->width(), g.y() - d->panIconPopup->height())); pan->setCursorToLocalRegionSelectionCenter(); @@ -594,7 +594,7 @@ void ImagePreviewView::slotPanIconHiden() d->cornerButton->blockSignals(false); } -void ImagePreviewView::slotPanIconSelectionMoved(const QRect& r, bool b) +void ImagePreviewView::slotPanIconSelectionMoved(const TQRect& r, bool b) { setContentsPos((int)(r.x()*zoomFactor()), (int)(r.y()*zoomFactor())); @@ -619,11 +619,11 @@ void ImagePreviewView::zoomFactorChanged(double zoom) PreviewWidget::zoomFactorChanged(zoom); } -void ImagePreviewView::resizeEvent(QResizeEvent* e) +void ImagePreviewView::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); if (!d->imageInfo) d->cornerButton->hide(); @@ -669,17 +669,17 @@ bool ImagePreviewView::previewIsNull() void ImagePreviewView::resetPreview() { d->preview = DImg(); - d->path = QString(); + d->path = TQString(); d->imageInfo = 0; updateZoomAndSize(true); emit signalPreviewLoaded(false); } -void ImagePreviewView::paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh) +void ImagePreviewView::paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh) { DImg img = d->preview.smoothScaleSection(sx, sy, sw, sh, tileSize(), tileSize()); - QPixmap pix2 = img.convertToPixmap(); + TQPixmap pix2 = img.convertToPixmap(); bitBlt(pix, 0, 0, &pix2, 0, 0); } diff --git a/digikam/digikam/imagepreviewview.h b/digikam/digikam/imagepreviewview.h index 29ff8b8..bc67301 100644 --- a/digikam/digikam/imagepreviewview.h +++ b/digikam/digikam/imagepreviewview.h @@ -24,10 +24,10 @@ #ifndef IMAGEPREVIEWVIEW_H #define IMAGEPREVIEWVIEW_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qimage.h> +#include <tqstring.h> +#include <tqimage.h> // Local includes. @@ -35,7 +35,7 @@ #include "previewwidget.h" #include "digikam_export.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -49,10 +49,11 @@ class DIGIKAM_EXPORT ImagePreviewView : public PreviewWidget { Q_OBJECT + TQ_OBJECT public: - ImagePreviewView(AlbumWidgetStack *parent=0); + ImagePreviewView(AlbumWidgetStack *tqparent=0); ~ImagePreviewView(); void setLoadFullImageSize(bool b); @@ -64,8 +65,8 @@ public: ImageInfo* getImageInfo() const; void reload(); - void setImagePath(const QString& path=QString()); - void setPreviousNextPaths(const QString& previous, const QString &next); + void setImagePath(const TQString& path=TQString()); + void setPreviousNextPaths(const TQString& previous, const TQString &next); signals: @@ -80,7 +81,7 @@ signals: protected: - void resizeEvent(QResizeEvent* e); + void resizeEvent(TQResizeEvent* e); private slots: @@ -92,7 +93,7 @@ private slots: void slotAssignRating(int rating); void slotThemeChanged(); void slotCornerButtonPressed(); - void slotPanIconSelectionMoved(const QRect&, bool); + void slotPanIconSelectionMoved(const TQRect&, bool); void slotPanIconHiden(); private: @@ -103,7 +104,7 @@ private: void resetPreview(); void zoomFactorChanged(double zoom); void updateZoomAndSize(bool alwaysFitToWindow); - inline void paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh); + inline void paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh); private: diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 75c2b82..23a5092 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -21,12 +21,12 @@ Boston, MA 02110-1301 USA */ -// Qt includes. +// TQt includes. -#include <qapplication.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qvalidator.h> +#include <tqapplication.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqvalidator.h> // KDE includes. @@ -43,14 +43,14 @@ namespace Digikam { -class DateValidator : public QValidator +class DateValidator : public TQValidator { public: - DateValidator( const QStringList &keywords, QWidget* parent, const char* name = 0 ) - : QValidator( parent, name ), mKeywords( keywords ) + DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 ) + : TQValidator( TQT_TQOBJECT(tqparent), name ), mKeywords( keywords ) {} - virtual State validate( QString &str, int& ) const + virtual State validate( TQString &str, int& ) const { int length = str.length(); @@ -58,7 +58,7 @@ class DateValidator : public QValidator if ( length <= 0 ) return Intermediate; - if ( mKeywords.contains( str.lower() ) ) + if ( mKeywords.tqcontains( str.lower() ) ) return Acceptable; bool ok = false; @@ -70,36 +70,36 @@ class DateValidator : public QValidator } private: - QStringList mKeywords; + TQStringList mKeywords; }; -KDateEdit::KDateEdit( QWidget *parent, const char *name ) - : QComboBox( true, parent, name ), +KDateEdit::KDateEdit( TQWidget *tqparent, const char *name ) + : TQComboBox( true, tqparent, name ), mReadOnly( false ), mDiscardNextMousePress( false ) { // need at least one entry for popup to work setMaxCount( 1 ); - mDate = QDate::currentDate(); - QString today = KGlobal::locale()->formatDate( mDate, true ); + mDate = TQDate::tqcurrentDate(); + TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); - connect( lineEdit(), SIGNAL( returnPressed() ), - this, SLOT( lineEnterPressed() ) ); - connect( this, SIGNAL( textChanged( const QString& ) ), - SLOT( slotTextChanged( const QString& ) ) ); + connect( lineEdit(), TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( lineEnterPressed() ) ); + connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), + TQT_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, SIGNAL( dateChanged( QDate ) ), - SLOT( dateSelected( QDate ) ) ); + connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), + TQT_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); @@ -116,13 +116,13 @@ KDateEdit::~KDateEdit() mPopup = 0; } -void KDateEdit::setDate( const QDate& date ) +void KDateEdit::setDate( const TQDate& date ) { assignDate( date ); updateView(); } -QDate KDateEdit::date() const +TQDate KDateEdit::date() const { return mDate; } @@ -143,17 +143,17 @@ void KDateEdit::popup() if ( mReadOnly ) return; - QRect desk = KGlobalSettings::desktopGeometry( this ); + TQRect desk = KGlobalSettings::desktopGeometry( this ); - QPoint popupPoint = mapToGlobal( QPoint( 0,0 ) ); + TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->sizeHint().height(); + int dateFrameHeight = mPopup->tqsizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->sizeHint().width(); + int dateFrameWidth = mPopup->tqsizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -166,26 +166,26 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( QDate::currentDate() ); + mPopup->setDate( TQDate::tqcurrentDate() ); mPopup->popup( popupPoint ); // The combo box is now shown pressed. Make it show not pressed again // by causing its (invisible) list box to emit a 'selected' signal. // First, ensure that the list box contains the date currently displayed. - QDate date = parseDate(); + TQDate date = parseDate(); assignDate( date ); updateView(); // Now, simulate an Enter to unpress it - QListBox *lb = listBox(); + TQListBox *lb = listBox(); if (lb) { lb->setCurrentItem(0); - QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, 0, 0); - QApplication::postEvent(lb, keyEvent); + TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, TQt::Key_Enter, 0, 0); + TQApplication::postEvent(lb, keyEvent); } } -void KDateEdit::dateSelected( QDate date ) +void KDateEdit::dateSelected( TQDate date ) { if (assignDate( date ) ) { updateView(); @@ -197,7 +197,7 @@ void KDateEdit::dateSelected( QDate date ) } } -void KDateEdit::dateEntered( QDate date ) +void KDateEdit::dateEntered( TQDate date ) { if (assignDate( date ) ) { updateView(); @@ -209,7 +209,7 @@ void KDateEdit::lineEnterPressed() { bool replaced = false; - QDate date = parseDate( &replaced ); + TQDate date = parseDate( &replaced ); if (assignDate( date ) ) { if ( replaced ) @@ -219,18 +219,18 @@ void KDateEdit::lineEnterPressed() } } -QDate KDateEdit::parseDate( bool *replaced ) const +TQDate KDateEdit::parseDate( bool *replaced ) const { - QString text = currentText(); - QDate result; + TQString text = currentText(); + TQDate result; if ( replaced ) (*replaced) = false; if ( text.isEmpty() ) - result = QDate(); - else if ( mKeywordMap.contains( text.lower() ) ) { - QDate today = QDate::currentDate(); + result = TQDate(); + else if ( mKeywordMap.tqcontains( text.lower() ) ) { + TQDate today = TQDate::tqcurrentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. @@ -259,30 +259,30 @@ QDate KDateEdit::parseDate( bool *replaced ) const return result; } -bool KDateEdit::eventFilter( QObject *object, QEvent *event ) +bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) { - if ( object == lineEdit() ) { + if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(lineEdit()) ) { // We only process the focus out event if the text has changed // since we got focus - if ( (event->type() == QEvent::FocusOut) && mTextChanged ) { + if ( (event->type() == TQEvent::FocusOut) && mTextChanged ) { lineEnterPressed(); mTextChanged = false; - } else if ( event->type() == QEvent::KeyPress ) { + } else if ( event->type() == TQEvent::KeyPress ) { // Up and down arrow keys step the date - QKeyEvent* keyEvent = (QKeyEvent*)event; + TQKeyEvent* keyEvent = (TQKeyEvent*)event; - if ( keyEvent->key() == Qt::Key_Return ) { + if ( keyEvent->key() == TQt::Key_Return ) { lineEnterPressed(); return true; } int step = 0; - if ( keyEvent->key() == Qt::Key_Up ) + if ( keyEvent->key() == TQt::Key_Up ) step = 1; - else if ( keyEvent->key() == Qt::Key_Down ) + else if ( keyEvent->key() == TQt::Key_Down ) step = -1; if ( step && !mReadOnly ) { - QDate date = parseDate(); + TQDate date = parseDate(); if ( date.isValid() ) { date = date.addDays( step ); if ( assignDate( date ) ) { @@ -296,12 +296,12 @@ bool KDateEdit::eventFilter( QObject *object, QEvent *event ) } else { // It's a date picker event switch ( event->type() ) { - case QEvent::MouseButtonDblClick: - case QEvent::MouseButtonPress: { - QMouseEvent *mouseEvent = (QMouseEvent*)event; - if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { - QPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); - if ( QApplication::widgetAt( globalPos, true ) == this ) { + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseButtonPress: { + TQMouseEvent *mouseEvent = (TQMouseEvent*)event; + if ( !TQT_TQRECT_OBJECT(mPopup->rect()).tqcontains( mouseEvent->pos() ) ) { + TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); + if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the // KDateEdit widget. Avoid popping it up again immediately. mDiscardNextMousePress = true; @@ -318,19 +318,19 @@ bool KDateEdit::eventFilter( QObject *object, QEvent *event ) return false; } -void KDateEdit::mousePressEvent( QMouseEvent *event ) +void KDateEdit::mousePressEvent( TQMouseEvent *event ) { if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } - QComboBox::mousePressEvent( event ); + TQComboBox::mousePressEvent( event ); } -void KDateEdit::slotTextChanged( const QString& ) +void KDateEdit::slotTextChanged( const TQString& ) { - QDate date = parseDate(); + TQDate date = parseDate(); if ( assignDate( date ) ) emit dateChanged( date ); @@ -346,14 +346,14 @@ void KDateEdit::setupKeywords() mKeywordMap.insert( i18n( "today" ), 0 ); mKeywordMap.insert( i18n( "yesterday" ), -1 ); - QString dayName; + TQString dayName; for ( int i = 1; i <= 7; ++i ) { dayName = KGlobal::locale()->calendar()->weekDayName( i ).lower(); mKeywordMap.insert( dayName, i + 100 ); } } -bool KDateEdit::assignDate( const QDate& date ) +bool KDateEdit::assignDate( const TQDate& date ) { mDate = date; mTextChanged = false; @@ -362,7 +362,7 @@ bool KDateEdit::assignDate( const QDate& date ) void KDateEdit::updateView() { - QString dateString; + TQString dateString; if ( mDate.isValid() ) dateString = KGlobal::locale()->formatDate( mDate, true ); diff --git a/digikam/digikam/kdateedit.h b/digikam/digikam/kdateedit.h index b886cc0..3395dc8 100644 --- a/digikam/digikam/kdateedit.h +++ b/digikam/digikam/kdateedit.h @@ -23,11 +23,11 @@ #ifndef KDATEEDIT_H #define KDATEEDIT_H -// Qt includes. +// TQt includes. -#include <qcombobox.h> -#include <qdatetime.h> -#include <qmap.h> +#include <tqcombobox.h> +#include <tqdatetime.h> +#include <tqmap.h> // KDE includes. @@ -53,20 +53,21 @@ namespace Digikam @author David Jarvie <software@astrojar.org.uk> @author Tobias Koenig <tokoe@kde.org> */ -class KDateEdit : public QComboBox +class KDateEdit : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - KDateEdit( QWidget *parent = 0, const char *name = 0 ); + KDateEdit( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KDateEdit(); /** @return The date entered. This date could be invalid, you have to check validity yourself. */ - QDate date() const; + TQDate date() const; /** Sets whether the widget is read-only for the user. If read-only, @@ -88,7 +89,7 @@ class KDateEdit : public QComboBox This signal is emitted whenever the user modifies the date. The passed date can be invalid. */ - void dateChanged( const QDate &date ); + void dateChanged( const TQDate &date ); public slots: /** @@ -97,32 +98,32 @@ class KDateEdit : public QComboBox @param date The new date to display. This date must be valid or it will not be set */ - void setDate( const QDate &date ); + void setDate( const TQDate &date ); protected slots: void lineEnterPressed(); - void slotTextChanged( const QString& ); - void dateEntered( QDate ); - void dateSelected( QDate ); + void slotTextChanged( const TQString& ); + void dateEntered( TQDate ); + void dateSelected( TQDate ); protected: - virtual bool eventFilter( QObject*, QEvent* ); - virtual void mousePressEvent( QMouseEvent* ); + virtual bool eventFilter( TQObject*, TQEvent* ); + virtual void mousePressEvent( TQMouseEvent* ); /** Sets the date, without altering the display. This method is used internally to set the widget's date value. As a virtual method, it allows derived classes to perform additional validation on the date value before it is set. Derived classes should return true if - QDate::isValid(@p date) returns false. + TQDate::isValid(@p date) returns false. @param date The new date to set. @return True if the date was set, false if it was considered invalid and remains unchanged. */ - virtual bool assignDate( const QDate &date ); + virtual bool assignDate( const TQDate &date ); /** Fills the keyword map. Reimplement it if you want additional @@ -132,17 +133,17 @@ class KDateEdit : public QComboBox private: - QDate parseDate( bool* = 0 ) const; + TQDate parseDate( bool* = 0 ) const; void updateView(); KDatePickerPopup *mPopup; - QDate mDate; + TQDate mDate; bool mReadOnly; bool mTextChanged; bool mDiscardNextMousePress; - QMap<QString, int> mKeywordMap; + TQMap<TQString, int> mKeywordMap; }; } // namespace Digikam diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp index d3940a5..47e87fc 100644 --- a/digikam/digikam/kdatepickerpopup.cpp +++ b/digikam/digikam/kdatepickerpopup.cpp @@ -23,10 +23,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qpopupmenu.h> +#include <tqdatetime.h> +#include <tqpopupmenu.h> // KDE includes. @@ -40,19 +40,19 @@ namespace Digikam { -KDatePickerPopup::KDatePickerPopup(int items, const QDate &date, QWidget *parent, +KDatePickerPopup::KDatePickerPopup(int items, const TQDate &date, TQWidget *tqparent, const char *name) - : QPopupMenu( parent, name ) + : TQPopupMenu( tqparent, name ) { mItems = items; mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, SIGNAL( dateEntered( QDate ) ), - this, SLOT( slotDateChanged( QDate ) ) ); + connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), + this, TQT_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, SIGNAL( dateSelected( QDate ) ), - this, SLOT( slotDateChanged( QDate ) ) ); + connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), + this, TQT_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); buildMenu(); @@ -73,19 +73,19 @@ void KDatePickerPopup::buildMenu() if ( mItems & Words ) { - insertItem( i18n("&Today"), this, SLOT( slotToday() ) ); - insertItem( i18n("Y&esterday"), this, SLOT( slotYesterday() ) ); - insertItem( i18n("Last &Monday"), this, SLOT( slotPrevMonday() ) ); - insertItem( i18n("Last &Friday"), this, SLOT( slotPrevFriday() ) ); - insertItem( i18n("Last &Week"), this, SLOT( slotPrevWeek() ) ); - insertItem( i18n("Last M&onth"), this, SLOT( slotPrevMonth() ) ); + insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); + insertItem( i18n("Y&esterday"), this, TQT_SLOT( slotYesterday() ) ); + insertItem( i18n("Last &Monday"), this, TQT_SLOT( slotPrevMonday() ) ); + insertItem( i18n("Last &Friday"), this, TQT_SLOT( slotPrevFriday() ) ); + insertItem( i18n("Last &Week"), this, TQT_SLOT( slotPrevWeek() ) ); + insertItem( i18n("Last M&onth"), this, TQT_SLOT( slotPrevMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const @@ -93,7 +93,7 @@ KDatePicker *KDatePickerPopup::datePicker() const return mDatePicker; } -void KDatePickerPopup::setDate( const QDate &date ) +void KDatePickerPopup::setDate( const TQDate &date ) { mDatePicker->setDate( date ); } @@ -106,7 +106,7 @@ void KDatePickerPopup::setItems( int items ) } #endif -void KDatePickerPopup::slotDateChanged( QDate date ) +void KDatePickerPopup::slotDateChanged( TQDate date ) { emit dateChanged( date ); hide(); @@ -114,17 +114,17 @@ void KDatePickerPopup::slotDateChanged( QDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( QDate::currentDate() ); + emit dateChanged( TQDate::tqcurrentDate() ); } void KDatePickerPopup::slotYesterday() { - emit dateChanged( QDate::currentDate().addDays( -1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( -1 ) ); } void KDatePickerPopup::slotPrevFriday() { - QDate date = QDate::currentDate(); + TQDate date = TQDate::tqcurrentDate(); int day = date.dayOfWeek(); if ( day < 6 ) date = date.addDays( 5 - 7 - day ); @@ -136,23 +136,23 @@ void KDatePickerPopup::slotPrevFriday() void KDatePickerPopup::slotPrevMonday() { - QDate date = QDate::currentDate(); + TQDate date = TQDate::tqcurrentDate(); emit dateChanged( date.addDays( 1 - date.dayOfWeek() ) ); } void KDatePickerPopup::slotNoDate() { - emit dateChanged( QDate() ); + emit dateChanged( TQDate() ); } void KDatePickerPopup::slotPrevWeek() { - emit dateChanged( QDate::currentDate().addDays( -7 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( -7 ) ); } void KDatePickerPopup::slotPrevMonth() { - emit dateChanged( QDate::currentDate().addMonths( -1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addMonths( -1 ) ); } } // namespace Digikam diff --git a/digikam/digikam/kdatepickerpopup.h b/digikam/digikam/kdatepickerpopup.h index 715425f..c2b3330 100644 --- a/digikam/digikam/kdatepickerpopup.h +++ b/digikam/digikam/kdatepickerpopup.h @@ -26,10 +26,10 @@ #ifndef KDATEPICKERPOPUP_H #define KDATEPICKERPOPUP_H -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qpopupmenu.h> +#include <tqdatetime.h> +#include <tqpopupmenu.h> // KDE includes. @@ -45,7 +45,7 @@ namespace Digikam The available items are: - @li NoDate: A menu-item with "No Date". If chosen, the datepicker will emit a null QDate. + @li NoDate: A menu-item with "No Date". If chosen, the datepicker will emit a null TQDate. @li DatePicker: Show a KDatePicker-widget. @li Words: Show items like "Today", "Yesterday" or "Previous Week". @@ -53,9 +53,10 @@ namespace Digikam @author Bram Schoenmakers <bram_s@softhome.net>, Mikolaj Machowski <mikmach@wp.pl> */ -class KDatePickerPopup: public QPopupMenu +class KDatePickerPopup: public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: @@ -71,11 +72,11 @@ public: @param items List of all desirable items, separated with a bitwise OR. @param date Initial date of datepicker-widget. - @param parent The object's parent. + @param tqparent The object's tqparent. @param name The object's name. */ - KDatePickerPopup(int items = 2, const QDate &date = QDate::currentDate(), - QWidget *parent = 0, const char *name = 0); + KDatePickerPopup(int items = 2, const TQDate &date = TQDate::tqcurrentDate(), + TQWidget *tqparent = 0, const char *name = 0); /** @return A pointer to the private variable mDatePicker, an instance of @@ -83,7 +84,7 @@ public: */ KDatePicker *datePicker() const; - void setDate( const QDate &date ); + void setDate( const TQDate &date ); #if 0 /** Set items which should be shown and rebuilds the menu afterwards. Only if the menu is not visible. @@ -100,11 +101,11 @@ public: This signal emits the new date (selected with datepicker or other menu-items). */ - void dateChanged ( QDate ); + void dateChanged ( TQDate ); protected slots: - void slotDateChanged(QDate); + void slotDateChanged(TQDate); void slotToday(); void slotYesterday(); void slotPrevMonday(); diff --git a/digikam/digikam/kdatetimeedit.cpp b/digikam/digikam/kdatetimeedit.cpp index ac8399f..5497892 100644 --- a/digikam/digikam/kdatetimeedit.cpp +++ b/digikam/digikam/kdatetimeedit.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetimeedit.h> +#include <tqdatetimeedit.h> // KDE includes. @@ -34,16 +34,16 @@ namespace Digikam { -KDateTimeEdit::KDateTimeEdit(QWidget *parent, const char *name) - : QHBox(parent, name) +KDateTimeEdit::KDateTimeEdit(TQWidget *tqparent, const char *name) + : TQHBox(tqparent, name) { m_datePopUp = new KDateEdit(this, "datepopup"); - m_timePopUp = new QTimeEdit(QTime::currentTime(), this); + m_timePopUp = new TQTimeEdit(TQTime::currentTime(), this); - connect(m_datePopUp, SIGNAL(dateChanged(const QDate& )), - SLOT(slotDateTimeChanged()) ); - connect(m_timePopUp, SIGNAL(valueChanged(const QTime& )), - SLOT(slotDateTimeChanged()) ); + connect(m_datePopUp, TQT_SIGNAL(dateChanged(const TQDate& )), + TQT_SLOT(slotDateTimeChanged()) ); + connect(m_timePopUp, TQT_SIGNAL(valueChanged(const TQTime& )), + TQT_SLOT(slotDateTimeChanged()) ); } KDateTimeEdit::~KDateTimeEdit() @@ -55,12 +55,12 @@ KDateTimeEdit::~KDateTimeEdit() m_timePopUp = 0; } -QDateTime KDateTimeEdit::dateTime() +TQDateTime KDateTimeEdit::dateTime() { - return QDateTime(m_datePopUp->date(), m_timePopUp->time()); + return TQDateTime(m_datePopUp->date(), m_timePopUp->time()); } -void KDateTimeEdit::setDateTime(const QDateTime dateTime) +void KDateTimeEdit::setDateTime(const TQDateTime dateTime) { m_datePopUp->setDate(dateTime.date()); m_timePopUp->setTime(dateTime.time()); diff --git a/digikam/digikam/kdatetimeedit.h b/digikam/digikam/kdatetimeedit.h index a0e9d8b..3392329 100644 --- a/digikam/digikam/kdatetimeedit.h +++ b/digikam/digikam/kdatetimeedit.h @@ -26,11 +26,11 @@ #ifndef KDATETIMEEDIT_H #define KDATETIMEEDIT_H -// Qt includes. +// TQt includes. -#include <qhbox.h> +#include <tqhbox.h> -class QTimeEdit; +class TQTimeEdit; namespace Digikam { @@ -40,24 +40,25 @@ class KDateEdit; /** * @class KDateTimeEdit * This class is basically the same as the KDateTime class - * with the exception that a QTimeEdit is placed directly + * with the exception that a TQTimeEdit is placed directly * besides it. * * @image html kdatetimeedit.png "This is how it looks" * @author Tom Albers */ -class KDateTimeEdit : public QHBox +class KDateTimeEdit : public TQHBox { Q_OBJECT + TQ_OBJECT public: /** * constructor - * @param parent the parent widget + * @param tqparent the tqparent widget * @param name the name of the widget */ - KDateTimeEdit(QWidget *parent, const char *name); + KDateTimeEdit(TQWidget *tqparent, const char *name); /** * destructor @@ -66,14 +67,14 @@ public: /** * returns the date and time - * @return a QDateTime with the currently chosen date and time + * @return a TQDateTime with the currently chosen date and time */ - QDateTime dateTime(); + TQDateTime dateTime(); /** * Sets the date and the time of this widget. */ - void setDateTime(const QDateTime dateTime); + void setDateTime(const TQDateTime dateTime); signals: @@ -81,12 +82,12 @@ signals: * This signal is emitted whenever the user modifies the date or time. * The passed date and time can be invalid. */ - void dateTimeChanged( const QDateTime &dateTime ); + void dateTimeChanged( const TQDateTime &dateTime ); private: KDateEdit* m_datePopUp; - QTimeEdit* m_timePopUp; + TQTimeEdit* m_timePopUp; private slots: diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 8be0c2f..5e37432 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -35,13 +35,13 @@ extern "C" #include <utime.h> } -// Qt includes. +// TQt includes. -#include <qdir.h> -#include <qdatetime.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqdir.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqregexp.h> // KDE includes. @@ -82,7 +82,7 @@ DigikamImageInfo::~DigikamImageInfo() { } -PAlbum* DigikamImageInfo::parentAlbum() +PAlbum* DigikamImageInfo::tqparentAlbum() { if (!palbum_) { @@ -92,14 +92,14 @@ PAlbum* DigikamImageInfo::parentAlbum() return palbum_; } -QString DigikamImageInfo::title() +TQString DigikamImageInfo::title() { return _url.fileName(); } -QString DigikamImageInfo::description() +TQString DigikamImageInfo::description() { - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if (p) { @@ -107,14 +107,14 @@ QString DigikamImageInfo::description() return db->getItemCaption(p->id(), _url.fileName()); } - return QString(); + return TQString(); } -void DigikamImageInfo::setTitle( const QString& newName ) +void DigikamImageInfo::setTitle( const TQString& newName ) { // Here we get informed that a plugin has renamed the file - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if ( p && !newName.isEmpty() ) { @@ -125,14 +125,14 @@ void DigikamImageInfo::setTitle( const QString& newName ) } } -void DigikamImageInfo::setDescription( const QString& description ) +void DigikamImageInfo::setDescription( const TQString& description ) { - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if ( p ) { AlbumDB* db = AlbumManager::instance()->albumDB(); - Q_LLONG imageId = db->getImageId(p->id(), _url.filename()); + TQ_LLONG imageId = db->getImageId(p->id(), _url.filename()); db->setItemCaption(imageId, description); ImageAttributesWatch::instance()->imageCaptionChanged(imageId); @@ -141,9 +141,9 @@ void DigikamImageInfo::setDescription( const QString& description ) } } -QDateTime DigikamImageInfo::time( KIPI::TimeSpec /*spec*/ ) +TQDateTime DigikamImageInfo::time( KIPI::TimeSpec /*spec*/ ) { - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if (p) { @@ -151,10 +151,10 @@ QDateTime DigikamImageInfo::time( KIPI::TimeSpec /*spec*/ ) return db->getItemDate(p->id(), _url.fileName()); } - return QDateTime(); + return TQDateTime(); } -void DigikamImageInfo::setTime(const QDateTime& time, KIPI::TimeSpec) +void DigikamImageInfo::setTime(const TQDateTime& time, KIPI::TimeSpec) { if ( !time.isValid() ) { @@ -162,12 +162,12 @@ void DigikamImageInfo::setTime(const QDateTime& time, KIPI::TimeSpec) return; } - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if ( p ) { AlbumDB* db = AlbumManager::instance()->albumDB(); - Q_LLONG imageId = db->getImageId(p->id(), _url.filename()); + TQ_LLONG imageId = db->getImageId(p->id(), _url.filename()); db->setItemDate(imageId, time); ImageAttributesWatch::instance()->imageDateChanged(imageId); AlbumManager::instance()->refreshItemHandler( _url ); @@ -181,18 +181,18 @@ void DigikamImageInfo::cloneData( ImageInfoShared* other ) addAttributes( other->attributes() ); } -QMap<QString, QVariant> DigikamImageInfo::attributes() +TQMap<TQString, TQVariant> DigikamImageInfo::attributes() { - QMap<QString, QVariant> res; + TQMap<TQString, TQVariant> res; - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if (p) { AlbumDB* db = AlbumManager::instance()->albumDB(); - Q_LLONG imageId = db->getImageId(p->id(), _url.filename()); + TQ_LLONG imageId = db->getImageId(p->id(), _url.filename()); // Get digiKam Tags list of picture. - QStringList tags = db->getItemTagNames(imageId); + TQStringList tags = db->getItemTagNames(imageId); res["tags"] = tags; // Get digiKam Rating of picture. @@ -204,24 +204,24 @@ QMap<QString, QVariant> DigikamImageInfo::attributes() return res; } -void DigikamImageInfo::addAttributes(const QMap<QString, QVariant>& res) +void DigikamImageInfo::addAttributes(const TQMap<TQString, TQVariant>& res) { - PAlbum* p = parentAlbum(); + PAlbum* p = tqparentAlbum(); if (p) { AlbumDB* db = AlbumManager::instance()->albumDB(); - Q_LLONG imageId = db->getImageId(p->id(), _url.filename()); - QMap<QString, QVariant> attributes = res; + TQ_LLONG imageId = db->getImageId(p->id(), _url.filename()); + TQMap<TQString, TQVariant> attributes = res; // Set digiKam Tags list of picture. - if (attributes.find("tags") != attributes.end()) + if (attributes.tqfind("tags") != attributes.end()) { - QStringList tags = attributes["tags"].asStringList(); + TQStringList tags = attributes["tags"].asStringList(); //TODO } // Set digiKam Rating of picture. - if (attributes.find("rating") != attributes.end()) + if (attributes.tqfind("rating") != attributes.end()) { int rating = attributes["rating"].asInt(); if (rating >= RatingMin && rating <= RatingMax) @@ -232,7 +232,7 @@ void DigikamImageInfo::addAttributes(const QMap<QString, QVariant>& res) } // To update sidebar content. Some kipi-plugins use this way to refresh sidebar - // using an empty QMap(). + // using an empty TQMap(). ImageAttributesWatch::instance()->fileMetadataChanged(_url); } @@ -274,7 +274,7 @@ void DigikamImageInfo::setAngle( int ) //-- Image Collection ------------------------------------------------------------ -DigikamImageCollection::DigikamImageCollection( Type tp, Album* album, const QString& filter ) +DigikamImageCollection::DigikamImageCollection( Type tp, Album* album, const TQString& filter ) : tp_( tp ), album_(album), imgFilter_(filter) { if (!album) @@ -287,17 +287,17 @@ DigikamImageCollection::~DigikamImageCollection() { } -QString DigikamImageCollection::name() +TQString DigikamImageCollection::name() { if ( album_->type() == Album::TAG ) { - return i18n("Tag: %1").arg(album_->title()); + return i18n("Tag: %1").tqarg(album_->title()); } else return album_->title(); } -QString DigikamImageCollection::category() +TQString DigikamImageCollection::category() { if ( album_->type() == Album::PHYSICAL ) { @@ -307,13 +307,13 @@ QString DigikamImageCollection::category() else if ( album_->type() == Album::TAG ) { TAlbum *p = dynamic_cast<TAlbum*>(album_); - return i18n("Tag: %1").arg(p->tagPath()); + return i18n("Tag: %1").tqarg(p->tagPath()); } else - return QString(); + return TQString(); } -QDate DigikamImageCollection::date() +TQDate DigikamImageCollection::date() { if ( album_->type() == Album::PHYSICAL ) { @@ -321,10 +321,10 @@ QDate DigikamImageCollection::date() return p->date(); } else - return QDate(); + return TQDate(); } -QString DigikamImageCollection::comment() +TQString DigikamImageCollection::comment() { if ( album_->type() == Album::PHYSICAL ) { @@ -332,36 +332,36 @@ QString DigikamImageCollection::comment() return p->caption(); } else - return QString(); + return TQString(); } -static QValueList<QRegExp> makeFilterList( const QString &filter ) +static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) { - QValueList<QRegExp> regExps; + TQValueList<TQRegExp> regExps; if ( filter.isEmpty() ) return regExps; - QChar sep( ';' ); - int i = filter.find( sep, 0 ); + TQChar sep( ';' ); + int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.find( ' ', 0 ) != -1 ) - sep = QChar( ' ' ); + if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + sep = TQChar( ' ' ); - QStringList list = QStringList::split( sep, filter ); - QStringList::Iterator it = list.begin(); + TQStringList list = TQStringList::split( sep, filter ); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - regExps << QRegExp( (*it).stripWhiteSpace(), false, true ); + regExps << TQRegExp( (*it).stripWhiteSpace(), false, true ); ++it; } return regExps; } -static bool matchFilterList( const QValueList<QRegExp>& filters, const QString &fileName ) +static bool matchFilterList( const TQValueList<TQRegExp>& filters, const TQString &fileName ) { - QValueList<QRegExp>::ConstIterator rit = filters.begin(); + TQValueList<TQRegExp>::ConstIterator rit = filters.begin(); while ( rit != filters.end() ) { @@ -438,15 +438,15 @@ KURL::List DigikamImageCollection::imagesFromPAlbum(PAlbum* album) const db->beginTransaction(); - QStringList urls = db->getItemURLsInAlbum(album->id()); + TQStringList urls = db->getItemURLsInAlbum(album->id()); db->commitTransaction(); KURL::List urlList; - QValueList<QRegExp> regex = makeFilterList(imgFilter_); + TQValueList<TQRegExp> regex = makeFilterList(imgFilter_); - for (QStringList::iterator it = urls.begin(); it != urls.end(); ++it) + for (TQStringList::iterator it = urls.begin(); it != urls.end(); ++it) { if (matchFilterList(regex, *it)) urlList.append(*it); @@ -463,15 +463,15 @@ KURL::List DigikamImageCollection::imagesFromTAlbum(TAlbum* album) const db->beginTransaction(); - QStringList urls = db->getItemURLsInTag(album->id()); + TQStringList urls = db->getItemURLsInTag(album->id()); db->commitTransaction(); KURL::List urlList; - QValueList<QRegExp> regex = makeFilterList(imgFilter_); + TQValueList<TQRegExp> regex = makeFilterList(imgFilter_); - for (QStringList::iterator it = urls.begin(); it != urls.end(); ++it) + for (TQStringList::iterator it = urls.begin(); it != urls.end(); ++it) { if (matchFilterList(regex, *it)) urlList.append(*it); @@ -492,7 +492,7 @@ KURL DigikamImageCollection::path() else { DWarning() << k_funcinfo << "Requesting kurl from a virtual album" << endl; - return QString(); + return TQString(); } } @@ -517,7 +517,7 @@ KURL DigikamImageCollection::uploadRoot() return KURL(AlbumManager::instance()->getLibraryPath() + '/'); } -QString DigikamImageCollection::uploadRootName() +TQString DigikamImageCollection::uploadRootName() { return i18n("My Albums"); } @@ -538,17 +538,17 @@ bool DigikamImageCollection::operator==(ImageCollectionShared& imgCollection) //-- LibKipi interface ----------------------------------------------------------- -DigikamKipiInterface::DigikamKipiInterface( QObject *parent, const char *name) - : KIPI::Interface( parent, name ) +DigikamKipiInterface::DigikamKipiInterface( TQObject *tqparent, const char *name) + : KIPI::Interface( tqparent, name ) { albumManager_ = AlbumManager::instance(); albumDB_ = albumManager_->albumDB(); - connect( albumManager_, SIGNAL( signalAlbumItemsSelected( bool ) ), - this, SLOT( slotSelectionChanged( bool ) ) ); + connect( albumManager_, TQT_SIGNAL( signalAlbumItemsSelected( bool ) ), + this, TQT_SLOT( slotSelectionChanged( bool ) ) ); - connect( albumManager_, SIGNAL( signalAlbumCurrentChanged(Album*) ), - this, SLOT( slotCurrentAlbumChanged(Album*) ) ); + connect( albumManager_, TQT_SIGNAL( signalAlbumCurrentChanged(Album*) ), + this, TQT_SLOT( slotCurrentAlbumChanged(Album*) ) ); } DigikamKipiInterface::~DigikamKipiInterface() @@ -585,11 +585,11 @@ KIPI::ImageCollection DigikamKipiInterface::currentSelection() } } -QValueList<KIPI::ImageCollection> DigikamKipiInterface::allAlbums() +TQValueList<KIPI::ImageCollection> DigikamKipiInterface::allAlbums() { - QValueList<KIPI::ImageCollection> result; + TQValueList<KIPI::ImageCollection> result; - QString fileFilter(fileExtensions()); + TQString fileFilter(fileExtensions()); AlbumList palbumList = albumManager_->allPAlbums(); for ( AlbumList::Iterator it = palbumList.begin(); @@ -652,13 +652,13 @@ int DigikamKipiInterface::features() const ); } -bool DigikamKipiInterface::addImage( const KURL& url, QString& errmsg ) +bool DigikamKipiInterface::addImage( const KURL& url, TQString& errmsg ) { // Nota : All copy/move operations are processed by the plugins. if ( url.isValid() == false ) { - errmsg = i18n("Target URL %1 is not valid.").arg(url.path()); + errmsg = i18n("Target URL %1 is not valid.").tqarg(url.path()); return false; } @@ -708,7 +708,7 @@ void DigikamKipiInterface::slotCurrentAlbumChanged( Album *album ) emit currentAlbumChanged( album != 0 ); } -QString DigikamKipiInterface::fileExtensions() +TQString DigikamKipiInterface::fileExtensions() { // do not save this into a local variable, as this // might change in the main app diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h index 01148f9..93d75be 100644 --- a/digikam/digikam/kipiinterface.h +++ b/digikam/digikam/kipiinterface.h @@ -30,11 +30,11 @@ #include <config.h> #endif -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qstring.h> -#include <qmap.h> +#include <tqvaluelist.h> +#include <tqstring.h> +#include <tqmap.h> // KDE includes. @@ -49,7 +49,7 @@ #include <libkipi/imageinfoshared.h> #include <libkipi/imagecollectionshared.h> -class QDateTime; +class TQDateTime; namespace KIPI { @@ -77,19 +77,19 @@ public: DigikamImageInfo( KIPI::Interface* interface, const KURL& url ); ~DigikamImageInfo(); - virtual QString title(); - virtual void setTitle( const QString& ); + virtual TQString title(); + virtual void setTitle( const TQString& ); - virtual QString description(); - virtual void setDescription( const QString& ); + virtual TQString description(); + virtual void setDescription( const TQString& ); virtual void cloneData( ImageInfoShared* other ); - virtual QDateTime time( KIPI::TimeSpec spec ); - virtual void setTime( const QDateTime& time, KIPI::TimeSpec spec = KIPI::FromInfo ); + virtual TQDateTime time( KIPI::TimeSpec spec ); + virtual void setTime( const TQDateTime& time, KIPI::TimeSpec spec = KIPI::FromInfo ); - virtual QMap<QString, QVariant> attributes(); - virtual void addAttributes(const QMap<QString, QVariant>& res); + virtual TQMap<TQString, TQVariant> attributes(); + virtual void addAttributes(const TQMap<TQString, TQVariant>& res); virtual void clearAttributes(); virtual int angle(); @@ -97,7 +97,7 @@ public: private: - PAlbum *parentAlbum(); + PAlbum *tqparentAlbum(); private: @@ -121,18 +121,18 @@ public: public: - DigikamImageCollection( Type tp, Album *album, const QString& filter ); + DigikamImageCollection( Type tp, Album *album, const TQString& filter ); ~DigikamImageCollection(); - virtual QString name(); - virtual QString comment(); - virtual QString category(); - virtual QDate date(); + virtual TQString name(); + virtual TQString comment(); + virtual TQString category(); + virtual TQDate date(); virtual KURL::List images(); virtual KURL path(); virtual KURL uploadPath(); virtual KURL uploadRoot(); - virtual QString uploadRootName(); + virtual TQString uploadRootName(); virtual bool isDirectory(); virtual bool operator==(ImageCollectionShared&); @@ -145,7 +145,7 @@ private: Type tp_; Album *album_; - QString imgFilter_; + TQString imgFilter_; }; @@ -154,21 +154,22 @@ private: class DigikamKipiInterface : public KIPI::Interface { Q_OBJECT + TQ_OBJECT public: - DigikamKipiInterface( QObject *parent, const char *name=0); + DigikamKipiInterface( TQObject *tqparent, const char *name=0); ~DigikamKipiInterface(); virtual KIPI::ImageCollection currentAlbum(); virtual KIPI::ImageCollection currentSelection(); - virtual QValueList<KIPI::ImageCollection> allAlbums(); + virtual TQValueList<KIPI::ImageCollection> allAlbums(); virtual KIPI::ImageInfo info( const KURL& ); - virtual bool addImage( const KURL&, QString& errmsg ); + virtual bool addImage( const KURL&, TQString& errmsg ); virtual void delImage( const KURL& ); virtual void refreshImages( const KURL::List& urls ); virtual int features() const; - virtual QString fileExtensions(); + virtual TQString fileExtensions(); public slots: diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp index 91f87e2..bdffaba 100644 --- a/digikam/digikam/main.cpp +++ b/digikam/digikam/main.cpp @@ -26,12 +26,12 @@ #include <config.h> #endif -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qstringlist.h> -#include <qfileinfo.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqfileinfo.h> +#include <tqfile.h> // KDE includes. @@ -66,9 +66,9 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - QString libInfo = Digikam::libraryInfo(); + TQString libInfo = Digikam::libraryInfo(); - QString description = Digikam::digiKamDescription(); + TQString description = Digikam::digiKamDescription(); KAboutData aboutData( "digikam", I18N_NOOP("digiKam"), @@ -90,11 +90,11 @@ int main(int argc, char *argv[]) KConfig* config = KGlobal::config(); config->setGroup("General Settings"); - QString version = config->readEntry("Version"); + TQString version = config->readEntry("Version"); config->setGroup("Album Settings"); - QString albumPath = config->readPathEntry("Album Path"); - QFileInfo dirInfo(albumPath); + TQString albumPath = config->readPathEntry("Album Path"); + TQFileInfo dirInfo(albumPath); // version 0.6 was the version when the new Albums Library // storage was implemented @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) digikam->downloadFrom(args->getOption("download-from")); #if KDE_IS_VERSION(3,2,0) - QStringList tipsFiles; + TQStringList tipsFiles; tipsFiles.append("digikam/tips"); tipsFiles.append("kipi/tips"); diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp index e726e89..5ebe8e9 100644 --- a/digikam/digikam/mediaplayerview.cpp +++ b/digikam/digikam/mediaplayerview.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qstring.h> -#include <qlayout.h> -#include <qframe.h> +#include <tqlabel.h> +#include <tqstring.h> +#include <tqlayout.h> +#include <tqframe.h> // KDE includes. @@ -67,29 +67,29 @@ public: mediaPlayerView = 0; } - QFrame *errorView; + TQFrame *errorView; - QFrame *mediaPlayerView; + TQFrame *mediaPlayerView; - QGridLayout *grid; + TQGridLayout *grid; KParts::ReadOnlyPart *mediaPlayerPart; }; -MediaPlayerView::MediaPlayerView(QWidget *parent) - : QWidgetStack(parent, 0, Qt::WDestructiveClose) +MediaPlayerView::MediaPlayerView(TQWidget *tqparent) + : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) { d = new MediaPlayerViewPriv; // -------------------------------------------------------------------------- - d->errorView = new QFrame(this); - QLabel *errorMsg = new QLabel(i18n("No media player available..."), d->errorView); - QGridLayout *grid = new QGridLayout(d->errorView, 2, 2, + d->errorView = new TQFrame(this); + TQLabel *errorMsg = new TQLabel(i18n("No media player available..."), d->errorView); + TQGridLayout *grid = new TQGridLayout(d->errorView, 2, 2, KDialogBase::marginHint(), KDialogBase::spacingHint()); - errorMsg->setAlignment(Qt::AlignCenter); - d->errorView->setFrameStyle(QFrame::GroupBoxPanel|QFrame::Plain); + errorMsg->tqsetAlignment(TQt::AlignCenter); + d->errorView->setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); d->errorView->setMargin(0); d->errorView->setLineWidth(1); @@ -103,11 +103,11 @@ MediaPlayerView::MediaPlayerView(QWidget *parent) // -------------------------------------------------------------------------- - d->mediaPlayerView = new QFrame(this); - d->grid = new QGridLayout(d->mediaPlayerView, 2, 2, + d->mediaPlayerView = new TQFrame(this); + d->grid = new TQGridLayout(d->mediaPlayerView, 2, 2, KDialogBase::marginHint(), KDialogBase::spacingHint()); - d->mediaPlayerView->setFrameStyle(QFrame::GroupBoxPanel|QFrame::Plain); + d->mediaPlayerView->setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); d->mediaPlayerView->setMargin(0); d->mediaPlayerView->setLineWidth(1); @@ -120,8 +120,8 @@ MediaPlayerView::MediaPlayerView(QWidget *parent) // -------------------------------------------------------------------------- - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); } MediaPlayerView::~MediaPlayerView() @@ -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(), - QString::fromLatin1("KParts/ReadOnlyPart")); + TQString::tqfromLatin1("KParts/ReadOnlyPart")); DDebug() << "Search a KPart to preview " << url.fileName() << " (" << mimePtr->name() << ") " << endl; @@ -162,7 +162,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) d->mediaPlayerPart = 0; } - QWidget *mediaPlayerWidget = 0; + TQWidget *mediaPlayerWidget = 0; for( KServiceTypeProfile::OfferList::Iterator it = services.begin(); it != services.end(); ++it ) { @@ -175,7 +175,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) continue; } - QString library = service->library(); + TQString library = service->library(); if ( library.isNull() ) { DWarning() << "The library returned from the service was null, " @@ -187,8 +187,8 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) DDebug() << "Find KPart library " << library << endl; int error = 0; d->mediaPlayerPart = KParts::ComponentFactory::createPartInstanceFromService - <KParts::ReadOnlyPart>(service, d->mediaPlayerView, 0, d->mediaPlayerView, - 0, QStringList(), &error); + <KParts::ReadOnlyPart>(service, TQT_TQWIDGET(d->mediaPlayerView), 0, TQT_TQOBJECT(d->mediaPlayerView), + 0, TQStringList(), &error); if (!d->mediaPlayerPart) { DWarning() << "Failed to instantiate KPart from library " << library @@ -214,7 +214,7 @@ void MediaPlayerView::setMediaPlayerFromUrl(const KURL& url) } d->grid->addMultiCellWidget(mediaPlayerWidget, 0, 0, 0, 2); - mediaPlayerWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + mediaPlayerWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); d->mediaPlayerPart->openURL(url); setPreviewMode(MediaPlayerViewPriv::PlayerView); } diff --git a/digikam/digikam/mediaplayerview.h b/digikam/digikam/mediaplayerview.h index ea95cb5..90ada61 100644 --- a/digikam/digikam/mediaplayerview.h +++ b/digikam/digikam/mediaplayerview.h @@ -24,9 +24,9 @@ #ifndef MEDIAPLAYERVIEW_H #define MEDIAPLAYERVIEW_H -// Qt includes. +// TQt includes. -#include <qwidgetstack.h> +#include <tqwidgetstack.h> // KDE includes. @@ -41,13 +41,14 @@ namespace Digikam class MediaPlayerViewPriv; -class DIGIKAM_EXPORT MediaPlayerView : public QWidgetStack +class DIGIKAM_EXPORT MediaPlayerView : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - MediaPlayerView(QWidget *parent=0); + MediaPlayerView(TQWidget *tqparent=0); ~MediaPlayerView(); void setMediaPlayerFromUrl(const KURL& url); diff --git a/digikam/digikam/metadatahub.cpp b/digikam/digikam/metadatahub.cpp index 92ee4b6..254e4c9 100644 --- a/digikam/digikam/metadatahub.cpp +++ b/digikam/digikam/metadatahub.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfileinfo.h> +#include <tqfileinfo.h> // KDE includes. @@ -47,9 +47,9 @@ public: MetadataHubPriv() { - dateTimeStatus = MetadataHub::MetadataInvalid; - ratingStatus = MetadataHub::MetadataInvalid; - commentStatus = MetadataHub::MetadataInvalid; + dateTimetqStatus = MetadataHub::MetadataInvalid; + ratingtqStatus = MetadataHub::MetadataInvalid; + commenttqStatus = MetadataHub::MetadataInvalid; rating = -1; highestRating = -1; @@ -64,20 +64,20 @@ public: tagsChanged = false; } - MetadataHub::Status dateTimeStatus; - MetadataHub::Status commentStatus; - MetadataHub::Status ratingStatus; + MetadataHub::tqStatus dateTimetqStatus; + MetadataHub::tqStatus commenttqStatus; + MetadataHub::tqStatus ratingtqStatus; - QDateTime dateTime; - QDateTime lastDateTime; - QString comment; + TQDateTime dateTime; + TQDateTime lastDateTime; + TQString comment; int rating; int highestRating; int count; - QMap<TAlbum *, MetadataHub::TagStatus> tags; - QStringList tagList; + TQMap<TAlbum *, MetadataHub::TagtqStatus> 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::Status &status); - template <class T> void loadSingleValue(const T &data, T &storage, MetadataHub::Status &status); + 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); }; MetadataWriteSettings::MetadataWriteSettings() @@ -152,13 +152,13 @@ void MetadataHub::load(ImageInfo *info) load(info->dateTime(), info->caption(), info->rating()); AlbumManager *man = AlbumManager::instance(); - QValueList<int> tagIDs = info->tagIDs(); - QValueList<TAlbum *> loadedTags; + TQValueList<int> tagIDs = info->tagIDs(); + TQValueList<TAlbum *> loadedTags; if (d->dbmode == ManagedTags) { - QValueList<TAlbum *> loadedTags; - for (QValueList<int>::iterator it = tagIDs.begin(); it != tagIDs.end(); ++it) + TQValueList<TAlbum *> loadedTags; + for (TQValueList<int>::iterator it = tagIDs.begin(); it != tagIDs.end(); ++it) { TAlbum *album = man->findTAlbum(*it); if (!album) @@ -181,9 +181,9 @@ void MetadataHub::load(const DMetadata &metadata) { d->count++; - QString comment; - QStringList keywords; - QDateTime datetime; + TQString comment; + TQStringList keywords; + TQDateTime datetime; int rating; // Try to get comments from image : @@ -205,7 +205,7 @@ void MetadataHub::load(const DMetadata &metadata) if ( !datetime.isValid() ) { - QFileInfo info( metadata.getFilePath() ); + TQFileInfo info( metadata.getFilePath() ); datetime = info.lastModified(); } @@ -216,10 +216,10 @@ void MetadataHub::load(const DMetadata &metadata) if (d->dbmode == ManagedTags) { AlbumManager *man = AlbumManager::instance(); - QStringList tagPaths = metadata.getImageKeywords(); - QValueList<TAlbum *> loadedTags; + TQStringList tagPaths = metadata.getImageKeywords(); + TQValueList<TAlbum *> loadedTags; - for (QStringList::iterator it = tagPaths.begin(); it != tagPaths.end(); ++it) + for (TQStringList::iterator it = tagPaths.begin(); it != tagPaths.end(); ++it) { TAlbum *album = man->findTAlbum(*it); if (!album) @@ -238,7 +238,7 @@ void MetadataHub::load(const DMetadata &metadata) } } -bool MetadataHub::load(const QString &filePath) +bool MetadataHub::load(const TQString &filePath) { DMetadata metadata; bool success = metadata.load(filePath); @@ -247,30 +247,30 @@ bool MetadataHub::load(const QString &filePath) } // private common code to merge tags -void MetadataHub::loadTags(const QValueList<TAlbum *> &loadedTags) +void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags) { // get copy of tags - QValueList<TAlbum *> previousTags = d->tags.keys(); + TQValueList<TAlbum *> previousTags = d->tags.keys(); // first go through all tags contained in this set - for (QValueList<TAlbum *>::const_iterator it = loadedTags.begin(); it != loadedTags.end(); ++it) + for (TQValueList<TAlbum *>::const_iterator it = loadedTags.begin(); it != loadedTags.end(); ++it) { // that is a reference - TagStatus &status = d->tags[*it]; + TagtqStatus &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 = TagStatus(MetadataAvailable, true); + status = TagtqStatus(MetadataAvailable, true); else // previous sets did not contain the tag, we do => disjoint - status = TagStatus(MetadataDisjoint, true); + status = TagtqStatus(MetadataDisjoint, true); } - else if (status == TagStatus(MetadataAvailable, false)) + else if (status == TagtqStatus(MetadataAvailable, false)) { // set to explicitly not contained, but we contain it => disjoint - status = TagStatus(MetadataDisjoint, true); + status = TagtqStatus(MetadataDisjoint, true); } // else if mapIt.data() == MetadataAvailable, true: all right, we contain it too // else if mapIt.data() == MetadataDisjoint: it's already disjoint @@ -281,18 +281,18 @@ void MetadataHub::loadTags(const QValueList<TAlbum *> &loadedTags) // Those tags which had been set as MetadataAvailable before, // but are not contained in this set, have to be set to MetadataDisjoint - for (QValueList<TAlbum *>::iterator it = previousTags.begin(); it != previousTags.end(); ++it) + for (TQValueList<TAlbum *>::iterator it = previousTags.begin(); it != previousTags.end(); ++it) { - QMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(*it); - if (mapIt != d->tags.end() && mapIt.data() == TagStatus(MetadataAvailable, true)) + TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.tqfind(*it); + if (mapIt != d->tags.end() && mapIt.data() == TagtqStatus(MetadataAvailable, true)) { - mapIt.data() = TagStatus(MetadataDisjoint, true); + mapIt.data() = TagtqStatus(MetadataDisjoint, true); } } } // private code to merge tags with d->tagList -void MetadataHub::loadTags(const QStringList &loadedTagPaths) +void MetadataHub::loadTags(const TQStringList &loadedTagPaths) { if (d->count == 1) { @@ -301,10 +301,10 @@ void MetadataHub::loadTags(const QStringList &loadedTagPaths) else { // a simple intersection - QStringList toBeAdded; - for (QStringList::iterator it = d->tagList.begin(); it != d->tagList.end(); ++it) + TQStringList toBeAdded; + for (TQStringList::iterator it = d->tagList.begin(); it != d->tagList.end(); ++it) { - QStringList::const_iterator newTagListIt = loadedTagPaths.find(*it); + TQStringList::const_iterator newTagListIt = loadedTagPaths.tqfind(*it); if (newTagListIt == loadedTagPaths.end()) { // it's not in the loadedTagPaths list. Remove it from intersection list. @@ -316,20 +316,20 @@ void MetadataHub::loadTags(const QStringList &loadedTagPaths) } // private common code to load dateTime, comment, rating -void MetadataHub::load(const QDateTime &dateTime, const QString &comment, int rating) +void MetadataHub::load(const TQDateTime &dateTime, const TQString &comment, int rating) { if (dateTime.isValid()) { - d->loadWithInterval<QDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimeStatus); + d->loadWithInterval<TQDateTime>(dateTime, d->dateTime, d->lastDateTime, d->dateTimetqStatus); } - d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingStatus); + d->loadWithInterval<int>(rating, d->rating, d->highestRating, d->ratingtqStatus); - d->loadSingleValue<QString>(comment, d->comment, d->commentStatus); + d->loadSingleValue<TQString>(comment, d->comment, d->commenttqStatus); } // template method to share code for dateTime and rating -template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::Status &status) +template <class T> void MetadataHubPriv::loadWithInterval(const T &data, T &storage, T &highestStorage, MetadataHub::tqStatus &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::Status &status) +template <class T> void MetadataHubPriv::loadSingleValue(const T &data, T &storage, MetadataHub::tqStatus &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->commentStatus == MetadataAvailable; - bool saveDateTime = d->dateTimeStatus == MetadataAvailable; - bool saveRating = d->ratingStatus == MetadataAvailable; + bool saveComment = d->commenttqStatus == MetadataAvailable; + bool saveDateTime = d->dateTimetqStatus == MetadataAvailable; + bool saveRating = d->ratingtqStatus == MetadataAvailable; bool saveTags = false; - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagtqStatus>::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 (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagtqStatus>::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->commentStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -521,8 +521,8 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata // To fix this constraint (not needed currently), an oldKeywords parameter is needed // create list of keywords to be added and to be removed - QStringList newKeywords, oldKeywords; - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + TQStringList newKeywords, oldKeywords; + for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { // it is important that MetadataDisjoint keywords are not touched if (it.data() == MetadataAvailable) @@ -559,7 +559,7 @@ bool MetadataHub::write(DMetadata &metadata, WriteMode writeMode, const Metadata return dirty; } -bool MetadataHub::write(const QString &filePath, WriteMode writeMode, const MetadataWriteSettings &settings) +bool MetadataHub::write(const TQString &filePath, WriteMode writeMode, const MetadataWriteSettings &settings) { // if no DMetadata object is needed at all, don't construct one - // important optimization if writing to file is turned off in setup! @@ -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->commentStatus == MetadataAvailable); - bool saveDateTime = (settings.saveDateTime && d->dateTimeStatus == MetadataAvailable); - bool saveRating = (settings.saveRating && d->ratingStatus == MetadataAvailable); + bool saveComment = (settings.saveComments && d->commenttqStatus == MetadataAvailable); + bool saveDateTime = (settings.saveDateTime && d->dateTimetqStatus == MetadataAvailable); + bool saveRating = (settings.saveRating && d->ratingtqStatus == MetadataAvailable); bool saveTags = false; if (settings.saveIptcTags) { saveTags = false; // find at least one tag to write - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { if (it.data() == MetadataAvailable) { @@ -661,42 +661,42 @@ MetadataWriteSettings MetadataHub::defaultWriteSettings() // -------------------------------------------------- -MetadataHub::Status MetadataHub::dateTimeStatus() const +MetadataHub::tqStatus MetadataHub::dateTimetqStatus() const { - return d->dateTimeStatus; + return d->dateTimetqStatus; } -MetadataHub::Status MetadataHub::commentStatus() const +MetadataHub::tqStatus MetadataHub::commenttqStatus() const { - return d->commentStatus; + return d->commenttqStatus; } -MetadataHub::Status MetadataHub::ratingStatus() const +MetadataHub::tqStatus MetadataHub::ratingtqStatus() const { - return d->ratingStatus; + return d->ratingtqStatus; } -MetadataHub::TagStatus MetadataHub::tagStatus(int albumId) const +MetadataHub::TagtqStatus MetadataHub::tagtqStatus(int albumId) const { if (d->dbmode == NewTagsImport) - return TagStatus(MetadataInvalid); - return tagStatus(AlbumManager::instance()->findTAlbum(albumId)); + return TagtqStatus(MetadataInvalid); + return tagtqStatus(AlbumManager::instance()->findTAlbum(albumId)); } -MetadataHub::TagStatus MetadataHub::tagStatus(const QString &tagPath) const +MetadataHub::TagtqStatus MetadataHub::tagtqStatus(const TQString &tagPath) const { if (d->dbmode == NewTagsImport) - return TagStatus(MetadataInvalid); - return tagStatus(AlbumManager::instance()->findTAlbum(tagPath)); + return TagtqStatus(MetadataInvalid); + return tagtqStatus(AlbumManager::instance()->findTAlbum(tagPath)); } -MetadataHub::TagStatus MetadataHub::tagStatus(TAlbum *album) const +MetadataHub::TagtqStatus MetadataHub::tagtqStatus(TAlbum *album) const { if (!album) - return TagStatus(MetadataInvalid); - QMap<TAlbum *, TagStatus>::iterator mapIt = d->tags.find(album); + return TagtqStatus(MetadataInvalid); + TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.tqfind(album); if (mapIt == d->tags.end()) - return TagStatus(MetadataInvalid); + return TagtqStatus(MetadataInvalid); return mapIt.data(); } @@ -721,12 +721,12 @@ bool MetadataHub::tagsChanged() const return d->tagsChanged; } -QDateTime MetadataHub::dateTime() const +TQDateTime MetadataHub::dateTime() const { return d->dateTime; } -QString MetadataHub::comment() const +TQString MetadataHub::comment() const { return d->comment; } @@ -736,12 +736,12 @@ int MetadataHub::rating() const return d->rating; } -void MetadataHub::dateTimeInterval(QDateTime &lowest, QDateTime &highest) const +void MetadataHub::dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) const { - switch (d->dateTimeStatus) + switch (d->dateTimetqStatus) { case MetadataInvalid: - lowest = highest = QDateTime(); + lowest = highest = TQDateTime(); break; case MetadataAvailable: lowest = highest = d->dateTime; @@ -755,7 +755,7 @@ void MetadataHub::dateTimeInterval(QDateTime &lowest, QDateTime &highest) const void MetadataHub::ratingInterval(int &lowest, int &highest) const { - switch (d->ratingStatus) + switch (d->ratingtqStatus) { case MetadataInvalid: lowest = highest = -1; @@ -770,33 +770,33 @@ void MetadataHub::ratingInterval(int &lowest, int &highest) const } } -QStringList MetadataHub::keywords() const +TQStringList MetadataHub::keywords() const { if (d->dbmode == NewTagsImport) return d->tagList; else { - QStringList tagList; - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + TQStringList tagList; + for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { - if (it.data() == TagStatus(MetadataAvailable, true)) + if (it.data() == TagtqStatus(MetadataAvailable, true)) tagList.append(it.key()->tagPath(false)); } return tagList; } } -QMap<TAlbum *, MetadataHub::TagStatus> MetadataHub::tags() const +TQMap<TAlbum *, MetadataHub::TagtqStatus> MetadataHub::tags() const { // DatabaseMode == ManagedTags is assumed return d->tags; } -QMap<int, MetadataHub::TagStatus> MetadataHub::tagIDs() const +TQMap<int, MetadataHub::TagtqStatus> MetadataHub::tagIDs() const { // DatabaseMode == ManagedTags is assumed - QMap<int, TagStatus> intmap; - for (QMap<TAlbum *, TagStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) + TQMap<int, TagtqStatus> intmap; + for (TQMap<TAlbum *, TagtqStatus>::iterator it = d->tags.begin(); it != d->tags.end(); ++it) { intmap.insert(it.key()->id(), it.data()); } @@ -806,35 +806,35 @@ QMap<int, MetadataHub::TagStatus> MetadataHub::tagIDs() const // -------------------------------------------------- -void MetadataHub::setDateTime(const QDateTime &dateTime, Status status) +void MetadataHub::setDateTime(const TQDateTime &dateTime, tqStatus status) { - d->dateTimeStatus = status; + d->dateTimetqStatus = status; d->dateTime = dateTime; d->dateTimeChanged = true; } -void MetadataHub::setComment(const QString &comment, Status status) +void MetadataHub::setComment(const TQString &comment, tqStatus status) { - d->commentStatus = status; + d->commenttqStatus = status; d->comment = comment; d->commentChanged = true; } -void MetadataHub::setRating(int rating, Status status) +void MetadataHub::setRating(int rating, tqStatus status) { - d->ratingStatus = status; + d->ratingtqStatus = status; d->rating = rating; d->ratingChanged = true; } -void MetadataHub::setTag(TAlbum *tag, bool hasTag, Status status) +void MetadataHub::setTag(TAlbum *tag, bool hasTag, tqStatus status) { // DatabaseMode == ManagedTags is assumed - d->tags[tag] = TagStatus(status, hasTag); + d->tags[tag] = TagtqStatus(status, hasTag); d->tagsChanged = true; } -void MetadataHub::setTag(int albumID, bool hasTag, Status status) +void MetadataHub::setTag(int albumID, bool hasTag, tqStatus status) { // DatabaseMode == ManagedTags is assumed TAlbum *album = AlbumManager::instance()->findTAlbum(albumID); diff --git a/digikam/digikam/metadatahub.h b/digikam/digikam/metadatahub.h index 62024fb..b0062f1 100644 --- a/digikam/digikam/metadatahub.h +++ b/digikam/digikam/metadatahub.h @@ -25,12 +25,12 @@ #ifndef METADATAHUB_H #define METADATAHUB_H -// Qt includes. +// TQt includes. -#include <qstringlist.h> -#include <qdatetime.h> -#include <qmap.h> -#include <qvaluelist.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqmap.h> +#include <tqvaluelist.h> // KDE includes. @@ -60,7 +60,7 @@ public: /** Constructs a MetadataWriteSettings object with all boolean values set to false, - all QString values set to QString() + all TQString values set to TQString() */ MetadataWriteSettings(); @@ -76,11 +76,11 @@ public: bool saveIptcPhotographerId; bool saveIptcCredits; - QString iptcAuthor; - QString iptcAuthorTitle; - QString iptcCredit; - QString iptcSource; - QString iptcCopyright; + TQString iptcAuthor; + TQString iptcAuthorTitle; + TQString iptcCredit; + TQString iptcSource; + TQString iptcCopyright; }; class MetadataHub @@ -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 Status + enum tqStatus { 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 TagStatus + class TagtqStatus { public: - TagStatus(Status status, bool hasTag = false) : status(status), hasTag(hasTag) {}; - TagStatus() : status(MetadataInvalid), hasTag(false) {}; + TagtqStatus(tqStatus status, bool hasTag = false) : status(status), hasTag(hasTag) {}; + TagtqStatus() : status(MetadataInvalid), hasTag(false) {}; - Status status; + tqStatus status; bool hasTag; - bool operator==(TagStatus otherstatus) + bool operator==(TagtqStatus otherstatus) { return otherstatus.status == status && otherstatus.hasTag == hasTag; } - bool operator==(Status otherstatus) { return otherstatus == status; } + bool operator==(tqStatus otherstatus) { return otherstatus == status; } }; enum DatabaseMode @@ -191,10 +191,10 @@ public: /** Load metadata information from the given file. - (Uses DMetadata, QFileInfo) + (Uses DMetadata, TQFileInfo) @returns True if the metadata could be loaded */ - bool load(const QString &filePath); + bool load(const TQString &filePath); // -------------------------------------------------- @@ -233,7 +233,7 @@ public: and notifies the ImageAttributesWatch. @return Returns if the file has been touched */ - bool write(const QString &filePath, WriteMode writeMode = FullWrite, + bool write(const TQString &filePath, WriteMode writeMode = FullWrite, const MetadataWriteSettings &settings = defaultWriteSettings()); /** @@ -251,13 +251,13 @@ public: // -------------------------------------------------- - Status dateTimeStatus() const; - Status commentStatus() const; - Status ratingStatus() const; + tqStatus dateTimetqStatus() const; + tqStatus commenttqStatus() const; + tqStatus ratingtqStatus() const; - TagStatus tagStatus(TAlbum *album) const; - TagStatus tagStatus(int albumId) const; - TagStatus tagStatus(const QString &tagPath) const; + TagtqStatus tagtqStatus(TAlbum *album) const; + TagtqStatus tagtqStatus(int albumId) const; + TagtqStatus tagtqStatus(const TQString &tagPath) const; /** Returns if the metadata field has been changed @@ -274,13 +274,13 @@ public: (see dateTimeInterval()) If status is MetadataInvalid, an invalid date is returned. */ - QDateTime dateTime() const; + TQDateTime dateTime() const; /** Returns the dateTime. If status is MetadataDisjoint, the first loaded comment is returned. - If status is MetadataInvalid, QString() is returned. + If status is MetadataInvalid, TQString() is returned. */ - QString comment() const; + TQString comment() const; /** Returns the rating. If status is MetadataDisjoint, the lowest rating is returned. @@ -294,7 +294,7 @@ public: If status is MetadataAvailable, the values are the same. If status is MetadataInvalid, invalid dates are returned. */ - void dateTimeInterval(QDateTime &lowest, QDateTime &highest) const; + void dateTimeInterval(TQDateTime &lowest, TQDateTime &highest) const; /** Returns the lowest and highest rating. If status is MetadataAvailable, the values are the same. @@ -303,10 +303,10 @@ public: void ratingInterval(int &lowest, int &highest) const; /** - Returns a QStringList with all tags with status MetadataAvailable. + Returns a TQStringList with all tags with status MetadataAvailable. (i.e., the intersection of tags from all loaded metadata sets) */ - QStringList keywords() const; + TQStringList keywords() const; /** Returns a map with the status for each tag. @@ -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. */ - QMap<TAlbum *, TagStatus> tags() const; + TQMap<TAlbum *, TagtqStatus> tags() const; /** Similar to the method above. This method is less efficient internally. */ - QMap<int, TagStatus> tagIDs() const; + TQMap<int, TagtqStatus> tagIDs() const; // -------------------------------------------------- /** Set dateTime to the given value, and the dateTime status to MetadataAvailable */ - void setDateTime(const QDateTime &dateTime, Status status = MetadataAvailable); - void setComment(const QString &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); + 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); /** Resets the information that metadata fields have been changed with one of the @@ -346,9 +346,9 @@ public: private: - void load(const QDateTime &dateTime, const QString &comment, int rating); - void loadTags(const QValueList<TAlbum *> &loadedTags); - void loadTags(const QStringList &loadedTagPaths); + void load(const TQDateTime &dateTime, const TQString &comment, int rating); + void loadTags(const TQValueList<TAlbum *> &loadedTags); + void loadTags(const TQStringList &loadedTagPaths); bool needWriteMetadata(WriteMode writeMode, const MetadataWriteSettings &settings) const; private: diff --git a/digikam/digikam/mimefilter.cpp b/digikam/digikam/mimefilter.cpp index ae49dfd..e794725 100644 --- a/digikam/digikam/mimefilter.cpp +++ b/digikam/digikam/mimefilter.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -49,8 +49,8 @@ public: } }; -MimeFilter::MimeFilter(QWidget* parent) - : QComboBox(parent) +MimeFilter::MimeFilter(TQWidget* tqparent) + : TQComboBox(tqparent) { d = new MimeFilterPriv; insertItem( i18n("All Files"), AllFiles ); @@ -63,8 +63,8 @@ MimeFilter::MimeFilter(QWidget* parent) insertItem( i18n("Movie Files"), MoviesFiles ); insertItem( i18n("Audio Files"), AudioFiles ); - QToolTip::add(this, i18n("Filter for file type")); - QWhatsThis::add(this, i18n("Select the file types (mime types) you want to show")); + TQToolTip::add(this, i18n("Filter for file type")); + TQWhatsThis::add(this, i18n("Select the file types (mime types) you want to show")); setMimeFilter(AllFiles); } diff --git a/digikam/digikam/mimefilter.h b/digikam/digikam/mimefilter.h index 9aaa54b..74e1350 100644 --- a/digikam/digikam/mimefilter.h +++ b/digikam/digikam/mimefilter.h @@ -24,18 +24,19 @@ #ifndef MIMEFILTER_H #define MIMEFILTER_H -// Qt includes. +// TQt includes. -#include <qcombobox.h> +#include <tqcombobox.h> namespace Digikam { class MimeFilterPriv; -class MimeFilter : public QComboBox +class MimeFilter : public TQComboBox { Q_OBJECT + TQ_OBJECT public: @@ -54,7 +55,7 @@ public: public: - MimeFilter(QWidget* parent); + MimeFilter(TQWidget* tqparent); ~MimeFilter(); void setMimeFilter(int filter); diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index 2445565..ad49264 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpalette.h> +#include <tqdatetime.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpalette.h> // KDE includes. @@ -77,13 +77,13 @@ public: struct Month days[42]; }; -MonthWidget::MonthWidget(QWidget* parent) - : QFrame(parent, 0, Qt::WNoAutoErase) +MonthWidget::MonthWidget(TQWidget* tqparent) + : TQFrame(tqparent, 0, TQt::WNoAutoErase) { d = new MonthWidgetPriv; init(); - QDate date = QDate::currentDate(); + TQDate date = TQDate::tqcurrentDate(); setYearMonth(date.year(), date.month()); setActive(false); @@ -96,11 +96,11 @@ MonthWidget::~MonthWidget() void MonthWidget::init() { - QFont fn(font()); + TQFont fn(font()); fn.setBold(true); fn.setPointSize(fn.pointSize()+1); - QFontMetrics fm(fn); - QRect r(fm.boundingRect("XX")); + TQFontMetrics fm(fn); + TQRect r(fm.boundingRect("XX")); r.setWidth(r.width() + 2); r.setHeight(r.height() + 4); d->width = r.width(); @@ -123,7 +123,7 @@ void MonthWidget::setYearMonth(int year, int month) d->days[i].numImages = 0; } - QDate date(year, month, 1); + TQDate date(year, month, 1); int s = date.dayOfWeek(); for (int i=s; i<(s+date.daysInMonth()); i++) @@ -134,37 +134,37 @@ void MonthWidget::setYearMonth(int year, int month) update(); } -QSize MonthWidget::sizeHint() const +TQSize MonthWidget::tqsizeHint() const { - return QSize(d->width * 8, d->height * 9); + return TQSize(d->width * 8, d->height * 9); } -void MonthWidget::resizeEvent(QResizeEvent *e) +void MonthWidget::resizeEvent(TQResizeEvent *e) { - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); d->currw = contentsRect().width()/8; d->currh = contentsRect().height()/9; } -void MonthWidget::drawContents(QPainter *) +void MonthWidget::drawContents(TQPainter *) { - QRect cr(contentsRect()); + TQRect cr(contentsRect()); - QPixmap pix(cr.width(), cr.height()); + TQPixmap pix(cr.width(), cr.height()); - QColorGroup cg = colorGroup(); + TQColorGroup cg = tqcolorGroup(); - QFont fnBold(font()); - QFont fnOrig(font()); + TQFont fnBold(font()); + TQFont fnOrig(font()); fnBold.setBold(true); fnOrig.setBold(false); - QPainter p(&pix); + TQPainter p(&pix); p.fillRect(0, 0, cr.width(), cr.height(), cg.background()); - QRect r(0, 0, d->currw, d->currh); - QRect rsmall; + TQRect r(0, 0, d->currw, d->currh); + TQRect rsmall; int sx, sy; int index = 0; @@ -177,8 +177,8 @@ void MonthWidget::drawContents(QPainter *) for (int i=1; i<8; i++) { sx = d->currw * i; - r.moveTopLeft(QPoint(sx,sy)); - rsmall = QRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); + r.moveTopLeft(TQPoint(sx,sy)); + rsmall = TQRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); if (d->days[index].day != -1) { if (d->days[index].selected) @@ -209,18 +209,18 @@ void MonthWidget::drawContents(QPainter *) } } - p.drawText(rsmall, Qt::AlignVCenter|Qt::AlignHCenter, - QString::number(d->days[index].day)); + p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, + TQString::number(d->days[index].day)); if(!weekvisible) { - int weeknr = KGlobal::locale()->calendar()->weekNumber(QDate(d->year, + int weeknr = KGlobal::locale()->calendar()->weekNumber(TQDate(d->year, d->month, d->days[index].day)); - p.setPen(d->active ? Qt::black : Qt::gray); + p.setPen(d->active ? TQt::black : TQt::gray); p.setFont(fnBold); - p.fillRect(1, sy, d->currw-1, d->currh-1, QColor(210,210,210)); - p.drawText(1, sy, d->currw-1, d->currh-1, Qt::AlignVCenter|Qt::AlignHCenter, - QString::number(weeknr)); + p.fillRect(1, sy, d->currw-1, d->currh-1, TQColor(210,210,210)); + p.drawText(1, sy, d->currw-1, d->currh-1, TQt::AlignVCenter|TQt::AlignHCenter, + TQString::number(weeknr)); weekvisible = true; } @@ -230,7 +230,7 @@ void MonthWidget::drawContents(QPainter *) } } - p.setPen(d->active ? Qt::black : Qt::gray); + p.setPen(d->active ? TQt::black : TQt::gray); p.setFont(fnBold); @@ -238,36 +238,36 @@ void MonthWidget::drawContents(QPainter *) for (int i=1; i<8; i++) { sx = d->currw * i; - r.moveTopLeft(QPoint(sx+1,sy+1)); + r.moveTopLeft(TQPoint(sx+1,sy+1)); rsmall = r; rsmall.setWidth(r.width() - 2); rsmall.setHeight(r.height() - 2); #if KDE_IS_VERSION(3,2,0) - p.drawText(rsmall, Qt::AlignVCenter|Qt::AlignHCenter, + p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, KGlobal::locale()->calendar()->weekDayName(i, true) .remove(2,1)); #else - p.drawText(rsmall, Qt::AlignVCenter|Qt::AlignHCenter, + p.drawText(rsmall, TQt::AlignVCenter|TQt::AlignHCenter, KGlobal::locale()->weekDayName(i, true).remove(2,1)); #endif index++; } - r = QRect(0, 0, cr.width(), 2*d->currh); + r = TQRect(0, 0, cr.width(), 2*d->currh); fnBold.setPointSize(fnBold.pointSize()+2); p.setFont(fnBold); #if KDE_IS_VERSION(3,2,0) - p.drawText(r, Qt::AlignCenter, - QString("%1 %2") - .arg(KGlobal::locale()->calendar()->monthName(d->month, false)) - .arg(KGlobal::locale()->calendar()->year(QDate(d->year,d->month,1)))); + 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)))); #else - p.drawText(r, Qt::AlignCenter, - QString("%1 %2") - .arg(KGlobal::locale()->monthName(d->month)) - .arg(QString::number(d->year))); + p.drawText(r, TQt::AlignCenter, + TQString("%1 %2") + .tqarg(KGlobal::locale()->monthName(d->month)) + .tqarg(TQString::number(d->year))); #endif p.end(); @@ -275,10 +275,10 @@ void MonthWidget::drawContents(QPainter *) bitBlt(this, cr.x(), cr.y(), &pix); } -void MonthWidget::mousePressEvent(QMouseEvent *e) +void MonthWidget::mousePressEvent(TQMouseEvent *e) { int firstSelected = 0, lastSelected = 0; - if (e->state() != Qt::ControlButton) + if (e->state() != TQt::ControlButton) { for (int i=0; i<42; i++) { @@ -292,12 +292,12 @@ void MonthWidget::mousePressEvent(QMouseEvent *e) } } - QRect r1(0, d->currh*3, d->currw, d->currh*6); - QRect r2(d->currw, d->currh*3, d->currw*7, d->currh*6); - QRect r3(d->currw, d->currh*2, d->currw*7, d->currh); + TQRect r1(0, d->currh*3, d->currw, d->currh*6); + TQRect r2(d->currw, d->currh*3, d->currw*7, d->currh*6); + TQRect r3(d->currw, d->currh*2, d->currw*7, d->currh); // Click on a weekday - if( r3.contains(e->pos())) + if( r3.tqcontains(e->pos())) { int j = (e->pos().x() - d->currw)/d->currw; for (int i=0; i<6; i++) @@ -306,7 +306,7 @@ void MonthWidget::mousePressEvent(QMouseEvent *e) } } // Click on a week - else if (r1.contains(e->pos())) + else if (r1.tqcontains(e->pos())) { int j = (e->pos().y() - 3*d->currh)/d->currh; for (int i=0; i<7; i++) @@ -315,12 +315,12 @@ void MonthWidget::mousePressEvent(QMouseEvent *e) } } // Click on a day. - else if (r2.contains(e->pos())) + else if (r2.tqcontains(e->pos())) { int i, j; i = (e->pos().x() - d->currw)/d->currw; j = (e->pos().y() - 3*d->currh)/d->currh; - if (e->state() == Qt::ShiftButton) + if (e->state() == TQt::ShiftButton) { int endSelection = j*7+i; if (endSelection > firstSelected) @@ -334,11 +334,11 @@ void MonthWidget::mousePressEvent(QMouseEvent *e) d->days[j*7+i].selected = !d->days[j*7+i].selected; } - QValueList<QDateTime> filterDays; + TQValueList<TQDateTime> filterDays; for (int i=0; i<42; i++) { if (d->days[i].selected && d->days[i].day != -1) - filterDays.append(QDateTime(QDate(d->year, d->month, d->days[i].day), QTime())); + filterDays.append(TQDateTime(TQDate(d->year, d->month, d->days[i].day), TQTime())); } AlbumLister::instance()->setDayFilter(filterDays); @@ -355,17 +355,17 @@ void MonthWidget::setActive(bool val) if (d->active) { - connect(AlbumLister::instance(), SIGNAL(signalNewItems(const ImageInfoList&)), - this, SLOT(slotAddItems(const ImageInfoList&))); + connect(AlbumLister::instance(), TQT_SIGNAL(signalNewItems(const ImageInfoList&)), + this, TQT_SLOT(slotAddItems(const ImageInfoList&))); - connect(AlbumLister::instance(), SIGNAL(signalDeleteItem(ImageInfo*)), - this, SLOT(slotDeleteItem(ImageInfo*))); + connect(AlbumLister::instance(), TQT_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQT_SLOT(slotDeleteItem(ImageInfo*))); } else { - QDate date = QDate::currentDate(); + TQDate date = TQDate::tqcurrentDate(); setYearMonth(date.year(), date.month()); - AlbumLister::instance()->setDayFilter(QValueList<QDateTime>()); + AlbumLister::instance()->setDayFilter(TQValueList<TQDateTime>()); disconnect(AlbumLister::instance()); } @@ -379,7 +379,7 @@ void MonthWidget::slotAddItems(const ImageInfoList& items) ImageInfo* item; for (ImageInfoListIterator it(items); (item = it.current()); ++it) { - QDateTime dt = item->dateTime(); + TQDateTime dt = item->dateTime(); for (int i=0; i<42; i++) { @@ -400,7 +400,7 @@ void MonthWidget::slotDeleteItem(ImageInfo* item) if (!d->active || !item) return; - QDateTime dt = item->dateTime(); + TQDateTime dt = item->dateTime(); for (int i=0; i<42; i++) { diff --git a/digikam/digikam/monthwidget.h b/digikam/digikam/monthwidget.h index 36333ce..a0bd353 100644 --- a/digikam/digikam/monthwidget.h +++ b/digikam/digikam/monthwidget.h @@ -25,9 +25,9 @@ #ifndef MONTHWIDGET_H #define MONTHWIDGET_H -// Qt includes. +// TQt includes. -#include <qframe.h> +#include <tqframe.h> // Local includes. @@ -37,25 +37,26 @@ namespace Digikam { class MonthWidgetPriv; -class MonthWidget : public QFrame +class MonthWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - MonthWidget(QWidget* parent); + MonthWidget(TQWidget* tqparent); ~MonthWidget(); void setYearMonth(int year, int month); - QSize sizeHint() const; + TQSize tqsizeHint() const; void setActive(bool val); protected: - void resizeEvent(QResizeEvent *e); - void drawContents(QPainter *p); - void mousePressEvent(QMouseEvent *e); + void resizeEvent(TQResizeEvent *e); + void drawContents(TQPainter *p); + void mousePressEvent(TQMouseEvent *e); private: diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index 33cbad7..a6f1609 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -29,15 +29,15 @@ extern "C" #include <unistd.h> } -// Qt includes. +// TQt includes. -#include <qcache.h> -#include <qguardedptr.h> -#include <qpixmap.h> -#include <qdir.h> -#include <qfile.h> -#include <qtimer.h> -#include <qimage.h> +#include <tqcache.h> +#include <tqguardedptr.h> +#include <tqpixmap.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqimage.h> // KDE includes. @@ -75,10 +75,10 @@ public: int size; - QCache<QPixmap> *cache; - QGuardedPtr<ThumbnailJob> thumbJob; - QTimer *timer; - QString thumbCacheDir; + TQCache<TQPixmap> *cache; + TQGuardedPtr<ThumbnailJob> thumbJob; + TQTimer *timer; + TQString thumbCacheDir; AlbumIconView *view; }; @@ -87,13 +87,13 @@ PixmapManager::PixmapManager(AlbumIconView* view) { d = new PixmapManagerPriv; d->view = view; - d->cache = new QCache<QPixmap>(101, 211); + d->cache = new TQCache<TQPixmap>(101, 211); d->cache->setAutoDelete(true); - d->thumbCacheDir = QDir::homeDirPath() + "/.thumbnails/"; + d->thumbCacheDir = TQDir::homeDirPath() + "/.thumbnails/"; - d->timer = new QTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotCompleted())); + d->timer = new TQTimer(this); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotCompleted())); } PixmapManager::~PixmapManager() @@ -123,9 +123,9 @@ void PixmapManager::setThumbnailSize(int size) } } -QPixmap* PixmapManager::find(const KURL& url) +TQPixmap* PixmapManager::tqfind(const KURL& url) { - QPixmap* pix = d->cache->find(url.path()); + TQPixmap* pix = d->cache->tqfind(url.path()); if (pix) return pix; @@ -133,14 +133,14 @@ QPixmap* PixmapManager::find(const KURL& url) { d->thumbJob = new ThumbnailJob(url, d->size, true, AlbumSettings::instance()->getExifRotate()); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotGotThumbnail(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotFailedThumbnail(const KURL&))); - connect(d->thumbJob, SIGNAL(signalCompleted()), - this, SLOT(slotCompleted())); + connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), + this, TQT_SLOT(slotCompleted())); } return 0; @@ -154,15 +154,15 @@ void PixmapManager::remove(const KURL& url) d->thumbJob->removeItem(url); // remove the items from the thumbnail cache directory as well. - QString uri = "file://" + QDir::cleanDirPath(url.path()); - KMD5 md5(QFile::encodeName(uri)); + TQString uri = "file://" + TQDir::cleanDirPath(url.path()); + KMD5 md5(TQFile::encodeName(uri).data()); uri = md5.hexDigest(); - QString smallThumbPath = d->thumbCacheDir + "normal/" + uri + ".png"; - QString bigThumbPath = d->thumbCacheDir + "large/" + uri + ".png"; + TQString smallThumbPath = d->thumbCacheDir + "normal/" + uri + ".png"; + TQString bigThumbPath = d->thumbCacheDir + "large/" + uri + ".png"; - ::unlink(QFile::encodeName(smallThumbPath)); - ::unlink(QFile::encodeName(bigThumbPath)); + ::unlink(TQFile::encodeName(smallThumbPath)); + ::unlink(TQFile::encodeName(bigThumbPath)); } void PixmapManager::clear() @@ -176,34 +176,34 @@ void PixmapManager::clear() d->cache->clear(); } -void PixmapManager::slotGotThumbnail(const KURL& url, const QPixmap& pix) +void PixmapManager::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { d->cache->remove(url.path()); - QPixmap* thumb = new QPixmap(pix); + TQPixmap* thumb = new TQPixmap(pix); d->cache->insert(url.path(), thumb); emit signalPixmap(url); } void PixmapManager::slotFailedThumbnail(const KURL& url) { - QImage img; - QString ext = QFileInfo(url.path()).extension(false); + TQImage img; + TQString ext = TQFileInfo(url.path()).extension(false); // Wrapper around mime type of item to get the right icon. AlbumSettings* settings = AlbumSettings::instance(); if (settings) { - if (settings->getImageFileFilter().upper().contains(ext.upper()) || - settings->getRawFileFilter().upper().contains(ext.upper())) + if (settings->getImageFileFilter().upper().tqcontains(ext.upper()) || + settings->getRawFileFilter().upper().tqcontains(ext.upper())) { img = DesktopIcon("image", KIcon::SizeEnormous).convertToImage(); } - else if (settings->getMovieFileFilter().upper().contains(ext.upper())) + else if (settings->getMovieFileFilter().upper().tqcontains(ext.upper())) { img = DesktopIcon("video", KIcon::SizeEnormous).convertToImage(); } - else if (settings->getAudioFileFilter().upper().contains(ext.upper())) + else if (settings->getAudioFileFilter().upper().tqcontains(ext.upper())) { img = DesktopIcon("sound", KIcon::SizeEnormous).convertToImage(); } @@ -214,8 +214,8 @@ void PixmapManager::slotFailedThumbnail(const KURL& url) // Resize icon to the right size depending of current settings. - QSize size(img.size()); - size.scale(d->size, d->size, QSize::ScaleMin); + TQSize size(img.size()); + size.tqscale(d->size, d->size, TQSize::ScaleMin); if (size.width() < img.width() && size.height() < img.height()) { // only scale down @@ -224,7 +224,7 @@ void PixmapManager::slotFailedThumbnail(const KURL& url) } d->cache->remove(url.path()); - QPixmap* thumb = new QPixmap(img); + TQPixmap* thumb = new TQPixmap(img); d->cache->insert(url.path(), thumb); emit signalPixmap(url); } @@ -241,7 +241,7 @@ void PixmapManager::slotCompleted() if (!item) return; - find(item->imageInfo()->kurl()); + tqfind(item->imageInfo()->kurl()); } int PixmapManager::cacheSize() const diff --git a/digikam/digikam/pixmapmanager.h b/digikam/digikam/pixmapmanager.h index 1ccec50..33c9a9c 100644 --- a/digikam/digikam/pixmapmanager.h +++ b/digikam/digikam/pixmapmanager.h @@ -25,13 +25,13 @@ #ifndef PIXMAPMANAGER_H #define PIXMAPMANAGER_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> /** @file pixmapmanager.h */ -class QPixmap; +class TQPixmap; class KURL; @@ -47,16 +47,17 @@ class PixmapManagerPriv; * pixmapmanager maintains a fixed size cache of thumbnails and loads * pixmaps on demand. */ -class PixmapManager : public QObject +class PixmapManager : public TQObject { Q_OBJECT + TQ_OBJECT public: PixmapManager(AlbumIconView* view); ~PixmapManager(); - QPixmap* find(const KURL& path); + TQPixmap* tqfind(const KURL& path); void remove(const KURL& path); void clear(); void setThumbnailSize(int size); @@ -68,7 +69,7 @@ signals: private slots: - void slotGotThumbnail(const KURL& url, const QPixmap& pix); + void slotGotThumbnail(const KURL& url, const TQPixmap& pix); void slotFailedThumbnail(const KURL& url); void slotCompleted(); diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp index 5bca291..b1521af 100644 --- a/digikam/digikam/ratingfilter.cpp +++ b/digikam/digikam/ratingfilter.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qwhatsthis.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqwhatsthis.h> // KDE includes. @@ -68,8 +68,8 @@ public: AlbumLister::RatingCondition filterCond; }; -RatingFilter::RatingFilter(QWidget* parent) - : RatingWidget(parent) +RatingFilter::RatingFilter(TQWidget* tqparent) + : RatingWidget(tqparent) { d = new RatingFilterPriv; @@ -77,13 +77,13 @@ RatingFilter::RatingFilter(QWidget* parent) updateRatingTooltip(); setMouseTracking(true); - QWhatsThis::add(this, i18n("Select the rating value used to filter " + TQWhatsThis::add(this, i18n("Select the rating value used to filter " "albums contents. Use contextual pop-up menu to " "set rating filter condition.")); - // To dispatch signal from parent widget with filter condition. - connect(this, SIGNAL(signalRatingChanged(int)), - this, SLOT(slotRatingChanged())); + // To dispatch signal from tqparent widget with filter condition. + connect(this, TQT_SIGNAL(signalRatingChanged(int)), + this, TQT_SLOT(slotRatingChanged())); } RatingFilter::~RatingFilter() @@ -109,7 +109,7 @@ AlbumLister::RatingCondition RatingFilter::ratingFilterCondition() return d->filterCond; } -void RatingFilter::mouseMoveEvent(QMouseEvent* e) +void RatingFilter::mouseMoveEvent(TQMouseEvent* e) { // This method have been re-implemented to display and update the famous TipTracker contents. @@ -124,7 +124,7 @@ void RatingFilter::mouseMoveEvent(QMouseEvent* e) } } -void RatingFilter::mousePressEvent(QMouseEvent* e) +void RatingFilter::mousePressEvent(TQMouseEvent* e) { // This method must be re-implemented to handle witch mousse button is pressed // and show the rating filter settings pop-up menu with right mouse button. @@ -155,7 +155,7 @@ void RatingFilter::mousePressEvent(QMouseEvent* e) popmenu.insertItem(i18n("Less Equal Condition"), AlbumLister::LessEqualCondition); popmenu.setItemChecked(d->filterCond, true); - int choice = popmenu.exec((QCursor::pos())); + int choice = popmenu.exec((TQCursor::pos())); switch(choice) { case AlbumLister::GreaterEqualCondition: @@ -171,7 +171,7 @@ void RatingFilter::mousePressEvent(QMouseEvent* e) } } -void RatingFilter::mouseReleaseEvent(QMouseEvent*) +void RatingFilter::mouseReleaseEvent(TQMouseEvent*) { d->dirty = false; } @@ -184,17 +184,17 @@ void RatingFilter::updateRatingTooltip() { case AlbumLister::GreaterEqualCondition: { - d->ratingTracker->setText(i18n("Rating >= %1").arg(rating())); + d->ratingTracker->setText(i18n("Rating >= %1").tqarg(rating())); break; } case AlbumLister::EqualCondition: { - d->ratingTracker->setText(i18n("Rating = %1").arg(rating())); + d->ratingTracker->setText(i18n("Rating = %1").tqarg(rating())); break; } case AlbumLister::LessEqualCondition: { - d->ratingTracker->setText(i18n("Rating <= %1").arg(rating())); + d->ratingTracker->setText(i18n("Rating <= %1").tqarg(rating())); break; } default: diff --git a/digikam/digikam/ratingfilter.h b/digikam/digikam/ratingfilter.h index d301a3b..5fb467e 100644 --- a/digikam/digikam/ratingfilter.h +++ b/digikam/digikam/ratingfilter.h @@ -38,10 +38,11 @@ class RatingFilterPriv; class RatingFilter : public RatingWidget { Q_OBJECT + TQ_OBJECT public: - RatingFilter(QWidget* parent); + RatingFilter(TQWidget* tqparent); ~RatingFilter(); void setRatingFilterCondition(AlbumLister::RatingCondition cond); @@ -53,9 +54,9 @@ signals: protected: - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); private: diff --git a/digikam/digikam/ratingpopupmenu.cpp b/digikam/digikam/ratingpopupmenu.cpp index 057e237..4b6f745 100644 --- a/digikam/digikam/ratingpopupmenu.cpp +++ b/digikam/digikam/ratingpopupmenu.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qbitmap.h> +#include <tqstring.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqbitmap.h> // KDE includes. @@ -44,24 +44,24 @@ namespace Digikam { -RatingPopupMenu::RatingPopupMenu(QWidget* parent) - : QPopupMenu(parent) +RatingPopupMenu::RatingPopupMenu(TQWidget* tqparent) + : TQPopupMenu(tqparent) { KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; insertItem(i18n("None"), 0); - QBitmap starbm(ratingPixPath); - QBitmap clearbm(starbm.width(), starbm.height(), true); + TQBitmap starbm(ratingPixPath); + TQBitmap clearbm(starbm.width(), starbm.height(), true); for (int i = 1 ; i <= RatingMax ; i++) { - QPixmap pix(starbm.width() * 5, starbm.height()); + TQPixmap pix(starbm.width() * 5, starbm.height()); pix.fill(ThemeEngine::instance()->textSpecialRegColor()); - QBitmap mask(starbm.width() * 5, starbm.height()); - QPainter painter(&mask); + TQBitmap tqmask(starbm.width() * 5, starbm.height()); + TQPainter painter(&tqmask); painter.drawTiledPixmap(0, 0, i*starbm.width(), pix.height(), starbm); @@ -69,7 +69,7 @@ RatingPopupMenu::RatingPopupMenu(QWidget* parent) 5*starbm.width()-i*starbm.width(), pix.height(), clearbm); painter.end(); - pix.setMask(mask); + pix.setMask(tqmask); insertItem(pix, i); } } diff --git a/digikam/digikam/ratingpopupmenu.h b/digikam/digikam/ratingpopupmenu.h index 7d51fe4..0ed8a46 100644 --- a/digikam/digikam/ratingpopupmenu.h +++ b/digikam/digikam/ratingpopupmenu.h @@ -24,22 +24,23 @@ #ifndef RATING_POPUP_MENU_H #define RATING_POPUP_MENU_H -// Qt includes. +// TQt includes. -#include <qpopupmenu.h> +#include <tqpopupmenu.h> namespace Digikam { class RatingPopupMenuPriv; -class RatingPopupMenu : public QPopupMenu +class RatingPopupMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - RatingPopupMenu(QWidget* parent=0); + RatingPopupMenu(TQWidget* tqparent=0); ~RatingPopupMenu(); }; diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp index cf1b3e5..b3c8e64 100644 --- a/digikam/digikam/ratingwidget.cpp +++ b/digikam/digikam/ratingwidget.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> // KDE includes. @@ -54,15 +54,15 @@ public: int rating; - QString ratingPixPath; + TQString ratingPixPath; - QPixmap disPixmap; - QPixmap selPixmap; - QPixmap regPixmap; + TQPixmap disPixmap; + TQPixmap selPixmap; + TQPixmap regPixmap; }; -RatingWidget::RatingWidget(QWidget* parent) - : QWidget(parent) +RatingWidget::RatingWidget(TQWidget* tqparent) + : TQWidget(tqparent) { d = new RatingWidgetPriv; @@ -73,8 +73,8 @@ RatingWidget::RatingWidget(QWidget* parent) slotThemeChanged(); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); } RatingWidget::~RatingWidget() @@ -101,7 +101,7 @@ int RatingWidget::regPixmapWidth() const return d->regPixmap.width(); } -void RatingWidget::mouseMoveEvent(QMouseEvent* e) +void RatingWidget::mouseMoveEvent(TQMouseEvent* e) { int pos = e->x() / d->regPixmap.width() +1; @@ -117,7 +117,7 @@ void RatingWidget::mouseMoveEvent(QMouseEvent* e) } } -void RatingWidget::mousePressEvent(QMouseEvent* e) +void RatingWidget::mousePressEvent(TQMouseEvent* e) { int pos = e->x() / d->regPixmap.width() +1; @@ -135,9 +135,9 @@ void RatingWidget::mousePressEvent(QMouseEvent* e) update(); } -void RatingWidget::paintEvent(QPaintEvent*) +void RatingWidget::paintEvent(TQPaintEvent*) { - QPainter p(this); + TQPainter p(this); int x = 0; // Widget is disable : drawing grayed frame. @@ -169,26 +169,26 @@ void RatingWidget::paintEvent(QPaintEvent*) void RatingWidget::slotThemeChanged() { - d->regPixmap = QPixmap(d->ratingPixPath); + d->regPixmap = TQPixmap(d->ratingPixPath); d->selPixmap = d->regPixmap; d->disPixmap = d->regPixmap; - QPainter painter(&d->regPixmap); + TQPainter painter(&d->regPixmap); painter.fillRect(0, 0, d->regPixmap.width(), d->regPixmap.height(), - colorGroup().dark()); + tqcolorGroup().dark()); painter.end(); - QPainter painter2(&d->selPixmap); + TQPainter painter2(&d->selPixmap); painter2.fillRect(0, 0, d->selPixmap.width(), d->selPixmap.height(), ThemeEngine::instance()->textSpecialRegColor()); painter2.end(); - QPainter painter3(&d->disPixmap); + TQPainter painter3(&d->disPixmap); painter3.fillRect(0, 0, d->disPixmap.width(), d->disPixmap.height(), - palette().disabled().foreground()); + tqpalette().disabled().foreground()); painter3.end(); - setFixedSize(QSize(d->regPixmap.width()*5, d->regPixmap.height())); + setFixedSize(TQSize(d->regPixmap.width()*5, d->regPixmap.height())); update(); } diff --git a/digikam/digikam/ratingwidget.h b/digikam/digikam/ratingwidget.h index 5d5655c..81e24cb 100644 --- a/digikam/digikam/ratingwidget.h +++ b/digikam/digikam/ratingwidget.h @@ -25,22 +25,23 @@ #ifndef RATINGWIDGET_H #define RATINGWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class RatingWidgetPriv; -class RatingWidget : public QWidget +class RatingWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RatingWidget(QWidget* parent); + RatingWidget(TQWidget* tqparent); virtual ~RatingWidget(); void setRating(int val); @@ -54,9 +55,9 @@ protected: int regPixmapWidth() const; - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void paintEvent(QPaintEvent*); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseMoveEvent(TQMouseEvent*); + virtual void paintEvent(TQPaintEvent*); private slots: diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 91e98bb..05aa059 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -34,16 +34,16 @@ extern "C" #include <ctime> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qapplication.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qwhatsthis.h> -#include <qpixmap.h> +#include <tqapplication.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqwhatsthis.h> +#include <tqpixmap.h> // KDE includes. @@ -72,9 +72,9 @@ ScanLib::ScanLib(SplashScreen *splash) { m_splash = splash; m_progressBar = new DProgressDlg(0); - m_progressBar->setInitialSize(QSize(500, 100), true); + m_progressBar->setInitialSize(TQSize(500, 100), true); m_progressBar->setActionListVSBarVisible(false); - QWhatsThis::add( m_progressBar, i18n("This shows the progress of the " + TQWhatsThis::add( m_progressBar, i18n("This shows the progress of the " "scan. During the scan, all files on disk are registered in a " "database. This is required for sorting by exif-date, and also speeds up " "the overall performance of digiKam.") ); @@ -93,10 +93,10 @@ ScanLib::~ScanLib() void ScanLib::startScan() { struct timeval tv1, tv2; - QPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( + TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( "run", KIcon::NoGroup, 32); - QString message = i18n("Finding non-existent Albums"); + TQString message = i18n("Finding non-existent Albums"); if (m_splash) m_splash->message(message); else m_progressBar->addedAction(pix, message); gettimeofday(&tv1, 0); @@ -123,13 +123,13 @@ void ScanLib::startScan() deleteStaleEntries(); AlbumDB* db = AlbumManager::instance()->albumDB(); - db->setSetting("Scanned", QDateTime::currentDateTime().toString(Qt::ISODate)); + db->setSetting("Scanned", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); } void ScanLib::findFoldersWhichDoNotExist() { - QMap<QString, int> toBeDeleted; - QString basePath(AlbumManager::instance()->getLibraryPath()); + TQMap<TQString, int> toBeDeleted; + TQString basePath(AlbumManager::instance()->getLibraryPath()); AlbumDB* db = AlbumManager::instance()->albumDB(); AlbumInfo::List aList = db->scanAlbums(); @@ -137,8 +137,8 @@ void ScanLib::findFoldersWhichDoNotExist() for (AlbumInfo::List::iterator it = aList.begin(); it != aList.end(); ++it) { AlbumInfo info = *it; - info.url = QDir::cleanDirPath(info.url); - QFileInfo fi(basePath + info.url); + info.url = TQDir::cleanDirPath(info.url); + TQFileInfo fi(basePath + info.url); if (!fi.exists() || !fi.isDir()) { toBeDeleted[info.url] = info.id; @@ -175,7 +175,7 @@ void ScanLib::findFoldersWhichDoNotExist() if (rc != KMessageBox::Yes) exit(0); - QMapIterator<QString,int> it; + TQMapIterator<TQString,int> it; for (it = toBeDeleted.begin() ; it != toBeDeleted.end(); ++it) { DDebug() << "Removing Album: " << it.key() << endl; @@ -184,15 +184,15 @@ void ScanLib::findFoldersWhichDoNotExist() } } -void ScanLib::findMissingItems(const QString &path) +void ScanLib::findMissingItems(const TQString &path) { allFiles(path); } void ScanLib::findMissingItems() { - QString albumPath = AlbumManager::instance()->getLibraryPath(); - albumPath = QDir::cleanDirPath(albumPath); + TQString albumPath = AlbumManager::instance()->getLibraryPath(); + albumPath = TQDir::cleanDirPath(albumPath); m_progressBar->setAllowCancel( false ); m_progressBar->showCancelButton (false ); @@ -202,20 +202,20 @@ void ScanLib::findMissingItems() if (!m_splash) m_progressBar->show(); kapp->processEvents(); - QDir dir(albumPath); - QStringList fileList(dir.entryList(QDir::Dirs)); - QPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( + TQDir dir(albumPath); + TQStringList fileList(dir.entryList(TQDir::Dirs)); + TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( "folder_image", KIcon::NoGroup, 32); AlbumDB* db = AlbumManager::instance()->albumDB(); db->beginTransaction(); - for (QStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) + for (TQStringList::iterator it = fileList.begin(); it != fileList.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; - QString path = albumPath + '/' + (*it); + TQString path = albumPath + '/' + (*it); allFiles(path); m_progressBar->addedAction(pix, path); } @@ -228,7 +228,7 @@ void ScanLib::findMissingItems() void ScanLib::updateItemsWithoutDate() { AlbumDB* db = AlbumManager::instance()->albumDB(); - QStringList urls = db->getAllItemURLsWithoutDate(); + TQStringList urls = db->getAllItemURLsWithoutDate(); if (urls.isEmpty()) { @@ -246,13 +246,13 @@ void ScanLib::updateItemsWithoutDate() m_progressBar->show(); kapp->processEvents(); - QString basePath = AlbumManager::instance()->getLibraryPath(); - basePath = QDir::cleanDirPath(basePath); + TQString basePath = AlbumManager::instance()->getLibraryPath(); + basePath = TQDir::cleanDirPath(basePath); db->beginTransaction(); int counter=0; - for (QStringList::iterator it = urls.begin(); it != urls.end(); ++it) + for (TQStringList::iterator it = urls.begin(); it != urls.end(); ++it) { m_progressBar->progressBar()->advance(1); ++counter; @@ -261,9 +261,9 @@ void ScanLib::updateItemsWithoutDate() kapp->processEvents(); } - QFileInfo fi(*it); - QString albumURL = fi.dirPath(); - albumURL = QDir::cleanDirPath(albumURL.remove(basePath)); + TQFileInfo fi(*it); + TQString albumURL = fi.dirPath(); + albumURL = TQDir::cleanDirPath(albumURL.remove(basePath)); int albumID = db->getOrCreateAlbumId(albumURL); @@ -278,9 +278,9 @@ void ScanLib::updateItemsWithoutDate() } else { - QPair<QString, int> fileID = qMakePair(fi.fileName(),albumID); + TQPair<TQString, int> fileID = tqMakePair(fi.fileName(),albumID); - if (m_filesToBeDeleted.findIndex(fileID) == -1) + if (m_filesToBeDeleted.tqfindIndex(fileID) == -1) { m_filesToBeDeleted.append(fileID); } @@ -293,17 +293,17 @@ void ScanLib::updateItemsWithoutDate() kapp->processEvents(); } -int ScanLib::countItemsInFolder(const QString& directory) +int ScanLib::countItemsInFolder(const TQString& directory) { int items = 0; - QDir dir( directory ); + TQDir dir( directory ); if ( !dir.exists() or !dir.isReadable() ) return 0; - const QFileInfoList *list = dir.entryInfoList(); - QFileInfoListIterator it( *list ); - QFileInfo *fi; + const TQFileInfoList *list = dir.entryInfoList(); + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; items += list->count(); @@ -322,9 +322,9 @@ int ScanLib::countItemsInFolder(const QString& directory) return items; } -void ScanLib::allFiles(const QString& directory) +void ScanLib::allFiles(const TQString& directory) { - QDir dir( directory ); + TQDir dir( directory ); if ( !dir.exists() or !dir.isReadable() ) { DWarning() << "Folder does not exist or is not readable: " @@ -332,11 +332,11 @@ void ScanLib::allFiles(const QString& directory) return; } - QString basePath = AlbumManager::instance()->getLibraryPath(); - basePath = QDir::cleanDirPath(basePath); + TQString basePath = AlbumManager::instance()->getLibraryPath(); + basePath = TQDir::cleanDirPath(basePath); - QString albumURL = directory; - albumURL = QDir::cleanDirPath(albumURL.remove(basePath)); + TQString albumURL = directory; + albumURL = TQDir::cleanDirPath(albumURL.remove(basePath)); AlbumDB* db = AlbumManager::instance()->albumDB(); @@ -347,21 +347,21 @@ void ScanLib::allFiles(const QString& directory) DWarning() << "Album ID == -1: " << albumURL << endl; } - QStringList filesInAlbum = db->getItemNamesInAlbum( albumID ); - QMap<QString, bool> filesFoundInDB; + TQStringList filesInAlbum = db->getItemNamesInAlbum( albumID ); + TQMap<TQString, bool> filesFoundInDB; - for (QStringList::iterator it = filesInAlbum.begin(); + for (TQStringList::iterator it = filesInAlbum.begin(); it != filesInAlbum.end(); ++it) { filesFoundInDB.insert(*it, true); } - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return; - QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; m_progressBar->progressBar()->advance(list->count()); kapp->processEvents(); @@ -370,7 +370,7 @@ void ScanLib::allFiles(const QString& directory) { if ( fi->isFile()) { - if (filesFoundInDB.contains(fi->fileName()) ) + if (filesFoundInDB.tqcontains(fi->fileName()) ) { filesFoundInDB.erase(fi->fileName()); } @@ -390,31 +390,31 @@ void ScanLib::allFiles(const QString& directory) // Removing items from the db which we did not see on disk. if (!filesFoundInDB.isEmpty()) { - QMapIterator<QString,bool> it; + TQMapIterator<TQString,bool> it; for (it = filesFoundInDB.begin(); it != filesFoundInDB.end(); ++it) { - if (m_filesToBeDeleted.findIndex(qMakePair(it.key(),albumID)) == -1) + if (m_filesToBeDeleted.tqfindIndex(tqMakePair(it.key(),albumID)) == -1) { - m_filesToBeDeleted.append(qMakePair(it.key(),albumID)); + m_filesToBeDeleted.append(tqMakePair(it.key(),albumID)); } } } } -void ScanLib::storeItemInDatabase(const QString& albumURL, - const QString& filename, +void ScanLib::storeItemInDatabase(const TQString& albumURL, + const TQString& filename, int albumID) { // Do not store items found in the root of the albumdb if (albumURL.isEmpty()) return; - QString comment; - QStringList keywords; - QDateTime datetime; + TQString comment; + TQStringList keywords; + TQDateTime datetime; int rating; - QString filePath( AlbumManager::instance()->getLibraryPath()); + TQString filePath( AlbumManager::instance()->getLibraryPath()); filePath += albumURL + '/' + filename; DMetadata metadata(filePath); @@ -438,7 +438,7 @@ void ScanLib::storeItemInDatabase(const QString& albumURL, if ( !datetime.isValid() ) { - QFileInfo info( filePath ); + TQFileInfo info( filePath ); datetime = info.lastModified(); } @@ -450,13 +450,13 @@ void ScanLib::storeItemInDatabase(const QString& albumURL, dbstore->addItem(albumID, filename, datetime, comment, rating, keywords); } -void ScanLib::updateItemDate(const QString& albumURL, - const QString& filename, +void ScanLib::updateItemDate(const TQString& albumURL, + const TQString& filename, int albumID) { - QDateTime datetime; + TQDateTime datetime; - QString filePath( AlbumManager::instance()->getLibraryPath()); + TQString filePath( AlbumManager::instance()->getLibraryPath()); filePath += albumURL + '/' + filename; DMetadata metadata(filePath); @@ -469,7 +469,7 @@ void ScanLib::updateItemDate(const QString& albumURL, if ( !datetime.isValid() ) { - QFileInfo info( filePath ); + TQFileInfo info( filePath ); datetime = info.lastModified(); } @@ -479,13 +479,13 @@ void ScanLib::updateItemDate(const QString& albumURL, void ScanLib::deleteStaleEntries() { - QStringList listToBeDeleted; - QValueList< QPair<QString,int> >::iterator it; + TQStringList listToBeDeleted; + TQValueList< TQPair<TQString,int> >::iterator it; for (it = m_filesToBeDeleted.begin() ; it != m_filesToBeDeleted.end(); ++it) { AlbumDB* dbstore = AlbumManager::instance()->albumDB(); - QString location = " (" + dbstore->getAlbumURL((*it).second) + ')'; + TQString location = " (" + dbstore->getAlbumURL((*it).second) + ')'; listToBeDeleted.append((*it).first + location); } @@ -529,7 +529,7 @@ void ScanLib::deleteStaleEntries() } } -void ScanLib::timing(const QString& text, struct timeval tv1, struct timeval tv2) +void ScanLib::timing(const TQString& text, struct timeval tv1, struct timeval tv2) { DDebug() << "ScanLib: " << text + ": " diff --git a/digikam/digikam/scanlib.h b/digikam/digikam/scanlib.h index 8759238..5e58b29 100644 --- a/digikam/digikam/scanlib.h +++ b/digikam/digikam/scanlib.h @@ -25,10 +25,10 @@ #ifndef SCANLIB_H #define SCANLIB_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> // KDE includes. @@ -92,7 +92,7 @@ public: * This calls allFiles with a given path. * @param path the path to scan. */ - void findMissingItems(const QString &path); + void findMissingItems(const TQString &path); /** * This queries the db for items that have no date @@ -107,7 +107,7 @@ private: * @param directory The path to the start searching from * @return The amount of items */ - int countItemsInFolder(const QString& directory); + int countItemsInFolder(const TQString& directory); /** * This checks all existing files recursively, starting from @@ -115,7 +115,7 @@ private: * which are not in the database. * @param directory The path to the start searching from */ - void allFiles(const QString& directory); + void allFiles(const TQString& directory); /** * This fetches the exif-date or the modification date when @@ -127,8 +127,8 @@ private: * @param filename The filename of the item to store * @param albumID The albumID as used in the database */ - void storeItemInDatabase(const QString& albumURL, - const QString& filename, + void storeItemInDatabase(const TQString& albumURL, + const TQString& filename, int albumID); /** @@ -140,8 +140,8 @@ private: * @param filename The filename of the item to store * @param albumID The albumID as used in the database */ - void updateItemDate(const QString& albumURL, - const QString& filename, + void updateItemDate(const TQString& albumURL, + const TQString& filename, int albumID); /** @@ -159,12 +159,12 @@ private: /** * Member to store stale filesystem */ - QValueList< QPair<QString,int> > m_filesToBeDeleted; + TQValueList< TQPair<TQString,int> > m_filesToBeDeleted; /** * This is used to print out some timings. */ - void timing(const QString& text, struct timeval tv1, struct timeval tv2); + void timing(const TQString& text, struct timeval tv1, struct timeval tv2); }; } // namespace Digikam diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index 68155d6..38709a7 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -25,17 +25,17 @@ /** @file searchadvanceddialog.cpp */ -// Qt includes. - -#include <qvbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> // KDE includes. @@ -72,33 +72,33 @@ public: rulesBox = 0; } - QVGroupBox *rulesBox; + TQVGroupBox *rulesBox; - QPushButton *addButton; - QPushButton *delButton; - QPushButton *groupButton; - QPushButton *ungroupButton; + TQPushButton *addButton; + TQPushButton *delButton; + TQPushButton *groupButton; + TQPushButton *ungroupButton; - QComboBox *optionsCombo; + TQComboBox *optionsCombo; - QValueList<SearchAdvancedBase*> baseList; + TQValueList<SearchAdvancedBase*> baseList; - QTimer *timer; + TQTimer *timer; KLineEdit *title; SearchResultsView *resultsView; }; -SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) - : KDialogBase(parent, 0, true, i18n("Advanced Search"), +SearchAdvancedDialog::SearchAdvancedDialog(TQWidget* tqparent, KURL& url) + : KDialogBase(tqparent, 0, true, i18n("Advanced Search"), Help|Ok|Cancel, Ok, true), m_url(url) { d = new SearchAdvancedDialogPriv; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); setHelp("advancedsearchtool.anchor", "digikam"); - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); resize(configDialogSize("AdvancedSearch Dialog")); @@ -106,11 +106,11 @@ SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) // ---------------------------------------------------------------- // two columns, one for the rules, one for the preview. - QHBoxLayout* hbox = new QHBoxLayout( page ); - QVBoxLayout* leftSide = new QVBoxLayout(); + TQHBoxLayout* hbox = new TQHBoxLayout( page ); + TQVBoxLayout* leftSide = new TQVBoxLayout(); d->resultsView = new SearchResultsView(page); - d->resultsView->setMinimumSize(QSize(200, 200)); - QWhatsThis::add(d->resultsView, i18n("<p>Here you can review the images found " + d->resultsView->setMinimumSize(TQSize(200, 200)); + TQWhatsThis::add(d->resultsView, i18n("<p>Here you can review the images found " "using the current search settings.")); hbox->addLayout(leftSide, 10); hbox->setSpacing(spacingHint()); @@ -119,35 +119,35 @@ SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) // ---------------------------------------------------------------- // Box for all the rules - d->rulesBox = new QVGroupBox(i18n("Search Rules"), page); - QWhatsThis::add(d->rulesBox, i18n("<p>Here you can review the search rules used to filter image-" + 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->layout()->setSpacing( spacingHint() ); - d->rulesBox->layout()->setMargin( spacingHint() ); - d->rulesBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); - d->rulesBox->layout()->setAlignment( Qt::AlignTop ); + d->rulesBox->tqlayout()->setSpacing( spacingHint() ); + d->rulesBox->tqlayout()->setMargin( spacingHint() ); + d->rulesBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + d->rulesBox->tqlayout()->tqsetAlignment( TQt::AlignTop ); // ---------------------------------------------------------------- // Box for the add/delete - QGroupBox *groupbox1 = new QGroupBox( i18n("Add/Delete Option"), page, "groupbox1" ); - QWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules " + TQGroupBox *groupbox1 = new TQGroupBox( i18n("Add/Delete Option"), page, "groupbox1" ); + TQWhatsThis::add(groupbox1, i18n("<p>You can edit the search rules " "by adding/removing criteria.")); groupbox1->setColumnLayout(0, Qt::Vertical ); - groupbox1->layout()->setSpacing( KDialog::spacingHint() ); - groupbox1->layout()->setMargin( KDialog::marginHint() ); - d->optionsCombo = new QComboBox(groupbox1); + groupbox1->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupbox1->tqlayout()->setMargin( KDialog::marginHint() ); + d->optionsCombo = new TQComboBox(groupbox1); d->optionsCombo->insertItem(i18n("As well as"), 0); d->optionsCombo->insertItem(i18n("Or"), 1); d->optionsCombo->setEnabled(false); - d->addButton = new QPushButton(i18n("&Add"), groupbox1); - d->delButton = new QPushButton(i18n("&Del"), groupbox1); + d->addButton = new TQPushButton(i18n("&Add"), groupbox1); + d->delButton = new TQPushButton(i18n("&Del"), groupbox1); d->addButton->setIconSet(SmallIcon("add")); d->delButton->setIconSet(SmallIcon("remove")); - QHBoxLayout* box1 = new QHBoxLayout(groupbox1->layout()); + TQHBoxLayout* box1 = new TQHBoxLayout(groupbox1->tqlayout()); box1->addWidget(d->optionsCombo); box1->addWidget(d->addButton); box1->addStretch(10); @@ -156,16 +156,16 @@ SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) // ---------------------------------------------------------------- // Box for the group/ungroup - QGroupBox *groupbox2 = new QGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" ); - QWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " + TQGroupBox *groupbox2 = new TQGroupBox( i18n("Group/Ungroup Options"), page, "groupbox2" ); + TQWhatsThis::add(groupbox1, i18n("<p>You can group or ungroup any search criteria " "from the Search Rule set.")); groupbox2->setColumnLayout(0, Qt::Vertical); - groupbox2->layout()->setSpacing( KDialog::spacingHint() ); - groupbox2->layout()->setMargin( KDialog::marginHint() ); - d->groupButton = new QPushButton(i18n("&Group"), groupbox2); - d->ungroupButton = new QPushButton(i18n("&Ungroup"), groupbox2); + groupbox2->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupbox2->tqlayout()->setMargin( KDialog::marginHint() ); + d->groupButton = new TQPushButton(i18n("&Group"), groupbox2); + d->ungroupButton = new TQPushButton(i18n("&Ungroup"), groupbox2); - QHBoxLayout* box2 = new QHBoxLayout(groupbox2->layout()); + TQHBoxLayout* box2 = new TQHBoxLayout(groupbox2->tqlayout()); box2->addWidget(d->groupButton); box2->addStretch(10); box2->addWidget(d->ungroupButton); @@ -173,16 +173,16 @@ SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) // ---------------------------------------------------------------- // box for saving the search. - QGroupBox *groupbox3 = new QGroupBox( page, "groupbox3"); + TQGroupBox *groupbox3 = new TQGroupBox( page, "groupbox3"); groupbox3->setColumnLayout(0, Qt::Vertical ); - groupbox3->layout()->setSpacing( KDialog::spacingHint() ); - groupbox3->setFrameStyle( QFrame::NoFrame ); - QLabel* label = new QLabel(i18n("&Save search as: "), groupbox3); + groupbox3->tqlayout()->setSpacing( KDialog::spacingHint() ); + groupbox3->setFrameStyle( TQFrame::NoFrame ); + TQLabel* label = new TQLabel(i18n("&Save search as: "), groupbox3); d->title = new KLineEdit(groupbox3, "searchTitle"); - QWhatsThis::add(d->title, i18n("<p>Enter the name used to save the current search in " + TQWhatsThis::add(d->title, i18n("<p>Enter the name used to save the current search in " "\"My Searches\" view")); - QHBoxLayout* box3 = new QHBoxLayout(groupbox3->layout()); + TQHBoxLayout* box3 = new TQHBoxLayout(groupbox3->tqlayout()); box3->addWidget(label); box3->addWidget(d->title); label->setBuddy(d->title); @@ -213,23 +213,23 @@ SearchAdvancedDialog::SearchAdvancedDialog(QWidget* parent, KURL& url) // ---------------------------------------------------------------- - connect(d->addButton, SIGNAL(clicked()), - this, SLOT(slotAddRule())); + connect(d->addButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddRule())); - connect(d->delButton, SIGNAL(clicked()), - this, SLOT(slotDelRules())); + connect(d->delButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDelRules())); - connect(d->groupButton, SIGNAL(clicked()), - this, SLOT(slotGroupRules())); + connect(d->groupButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotGroupRules())); - connect(d->ungroupButton, SIGNAL(clicked()), - this, SLOT(slotUnGroupRules())); + connect(d->ungroupButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotUnGroupRules())); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeOut())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeOut())); - connect(d->title, SIGNAL(textChanged(const QString&)), - this, SLOT(slotChangeButtonStates())); + connect(d->title, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotChangeButtonStates())); } SearchAdvancedDialog::~SearchAdvancedDialog() @@ -253,11 +253,11 @@ void SearchAdvancedDialog::slotAddRule() SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); d->baseList.append(rule); - connect( rule, SIGNAL( signalBaseItemToggled() ), - this, SLOT( slotChangeButtonStates() ) ); + connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), + this, TQT_SLOT( slotChangeButtonStates() ) ); - connect( rule, SIGNAL( signalPropertyChanged() ), - this, SLOT(slotPropertyChanged())); + connect( rule, TQT_SIGNAL( signalPropertyChanged() ), + this, TQT_SLOT(slotPropertyChanged())); slotChangeButtonStates(); slotPropertyChanged(); @@ -268,7 +268,7 @@ void SearchAdvancedDialog::slotDelRules() if (d->baseList.isEmpty()) return; - typedef QValueList<SearchAdvancedBase*> BaseList; + typedef TQValueList<SearchAdvancedBase*> BaseList; BaseList itemsToRemove; @@ -306,7 +306,7 @@ void SearchAdvancedDialog::slotDelRules() void SearchAdvancedDialog::slotGroupRules() { - typedef QValueList<SearchAdvancedBase*> BaseList; + typedef TQValueList<SearchAdvancedBase*> BaseList; BaseList itemsToGroup; BaseList groupsToUnGroupAndGroup; @@ -328,10 +328,10 @@ void SearchAdvancedDialog::slotGroupRules() it != groupsToUnGroupAndGroup.end(); ++it) { SearchAdvancedGroup* group = (SearchAdvancedGroup*)*it; - BaseList::iterator itemsToGroupPos = itemsToGroup.find(group); - BaseList::iterator itPos = d->baseList.find(group); - QValueList<SearchAdvancedRule*> childRules = group->childRules(); - for (QValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); + BaseList::iterator itemsToGroupPos = itemsToGroup.tqfind(group); + BaseList::iterator itPos = d->baseList.tqfind(group); + TQValueList<SearchAdvancedRule*> childRules = group->childRules(); + for (TQValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); iter != childRules.end(); ++iter) { d->baseList.insert(itPos, *iter); @@ -351,7 +351,7 @@ void SearchAdvancedDialog::slotGroupRules() SearchAdvancedRule* rule = (SearchAdvancedRule*)(*it); SearchAdvancedGroup* group = new SearchAdvancedGroup(d->rulesBox); - BaseList::iterator itPos = d->baseList.find(rule); + BaseList::iterator itPos = d->baseList.tqfind(rule); d->baseList.insert(itPos, group); for (BaseList::iterator it = itemsToGroup.begin(); @@ -369,12 +369,12 @@ void SearchAdvancedDialog::slotGroupRules() for (BaseList::iterator it = d->baseList.begin(); it != d->baseList.end(); ++it) { - d->rulesBox->layout()->remove((*it)->widget()); - d->rulesBox->layout()->add((*it)->widget()); + d->rulesBox->tqlayout()->remove((*it)->widget()); + d->rulesBox->tqlayout()->add((*it)->widget()); } - connect( group, SIGNAL( signalBaseItemToggled() ), - this, SLOT( slotChangeButtonStates() ) ); + connect( group, TQT_SIGNAL( signalBaseItemToggled() ), + this, TQT_SLOT( slotChangeButtonStates() ) ); slotChangeButtonStates(); slotPropertyChanged(); @@ -382,8 +382,8 @@ void SearchAdvancedDialog::slotGroupRules() void SearchAdvancedDialog::slotUnGroupRules() { - typedef QValueList<SearchAdvancedBase*> BaseList; - typedef QValueList<SearchAdvancedGroup*> GroupList; + typedef TQValueList<SearchAdvancedBase*> BaseList; + typedef TQValueList<SearchAdvancedGroup*> GroupList; GroupList itemsToUnGroup; @@ -405,11 +405,11 @@ void SearchAdvancedDialog::slotUnGroupRules() it != itemsToUnGroup.end(); ++it) { SearchAdvancedGroup *group = *it; - QValueList<SearchAdvancedRule*> childRules = group->childRules(); + TQValueList<SearchAdvancedRule*> childRules = group->childRules(); - BaseList::iterator itPos = d->baseList.find(group); + BaseList::iterator itPos = d->baseList.tqfind(group); - for (QValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); + for (TQValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); iter != childRules.end(); ++iter) { d->baseList.insert(itPos, *iter); @@ -423,8 +423,8 @@ void SearchAdvancedDialog::slotUnGroupRules() for (BaseList::iterator it = d->baseList.begin(); it != d->baseList.end(); ++it) { - d->rulesBox->layout()->remove((*it)->widget()); - d->rulesBox->layout()->add((*it)->widget()); + d->rulesBox->tqlayout()->remove((*it)->widget()); + d->rulesBox->tqlayout()->add((*it)->widget()); } slotChangeButtonStates(); @@ -452,9 +452,9 @@ void SearchAdvancedDialog::slotTimeOut() if (d->baseList.isEmpty()) return; - typedef QValueList<SearchAdvancedBase*> BaseList; + typedef TQValueList<SearchAdvancedBase*> BaseList; - QString grouping; + TQString grouping; int count = 0; bool emptyVal = false; @@ -468,17 +468,17 @@ void SearchAdvancedDialog::slotTimeOut() if (base->type() == SearchAdvancedBase::RULE) { SearchAdvancedRule* rule = (SearchAdvancedRule*)base; - QString val = rule->urlValue(); + TQString val = rule->urlValue(); if ( !val.isEmpty() ) { if (rule->option() != SearchAdvancedBase::NONE && !count == 0 ) grouping += (rule->option() == SearchAdvancedBase::AND) ? " AND " : " OR "; - grouping += QString::number(++count); - url.addQueryItem( QString::number(count) + ".key", rule->urlKey()); - url.addQueryItem( QString::number(count) + ".op", rule->urlOperator()); - url.addQueryItem( QString::number(count) + ".val", val); + grouping += TQString::number(++count); + url.addQueryItem( TQString::number(count) + ".key", rule->urlKey()); + url.addQueryItem( TQString::number(count) + ".op", rule->urlOperator()); + url.addQueryItem( TQString::number(count) + ".val", val); } else emptyVal = true; @@ -487,26 +487,26 @@ void SearchAdvancedDialog::slotTimeOut() { SearchAdvancedGroup* group = (SearchAdvancedGroup*)base; - QString tempGrouping; + TQString tempGrouping; int curCount = count; - QValueList<SearchAdvancedRule*> childRules = group->childRules(); - for (QValueList<SearchAdvancedRule*>::iterator iter = + TQValueList<SearchAdvancedRule*> childRules = group->childRules(); + for (TQValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); iter != childRules.end(); ++iter) { SearchAdvancedRule* rule = (SearchAdvancedRule*)(*iter); - QString val = rule->urlValue(); + TQString val = rule->urlValue(); if ( !val.isEmpty() ) { if (rule->option() != SearchAdvancedBase::NONE && !count == 0 ) tempGrouping += (rule->option() == SearchAdvancedBase::AND) ? " AND " : " OR "; - tempGrouping += QString::number(++count); - url.addQueryItem( QString::number(count) + ".key", rule->urlKey()); - url.addQueryItem( QString::number(count) + ".op", rule->urlOperator()); - url.addQueryItem( QString::number(count) + ".val", val); + tempGrouping += TQString::number(++count); + url.addQueryItem( TQString::number(count) + ".key", rule->urlKey()); + url.addQueryItem( TQString::number(count) + ".op", rule->urlOperator()); + url.addQueryItem( TQString::number(count) + ".val", val); } else emptyVal = true; @@ -525,7 +525,7 @@ void SearchAdvancedDialog::slotTimeOut() url.setPath(grouping); url.addQueryItem("name", d->title->text()); - url.addQueryItem("count", QString::number(count)); + url.addQueryItem("count", TQString::number(count)); m_url = url; if (!count == 0) d->resultsView->openURL( url ); @@ -545,7 +545,7 @@ void SearchAdvancedDialog::slotChangeButtonStates() bool group = false; int counter = 0; - typedef QValueList<SearchAdvancedBase*> BaseList; + typedef TQValueList<SearchAdvancedBase*> BaseList; for (BaseList::iterator it = d->baseList.begin(); it != d->baseList.end(); ++it) { @@ -586,15 +586,15 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) if (count <= 0) return; - QMap<int, KURL> rulesMap; + TQMap<int, KURL> rulesMap; for (int i=1; i<=count; i++) { KURL newRule; - QString key = url.queryItem(QString::number(i) + ".key"); - QString op = url.queryItem(QString::number(i) + ".op"); - QString val = url.queryItem(QString::number(i) + ".val"); + TQString key = url.queryItem(TQString::number(i) + ".key"); + TQString op = url.queryItem(TQString::number(i) + ".op"); + TQString val = url.queryItem(TQString::number(i) + ".val"); newRule.setPath("1"); newRule.addQueryItem("1.key",key); @@ -604,13 +604,13 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) rulesMap.insert(i, newRule); } - QStringList strList = QStringList::split(" ", url.path()); + TQStringList strList = TQStringList::split(" ", url.path()); SearchAdvancedGroup* group = 0; bool groupingActive = false; SearchAdvancedBase::Option type = SearchAdvancedBase::NONE; - for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) + for ( TQStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { bool ok; int num = (*it).toInt(&ok); @@ -619,11 +619,11 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) SearchAdvancedRule* rule = new SearchAdvancedRule( d->rulesBox, type ); rule->setValues( rulesMap[num] ); - connect( rule, SIGNAL( signalBaseItemToggled() ), - this, SLOT( slotChangeButtonStates() ) ); + connect( rule, TQT_SIGNAL( signalBaseItemToggled() ), + this, TQT_SLOT( slotChangeButtonStates() ) ); - connect( rule, SIGNAL( signalPropertyChanged() ), - this, SLOT(slotPropertyChanged())); + connect( rule, TQT_SIGNAL( signalPropertyChanged() ), + this, TQT_SLOT(slotPropertyChanged())); if (groupingActive) group->addRule(rule); @@ -643,8 +643,8 @@ void SearchAdvancedDialog::fillWidgets( const KURL& url ) group = new SearchAdvancedGroup(d->rulesBox); d->baseList.append(group); - connect( group, SIGNAL( signalBaseItemToggled() ), - this, SLOT( slotChangeButtonStates() ) ); + connect( group, TQT_SIGNAL( signalBaseItemToggled() ), + this, TQT_SLOT( slotChangeButtonStates() ) ); groupingActive = true; } diff --git a/digikam/digikam/searchadvanceddialog.h b/digikam/digikam/searchadvanceddialog.h index 21dcad8..9a3a29a 100644 --- a/digikam/digikam/searchadvanceddialog.h +++ b/digikam/digikam/searchadvanceddialog.h @@ -51,15 +51,16 @@ class SearchAdvancedDialogPriv; class SearchAdvancedDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent window + * @param tqparent tqparent window * @param url holds the url for the search */ - SearchAdvancedDialog(QWidget* parent, KURL& url); + SearchAdvancedDialog(TQWidget* tqparent, KURL& url); /** * Destructor diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index b276f75..9d49915 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -23,12 +23,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfont.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qcursor.h> +#include <tqfont.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqcursor.h> // KDE includes. @@ -64,11 +64,11 @@ class SearchFolderItem : public FolderItem public: - SearchFolderItem(QListView* parent, SAlbum* album) - : FolderItem(parent, album->title()), + SearchFolderItem(TQListView* tqparent, SAlbum* album) + : FolderItem(tqparent, album->title()), m_album(album) { - m_album->setExtraData(parent, this); + m_album->setExtraData(tqparent, this); } ~SearchFolderItem() @@ -76,7 +76,7 @@ public: m_album->removeExtraData(listView()); } - int compare(QListViewItem* i, int , bool ) const + int compare(TQListViewItem* i, int , bool ) const { if (!i) return 0; @@ -102,32 +102,32 @@ private: SAlbum *m_album; }; -SearchFolderView::SearchFolderView(QWidget* parent) - : FolderView(parent, "SearchFolderView") +SearchFolderView::SearchFolderView(TQWidget* tqparent) + : FolderView(tqparent, "SearchFolderView") { addColumn(i18n("My Searches")); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); m_lastAddedItem = 0; - connect(AlbumManager::instance(), SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumsCleared()), - this, SLOT(clear())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(clear())); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - this, SLOT(slotDoubleClicked(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(this, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); } SearchFolderView::~SearchFolderView() @@ -135,9 +135,9 @@ SearchFolderView::~SearchFolderView() saveViewState(); } -void SearchFolderView::slotTextSearchFilterChanged(const QString& filter) +void SearchFolderView::slotTextSearchFilterChanged(const TQString& filter) { - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -150,10 +150,10 @@ void SearchFolderView::slotTextSearchFilterChanged(const QString& filter) // Check if a special url query exist to identify a SAlbum dedicaced to Date Search // used with TimeLine. KURL url = salbum->kurl(); - QString type = url.queryItem("type"); + TQString type = url.queryItem("type"); - if (salbum->title().lower().contains(search) && - type != QString("datesearch")) + if (salbum->title().lower().tqcontains(search) && + type != TQString("datesearch")) { atleastOneMatch = true; @@ -228,21 +228,21 @@ void SearchFolderView::extendedSearchNew() bool SearchFolderView::checkName( KURL& url ) { - QString albumTitle = url.queryItem("name"); + TQString albumTitle = url.queryItem("name"); AlbumManager* aManager = AlbumManager::instance(); AlbumList aList = aManager->allSAlbums(); bool checked = checkAlbum( albumTitle ); while ( !checked) { - QString label = i18n( "Search name already exists." + TQString label = i18n( "Search name already exists." "\nPlease enter a new name:" ); bool ok; #if KDE_IS_VERSION(3,2,0) - QString newTitle = KInputDialog::getText( i18n("Name exists"), label, + TQString newTitle = KInputDialog::getText( i18n("Name exists"), label, albumTitle, &ok, this ); #else - QString newTitle = KLineEditDlg::getText( i18n("Name exists"), label, + TQString newTitle = KLineEditDlg::getText( i18n("Name exists"), label, albumTitle, ok, this ); #endif if (!ok) @@ -257,7 +257,7 @@ bool SearchFolderView::checkName( KURL& url ) return true; } -bool SearchFolderView::checkAlbum( const QString& name ) const +bool SearchFolderView::checkAlbum( const TQString& name ) const { AlbumManager* aManager = AlbumManager::instance(); @@ -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\"?") - .arg(album->title()), + .tqarg(album->title()), i18n("Delete Search?"), i18n("Delete"), KStdGuiItem::cancel()); @@ -341,11 +341,11 @@ void SearchFolderView::slotAlbumAdded(Album* a) // Check if a special url query exist to identify a SAlbum dedicaced to Date Search // used with TimeLine. In this case, SAlbum is not displayed here, but in TimeLineFolderView. KURL url = album->kurl(); - QString type = url.queryItem("type"); - if (type == QString("datesearch")) return; + TQString type = url.queryItem("type"); + if (type == TQString("datesearch")) return; SearchFolderItem* item = new SearchFolderItem(this, album); - item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize())); + item->setPixmap(0, SmallIcon("tqfind", AlbumSettings::instance()->getDefaultTreeIconSize())); m_lastAddedItem = item; } @@ -366,9 +366,9 @@ void SearchFolderView::slotSelectionChanged() if (!active()) return; - QListViewItem* selItem = 0; + TQListViewItem* selItem = 0; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while (it.current()) { if (it.current()->isSelected()) @@ -393,16 +393,16 @@ void SearchFolderView::slotSelectionChanged() AlbumManager::instance()->setCurrentAlbum(searchItem->album()); } -void SearchFolderView::slotContextMenu(QListViewItem* item, const QPoint&, int) +void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int) { if (!item) { KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches")); - popmenu.insertItem(SmallIcon("filefind"), i18n("New Simple Search..."), 10); - popmenu.insertItem(SmallIcon("find"), i18n("New Advanced Search..."), 11); + popmenu.insertItem(SmallIcon("filetqfind"), i18n("New Simple Search..."), 10); + popmenu.insertItem(SmallIcon("tqfind"), i18n("New Advanced Search..."), 11); - switch (popmenu.exec(QCursor::pos())) + switch (popmenu.exec(TQCursor::pos())) { case 10: { @@ -424,15 +424,15 @@ void SearchFolderView::slotContextMenu(QListViewItem* item, const QPoint&, int) KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches")); - popmenu.insertItem(SmallIcon("filefind"), i18n("Edit Search..."), 10); + popmenu.insertItem(SmallIcon("filetqfind"), i18n("Edit Search..."), 10); if ( sItem->album()->isSimple() ) - popmenu.insertItem(SmallIcon("find"), i18n("Edit as Advanced Search..."), 11); + popmenu.insertItem(SmallIcon("tqfind"), i18n("Edit as Advanced Search..."), 11); popmenu.insertSeparator(-1); popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete Search"), 12); - switch (popmenu.exec(QCursor::pos())) + switch (popmenu.exec(TQCursor::pos())) { case 10: { @@ -458,7 +458,7 @@ void SearchFolderView::slotContextMenu(QListViewItem* item, const QPoint&, int) } } -void SearchFolderView::slotDoubleClicked(QListViewItem* item, const QPoint&, int) +void SearchFolderView::slotDoubleClicked(TQListViewItem* item, const TQPoint&, int) { if (!item) return; diff --git a/digikam/digikam/searchfolderview.h b/digikam/digikam/searchfolderview.h index 41e9152..91f095c 100644 --- a/digikam/digikam/searchfolderview.h +++ b/digikam/digikam/searchfolderview.h @@ -38,10 +38,11 @@ class SearchFolderItem; class SearchFolderView : public FolderView { Q_OBJECT + TQ_OBJECT public: - SearchFolderView(QWidget* parent); + SearchFolderView(TQWidget* tqparent); ~SearchFolderView(); void quickSearchNew(); @@ -58,15 +59,15 @@ signals: public slots: - void slotTextSearchFilterChanged(const QString&); + void slotTextSearchFilterChanged(const TQString&); private slots: void slotAlbumAdded(Album* album); void slotAlbumDeleted(Album* album); void slotSelectionChanged(); - void slotContextMenu(QListViewItem*, const QPoint&, int); - void slotDoubleClicked(QListViewItem*, const QPoint&, int); + void slotContextMenu(TQListViewItem*, const TQPoint&, int); + void slotDoubleClicked(TQListViewItem*, const TQPoint&, int); protected: @@ -75,7 +76,7 @@ protected: private: bool checkName( KURL& url ); - bool checkAlbum( const QString& name ) const; + bool checkAlbum( const TQString& name ) const; private: diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index 02b1703..ca37cc5 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -24,14 +24,14 @@ /** @file searchquickdialog.cpp */ -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qlayout.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qlabel.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> // KDE includes. @@ -62,7 +62,7 @@ public: resultsView = 0; } - QTimer *timer; + TQTimer *timer; KLineEdit *nameEdit; @@ -71,29 +71,29 @@ public: SearchResultsView *resultsView; }; -SearchQuickDialog::SearchQuickDialog(QWidget* parent, KURL& url) +SearchQuickDialog::SearchQuickDialog(TQWidget* tqparent, KURL& url) : KDialogBase(Plain, i18n("Quick Search"), Help|Ok|Cancel, Ok, - parent, 0, true, true), m_url(url) + tqparent, 0, true, true), m_url(url) { d = new SearchQuickDialogPriv; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); setHelp("quicksearchtool.anchor", "digikam"); - QGridLayout* grid = new QGridLayout(plainPage(), 2, 2, 0, spacingHint()); + TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 2, 0, spacingHint()); - QLabel *label1 = new QLabel("<b>" + i18n("Search:") + "</b>", plainPage()); + TQLabel *label1 = new TQLabel("<b>" + i18n("Search:") + "</b>", plainPage()); d->searchEdit = new SearchTextBar(plainPage(), "SearchQuickDialogSearchEdit", i18n("Enter here your search criteria")); - QWhatsThis::add( d->searchEdit, i18n("<p>Enter your search criteria to find items in the album library")); + TQWhatsThis::add( d->searchEdit, i18n("<p>Enter your search criteria to find items in the album library")); d->resultsView = new SearchResultsView(plainPage()); d->resultsView->setMinimumSize(320, 200); - QWhatsThis::add( d->resultsView, i18n("<p>Here you can see the items found in album library, " + TQWhatsThis::add( d->resultsView, i18n("<p>Here you can see the items found in album library, " "using the current search criteria")); - QLabel *label2 = new QLabel(i18n("Save search as:"), plainPage()); + TQLabel *label2 = new TQLabel(i18n("Save search as:"), plainPage()); d->nameEdit = new KLineEdit(plainPage()); d->nameEdit->setText(i18n("Last Search")); - QWhatsThis::add( d->nameEdit, i18n("<p>Enter the name of the current search to save in the " + TQWhatsThis::add( d->nameEdit, i18n("<p>Enter the name of the current search to save in the " "\"My Searches\" view")); grid->addMultiCellWidget(label1, 0, 0, 0, 0); @@ -102,14 +102,14 @@ SearchQuickDialog::SearchQuickDialog(QWidget* parent, KURL& url) grid->addMultiCellWidget(label2, 2, 2, 0, 1); grid->addMultiCellWidget(d->nameEdit, 2, 2, 2, 2); - connect(d->searchEdit, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotSearchChanged(const QString&))); + connect(d->searchEdit, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotSearchChanged(const TQString&))); - connect(d->resultsView, SIGNAL(signalSearchResultsMatch(bool)), - d->searchEdit, SLOT(slotSearchResult(bool))); + connect(d->resultsView, TQT_SIGNAL(signalSearchResultsMatch(bool)), + d->searchEdit, TQT_SLOT(slotSearchResult(bool))); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeOut())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeOut())); enableButtonOK(false); resize(configDialogSize("QuickSearch Dialog")); @@ -120,12 +120,12 @@ SearchQuickDialog::SearchQuickDialog(QWidget* parent, KURL& url) int count = m_url.queryItem("count").toInt(); if (count > 0) { - QStringList strList; + TQStringList strList; for (int i=1; i<=count; i++) { - QString val = m_url.queryItem(QString::number(i) + ".val"); - if (!strList.contains(val)) + TQString val = m_url.queryItem(TQString::number(i) + ".val"); + if (!strList.tqcontains(val)) { strList.append(val); } @@ -159,18 +159,18 @@ void SearchQuickDialog::slotTimeOut() KURL url; url.setProtocol("digikamsearch"); - QString path, num; + TQString path, num; int count = 0; - QStringList textList = QStringList::split(' ', d->searchEdit->text()); - for (QStringList::iterator it = textList.begin(); it != textList.end(); ++it) + TQStringList textList = TQStringList::split(' ', d->searchEdit->text()); + for (TQStringList::iterator it = textList.begin(); it != textList.end(); ++it) { if (count != 0) path += " AND "; - path += QString(" %1 ").arg(count + 1); + path += TQString(" %1 ").tqarg(count + 1); - num = QString::number(++count); + num = TQString::number(++count); url.addQueryItem(num + ".key", "keyword"); url.addQueryItem(num + ".op", "like"); url.addQueryItem(num + ".val", *it); @@ -184,12 +184,12 @@ void SearchQuickDialog::slotTimeOut() d->resultsView->openURL(url); } -void SearchQuickDialog::slotSearchChanged(const QString&) +void SearchQuickDialog::slotSearchChanged(const TQString&) { d->timer->start(500, true); } -void SearchQuickDialog::hideEvent(QHideEvent* e) +void SearchQuickDialog::hideEvent(TQHideEvent* e) { m_url.removeQueryItem("name"); m_url.addQueryItem("name", d->nameEdit->text().isEmpty() ? diff --git a/digikam/digikam/searchquickdialog.h b/digikam/digikam/searchquickdialog.h index c2c2453..dff2e4c 100644 --- a/digikam/digikam/searchquickdialog.h +++ b/digikam/digikam/searchquickdialog.h @@ -24,12 +24,12 @@ /** @file searchquickdialog.h */ -#ifndef SEARCHQUICKDIALOG_H -#define SEARCHQUICKDIALOG_H +#ifndef SEARCHTQUICKDIALOG_H +#define SEARCHTQUICKDIALOG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -51,15 +51,16 @@ class SearchQuickDialogPriv; class SearchQuickDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent window + * @param tqparent tqparent window * @param url holds the url for the search */ - SearchQuickDialog(QWidget* parent, KURL& url); + SearchQuickDialog(TQWidget* tqparent, KURL& url); /** * Destructor */ @@ -67,12 +68,12 @@ public: protected: - void hideEvent(QHideEvent* e); + void hideEvent(TQHideEvent* e); private slots: void slotTimeOut(); - void slotSearchChanged(const QString&); + void slotSearchChanged(const TQString&); private: @@ -84,4 +85,4 @@ private: } // namespace Digikam -#endif /* SEARCHQUICKDIALOG_H */ +#endif /* SEARCHTQUICKDIALOG_H */ diff --git a/digikam/digikam/searchresultsitem.cpp b/digikam/digikam/searchresultsitem.cpp index dfa0343..85b02ab 100644 --- a/digikam/digikam/searchresultsitem.cpp +++ b/digikam/digikam/searchresultsitem.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> // Local includes. @@ -33,18 +33,18 @@ namespace Digikam { -QPixmap* SearchResultsItem::m_basePixmap = 0; +TQPixmap* SearchResultsItem::m_basePixmap = 0; -SearchResultsItem::SearchResultsItem(QIconView* view, const QString& path) - : QIconViewItem(view), m_path(path) +SearchResultsItem::SearchResultsItem(TQIconView* view, const TQString& path) + : TQIconViewItem(view), m_path(path) { if (!m_basePixmap) { - m_basePixmap = new QPixmap(128, 128); - m_basePixmap->fill(view->colorGroup().base()); + m_basePixmap = new TQPixmap(128, 128); + m_basePixmap->fill(view->tqcolorGroup().base()); - QPainter p(m_basePixmap); - p.setPen(Qt::lightGray); + TQPainter p(m_basePixmap); + p.setPen(TQt::lightGray); p.drawRect(0, 0, 128, 128); p.end(); } @@ -59,27 +59,27 @@ SearchResultsItem::~SearchResultsItem() } -void SearchResultsItem::calcRect(const QString&) +void SearchResultsItem::calcRect(const TQString&) { - QRect r(0,0,0,0); + TQRect r(0,0,0,0); setTextRect(r); setPixmapRect(r); - setItemRect(QRect(x(),y(),130,130)); + setItemRect(TQRect(x(),y(),130,130)); } -void SearchResultsItem::paintItem(QPainter* p, const QColorGroup&) +void SearchResultsItem::paintItem(TQPainter* p, const TQColorGroup&) { - QRect r(rect()); + TQRect r(rect()); p->drawPixmap(r.x() + (width()-pixmap()->width())/2 , r.y() + (height()-pixmap()->height())/2, *pixmap()); } -void SearchResultsItem::paintFocus(QPainter* p, const QColorGroup&) +void SearchResultsItem::paintFocus(TQPainter* p, const TQColorGroup&) { - QRect r(rect()); + TQRect r(rect()); p->save(); - p->setPen(QPen(Qt::darkGray, 0, Qt::DotLine)); + p->setPen(TQPen(TQt::darkGray, 0, TQt::DotLine)); p->drawRect(rect()); p->restore(); } diff --git a/digikam/digikam/searchresultsitem.h b/digikam/digikam/searchresultsitem.h index 14601d6..39d6562 100644 --- a/digikam/digikam/searchresultsitem.h +++ b/digikam/digikam/searchresultsitem.h @@ -23,33 +23,33 @@ #ifndef SEARCHRESULTSITEM_H #define SEARCHRESULTSITEM_H -// Qt includes. +// TQt includes. -#include <qiconview.h> +#include <tqiconview.h> namespace Digikam { -class SearchResultsItem : public QIconViewItem +class SearchResultsItem : public TQIconViewItem { friend class SearchResultsView; public: - SearchResultsItem(QIconView* view, const QString& path); + SearchResultsItem(TQIconView* view, const TQString& path); ~SearchResultsItem(); protected: - void calcRect(const QString& text = QString()); - void paintItem (QPainter * p, const QColorGroup & cg); - void paintFocus (QPainter * p, const QColorGroup & cg); + void calcRect(const TQString& text = TQString()); + void paintItem (TQPainter * p, const TQColorGroup & cg); + void paintFocus (TQPainter * p, const TQColorGroup & cg); private: - static QPixmap* m_basePixmap; + static TQPixmap* m_basePixmap; bool m_marked; - QString m_path; + TQString m_path; }; } // namespace Digikam diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index 24b0d8c..cbe9326 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatastream.h> -#include <qdict.h> -#include <qguardedptr.h> +#include <tqdatastream.h> +#include <tqdict.h> +#include <tqguardedptr.h> // KDE includes. @@ -56,25 +56,25 @@ public: thumbJob = 0; } - QString libraryPath; - QString filter; + TQString libraryPath; + TQString filter; - QDict<QIconViewItem> itemDict; + TQDict<TQIconViewItem> itemDict; - QGuardedPtr<ThumbnailJob> thumbJob; + TQGuardedPtr<ThumbnailJob> thumbJob; KIO::TransferJob* listJob; }; -SearchResultsView::SearchResultsView(QWidget* parent) - : QIconView(parent) +SearchResultsView::SearchResultsView(TQWidget* tqparent) + : TQIconView(tqparent) { d = new SearchResultsViewPriv; d->libraryPath = AlbumManager::instance()->getLibraryPath(); d->filter = AlbumSettings::instance()->getAllFileFilter(); setAutoArrange(true); - setResizeMode(QIconView::Adjust); + setResizeMode(TQIconView::Adjust); } SearchResultsView::~SearchResultsView() @@ -97,8 +97,8 @@ void SearchResultsView::openURL(const KURL& url) d->thumbJob->kill(); d->thumbJob = 0; - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << d->libraryPath; ds << url; ds << d->filter; @@ -108,13 +108,13 @@ void SearchResultsView::openURL(const KURL& url) ds << 2; // miniListing (Use 1 for full listing) d->listJob = new KIO::TransferJob(url, KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); - connect(d->listJob, SIGNAL(result(KIO::Job*)), - this, SLOT(slotResult(KIO::Job*))); + connect(d->listJob, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotResult(KIO::Job*))); - connect(d->listJob, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotData(KIO::Job*, const QByteArray&))); + connect(d->listJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); } void SearchResultsView::clear() @@ -128,23 +128,23 @@ void SearchResultsView::clear() d->thumbJob = 0; d->itemDict.clear(); - QIconView::clear(); + TQIconView::clear(); } -void SearchResultsView::slotData(KIO::Job*, const QByteArray &data) +void SearchResultsView::slotData(KIO::Job*, const TQByteArray &data) { - for (QIconViewItem* item = firstItem(); item; item = item->nextItem()) + for (TQIconViewItem* item = firstItem(); item; item = item->nextItem()) ((SearchResultsItem*)item)->m_marked = false; KURL::List ulist; - QString path; - QDataStream ds(data, IO_ReadOnly); + TQString path; + TQDataStream ds(data, IO_ReadOnly); while (!ds.atEnd()) { ds >> path; - SearchResultsItem* existingItem = (SearchResultsItem*) d->itemDict.find(path); + SearchResultsItem* existingItem = (SearchResultsItem*) d->itemDict.tqfind(path); if (existingItem) { existingItem->m_marked = true; @@ -158,7 +158,7 @@ void SearchResultsView::slotData(KIO::Job*, const QByteArray &data) } SearchResultsItem* item = (SearchResultsItem*)firstItem(); - QIconViewItem* nextItem; + TQIconViewItem* nextItem; while (item) { nextItem = item->nextItem(); @@ -179,11 +179,11 @@ void SearchResultsView::slotData(KIO::Job*, const QByteArray &data) { d->thumbJob = new ThumbnailJob(ulist, 128, true, true); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotGotThumbnail(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotFailedThumbnail(const KURL&))); } } @@ -194,9 +194,9 @@ void SearchResultsView::slotResult(KIO::Job *job) d->listJob = 0; } -void SearchResultsView::slotGotThumbnail(const KURL& url, const QPixmap& pix) +void SearchResultsView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { - QIconViewItem* i = d->itemDict.find(url.path()); + TQIconViewItem* i = d->itemDict.tqfind(url.path()); if (i) i->setPixmap(pix); diff --git a/digikam/digikam/searchresultsview.h b/digikam/digikam/searchresultsview.h index e8a3256..b109d85 100644 --- a/digikam/digikam/searchresultsview.h +++ b/digikam/digikam/searchresultsview.h @@ -25,16 +25,16 @@ #ifndef SEARCHRESULTSVIEW_H #define SEARCHRESULTSVIEW_H -// Qt includes. +// TQt includes. -#include <qcstring.h> -#include <qiconview.h> +#include <tqcstring.h> +#include <tqiconview.h> // KDE includes. #include <kurl.h> -class QPixmap; +class TQPixmap; class KFileItem; @@ -49,13 +49,14 @@ namespace Digikam class SearchResultsViewPriv; -class SearchResultsView : public QIconView +class SearchResultsView : public TQIconView { Q_OBJECT + TQ_OBJECT public: - SearchResultsView(QWidget* parent); + SearchResultsView(TQWidget* tqparent); ~SearchResultsView(); void openURL(const KURL& url); @@ -67,9 +68,9 @@ signals: private slots: - void slotData(KIO::Job *job, const QByteArray &data); + void slotData(KIO::Job *job, const TQByteArray &data); void slotResult(KIO::Job *job); - void slotGotThumbnail(const KURL& url, const QPixmap& pix); + void slotGotThumbnail(const KURL& url, const TQPixmap& pix); void slotFailedThumbnail(const KURL& url); private: diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp index 60786e8..2cb23ab 100644 --- a/digikam/digikam/searchwidgets.cpp +++ b/digikam/digikam/searchwidgets.cpp @@ -25,18 +25,18 @@ /** @file searchwidgets.cpp */ -// Qt includes. - -#include <qhbox.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qgroupbox.h> -#include <qvgroupbox.h> -#include <qlayout.h> -#include <qdatetime.h> +// TQt includes. + +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlayout.h> +#include <tqdatetime.h> // KDE includes. @@ -65,7 +65,7 @@ static const int RuleOpTableCount = 18; static struct { const char *keyText; - QString key; + TQString key; SearchAdvancedRule::valueWidgetTypes cat; } RuleKeyTable[] = @@ -86,7 +86,7 @@ RuleKeyTable[] = static struct { const char *keyText; - QString key; + TQString key; SearchAdvancedRule::valueWidgetTypes cat; } RuleOpTable[] = @@ -111,79 +111,79 @@ RuleOpTable[] = { I18N_NOOP("Equals"), "EQ", SearchAdvancedRule::RATING }, }; -SearchRuleLabel::SearchRuleLabel(const QString& text, QWidget *parent, +SearchRuleLabel::SearchRuleLabel(const TQString& text, TQWidget *tqparent, const char *name, WFlags f ) - : QLabel(text, parent, name, f) + : TQLabel(text, tqparent, name, f) { } -void SearchRuleLabel::mouseDoubleClickEvent( QMouseEvent * e ) +void SearchRuleLabel::mouseDoubleClickEvent( TQMouseEvent * e ) { emit signalDoubleClick( e ); } -SearchAdvancedRule::SearchAdvancedRule(QWidget* parent, SearchAdvancedRule::Option option) +SearchAdvancedRule::SearchAdvancedRule(TQWidget* tqparent, SearchAdvancedRule::Option option) : SearchAdvancedBase(SearchAdvancedBase::RULE) { - m_box = new QVBox(parent); - m_box->layout()->setSpacing( KDialog::spacingHint() ); - m_box->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_box = new TQVBox(tqparent); + m_box->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_box->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_optionsBox = 0; m_option = option; if (option != NONE) { - m_optionsBox = new QHBox( m_box ); + m_optionsBox = new TQHBox( m_box ); m_label = new SearchRuleLabel( option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox); - QFrame* hline = new QFrame( m_optionsBox ); - hline->setFrameStyle( QFrame::HLine|QFrame::Sunken ); - m_label->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); - hline->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ); + 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 ); - connect( m_label, SIGNAL( signalDoubleClick( QMouseEvent* ) ), - this, SLOT( slotLabelDoubleClick() )); + connect( m_label, TQT_SIGNAL( signalDoubleClick( TQMouseEvent* ) ), + this, TQT_SLOT( slotLabelDoubleClick() )); } - m_hbox = new QWidget( m_box ); - m_hbox->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + m_hbox = new TQWidget( m_box ); + m_hbox->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); - m_key = new QComboBox( m_hbox, "key" ); - m_key->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ); + m_key = new TQComboBox( m_hbox, "key" ); + m_key->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); for (int i=0; i< RuleKeyTableCount; i++) m_key->insertItem( i18n(RuleKeyTable[i].keyText), i ); - m_operator = new QComboBox( m_hbox ); - m_operator->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ); + m_operator = new TQComboBox( m_hbox ); + m_operator->tqsetSizePolicy( 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 ); m_operator->adjustSize(); - m_valueBox = new QHBox( m_hbox ); + m_valueBox = new TQHBox( m_hbox ); m_widgetType = NOWIDGET; slotKeyChanged( 0 ); - m_check = new QCheckBox( m_hbox ); + m_check = new TQCheckBox( m_hbox ); - m_hboxLayout = new QHBoxLayout( m_hbox ); + m_hboxLayout = new TQHBoxLayout( m_hbox ); m_hboxLayout->setSpacing( KDialog::spacingHint() ); m_hboxLayout->addWidget( m_key ); m_hboxLayout->addWidget( m_operator ); m_hboxLayout->addWidget( m_valueBox ); - m_hboxLayout->addWidget( m_check, 0, Qt::AlignRight ); + m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_box->show(); - connect( m_key, SIGNAL( activated(int) ), - this, SLOT(slotKeyChanged(int))); - connect( m_key, SIGNAL( activated(int) ), - this, SIGNAL( signalPropertyChanged() )); - connect( m_operator, SIGNAL( activated(int) ), - this, SIGNAL( signalPropertyChanged() )); - connect( m_check, SIGNAL( toggled( bool ) ), - this, SIGNAL( signalBaseItemToggled() )); + connect( m_key, TQT_SIGNAL( activated(int) ), + this, TQT_SLOT(slotKeyChanged(int))); + connect( m_key, TQT_SIGNAL( activated(int) ), + this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_operator, TQT_SIGNAL( activated(int) ), + this, TQT_SIGNAL( signalPropertyChanged() )); + connect( m_check, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::setValues(const KURL& url) @@ -212,12 +212,12 @@ void SearchAdvancedRule::setValues(const KURL& url) } // Set the value for the last widget. - QString value = url.queryItem("1.val"); + TQString value = url.queryItem("1.val"); if (m_widgetType == LINEEDIT) m_lineEdit->setText( value ); if (m_widgetType == DATE) - m_dateEdit->setDate( QDate::fromString( value, Qt::ISODate) ); + m_dateEdit->setDate( TQDate::fromString( value, Qt::ISODate) ); if (m_widgetType == RATING) { @@ -233,7 +233,7 @@ void SearchAdvancedRule::setValues(const KURL& url) int num = value.toInt(&ok); if (ok) { - QMapIterator<int,int> it; + TQMapIterator<int,int> it; for (it = m_itemsIndexIDMap.begin() ; it != m_itemsIndexIDMap.end(); ++it) { if (it.data() == num) @@ -265,12 +265,12 @@ void SearchAdvancedRule::slotLabelDoubleClick() void SearchAdvancedRule::slotKeyChanged(int id) { - QString currentOperator = m_operator->currentText(); + TQString currentOperator = m_operator->currentText(); valueWidgetTypes currentType = m_widgetType; // we need to save the current size of the operator combobox // otherise clear() will shrink it - QSize curSize = m_operator->size(); + TQSize curSize = m_operator->size(); m_operator->clear(); m_widgetType = RuleKeyTable[id].cat; @@ -291,7 +291,7 @@ void SearchAdvancedRule::slotKeyChanged(int id) void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTypes newType) { // this map is used to sort album and tag list combobox - typedef QMap<QString, int> SortedList; + typedef TQMap<TQString, int> SortedList; if (oldType == newType) return; @@ -311,26 +311,26 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp if (newType == DATE) { m_dateEdit = new KDateEdit( m_valueBox,"datepicker"); - m_dateEdit->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + m_dateEdit->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); m_dateEdit->show(); - connect( m_dateEdit, SIGNAL( dateChanged(const QDate& ) ), - this, SIGNAL(signalPropertyChanged())); + connect( m_dateEdit, TQT_SIGNAL( dateChanged(const TQDate& ) ), + this, TQT_SIGNAL(signalPropertyChanged())); } else if (newType == LINEEDIT) { - m_lineEdit = new QLineEdit( m_valueBox, "lineedit" ); - m_lineEdit->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_lineEdit = new TQLineEdit( m_valueBox, "lineedit" ); + m_lineEdit->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); m_lineEdit->show(); - connect( m_lineEdit, SIGNAL ( textChanged(const QString&) ), - this, SIGNAL(signalPropertyChanged())); + connect( m_lineEdit, TQT_SIGNAL ( textChanged(const TQString&) ), + this, TQT_SIGNAL(signalPropertyChanged())); } else if (newType == ALBUMS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "albumscombo" ); - m_valueCombo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList aList = aManager->allPAlbums(); @@ -364,13 +364,13 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, SIGNAL( activated(int) ), - this, SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQT_SIGNAL( activated(int) ), + this, TQT_SIGNAL( signalPropertyChanged() )); } else if (newType == TAGS) { m_valueCombo = new SqueezedComboBox( m_valueBox, "tagscombo" ); - m_valueCombo->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ); + m_valueCombo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); AlbumManager* aManager = AlbumManager::instance(); AlbumList tList = aManager->allTAlbums(); @@ -404,27 +404,27 @@ void SearchAdvancedRule::setValueWidget(valueWidgetTypes oldType, valueWidgetTyp m_valueCombo->show(); - connect( m_valueCombo, SIGNAL( activated(int) ), - this, SIGNAL( signalPropertyChanged() )); + connect( m_valueCombo, TQT_SIGNAL( activated(int) ), + this, TQT_SIGNAL( signalPropertyChanged() )); } else if (newType == RATING) { m_ratingWidget = new RatingWidget( m_valueBox ); m_ratingWidget->show(); - connect( m_ratingWidget, SIGNAL( signalRatingChanged(int) ), - this, SIGNAL( signalPropertyChanged() )); + connect( m_ratingWidget, TQT_SIGNAL( signalRatingChanged(int) ), + this, TQT_SIGNAL( signalPropertyChanged() )); } } -QString SearchAdvancedRule::urlKey() const +TQString SearchAdvancedRule::urlKey() const { return RuleKeyTable[m_key->currentItem()].key; } -QString SearchAdvancedRule::urlOperator() const +TQString SearchAdvancedRule::urlOperator() const { - QString string; + TQString string; int countItems = 0; for (int i=0; i< RuleOpTableCount; i++) @@ -440,9 +440,9 @@ QString SearchAdvancedRule::urlOperator() const return string; } -QString SearchAdvancedRule::urlValue() const +TQString SearchAdvancedRule::urlValue() const { - QString string; + TQString string; if (m_widgetType == LINEEDIT) string = m_lineEdit->text() ; @@ -451,15 +451,15 @@ QString SearchAdvancedRule::urlValue() const string = m_dateEdit->date().toString(Qt::ISODate) ; else if (m_widgetType == TAGS || m_widgetType == ALBUMS) - string = QString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]); + string = TQString::number(m_itemsIndexIDMap[ m_valueCombo->currentItem() ]); else if (m_widgetType == RATING) - string = QString::number(m_ratingWidget->rating()) ; + string = TQString::number(m_ratingWidget->rating()) ; return string; } -QWidget* SearchAdvancedRule::widget() const +TQWidget* SearchAdvancedRule::widget() const { return m_box; } @@ -477,16 +477,16 @@ void SearchAdvancedRule::addOption(Option option) return; } - m_box->layout()->remove(m_hbox); + m_box->tqlayout()->remove(m_hbox); - m_optionsBox = new QHBox(m_box); - new QLabel(option == AND ? i18n("As well as") : i18n("Or"), m_optionsBox); - QFrame* hline = new QFrame(m_optionsBox); - hline->setFrameStyle(QFrame::HLine|QFrame::Sunken); - hline->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + 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); m_optionsBox->show(); - m_box->layout()->add(m_hbox); + m_box->tqlayout()->add(m_hbox); m_option = option; } @@ -499,13 +499,13 @@ void SearchAdvancedRule::removeOption() void SearchAdvancedRule::addCheck() { - m_check = new QCheckBox(m_hbox); - m_check->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - m_hboxLayout->addWidget( m_check, 0, Qt::AlignRight ); + m_check = new TQCheckBox(m_hbox); + m_check->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + m_hboxLayout->addWidget( m_check, 0, TQt::AlignRight ); m_check->show(); - connect( m_check, SIGNAL( toggled( bool ) ), - this, SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SIGNAL( signalBaseItemToggled() )); } void SearchAdvancedRule::removeCheck() @@ -514,18 +514,18 @@ void SearchAdvancedRule::removeCheck() m_check = 0; } -SearchAdvancedGroup::SearchAdvancedGroup(QWidget* parent) +SearchAdvancedGroup::SearchAdvancedGroup(TQWidget* tqparent) : SearchAdvancedBase(SearchAdvancedBase::GROUP) { - m_box = new QHBox(parent); - m_box->layout()->setSpacing(KDialog::spacingHint()); - m_groupbox = new QVGroupBox(m_box); - m_check = new QCheckBox(m_box); + m_box = new TQHBox(tqparent); + m_box->tqlayout()->setSpacing(KDialog::spacingHint()); + m_groupbox = new TQVGroupBox(m_box); + m_check = new TQCheckBox(m_box); m_option = SearchAdvancedRule::NONE; m_box->show(); - connect( m_check, SIGNAL( toggled( bool ) ), - this, SIGNAL( signalBaseItemToggled() )); + connect( m_check, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SIGNAL( signalBaseItemToggled() )); } SearchAdvancedGroup::~SearchAdvancedGroup() @@ -533,7 +533,7 @@ SearchAdvancedGroup::~SearchAdvancedGroup() delete m_box; } -QWidget* SearchAdvancedGroup::widget() const +TQWidget* SearchAdvancedGroup::widget() const { return m_box; } @@ -556,13 +556,13 @@ void SearchAdvancedGroup::addRule(SearchAdvancedRule* rule) rule->removeCheck(); m_childRules.append(rule); - rule->widget()->reparent(m_groupbox, QPoint(0,0)); + rule->widget()->reparent(m_groupbox, TQPoint(0,0)); rule->widget()->show(); } void SearchAdvancedGroup::removeRules() { - typedef QValueList<SearchAdvancedRule*> RuleList; + typedef TQValueList<SearchAdvancedRule*> RuleList; for (RuleList::iterator it = m_childRules.begin(); it != m_childRules.end(); ++it) @@ -574,7 +574,7 @@ void SearchAdvancedGroup::removeRules() } rule->addCheck(); - rule->widget()->reparent((QWidget*)m_box->parent(), QPoint(0,0)); + rule->widget()->reparent((TQWidget*)m_box->tqparent(), TQPoint(0,0)); rule->widget()->show(); } @@ -582,7 +582,7 @@ void SearchAdvancedGroup::removeRules() removeOption(); } -QValueList<SearchAdvancedRule*> SearchAdvancedGroup::childRules() const +TQValueList<SearchAdvancedRule*> SearchAdvancedGroup::childRules() const { return m_childRules; } diff --git a/digikam/digikam/searchwidgets.h b/digikam/digikam/searchwidgets.h index 912f94b..c501a6f 100644 --- a/digikam/digikam/searchwidgets.h +++ b/digikam/digikam/searchwidgets.h @@ -28,14 +28,14 @@ #ifndef SEARCHWIDGETS_H #define SEARCHWIDGETS_H -class QHBox; -class QVBox; -class QCheckBox; -class QComboBox; -class QLineEdit; -class QLabel; -class QVGroupBox; -class QLabel; +class TQHBox; +class TQVBox; +class TQCheckBox; +class TQComboBox; +class TQLineEdit; +class TQLabel; +class TQVGroupBox; +class TQLabel; class KURL; class KDateEdit; @@ -48,23 +48,24 @@ class SqueezedComboBox; /** @class SearchRuleLabel * - * This class inherits everything from QLabel, and adds one + * This class inherits everything from TQLabel, and adds one * signal to it, when double clicked on it. */ -class SearchRuleLabel: public QLabel +class SearchRuleLabel: public TQLabel { Q_OBJECT + TQ_OBJECT public: - /** Constructor. See for more info the QLabel clas. + /** Constructor. See for more info the TQLabel clas. * @param text Text of the label - * @param parent The parent widget + * @param tqparent The tqparent widget * @param name The name * @param f WFlags */ - SearchRuleLabel(const QString & text, - QWidget * parent, + SearchRuleLabel(const TQString & text, + TQWidget * tqparent, const char * name=0, WFlags f=0 ); @@ -75,11 +76,11 @@ signals: * event occurs * @param e the mouse event received */ - void signalDoubleClick( QMouseEvent * e ); + void signalDoubleClick( TQMouseEvent * e ); private: - void mouseDoubleClickEvent( QMouseEvent * e ); + void mouseDoubleClickEvent( TQMouseEvent * e ); }; /** @class SearchAdvancedBase @@ -91,9 +92,10 @@ private: * @author Tom Albers * */ -class SearchAdvancedBase : public QObject +class SearchAdvancedBase : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -140,7 +142,7 @@ public: * Returns a pointer to the widget holding the base item * @return Pointer to the widget */ - virtual QWidget* widget() const = 0; + virtual TQWidget* widget() const = 0; /** * Determines if the base item is checked or not @@ -194,15 +196,16 @@ class SearchAdvancedGroup; class SearchAdvancedRule : public SearchAdvancedBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent The parent + * @param tqparent The tqparent * @param option Holds the Option of the rule, see the enum. * */ - SearchAdvancedRule(QWidget* parent, Option option); + SearchAdvancedRule(TQWidget* tqparent, Option option); /** * destructor @@ -213,7 +216,7 @@ public: * Returns a pointer to the widget holding the rule * @return Pointer to the widget */ - QWidget* widget() const; + TQWidget* widget() const; /** * Determines if the rule is checked or not @@ -257,21 +260,21 @@ public: * be used to build the correct url for the kio * @return The value of the key part of the rule */ - QString urlKey() const; + TQString urlKey() const; /** * Gives back the value of the operator part of the rule, which can * be used to build the correct url for the kio * @return The value of the operator part of the rule */ - QString urlOperator() const; + TQString urlOperator() const; /** * Gives back the value of the value part of the rule, which can * be used to build the correct url for the kio * @return The value of the value part of the rule */ - QString urlValue() const; + TQString urlValue() const; enum valueWidgetTypes { @@ -294,27 +297,27 @@ private slots: private: - QLabel* m_label; + TQLabel* m_label; - QVBox* m_box; - QWidget* m_hbox; - QHBoxLayout* m_hboxLayout; + TQVBox* m_box; + TQWidget* m_hbox; + TQHBoxLayout* m_hboxLayout; - QHBox* m_valueBox; + TQHBox* m_valueBox; - QCheckBox* m_check; + TQCheckBox* m_check; - QComboBox* m_key; - QComboBox* m_operator; + TQComboBox* m_key; + TQComboBox* m_operator; - QLineEdit* m_lineEdit; + TQLineEdit* m_lineEdit; KDateEdit* m_dateEdit; SqueezedComboBox* m_valueCombo; RatingWidget* m_ratingWidget; - QMap<int, int> m_itemsIndexIDMap; + TQMap<int, int> m_itemsIndexIDMap; - QHBox* m_optionsBox; + TQHBox* m_optionsBox; enum valueWidgetTypes m_widgetType; }; @@ -329,9 +332,9 @@ class SearchAdvancedGroup : public SearchAdvancedBase public: /** * Constructor - * @param parent the parent + * @param tqparent the tqparent */ - SearchAdvancedGroup(QWidget* parent); + SearchAdvancedGroup(TQWidget* tqparent); /** * Destructor @@ -342,7 +345,7 @@ public: * Returns a pointer to the widget holding the group * @return pointer to the widget */ - QWidget* widget() const; + TQWidget* widget() const; /** * determines if the rule is checked or not @@ -376,14 +379,14 @@ public: * gives back a list of pointers to the rules inside the group * @return a list of pointers to the childeren in the group */ - QValueList<SearchAdvancedRule*> childRules() const; + TQValueList<SearchAdvancedRule*> childRules() const; private: - QHBox* m_box; - QVGroupBox* m_groupbox; - QCheckBox* m_check; - QValueList<SearchAdvancedRule*> m_childRules; + TQHBox* m_box; + TQVGroupBox* m_groupbox; + TQCheckBox* m_check; + TQValueList<SearchAdvancedRule*> m_childRules; }; } // namespace Digikam diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp index f423b48..40a1c15 100644 --- a/digikam/digikam/syncjob.cpp +++ b/digikam/digikam/syncjob.cpp @@ -27,10 +27,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qapplication.h> -#include <qpixmap.h> +#include <tqapplication.h> +#include <tqpixmap.h> // KDE includes. @@ -51,13 +51,13 @@ #include "syncjob.h" #include "syncjob.moc" -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); namespace Digikam { -QString* SyncJob::lastErrorMsg_ = 0; +TQString* SyncJob::lastErrorMsg_ = 0; int SyncJob::lastErrorCode_ = 0; bool SyncJob::del(const KURL::List& urls, bool useTrash) @@ -76,13 +76,13 @@ bool SyncJob::file_move(const KURL &src, const KURL &dest) return sj.fileMovePriv(src, dest); } -QPixmap SyncJob::getTagThumbnail(TAlbum *album) +TQPixmap SyncJob::getTagThumbnail(TAlbum *album) { SyncJob sj; return sj.getTagThumbnailPriv(album); } -QPixmap SyncJob::getTagThumbnail(const QString &name, int size) +TQPixmap SyncJob::getTagThumbnail(const TQString &name, int size) { SyncJob sj; return sj.getTagThumbnailPriv(name, size); @@ -105,8 +105,8 @@ bool SyncJob::delPriv(const KURL::List& urls) success_ = true; KIO::Job* job = KIO::del( urls ); - connect( job, SIGNAL(result( KIO::Job* )), - SLOT(slotResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( KIO::Job* )), + TQT_SLOT(slotResult( KIO::Job*)) ); enter_loop(); return success_; @@ -123,8 +123,8 @@ bool SyncJob::trashPriv(const KURL::List& urls) } KIO::Job* job = KIO::move( urls, dest ); - connect( job, SIGNAL(result( KIO::Job* )), - SLOT(slotResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( KIO::Job* )), + TQT_SLOT(slotResult( KIO::Job*)) ); enter_loop(); return success_; @@ -136,8 +136,8 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) KIO::FileCopyJob* job = KIO::file_move(src, dest, -1, true, false, false); - connect( job, SIGNAL(result( KIO::Job* )), - SLOT(slotResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( KIO::Job* )), + TQT_SLOT(slotResult( KIO::Job*)) ); enter_loop(); return success_; @@ -145,10 +145,10 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest) void SyncJob::enter_loop() { - QWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0,0,WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -159,17 +159,17 @@ void SyncJob::slotResult( KIO::Job * job ) if ( !success_ ) { if ( !lastErrorMsg_ ) - lastErrorMsg_ = new QString; + lastErrorMsg_ = new TQString; *lastErrorMsg_ = job->errorString(); } - qApp->exit_loop(); + tqApp->exit_loop(); } -QPixmap SyncJob::getTagThumbnailPriv(TAlbum *album) +TQPixmap SyncJob::getTagThumbnailPriv(TAlbum *album) { if (thumbnail_) delete thumbnail_; - thumbnail_ = new QPixmap; + thumbnail_ = new TQPixmap; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); @@ -186,11 +186,11 @@ QPixmap SyncJob::getTagThumbnailPriv(TAlbum *album) } else { - connect(loader, SIGNAL(signalThumbnail(Album *, const QPixmap&)), - this, SLOT(slotGotThumbnailFromIcon(Album *, const QPixmap&))); + connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, SIGNAL(signalFailed(Album *)), - this, SLOT(slotLoadThumbnailFailed(Album *))); + connect(loader, TQT_SIGNAL(signalFailed(Album *)), + this, TQT_SLOT(slotLoadThumbnailFailed(Album *))); album_ = album; enter_loop(); @@ -203,25 +203,25 @@ void SyncJob::slotLoadThumbnailFailed(Album *album) // TODO: setting _lastError* if (album == album_) { - qApp->exit_loop(); + tqApp->exit_loop(); } } -void SyncJob::slotGotThumbnailFromIcon(Album *album, const QPixmap& pix) +void SyncJob::slotGotThumbnailFromIcon(Album *album, const TQPixmap& pix) { if (album == album_) { *thumbnail_ = pix; - qApp->exit_loop(); + tqApp->exit_loop(); } } -QPixmap SyncJob::getTagThumbnailPriv(const QString &name, int size) +TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size) { thumbnailSize_ = size; if (thumbnail_) delete thumbnail_; - thumbnail_ = new QPixmap; + thumbnail_ = new TQPixmap; if(name.startsWith("/")) { @@ -230,13 +230,13 @@ QPixmap SyncJob::getTagThumbnailPriv(const QString &name, int size) false, AlbumSettings::instance()->getExifRotate()); connect(job, - SIGNAL(signalThumbnail(const KURL&, - const QPixmap&)), - SLOT(slotGotThumbnailFromIcon(const KURL&, - const QPixmap&))); + TQT_SIGNAL(signalThumbnail(const KURL&, + const TQPixmap&)), + TQT_SLOT(slotGotThumbnailFromIcon(const KURL&, + const TQPixmap&))); connect(job, - SIGNAL(signalFailed(const KURL&)), - SLOT(slotLoadThumbnailFailed())); + TQT_SIGNAL(signalFailed(const KURL&)), + TQT_SLOT(slotLoadThumbnailFailed())); enter_loop(); job->kill(); @@ -253,10 +253,10 @@ QPixmap SyncJob::getTagThumbnailPriv(const QString &name, int size) void SyncJob::slotLoadThumbnailFailed() { // TODO: setting _lastError* - qApp->exit_loop(); + tqApp->exit_loop(); } -void SyncJob::slotGotThumbnailFromIcon(const KURL&, const QPixmap& pix) +void SyncJob::slotGotThumbnailFromIcon(const KURL&, const TQPixmap& pix) { if(!pix.isNull() && (thumbnailSize_ < ThumbnailSize::Tiny)) { @@ -271,12 +271,12 @@ void SyncJob::slotGotThumbnailFromIcon(const KURL&, const QPixmap& pix) { *thumbnail_ = pix; } - qApp->exit_loop(); + tqApp->exit_loop(); } -QString SyncJob::lastErrorMsg() +TQString SyncJob::lastErrorMsg() { - return (lastErrorMsg_ ? *lastErrorMsg_ : QString()); + return (lastErrorMsg_ ? *lastErrorMsg_ : TQString()); } int SyncJob::lastErrorCode() diff --git a/digikam/digikam/syncjob.h b/digikam/digikam/syncjob.h index e9fad88..525cd23 100644 --- a/digikam/digikam/syncjob.h +++ b/digikam/digikam/syncjob.h @@ -30,16 +30,16 @@ #ifndef SYNCJOB_H #define SYNCJOB_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqpixmap.h> // KDE includes. #include <kurl.h> -class QString; +class TQString; namespace KIO { @@ -52,9 +52,10 @@ namespace Digikam class Album; class TAlbum; -class SyncJob : public QObject +class SyncJob : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -65,10 +66,10 @@ public: static bool file_move(const KURL &src, const KURL &dest); /* Load the image or icon for the tag thumbnail */ - static QPixmap getTagThumbnail(TAlbum *album); - static QPixmap getTagThumbnail(const QString &name, int size); + static TQPixmap getTagThumbnail(TAlbum *album); + static TQPixmap getTagThumbnail(const TQString &name, int size); - static QString lastErrorMsg(); + static TQString lastErrorMsg(); static int lastErrorCode(); private: @@ -81,25 +82,25 @@ private: bool fileMovePriv(const KURL &src, const KURL &dest); - QPixmap getTagThumbnailPriv(TAlbum *album); - QPixmap getTagThumbnailPriv(const QString &name, int size); + TQPixmap getTagThumbnailPriv(TAlbum *album); + TQPixmap getTagThumbnailPriv(const TQString &name, int size); void enter_loop(); static int lastErrorCode_; - static QString* lastErrorMsg_; + static TQString* lastErrorMsg_; bool success_; - QPixmap *thumbnail_; + TQPixmap *thumbnail_; Album *album_; int thumbnailSize_; private slots: void slotResult( KIO::Job * job ); - void slotGotThumbnailFromIcon(Album *album, const QPixmap& pix); + void slotGotThumbnailFromIcon(Album *album, const TQPixmap& pix); void slotLoadThumbnailFailed(Album *album); - void slotGotThumbnailFromIcon(const KURL& url, const QPixmap& pix); + void slotGotThumbnailFromIcon(const KURL& url, const TQPixmap& pix); void slotLoadThumbnailFailed(); }; diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp index f58f97c..323c42c 100644 --- a/digikam/digikam/tageditdlg.cpp +++ b/digikam/digikam/tageditdlg.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> // KDE includes. @@ -54,7 +54,7 @@ class TagsListCreationErrorDialog : public KDialogBase public: - TagsListCreationErrorDialog(QWidget* parent, const QMap<QString, QString>& errMap); + TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap); ~TagsListCreationErrorDialog(){}; }; @@ -76,19 +76,19 @@ public: bool create; - QLabel *topLabel; + TQLabel *topLabel; - QString icon; + TQString icon; - QPushButton *iconButton; - QPushButton *resetIconButton; + TQPushButton *iconButton; + TQPushButton *resetIconButton; TAlbum *mainRootAlbum; SearchTextBar *titleEdit; }; -TagEditDlg::TagEditDlg(QWidget *parent, TAlbum* album, bool create) - : KDialogBase(parent, 0, true, 0, Help|Ok|Cancel, Ok, true) +TagEditDlg::TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create) + : KDialogBase(tqparent, 0, true, 0, Help|Ok|Cancel, Ok, true) { d = new TagEditDlgPriv; d->mainRootAlbum = album; @@ -98,36 +98,36 @@ TagEditDlg::TagEditDlg(QWidget *parent, TAlbum* album, bool create) if (d->create) setCaption(i18n("New Tag")); else setCaption(i18n("Edit Tag")); - QWidget *page = makeMainWidget(); - QGridLayout* grid = new QGridLayout(page, 5, 4, 0, spacingHint()); + TQWidget *page = makeMainWidget(); + TQGridLayout* grid = new TQGridLayout(page, 5, 4, 0, spacingHint()); // -------------------------------------------------------- - QLabel *logo = new QLabel(page); + TQLabel *logo = new TQLabel(page); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); - d->topLabel = new QLabel(page); - d->topLabel->setAlignment(Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine); + d->topLabel = new TQLabel(page); + d->topLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine); - KSeparator *line = new KSeparator (Horizontal, page); + KSeparator *line = new KSeparator(Qt::Horizontal, page); // -------------------------------------------------------- - QLabel *titleLabel = new QLabel(page); + TQLabel *titleLabel = new TQLabel(page); titleLabel->setText(i18n("&Title:")); d->titleEdit = new SearchTextBar(page, "TagEditDlgTitleEdit", i18n("Enter tag name here...")); titleLabel->setBuddy(d->titleEdit); - QLabel *tipLabel = new QLabel(page); - tipLabel->setTextFormat(Qt::RichText); + TQLabel *tipLabel = new TQLabel(page); + tipLabel->setTextFormat(TQt::RichText); tipLabel->setText(i18n("<qt><p>To create new tags, you can use the following rules:</p>" "<p><ul><li>'/' can be used to create a tags hierarchy.<br>" "Ex.: <i>\"Country/City/Paris\"</i></li>" "<li>',' can be used to create more than one tags hierarchy at the same time.<br>" "Ex.: <i>\"City/Paris, Monument/Notre-Dame\"</i></li>" - "<li>If a tag hierarchy starts with '/', root tag album is used as parent.</li></ul></p></qt>" + "<li>If a tag hierarchy starts with '/', root tag album is used as tqparent.</li></ul></p></qt>" )); if (d->create) @@ -145,14 +145,14 @@ TagEditDlg::TagEditDlg(QWidget *parent, TAlbum* album, bool create) tipLabel->hide(); } - QLabel *iconTextLabel = new QLabel(page); + TQLabel *iconTextLabel = new TQLabel(page); iconTextLabel->setText(i18n("&Icon:")); - d->iconButton = new QPushButton(page); + d->iconButton = new TQPushButton(page); d->iconButton->setFixedSize(40, 40); iconTextLabel->setBuddy(d->iconButton); - // In create mode, by default assign the icon of the parent (if not root) to this new tag. + // In create mode, by default assign the icon of the tqparent (if not root) to this new tag. if (d->create && !d->mainRootAlbum->isRoot()) d->icon = d->mainRootAlbum->icon(); else @@ -160,7 +160,7 @@ TagEditDlg::TagEditDlg(QWidget *parent, TAlbum* album, bool create) d->iconButton->setIconSet(SyncJob::getTagThumbnail(d->icon, 20)); - d->resetIconButton = new QPushButton(SmallIcon("reload_page"), i18n("Reset"), page); + d->resetIconButton = new TQPushButton(SmallIcon("reload_page"), i18n("Reset"), page); if (d->create) d->resetIconButton->hide(); // -------------------------------------------------------- @@ -179,14 +179,14 @@ TagEditDlg::TagEditDlg(QWidget *parent, TAlbum* album, bool create) // -------------------------------------------------------- - connect(d->iconButton, SIGNAL(clicked()), - this, SLOT(slotIconChanged())); + connect(d->iconButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotIconChanged())); - connect(d->resetIconButton, SIGNAL(clicked()), - this, SLOT(slotIconResetClicked())); + connect(d->resetIconButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotIconResetClicked())); - connect(d->titleEdit->lineEdit(), SIGNAL(textChanged(const QString&)), - this, SLOT(slotTitleChanged(const QString&))); + connect(d->titleEdit->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotTitleChanged(const TQString&))); // -------------------------------------------------------- @@ -200,19 +200,19 @@ TagEditDlg::~TagEditDlg() delete d; } -QString TagEditDlg::title() const +TQString TagEditDlg::title() const { return d->titleEdit->text(); } -QString TagEditDlg::icon() const +TQString TagEditDlg::icon() const { return d->icon; } void TagEditDlg::slotIconResetClicked() { - d->icon = QString("tag"); + d->icon = TQString("tag"); d->iconButton->setIconSet(SyncJob::getTagThumbnail(d->icon, 20)); } @@ -221,9 +221,9 @@ void TagEditDlg::slotIconChanged() #if KDE_IS_VERSION(3,3,0) KIconDialog dlg(this); dlg.setup(KIcon::NoGroup, KIcon::Application, false, 20, false, false, false); - QString icon = dlg.openDialog(); + TQString icon = dlg.openDialog(); #else - QString icon = KIconDialog::getIcon(KIcon::NoGroup, KIcon::Application, false, 20); + TQString icon = KIconDialog::getIcon(KIcon::NoGroup, KIcon::Application, false, 20); if (icon.startsWith("/")) return; #endif @@ -235,9 +235,9 @@ void TagEditDlg::slotIconChanged() d->iconButton->setIconSet(SyncJob::getTagThumbnail(d->icon, 20)); } -void TagEditDlg::slotTitleChanged(const QString& newtitle) +void TagEditDlg::slotTitleChanged(const TQString& newtitle) { - QString tagName = d->mainRootAlbum->tagPath(); + TQString tagName = d->mainRootAlbum->tagPath(); if (tagName.endsWith("/") && !d->mainRootAlbum->isRoot()) tagName.truncate(tagName.length()-1); @@ -250,24 +250,24 @@ void TagEditDlg::slotTitleChanged(const QString& newtitle) else { d->topLabel->setText(i18n("<qt><b>Create New Tag in<br>" - "<i>\"%1\"</i></b></qt>").arg(tagName)); + "<i>\"%1\"</i></b></qt>").tqarg(tagName)); } } else { d->topLabel->setText(i18n("<qt><b>Properties of Tag<br>" - "<i>\"%1\"</i></b></qt>").arg(tagName)); + "<i>\"%1\"</i></b></qt>").tqarg(tagName)); } enableButtonOK(!newtitle.isEmpty()); } -bool TagEditDlg::tagEdit(QWidget *parent, TAlbum* album, QString& title, QString& icon) +bool TagEditDlg::tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon) { - TagEditDlg dlg(parent, album); + TagEditDlg dlg(tqparent, album); bool valRet = dlg.exec(); - if (valRet == QDialog::Accepted) + if (valRet == TQDialog::Accepted) { title = dlg.title(); icon = dlg.icon(); @@ -276,12 +276,12 @@ bool TagEditDlg::tagEdit(QWidget *parent, TAlbum* album, QString& title, QString return valRet; } -bool TagEditDlg::tagCreate(QWidget *parent, TAlbum* album, QString& title, QString& icon) +bool TagEditDlg::tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon) { - TagEditDlg dlg(parent, album, true); + TagEditDlg dlg(tqparent, album, true); bool valRet = dlg.exec(); - if (valRet == QDialog::Accepted) + if (valRet == TQDialog::Accepted) { title = dlg.title(); icon = dlg.icon(); @@ -290,8 +290,8 @@ bool TagEditDlg::tagCreate(QWidget *parent, TAlbum* album, QString& title, QStri return valRet; } -AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const QString& tagStr, const QString& icon, - QMap<QString, QString>& errMap) +AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr, const TQString& icon, + TQMap<TQString, TQString>& errMap) { errMap.clear(); AlbumList createdTagsList; @@ -299,13 +299,13 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const QString& tagStr, // Check if new tags are include in a list of tags hierarchy separated by ','. // Ex: /Country/France/people,/City/France/Paris - QStringList tagsHierarchies = QStringList::split(",", tagStr); + TQStringList tagsHierarchies = TQStringList::split(",", tagStr); if (tagsHierarchies.isEmpty()) return createdTagsList; - for (QStringList::const_iterator it = tagsHierarchies.begin(); it != tagsHierarchies.end(); ++it) + for (TQStringList::const_iterator it = tagsHierarchies.begin(); it != tagsHierarchies.end(); ++it) { - QString hierarchy = (*it).stripWhiteSpace(); + TQString hierarchy = (*it).stripWhiteSpace(); if (!hierarchy.isEmpty()) { // Check if new tags is a hierarchy of tags separated by '/'. @@ -317,19 +317,19 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const QString& tagStr, else root = mainRootAlbum; - QStringList tagsList = QStringList::split("/", hierarchy); + TQStringList tagsList = TQStringList::split("/", hierarchy); DDebug() << tagsList << endl; if (!tagsList.isEmpty()) { - for (QStringList::iterator it2 = tagsList.begin(); it2 != tagsList.end(); ++it2) + for (TQStringList::iterator it2 = tagsList.begin(); it2 != tagsList.end(); ++it2) { - QString tagPath, errMsg; - QString tag = (*it2).stripWhiteSpace(); + TQString tagPath, errMsg; + TQString tag = (*it2).stripWhiteSpace(); if (root->isRoot()) - tagPath = QString("/%1").arg(tag); + tagPath = TQString("/%1").tqarg(tag); else - tagPath = QString("%1/%2").arg(root->tagPath()).arg(tag); + tagPath = TQString("%1/%2").tqarg(root->tagPath()).tqarg(tag); DDebug() << tag << " :: " << tagPath << endl; @@ -366,38 +366,38 @@ AlbumList TagEditDlg::createTAlbum(TAlbum *mainRootAlbum, const QString& tagStr, return createdTagsList; } -void TagEditDlg::showtagsListCreationError(QWidget* parent, const QMap<QString, QString>& errMap) +void TagEditDlg::showtagsListCreationError(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap) { if (!errMap.isEmpty()) { - TagsListCreationErrorDialog dlg(parent, errMap); + TagsListCreationErrorDialog dlg(tqparent, errMap); dlg.exec(); } } // ------------------------------------------------------------------------------ -TagsListCreationErrorDialog::TagsListCreationErrorDialog(QWidget* parent, const QMap<QString, QString>& errMap) - : KDialogBase(parent, 0, true, 0, Help|Ok, Ok, false) +TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap) + : KDialogBase(tqparent, 0, true, 0, Help|Ok, Ok, false) { setHelp("tagscreation.anchor", "digikam"); setCaption(i18n("Tag creation Error")); - QWidget* box = makeMainWidget(); - QVBoxLayout* vLay = new QVBoxLayout(box); + TQWidget* box = makeMainWidget(); + TQVBoxLayout* vLay = new TQVBoxLayout(box); - QLabel *label = new QLabel(i18n("Error been occured during Tag creation:"), box); + TQLabel *label = new TQLabel(i18n("Error been occured during Tag creation:"), box); KListView *listView = new KListView(box); listView->addColumn(i18n("Tag Path")); listView->addColumn(i18n("Error")); - listView->setResizeMode(QListView::LastColumn); + listView->setResizeMode(TQListView::LastColumn); vLay->addWidget(label); vLay->addWidget(listView); vLay->setMargin(0); vLay->setSpacing(0); - for (QMap<QString, QString>::const_iterator it = errMap.begin() ; it != errMap.end() ; ++it) + for (TQMap<TQString, TQString>::const_iterator it = errMap.begin() ; it != errMap.end() ; ++it) new KListViewItem(listView, it.key(), it.data()); adjustSize(); diff --git a/digikam/digikam/tageditdlg.h b/digikam/digikam/tageditdlg.h index e51f798..18aada0 100644 --- a/digikam/digikam/tageditdlg.h +++ b/digikam/digikam/tageditdlg.h @@ -25,10 +25,10 @@ #ifndef TAGEDITDLG_H #define TAGEDITDLG_H -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqstring.h> // KDE includes. @@ -45,35 +45,36 @@ class TagEditDlgPriv; class TagEditDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagEditDlg(QWidget *parent, TAlbum* album, bool create=false); + TagEditDlg(TQWidget *tqparent, TAlbum* album, bool create=false); ~TagEditDlg(); - QString title() const; - QString icon() const; + TQString title() const; + TQString icon() const; - static bool tagEdit(QWidget *parent, TAlbum* album, QString& title, QString& icon); - static bool tagCreate(QWidget *parent, TAlbum* album, QString& title, QString& icon); + static bool tagEdit(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon); + static bool tagCreate(TQWidget *tqparent, TAlbum* album, TQString& title, TQString& icon); /** Create a list of new Tag album using a list of tags hierarchies separated by ",". A hierarchy of tags is a string path of tags name separated by "/". If a hierarchy start by "/" or if mainRootAlbum is null, it will be created from - root tag album, else it will be created from mainRootAlbum as parent album. + root tag album, else it will be created from mainRootAlbum as tqparent album. 'errMap' is Map of TAlbum path and error message if tag creation failed. Return the list of created Albums. */ - static AlbumList createTAlbum(TAlbum *mainRootAlbum, const QString& tagStr, const QString& icon, - QMap<QString, QString>& errMap); + static AlbumList createTAlbum(TAlbum *mainRootAlbum, const TQString& tagStr, const TQString& icon, + TQMap<TQString, TQString>& errMap); - static void showtagsListCreationError(QWidget* parent, const QMap<QString, QString>& errMap); + static void showtagsListCreationError(TQWidget* tqparent, const TQMap<TQString, TQString>& errMap); private slots: void slotIconChanged(); void slotIconResetClicked(); - void slotTitleChanged(const QString& newtitle); + void slotTitleChanged(const TQString& newtitle); private: diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 2fd1412..01601ab 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -23,13 +23,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qheader.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqheader.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqcursor.h> // KDE includes. @@ -78,8 +78,8 @@ class TagFilterViewItem : public FolderCheckListItem public: - TagFilterViewItem(QListView* parent, TAlbum* tag, bool untagged=false); - TagFilterViewItem(QListViewItem* parent, TAlbum* tag); + TagFilterViewItem(TQListView* tqparent, TAlbum* tag, bool untagged=false); + TagFilterViewItem(TQListViewItem* tqparent, TAlbum* tag); TAlbum* album() const; int id() const; @@ -88,12 +88,12 @@ public: void setOpen(bool o); void setCount(int count); int count(); - int compare(QListViewItem* i, int column, bool ascending) const; + int compare(TQListViewItem* i, int column, bool ascending) const; private: void stateChange(bool val); - void paintCell(QPainter* p, const QColorGroup & cg, int column, int width, int align); + void paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align); private: @@ -104,9 +104,9 @@ private: TAlbum *m_album; }; -TagFilterViewItem::TagFilterViewItem(QListView* parent, TAlbum* album, bool untagged) - : FolderCheckListItem(parent, album ? album->title() : i18n("Not Tagged"), - QCheckListItem::CheckBox/*Controller*/) +TagFilterViewItem::TagFilterViewItem(TQListView* tqparent, TAlbum* album, bool untagged) + : FolderCheckListItem(tqparent, album ? album->title() : i18n("Not Tagged"), + TQCheckListItem::CheckBox/*Controller*/) { m_album = album; m_untagged = untagged; @@ -117,9 +117,9 @@ TagFilterViewItem::TagFilterViewItem(QListView* parent, TAlbum* album, bool unta m_album->setExtraData(listView(), this); } -TagFilterViewItem::TagFilterViewItem(QListViewItem* parent, TAlbum* album) - : FolderCheckListItem(parent, album->title(), - QCheckListItem::CheckBox/*Controller*/) +TagFilterViewItem::TagFilterViewItem(TQListViewItem* tqparent, TAlbum* album) + : FolderCheckListItem(tqparent, album->title(), + TQCheckListItem::CheckBox/*Controller*/) { m_album = album; m_untagged = false; @@ -137,7 +137,7 @@ void TagFilterViewItem::refresh() if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount()) { if (isOpen()) - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(m_count)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); else { int countRecursive = m_count; @@ -149,7 +149,7 @@ void TagFilterViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); } } else @@ -160,15 +160,15 @@ void TagFilterViewItem::refresh() void TagFilterViewItem::stateChange(bool val) { - QCheckListItem::stateChange(val); + TQCheckListItem::stateChange(val); /* NOTE G.Caulier 2007/01/08: this code is now disable because TagFilterViewItem - have been changed from QCheckListItem::CheckBoxController - to QCheckListItem::CheckBox. + have been changed from TQCheckListItem::CheckBoxController + to TQCheckListItem::CheckBox. - // All TagFilterViewItems are CheckBoxControllers. If they have no children, + // All TagFilterViewItems are CheckBoxControllers. If they have no tqchildren, // they should be of type CheckBox, but that is not possible with our way of adding items. - // When clicked, children-less items first change to the NoChange state, and a second + // When clicked, tqchildren-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) @@ -180,7 +180,7 @@ void TagFilterViewItem::stateChange(bool val) ((TagFilterView*)listView())->stateChanged(this); } -int TagFilterViewItem::compare(QListViewItem* i, int column, bool ascending) const +int TagFilterViewItem::compare(TQListViewItem* i, int column, bool ascending) const { if (m_untagged) return 1; @@ -192,10 +192,10 @@ int TagFilterViewItem::compare(QListViewItem* i, int column, bool ascending) con if (dItem && dItem->m_untagged) return -1; - return QListViewItem::compare(i, column, ascending); + return TQListViewItem::compare(i, column, ascending); } -void TagFilterViewItem::paintCell(QPainter* p, const QColorGroup & cg, int column, int width, int align) +void TagFilterViewItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { if (!m_untagged) { @@ -203,20 +203,20 @@ void TagFilterViewItem::paintCell(QPainter* p, const QColorGroup & cg, int colum return; } - QFont f(listView()->font()); + TQFont f(listView()->font()); f.setBold(true); f.setItalic(true); p->setFont(f); - QColorGroup mcg(cg); - mcg.setColor(QColorGroup::Text, Qt::darkRed); + TQColorGroup mcg(cg); + mcg.setColor(TQColorGroup::Text, TQt::darkRed); FolderCheckListItem::paintCell(p, mcg, column, width, align); } void TagFilterViewItem::setOpen(bool o) { - QListViewItem::setOpen(o); + TQListViewItem::setOpen(o); refresh(); } @@ -261,23 +261,23 @@ public: matchingCond = AlbumLister::OrCondition; } - QTimer *timer; + TQTimer *timer; - QPopupMenu *ABCMenu; + TQPopupMenu *ABCMenu; TagFilterView::ToggleAutoTags toggleAutoTags; AlbumLister::MatchingCondition matchingCond; }; -TagFilterView::TagFilterView(QWidget* parent) - : FolderView(parent, "TagFilterView") +TagFilterView::TagFilterView(TQWidget* tqparent) + : FolderView(tqparent, "TagFilterView") { d = new TagFilterViewPrivate; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); addColumn(i18n("Tag Filters")); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(true); setAcceptDrops(true); @@ -288,45 +288,45 @@ TagFilterView::TagFilterView(QWidget* parent) // ------------------------------------------------------------------------ - connect(AlbumManager::instance(), SIGNAL(signalTAlbumsDirty(const QMap<int, int>&)), - this, SLOT(slotRefresh(const QMap<int, int>&))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotTagAdded(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotTagAdded(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotTagDeleted(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotTagDeleted(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotTagRenamed(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotTagRenamed(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumsCleared()), - this, SLOT(slotClear())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotClear())); - connect(AlbumManager::instance(), SIGNAL(signalAlbumIconChanged(Album*)), - this, SLOT(slotAlbumIconChanged(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQT_SLOT(slotAlbumIconChanged(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, SLOT(slotTagMoved(TAlbum*, TAlbum*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQT_SLOT(slotTagMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, SIGNAL(signalThumbnail(Album *, const QPixmap&)), - this, SLOT(slotGotThumbnailFromIcon(Album *, const QPixmap&))); + connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, SIGNAL(signalFailed(Album *)), - this, SLOT(slotThumbnailLost(Album *))); + connect(loader, TQT_SIGNAL(signalFailed(Album *)), + this, TQT_SLOT(slotThumbnailLost(Album *))); - connect(loader, SIGNAL(signalReloadThumbnails()), - this, SLOT(slotReloadThumbnails())); + connect(loader, TQT_SIGNAL(signalReloadThumbnails()), + this, TQT_SLOT(slotReloadThumbnails())); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeOut())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeOut())); // ------------------------------------------------------------------------ @@ -352,7 +352,7 @@ TagFilterView::~TagFilterView() delete d; } -void TagFilterView::slotTextTagFilterChanged(const QString& filter) +void TagFilterView::slotTextTagFilterChanged(const TQString& filter) { if (filter.isEmpty()) { @@ -360,7 +360,7 @@ void TagFilterView::slotTextTagFilterChanged(const QString& filter) return; } - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -373,31 +373,31 @@ void TagFilterView::slotTextTagFilterChanged(const QString& filter) if (talbum->isRoot()) continue; - bool match = talbum->title().lower().contains(search); + bool match = talbum->title().lower().tqcontains(search); bool doesExpand = false; if (!match) { - // check if any of the parents match the search - Album* parent = talbum->parent(); - while (parent && !parent->isRoot()) + // check if any of the tqparents match the search + Album* tqparent = talbum->tqparent(); + while (tqparent && !tqparent->isRoot()) { - if (parent->title().lower().contains(search)) + if (tqparent->title().lower().tqcontains(search)) { match = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } if (!match) { - // check if any of the children match the search + // check if any of the tqchildren match the search AlbumIterator it(talbum); while (it.current()) { - if ((*it)->title().lower().contains(search)) + if ((*it)->title().lower().tqcontains(search)) { match = true; doesExpand = true; @@ -466,7 +466,7 @@ void TagFilterView::triggerChange() d->timer->start(50, true); } -QDragObject* TagFilterView::dragObject() +TQDragObject* TagFilterView::dragObject() { TagFilterViewItem *item = dynamic_cast<TagFilterViewItem*>(dragItem()); if(!item) @@ -478,9 +478,9 @@ QDragObject* TagFilterView::dragObject() return t; } -bool TagFilterView::acceptDrop(const QDropEvent *e) const +bool TagFilterView::acceptDrop(const TQDropEvent *e) const { - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TagFilterViewItem *itemDrop = dynamic_cast<TagFilterViewItem*>(itemAt(vp)); TagFilterViewItem *itemDrag = dynamic_cast<TagFilterViewItem*>(dragItem()); @@ -498,7 +498,7 @@ bool TagFilterView::acceptDrop(const QDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a parent on its child makes no sense + // Dragging a tqparent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; @@ -511,7 +511,7 @@ bool TagFilterView::acceptDrop(const QDropEvent *e) const if (tag) { - if (tag->parent()) + if (tag->tqparent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped @@ -524,14 +524,14 @@ bool TagFilterView::acceptDrop(const QDropEvent *e) const return false; } -void TagFilterView::contentsDropEvent(QDropEvent *e) +void TagFilterView::contentsDropEvent(TQDropEvent *e) { FolderView::contentsDropEvent(e); if (!acceptDrop(e)) return; - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TagFilterViewItem *itemDrop = dynamic_cast<TagFilterViewItem*>(itemAt(vp)); if (!itemDrop || itemDrop->untagged()) @@ -539,8 +539,8 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -559,7 +559,7 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel"), 20); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); if(id == 10) { @@ -576,7 +576,7 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) newParentTag = itemDrop->album(); } - QString errMsg; + TQString errMsg; if (!AlbumManager::instance()->moveTAlbum(talbum, newParentTag, errMsg)) { KMessageBox::error(this, errMsg); @@ -595,8 +595,8 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (!ItemDrag::decode(e, urls, kioURLs, albumIDs, imageIDs)) return; @@ -623,13 +623,13 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters")); popMenu.insertItem(SmallIcon("tag"), i18n("Assign Tag '%1' to Items") - .arg(destAlbum->prettyURL()), 10) ; + .tqarg(destAlbum->prettyURL()), 10) ; popMenu.insertItem(i18n("Set as Tag Thumbnail"), 11); popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel")); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if (id == 10) @@ -640,7 +640,7 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) AlbumLister::instance()->blockSignals(true); AlbumManager::instance()->albumDB()->beginTransaction(); int i=0; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { // create temporary ImageInfo object @@ -660,12 +660,12 @@ void TagFilterView::contentsDropEvent(QDropEvent *e) ImageAttributesWatch::instance()->imagesChanged(destAlbum->id()); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } else if(id == 11) { - QString errMsg; - AlbumManager::instance()->updateTAlbumIcon(destAlbum, QString(), + TQString errMsg; + AlbumManager::instance()->updateTAlbumIcon(destAlbum, TQString(), imageIDs.first(), errMsg); } } @@ -680,21 +680,21 @@ void TagFilterView::slotTagAdded(Album* album) if (!tag) return; - if (tag->parent()->isRoot()) + if (tag->tqparent()->isRoot()) { new TagFilterViewItem(this, tag); } else { - TagFilterViewItem* parent = (TagFilterViewItem*)(tag->parent()->extraData(this)); - if (!parent) + TagFilterViewItem* tqparent = (TagFilterViewItem*)(tag->tqparent()->extraData(this)); + if (!tqparent) { - DWarning() << k_funcinfo << " Failed to find parent for Tag " + DWarning() << k_funcinfo << " Failed to find tqparent for Tag " << tag->tagPath() << endl; return; } - new TagFilterViewItem(parent, tag); + new TagFilterViewItem(tqparent, tag); } setTagThumbnail(tag); @@ -723,9 +723,9 @@ void TagFilterView::slotTagMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->parent()) + if (item->tqparent()) { - QListViewItem* oldPItem = item->parent(); + TQListViewItem* oldPItem = item->tqparent(); oldPItem->takeItem(item); TagFilterViewItem* newPItem = (TagFilterViewItem*)(newParent->extraData(this)); @@ -760,7 +760,7 @@ void TagFilterView::slotTagDeleted(Album* album) if (!item) return; - // NOTE: see B.K.O #158558: unselected tag filter and all childrens before to delete it. + // NOTE: see B.K.O #158558: unselected tag filter and all tqchildrens before to delete it. toggleChildTags(item, false); item->setOn(false); @@ -779,7 +779,7 @@ void TagFilterView::setTagThumbnail(TAlbum *album) return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap icon; + TQPixmap icon; if (!loader->getTagThumbnail(album, icon)) { if (icon.isNull()) @@ -788,7 +788,7 @@ void TagFilterView::setTagThumbnail(TAlbum *album) } else { - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); item->setPixmap(0, blendedIcon); } } @@ -799,7 +799,7 @@ void TagFilterView::setTagThumbnail(TAlbum *album) } } -void TagFilterView::slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail) +void TagFilterView::slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail) { if(!album || album->type() != Album::TAG) return; @@ -810,7 +810,7 @@ void TagFilterView::slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbn return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); item->setPixmap(0, blendedIcon); } @@ -847,11 +847,11 @@ void TagFilterView::slotClear() void TagFilterView::slotTimeOut() { - QValueList<int> filterTags; + TQValueList<int> filterTags; bool showUnTagged = false; - QListViewItemIterator it(this, QListViewItemIterator::Checked); + TQListViewItemIterator it(this, TQListViewItemIterator::Checked); while (it.current()) { TagFilterViewItem* item = (TagFilterViewItem*)it.current(); @@ -865,16 +865,16 @@ void TagFilterView::slotTimeOut() AlbumLister::instance()->setTagFilter(filterTags, d->matchingCond, showUnTagged); } -void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) +void TagFilterView::slotContextMenu(TQListViewItem* it, const TQPoint&, int) { TagFilterViewItem *item = dynamic_cast<TagFilterViewItem*>(it); if (item && item->untagged()) return; - d->ABCMenu = new QPopupMenu; + d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, SIGNAL( aboutToShow() ), - this, SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotABCContextMenu() )); KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters")); @@ -891,7 +891,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) popmenu.insertSeparator(-1); - QPopupMenu selectTagsMenu; + TQPopupMenu selectTagsMenu; selectTagsMenu.insertItem(i18n("All Tags"), 14); if (item) { @@ -901,7 +901,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) } popmenu.insertItem(i18n("Select"), &selectTagsMenu); - QPopupMenu deselectTagsMenu; + TQPopupMenu deselectTagsMenu; deselectTagsMenu.insertItem(i18n("All Tags"), 15); if (item) { @@ -914,7 +914,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) popmenu.insertItem(i18n("Invert Selection"), 16); popmenu.insertSeparator(-1); - QPopupMenu toggleAutoMenu; + TQPopupMenu toggleAutoMenu; toggleAutoMenu.setCheckable(true); toggleAutoMenu.insertItem(i18n("None"), 21); toggleAutoMenu.insertSeparator(-1); @@ -924,7 +924,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) toggleAutoMenu.setItemChecked(21 + d->toggleAutoTags, true); popmenu.insertItem(i18n("Toggle Auto"), &toggleAutoMenu); - QPopupMenu matchingCongMenu; + TQPopupMenu matchingCongMenu; matchingCongMenu.setCheckable(true); matchingCongMenu.insertItem(i18n("Or Between Tags"), 25); matchingCongMenu.insertItem(i18n("And Between Tags"), 26); @@ -933,7 +933,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) ToggleAutoTags oldAutoTags = d->toggleAutoTags; - int choice = popmenu.exec((QCursor::pos())); + int choice = popmenu.exec((TQCursor::pos())); switch( choice ) { case 10: // New Tag. @@ -953,14 +953,14 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) } case 13: // Reset Tag Icon. { - QString errMsg; - AlbumManager::instance()->updateTAlbumIcon(item->album(), QString("tag"), 0, errMsg); + TQString errMsg; + AlbumManager::instance()->updateTAlbumIcon(item->album(), TQString("tag"), 0, errMsg); break; } case 14: // Select All Tags. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(this, QListViewItemIterator::NotChecked); + TQListViewItemIterator it(this, TQListViewItemIterator::NotChecked); while (it.current()) { TagFilterViewItem* item = (TagFilterViewItem*)it.current(); @@ -978,7 +978,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) case 15: // Deselect All Tags. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(this, QListViewItemIterator::Checked); + TQListViewItemIterator it(this, TQListViewItemIterator::Checked); while (it.current()) { TagFilterViewItem* item = (TagFilterViewItem*)it.current(); @@ -996,7 +996,7 @@ void TagFilterView::slotContextMenu(QListViewItem* it, const QPoint&, int) case 16: // Invert All Tags Selection. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { TagFilterViewItem* item = (TagFilterViewItem*)it.current(); @@ -1098,7 +1098,7 @@ void TagFilterView::slotABCContextMenu() int counter = 100; KABC::AddressBook* ab = KABC::StdAddressBook::self(); - QStringList names; + TQStringList names; for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); @@ -1106,9 +1106,9 @@ void TagFilterView::slotABCContextMenu() qHeapSort(names); - for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) + for ( TQStringList::Iterator it = names.begin(); it != names.end(); ++it ) { - QString name = *it; + TQString name = *it; if ( !name.isNull() ) d->ABCMenu->insertItem( name, ++counter ); } @@ -1120,27 +1120,27 @@ void TagFilterView::slotABCContextMenu() } } -void TagFilterView::tagNew(TagFilterViewItem* item, const QString& _title, const QString& _icon) +void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, const TQString& _icon) { - TAlbum *parent; - QString title = _title; - QString icon = _icon; + TAlbum *tqparent; + TQString title = _title; + TQString icon = _icon; AlbumManager *man = AlbumManager::instance(); if (!item) - parent = man->findTAlbum(0); + tqparent = man->findTAlbum(0); else - parent = item->album(); + tqparent = item->album(); if (title.isNull()) { - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) return; } - QMap<QString, QString> errMap; - AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TQMap<TQString, TQString> errMap; + AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -1164,8 +1164,8 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) if (!tag) return; - QString title, icon; - if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) + TQString title, icon; + if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) { return; } @@ -1174,7 +1174,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) if (tag->title() != title) { - QString errMsg; + TQString errMsg; if(!man->renameTAlbum(tag, title, errMsg)) KMessageBox::error(0, errMsg); else @@ -1183,7 +1183,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item) if (tag->icon() != icon) { - QString errMsg; + TQString errMsg; if (!man->updateTAlbumIcon(tag, icon, 0, errMsg)) KMessageBox::error(0, errMsg); else @@ -1201,17 +1201,17 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) return; // find number of subtags - int children = 0; + int tqchildren = 0; AlbumIterator iter(tag); while(iter.current()) { - children++; + tqchildren++; ++iter; } AlbumManager* man = AlbumManager::instance(); - if (children) + if (tqchildren) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -1222,13 +1222,13 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - children).arg(tag->title())); + tqchildren).tqarg(tag->title())); if(result != KMessageBox::Continue) return; } - QString message; + TQString message; LLongList assignedItems = man->albumDB()->getItemIDsInTag(tag->id()); if (!assignedItems.isEmpty()) { @@ -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()).arg(tag->title()); + assignedItems.count()).tqarg(tag->title()); } else { - message = i18n("Delete '%1' tag?").arg(tag->title()); + message = i18n("Delete '%1' tag?").tqarg(tag->title()); } int result = KMessageBox::warningContinueCancel(0, message, @@ -1250,7 +1250,7 @@ void TagFilterView::tagDelete(TagFilterViewItem* item) if (result == KMessageBox::Continue) { - QString errMsg; + TQString errMsg; if (!man->deleteTAlbum(tag, errMsg)) KMessageBox::error(0, errMsg); } @@ -1288,7 +1288,7 @@ void TagFilterView::toggleParentTags(TagFilterViewItem* tItem, bool b) if (!album) return; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { TagFilterViewItem* item = dynamic_cast<TagFilterViewItem*>(it.current()); @@ -1297,7 +1297,7 @@ void TagFilterView::toggleParentTags(TagFilterViewItem* tItem, bool b) Album *a = dynamic_cast<Album*>(item->album()); if (a) { - if (a == album->parent()) + if (a == album->tqparent()) { item->setOn(b); toggleParentTags(item, b); @@ -1310,7 +1310,7 @@ void TagFilterView::toggleParentTags(TagFilterViewItem* tItem, bool b) void TagFilterView::refresh() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1321,9 +1321,9 @@ void TagFilterView::refresh() } } -void TagFilterView::slotRefresh(const QMap<int, int>& tagsStatMap) +void TagFilterView::slotRefresh(const TQMap<int, int>& tagsStatMap) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1333,7 +1333,7 @@ void TagFilterView::slotRefresh(const QMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - QMap<int, int>::const_iterator it2 = tagsStatMap.find(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } @@ -1346,7 +1346,7 @@ void TagFilterView::slotRefresh(const QMap<int, int>& tagsStatMap) void TagFilterView::slotResetTagFilters() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1364,7 +1364,7 @@ void TagFilterView::loadViewState() int selectedItem = config->readNumEntry("LastSelectedItem", 0); - QValueList<int> openFolders; + TQValueList<int> openFolders; if(config->hasKey("OpenFolders")) { openFolders = config->readIntListEntry("OpenFolders"); @@ -1372,7 +1372,7 @@ void TagFilterView::loadViewState() TagFilterViewItem *item = 0; TagFilterViewItem *foundItem = 0; - QListViewItemIterator it(this->lastItem()); + TQListViewItemIterator it(this->lastItem()); for( ; it.current(); --it) { @@ -1381,7 +1381,7 @@ void TagFilterView::loadViewState() continue; // Start the album root always open - if(openFolders.contains(item->id()) || item->id() == 0) + if(openFolders.tqcontains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); @@ -1396,7 +1396,7 @@ void TagFilterView::loadViewState() // Important note: this cannot be done inside the previous loop // because opening folders prevents the visibility. // Fixes bug #144815. - // (Looks a bit like a bug in Qt to me ...) + // (Looks a bit like a bug in TQt to me ...) if (foundItem) { setSelected(foundItem, true); @@ -1415,8 +1415,8 @@ void TagFilterView::saveViewState() else config->writeEntry("LastSelectedItem", 0); - QValueList<int> openFolders; - QListViewItemIterator it(this); + TQValueList<int> openFolders; + TQListViewItemIterator it(this); for( ; it.current(); ++it) { item = dynamic_cast<TagFilterViewItem*>(it.current()); diff --git a/digikam/digikam/tagfilterview.h b/digikam/digikam/tagfilterview.h index 59fbc1f..34579f1 100644 --- a/digikam/digikam/tagfilterview.h +++ b/digikam/digikam/tagfilterview.h @@ -40,6 +40,7 @@ class TagFilterViewPrivate; class TagFilterView : public FolderView { Q_OBJECT + TQ_OBJECT public: @@ -53,7 +54,7 @@ public: public: - TagFilterView(QWidget* parent); + TagFilterView(TQWidget* tqparent); ~TagFilterView(); void stateChanged(TagFilterViewItem*); @@ -61,22 +62,22 @@ public: signals: - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalTextTagFilterMatch(bool); public slots: - void slotTextTagFilterChanged(const QString&); + void slotTextTagFilterChanged(const TQString&); /** Reset all active tag filters */ void slotResetTagFilters(); protected: - bool acceptDrop(const QDropEvent *e) const; - void contentsDropEvent(QDropEvent *e); - QDragObject* dragObject(); + bool acceptDrop(const TQDropEvent *e) const; + void contentsDropEvent(TQDropEvent *e); + TQDragObject* dragObject(); private slots: @@ -87,18 +88,18 @@ private slots: void slotClear(); void slotAlbumIconChanged(Album* album); void slotTimeOut(); - void slotContextMenu(QListViewItem*, const QPoint&, int); + void slotContextMenu(TQListViewItem*, const TQPoint&, int); void slotABCContextMenu(); - void slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail); + void slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail); void slotThumbnailLost(Album *album); void slotReloadThumbnails(); - void slotRefresh(const QMap<int, int>&); + void slotRefresh(const TQMap<int, int>&); private: void triggerChange(); - void tagNew(TagFilterViewItem* item, const QString& _title=QString(), - const QString& _icon=QString()); + void tagNew(TagFilterViewItem* item, const TQString& _title=TQString(), + const TQString& _icon=TQString()); void tagEdit(TagFilterViewItem* item); void tagDelete(TagFilterViewItem* item); void setTagThumbnail(TAlbum *album); diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 022453f..b22444d 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -23,11 +23,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qcursor.h> -#include <qlistview.h> +#include <tqpainter.h> +#include <tqcursor.h> +#include <tqlistview.h> // KDE includes. @@ -74,8 +74,8 @@ class TagFolderViewItem : public FolderItem public: - TagFolderViewItem(QListView *parent, TAlbum *album); - TagFolderViewItem(QListViewItem *parent, TAlbum *album); + TagFolderViewItem(TQListView *tqparent, TAlbum *album); + TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album); TAlbum* album() const; int id() const; @@ -91,16 +91,16 @@ private: TAlbum *m_album; }; -TagFolderViewItem::TagFolderViewItem(QListView *parent, TAlbum *album) - : FolderItem(parent, album->title()) +TagFolderViewItem::TagFolderViewItem(TQListView *tqparent, TAlbum *album) + : FolderItem(tqparent, album->title()) { setDragEnabled(true); m_album = album; m_count = 0; } -TagFolderViewItem::TagFolderViewItem(QListViewItem *parent, TAlbum *album) - : FolderItem(parent, album->title()) +TagFolderViewItem::TagFolderViewItem(TQListViewItem *tqparent, TAlbum *album) + : FolderItem(tqparent, album->title()) { setDragEnabled(true); m_album = album; @@ -112,10 +112,10 @@ void TagFolderViewItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast<TagFolderViewItem*>(parent())) + dynamic_cast<TagFolderViewItem*>(tqparent())) { if (isOpen()) - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(m_count)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); else { int countRecursive = m_count; @@ -127,7 +127,7 @@ void TagFolderViewItem::refresh() countRecursive += item->count(); ++it; } - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); } } else @@ -138,7 +138,7 @@ void TagFolderViewItem::refresh() void TagFolderViewItem::setOpen(bool o) { - QListViewItem::setOpen(o); + TQListViewItem::setOpen(o); refresh(); } @@ -176,64 +176,64 @@ public: albumMan = 0; } - QPopupMenu *ABCMenu; + TQPopupMenu *ABCMenu; AlbumManager *albumMan; }; -TagFolderView::TagFolderView(QWidget *parent) - : FolderView(parent, "TagFolderView") +TagFolderView::TagFolderView(TQWidget *tqparent) + : FolderView(tqparent, "TagFolderView") { d = new TagFolderViewPriv(); d->albumMan = AlbumManager::instance(); addColumn(i18n("My Tags")); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); setAcceptDrops(true); viewport()->setAcceptDrops(true); // ------------------------------------------------------------------------ - connect(d->albumMan, SIGNAL(signalTAlbumsDirty(const QMap<int, int>&)), - this, SLOT(slotRefresh(const QMap<int, int>&))); + connect(d->albumMan, TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); - connect(d->albumMan, SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotAlbumRenamed(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotAlbumRenamed(Album*))); - connect(d->albumMan, SIGNAL(signalAlbumsCleared()), - this, SLOT(slotAlbumsCleared())); + connect(d->albumMan, TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotAlbumsCleared())); - connect(d->albumMan, SIGNAL(signalAlbumIconChanged(Album*)), - this, SLOT(slotAlbumIconChanged(Album*))); + connect(d->albumMan, TQT_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQT_SLOT(slotAlbumIconChanged(Album*))); - connect(d->albumMan, SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(d->albumMan, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // ------------------------------------------------------------------------ AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, SIGNAL(signalThumbnail(Album *, const QPixmap&)), - this, SLOT(slotGotThumbnailFromIcon(Album *, const QPixmap&))); + connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, SIGNAL(signalFailed(Album *)), - this, SLOT(slotThumbnailLost(Album *))); + connect(loader, TQT_SIGNAL(signalFailed(Album *)), + this, TQT_SLOT(slotThumbnailLost(Album *))); - connect(loader, SIGNAL(signalReloadThumbnails()), - this, SLOT(slotReloadThumbnails())); + connect(loader, TQT_SIGNAL(signalReloadThumbnails()), + this, TQT_SLOT(slotReloadThumbnails())); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); } TagFolderView::~TagFolderView() @@ -242,7 +242,7 @@ TagFolderView::~TagFolderView() delete d; } -void TagFolderView::slotTextTagFilterChanged(const QString& filter) +void TagFolderView::slotTextTagFilterChanged(const TQString& filter) { if (filter.isEmpty()) { @@ -250,7 +250,7 @@ void TagFolderView::slotTextTagFilterChanged(const QString& filter) return; } - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -263,31 +263,31 @@ void TagFolderView::slotTextTagFilterChanged(const QString& filter) if (talbum->isRoot()) continue; - bool match = talbum->title().lower().contains(search); + bool match = talbum->title().lower().tqcontains(search); bool doesExpand = false; if (!match) { - // check if any of the parents match the search - Album* parent = talbum->parent(); - while (parent && !parent->isRoot()) + // check if any of the tqparents match the search + Album* tqparent = talbum->tqparent(); + while (tqparent && !tqparent->isRoot()) { - if (parent->title().lower().contains(search)) + if (tqparent->title().lower().tqcontains(search)) { match = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } if (!match) { - // check if any of the children match the search + // check if any of the tqchildren match the search AlbumIterator it(talbum); while (it.current()) { - if ((*it)->title().lower().contains(search)) + if ((*it)->title().lower().tqcontains(search)) { match = true; doesExpand = true; @@ -337,22 +337,22 @@ void TagFolderView::slotAlbumAdded(Album *album) { item = new TagFolderViewItem(this, tag); tag->setExtraData(this, item); - // Toplevel tags are all children of root, and should always be visible - set root to open + // Toplevel tags are all tqchildren of root, and should always be visible - set root to open item->setOpen(true); } else { - TagFolderViewItem *parent = - (TagFolderViewItem*)tag->parent()->extraData(this); + TagFolderViewItem *tqparent = + (TagFolderViewItem*)tag->tqparent()->extraData(this); - if (!parent) + if (!tqparent) { - DWarning() << k_funcinfo << " Failed to find parent for Tag " + DWarning() << k_funcinfo << " Failed to find tqparent for Tag " << tag->title() << endl; return; } - item = new TagFolderViewItem(parent, tag); + item = new TagFolderViewItem(tqparent, tag); tag->setExtraData(this, item); } @@ -371,7 +371,7 @@ void TagFolderView::slotAlbumDeleted(Album *album) TagFolderViewItem *item = (TagFolderViewItem*)album->extraData(this); if(item) { - TagFolderViewItem *itemParent = dynamic_cast<TagFolderViewItem*>(item->parent()); + TagFolderViewItem *itemParent = dynamic_cast<TagFolderViewItem*>(item->tqparent()); if(itemParent) itemParent->takeItem(item); @@ -396,9 +396,9 @@ void TagFolderView::slotAlbumMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->parent()) + if (item->tqparent()) { - QListViewItem* oldPItem = item->parent(); + TQListViewItem* oldPItem = item->tqparent(); oldPItem->takeItem(item); } else @@ -438,7 +438,7 @@ void TagFolderView::setTagThumbnail(TAlbum *album) return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap icon; + TQPixmap icon; if (!loader->getTagThumbnail(album, icon)) { if (icon.isNull()) @@ -447,7 +447,7 @@ void TagFolderView::setTagThumbnail(TAlbum *album) } else { - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); item->setPixmap(0, blendedIcon); } } @@ -458,7 +458,7 @@ void TagFolderView::setTagThumbnail(TAlbum *album) } } -void TagFolderView::slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail) +void TagFolderView::slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail) { if(!album || album->type() != Album::TAG) return; @@ -469,7 +469,7 @@ void TagFolderView::slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbn return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); item->setPixmap(0, blendedIcon); } @@ -501,8 +501,8 @@ void TagFolderView::slotSelectionChanged() if (!active()) return; - QListViewItem* selItem = 0; - QListViewItemIterator it(this); + TQListViewItem* selItem = 0; + TQListViewItemIterator it(this); while (it.current()) { if (it.current()->isSelected()) @@ -529,12 +529,12 @@ void TagFolderView::slotSelectionChanged() d->albumMan->setCurrentAlbum(tagitem->album()); } -void TagFolderView::slotContextMenu(QListViewItem *item, const QPoint &, int) +void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int) { - d->ABCMenu = new QPopupMenu; + d->ABCMenu = new TQPopupMenu; - connect( d->ABCMenu, SIGNAL( aboutToShow() ), - this, SLOT( slotABCContextMenu() ) ); + connect( d->ABCMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotABCContextMenu() ) ); TagFolderViewItem *tag = dynamic_cast<TagFolderViewItem*>(item); @@ -543,7 +543,7 @@ void TagFolderView::slotContextMenu(QListViewItem *item, const QPoint &, int) popmenu.insertItem(SmallIcon("tag-new"), i18n("New Tag..."), 10); popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu); - if(tag && tag->parent()) + if(tag && tag->tqparent()) { popmenu.insertItem(SmallIcon("tag-properties"), i18n("Edit Tag Properties..."), 11); popmenu.insertItem(SmallIcon("tag-reset"), i18n("Reset Tag Icon"), 13); @@ -551,7 +551,7 @@ void TagFolderView::slotContextMenu(QListViewItem *item, const QPoint &, int) popmenu.insertItem(SmallIcon("tag-delete"), i18n("Delete Tag"), 12); } - int choice = popmenu.exec((QCursor::pos())); + int choice = popmenu.exec((TQCursor::pos())); switch( choice ) { case 10: @@ -571,8 +571,8 @@ void TagFolderView::slotContextMenu(QListViewItem *item, const QPoint &, int) } case 13: { - QString errMsg; - d->albumMan->updateTAlbumIcon(tag->album(), QString("tag"), 0, errMsg); + TQString errMsg; + d->albumMan->updateTAlbumIcon(tag->album(), TQString("tag"), 0, errMsg); break; } default: @@ -594,7 +594,7 @@ void TagFolderView::slotABCContextMenu() int counter = 100; KABC::AddressBook* ab = KABC::StdAddressBook::self(); - QStringList names; + TQStringList names; for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); @@ -602,9 +602,9 @@ void TagFolderView::slotABCContextMenu() qHeapSort(names); - for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) + for ( TQStringList::Iterator it = names.begin(); it != names.end(); ++it ) { - QString name = *it; + TQString name = *it; if ( !name.isNull() ) d->ABCMenu->insertItem( name, ++counter ); } @@ -622,26 +622,26 @@ void TagFolderView::tagNew() tagNew(item); } -void TagFolderView::tagNew( TagFolderViewItem *item, const QString& _title, const QString& _icon ) +void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, const TQString& _icon ) { - QString title = _title; - QString icon = _icon; - TAlbum *parent; + TQString title = _title; + TQString icon = _icon; + TAlbum *tqparent; if(!item) - parent = d->albumMan->findTAlbum(0); + tqparent = d->albumMan->findTAlbum(0); else - parent = item->album(); + tqparent = item->album(); if (title.isNull()) { - if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + if(!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) return; } - QMap<QString, QString> errMap; - AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TQMap<TQString, TQString> errMap; + AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -666,13 +666,13 @@ void TagFolderView::tagEdit(TagFolderViewItem *item) if(!tag) return; - QString title, icon; - if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon)) + TQString title, icon; + if(!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), tag, title, icon)) return; if(tag->title() != title) { - QString errMsg; + TQString errMsg; if(!d->albumMan->renameTAlbum(tag, title, errMsg)) KMessageBox::error(0, errMsg); else @@ -681,7 +681,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item) if(tag->icon() != icon) { - QString errMsg; + TQString errMsg; if (!d->albumMan->updateTAlbumIcon(tag, icon, 0, errMsg)) KMessageBox::error(0, errMsg); else @@ -705,15 +705,15 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) return; // find number of subtags - int children = 0; + int tqchildren = 0; AlbumIterator iter(tag); while(iter.current()) { - children++; + tqchildren++; ++iter; } - if(children) + if(tqchildren) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -724,13 +724,13 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - children).arg(tag->title())); + tqchildren).tqarg(tag->title())); if(result != KMessageBox::Continue) return; } - QString message; + TQString message; LLongList assignedItems = d->albumMan->albumDB()->getItemIDsInTag(tag->id()); if (!assignedItems.isEmpty()) { @@ -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()).arg(tag->title()); + assignedItems.count()).tqarg(tag->title()); } else { - message = i18n("Delete '%1' tag?").arg(tag->title()); + message = i18n("Delete '%1' tag?").tqarg(tag->title()); } int result = KMessageBox::warningContinueCancel(0, message, @@ -752,19 +752,19 @@ void TagFolderView::tagDelete(TagFolderViewItem *item) if(result == KMessageBox::Continue) { - QString errMsg; + TQString errMsg; if (!d->albumMan->deleteTAlbum(tag, errMsg)) KMessageBox::error(0, errMsg); } } -QDragObject* TagFolderView::dragObject() +TQDragObject* TagFolderView::dragObject() { TagFolderViewItem *item = dynamic_cast<TagFolderViewItem*>(dragItem()); if(!item) return 0; - if(!item->parent()) + if(!item->tqparent()) return 0; TagDrag *t = new TagDrag(item->album()->id(), this); @@ -773,9 +773,9 @@ QDragObject* TagFolderView::dragObject() return t; } -bool TagFolderView::acceptDrop(const QDropEvent *e) const +bool TagFolderView::acceptDrop(const TQDropEvent *e) const { - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TagFolderViewItem *itemDrop = dynamic_cast<TagFolderViewItem*>(itemAt(vp)); TagFolderViewItem *itemDrag = dynamic_cast<TagFolderViewItem*>(dragItem()); @@ -789,14 +789,14 @@ bool TagFolderView::acceptDrop(const QDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a parent on its child makes no sense + // Dragging a tqparent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; return true; } - if (ItemDrag::canDecode(e) && itemDrop && itemDrop->parent()) + if (ItemDrag::canDecode(e) && itemDrop && itemDrop->tqparent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped @@ -807,14 +807,14 @@ bool TagFolderView::acceptDrop(const QDropEvent *e) const return false; } -void TagFolderView::contentsDropEvent(QDropEvent *e) +void TagFolderView::contentsDropEvent(TQDropEvent *e) { FolderView::contentsDropEvent(e); if(!acceptDrop(e)) return; - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TagFolderViewItem *itemDrop = dynamic_cast<TagFolderViewItem*>(itemAt(vp)); if (!itemDrop) @@ -822,8 +822,8 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -841,7 +841,7 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel"), 20); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); if(id == 10) { @@ -858,7 +858,7 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) newParentTag = itemDrop->album(); } - QString errMsg; + TQString errMsg; if (!d->albumMan->moveTAlbum(talbum, newParentTag, errMsg)) { KMessageBox::error(this, errMsg); @@ -878,8 +878,8 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (!ItemDrag::decode(e, urls, kioURLs, albumIDs, imageIDs)) return; @@ -922,13 +922,13 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if(id == 12) { - QString errMsg; - d->albumMan->updateTAlbumIcon(destAlbum, QString(), imageIDs.first(), errMsg); + TQString errMsg; + d->albumMan->updateTAlbumIcon(destAlbum, TQString(), imageIDs.first(), errMsg); } return; } @@ -946,12 +946,12 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags")); popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items") - .arg(destAlbum->prettyURL()), 10) ; + .tqarg(destAlbum->prettyURL()), 10) ; popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if (id == 10) @@ -962,7 +962,7 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) AlbumLister::instance()->blockSignals(true); d->albumMan->albumDB()->beginTransaction(); int i=0; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { // create temporary ImageInfo object @@ -982,7 +982,7 @@ void TagFolderView::contentsDropEvent(QDropEvent *e) ImageAttributesWatch::instance()->imagesChanged(destAlbum->id()); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } } } @@ -1004,7 +1004,7 @@ void TagFolderView::selectItem(int id) void TagFolderView::refresh() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1015,9 +1015,9 @@ void TagFolderView::refresh() } } -void TagFolderView::slotRefresh(const QMap<int, int>& tagsStatMap) +void TagFolderView::slotRefresh(const TQMap<int, int>& tagsStatMap) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -1027,7 +1027,7 @@ void TagFolderView::slotRefresh(const QMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - QMap<int, int>::const_iterator it2 = tagsStatMap.find(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } diff --git a/digikam/digikam/tagfolderview.h b/digikam/digikam/tagfolderview.h index 4bf6689..c79ec17 100644 --- a/digikam/digikam/tagfolderview.h +++ b/digikam/digikam/tagfolderview.h @@ -31,7 +31,7 @@ #include "folderview.h" -class QDropEvent; +class TQDropEvent; namespace Digikam { @@ -44,10 +44,11 @@ class TagFolderViewPriv; class TagFolderView : public FolderView { Q_OBJECT + TQ_OBJECT public: - TagFolderView(QWidget *parent); + TagFolderView(TQWidget *tqparent); ~TagFolderView(); void tagNew(); @@ -59,19 +60,19 @@ public: signals: - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalTextTagFilterMatch(bool); public slots: - void slotTextTagFilterChanged(const QString&); + void slotTextTagFilterChanged(const TQString&); protected: - void contentsDropEvent(QDropEvent *e); - QDragObject* dragObject(); - bool acceptDrop(const QDropEvent *e) const; + void contentsDropEvent(TQDropEvent *e); + TQDragObject* dragObject(); + bool acceptDrop(const TQDropEvent *e) const; private slots: @@ -82,17 +83,17 @@ private slots: void slotAlbumsCleared(); void slotAlbumIconChanged(Album* album); void slotAlbumMoved(TAlbum* tag, TAlbum* newParent); - void slotContextMenu(QListViewItem*, const QPoint&, int); + void slotContextMenu(TQListViewItem*, const TQPoint&, int); void slotABCContextMenu(); - void slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail); + void slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail); void slotThumbnailLost(Album *album); void slotReloadThumbnails(); - void slotRefresh(const QMap<int, int>&); + void slotRefresh(const TQMap<int, int>&); private: - void tagNew(TagFolderViewItem *item, const QString& _title=QString(), - const QString& _icon=QString() ); + void tagNew(TagFolderViewItem *item, const TQString& _title=TQString(), + const TQString& _icon=TQString() ); void tagEdit(TagFolderViewItem *item); void tagDelete(TagFolderViewItem *item); void setTagThumbnail(TAlbum *album); diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index 5b88a19..5b19356 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -25,15 +25,15 @@ #define ADDTAGID 10000 -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qstring.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qvaluelist.h> -#include <qpixmap.h> -#include <qvaluevector.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqvaluelist.h> +#include <tqpixmap.h> +#include <tqvaluevector.h> // KDE includes. @@ -58,61 +58,61 @@ namespace Digikam { -class TagsPopupCheckedMenuItem : public QCustomMenuItem +class TagsPopupCheckedMenuItem : public TQCustomMenuItem { public: - TagsPopupCheckedMenuItem(QPopupMenu* popup, const QString& txt, const QPixmap& pix) - : QCustomMenuItem(), m_popup(popup), m_txt(txt), m_pix(pix) + TagsPopupCheckedMenuItem(TQPopupMenu* popup, const TQString& txt, const TQPixmap& pix) + : TQCustomMenuItem(), m_popup(popup), m_txt(txt), m_pix(pix) { } - virtual QSize sizeHint() + virtual TQSize tqsizeHint() { - QFont fn = m_popup->font(); - QFontMetrics fm(fn); - int w = fm.width(m_txt) + 5 + kapp->style().pixelMetric(QStyle::PM_IndicatorWidth, 0); - int h = QMAX(fm.height(), m_pix.height()); - return QSize( w, h ); + TQFont fn = m_popup->font(); + TQFontMetrics fm(fn); + int w = fm.width(m_txt) + 5 + kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + int h = TQMAX(fm.height(), m_pix.height()); + return TQSize( w, h ); } - virtual void paint(QPainter* p, const QColorGroup& cg, bool act, bool enabled, + virtual void paint(TQPainter* p, const TQColorGroup& cg, bool act, bool enabled, int x, int y, int w, int h ) { p->save(); p->setPen(act ? cg.highlightedText() : cg.highlight()); - p->drawText(x, y, w, h, Qt::AlignLeft|Qt::AlignVCenter, m_txt); + p->drawText(x, y, w, h, TQt::AlignLeft|TQt::AlignVCenter, m_txt); p->restore(); if (!m_pix.isNull()) { - QRect pixRect(x/2 - m_pix.width()/2, y, m_pix.width(), m_pix.height()); + TQRect pixRect(x/2 - m_pix.width()/2, y, m_pix.width(), m_pix.height()); p->drawPixmap( pixRect.topLeft(), m_pix ); } - int checkWidth = kapp->style().pixelMetric(QStyle::PM_IndicatorWidth, 0); - int checkHeight = kapp->style().pixelMetric(QStyle::PM_IndicatorHeight, 0); + int checkWidth = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + int checkHeight = kapp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight, 0); - QStyle::SFlags flags = QStyle::Style_Default; - flags |= QStyle::Style_On; + TQStyle::SFlags flags = TQStyle::Style_Default; + flags |= TQStyle::Style_On; if (enabled) - flags |= QStyle::Style_Enabled; + flags |= TQStyle::Style_Enabled; if (act) - flags |= QStyle::Style_Active; + flags |= TQStyle::Style_Active; - QFont fn = m_popup->font(); - QFontMetrics fm(fn); - QRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight); - kapp->style().drawPrimitive(QStyle::PE_CheckMark, p, r, cg, flags); + TQFont fn = m_popup->font(); + TQFontMetrics fm(fn); + TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight); + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags); } private: - QPopupMenu *m_popup; + TQPopupMenu *m_popup; - QString m_txt; + TQString m_txt; - QPixmap m_pix; + TQPixmap m_pix; }; // ------------------------------------------------------------------------ @@ -125,16 +125,16 @@ public: int addToID; - QPixmap addTagPix; + TQPixmap addTagPix; - QValueList<int> assignedTags; - QValueList<Q_LLONG> selectedImageIDs; + TQValueList<int> assignedTags; + TQValueList<TQ_LLONG> selectedImageIDs; TagsPopupMenu::Mode mode; }; -TagsPopupMenu::TagsPopupMenu(const QValueList<Q_LLONG>& selectedImageIDs, int addToID, Mode mode) - : QPopupMenu(0) +TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int addToID, Mode mode) + : TQPopupMenu(0) { d = new TagsPopupMenuPriv; d->selectedImageIDs = selectedImageIDs; @@ -148,11 +148,11 @@ TagsPopupMenu::TagsPopupMenu(const QValueList<Q_LLONG>& selectedImageIDs, int ad KIcon::DefaultState, 0, true); - connect(this, SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotAboutToShow())); - connect(this, SIGNAL(activated(int)), - this, SLOT(slotActivated(int))); + connect(this, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotActivated(int))); } TagsPopupMenu::~TagsPopupMenu() @@ -166,25 +166,25 @@ void TagsPopupMenu::clearPopup() clear(); } -QPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) +TQPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) { AlbumManager* man = AlbumManager::instance(); TAlbum* album = man->findTAlbum(tagid); if (!album) return 0; - QPopupMenu* popup = new QPopupMenu(this); + TQPopupMenu* popup = new TQPopupMenu(this); - connect(popup, SIGNAL(activated(int)), - this, SLOT(slotActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotActivated(int))); if (d->mode == ASSIGN) { popup->insertItem(d->addTagPix, i18n("Add New Tag..."), ADDTAGID + album->id()); popup->insertSeparator(); - QPixmap pix = SyncJob::getTagThumbnail(album); - if ((d->mode == ASSIGN) && (d->assignedTags.contains(album->id()))) + TQPixmap pix = SyncJob::getTagThumbnail(album); + if ((d->mode == ASSIGN) && (d->assignedTags.tqcontains(album->id()))) { popup->insertItem(new TagsPopupCheckedMenuItem(popup, album->title(), pix), d->addToID + album->id()); @@ -203,7 +203,7 @@ QPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) { if (!album->isRoot()) { - QPixmap pix = SyncJob::getTagThumbnail(album); + TQPixmap pix = SyncJob::getTagThumbnail(album); popup->insertItem(pix, album->title(), d->addToID + album->id()); popup->insertSeparator(); } @@ -230,7 +230,7 @@ void TagsPopupMenu::slotAboutToShow() if (d->assignedTags.isEmpty()) return; - // also add the parents of the assigned tags + // also add the tqparents of the assigned tags IntList tList; for (IntList::iterator it = d->assignedTags.begin(); it != d->assignedTags.end(); ++it) @@ -238,11 +238,11 @@ void TagsPopupMenu::slotAboutToShow() TAlbum* album = man->findTAlbum(*it); if (album) { - Album* a = album->parent(); + Album* a = album->tqparent(); while (a) { tList.append(a->id()); - a = a->parent(); + a = a->tqparent(); } } } @@ -278,38 +278,38 @@ void TagsPopupMenu::slotAboutToShow() } // for qHeapSort -typedef QPair<QString, Album*> TagsMenuSortType; +typedef TQPair<TQString, Album*> TagsMenuSortType; bool operator<(const TagsMenuSortType &lhs, const TagsMenuSortType &rhs) { return lhs.first < rhs.first; } -void TagsPopupMenu::iterateAndBuildMenu(QPopupMenu *menu, TAlbum *album) +void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album) { - QValueVector<TagsMenuSortType> sortedTags; + TQValueVector<TagsMenuSortType> sortedTags; for (Album* a = album->firstChild(); a; a = a->next()) { - sortedTags.push_back(qMakePair(a->title(), a)); + sortedTags.push_back(tqMakePair(a->title(), a)); } qHeapSort(sortedTags); - for (QValueVector<TagsMenuSortType>::Iterator i = sortedTags.begin(); i != sortedTags.end(); ++i) + for (TQValueVector<TagsMenuSortType>::Iterator i = sortedTags.begin(); i != sortedTags.end(); ++i) { Album *a = i->second; if (d->mode == REMOVE || d->mode == DISPLAY) { - IntList::iterator it = qFind(d->assignedTags.begin(), + IntList::iterator it = tqFind(d->assignedTags.begin(), d->assignedTags.end(), a->id()); if (it == d->assignedTags.end()) continue; } - QPixmap pix = SyncJob::getTagThumbnail((TAlbum*)a); - QString t = a->title(); - t.replace('&',"&&"); + TQPixmap pix = SyncJob::getTagThumbnail((TAlbum*)a); + TQString t = a->title(); + t.tqreplace('&',"&&"); if (a->firstChild()) { @@ -317,7 +317,7 @@ void TagsPopupMenu::iterateAndBuildMenu(QPopupMenu *menu, TAlbum *album) } else { - if ((d->mode == ASSIGN) && (d->assignedTags.contains(a->id()))) + if ((d->mode == ASSIGN) && (d->assignedTags.tqcontains(a->id()))) { menu->insertItem(new TagsPopupCheckedMenuItem(this, a->title(), pix), d->addToID + a->id()); @@ -337,21 +337,21 @@ void TagsPopupMenu::slotActivated(int id) int tagID = id - ADDTAGID; AlbumManager* man = AlbumManager::instance(); - TAlbum* parent = man->findTAlbum(tagID); - if (!parent) + TAlbum* tqparent = man->findTAlbum(tagID); + if (!tqparent) { DWarning() << "Failed to find album with id " << tagID << endl; return; } - QString title, icon; - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon)) + TQString title, icon; + if (!TagEditDlg::tagCreate(TQT_TQWIDGET(kapp->activeWindow()), tqparent, title, icon)) return; - QMap<QString, QString> errMap; - AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TQMap<TQString, TQString> errMap; + AlbumList tList = TagEditDlg::createTAlbum(tqparent, title, icon, errMap); + TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) emit signalTagActivated((*it)->id()); diff --git a/digikam/digikam/tagspopupmenu.h b/digikam/digikam/tagspopupmenu.h index abc05ff..7fee5a4 100644 --- a/digikam/digikam/tagspopupmenu.h +++ b/digikam/digikam/tagspopupmenu.h @@ -26,9 +26,9 @@ #ifndef TAGSPOPUPMENU_H #define TAGSPOPUPMENU_H -// Qt includes. +// TQt includes. -#include <qpopupmenu.h> +#include <tqpopupmenu.h> namespace Digikam { @@ -36,9 +36,10 @@ namespace Digikam class TAlbum; class TagsPopupMenuPriv; -class TagsPopupMenu : public QPopupMenu +class TagsPopupMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: @@ -49,7 +50,7 @@ public: DISPLAY // Used by "GoTo Tag" feature }; - TagsPopupMenu(const QValueList<Q_LLONG>& selectedImageIDs, int addToID, Mode mode); + TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int addToID, Mode mode); ~TagsPopupMenu(); signals: @@ -64,8 +65,8 @@ private slots: private: void clearPopup(); - QPopupMenu* buildSubMenu(int tagid); - void iterateAndBuildMenu(QPopupMenu *menu, TAlbum *album); + TQPopupMenu* buildSubMenu(int tagid); + void iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album); bool showThisTag(int tagid); private: diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index aa8b28d..a5bf7cc 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -22,12 +22,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfont.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qcursor.h> +#include <tqfont.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqcursor.h> // KDE includes. @@ -54,11 +54,11 @@ class TimeLineFolderItem : public FolderItem public: - TimeLineFolderItem(QListView* parent, SAlbum* album) - : FolderItem(parent, album->title()), + TimeLineFolderItem(TQListView* tqparent, SAlbum* album) + : FolderItem(tqparent, album->title()), m_album(album) { - m_album->setExtraData(parent, this); + m_album->setExtraData(tqparent, this); } ~TimeLineFolderItem() @@ -66,7 +66,7 @@ public: m_album->removeExtraData(listView()); } - int compare(QListViewItem* i, int , bool ) const + int compare(TQListViewItem* i, int , bool ) const { if (!i) return 0; @@ -89,31 +89,31 @@ private: SAlbum *m_album; }; -TimeLineFolderView::TimeLineFolderView(QWidget* parent) - : FolderView(parent, "TimeLineFolderView") +TimeLineFolderView::TimeLineFolderView(TQWidget* tqparent) + : FolderView(tqparent, "TimeLineFolderView") { - m_currentTimeLineSearchName = QString("_Current_Time_Line_Search_"); + m_currentTimeLineSearchName = TQString("_Current_Time_Line_Search_"); addColumn(i18n("My Date Searches")); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(false); - connect(AlbumManager::instance(), SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumsCleared()), - this, SLOT(clear())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(clear())); - connect(AlbumManager::instance(), SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotAlbumRenamed(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotAlbumRenamed(Album*))); - connect(this, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(this, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); } TimeLineFolderView::~TimeLineFolderView() @@ -121,14 +121,14 @@ TimeLineFolderView::~TimeLineFolderView() saveViewState(); } -QString TimeLineFolderView::currentTimeLineSearchName() const +TQString TimeLineFolderView::currentTimeLineSearchName() const { return m_currentTimeLineSearchName; } -void TimeLineFolderView::slotTextSearchFilterChanged(const QString& filter) +void TimeLineFolderView::slotTextSearchFilterChanged(const TQString& filter) { - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -141,10 +141,10 @@ void TimeLineFolderView::slotTextSearchFilterChanged(const QString& filter) // Check if a special url query exist to identify a SAlbum dedicaced to Date Search // used with TimeLine. KURL url = salbum->kurl(); - QString type = url.queryItem("type"); + TQString type = url.queryItem("type"); - if (salbum->title().lower().contains(search) && - type == QString("datesearch") && + if (salbum->title().lower().tqcontains(search) && + type == TQString("datesearch") && salbum->title() != currentTimeLineSearchName()) { atleastOneMatch = true; @@ -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\"?") - .arg(album->title()), + .tqarg(album->title()), i18n("Delete Date Search?"), i18n("Delete"), KStdGuiItem::cancel()); @@ -194,18 +194,18 @@ void TimeLineFolderView::slotAlbumAdded(Album* a) // Check if a special url query exist to identify a SAlbum dedicaced to Date Search KURL url = salbum->kurl(); - QMap<QString, QString> queries = url.queryItems(); + TQMap<TQString, TQString> queries = url.queryItems(); if (queries.isEmpty()) return; - QString type = url.queryItem("type"); - if (type != QString("datesearch")) return; + TQString type = url.queryItem("type"); + if (type != TQString("datesearch")) return; // We will ignore the internal Dates Search Album used to perform selection from timeline. - QString name = url.queryItem("name"); + TQString name = url.queryItem("name"); if (name == currentTimeLineSearchName()) return; TimeLineFolderItem* item = new TimeLineFolderItem(this, salbum); - item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize())); + item->setPixmap(0, SmallIcon("tqfind", AlbumSettings::instance()->getDefaultTreeIconSize())); } void TimeLineFolderView::slotAlbumDeleted(Album* a) @@ -236,9 +236,9 @@ void TimeLineFolderView::slotAlbumRenamed(Album* album) void TimeLineFolderView::slotSelectionChanged() { - QListViewItem* selItem = 0; + TQListViewItem* selItem = 0; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while (it.current()) { if (it.current()->isSelected()) @@ -263,7 +263,7 @@ void TimeLineFolderView::slotSelectionChanged() emit signalAlbumSelected(searchItem->album()); } -void TimeLineFolderView::slotContextMenu(QListViewItem* item, const QPoint&, int) +void TimeLineFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int) { if (!item) return; @@ -274,7 +274,7 @@ void TimeLineFolderView::slotContextMenu(QListViewItem* item, const QPoint&, int popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 10); popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 11); - switch (popmenu.exec(QCursor::pos())) + switch (popmenu.exec(TQCursor::pos())) { case 10: { diff --git a/digikam/digikam/timelinefolderview.h b/digikam/digikam/timelinefolderview.h index e2cb23d..528945c 100644 --- a/digikam/digikam/timelinefolderview.h +++ b/digikam/digikam/timelinefolderview.h @@ -38,14 +38,15 @@ class TimeLineFolderItem; class TimeLineFolderView : public FolderView { Q_OBJECT + TQ_OBJECT public: - TimeLineFolderView(QWidget* parent); + TimeLineFolderView(TQWidget* tqparent); ~TimeLineFolderView(); void searchDelete(SAlbum* album); - QString currentTimeLineSearchName() const; + TQString currentTimeLineSearchName() const; signals: @@ -55,7 +56,7 @@ signals: public slots: - void slotTextSearchFilterChanged(const QString&); + void slotTextSearchFilterChanged(const TQString&); private slots: @@ -63,7 +64,7 @@ private slots: void slotAlbumDeleted(Album* album); void slotAlbumRenamed(Album* album); void slotSelectionChanged(); - void slotContextMenu(QListViewItem*, const QPoint&, int); + void slotContextMenu(TQListViewItem*, const TQPoint&, int); protected: @@ -73,7 +74,7 @@ private: // Used to store in database the name of search performed by // current selection from timeline. - QString m_currentTimeLineSearchName; + TQString m_currentTimeLineSearchName; }; } // namespace Digikam diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index b35855a..bdc0180 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -21,19 +21,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qtimer.h> -#include <qframe.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qpushbutton.h> -#include <qhbuttongroup.h> -#include <qmap.h> -#include <qscrollbar.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqtimer.h> +#include <tqframe.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqpushbutton.h> +#include <tqhbuttongroup.h> +#include <tqmap.h> +#include <tqscrollbar.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -89,18 +89,18 @@ public: searchDateBar = 0; } - QScrollBar *scrollBar; + TQScrollBar *scrollBar; - QTimer *timer; + TQTimer *timer; - QComboBox *timeUnitCB; + TQComboBox *timeUnitCB; - QHButtonGroup *scaleBG; + TQHButtonGroup *scaleBG; - QPushButton *resetButton; - QPushButton *saveButton; + TQPushButton *resetButton; + TQPushButton *saveButton; - QLabel *cursorCountLabel; + TQLabel *cursorCountLabel; KLineEdit *nameEdit; @@ -113,101 +113,101 @@ public: TimeLineFolderView *timeLineFolderView; }; -TimeLineView::TimeLineView(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +TimeLineView::TimeLineView(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new TimeLineViewPriv; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - QVBoxLayout *vlay = new QVBoxLayout(this); - QFrame *panel = new QFrame(this); - panel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + TQVBoxLayout *vlay = new TQVBoxLayout(this); + TQFrame *panel = new TQFrame(this); + panel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); panel->setLineWidth(1); - QGridLayout *grid = new QGridLayout(panel, 4, 3); + TQGridLayout *grid = new TQGridLayout(panel, 4, 3); // --------------------------------------------------------------- - QWidget *hbox1 = new QWidget(panel); - QHBoxLayout *hlay = new QHBoxLayout(hbox1); + TQWidget *hbox1 = new TQWidget(panel); + TQHBoxLayout *hlay = new TQHBoxLayout(hbox1); - QLabel *label1 = new QLabel(i18n("Time Unit:"), hbox1); - d->timeUnitCB = new QComboBox(false, hbox1); + TQLabel *label1 = new TQLabel(i18n("Time Unit:"), hbox1); + d->timeUnitCB = new TQComboBox(false, hbox1); d->timeUnitCB->insertItem(i18n("Day"), TimeLineWidget::Day); d->timeUnitCB->insertItem(i18n("Week"), TimeLineWidget::Week); d->timeUnitCB->insertItem(i18n("Month"), TimeLineWidget::Month); d->timeUnitCB->insertItem(i18n("Year"), TimeLineWidget::Year); d->timeUnitCB->setCurrentItem((int)TimeLineWidget::Month); - d->timeUnitCB->setFocusPolicy(QWidget::NoFocus); - QWhatsThis::add(d->timeUnitCB, i18n("<p>Select the histogram time unit here.<p>" + d->timeUnitCB->setFocusPolicy(TQ_NoFocus); + TQWhatsThis::add(d->timeUnitCB, i18n("<p>Select the histogram time unit here.<p>" "You can change the graph decade to zoom in or zoom out over time.")); - d->scaleBG = new QHButtonGroup(hbox1); + d->scaleBG = new TQHButtonGroup(hbox1); d->scaleBG->setExclusive(true); - d->scaleBG->setFrameShape(QFrame::NoFrame); + d->scaleBG->setFrameShape(TQFrame::NoFrame); d->scaleBG->setInsideMargin( 0 ); - QWhatsThis::add(d->scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add(d->scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the date count's maximal values are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal values are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); d->scaleBG->insert(linHistoButton, TimeLineWidget::LinScale); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); d->scaleBG->insert(logHistoButton, TimeLineWidget::LogScale); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); hlay->setMargin(0); hlay->setSpacing(KDialog::spacingHint()); hlay->addWidget(label1); hlay->addWidget(d->timeUnitCB); - hlay->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + hlay->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); hlay->addWidget(d->scaleBG); // --------------------------------------------------------------- d->timeLineWidget = new TimeLineWidget(panel); - d->scrollBar = new QScrollBar(panel); + d->scrollBar = new TQScrollBar(panel); d->scrollBar->setOrientation(Qt::Horizontal); d->scrollBar->setMinValue(0); d->scrollBar->setLineStep(1); d->cursorDateLabel = new KSqueezedTextLabel(0, panel); - d->cursorCountLabel = new QLabel(panel); - d->cursorCountLabel->setAlignment(Qt::AlignRight); + d->cursorCountLabel = new TQLabel(panel); + d->cursorCountLabel->tqsetAlignment(TQt::AlignRight); // --------------------------------------------------------------- - QHBox *hbox2 = new QHBox(panel); + TQHBox *hbox2 = new TQHBox(panel); hbox2->setMargin(0); hbox2->setSpacing(KDialog::spacingHint()); - d->resetButton = new QPushButton(hbox2); + d->resetButton = new TQPushButton(hbox2); d->resetButton->setPixmap(SmallIcon("reload_page")); - QToolTip::add(d->resetButton, i18n("Clear current selection")); - QWhatsThis::add(d->resetButton, i18n("<p>If you press this button, current " + TQToolTip::add(d->resetButton, i18n("Clear current selection")); + TQWhatsThis::add(d->resetButton, i18n("<p>If you press this button, current " "dates selection from time-line will be " "clear.")); d->nameEdit = new KLineEdit(hbox2); - QWhatsThis::add(d->nameEdit, i18n("<p>Enter the name of the current dates search to save in the " + TQWhatsThis::add(d->nameEdit, i18n("<p>Enter the name of the current dates search to save in the " "\"My Date Searches\" view")); - d->saveButton = new QPushButton(hbox2); + d->saveButton = new TQPushButton(hbox2); d->saveButton->setPixmap(SmallIcon("filesave")); d->saveButton->setEnabled(false); - QToolTip::add(d->saveButton, i18n("Save current selection to a new virtual Album")); - QWhatsThis::add(d->saveButton, i18n("<p>If you press this button, current " + TQToolTip::add(d->saveButton, i18n("Save current selection to a new virtual Album")); + TQWhatsThis::add(d->saveButton, i18n("<p>If you press this button, current " "dates selection from time-line will be " "saved to a new search virtual Album using name " "set on the left side.")); @@ -231,64 +231,64 @@ TimeLineView::TimeLineView(QWidget *parent) vlay->addWidget(panel); vlay->addWidget(d->timeLineFolderView); - vlay->addItem(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::Minimum)); + vlay->addItem(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::Minimum)); vlay->addWidget(d->searchDateBar); vlay->setMargin(0); vlay->setSpacing(0); // --------------------------------------------------------------- - connect(AlbumManager::instance(), SIGNAL(signalDatesMapDirty(const QMap<QDateTime, int>&)), - d->timeLineWidget, SLOT(slotDatesMap(const QMap<QDateTime, int>&))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalDatesMapDirty(const TQMap<TQDateTime, int>&)), + d->timeLineWidget, TQT_SLOT(slotDatesMap(const TQMap<TQDateTime, int>&))); - connect(d->timeLineFolderView, SIGNAL(signalAlbumSelected(SAlbum*)), - this, SLOT(slotAlbumSelected(SAlbum*))); + connect(d->timeLineFolderView, TQT_SIGNAL(signalAlbumSelected(SAlbum*)), + this, TQT_SLOT(slotAlbumSelected(SAlbum*))); - connect(d->timeLineFolderView, SIGNAL(signalRenameAlbum(SAlbum*)), - this, SLOT(slotRenameAlbum(SAlbum*))); + connect(d->timeLineFolderView, TQT_SIGNAL(signalRenameAlbum(SAlbum*)), + this, TQT_SLOT(slotRenameAlbum(SAlbum*))); - connect(d->timeLineFolderView, SIGNAL(signalTextSearchFilterMatch(bool)), - d->searchDateBar, SLOT(slotSearchResult(bool))); + connect(d->timeLineFolderView, TQT_SIGNAL(signalTextSearchFilterMatch(bool)), + d->searchDateBar, TQT_SLOT(slotSearchResult(bool))); - connect(d->searchDateBar, SIGNAL(signalTextChanged(const QString&)), - d->timeLineFolderView, SLOT(slotTextSearchFilterChanged(const QString&))); + connect(d->searchDateBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->timeLineFolderView, TQT_SLOT(slotTextSearchFilterChanged(const TQString&))); - connect(d->timeUnitCB, SIGNAL(activated(int)), - this, SLOT(slotTimeUnitChanged(int))); + connect(d->timeUnitCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotTimeUnitChanged(int))); - connect(d->scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(d->timeLineWidget, SIGNAL(signalDateMapChanged()), - this, SLOT(slotInit())); + connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), + this, TQT_SLOT(slotInit())); - connect(d->timeLineWidget, SIGNAL(signalCursorPositionChanged()), - this, SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQT_SIGNAL(signalCursorPositionChanged()), + this, TQT_SLOT(slotCursorPositionChanged())); - connect(d->timeLineWidget, SIGNAL(signalSelectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(d->timeLineWidget, TQT_SIGNAL(signalSelectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); - connect(d->timeLineWidget, SIGNAL(signalRefDateTimeChanged()), - this, SLOT(slotRefDateTimeChanged())); + connect(d->timeLineWidget, TQT_SIGNAL(signalRefDateTimeChanged()), + this, TQT_SLOT(slotRefDateTimeChanged())); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotUpdateCurrentDateSearchAlbum())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateCurrentDateSearchAlbum())); - connect(d->resetButton, SIGNAL(clicked()), - this, SLOT(slotResetSelection())); + connect(d->resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetSelection())); - connect(d->saveButton, SIGNAL(clicked()), - this, SLOT(slotSaveSelection())); + connect(d->saveButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSaveSelection())); - connect(d->scrollBar, SIGNAL(valueChanged(int)), - this, SLOT(slotScrollBarValueChanged(int))); + connect(d->scrollBar, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotScrollBarValueChanged(int))); - connect(d->nameEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(slotCheckAboutSelection())); + connect(d->nameEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotCheckAboutSelection())); - connect(d->nameEdit, SIGNAL(returnPressed(const QString&)), - d->saveButton, SLOT(animateClick())); + connect(d->nameEdit, TQT_SIGNAL(returnPressed(const TQString&)), + d->saveButton, TQT_SLOT(animateClick())); } TimeLineView::~TimeLineView() @@ -316,11 +316,11 @@ void TimeLineView::slotInit() readConfig(); - disconnect(d->timeLineWidget, SIGNAL(signalDateMapChanged()), - this, SLOT(slotInit())); + disconnect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), + this, TQT_SLOT(slotInit())); - connect(d->timeLineWidget, SIGNAL(signalDateMapChanged()), - this, SLOT(slotCursorPositionChanged())); + connect(d->timeLineWidget, TQT_SIGNAL(signalDateMapChanged()), + this, TQT_SLOT(slotCursorPositionChanged())); } void TimeLineView::readConfig() @@ -334,7 +334,7 @@ void TimeLineView::readConfig() d->scaleBG->setButton(config->readNumEntry("Histogram Scale", TimeLineWidget::LinScale)); slotScaleChanged(d->scaleBG->selectedId()); - QDateTime now = QDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); d->timeLineWidget->setCursorDateTime(config->readDateTimeEntry("Cursor Position", &now)); d->timeLineWidget->setCurrentIndex(d->timeLineWidget->indexForCursorDateTime()); } @@ -401,10 +401,10 @@ void TimeLineView::slotScaleChanged(int mode) void TimeLineView::slotCursorPositionChanged() { - QString txt; + TQString txt; int val = d->timeLineWidget->cursorInfo(txt); d->cursorDateLabel->setText(txt); - d->cursorCountLabel->setText(QString::number(val)); + d->cursorCountLabel->setText(TQString::number(val)); } void TimeLineView::slotSelectionChanged() @@ -421,16 +421,16 @@ void TimeLineView::slotUpdateCurrentDateSearchAlbum() void TimeLineView::slotSaveSelection() { - QString name = d->nameEdit->text(); + TQString name = d->nameEdit->text(); if (!checkName(name)) return; createNewDateSearchAlbum(name); } -void TimeLineView::createNewDateSearchAlbum(const QString& name) +void TimeLineView::createNewDateSearchAlbum(const TQString& name) { int totalCount = 0; - QDateTime start, end; + TQDateTime start, end; DateRangeList list = d->timeLineWidget->selectedDateRange(totalCount); if (list.isEmpty()) @@ -449,14 +449,14 @@ void TimeLineView::createNewDateSearchAlbum(const QString& name) url.setProtocol("digikamsearch"); int grp = list.count(); - QString path("1 AND 2"); + TQString path("1 AND 2"); if (grp > 1 ) { for (int i = 1 ; i < grp; i++) { path.append(" OR "); - path.append(QString("%1 AND %2").arg(i*2+1).arg(i*2+2)); + path.append(TQString("%1 AND %2").tqarg(i*2+1).tqarg(i*2+2)); } } url.setPath(path); @@ -467,18 +467,18 @@ void TimeLineView::createNewDateSearchAlbum(const QString& name) { start = (*it).first; end = (*it).second; - url.addQueryItem(QString("%1.key").arg(i*2+1), QString("imagedate")); - url.addQueryItem(QString("%1.op").arg(i*2+1), QString("GT")); - url.addQueryItem(QString("%1.val").arg(i*2+1), start.date().toString(Qt::ISODate)); - url.addQueryItem(QString("%1.key").arg(i*2+2), QString("imagedate")); - url.addQueryItem(QString("%1.op").arg(i*2+2), QString("LT")); - url.addQueryItem(QString("%1.val").arg(i*2+2), end.date().toString(Qt::ISODate)); + 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)); i++; } url.addQueryItem("name", name); - url.addQueryItem("count", QString::number(grp*2)); - url.addQueryItem("type", QString("datesearch")); + url.addQueryItem("count", TQString::number(grp*2)); + url.addQueryItem("type", TQString("datesearch")); //DDebug() << url << endl; @@ -508,11 +508,11 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) // Check if a special url query exist to identify a SAlbum dedicaced to Date Search KURL url = salbum->kurl(); - QMap<QString, QString> queries = url.queryItems(); + TQMap<TQString, TQString> queries = url.queryItems(); if (queries.isEmpty()) return; - QString type = url.queryItem("type"); - if (type != QString("datesearch")) return; + TQString type = url.queryItem("type"); + if (type != TQString("datesearch")) return; bool ok = false; int count = url.queryItem("count").toInt(&ok); @@ -520,23 +520,23 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) //DDebug() << url << endl; - QMap<QString, QString>::iterator it2; - QString key; - QDateTime start, end; + TQMap<TQString, TQString>::iterator it2; + TQString key; + TQDateTime start, end; DateRangeList list; for (int i = 1 ; i <= count ; i+=2) { - key = QString("%1.val").arg(QString::number(i)); - it2 = queries.find(key); + key = TQString("%1.val").tqarg(TQString::number(i)); + it2 = queries.tqfind(key); if (it2 != queries.end()) - start = QDateTime(QDate::fromString(it2.data(), Qt::ISODate)); + start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; - key = QString("%1.val").arg(QString::number(i+1)); - it2 = queries.find(key); + key = TQString("%1.val").tqarg(TQString::number(i+1)); + it2 = queries.tqfind(key); if (it2 != queries.end()) - end = QDateTime(QDate::fromString(it2.data(), Qt::ISODate)); + end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; @@ -561,19 +561,19 @@ void TimeLineView::slotResetSelection() AlbumManager::instance()->setCurrentAlbum(0); } -bool TimeLineView::checkName(QString& name) +bool TimeLineView::checkName(TQString& name) { bool checked = checkAlbum(name); while (!checked) { - QString label = i18n( "Search name already exists.\n" + TQString label = i18n( "Search name already exists.\n" "Please enter a new name:" ); bool ok; #if KDE_IS_VERSION(3,2,0) - QString newTitle = KInputDialog::getText(i18n("Name exists"), label, name, &ok, this); + TQString newTitle = KInputDialog::getText(i18n("Name exists"), label, name, &ok, this); #else - QString newTitle = KLineEditDlg::getText(i18n("Name exists"), label, name, ok, this); + TQString newTitle = KLineEditDlg::getText(i18n("Name exists"), label, name, ok, this); #endif if (!ok) return false; @@ -584,7 +584,7 @@ bool TimeLineView::checkName(QString& name) return true; } -bool TimeLineView::checkAlbum(const QString& name) const +bool TimeLineView::checkAlbum(const TQString& name) const { AlbumList list = AlbumManager::instance()->allSAlbums(); @@ -619,15 +619,15 @@ void TimeLineView::slotRenameAlbum(SAlbum* salbum) { if (!salbum) return; - QString oldName(salbum->title()); + TQString oldName(salbum->title()); bool ok; #if KDE_IS_VERSION(3,2,0) - QString name = KInputDialog::getText(i18n("Rename Album (%1)").arg(oldName), + TQString name = KInputDialog::getText(i18n("Rename Album (%1)").tqarg(oldName), i18n("Enter new album name:"), oldName, &ok, this); #else - QString name = KLineEditDlg::getText(i18n("Rename Album (%1)").arg(oldName), + TQString name = KLineEditDlg::getText(i18n("Rename Album (%1)").tqarg(oldName), i18n("Enter new album name:"), oldName, &ok, this); #endif diff --git a/digikam/digikam/timelineview.h b/digikam/digikam/timelineview.h index 591a54b..22954f0 100644 --- a/digikam/digikam/timelineview.h +++ b/digikam/digikam/timelineview.h @@ -24,11 +24,11 @@ #ifndef TIMELINEVIEW_H #define TIMELINEVIEW_H -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qwidget.h> -#include <qstring.h> +#include <tqdatetime.h> +#include <tqwidget.h> +#include <tqstring.h> namespace Digikam { @@ -38,13 +38,14 @@ class SearchTextBar; class TimeLineFolderView; class TimeLineViewPriv; -class TimeLineView : public QWidget +class TimeLineView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TimeLineView(QWidget *parent=0); + TimeLineView(TQWidget *tqparent=0); ~TimeLineView(); TimeLineFolderView *folderView() const; @@ -56,9 +57,9 @@ private: void readConfig(); void writeConfig(); - void createNewDateSearchAlbum(const QString& name); - bool checkName(QString& name); - bool checkAlbum(const QString& name) const; + void createNewDateSearchAlbum(const TQString& name); + bool checkName(TQString& name); + bool checkAlbum(const TQString& name) const; private slots: diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index a450f1f..5b6eb36 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -25,11 +25,11 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qpen.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpen.h> // KDE includes. @@ -54,8 +54,8 @@ class TimeLineWidgetPriv public : - typedef QPair<int, int> YearRefPair; // Year + a reference association (Month or week or day) - typedef QPair<int, TimeLineWidget::SelectionMode> StatPair; // Statistic value + selection status. + typedef TQPair<int, int> YearRefPair; // Year + a reference association (Month or week or day) + typedef TQPair<int, TimeLineWidget::SelectionMode> StatPair; // Statistic value + selection status. public: @@ -90,20 +90,20 @@ public: int nbItems; int startPos; - QDateTime refDateTime; // Reference date-time used to draw histogram from middle of widget. - QDateTime cursorDateTime; // Current date-time used to draw focus cursor. - QDateTime minDateTime; // Higher date on histogram. - QDateTime maxDateTime; // Lower date on histogram. - QDateTime selStartDateTime; - QDateTime selMinDateTime; // Lower date available on histogram. - QDateTime selMaxDateTime; // Higher date available on histogram. + TQDateTime refDateTime; // Reference date-time used to draw histogram from middle of widget. + TQDateTime cursorDateTime; // Current date-time used to draw focus cursor. + TQDateTime minDateTime; // Higher date on histogram. + TQDateTime maxDateTime; // Lower date on histogram. + TQDateTime selStartDateTime; + TQDateTime selMinDateTime; // Lower date available on histogram. + TQDateTime selMaxDateTime; // Higher date available on histogram. - QPixmap pixmap; // Used for widget double buffering. + TQPixmap pixmap; // Used for widget double buffering. - QMap<YearRefPair, StatPair> dayStatMap; // Store Days count statistics. - QMap<YearRefPair, StatPair> weekStatMap; // Store Weeks count statistics. - QMap<YearRefPair, StatPair> monthStatMap; // Store Month count statistics. - QMap<int, StatPair> yearStatMap; // Store Years count statistics. + TQMap<YearRefPair, StatPair> dayStatMap; // Store Days count statistics. + TQMap<YearRefPair, StatPair> weekStatMap; // Store Weeks count statistics. + TQMap<YearRefPair, StatPair> monthStatMap; // Store Month count statistics. + TQMap<int, StatPair> yearStatMap; // Store Years count statistics. const KCalendarSystem *calendar; @@ -111,21 +111,21 @@ public: TimeLineWidget::ScaleMode scaleMode; }; -TimeLineWidget::TimeLineWidget(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +TimeLineWidget::TimeLineWidget(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new TimeLineWidgetPriv; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMouseTracking(true); setMinimumWidth(256); setMinimumHeight(192); - QDateTime ref = QDateTime::currentDateTime(); + TQDateTime ref = TQDateTime::tqcurrentDateTime(); setCursorDateTime(ref); setRefDateTime(ref); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); } TimeLineWidget::~TimeLineWidget() @@ -163,7 +163,7 @@ int TimeLineWidget::totalIndex() return 0; int i = 0; - QDateTime dt = d->minDateTime; + TQDateTime dt = d->minDateTime; do { @@ -175,13 +175,13 @@ int TimeLineWidget::totalIndex() return i; } -int TimeLineWidget::indexForDateTime(const QDateTime& date) +int TimeLineWidget::indexForDateTime(const TQDateTime& date) { if (d->minDateTime.isNull() || d->maxDateTime.isNull() || date.isNull()) return 0; int i = 0; - QDateTime dt = d->minDateTime; + TQDateTime dt = d->minDateTime; do { @@ -209,7 +209,7 @@ void TimeLineWidget::setCurrentIndex(int index) return; int i = 0; - QDateTime dt = d->minDateTime; + TQDateTime dt = d->minDateTime; do { @@ -221,10 +221,10 @@ void TimeLineWidget::setCurrentIndex(int index) setRefDateTime(dt); } -void TimeLineWidget::setCursorDateTime(const QDateTime& dateTime) +void TimeLineWidget::setCursorDateTime(const TQDateTime& dateTime) { - QDateTime dt = dateTime; - dt.setTime(QTime(0, 0, 0, 0)); + TQDateTime dt = dateTime; + dt.setTime(TQTime(0, 0, 0, 0)); switch(d->timeUnit) { @@ -239,13 +239,13 @@ void TimeLineWidget::setCursorDateTime(const QDateTime& dateTime) case Month: { // Go to the first day of month. - dt.setDate(QDate(dt.date().year(), dt.date().month(), 1)); + dt.setDate(TQDate(dt.date().year(), dt.date().month(), 1)); break; } case Year: { // Go to the first day of year. - dt.setDate(QDate(dt.date().year(), 1, 1)); + dt.setDate(TQDate(dt.date().year(), 1, 1)); break; } default: @@ -260,15 +260,15 @@ void TimeLineWidget::setCursorDateTime(const QDateTime& dateTime) emit signalCursorPositionChanged(); } -QDateTime TimeLineWidget::cursorDateTime() const +TQDateTime TimeLineWidget::cursorDateTime() const { return d->cursorDateTime; } -int TimeLineWidget::cursorInfo(QString& infoDate) +int TimeLineWidget::cursorInfo(TQString& infoDate) { SelectionMode selected; - QDateTime dt = cursorDateTime(); + TQDateTime dt = cursorDateTime(); switch(d->timeUnit) { @@ -280,16 +280,16 @@ int TimeLineWidget::cursorInfo(QString& infoDate) case Week: { infoDate = i18n("Week #%1 - %2 %3") - .arg(d->calendar->weekNumber(dt.date())) - .arg(d->calendar->monthName(dt.date())) - .arg(d->calendar->yearString(dt.date(), false)); + .tqarg(d->calendar->weekNumber(dt.date())) + .tqarg(d->calendar->monthName(dt.date())) + .tqarg(d->calendar->yearString(dt.date(), false)); break; } case Month: { - infoDate = QString("%1 %2") - .arg(d->calendar->monthName(dt.date())) - .arg(d->calendar->yearString(dt.date(), false)); + infoDate = TQString("%1 %2") + .tqarg(d->calendar->monthName(dt.date())) + .tqarg(d->calendar->yearString(dt.date(), false)); break; } case Year: @@ -302,10 +302,10 @@ int TimeLineWidget::cursorInfo(QString& infoDate) return statForDateTime(dt, selected); } -void TimeLineWidget::setRefDateTime(const QDateTime& dateTime) +void TimeLineWidget::setRefDateTime(const TQDateTime& dateTime) { - QDateTime dt = dateTime; - dt.setTime(QTime(0, 0, 0, 0)); + TQDateTime dt = dateTime; + dt.setTime(TQTime(0, 0, 0, 0)); switch(d->timeUnit) { @@ -319,13 +319,13 @@ void TimeLineWidget::setRefDateTime(const QDateTime& dateTime) case Month: { // Go to the first day of month. - dt.setDate(QDate(dt.date().year(), dt.date().month(), 1)); + dt.setDate(TQDate(dt.date().year(), dt.date().month(), 1)); break; } case Year: { // Go to the first day of year. - dt.setDate(QDate(dt.date().year(), 1, 1)); + dt.setDate(TQDate(dt.date().year(), 1, 1)); break; } default: @@ -347,7 +347,7 @@ void TimeLineWidget::slotResetSelection() void TimeLineWidget::resetSelection() { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; for (it = d->dayStatMap.begin() ; it != d->dayStatMap.end(); ++it) it.data().second = Unselected; @@ -358,7 +358,7 @@ void TimeLineWidget::resetSelection() for (it = d->monthStatMap.begin() ; it != d->monthStatMap.end(); ++it) it.data().second = Unselected; - QMap<int, TimeLineWidgetPriv::StatPair>::iterator it2; + TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it2; for (it2 = d->yearStatMap.begin() ; it2 != d->yearStatMap.end(); ++it2) it2.data().second = Unselected; @@ -371,7 +371,7 @@ void TimeLineWidget::setSelectedDateRange(const DateRangeList& list) resetSelection(); - QDateTime start, end, dt; + TQDateTime start, end, dt; DateRangeList::const_iterator it; for (it = list.begin() ; it != list.end(); ++it) @@ -400,17 +400,17 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) DateRangeList list; totalCount = 0; - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it3; - QDateTime sdt, edt; - QDate date; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it3; + TQDateTime sdt, edt; + TQDate date; for (it3 = d->dayStatMap.begin() ; it3 != d->dayStatMap.end(); ++it3) { if (it3.data().second == Selected) { - date = QDate(it3.key().first, 1, 1); + date = TQDate(it3.key().first, 1, 1); date = date.addDays(it3.key().second-1); - sdt = QDateTime(date); + sdt = TQDateTime(date); edt = sdt.addDays(1); list.append(DateRange(sdt, edt)); totalCount += it3.data().first; @@ -430,7 +430,7 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) // Group contiguous date ranges to optimize query on database. DateRangeList list2; - QDateTime first, second, first2, second2; + TQDateTime first, second, first2, second2; for (it = list.begin() ; it != list.end(); ++it) { @@ -468,15 +468,15 @@ DateRangeList TimeLineWidget::selectedDateRange(int& totalCount) return list2; } -void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) +void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) { // Clear all counts in all stats maps before to update it. Do not clear selections. - QMap<int, TimeLineWidgetPriv::StatPair>::iterator it_iP; + TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it_iP; for ( it_iP = d->yearStatMap.begin() ; it_iP != d->yearStatMap.end(); ++it_iP ) it_iP.data().first = 0; - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it_YP; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it_YP; for ( it_YP = d->monthStatMap.begin() ; it_YP != d->monthStatMap.end(); ++it_YP ) it_YP.data().first = 0; @@ -489,11 +489,11 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) // Parse all new Date stamp and store histogram stats relevant in maps. int count; - QMap<QDateTime, int>::const_iterator it; + TQMap<TQDateTime, int>::const_iterator it; if (datesStatMap.isEmpty()) { - d->minDateTime = QDateTime(); - d->maxDateTime = QDateTime(); + d->minDateTime = TQDateTime(); + d->maxDateTime = TQDateTime(); } else { @@ -517,7 +517,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) // Stats Years values. - it_iP = d->yearStatMap.find(year); + it_iP = d->yearStatMap.tqfind(year); if ( it_iP == d->yearStatMap.end() ) { count = it.data(); @@ -526,7 +526,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) else { count = it_iP.data().first + it.data(); - d->yearStatMap.replace( year, TimeLineWidgetPriv::StatPair(count, it_iP.data().second) ); + d->yearStatMap.tqreplace( year, TimeLineWidgetPriv::StatPair(count, it_iP.data().second) ); } if (d->maxCountByYear < count) @@ -534,7 +534,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) // Stats Months values. - it_YP = d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); + it_YP = d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it_YP == d->monthStatMap.end() ) { count = it.data(); @@ -544,7 +544,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->monthStatMap.replace( TimeLineWidgetPriv::YearRefPair(year, month), + d->monthStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(year, month), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -553,7 +553,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) // Stats Weeks values. - it_YP = d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + it_YP = d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it_YP == d->weekStatMap.end() ) { count = it.data(); @@ -563,7 +563,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->weekStatMap.replace( TimeLineWidgetPriv::YearRefPair(yearForWeek, week), + d->weekStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(yearForWeek, week), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -572,7 +572,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) // Stats Days values. - it_YP = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); + it_YP = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it_YP == d->dayStatMap.end() ) { count = it.data(); @@ -582,7 +582,7 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->dayStatMap.replace( TimeLineWidgetPriv::YearRefPair(year, day), + d->dayStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(year, day), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -592,8 +592,8 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) if (!datesStatMap.isEmpty()) { - d->maxDateTime.setTime(QTime(0, 0, 0, 0)); - d->minDateTime.setTime(QTime(0, 0, 0, 0)); + d->maxDateTime.setTime(TQTime(0, 0, 0, 0)); + d->minDateTime.setTime(TQTime(0, 0, 0, 0)); } else { @@ -609,24 +609,24 @@ void TimeLineWidget::slotDatesMap(const QMap<QDateTime, int>& datesStatMap) void TimeLineWidget::updatePixmap() { // Drawing background and image. - d->pixmap = QPixmap(size()); - d->pixmap.fill(palette().active().background()); + d->pixmap = TQPixmap(size()); + d->pixmap.fill(tqpalette().active().background()); - QPainter p(&d->pixmap); + TQPainter p(&d->pixmap); d->bottomMargin = (int)(p.fontMetrics().height()*1.5); d->barWidth = p.fontMetrics().width("00"); d->nbItems = (int)((width() / 2.0) / (float)d->barWidth); d->startPos = (int)((width() / 2.0) - ((float)(d->barWidth) / 2.0)); int dim = height() - d->bottomMargin - d->topMargin; - QDateTime ref = d->refDateTime; - ref.setTime(QTime(0, 0, 0, 0)); + TQDateTime ref = d->refDateTime; + ref.setTime(TQTime(0, 0, 0, 0)); double max, logVal; int val, top; SelectionMode sel; - QRect focusRect, selRect, barRect; - QBrush selBrush; - QColor dateColor, subDateColor; + TQRect focusRect, selRect, barRect; + TQBrush selBrush; + TQColor dateColor, subDateColor; // Date histogram drawing is divided in 2 parts. The current date-time // is placed on the center of the view and all dates on right are computed, @@ -665,12 +665,12 @@ void TimeLineWidget::updatePixmap() focusRect = barRect; if (ref > d->maxDateTime) - dateColor = palette().active().mid(); + dateColor = tqpalette().active().mid(); else - dateColor = palette().active().foreground(); + dateColor = tqpalette().active().foreground(); - p.setPen(palette().active().foreground()); - p.fillRect(barRect, QBrush(ThemeEngine::instance()->textSpecialRegColor())); + p.setPen(tqpalette().active().foreground()); + p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor())); p.drawRect(barRect); p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+3); @@ -678,19 +678,19 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = palette().active().highlightedText(); + subDateColor = tqpalette().active().highlightedText(); else - subDateColor = palette().active().foreground(); + subDateColor = tqpalette().active().foreground(); } else - subDateColor = palette().active().mid(); + subDateColor = tqpalette().active().mid(); if (sel == Selected || sel == FuzzySelection) { selBrush.setColor(ThemeEngine::instance()->thumbSelColor()); - selBrush.setStyle(QBrush::SolidPattern); + selBrush.setStyle(Qt::SolidPattern); if (sel == FuzzySelection) - selBrush.setStyle(QBrush::Dense4Pattern); + selBrush.setStyle(Qt::Dense4Pattern); selRect.setTop(height() - d->bottomMargin + 1); selRect.setLeft(d->startPos + i*d->barWidth); @@ -705,12 +705,12 @@ void TimeLineWidget::updatePixmap() { { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor); - QString txt = QString(d->calendar->weekDayName(ref.date(), true)[0]); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString(d->calendar->weekDayName(ref.date(), true)[0]); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -721,8 +721,8 @@ void TimeLineWidget::updatePixmap() p.setPen(dateColor); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = KGlobal::locale()->formatDate(ref.date(), true); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } break; @@ -732,12 +732,12 @@ void TimeLineWidget::updatePixmap() int week = d->calendar->weekNumber(ref.date()); { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor); - QString txt = QString::number(week); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(week); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -748,8 +748,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = KGlobal::locale()->formatDate(ref.date(), true); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); if (week != 50) p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } @@ -764,12 +764,12 @@ void TimeLineWidget::updatePixmap() { { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor) ; - QString txt = QString(d->calendar->monthName(ref.date(), true)[0]); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString(d->calendar->monthName(ref.date(), true)[0]); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -780,8 +780,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = QString::number(ref.date().year()); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(ref.date().year()); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } else if (ref.date().month() == 7) @@ -798,8 +798,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = QString::number(ref.date().year()); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(ref.date().year()); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } else if (ref.date().year() % 5 == 0) @@ -815,7 +815,7 @@ void TimeLineWidget::updatePixmap() // Draw all dates on the left of ref. date-time. ref = d->refDateTime; - ref.setTime(QTime(0, 0, 0, 0)); + ref.setTime(TQTime(0, 0, 0, 0)); ref = prevDateTime(ref); for (int i = 0 ; i < d->nbItems-1 ; i++) @@ -849,12 +849,12 @@ void TimeLineWidget::updatePixmap() focusRect = barRect; if (ref < d->minDateTime) - dateColor = palette().active().mid(); + dateColor = tqpalette().active().mid(); else - dateColor = palette().active().foreground(); + dateColor = tqpalette().active().foreground(); - p.setPen(palette().active().foreground()); - p.fillRect(barRect, QBrush(ThemeEngine::instance()->textSpecialRegColor())); + p.setPen(tqpalette().active().foreground()); + p.fillRect(barRect, TQBrush(ThemeEngine::instance()->textSpecialRegColor())); p.drawRect(barRect); p.drawLine(barRect.right(), barRect.bottom(), barRect.right(), barRect.bottom()+3); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+3); @@ -862,19 +862,19 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = palette().active().highlightedText(); + subDateColor = tqpalette().active().highlightedText(); else - subDateColor = palette().active().foreground(); + subDateColor = tqpalette().active().foreground(); } else - subDateColor = palette().active().mid(); + subDateColor = tqpalette().active().mid(); if (sel == Selected || sel == FuzzySelection) { selBrush.setColor(ThemeEngine::instance()->thumbSelColor()); - selBrush.setStyle(QBrush::SolidPattern); + selBrush.setStyle(Qt::SolidPattern); if (sel == FuzzySelection) - selBrush.setStyle(QBrush::Dense4Pattern); + selBrush.setStyle(Qt::Dense4Pattern); selRect.setTop(height() - d->bottomMargin + 1); selRect.setLeft(d->startPos - (i+1)*d->barWidth); @@ -889,12 +889,12 @@ void TimeLineWidget::updatePixmap() { { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor) ; - QString txt = QString(d->calendar->weekDayName(ref.date(), true)[0]); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString(d->calendar->weekDayName(ref.date(), true)[0]); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -905,8 +905,8 @@ void TimeLineWidget::updatePixmap() p.setPen(dateColor); p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = KGlobal::locale()->formatDate(ref.date(), true); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } break; @@ -916,12 +916,12 @@ void TimeLineWidget::updatePixmap() int week = d->calendar->weekNumber(ref.date()); { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor) ; - QString txt = QString::number(week); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(week); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -932,8 +932,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = KGlobal::locale()->formatDate(ref.date(), true); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = KGlobal::locale()->formatDate(ref.date(), true); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); if (week != 50) p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } @@ -948,12 +948,12 @@ void TimeLineWidget::updatePixmap() { { p.save(); - QFont fnt = p.font(); + TQFont fnt = p.font(); fnt.setPointSize(fnt.pointSize()-4); p.setFont(fnt); p.setPen(subDateColor) ; - QString txt = QString(d->calendar->monthName(ref.date(), true)[0]); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString(d->calendar->monthName(ref.date(), true)[0]); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left() + ((barRect.width()-br.width())/2), barRect.bottom()+br.height(), txt); p.restore(); @@ -964,8 +964,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = QString::number(ref.date().year()); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(ref.date().year()); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } else if (ref.date().month() == 7) @@ -982,8 +982,8 @@ void TimeLineWidget::updatePixmap() { p.drawLine(barRect.left(), barRect.bottom(), barRect.left(), barRect.bottom()+d->bottomMargin/2); - QString txt = QString::number(ref.date().year()); - QRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); + TQString txt = TQString::number(ref.date().year()); + TQRect br = p.fontMetrics().boundingRect(0, 0, width(), height(), 0, txt); p.drawText(barRect.left()-br.width()/2, barRect.bottom() + d->bottomMargin, txt); } else if (ref.date().year() % 5 == 0) @@ -1000,11 +1000,11 @@ void TimeLineWidget::updatePixmap() if (focusRect.isValid()) { focusRect.setTop(d->topMargin); - QPoint p1(focusRect.left(), height() - d->bottomMargin); - QPoint p2(focusRect.right(), height() - d->bottomMargin); + TQPoint p1(focusRect.left(), height() - d->bottomMargin); + TQPoint p2(focusRect.right(), height() - d->bottomMargin); focusRect.setBottom(focusRect.bottom() + d->bottomMargin/2); - p.setPen(palette().active().shadow()); + p.setPen(tqpalette().active().shadow()); p.drawLine(p1.x(), p1.y()+1, p2.x(), p2.y()+1); p.drawRect(focusRect); @@ -1018,16 +1018,16 @@ 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(palette().active().shadow()); + p.setPen(tqpalette().active().shadow()); p.drawRect(focusRect); p.drawLine(p1.x(), p1.y()-2, p2.x(), p2.y()-2); } p.end(); } -QDateTime TimeLineWidget::prevDateTime(const QDateTime& dt) +TQDateTime TimeLineWidget::prevDateTime(const TQDateTime& dt) { - QDateTime prev; + TQDateTime prev; switch(d->timeUnit) { case Day: @@ -1054,9 +1054,9 @@ QDateTime TimeLineWidget::prevDateTime(const QDateTime& dt) return prev; } -QDateTime TimeLineWidget::nextDateTime(const QDateTime& dt) +TQDateTime TimeLineWidget::nextDateTime(const TQDateTime& dt) { - QDateTime next; + TQDateTime next; switch(d->timeUnit) { case Day: @@ -1112,7 +1112,7 @@ int TimeLineWidget::maxCount() return max; } -int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected) +int TimeLineWidget::statForDateTime(const TQDateTime& dt, SelectionMode& selected) { int count = 0; int year = dt.date().year(); @@ -1126,8 +1126,8 @@ int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected { case Day: { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = + d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) { count = it.data().first; @@ -1137,8 +1137,8 @@ int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected } case Week: { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = + d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it != d->weekStatMap.end() ) { count = it.data().first; @@ -1148,8 +1148,8 @@ int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected } case Month: { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = + d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it != d->monthStatMap.end() ) { count = it.data().first; @@ -1159,7 +1159,7 @@ int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected } case Year: { - QMap<int, TimeLineWidgetPriv::StatPair>::iterator it = d->yearStatMap.find(year); + TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it = d->yearStatMap.tqfind(year); if ( it != d->yearStatMap.end() ) { count = it.data().first; @@ -1172,14 +1172,14 @@ int TimeLineWidget::statForDateTime(const QDateTime& dt, SelectionMode& selected return count; } -void TimeLineWidget::setDateTimeSelected(const QDateTime& dt, SelectionMode selected) +void TimeLineWidget::setDateTimeSelected(const TQDateTime& dt, SelectionMode selected) { int year = dt.date().year(); int month = dt.date().month(); int yearForWeek; // Used with week shared between 2 years decade (Dec/Jan). int week = d->calendar->weekNumber(dt.date(), &yearForWeek); - QDateTime dts, dte; + TQDateTime dts, dte; switch(d->timeUnit) { @@ -1200,7 +1200,7 @@ void TimeLineWidget::setDateTimeSelected(const QDateTime& dt, SelectionMode sele } case Month: { - dts = QDateTime(QDate(year, month, 1)); + dts = TQDateTime(TQDate(year, month, 1)); dte = dts.addDays(d->calendar->daysInMonth(dts.date())); setDaysRangeSelection(dts, dte, selected); updateMonthSelection(dts, dte); @@ -1208,7 +1208,7 @@ void TimeLineWidget::setDateTimeSelected(const QDateTime& dt, SelectionMode sele } case Year: { - dts = QDateTime(QDate(year, 1, 1)); + dts = TQDateTime(TQDate(year, 1, 1)); dte = dts.addDays(d->calendar->daysInYear(dts.date())); setDaysRangeSelection(dts, dte, selected); updateYearSelection(dts, dte); @@ -1217,10 +1217,10 @@ void TimeLineWidget::setDateTimeSelected(const QDateTime& dt, SelectionMode sele } } -void TimeLineWidget::updateWeekSelection(const QDateTime dts, const QDateTime dte) +void TimeLineWidget::updateWeekSelection(const TQDateTime dts, const TQDateTime dte) { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; - QDateTime dtsWeek, dteWeek, dt; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dtsWeek, dteWeek, dt; int week; int yearForWeek; // Used with week shared between 2 years decade (Dec/Jan). dt = dts; @@ -1231,7 +1231,7 @@ void TimeLineWidget::updateWeekSelection(const QDateTime dts, const QDateTime dt dtsWeek = firstDayOfWeek(yearForWeek, week); dteWeek = dtsWeek.addDays(7); - it = d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + it = d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it != d->weekStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsWeek, dteWeek); @@ -1240,10 +1240,10 @@ void TimeLineWidget::updateWeekSelection(const QDateTime dts, const QDateTime dt while (dt <= dte); } -void TimeLineWidget::updateMonthSelection(const QDateTime dts, const QDateTime dte) +void TimeLineWidget::updateMonthSelection(const TQDateTime dts, const TQDateTime dte) { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; - QDateTime dtsMonth, dteMonth, dt; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dtsMonth, dteMonth, dt; int year, month; dt = dts; do @@ -1251,9 +1251,9 @@ void TimeLineWidget::updateMonthSelection(const QDateTime dts, const QDateTime d year = dt.date().year(); month = dt.date().month(); - dtsMonth = QDateTime(QDate(year, month, 1)); + dtsMonth = TQDateTime(TQDate(year, month, 1)); dteMonth = dtsMonth.addDays(d->calendar->daysInMonth(dtsMonth.date())); - it = d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); + it = d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it != d->monthStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsMonth, dteMonth); @@ -1262,19 +1262,19 @@ void TimeLineWidget::updateMonthSelection(const QDateTime dts, const QDateTime d while (dt <= dte); } -void TimeLineWidget::updateYearSelection(const QDateTime dts, const QDateTime dte) +void TimeLineWidget::updateYearSelection(const TQDateTime dts, const TQDateTime dte) { - QMap<int, TimeLineWidgetPriv::StatPair>::iterator it; - QDateTime dtsYear, dteYear, dt; + TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dtsYear, dteYear, dt; int year; dt = dts; do { year = dt.date().year(); - dtsYear = QDateTime(QDate(year, 1, 1)); + dtsYear = TQDateTime(TQDate(year, 1, 1)); dteYear = dtsYear.addDays(d->calendar->daysInYear(dtsYear.date())); - it = d->yearStatMap.find(year); + it = d->yearStatMap.tqfind(year); if ( it != d->yearStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsYear, dteYear); @@ -1285,17 +1285,17 @@ void TimeLineWidget::updateYearSelection(const QDateTime dts, const QDateTime dt void TimeLineWidget::updateAllSelection() { - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; - QDateTime dts, dte; - QDate date; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dts, dte; + TQDate date; for (it = d->dayStatMap.begin() ; it != d->dayStatMap.end(); ++it) { if (it.data().second == Selected) { - date = QDate(it.key().first, 1, 1); + date = TQDate(it.key().first, 1, 1); date = date.addDays(it.key().second-1); - dts = QDateTime(date); + dts = TQDateTime(date); dte = dts.addDays(1); updateWeekSelection(dts, dte); updateMonthSelection(dts, dte); @@ -1304,17 +1304,17 @@ void TimeLineWidget::updateAllSelection() } } -void TimeLineWidget::setDaysRangeSelection(const QDateTime dts, const QDateTime dte, SelectionMode selected) +void TimeLineWidget::setDaysRangeSelection(const TQDateTime dts, const TQDateTime dte, SelectionMode selected) { int year, day; - QDateTime dt = dts; - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dt = dts; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; do { year = dt.date().year(); day = d->calendar->dayOfYear(dt.date()); - it = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); + it = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) it.data().second = selected; @@ -1323,21 +1323,21 @@ void TimeLineWidget::setDaysRangeSelection(const QDateTime dts, const QDateTime while(dt < dte); } -TimeLineWidget::SelectionMode TimeLineWidget::checkSelectionForDaysRange(const QDateTime dts, const QDateTime dte) +TimeLineWidget::SelectionMode TimeLineWidget::checkSelectionForDaysRange(const TQDateTime dts, const TQDateTime dte) { int year, day; int items = 0; int itemsFuz = 0; int itemsSel = 0; - QDateTime dt = dts; - QMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; + TQDateTime dt = dts; + TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it; do { year = dt.date().year(); day = d->calendar->dayOfYear(dt.date()); - it = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); + it = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) { items++; @@ -1369,19 +1369,19 @@ TimeLineWidget::SelectionMode TimeLineWidget::checkSelectionForDaysRange(const Q return Selected; } -void TimeLineWidget::paintEvent(QPaintEvent*) +void TimeLineWidget::paintEvent(TQPaintEvent*) { bitBlt(this, 0, 0, &d->pixmap); } -void TimeLineWidget::resizeEvent(QResizeEvent*) +void TimeLineWidget::resizeEvent(TQResizeEvent*) { updatePixmap(); } void TimeLineWidget::slotBackward() { - QDateTime ref = d->refDateTime; + TQDateTime ref = d->refDateTime; switch(d->timeUnit) { @@ -1421,7 +1421,7 @@ void TimeLineWidget::slotPrevious() { if (d->refDateTime <= d->minDateTime) return; - QDateTime ref = prevDateTime(d->refDateTime); + TQDateTime ref = prevDateTime(d->refDateTime); setRefDateTime(ref); } @@ -1429,13 +1429,13 @@ void TimeLineWidget::slotNext() { if (d->refDateTime >= d->maxDateTime) return; - QDateTime ref = nextDateTime(d->refDateTime); + TQDateTime ref = nextDateTime(d->refDateTime); setRefDateTime(ref); } void TimeLineWidget::slotForward() { - QDateTime ref = d->refDateTime; + TQDateTime ref = d->refDateTime; switch(d->timeUnit) { @@ -1471,11 +1471,11 @@ void TimeLineWidget::slotForward() setRefDateTime(ref); } -void TimeLineWidget::wheelEvent(QWheelEvent* e) +void TimeLineWidget::wheelEvent(TQWheelEvent* e) { if (e->delta() < 0) { - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) slotForward(); else slotNext(); @@ -1483,22 +1483,22 @@ void TimeLineWidget::wheelEvent(QWheelEvent* e) if (e->delta() > 0) { - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) slotBackward(); else slotPrevious(); } } -void TimeLineWidget::mousePressEvent(QMouseEvent *e) +void TimeLineWidget::mousePressEvent(TQMouseEvent *e) { if (e->button() == Qt::LeftButton) { - QPoint pt(e->x(), e->y()); + TQPoint pt(e->x(), e->y()); - bool ctrlPressed = e->state() & Qt::ControlButton; - QDateTime ref = dateTimeForPoint(pt, d->selMouseEvent); - d->selStartDateTime = QDateTime(); + bool ctrlPressed = e->state() & TQt::ControlButton; + TQDateTime ref = dateTimeForPoint(pt, d->selMouseEvent); + d->selStartDateTime = TQDateTime(); if (d->selMouseEvent) { if (!ctrlPressed) @@ -1519,14 +1519,14 @@ void TimeLineWidget::mousePressEvent(QMouseEvent *e) } } -void TimeLineWidget::mouseMoveEvent(QMouseEvent *e) +void TimeLineWidget::mouseMoveEvent(TQMouseEvent *e) { if (d->validMouseEvent == true) { - QPoint pt(e->x(), e->y()); + TQPoint pt(e->x(), e->y()); bool sel; - QDateTime selEndDateTime = dateTimeForPoint(pt, sel); + TQDateTime selEndDateTime = dateTimeForPoint(pt, sel); setCursorDateTime(selEndDateTime); // Clamp start and end date-time of current contiguous selection. @@ -1544,7 +1544,7 @@ void TimeLineWidget::mouseMoveEvent(QMouseEvent *e) d->selMinDateTime = selEndDateTime; } - QDateTime dt = d->selMinDateTime; + TQDateTime dt = d->selMinDateTime; do { setDateTimeSelected(dt, Unselected); @@ -1559,7 +1559,7 @@ void TimeLineWidget::mouseMoveEvent(QMouseEvent *e) { if (!d->selStartDateTime.isNull() && !selEndDateTime.isNull()) { - QDateTime dt = d->selStartDateTime; + TQDateTime dt = d->selStartDateTime; if (selEndDateTime > d->selStartDateTime) { do @@ -1586,7 +1586,7 @@ void TimeLineWidget::mouseMoveEvent(QMouseEvent *e) } } -void TimeLineWidget::mouseReleaseEvent(QMouseEvent*) +void TimeLineWidget::mouseReleaseEvent(TQMouseEvent*) { d->validMouseEvent = false; @@ -1601,17 +1601,17 @@ void TimeLineWidget::mouseReleaseEvent(QMouseEvent*) d->selMouseEvent = false; } -QDateTime TimeLineWidget::dateTimeForPoint(const QPoint& pt, bool &isOnSelectionArea) +TQDateTime TimeLineWidget::dateTimeForPoint(const TQPoint& pt, bool &isOnSelectionArea) { - QRect barRect, selRect; + TQRect barRect, selRect; isOnSelectionArea = false; // Check on the right of reference date. - QDateTime ref = d->refDateTime; - ref.setTime(QTime(0, 0, 0, 0)); + TQDateTime ref = d->refDateTime; + ref.setTime(TQTime(0, 0, 0, 0)); - QRect deskRect = KGlobalSettings::desktopGeometry(this); + TQRect deskRect = KGlobalSettings::desktopGeometry(this); int items = deskRect.width() / d->barWidth; for (int i = 0 ; i < items ; i++) @@ -1626,10 +1626,10 @@ QDateTime TimeLineWidget::dateTimeForPoint(const QPoint& pt, bool &isOnSelection selRect.setBottom(height()); selRect.setRight(d->startPos + (i+1)*d->barWidth); - if (selRect.contains(pt)) + if (selRect.tqcontains(pt)) isOnSelectionArea = true; - if (barRect.contains(pt) || selRect.contains(pt)) + if (barRect.tqcontains(pt) || selRect.tqcontains(pt)) { if (i >= d->nbItems) { @@ -1646,7 +1646,7 @@ QDateTime TimeLineWidget::dateTimeForPoint(const QPoint& pt, bool &isOnSelection // Check on the left of reference date. ref = d->refDateTime; - ref.setTime(QTime(0, 0, 0, 0)); + ref.setTime(TQTime(0, 0, 0, 0)); ref = prevDateTime(ref); for (int i = 0 ; i < items ; i++) @@ -1661,10 +1661,10 @@ QDateTime TimeLineWidget::dateTimeForPoint(const QPoint& pt, bool &isOnSelection selRect.setBottom(height()); selRect.setRight(d->startPos - i*d->barWidth); - if (selRect.contains(pt)) + if (selRect.tqcontains(pt)) isOnSelectionArea = true; - if (barRect.contains(pt) || selRect.contains(pt)) + if (barRect.tqcontains(pt) || selRect.tqcontains(pt)) { if (i >= d->nbItems-1) { @@ -1678,17 +1678,17 @@ QDateTime TimeLineWidget::dateTimeForPoint(const QPoint& pt, bool &isOnSelection ref = prevDateTime(ref); } - return QDateTime(); + return TQDateTime(); } -QDateTime TimeLineWidget::firstDayOfWeek(int year, int weekNumber) +TQDateTime TimeLineWidget::firstDayOfWeek(int year, int weekNumber) { // Search the first day of first week of year. // We start to scan from 1st december of year-1 because // first week of year OR last week of year-1 can be shared // between year-1 and year. - QDateTime d1(QDate(year-1, 12, 1)); - QDateTime dt = d1; + TQDateTime d1(TQDate(year-1, 12, 1)); + TQDateTime dt = d1; int weekYear = 0; int weekNum = 0; diff --git a/digikam/digikam/timelinewidget.h b/digikam/digikam/timelinewidget.h index d6d9ea9..c88c184 100644 --- a/digikam/digikam/timelinewidget.h +++ b/digikam/digikam/timelinewidget.h @@ -24,11 +24,11 @@ #ifndef TIMELINEWIDGET_H #define TIMELINEWIDGET_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qwidget.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqdatetime.h> // Local includes. @@ -37,14 +37,15 @@ namespace Digikam { -typedef QPair<QDateTime, QDateTime> DateRange; // Range of a contigue dates selection <start date, end date>. -typedef QValueList<DateRange> DateRangeList; // List of dates range selected. +typedef TQPair<TQDateTime, TQDateTime> DateRange; // Range of a contigue dates selection <start date, end date>. +typedef TQValueList<DateRange> DateRangeList; // List of dates range selected. class TimeLineWidgetPriv; -class TimeLineWidget : public QWidget +class TimeLineWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -71,7 +72,7 @@ public: public: - TimeLineWidget(QWidget *parent=0); + TimeLineWidget(TQWidget *tqparent=0); ~TimeLineWidget(); void setTimeUnit(TimeUnit timeUnit); @@ -80,9 +81,9 @@ public: void setScaleMode(ScaleMode scaleMode); ScaleMode scaleMode() const; - void setCursorDateTime(const QDateTime& dateTime); - QDateTime cursorDateTime() const; - int cursorInfo(QString& infoDate); + void setCursorDateTime(const TQDateTime& dateTime); + TQDateTime cursorDateTime() const; + int cursorInfo(TQString& infoDate); /** Return a list of Date-Range based on selection performed on days-map */ DateRangeList selectedDateRange(int& totalCount); @@ -102,7 +103,7 @@ signals: public slots: - void slotDatesMap(const QMap<QDateTime, int>&); + void slotDatesMap(const TQMap<TQDateTime, int>&); void slotPrevious(); void slotNext(); void slotBackward(); @@ -115,33 +116,33 @@ private slots: private: - QDateTime prevDateTime(const QDateTime& dt); - QDateTime nextDateTime(const QDateTime& dt); + TQDateTime prevDateTime(const TQDateTime& dt); + TQDateTime nextDateTime(const TQDateTime& dt); int maxCount(); - int indexForDateTime(const QDateTime& date); - int statForDateTime(const QDateTime& dt, SelectionMode& selected); - void setRefDateTime(const QDateTime& dateTime); + int indexForDateTime(const TQDateTime& date); + int statForDateTime(const TQDateTime& dt, SelectionMode& selected); + void setRefDateTime(const TQDateTime& dateTime); void updatePixmap(); - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); - void wheelEvent(QWheelEvent*); + void paintEvent(TQPaintEvent*); + void resizeEvent(TQResizeEvent*); + void wheelEvent(TQWheelEvent*); - void mousePressEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); - QDateTime dateTimeForPoint(const QPoint& pt, bool &isOnSelectionArea); - QDateTime firstDayOfWeek(int year, int weekNumber); + TQDateTime dateTimeForPoint(const TQPoint& pt, bool &isOnSelectionArea); + TQDateTime firstDayOfWeek(int year, int weekNumber); void resetSelection(); - void setDateTimeSelected(const QDateTime& dt, SelectionMode selected); - void setDaysRangeSelection(const QDateTime dts, const QDateTime dte, SelectionMode selected); - SelectionMode checkSelectionForDaysRange(const QDateTime dts, const QDateTime dte); - void updateWeekSelection(const QDateTime dts, const QDateTime dte); - void updateMonthSelection(const QDateTime dts, const QDateTime dte); - void updateYearSelection(const QDateTime dts, const QDateTime dte); + void setDateTimeSelected(const TQDateTime& dt, SelectionMode selected); + void setDaysRangeSelection(const TQDateTime dts, const TQDateTime dte, SelectionMode selected); + SelectionMode checkSelectionForDaysRange(const TQDateTime dts, const TQDateTime dte); + void updateWeekSelection(const TQDateTime dts, const TQDateTime dte); + void updateMonthSelection(const TQDateTime dts, const TQDateTime dte); + void updateYearSelection(const TQDateTime dts, const TQDateTime dte); void updateAllSelection(); private: diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp index c2cf11e..1101ae3 100644 --- a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp +++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qpair.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qfileinfo.h> +#include <tqmap.h> +#include <tqpair.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqfileinfo.h> // KDE includes. @@ -48,59 +48,59 @@ namespace Digikam struct _Album { int id; - QString url; - QString date; - QString caption; - QString collection; - QString icon; + TQString url; + TQString date; + TQString caption; + TQString collection; + TQString icon; }; struct _Tag { int id; int pid; - QString name; - QString icon; + TQString name; + TQString icon; }; -static QString escapeString(QString str) +static TQString escapeString(TQString str) { - str.replace( "'", "''" ); + str.tqreplace( "'", "''" ); return str; } -Q_LLONG findOrAddImage(AlbumDB* db, int dirid, const QString& name, - const QString& caption) +TQ_LLONG findOrAddImage(AlbumDB* db, int dirid, const TQString& name, + const TQString& caption) { - QStringList values; + TQStringList values; - db->execSql(QString("SELECT id FROM Images WHERE dirid=%1 AND name='%2'") - .arg(dirid) - .arg(escapeString(name)), &values); + db->execSql(TQString("SELECT id FROM Images WHERE dirid=%1 AND name='%2'") + .tqarg(dirid) + .tqarg(escapeString(name)), &values); if (!values.isEmpty()) { return values.first().toLongLong(); } - db->execSql(QString("INSERT INTO Images (dirid, name, caption) \n " + db->execSql(TQString("INSERT INTO Images (dirid, name, caption) \n " "VALUES(%1, '%2', '%3');") - .arg(dirid) - .arg(escapeString(name)) - .arg(escapeString(caption)), &values); + .tqarg(dirid) + .tqarg(escapeString(name)) + .tqarg(escapeString(caption)), &values); return db->lastInsertedRow(); } -bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) +bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) { - QString libraryPath = QDir::cleanDirPath(_libraryPath); + TQString libraryPath = TQDir::cleanDirPath(_libraryPath); - QString newDB= libraryPath + "/digikam3.db"; + TQString newDB= libraryPath + "/digikam3.db"; #ifdef NFS_HACK - newDB = locateLocal("appdata", KIO::encodeFileName(QDir::cleanDirPath(newDB))); + newDB = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(newDB))); DDebug() << "NFS: " << newDB << endl; #endif @@ -116,14 +116,14 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) if (db3.getSetting("UpgradedFromSqlite2") == "yes") return true; - QString dbPath = libraryPath + "/digikam.db"; + TQString dbPath = libraryPath + "/digikam.db"; #ifdef NFS_HACK - dbPath = locateLocal("appdata", KIO::encodeFileName(QDir::cleanDirPath(dbPath))); + dbPath = locateLocal("appdata", KIO::encodeFileName(TQDir::cleanDirPath(dbPath))); DDebug() << "From NFS: " << dbPath << endl; #endif - QFileInfo fi(dbPath); + TQFileInfo fi(dbPath); if (!fi.exists()) { @@ -148,7 +148,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) db3.execSql("DELETE FROM ImageTags;"); db3.execSql("DELETE FROM ImageProperties;"); - QStringList values; + TQStringList values; // update albums ------------------------------------------------- @@ -156,14 +156,14 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) db2.execSql("SELECT id, url, date, caption, collection, icon FROM Albums;", &values); - typedef QValueList<_Album> AlbumList; + typedef TQValueList<_Album> AlbumList; AlbumList albumList; - typedef QMap<QString, int> AlbumMap; + typedef TQMap<TQString, int> AlbumMap; AlbumMap albumMap; db3.beginTransaction(); - for (QStringList::iterator it=values.begin(); it!=values.end();) + for (TQStringList::iterator it=values.begin(); it!=values.end();) { _Album album; @@ -183,13 +183,13 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) albumList.append(album); albumMap.insert(album.url, album.id); - db3.execSql(QString("INSERT INTO Albums (id, url, date, caption, collection) " + db3.execSql(TQString("INSERT INTO Albums (id, url, date, caption, collection) " "VALUES(%1, '%2', '%3', '%4', '%5');") - .arg(album.id) - .arg(escapeString(album.url)) - .arg(escapeString(album.date)) - .arg(escapeString(album.caption)) - .arg(escapeString(album.collection))); + .tqarg(album.id) + .tqarg(escapeString(album.url)) + .tqarg(escapeString(album.date)) + .tqarg(escapeString(album.caption)) + .tqarg(escapeString(album.collection))); } db3.commitTransaction(); @@ -199,11 +199,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) db2.execSql("SELECT id, pid, name, icon FROM Tags;", &values); - typedef QValueList<_Tag> TagList; + typedef TQValueList<_Tag> TagList; TagList tagList; db3.beginTransaction(); - for (QStringList::iterator it=values.begin(); it!=values.end();) + for (TQStringList::iterator it=values.begin(); it!=values.end();) { _Tag tag; @@ -218,11 +218,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) tagList.append(tag); - db3.execSql(QString("INSERT INTO Tags (id, pid, name) " + db3.execSql(TQString("INSERT INTO Tags (id, pid, name) " "VALUES(%1, %2, '%3');") - .arg(tag.id) - .arg(tag.pid) - .arg(escapeString(tag.name))); + .tqarg(tag.id) + .tqarg(tag.pid) + .tqarg(escapeString(tag.name))); } db3.commitTransaction(); @@ -233,13 +233,13 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) &values); db3.beginTransaction(); - for (QStringList::iterator it=values.begin(); it!=values.end();) + for (TQStringList::iterator it=values.begin(); it!=values.end();) { int dirid = (*it).toInt(); ++it; - QString name = (*it); + TQString name = (*it); ++it; - QString caption = (*it); + TQString caption = (*it); ++it; findOrAddImage(&db3, dirid, name, caption); @@ -252,21 +252,21 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) db2.execSql("SELECT dirid, name, tagid FROM ImageTags;", &values); db3.beginTransaction(); - for (QStringList::iterator it=values.begin(); it!=values.end();) + for (TQStringList::iterator it=values.begin(); it!=values.end();) { int dirid = (*it).toInt(); ++it; - QString name = (*it); + TQString name = (*it); ++it; int tagid = (*it).toInt(); ++it; - Q_LLONG imageid = findOrAddImage(&db3, dirid, name, QString()); + TQ_LLONG imageid = findOrAddImage(&db3, dirid, name, TQString()); - db3.execSql(QString("INSERT INTO ImageTags VALUES( %1, %2 )") - .arg(imageid).arg(tagid)); + db3.execSql(TQString("INSERT INTO ImageTags VALUES( %1, %2 )") + .tqarg(imageid).tqarg(tagid)); } db3.commitTransaction(); @@ -281,11 +281,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) if (album.icon.isEmpty()) continue; - Q_LLONG imageid = findOrAddImage(&db3, album.id, album.icon, QString()); + TQ_LLONG imageid = findOrAddImage(&db3, album.id, album.icon, TQString()); - db3.execSql(QString("UPDATE Albums SET icon=%1 WHERE id=%2") - .arg(imageid) - .arg(album.id)); + db3.execSql(TQString("UPDATE Albums SET icon=%1 WHERE id=%2") + .tqarg(imageid) + .tqarg(album.id)); } db3.commitTransaction(); @@ -299,22 +299,22 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) if (tag.icon.isEmpty()) continue; - QFileInfo fi(tag.icon); + TQFileInfo fi(tag.icon); if (fi.isRelative()) { - db3.execSql(QString("UPDATE Tags SET iconkde='%1' WHERE id=%2") - .arg(escapeString(tag.icon)) - .arg(tag.id)); + db3.execSql(TQString("UPDATE Tags SET iconkde='%1' WHERE id=%2") + .tqarg(escapeString(tag.icon)) + .tqarg(tag.id)); continue; } - tag.icon = QDir::cleanDirPath(tag.icon); + tag.icon = TQDir::cleanDirPath(tag.icon); fi.setFile(tag.icon.remove(libraryPath)); - QString url = fi.dirPath(true); - QString name = fi.fileName(); + TQString url = fi.dirPath(true); + TQString name = fi.fileName(); - AlbumMap::iterator it1 = albumMap.find(url); + AlbumMap::iterator it1 = albumMap.tqfind(url); if (it1 == albumMap.end()) { DDebug() << "Could not find album with url: " << url << endl; @@ -324,11 +324,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) int dirid = it1.data(); - Q_LLONG imageid = findOrAddImage(&db3, dirid, name, QString());; + TQ_LLONG imageid = findOrAddImage(&db3, dirid, name, TQString());; - db3.execSql(QString("UPDATE Tags SET icon=%1 WHERE id=%2") - .arg(imageid) - .arg(tag.id)); + db3.execSql(TQString("UPDATE Tags SET icon=%1 WHERE id=%2") + .tqarg(imageid) + .tqarg(tag.id)); } db3.commitTransaction(); @@ -349,7 +349,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) std::cout << "Checking Albums.................."; values.clear(); db2.execSql("SELECT id, url, date, caption, collection FROM Albums;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { _Album album; album.id = (*it).toInt(); @@ -363,18 +363,18 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) album.collection = (*it); ++it; - QStringList list; - db3.execSql(QString("SELECT id FROM Albums WHERE \n" + TQStringList list; + db3.execSql(TQString("SELECT id FROM Albums WHERE \n" " id=%1 AND \n" " url='%2' AND \n" " date='%3' AND \n" " caption='%4' AND \n" " collection='%5';") - .arg(album.id) - .arg(escapeString(album.url)) - .arg(escapeString(album.date)) - .arg(escapeString(album.caption)) - .arg(escapeString(album.collection)), &list, false); + .tqarg(album.id) + .tqarg(escapeString(album.url)) + .tqarg(escapeString(album.date)) + .tqarg(escapeString(album.caption)) + .tqarg(escapeString(album.collection)), &list, false); if (list.size() != 1) { std::cerr << "Failed" << std::endl; @@ -390,23 +390,23 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) std::cout << "Checking Tags...................."; values.clear(); db2.execSql("SELECT id, pid, name FROM Tags;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { int id = (*it).toInt(); ++it; int pid = (*it).toInt(); ++it; - QString name = (*it); + TQString name = (*it); ++it; - QStringList list; - db3.execSql(QString("SELECT id FROM Tags WHERE \n" + TQStringList list; + db3.execSql(TQString("SELECT id FROM Tags WHERE \n" " id=%1 AND \n" " pid=%2 AND \n" " name='%3';") - .arg(id) - .arg(pid) - .arg(escapeString(name)), + .tqarg(id) + .tqarg(pid) + .tqarg(escapeString(name)), &list, false); if (list.size() != 1) { @@ -424,24 +424,24 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) values.clear(); db2.execSql("SELECT Albums.url, Images.name, Images.caption " "FROM Images, Albums WHERE Albums.id=Images.dirid;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { - QString url = (*it); + TQString url = (*it); ++it; - QString name = (*it); + TQString name = (*it); ++it; - QString caption = (*it); + TQString caption = (*it); ++it; - QStringList list; - db3.execSql(QString("SELECT Images.id FROM Images, Albums WHERE \n " + TQStringList list; + db3.execSql(TQString("SELECT Images.id FROM Images, Albums WHERE \n " "Albums.url = '%1' AND \n " "Images.dirid = Albums.id AND \n " "Images.name = '%2' AND \n " "Images.caption = '%3';") - .arg(escapeString(url)) - .arg(escapeString(name)) - .arg(escapeString(caption)), + .tqarg(escapeString(url)) + .tqarg(escapeString(name)) + .tqarg(escapeString(caption)), &list, false); if (list.size() != 1) { @@ -460,25 +460,25 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) db2.execSql("SELECT Albums.url, ImageTags.name, ImageTags.tagid " "FROM ImageTags, Albums WHERE \n " " Albums.id=ImageTags.dirid;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { - QString url = (*it); + TQString url = (*it); ++it; - QString name = (*it); + TQString name = (*it); ++it; int tagid = (*it).toInt(); ++it; - QStringList list; - db3.execSql(QString("SELECT Images.id FROM Albums, Images, ImageTags WHERE \n " + TQStringList list; + db3.execSql(TQString("SELECT Images.id FROM Albums, Images, ImageTags WHERE \n " "Albums.url = '%1' AND \n " "Images.dirid = Albums.id AND \n " "Images.name = '%2' AND \n " "ImageTags.imageid = Images.id AND \n " "ImageTags.tagid = %3;") - .arg(escapeString(url)) - .arg(escapeString(name)) - .arg(tagid), + .tqarg(escapeString(url)) + .tqarg(escapeString(name)) + .tqarg(tagid), &list, false); if (list.size() != 1) { @@ -494,23 +494,23 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) std::cout << "Checking Album icons ..............."; values.clear(); db2.execSql("SELECT url, icon FROM Albums;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { - QString url = (*it); + TQString url = (*it); ++it; - QString icon = (*it); + TQString icon = (*it); ++it; if (icon.isEmpty()) continue; - QStringList list; - db3.execSql(QString("SELECT Images.id FROM Images, Albums WHERE \n " + TQStringList list; + db3.execSql(TQString("SELECT Images.id FROM Images, Albums WHERE \n " "Albums.url = '%1' AND \n " "Images.id = Albums.icon AND \n " "Images.name = '%2';") - .arg(escapeString(url)) - .arg(escapeString(icon)), &list); + .tqarg(escapeString(url)) + .tqarg(escapeString(icon)), &list); if (list.size() != 1) { @@ -528,11 +528,11 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) std::cout << "Checking Tag icons ..............."; values.clear(); db2.execSql("SELECT id, icon FROM Tags;", &values); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { int id = (*it).toInt(); ++it; - QString icon = (*it); + TQString icon = (*it); ++it; if (icon.isEmpty()) @@ -540,12 +540,12 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) if (!icon.startsWith("/")) { - QStringList list; - db3.execSql(QString("SELECT id FROM Tags WHERE \n " + TQStringList list; + db3.execSql(TQString("SELECT id FROM Tags WHERE \n " "id = %1 AND \n " "iconkde = '%2';") - .arg(id) - .arg(escapeString(icon)), &list); + .tqarg(id) + .tqarg(escapeString(icon)), &list); if (list.size() != 1) { @@ -559,17 +559,17 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) } else { - icon = QDir::cleanDirPath(icon); - QFileInfo fi(icon.remove(libraryPath)); + icon = TQDir::cleanDirPath(icon); + TQFileInfo fi(icon.remove(libraryPath)); - QString url = fi.dirPath(true); - QString name = fi.fileName(); + TQString url = fi.dirPath(true); + TQString name = fi.fileName(); - QStringList list; + TQStringList list; list.clear(); - db3.execSql(QString("SELECT id FROM Albums WHERE url='%1'") - .arg(escapeString(url)), &list); + db3.execSql(TQString("SELECT id FROM Albums WHERE url='%1'") + .tqarg(escapeString(url)), &list); if (list.isEmpty()) { DWarning() << "Tag icon not in Album Library Path, Rejecting " << endl; @@ -578,14 +578,14 @@ bool upgradeDB_Sqlite2ToSqlite3(const QString& _libraryPath) } list.clear(); - db3.execSql(QString("SELECT Images.id FROM Images, Tags WHERE \n " + db3.execSql(TQString("SELECT Images.id FROM Images, Tags WHERE \n " " Images.dirid=(SELECT id FROM Albums WHERE url='%1') AND \n " " Images.name='%2' AND \n " " Tags.id=%3 AND \n " " Tags.icon=Images.id") - .arg(escapeString(url)) - .arg(escapeString(name)) - .arg(id), &list); + .tqarg(escapeString(url)) + .tqarg(escapeString(name)) + .tqarg(id), &list); if (list.size() != 1) { std::cerr << "Failed." << std::endl; diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.h b/digikam/digikam/upgradedb_sqlite2tosqlite3.h index 44db1b5..a699c75 100644 --- a/digikam/digikam/upgradedb_sqlite2tosqlite3.h +++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.h @@ -21,18 +21,18 @@ * * ============================================================ */ -#ifndef UPGRADEDB_SQLITE2TOSQLITE3_H -#define UPGRADEDB_SQLITE2TOSQLITE3_H +#ifndef UPGRADEDB_STQLITE2TOSTQLITE3_H +#define UPGRADEDB_STQLITE2TOSTQLITE3_H #include "digikam_export.h" -class QString; +class TQString; namespace Digikam { -extern bool DIGIKAM_EXPORT upgradeDB_Sqlite2ToSqlite3(const QString& libraryPath); +extern bool DIGIKAM_EXPORT upgradeDB_Sqlite2ToSqlite3(const TQString& libraryPath); } // namespace Digikam -#endif /* UPGRADEDB_SQLITE2TOSQLITE3_H */ +#endif /* UPGRADEDB_STQLITE2TOSTQLITE3_H */ diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp index 19da547..1b64418 100644 --- a/digikam/digikam/welcomepageview.cpp +++ b/digikam/digikam/welcomepageview.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqwidget.h> +#include <tqfile.h> +#include <tqfileinfo.h> // KDE includes. @@ -47,10 +47,10 @@ namespace Digikam { -WelcomePageView::WelcomePageView(QWidget* parent) - : KHTMLPart(parent) +WelcomePageView::WelcomePageView(TQWidget* tqparent) + : KHTMLPart(tqparent) { - widget()->setFocusPolicy(QWidget::WheelFocus); + widget()->setFocusPolicy(TQ_WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): setPluginsEnabled(false); setJScriptEnabled(false); // just make this explicit. @@ -58,33 +58,33 @@ WelcomePageView::WelcomePageView(QWidget* parent) setMetaRefreshEnabled(false); setURLCursor(KCursor::handCursor()); - QString fontSize = QString::number(12); - QString appTitle = i18n("digiKam"); - QString catchPhrase = QString(); // Not enough space for a catch phrase at default window size. - QString quickDescription = QString(digiKamDescription()); - QString locationHtml = locate("data", "digikam/about/main.html"); - QString locationCss = locate("data", "digikam/about/kde_infopage.css"); - QString locationRtl = locate("data", "digikam/about/kde_infopage_rtl.css" ); - QString rtl = kapp->reverseLayout() ? QString("@import \"%1\";" ).arg(locationRtl) - : QString(); + TQString fontSize = TQString::number(12); + TQString appTitle = i18n("digiKam"); + TQString catchPhrase = TQString(); // Not enough space for a catch phrase at default window size. + TQString quickDescription = TQString(digiKamDescription()); + 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(); begin(KURL(locationHtml)); - QString content = fileToString(locationHtml); - content = content.arg(locationCss) // %1 - .arg(rtl) // %2 - .arg(fontSize) // %3 - .arg(appTitle) // %4 - .arg(catchPhrase) // %5 - .arg(quickDescription) // %6 - .arg(infoPage()); // %7 + 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 write(content); end(); show(); - connect(browserExtension(), SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - this, SLOT(slotUrlOpen(const KURL &))); + connect(browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + this, TQT_SLOT(slotUrlOpen(const KURL &))); } WelcomePageView::~WelcomePageView() @@ -96,9 +96,9 @@ void WelcomePageView::slotUrlOpen(const KURL &url) KApplication::kApplication()->invokeBrowser(url.url()); } -QString WelcomePageView::infoPage() +TQString WelcomePageView::infoPage() { - QString info = + TQString info = i18n( "%1: digiKam version; " "%2: help:// URL; " @@ -127,12 +127,12 @@ QString WelcomePageView::infoPage() "<p>We hope that you will enjoy digiKam.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The digiKam Team</p>") - .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. + .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. - QStringList newFeatures; + TQStringList newFeatures; newFeatures << i18n("16-bit/color/pixel image support"); newFeatures << i18n("Full color management support"); newFeatures << i18n("Native JPEG-2000 support"); @@ -155,33 +155,33 @@ QString WelcomePageView::infoPage() newFeatures << i18n("New tool to perform dates search around whole albums collection: Time-Line"); newFeatures << i18n("New tool to import RAW files in editor with customized decoding settings"); - QString featureItems; + TQString featureItems; for ( uint i = 0 ; i < newFeatures.count() ; i++ ) - featureItems += i18n("<li>%1</li>\n").arg( newFeatures[i] ); + featureItems += i18n("<li>%1</li>\n").tqarg( newFeatures[i] ); - info = info.arg( featureItems ); + info = info.tqarg( featureItems ); // Add first-time user text (only shown on first start). - info = info.arg( QString() ); + info = info.tqarg( TQString() ); // Generated list of important changes - info = info.arg( QString() ); + info = info.tqarg( TQString() ); return info; } -QCString WelcomePageView::fileToString(const QString &aFileName) +TQCString WelcomePageView::fileToString(const TQString &aFileName) { - QCString result; - QFileInfo info(aFileName); + TQCString result; + TQFileInfo info(aFileName); unsigned int readLen; unsigned int len = info.size(); - QFile file(aFileName); + TQFile file(aFileName); if (aFileName.isEmpty() || len <= 0 || !info.exists() || info.isDir() || !info.isReadable() || !file.open(IO_Raw|IO_ReadOnly)) - return QCString(); + return TQCString(); result.resize(len + 2); readLen = file.readBlock(result.data(), len); @@ -193,7 +193,7 @@ QCString WelcomePageView::fileToString(const QString &aFileName) result[len] = '\0'; if (readLen < len) - return QCString(); + return TQCString(); return result; } diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h index fa864d5..627533f 100644 --- a/digikam/digikam/welcomepageview.h +++ b/digikam/digikam/welcomepageview.h @@ -25,9 +25,9 @@ #ifndef WELCOMEPAGEVIEW_H #define WELCOMEPAGEVIEW_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -43,16 +43,17 @@ namespace Digikam class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: - WelcomePageView(QWidget* parent); + WelcomePageView(TQWidget* tqparent); ~WelcomePageView(); private: - QCString fileToString(const QString &aFileName); - QString infoPage(); + TQCString fileToString(const TQString &aFileName); + TQString infoPage(); private slots: diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index 3172730..02a65ed 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -25,25 +25,25 @@ #include <cmath> -// Qt includes. - -#include <qlayout.h> -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qpixmap.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqpixmap.h> // KDE includes. @@ -80,8 +80,8 @@ namespace DigikamAdjustCurvesImagesPlugin { -AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Adjust Color Curves"), "adjustcurves", true, false) +AdjustCurveDialog::AdjustCurveDialog(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Curves"), "adjustcurves", true, false) { m_destinationPreviewData = 0L; @@ -123,19 +123,19 @@ AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* grid = new QGridLayout( gboxSettings, 5, 5, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* grid = new TQGridLayout( gboxSettings, 5, 5, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->insertItem( i18n("Alpha") ); m_channelCB->setCurrentText( i18n("Luminosity") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" @@ -144,34 +144,34 @@ AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) "This channel corresponds to the transparency value and " "is supported by some image formats, such as PNG or TIF.")); - m_scaleBG = new QHButtonGroup(gboxSettings); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + m_scaleBG = new TQHButtonGroup(gboxSettings); + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::CurvesWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::CurvesWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); m_scaleBG->setExclusive(true); m_scaleBG->setButton(Digikam::CurvesWidget::LogScaleHistogram); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addStretch(10); l1->addWidget(m_scaleBG); @@ -181,31 +181,31 @@ AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) // ------------------------------------------------------------- - QWidget *curveBox = new QWidget(gboxSettings); - QGridLayout* gl = new QGridLayout(curveBox, 4, 2, 0); + TQWidget *curveBox = new TQWidget(gboxSettings); + TQGridLayout* gl = new TQGridLayout(curveBox, 4, 2, 0); m_histogramWidget = new Digikam::HistogramWidget(256, 140, curveBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "curves settings changes.")); m_vGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Vertical, 10, curveBox ); - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); - QLabel *spacev = new QLabel(curveBox); + TQLabel *spacev = new TQLabel(curveBox); spacev->setFixedWidth(1); m_curvesWidget = new Digikam::CurvesWidget(256, 256, m_originalImage.bits(), m_originalImage.width(), m_originalImage.height(), m_originalImage.sixteenBit(), m_curves, curveBox); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve drawing of the selected channel from " + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve drawing of the selected channel from " "original image")); - QLabel *spaceh = new QLabel(curveBox); + TQLabel *spaceh = new TQLabel(curveBox); spaceh->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, curveBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gl->addMultiCellWidget(m_histogramWidget, 0, 0, 2, 2); gl->addMultiCellWidget(m_vGradient, 2, 2, 0, 0); @@ -219,75 +219,75 @@ AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) // ------------------------------------------------------------- - m_curveType = new QHButtonGroup(gboxSettings); - m_curveFree = new QPushButton(m_curveType); + m_curveType = new TQHButtonGroup(gboxSettings); + m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); - m_curveFree->setPixmap( QPixmap( directory + "curvefree.png" ) ); + m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); - QToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); - QWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); - m_curveSmooth = new QPushButton(m_curveType); + TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); + TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); + m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); - m_curveSmooth->setPixmap( QPixmap( directory + "curvemooth.png" ) ); + m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); - QToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); - QWhatsThis::add( m_curveSmooth, i18n("<p>With this button, you constrains the curve type to a smooth line with tension.")); + TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); + TQWhatsThis::add( m_curveSmooth, i18n("<p>With this button, you constrains the curve type to a smooth line with tension.")); m_curveType->setExclusive(true); m_curveType->setButton(SmoothDrawing); - m_curveType->setFrameShape(QFrame::NoFrame); + m_curveType->setFrameShape(TQFrame::NoFrame); // ------------------------------------------------------------- - m_pickerColorButtonGroup = new QHButtonGroup(gboxSettings); - m_pickBlack = new QPushButton(m_pickerColorButtonGroup); + m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); + m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); - m_pickBlack->setPixmap( QPixmap( directory + "color-picker-black.png" ) ); + m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); - QToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); - QWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " + TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); + TQWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); - m_pickGray = new QPushButton(m_pickerColorButtonGroup); + m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); - m_pickGray->setPixmap( QPixmap( directory + "color-picker-grey.png" ) ); + m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); - QToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); - QWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " + TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); + TQWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); - m_pickWhite = new QPushButton(m_pickerColorButtonGroup); + m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); - m_pickWhite->setPixmap( QPixmap( directory + "color-picker-white.png" ) ); + m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); - QToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); - QWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " + TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); + TQWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickerColorButtonGroup->setExclusive(true); - m_pickerColorButtonGroup->setFrameShape(QFrame::NoFrame); + m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); // ------------------------------------------------------------- - m_resetButton = new QPushButton(i18n("&Reset"), gboxSettings); + m_resetButton = new TQPushButton(i18n("&Reset"), gboxSettings); m_resetButton->setPixmap( SmallIcon("reload_page", 18) ); - QToolTip::add( m_resetButton, i18n( "Reset current channel curves' values." ) ); - QWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all curves' values " + TQToolTip::add( m_resetButton, i18n( "Reset current channel curves' values." ) ); + TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all curves' values " "from the current selected channel " "will be reset to the default values.")); - QHBoxLayout* l3 = new QHBoxLayout(); + TQHBoxLayout* l3 = new TQHBoxLayout(); l3->addWidget(m_curveType); l3->addWidget(m_pickerColorButtonGroup); l3->addWidget(m_resetButton); @@ -303,38 +303,38 @@ AdjustCurveDialog::AdjustCurveDialog(QWidget* parent) // ------------------------------------------------------------- - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // ComboBox slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_curveType, SIGNAL(clicked(int)), - this, SLOT(slotCurveTypeChanged(int))); + connect(m_curveType, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(slotCurveTypeChanged(int))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, SIGNAL(released(int)), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotPickerColorButtonActived())); } AdjustCurveDialog::~AdjustCurveDialog() @@ -365,30 +365,30 @@ void AdjustCurveDialog::slotSpotColorChanged(const Digikam::DColor &color) { // Black tonal curves point. m_curves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 1, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 42*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 1, QPoint(sc.red(), 42*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 1, QPoint(sc.green(), 42*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 1, QPoint(sc.blue(), 42*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 42*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 1, TQPoint(sc.red(), 42*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 1, TQPoint(sc.green(), 42*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 1, TQPoint(sc.blue(), 42*m_histoSegments/256)); m_pickBlack->setOn(false); } else if ( m_pickGray->isOn() ) { // Gray tonal curves point. m_curves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 128*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 8, QPoint(sc.red(), 128*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 8, QPoint(sc.green(), 128*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 8, QPoint(sc.blue(), 128*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 128*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 8, TQPoint(sc.red(), 128*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 8, TQPoint(sc.green(), 128*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 8, TQPoint(sc.blue(), 128*m_histoSegments/256)); m_pickGray->setOn(false); } else if ( m_pickWhite->isOn() ) { // White tonal curves point. m_curves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 15, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 213*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 15, QPoint(sc.red(), 213*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 15, QPoint(sc.green(), 213*m_histoSegments/256)); - m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 15, QPoint(sc.blue(), 213*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 213*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::RedChannel, 15, TQPoint(sc.red(), 213*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::GreenChannel, 15, TQPoint(sc.green(), 213*m_histoSegments/256)); + m_curves->setCurvePoint(Digikam::ImageHistogram::BlueChannel, 15, TQPoint(sc.blue(), 213*m_histoSegments/256)); m_pickWhite->setOn(false); } else @@ -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->repaint(false); + m_curvesWidget->tqrepaint(false); // restore previous rendering mode. m_previewWidget->setRenderingPreviewMode(m_currentPreviewMode); @@ -486,52 +486,52 @@ void AdjustCurveDialog::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_curvesWidget->m_channelType = Digikam::CurvesWidget::ValueHistogram; - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); m_curvesWidget->m_channelType = Digikam::CurvesWidget::RedChannelHistogram; - m_vGradient->setColors( QColor( "red" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "red" ), TQColor( "black" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); m_curvesWidget->m_channelType = Digikam::CurvesWidget::GreenChannelHistogram; - m_vGradient->setColors( QColor( "green" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "green" ), TQColor( "black" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); m_curvesWidget->m_channelType = Digikam::CurvesWidget::BlueChannelHistogram; - m_vGradient->setColors( QColor( "blue" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "blue" ), TQColor( "black" ) ); break; case AlphaChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::AlphaChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_curvesWidget->m_channelType = Digikam::CurvesWidget::AlphaChannelHistogram; - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); break; } m_curveType->setButton(m_curves->getCurveType(channel)); - m_curvesWidget->repaint(false); - m_histogramWidget->repaint(false); + m_curvesWidget->tqrepaint(false); + m_histogramWidget->tqrepaint(false); } void AdjustCurveDialog::slotScaleChanged(int scale) { m_curvesWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); - m_curvesWidget->repaint(false); + m_histogramWidget->tqrepaint(false); + m_curvesWidget->tqrepaint(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(QString("CurveTypeChannel%1").arg(i), + m_curves->setCurveType(i, (Digikam::ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i), Digikam::ImageCurves::CURVE_SMOOTH)); for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable); if (m_originalImage.sixteenBit() && p.x() != -1) { @@ -602,11 +602,11 @@ void AdjustCurveDialog::writeUserSettings() for (int i = 0 ; i < 5 ; i++) { - config->writeEntry(QString("CurveTypeChannel%1").arg(i), m_curves->getCurveType(i)); + config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curves->getCurveType(i)); for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curves->getCurvePoint(i, j); + TQPoint p = m_curves->getCurvePoint(i, j); if (m_originalImage.sixteenBit() && p.x() != -1) { @@ -614,7 +614,7 @@ void AdjustCurveDialog::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(QString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p); + config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p); } } @@ -636,8 +636,8 @@ void AdjustCurveDialog::slotUser3() KURL loadCurvesFile; loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Select Gimp Curves File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) return; @@ -658,8 +658,8 @@ void AdjustCurveDialog::slotUser2() KURL saveCurvesFile; saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Gimp Curves File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) return; diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.h b/digikam/imageplugins/adjustcurves/adjustcurves.h index 6f47c60..7879312 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/adjustcurves.h @@ -31,9 +31,9 @@ // Local includes. -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; namespace Digikam { @@ -50,10 +50,11 @@ namespace DigikamAdjustCurvesImagesPlugin class AdjustCurveDialog : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - AdjustCurveDialog(QWidget *parent); + AdjustCurveDialog(TQWidget *tqparent); ~AdjustCurveDialog(); private: @@ -111,18 +112,18 @@ private: int m_histoSegments; int m_currentPreviewMode; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QPushButton *m_resetButton; - QPushButton *m_pickBlack; - QPushButton *m_pickGray; - QPushButton *m_pickWhite; - QPushButton *m_curveFree; - QPushButton *m_curveSmooth; + TQPushButton *m_resetButton; + TQPushButton *m_pickBlack; + TQPushButton *m_pickGray; + TQPushButton *m_pickWhite; + TQPushButton *m_curveFree; + TQPushButton *m_curveSmooth; - QHButtonGroup *m_pickerColorButtonGroup; - QHButtonGroup *m_scaleBG; - QHButtonGroup *m_curveType; + TQHButtonGroup *m_pickerColorButtonGroup; + TQHButtonGroup *m_scaleBG; + TQHButtonGroup *m_curveType; Digikam::CurvesWidget *m_curvesWidget; diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index e488d34..fed5e24 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -25,25 +25,25 @@ #include <cmath> -// Qt includes. - -#include <qlayout.h> -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qpixmap.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqpixmap.h> // KDE includes. @@ -85,8 +85,8 @@ using namespace Digikam; namespace DigikamAdjustCurvesImagesPlugin { -AdjustCurvesTool::AdjustCurvesTool(QObject* parent) - : EditorTool(parent) +AdjustCurvesTool::AdjustCurvesTool(TQObject* tqparent) + : EditorTool(tqparent) { m_destinationPreviewData = 0; @@ -115,18 +115,18 @@ AdjustCurvesTool::AdjustCurvesTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 5, 5); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 5, 5); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, m_gboxSettings->plainPage() ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->insertItem( i18n("Alpha") ); m_channelCB->setCurrentText( i18n("Luminosity") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" @@ -135,34 +135,34 @@ AdjustCurvesTool::AdjustCurvesTool(QObject* parent) "This channel corresponds to the transparency value and " "is supported by some image formats, such as PNG or TIF.")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, CurvesWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, CurvesWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); m_scaleBG->setExclusive(true); m_scaleBG->setButton(CurvesWidget::LogScaleHistogram); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -170,31 +170,31 @@ AdjustCurvesTool::AdjustCurvesTool(QObject* parent) // ------------------------------------------------------------- - QWidget *curveBox = new QWidget(m_gboxSettings->plainPage()); - QGridLayout* gl = new QGridLayout(curveBox, 4, 2, 0); + TQWidget *curveBox = new TQWidget(m_gboxSettings->plainPage()); + TQGridLayout* gl = new TQGridLayout(curveBox, 4, 2, 0); m_histogramWidget = new HistogramWidget(256, 140, curveBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "curves settings changes.")); m_vGradient = new ColorGradientWidget( ColorGradientWidget::Vertical, 10, curveBox ); - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); - QLabel *spacev = new QLabel(curveBox); + TQLabel *spacev = new TQLabel(curveBox); spacev->setFixedWidth(1); m_curvesWidget = new CurvesWidget(256, 256, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), curveBox); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve drawing of the selected channel from " + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve drawing of the selected channel from " "original image")); - QLabel *spaceh = new QLabel(curveBox); + TQLabel *spaceh = new TQLabel(curveBox); spaceh->setFixedHeight(1); m_hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, curveBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gl->addMultiCellWidget(m_histogramWidget, 0, 0, 2, 2); gl->addMultiCellWidget(m_vGradient, 2, 2, 0, 0); @@ -206,75 +206,75 @@ AdjustCurvesTool::AdjustCurvesTool(QObject* parent) // ------------------------------------------------------------- - m_curveType = new QHButtonGroup(m_gboxSettings->plainPage()); - m_curveFree = new QPushButton(m_curveType); + m_curveType = new TQHButtonGroup(m_gboxSettings->plainPage()); + m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); - m_curveFree->setPixmap( QPixmap( directory + "curvefree.png" ) ); + m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); - QToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); - QWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); - m_curveSmooth = new QPushButton(m_curveType); + TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); + TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); + m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); - m_curveSmooth->setPixmap( QPixmap( directory + "curvemooth.png" ) ); + m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); - QToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); - QWhatsThis::add( m_curveSmooth, i18n("<p>With this button, you constrains the curve type to a smooth line with tension.")); + TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); + TQWhatsThis::add( m_curveSmooth, i18n("<p>With this button, you constrains the curve type to a smooth line with tension.")); m_curveType->setExclusive(true); m_curveType->setButton(SmoothDrawing); - m_curveType->setFrameShape(QFrame::NoFrame); + m_curveType->setFrameShape(TQFrame::NoFrame); // ------------------------------------------------------------- - m_pickerColorButtonGroup = new QHButtonGroup(m_gboxSettings->plainPage()); - m_pickBlack = new QPushButton(m_pickerColorButtonGroup); + m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); + m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); - m_pickBlack->setPixmap( QPixmap( directory + "color-picker-black.png" ) ); + m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); - QToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); - QWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " + TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); + TQWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); - m_pickGray = new QPushButton(m_pickerColorButtonGroup); + m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); - m_pickGray->setPixmap( QPixmap( directory + "color-picker-grey.png" ) ); + m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); - QToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); - QWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " + TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); + TQWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); - m_pickWhite = new QPushButton(m_pickerColorButtonGroup); + m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); - m_pickWhite->setPixmap( QPixmap( directory + "color-picker-white.png" ) ); + m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); - QToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); - QWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " + TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); + TQWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickerColorButtonGroup->setExclusive(true); - m_pickerColorButtonGroup->setFrameShape(QFrame::NoFrame); + m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); // ------------------------------------------------------------- - m_resetButton = new QPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); + m_resetButton = new TQPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); m_resetButton->setPixmap( SmallIcon("reload_page", 18) ); - QToolTip::add( m_resetButton, i18n( "Reset current channel curves' values." ) ); - QWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all curves' values " + TQToolTip::add( m_resetButton, i18n( "Reset current channel curves' values." ) ); + TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all curves' values " "from the current selected channel " "will be reset to the default values.")); - QHBoxLayout* l3 = new QHBoxLayout(); + TQHBoxLayout* l3 = new TQHBoxLayout(); l3->addWidget(m_curveType); l3->addWidget(m_pickerColorButtonGroup); l3->addWidget(m_resetButton); @@ -292,38 +292,38 @@ AdjustCurvesTool::AdjustCurvesTool(QObject* parent) // ------------------------------------------------------------- - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // ComboBox slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_curveType, SIGNAL(clicked(int)), - this, SLOT(slotCurveTypeChanged(int))); + connect(m_curveType, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(slotCurveTypeChanged(int))); // ------------------------------------------------------------- // Buttons slots. - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, SIGNAL(released(int)), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotPickerColorButtonActived())); } AdjustCurvesTool::~AdjustCurvesTool() @@ -347,30 +347,30 @@ void AdjustCurvesTool::slotSpotColorChanged(const DColor &color) { // Black tonal curves point. m_curvesWidget->curves()->setCurvePoint(ImageHistogram::ValueChannel, 1, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 42*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 1, QPoint(sc.red(), 42*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 1, QPoint(sc.green(), 42*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 1, QPoint(sc.blue(), 42*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 42*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 1, TQPoint(sc.red(), 42*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 1, TQPoint(sc.green(), 42*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 1, TQPoint(sc.blue(), 42*m_histoSegments/256)); m_pickBlack->setOn(false); } else if ( m_pickGray->isOn() ) { // Gray tonal curves point. m_curvesWidget->curves()->setCurvePoint(ImageHistogram::ValueChannel, 8, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 128*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 8, QPoint(sc.red(), 128*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 8, QPoint(sc.green(), 128*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 8, QPoint(sc.blue(), 128*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 128*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 8, TQPoint(sc.red(), 128*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 8, TQPoint(sc.green(), 128*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 8, TQPoint(sc.blue(), 128*m_histoSegments/256)); m_pickGray->setOn(false); } else if ( m_pickWhite->isOn() ) { // White tonal curves point. m_curvesWidget->curves()->setCurvePoint(ImageHistogram::ValueChannel, 15, - QPoint(QMAX(QMAX(sc.red(), sc.green()), sc.blue()), 213*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 15, QPoint(sc.red(), 213*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 15, QPoint(sc.green(), 213*m_histoSegments/256)); - m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 15, QPoint(sc.blue(), 213*m_histoSegments/256)); + TQPoint(TQMAX(TQMAX(sc.red(), sc.green()), sc.blue()), 213*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::RedChannel, 15, TQPoint(sc.red(), 213*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::GreenChannel, 15, TQPoint(sc.green(), 213*m_histoSegments/256)); + m_curvesWidget->curves()->setCurvePoint(ImageHistogram::BlueChannel, 15, TQPoint(sc.blue(), 213*m_histoSegments/256)); m_pickWhite->setOn(false); } else @@ -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->repaint(false); + m_curvesWidget->tqrepaint(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->repaint(); + m_curvesWidget->tqrepaint(); slotEffect(); m_histogramWidget->reset(); } @@ -467,52 +467,52 @@ void AdjustCurvesTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_curvesWidget->m_channelType = CurvesWidget::ValueHistogram; - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); m_curvesWidget->m_channelType = CurvesWidget::RedChannelHistogram; - m_vGradient->setColors( QColor( "red" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "red" ), TQColor( "black" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); m_curvesWidget->m_channelType = CurvesWidget::GreenChannelHistogram; - m_vGradient->setColors( QColor( "green" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "green" ), TQColor( "black" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); m_curvesWidget->m_channelType = CurvesWidget::BlueChannelHistogram; - m_vGradient->setColors( QColor( "blue" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "blue" ), TQColor( "black" ) ); break; case AlphaChannel: m_histogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_curvesWidget->m_channelType = CurvesWidget::AlphaChannelHistogram; - m_vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + m_vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); break; } m_curveType->setButton(m_curvesWidget->curves()->getCurveType(channel)); - m_curvesWidget->repaint(false); - m_histogramWidget->repaint(false); + m_curvesWidget->tqrepaint(false); + m_histogramWidget->tqrepaint(false); } void AdjustCurvesTool::slotScaleChanged(int scale) { m_curvesWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); - m_curvesWidget->repaint(false); + m_histogramWidget->tqrepaint(false); + m_curvesWidget->tqrepaint(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(QString("CurveTypeChannel%1").arg(i), + m_curvesWidget->curves()->setCurveType(i, (ImageCurves::CurveType)config->readNumEntry(TQString("CurveTypeChannel%1").tqarg(i), ImageCurves::CURVE_SMOOTH)); for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -585,11 +585,11 @@ void AdjustCurvesTool::writeSettings() for (int i = 0 ; i < 5 ; i++) { - config->writeEntry(QString("CurveTypeChannel%1").arg(i), m_curvesWidget->curves()->getCurveType(i)); + config->writeEntry(TQString("CurveTypeChannel%1").tqarg(i), m_curvesWidget->curves()->getCurveType(i)); for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curvesWidget->curves()->getCurvePoint(i, j); + TQPoint p = m_curvesWidget->curves()->getCurvePoint(i, j); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -597,7 +597,7 @@ void AdjustCurvesTool::writeSettings() p.setY(p.y()/255); } - config->writeEntry(QString("CurveAjustmentChannel%1Point%2").arg(i).arg(j), p); + config->writeEntry(TQString("CurveAjustmentChannel%1Point%2").tqarg(i).tqarg(j), p); } } @@ -620,8 +620,8 @@ void AdjustCurvesTool::slotLoadSettings() KURL loadCurvesFile; loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Select Gimp Curves File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) return; @@ -641,8 +641,8 @@ void AdjustCurvesTool::slotSaveAsSettings() KURL saveCurvesFile; saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Gimp Curves File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) return; diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.h b/digikam/imageplugins/adjustcurves/adjustcurvestool.h index 46ae831..37f2c36 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.h +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.h @@ -30,9 +30,9 @@ // Local includes. -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; namespace Digikam { @@ -51,10 +51,11 @@ namespace DigikamAdjustCurvesImagesPlugin class AdjustCurvesTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - AdjustCurvesTool(QObject *parent); + AdjustCurvesTool(TQObject *tqparent); ~AdjustCurvesTool(); private: @@ -112,18 +113,18 @@ private: int m_histoSegments; int m_currentPreviewMode; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QPushButton *m_resetButton; - QPushButton *m_pickBlack; - QPushButton *m_pickGray; - QPushButton *m_pickWhite; - QPushButton *m_curveFree; - QPushButton *m_curveSmooth; + TQPushButton *m_resetButton; + TQPushButton *m_pickBlack; + TQPushButton *m_pickGray; + TQPushButton *m_pickWhite; + TQPushButton *m_curveFree; + TQPushButton *m_curveSmooth; - QHButtonGroup *m_pickerColorButtonGroup; - QHButtonGroup *m_scaleBG; - QHButtonGroup *m_curveType; + TQHButtonGroup *m_pickerColorButtonGroup; + TQHButtonGroup *m_scaleBG; + TQHButtonGroup *m_curveType; Digikam::CurvesWidget *m_curvesWidget; diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp index d341958..0848560 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp @@ -41,12 +41,12 @@ using namespace DigikamAdjustCurvesImagesPlugin; K_EXPORT_COMPONENT_FACTORY( digikamimageplugin_adjustcurves, KGenericFactory<ImagePlugin_AdjustCurves>("digikamimageplugin_adjustcurves")); -ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(QObject *parent, const char*, const QStringList&) - : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustCurves") +ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *tqparent, const char*, const TQStringList&) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustCurves") { m_curvesAction = new KAction(i18n("Curves Adjust..."), "adjustcurves", CTRL+SHIFT+Key_M, // NOTE: Photoshop 7 use CTRL+M (but it's used in KDE to toogle menu bar). - this, SLOT(slotCurvesAdjust()), + this, TQT_SLOT(slotCurvesAdjust()), actionCollection(), "imageplugin_adjustcurves"); setXMLFile("digikamimageplugin_adjustcurves_ui.rc"); diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h index e592080..d78637d 100644 --- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h +++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustCurves : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_AdjustCurves(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_AdjustCurves(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_AdjustCurves(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index bc9a000..3b0a4d9 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -25,25 +25,25 @@ #include <cmath> -// Qt includes. - -#include <qlayout.h> -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qpixmap.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqpixmap.h> // KDE includes. @@ -78,8 +78,8 @@ namespace DigikamAdjustLevelsImagesPlugin { -AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Adjust Color Levels"), +AdjustLevelDialog::AdjustLevelDialog(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Adjust Color Levels"), "adjustlevels", true, false) { m_destinationPreviewData = 0L; @@ -122,19 +122,19 @@ AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* grid = new QGridLayout(gboxSettings, 16, 8, spacingHint(), 0); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* grid = new TQGridLayout(gboxSettings, 16, 8, spacingHint(), 0); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->insertItem( i18n("Alpha") ); m_channelCB->setCurrentText( i18n("Luminosity") ); - QWhatsThis::add( m_channelCB, i18n("<p>Here select the histogram channel to display:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Here select the histogram channel to display:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" @@ -143,32 +143,32 @@ AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) "This channel corresponds to the transparency value and " "is supported by some image formats, such as PNG or TIF.")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Here select the histogram scale.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Here select the histogram scale.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "The Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -177,13 +177,13 @@ AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) // ------------------------------------------------------------- m_histogramWidget = new Digikam::HistogramWidget(256, 140, gboxSettings, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing of the " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing of the " "selected image channel. This one is re-computed at any levels " "settings changes.")); m_levelsHistogramWidget = new Digikam::HistogramWidget(256, 140, m_originalImage.bits(), m_originalImage.width(), m_originalImage.height(), m_originalImage.sixteenBit(), gboxSettings, false); - QWhatsThis::add( m_levelsHistogramWidget, i18n("<p>This is the histogram drawing of the selected channel " + TQWhatsThis::add( m_levelsHistogramWidget, i18n("<p>This is the histogram drawing of the selected channel " "from original image")); // ------------------------------------------------------------- @@ -192,117 +192,117 @@ AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) m_hGradientMinInput->setFixedHeight( 20 ); m_hGradientMinInput->setMinValue(0); m_hGradientMinInput->setMaxValue(m_histoSegments); - QWhatsThis::add( m_hGradientMinInput, i18n("<p>Select the minimal intensity input value of the histogram.")); - QToolTip::add( m_hGradientMinInput, i18n( "Minimal intensity input." ) ); - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); + TQWhatsThis::add( m_hGradientMinInput, i18n("<p>Select the minimal intensity input value of the histogram.")); + TQToolTip::add( m_hGradientMinInput, i18n( "Minimal intensity input." ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); m_hGradientMinInput->installEventFilter(this); m_hGradientMaxInput = new KGradientSelector( KSelector::Horizontal, gboxSettings ); m_hGradientMaxInput->setFixedHeight( 20 ); m_hGradientMaxInput->setMinValue(0); m_hGradientMaxInput->setMaxValue(m_histoSegments); - QWhatsThis::add( m_hGradientMaxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); - QToolTip::add( m_hGradientMaxInput, i18n( "Maximal intensity input." ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); + TQWhatsThis::add( m_hGradientMaxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); + TQToolTip::add( m_hGradientMaxInput, i18n( "Maximal intensity input." ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); m_hGradientMaxInput->installEventFilter(this); - m_minInput = new QSpinBox(0, m_histoSegments, 1, gboxSettings); + m_minInput = new TQSpinBox(0, m_histoSegments, 1, gboxSettings); m_minInput->setValue(0); - QWhatsThis::add( m_minInput, i18n("<p>Select the minimal intensity input value of the histogram.")); - QToolTip::add( m_minInput, i18n( "Minimal intensity input." ) ); + TQWhatsThis::add( m_minInput, i18n("<p>Select the minimal intensity input value of the histogram.")); + TQToolTip::add( m_minInput, i18n( "Minimal intensity input." ) ); m_gammaInput = new KDoubleNumInput(gboxSettings); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01); m_gammaInput->setValue(1.0); - QToolTip::add( m_gammaInput, i18n( "Gamma input value." ) ); - QWhatsThis::add( m_gammaInput, i18n("<p>Select the gamma input value.")); + TQToolTip::add( m_gammaInput, i18n( "Gamma input value." ) ); + TQWhatsThis::add( m_gammaInput, i18n("<p>Select the gamma input value.")); - m_maxInput = new QSpinBox(0, m_histoSegments, 1, gboxSettings); + m_maxInput = new TQSpinBox(0, m_histoSegments, 1, gboxSettings); m_maxInput->setValue(m_histoSegments); - QToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) ); - QWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); + TQToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) ); + TQWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); m_hGradientMinOutput = new KGradientSelector( KSelector::Horizontal, gboxSettings ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - QWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); - QToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + TQWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); + TQToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) ); m_hGradientMinOutput->setFixedHeight( 20 ); m_hGradientMinOutput->setMinValue(0); m_hGradientMinOutput->setMaxValue(m_histoSegments); m_hGradientMinOutput->installEventFilter(this); m_hGradientMaxOutput = new KGradientSelector( KSelector::Horizontal, gboxSettings ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); - QWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); - QToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + TQWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); + TQToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) ); m_hGradientMaxOutput->setFixedHeight( 20 ); m_hGradientMaxOutput->setMinValue(0); m_hGradientMaxOutput->setMaxValue(m_histoSegments); m_hGradientMaxOutput->installEventFilter(this); - m_minOutput = new QSpinBox(0, m_histoSegments, 1, gboxSettings); + m_minOutput = new TQSpinBox(0, m_histoSegments, 1, gboxSettings); m_minOutput->setValue(0); - QToolTip::add( m_minOutput, i18n( "Minimal intensity output." ) ); - QWhatsThis::add( m_minOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); + TQToolTip::add( m_minOutput, i18n( "Minimal intensity output." ) ); + TQWhatsThis::add( m_minOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); - m_maxOutput = new QSpinBox(0, m_histoSegments, 1, gboxSettings); + m_maxOutput = new TQSpinBox(0, m_histoSegments, 1, gboxSettings); m_maxOutput->setValue(m_histoSegments); - QToolTip::add( m_maxOutput, i18n( "Maximal intensity output." ) ); - QWhatsThis::add( m_maxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); + TQToolTip::add( m_maxOutput, i18n( "Maximal intensity output." ) ); + TQWhatsThis::add( m_maxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); // ------------------------------------------------------------- - m_pickerColorButtonGroup = new QHButtonGroup(gboxSettings); - m_pickBlack = new QPushButton(m_pickerColorButtonGroup); + m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); + m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); - m_pickBlack->setPixmap( QPixmap( directory + "color-picker-black.png" ) ); + m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); - QToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); - QWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " + TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); + TQWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); - m_pickGray = new QPushButton(m_pickerColorButtonGroup); + m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-gray", "color-picker-gray.png"); - m_pickGray->setPixmap( QPixmap( directory + "color-picker-gray.png" ) ); + m_pickGray->setPixmap( TQPixmap( directory + "color-picker-gray.png" ) ); m_pickGray->setToggleButton(true); - QToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); - QWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " + TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); + TQWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); - m_pickWhite = new QPushButton(m_pickerColorButtonGroup); + m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); - m_pickWhite->setPixmap( QPixmap( directory + "color-picker-white.png" ) ); + m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); - QToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); - QWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " + TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); + TQWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickerColorButtonGroup->setExclusive(true); - m_pickerColorButtonGroup->setFrameShape(QFrame::NoFrame); + m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); - m_autoButton = new QPushButton(gboxSettings); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); QToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); - QWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted " + m_autoButton = new TQPushButton(gboxSettings); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + TQWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted " "automatically.")); - m_resetButton = new QPushButton(i18n("&Reset"), gboxSettings); + m_resetButton = new TQPushButton(i18n("&Reset"), gboxSettings); m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (KIcon::Group)KIcon::Toolbar)); - QToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); - QWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values " + TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); + TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values " "from the current selected channel " "will be reset to the default values.")); - QLabel *space = new QLabel(gboxSettings); + TQLabel *space = new TQLabel(gboxSettings); space->setFixedWidth(spacingHint()); - QHBoxLayout* l3 = new QHBoxLayout(); + TQHBoxLayout* l3 = new TQHBoxLayout(); l3->addWidget(m_pickerColorButtonGroup); l3->addWidget(m_autoButton); l3->addWidget(space); @@ -342,62 +342,62 @@ AdjustLevelDialog::AdjustLevelDialog(QWidget* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Color sliders and spinbox slots. - connect(m_hGradientMinInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMinInputSpinBox(int))); + connect(m_hGradientMinInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMinInputSpinBox(int))); - connect(m_minInput, SIGNAL(valueChanged (int)), - this, SLOT(slotAdjustSliders())); + connect(m_minInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_gammaInput, SIGNAL(valueChanged (double)), - this, SLOT(slotGammaInputchanged(double))); + connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotGammaInputchanged(double))); - connect(m_hGradientMaxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMaxInputSpinBox(int))); + connect(m_hGradientMaxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMaxInputSpinBox(int))); - connect(m_maxInput, SIGNAL(valueChanged (int)), - this, SLOT(slotAdjustSliders())); + connect(m_maxInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_hGradientMinOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMinOutputSpinBox(int))); + connect(m_hGradientMinOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMinOutputSpinBox(int))); - connect(m_minOutput, SIGNAL(valueChanged (int)), - this, SLOT(slotAdjustSliders())); + connect(m_minOutput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_hGradientMaxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMaxOutputSpinBox(int))); + connect(m_hGradientMaxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMaxOutputSpinBox(int))); - connect(m_maxOutput, SIGNAL(valueChanged (int)), - this, SLOT(slotAdjustSliders())); + connect(m_maxOutput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotAdjustSliders())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoButton, SIGNAL(clicked()), - this, SLOT(slotAutoLevels())); + connect(m_autoButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAutoLevels())); - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, SIGNAL(released(int)), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotPickerColorButtonActived())); } @@ -627,46 +627,46 @@ void AdjustLevelDialog::slotChannelChanged(int channel) case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; m_levelsHistogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; m_levelsHistogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; m_levelsHistogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; m_levelsHistogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; case AlphaChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::AlphaChannelHistogram; m_levelsHistogramWidget->m_channelType = Digikam::HistogramWidget::AlphaChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); break; } @@ -676,16 +676,16 @@ void AdjustLevelDialog::slotChannelChanged(int channel) m_levels->getLevelLowOutputValue(channel), m_levels->getLevelHighOutputValue(channel)); - m_levelsHistogramWidget->repaint(false); - m_histogramWidget->repaint(false); + m_levelsHistogramWidget->tqrepaint(false); + m_histogramWidget->tqrepaint(false); } void AdjustLevelDialog::slotScaleChanged(int scale) { m_levelsHistogramWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); - m_levelsHistogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); + m_levelsHistogramWidget->tqrepaint(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(QString("GammaChannel%1").arg(i), 1.0); - int lowInput = config->readNumEntry(QString("LowInputChannel%1").arg(i), 0); - int lowOutput = config->readNumEntry(QString("LowOutputChannel%1").arg(i), 0); - int highInput = config->readNumEntry(QString("HighInputChannel%1").arg(i), max); - int highOutput = config->readNumEntry(QString("HighOutputChannel%1").arg(i), max); + 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); 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(QString("GammaChannel%1").arg(i), gamma); - config->writeEntry(QString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput); - config->writeEntry(QString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput); - config->writeEntry(QString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput); - config->writeEntry(QString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput); + 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->sync(); @@ -769,8 +769,8 @@ void AdjustLevelDialog::slotUser3() KURL loadLevelsFile; loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Select Gimp Levels File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) return; @@ -790,8 +790,8 @@ void AdjustLevelDialog::slotUser2() KURL saveLevelsFile; saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Gimp Levels File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) return; @@ -807,21 +807,21 @@ void AdjustLevelDialog::slotUser2() // See B.K.O #146636: use event filter with all level slider to display a // guide over level histogram. -bool AdjustLevelDialog::eventFilter(QObject *obj, QEvent *ev) +bool AdjustLevelDialog::eventFilter(TQObject *obj, TQEvent *ev) { if ( obj == m_hGradientMinInput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + connect(m_minInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + disconnect(m_minInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -833,17 +833,17 @@ bool AdjustLevelDialog::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMaxInput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + disconnect(m_maxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -855,17 +855,17 @@ bool AdjustLevelDialog::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMinOutput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + disconnect(m_minOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -877,17 +877,17 @@ bool AdjustLevelDialog::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMaxOutput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowHistogramGuide(int))); + disconnect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -899,7 +899,7 @@ bool AdjustLevelDialog::eventFilter(QObject *obj, QEvent *ev) } else { - // pass the event on to the parent class + // pass the event on to the tqparent class return KDialogBase::eventFilter(obj, ev); } } diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.h b/digikam/imageplugins/adjustlevels/adjustlevels.h index 9e9c47d..2ccfef6 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/adjustlevels.h @@ -29,10 +29,10 @@ #include "imagedlgbase.h" #include "dimg.h" -class QComboBox; -class QSpinBox; -class QPushButton; -class QHButtonGroup; +class TQComboBox; +class TQSpinBox; +class TQPushButton; +class TQHButtonGroup; class KDoubleSpinBox; class KGradientSelector; @@ -51,10 +51,11 @@ namespace DigikamAdjustLevelsImagesPlugin class AdjustLevelDialog : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - AdjustLevelDialog(QWidget *parent); + AdjustLevelDialog(TQWidget *tqparent); ~AdjustLevelDialog(); private: @@ -64,7 +65,7 @@ private: void resetValues(); void finalRendering(); void adjustSliders(int minIn, double gamIn, int maxIn, int minOut, int maxOut); - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); private slots: @@ -115,21 +116,21 @@ private: int m_histoSegments; int m_currentPreviewMode; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QSpinBox *m_minInput; - QSpinBox *m_maxInput; - QSpinBox *m_minOutput; - QSpinBox *m_maxOutput; + TQSpinBox *m_minInput; + TQSpinBox *m_maxInput; + TQSpinBox *m_minOutput; + TQSpinBox *m_maxOutput; - QPushButton *m_autoButton; - QPushButton *m_resetButton; - QPushButton *m_pickBlack; - QPushButton *m_pickGray; - QPushButton *m_pickWhite; + TQPushButton *m_autoButton; + TQPushButton *m_resetButton; + TQPushButton *m_pickBlack; + TQPushButton *m_pickGray; + TQPushButton *m_pickWhite; - QHButtonGroup *m_pickerColorButtonGroup; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_pickerColorButtonGroup; + TQHButtonGroup *m_scaleBG; KDoubleNumInput *m_gammaInput; diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index b52d5ec..c836595 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -25,24 +25,24 @@ #include <cmath> -// Qt includes. - -#include <qcolor.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -85,8 +85,8 @@ using namespace Digikam; namespace DigikamAdjustLevelsImagesPlugin { -AdjustLevelsTool::AdjustLevelsTool(QObject* parent) - : EditorTool(parent) +AdjustLevelsTool::AdjustLevelsTool(TQObject* tqparent) + : EditorTool(tqparent) { m_destinationPreviewData = 0; @@ -116,18 +116,18 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 20, 6); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 20, 6); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, m_gboxSettings->plainPage() ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->insertItem( i18n("Alpha") ); m_channelCB->setCurrentText( i18n("Luminosity") ); - QWhatsThis::add( m_channelCB, i18n("<p>Here select the histogram channel to display:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Here select the histogram channel to display:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" @@ -136,32 +136,32 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) "This channel corresponds to the transparency value and " "is supported by some image formats, such as PNG or TIF.")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Here select the histogram scale.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Here select the histogram scale.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "The Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -170,13 +170,13 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) // ------------------------------------------------------------- m_histogramWidget = new HistogramWidget(256, 140, m_gboxSettings->plainPage(), false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing of the " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing of the " "selected image channel. This one is re-computed at any levels " "settings changes.")); m_levelsHistogramWidget = new HistogramWidget(256, 140, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), m_gboxSettings, false); - QWhatsThis::add( m_levelsHistogramWidget, i18n("<p>This is the histogram drawing of the selected channel " + TQWhatsThis::add( m_levelsHistogramWidget, i18n("<p>This is the histogram drawing of the selected channel " "from original image")); // ------------------------------------------------------------- @@ -185,52 +185,52 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) m_hGradientMinInput->setFixedHeight( 20 ); m_hGradientMinInput->setMinValue(0); m_hGradientMinInput->setMaxValue(m_histoSegments); - QWhatsThis::add( m_hGradientMinInput, i18n("<p>Select the minimal intensity input value of the histogram.")); - QToolTip::add( m_hGradientMinInput, i18n( "Minimal intensity input." ) ); - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); + TQWhatsThis::add( m_hGradientMinInput, i18n("<p>Select the minimal intensity input value of the histogram.")); + TQToolTip::add( m_hGradientMinInput, i18n( "Minimal intensity input." ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); m_hGradientMinInput->installEventFilter(this); m_hGradientMaxInput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() ); m_hGradientMaxInput->setFixedHeight( 20 ); m_hGradientMaxInput->setMinValue(0); m_hGradientMaxInput->setMaxValue(m_histoSegments); - QWhatsThis::add( m_hGradientMaxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); - QToolTip::add( m_hGradientMaxInput, i18n( "Maximal intensity input." ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); + TQWhatsThis::add( m_hGradientMaxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); + TQToolTip::add( m_hGradientMaxInput, i18n( "Maximal intensity input." ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); m_hGradientMaxInput->installEventFilter(this); m_minInput = new RIntNumInput(m_gboxSettings->plainPage()); m_minInput->input()->setRange(0, m_histoSegments, 1, false); m_minInput->setDefaultValue(0); - QWhatsThis::add( m_minInput, i18n("<p>Select the minimal intensity input value of the histogram.")); - QToolTip::add( m_minInput, i18n( "Minimal intensity input." ) ); + TQWhatsThis::add( m_minInput, i18n("<p>Select the minimal intensity input value of the histogram.")); + TQToolTip::add( m_minInput, i18n( "Minimal intensity input." ) ); m_gammaInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01, true); m_gammaInput->setDefaultValue(1.0); - QToolTip::add( m_gammaInput, i18n( "Gamma input value." ) ); - QWhatsThis::add( m_gammaInput, i18n("<p>Select the gamma input value.")); + TQToolTip::add( m_gammaInput, i18n( "Gamma input value." ) ); + TQWhatsThis::add( m_gammaInput, i18n("<p>Select the gamma input value.")); m_maxInput = new RIntNumInput(m_gboxSettings->plainPage()); m_maxInput->input()->setRange(0, m_histoSegments, 1, false); m_maxInput->setDefaultValue(m_histoSegments); - QToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) ); - QWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); + TQToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) ); + TQWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram.")); m_hGradientMinOutput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - QWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); - QToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + TQWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); + TQToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) ); m_hGradientMinOutput->setFixedHeight( 20 ); m_hGradientMinOutput->setMinValue(0); m_hGradientMinOutput->setMaxValue(m_histoSegments); m_hGradientMinOutput->installEventFilter(this); m_hGradientMaxOutput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); - QWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); - QToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + TQWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); + TQToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) ); m_hGradientMaxOutput->setFixedHeight( 20 ); m_hGradientMaxOutput->setMinValue(0); m_hGradientMaxOutput->setMaxValue(m_histoSegments); @@ -239,67 +239,67 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) m_minOutput = new RIntNumInput(m_gboxSettings->plainPage()); m_minOutput->input()->setRange(0, m_histoSegments, 1, false); m_minOutput->setDefaultValue(0); - QToolTip::add( m_minOutput, i18n( "Minimal intensity output." ) ); - QWhatsThis::add( m_minOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); + TQToolTip::add( m_minOutput, i18n( "Minimal intensity output." ) ); + TQWhatsThis::add( m_minOutput, i18n("<p>Select the minimal intensity output value of the histogram.")); m_maxOutput = new RIntNumInput(m_gboxSettings->plainPage()); m_maxOutput->input()->setRange(0, m_histoSegments, 1, false); m_maxOutput->setDefaultValue(m_histoSegments); - QToolTip::add( m_maxOutput, i18n( "Maximal intensity output." ) ); - QWhatsThis::add( m_maxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); + TQToolTip::add( m_maxOutput, i18n( "Maximal intensity output." ) ); + TQWhatsThis::add( m_maxOutput, i18n("<p>Select the maximal intensity output value of the histogram.")); // ------------------------------------------------------------- - m_pickerColorButtonGroup = new QHButtonGroup(m_gboxSettings->plainPage()); - m_pickBlack = new QPushButton(m_pickerColorButtonGroup); + m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); + m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); - m_pickBlack->setPixmap( QPixmap( directory + "color-picker-black.png" ) ); + m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); - QToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); - QWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " + TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); + TQWhatsThis::add( m_pickBlack, i18n("<p>With this button, you can pick the color from original image used to set <b>Shadow Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); - m_pickGray = new QPushButton(m_pickerColorButtonGroup); + m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); - m_pickGray->setPixmap( QPixmap( directory + "color-picker-grey.png" ) ); + m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); - QToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); - QWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " + TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); + TQWhatsThis::add( m_pickGray, i18n("<p>With this button, you can pick the color from original image used to set <b>Middle Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); - m_pickWhite = new QPushButton(m_pickerColorButtonGroup); + m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); - m_pickWhite->setPixmap( QPixmap( directory + "color-picker-white.png" ) ); + m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); - QToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); - QWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " + TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); + TQWhatsThis::add( m_pickWhite, i18n("<p>With this button, you can pick the color from original image used to set <b>Highlight Tone</b> " "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickerColorButtonGroup->setExclusive(true); - m_pickerColorButtonGroup->setFrameShape(QFrame::NoFrame); + m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame); - m_autoButton = new QPushButton(m_gboxSettings->plainPage()); - m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); QToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); - QWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted " + m_autoButton = new TQPushButton(m_gboxSettings->plainPage()); + m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) ); + TQWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted " "automatically.")); - m_resetButton = new QPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); + m_resetButton = new TQPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (KIcon::Group)KIcon::Toolbar)); - QToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); - QWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values " + TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) ); + TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values " "from the current selected channel " "will be reset to the default values.")); - QLabel *space = new QLabel(m_gboxSettings->plainPage()); + TQLabel *space = new TQLabel(m_gboxSettings->plainPage()); space->setFixedWidth(m_gboxSettings->spacingHint()); - QHBoxLayout* l3 = new QHBoxLayout(); + TQHBoxLayout* l3 = new TQHBoxLayout(); l3->addWidget(m_pickerColorButtonGroup); l3->addWidget(m_autoButton); l3->addWidget(space); @@ -332,62 +332,62 @@ AdjustLevelsTool::AdjustLevelsTool(QObject* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Color sliders and spinbox slots. - connect(m_hGradientMinInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMinInputSpinBox(int))); + connect(m_hGradientMinInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMinInputSpinBox(int))); - connect(m_minInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustSliders())); + connect(m_minInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_gammaInput, SIGNAL(valueChanged(double)), - this, SLOT(slotGammaInputchanged(double))); + connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGammaInputchanged(double))); - connect(m_hGradientMaxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMaxInputSpinBox(int))); + connect(m_hGradientMaxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMaxInputSpinBox(int))); - connect(m_maxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustSliders())); + connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_hGradientMinOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMinOutputSpinBox(int))); + connect(m_hGradientMinOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMinOutputSpinBox(int))); - connect(m_minOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustSliders())); + connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustSliders())); - connect(m_hGradientMaxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustMaxOutputSpinBox(int))); + connect(m_hGradientMaxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustMaxOutputSpinBox(int))); - connect(m_maxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotAdjustSliders())); + connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAdjustSliders())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoButton, SIGNAL(clicked()), - this, SLOT(slotAutoLevels())); + connect(m_autoButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAutoLevels())); - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); - connect(m_pickerColorButtonGroup, SIGNAL(released(int)), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickerColorButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotPickerColorButtonActived())); } AdjustLevelsTool::~AdjustLevelsTool() @@ -609,46 +609,46 @@ void AdjustLevelsTool::slotChannelChanged(int channel) case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; m_levelsHistogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; m_levelsHistogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "red" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "red" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; m_levelsHistogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "green" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "green" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; m_levelsHistogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "blue" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "blue" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; case AlphaChannel: m_histogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram; m_levelsHistogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram; - m_hGradientMinInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxInput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMinOutput->setColors( QColor( "black" ), QColor( "white" ) ); - m_hGradientMaxOutput->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxInput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); + m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) ); break; } @@ -658,16 +658,16 @@ void AdjustLevelsTool::slotChannelChanged(int channel) m_levels->getLevelLowOutputValue(channel), m_levels->getLevelHighOutputValue(channel)); - m_levelsHistogramWidget->repaint(false); - m_histogramWidget->repaint(false); + m_levelsHistogramWidget->tqrepaint(false); + m_histogramWidget->tqrepaint(false); } void AdjustLevelsTool::slotScaleChanged(int scale) { m_levelsHistogramWidget->m_scaleType = scale; m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); - m_levelsHistogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); + m_levelsHistogramWidget->tqrepaint(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(QString("GammaChannel%1").arg(i), 1.0); - int lowInput = config->readNumEntry(QString("LowInputChannel%1").arg(i), 0); - int lowOutput = config->readNumEntry(QString("LowOutputChannel%1").arg(i), 0); - int highInput = config->readNumEntry(QString("HighInputChannel%1").arg(i), max); - int highOutput = config->readNumEntry(QString("HighOutputChannel%1").arg(i), max); + 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); 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(QString("GammaChannel%1").arg(i), gamma); - config->writeEntry(QString("LowInputChannel%1").arg(i), sb ? lowInput/255 : lowInput); - config->writeEntry(QString("LowOutputChannel%1").arg(i), sb ? lowOutput/255 : lowOutput); - config->writeEntry(QString("HighInputChannel%1").arg(i), sb ? highInput/255 : highInput); - config->writeEntry(QString("HighOutputChannel%1").arg(i), sb ? highOutput/255 : highOutput); + 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); } m_previewWidget->writeSettings(); @@ -752,8 +752,8 @@ void AdjustLevelsTool::slotLoadSettings() KURL loadLevelsFile; loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Select Gimp Levels File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) return; @@ -772,8 +772,8 @@ void AdjustLevelsTool::slotSaveAsSettings() KURL saveLevelsFile; saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Gimp Levels File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) return; @@ -789,21 +789,21 @@ void AdjustLevelsTool::slotSaveAsSettings() // See B.K.O #146636: use event filter with all level slider to display a // guide over level histogram. -bool AdjustLevelsTool::eventFilter(QObject *obj, QEvent *ev) +bool AdjustLevelsTool::eventFilter(TQObject *obj, TQEvent *ev) { if ( obj == m_hGradientMinInput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowInputHistogramGuide(int))); + connect(m_minInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowInputHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowInputHistogramGuide(int))); + disconnect(m_minInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowInputHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -815,17 +815,17 @@ bool AdjustLevelsTool::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMaxInput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowInputHistogramGuide(int))); + connect(m_maxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowInputHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxInput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowInputHistogramGuide(int))); + disconnect(m_maxInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowInputHistogramGuide(int))); m_levelsHistogramWidget->reset(); return false; @@ -837,17 +837,17 @@ bool AdjustLevelsTool::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMinOutput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_minOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowOutputHistogramGuide(int))); + connect(m_minOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowOutputHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_minOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowOutputHistogramGuide(int))); + disconnect(m_minOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowOutputHistogramGuide(int))); m_histogramWidget->reset(); return false; @@ -859,17 +859,17 @@ bool AdjustLevelsTool::eventFilter(QObject *obj, QEvent *ev) } if ( obj == m_hGradientMaxOutput ) { - if ( ev->type() == QEvent::MouseButtonPress) + if ( ev->type() == TQEvent::MouseButtonPress) { - connect(m_maxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowOutputHistogramGuide(int))); + connect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowOutputHistogramGuide(int))); return false; } - if ( ev->type() == QEvent::MouseButtonRelease) + if ( ev->type() == TQEvent::MouseButtonRelease) { - disconnect(m_maxOutput, SIGNAL(valueChanged(int)), - this, SLOT(slotShowOutputHistogramGuide(int))); + disconnect(m_maxOutput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotShowOutputHistogramGuide(int))); m_histogramWidget->reset(); return false; @@ -881,7 +881,7 @@ bool AdjustLevelsTool::eventFilter(QObject *obj, QEvent *ev) } else { - // pass the event on to the parent class + // pass the event on to the tqparent class return EditorTool::eventFilter(obj, ev); } } diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.h b/digikam/imageplugins/adjustlevels/adjustlevelstool.h index 567b344..2a301e2 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.h +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.h @@ -28,9 +28,9 @@ #include "editortool.h" -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; class KGradientSelector; @@ -55,10 +55,11 @@ namespace DigikamAdjustLevelsImagesPlugin class AdjustLevelsTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - AdjustLevelsTool(QObject *parent); + AdjustLevelsTool(TQObject *tqparent); ~AdjustLevelsTool(); private: @@ -67,7 +68,7 @@ private: void writeSettings(); void finalRendering(); void adjustSliders(int minIn, double gamIn, int maxIn, int minOut, int maxOut); - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); private slots: @@ -120,16 +121,16 @@ private: int m_histoSegments; int m_currentPreviewMode; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QPushButton *m_autoButton; - QPushButton *m_resetButton; - QPushButton *m_pickBlack; - QPushButton *m_pickGray; - QPushButton *m_pickWhite; + TQPushButton *m_autoButton; + TQPushButton *m_resetButton; + TQPushButton *m_pickBlack; + TQPushButton *m_pickGray; + TQPushButton *m_pickWhite; - QHButtonGroup *m_pickerColorButtonGroup; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_pickerColorButtonGroup; + TQHButtonGroup *m_scaleBG; KGradientSelector *m_hGradientMinInput; KGradientSelector *m_hGradientMaxInput; diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp index a120f88..7485f72 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp @@ -41,13 +41,13 @@ using namespace DigikamAdjustLevelsImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_adjustlevels, KGenericFactory<ImagePlugin_AdjustLevels>("digikamimageplugin_adjustlevels")) -ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(QObject *parent, const char*, - const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustLevels") +ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *tqparent, const char*, + const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_AdjustLevels") { m_levelsAction = new KAction(i18n("Levels Adjust..."), "adjustlevels", CTRL+Key_L, // NOTE: Photoshop 7 use CTRL+L. - this, SLOT(slotLevelsAdjust()), + this, TQT_SLOT(slotLevelsAdjust()), actionCollection(), "imageplugin_adjustlevels"); setXMLFile("digikamimageplugin_adjustlevels_ui.rc"); diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h index 095cde0..e151504 100644 --- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h +++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustLevels : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_AdjustLevels(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_AdjustLevels(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_AdjustLevels(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/antivignetting/antivignetting.cpp b/digikam/imageplugins/antivignetting/antivignetting.cpp index 70a7535..d5cdb23 100644 --- a/digikam/imageplugins/antivignetting/antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/antivignetting.cpp @@ -40,9 +40,9 @@ namespace DigikamAntiVignettingImagesPlugin { -AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, QObject *parent, double density, +AntiVignetting::AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent, double density, double power, double radius, int xshift, int yshift, bool normalize) - : Digikam::DImgThreadedFilter(orgImage, parent, "AntiVignetting") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "AntiVignetting") { m_density = density; m_power = power; diff --git a/digikam/imageplugins/antivignetting/antivignetting.h b/digikam/imageplugins/antivignetting/antivignetting.h index e45c04f..e167d29 100644 --- a/digikam/imageplugins/antivignetting/antivignetting.h +++ b/digikam/imageplugins/antivignetting/antivignetting.h @@ -36,7 +36,7 @@ class AntiVignetting : public Digikam::DImgThreadedFilter public: - AntiVignetting(Digikam::DImg *orgImage, QObject *parent=0, double density=2.0, + AntiVignetting(Digikam::DImg *orgImage, TQObject *tqparent=0, double density=2.0, double power=1.0, double radius=1.0, int xshift=0, int yshift=0, bool normalize=true); ~AntiVignetting(){}; diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp index 81a89d8..421a4dd 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp +++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qpen.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqtabwidget.h> // KDE includes. @@ -66,14 +66,14 @@ using namespace Digikam; namespace DigikamAntiVignettingImagesPlugin { -AntiVignettingTool::AntiVignettingTool(QObject* parent) - : EditorToolThreaded(parent) +AntiVignettingTool::AntiVignettingTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("antivignettings"); setToolName(i18n("Vignetting Correction")); setToolIcon(SmallIcon("antivignetting")); - m_previewWidget = new ImageWidget("antivignetting Tool", 0, QString(), + m_previewWidget = new ImageWidget("antivignetting Tool", 0, TQString(), false, ImageGuideWidget::HVGuideMode, false); setToolView(m_previewWidget); @@ -83,78 +83,78 @@ AntiVignettingTool::AntiVignettingTool(QObject* parent) m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 14, 2); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 14, 2); - m_maskPreviewLabel = new QLabel( m_gboxSettings->plainPage() ); - m_maskPreviewLabel->setAlignment ( Qt::AlignHCenter | Qt::AlignVCenter ); - QWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting " - "mask applied to the image.") ); + m_tqmaskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() ); + m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting " + "tqmask applied to the image.") ); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Density:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Density:"), m_gboxSettings->plainPage()); m_densityInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_densityInput->setPrecision(1); m_densityInput->setRange(1.0, 20.0, 0.1); m_densityInput->setDefaultValue(2.0); - QWhatsThis::add( m_densityInput, i18n("<p>This value controls the degree of intensity attenuation by the filter " + TQWhatsThis::add( m_densityInput, i18n("<p>This value controls the degree of intensity attenuation by the filter " "at its point of maximum density.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Power:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Power:"), m_gboxSettings->plainPage()); m_powerInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_powerInput->setPrecision(1); m_powerInput->setRange(0.1, 2.0, 0.1); m_powerInput->setDefaultValue(1.0); - QWhatsThis::add( m_powerInput, i18n("<p>This value is used as the exponent controlling the fall-off in density " + TQWhatsThis::add( m_powerInput, i18n("<p>This value is used as the exponent controlling the fall-off in density " "from the center of the filter to the periphery.")); // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Radius:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Radius:"), m_gboxSettings->plainPage()); m_radiusInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_radiusInput->setPrecision(1); m_radiusInput->setRange(-100.0, 100.0, 0.1); m_radiusInput->setDefaultValue(1.0); - QWhatsThis::add( m_radiusInput, i18n("<p>This value is the radius of the center filter. It is a multiple of the " + TQWhatsThis::add( m_radiusInput, i18n("<p>This value is the radius of the center filter. It is a multiple of the " "half-diagonal measure of the image, at which the density of the filter falls " "to zero.")); - KSeparator *line = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Brightness:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Brightness:"), m_gboxSettings->plainPage()); m_brightnessInput = new RIntNumInput(m_gboxSettings->plainPage()); m_brightnessInput->setRange(0, 100, 1); m_brightnessInput->setDefaultValue(0); - QWhatsThis::add( m_brightnessInput, i18n("<p>Set here the brightness re-adjustment of the target image.")); + TQWhatsThis::add( m_brightnessInput, i18n("<p>Set here the brightness re-adjustment of the target image.")); // ------------------------------------------------------------- - QLabel *label5 = new QLabel(i18n("Contrast:"), m_gboxSettings->plainPage()); + TQLabel *label5 = new TQLabel(i18n("Contrast:"), m_gboxSettings->plainPage()); m_contrastInput = new RIntNumInput(m_gboxSettings->plainPage()); m_contrastInput->setRange(0, 100, 1); m_contrastInput->setDefaultValue(0); - QWhatsThis::add( m_contrastInput, i18n("<p>Set here the contrast re-adjustment of the target image.")); + TQWhatsThis::add( m_contrastInput, i18n("<p>Set here the contrast re-adjustment of the target image.")); // ------------------------------------------------------------- - QLabel *label6 = new QLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); + TQLabel *label6 = new TQLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); m_gammaInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01); m_gammaInput->setDefaultValue(1.0); - QWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma re-adjustment of the target image.")); + TQWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma re-adjustment of the target image.")); - grid->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 2); + grid->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 2); grid->addMultiCellWidget(label1, 1, 1, 0, 2); grid->addMultiCellWidget(m_densityInput, 2, 2, 0, 2); grid->addMultiCellWidget(label2, 3, 3, 0, 2); @@ -177,23 +177,23 @@ AntiVignettingTool::AntiVignettingTool(QObject* parent) // ------------------------------------------------------------- - connect(m_densityInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_densityInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_powerInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_powerInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_radiusInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_radiusInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_brightnessInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_brightnessInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_contrastInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_contrastInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_gammaInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); } AntiVignettingTool::~AntiVignettingTool() @@ -294,19 +294,19 @@ void AntiVignettingTool::prepareEffect() uchar *data = iface->getOriginalImage(); int orgWidth = iface->originalWidth(); int orgHeight = iface->originalHeight(); - QSize ps(orgWidth, orgHeight); - ps.scale( QSize(120, 120), QSize::ScaleMin ); + TQSize ps(orgWidth, orgHeight); + ps.scale( TQSize(120, 120), TQSize::ScaleMin ); - // Calc mask preview. + // Calc tqmask preview. DImg preview(ps.width(), ps.height(), false); memset(preview.bits(), 255, preview.numBytes()); - AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false); - QPixmap pix = maskPreview.getTargetImage().convertToPixmap(); - QPainter pt(&pix); - pt.setPen( QPen(Qt::black, 1) ); + AntiVignetting tqmaskPreview(&preview, 0L, d, p, r, 0, 0, false); + TQPixmap pix = tqmaskPreview.getTargetImage().convertToPixmap(); + TQPainter pt(&pix); + pt.setPen( TQPen(TQt::black, 1) ); pt.drawRect( 0, 0, pix.width(), pix.height() ); pt.end(); - m_maskPreviewLabel->setPixmap( pix ); + m_tqmaskPreviewLabel->setPixmap( pix ); DImg orgImage(orgWidth, orgHeight, iface->originalSixteenBit(), iface->originalHasAlpha(), data); diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.h b/digikam/imageplugins/antivignetting/antivignettingtool.h index 4edc356..02515da 100644 --- a/digikam/imageplugins/antivignetting/antivignettingtool.h +++ b/digikam/imageplugins/antivignetting/antivignettingtool.h @@ -29,7 +29,7 @@ #include "editortool.h" -class QLabel; +class TQLabel; namespace KDcrawIface { @@ -49,10 +49,11 @@ namespace DigikamAntiVignettingImagesPlugin class AntiVignettingTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - AntiVignettingTool(QObject *parent); + AntiVignettingTool(TQObject *tqparent); ~AntiVignettingTool(); private slots: @@ -71,7 +72,7 @@ private: private: - QLabel *m_maskPreviewLabel; + TQLabel *m_tqmaskPreviewLabel; KDcrawIface::RIntNumInput *m_brightnessInput; KDcrawIface::RIntNumInput *m_contrastInput; diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp index 5caf1e9..f131373 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qpen.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqtabwidget.h> // KDE includes. @@ -59,12 +59,12 @@ namespace DigikamAntiVignettingImagesPlugin { -ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Vignetting Correction"), +ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Vignetting Correction"), "antivignettings", false, true, false, Digikam::ImageGuideWidget::HVGuideMode, 0, true) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Vignetting Correction"), @@ -85,23 +85,23 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 13, 2, spacingHint()); - - m_maskPreviewLabel = new QLabel( gboxSettings ); - m_maskPreviewLabel->setAlignment ( Qt::AlignHCenter | Qt::AlignVCenter ); - QWhatsThis::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); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 13, 2, spacingHint()); + + m_tqmaskPreviewLabel = new TQLabel( gboxSettings ); + m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the anti-vignetting " + "tqmask applied to the image.") ); + gridSettings->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 2); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Density:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Density:"), gboxSettings); m_densityInput = new KDoubleNumInput(gboxSettings); m_densityInput->setPrecision(1); m_densityInput->setRange(1.0, 20.0, 0.1, true); - QWhatsThis::add( m_densityInput, i18n("<p>This value controls the degree of intensity attenuation by the filter " + TQWhatsThis::add( m_densityInput, i18n("<p>This value controls the degree of intensity attenuation by the filter " "at its point of maximum density.")); gridSettings->addMultiCellWidget(label1, 1, 1, 0, 2); @@ -109,12 +109,12 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(QWidget* parent) // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Power:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Power:"), gboxSettings); m_powerInput = new KDoubleNumInput(gboxSettings); m_powerInput->setPrecision(1); m_powerInput->setRange(0.1, 2.0, 0.1, true); - QWhatsThis::add( m_powerInput, i18n("<p>This value is used as the exponent controlling the fall-off in density " + TQWhatsThis::add( m_powerInput, i18n("<p>This value is used as the exponent controlling the fall-off in density " "from the center of the filter to the periphery.")); gridSettings->addMultiCellWidget(label2, 3, 3, 0, 2); @@ -122,52 +122,52 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(QWidget* parent) // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Radius:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Radius:"), gboxSettings); m_radiusInput = new KDoubleNumInput(gboxSettings); m_radiusInput->setPrecision(1); m_radiusInput->setRange(-100.0, 100.0, 0.1, true); - QWhatsThis::add( m_radiusInput, i18n("<p>This value is the radius of the center filter. It is a multiple of the " + TQWhatsThis::add( m_radiusInput, i18n("<p>This value is the radius of the center filter. It is a multiple of the " "half-diagonal measure of the image, at which the density of the filter falls " "to zero.")); gridSettings->addMultiCellWidget(label3, 5, 5, 0, 2); gridSettings->addMultiCellWidget(m_radiusInput, 6, 6, 0, 2); - KSeparator *line = new KSeparator (Horizontal, gboxSettings); + KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); gridSettings->addMultiCellWidget(line, 7, 7, 0, 2); // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Brightness:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Brightness:"), gboxSettings); m_brightnessInput = new KIntNumInput(gboxSettings); m_brightnessInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_brightnessInput, i18n("<p>Set here the brightness re-adjustment of the target image.")); + TQWhatsThis::add( m_brightnessInput, i18n("<p>Set here the brightness re-adjustment of the target image.")); gridSettings->addMultiCellWidget(label4, 8, 8, 0, 2); gridSettings->addMultiCellWidget(m_brightnessInput, 9, 9, 0, 2); // ------------------------------------------------------------- - QLabel *label5 = new QLabel(i18n("Contrast:"), gboxSettings); + TQLabel *label5 = new TQLabel(i18n("Contrast:"), gboxSettings); m_contrastInput = new KIntNumInput(gboxSettings); m_contrastInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_contrastInput, i18n("<p>Set here the contrast re-adjustment of the target image.")); + TQWhatsThis::add( m_contrastInput, i18n("<p>Set here the contrast re-adjustment of the target image.")); gridSettings->addMultiCellWidget(label5, 10, 10, 0, 2); gridSettings->addMultiCellWidget(m_contrastInput, 11, 11, 0, 2); // ------------------------------------------------------------- - QLabel *label6 = new QLabel(i18n("Gamma:"), gboxSettings); + TQLabel *label6 = new TQLabel(i18n("Gamma:"), gboxSettings); m_gammaInput = new KDoubleNumInput(gboxSettings); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01, true); m_gammaInput->setValue(1.0); - QWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma re-adjustment of the target image.")); + TQWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma re-adjustment of the target image.")); gridSettings->addMultiCellWidget(label6, 12, 12, 0, 2); gridSettings->addMultiCellWidget(m_gammaInput, 13, 13, 0, 2); @@ -176,23 +176,23 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(QWidget* parent) // ------------------------------------------------------------- - connect(m_densityInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_densityInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_powerInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_powerInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_radiusInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_radiusInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_brightnessInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_brightnessInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_contrastInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_contrastInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_gammaInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); } ImageEffect_AntiVignetting::~ImageEffect_AntiVignetting() @@ -292,19 +292,19 @@ void ImageEffect_AntiVignetting::prepareEffect() uchar *data = iface->getOriginalImage(); int orgWidth = iface->originalWidth(); int orgHeight = iface->originalHeight(); - QSize ps(orgWidth, orgHeight); - ps.scale( QSize(120, 120), QSize::ScaleMin ); + TQSize ps(orgWidth, orgHeight); + ps.scale( TQSize(120, 120), TQSize::ScaleMin ); - // Calc mask preview. + // Calc tqmask preview. Digikam::DImg preview(ps.width(), ps.height(), false); memset(preview.bits(), 255, preview.numBytes()); - AntiVignetting maskPreview(&preview, 0L, d, p, r, 0, 0, false); - QPixmap pix = maskPreview.getTargetImage().convertToPixmap(); - QPainter pt(&pix); - pt.setPen( QPen(Qt::black, 1) ); + AntiVignetting tqmaskPreview(&preview, 0L, d, p, r, 0, 0, false); + TQPixmap pix = tqmaskPreview.getTargetImage().convertToPixmap(); + TQPainter pt(&pix); + pt.setPen( TQPen(TQt::black, 1) ); pt.drawRect( 0, 0, pix.width(), pix.height() ); pt.end(); - m_maskPreviewLabel->setPixmap( pix ); + m_tqmaskPreviewLabel->setPixmap( pix ); Digikam::DImg orgImage(orgWidth, orgHeight, iface->originalSixteenBit(), iface->originalHasAlpha(), data); diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h index 907730f..3d7ff18 100644 --- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.h @@ -29,7 +29,7 @@ #include "imageguidedlg.h" -class QLabel; +class TQLabel; class KIntNumInput; class KDoubleNumInput; @@ -40,10 +40,11 @@ namespace DigikamAntiVignettingImagesPlugin class ImageEffect_AntiVignetting : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_AntiVignetting(QWidget *parent); + ImageEffect_AntiVignetting(TQWidget *tqparent); ~ImageEffect_AntiVignetting(); private slots: @@ -62,7 +63,7 @@ private: private: - QLabel *m_maskPreviewLabel; + TQLabel *m_tqmaskPreviewLabel; KIntNumInput *m_brightnessInput; KIntNumInput *m_contrastInput; diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp index 0a25f4c..d0b16da 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp @@ -42,11 +42,11 @@ using namespace DigikamAntiVignettingImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_antivignetting, KGenericFactory<ImagePlugin_AntiVignetting>("digikamimageplugin_antivignetting")); -ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting") +ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_AntiVignetting") { m_antivignettingAction = new KAction(i18n("Vignetting Correction..."), "antivignetting", 0, - this, SLOT(slotAntiVignetting()), + this, TQT_SLOT(slotAntiVignetting()), actionCollection(), "imageplugin_antivignetting"); setXMLFile("digikamimageplugin_antivignetting_ui.rc"); diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h index 6f3b501..aeb1ee3 100644 --- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h +++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_AntiVignetting(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_AntiVignetting(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_AntiVignetting(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/blurfx/blurfx.cpp b/digikam/imageplugins/blurfx/blurfx.cpp index 3806452..428bdcc 100644 --- a/digikam/imageplugins/blurfx/blurfx.cpp +++ b/digikam/imageplugins/blurfx/blurfx.cpp @@ -34,9 +34,9 @@ #include <cstdlib> #include <cstring> -// Qt includes. +// TQt includes. -#include <qdatetime.h> +#include <tqdatetime.h> // Local includes. @@ -47,8 +47,8 @@ namespace DigikamBlurFXImagesPlugin { -BlurFX::BlurFX(Digikam::DImg *orgImage, QObject *parent, int blurFXType, int distance, int level) - : Digikam::DImgThreadedFilter(orgImage, parent, "BlurFX") +BlurFX::BlurFX(Digikam::DImg *orgImage, TQObject *tqparent, int blurFXType, int distance, int level) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "BlurFX") { m_blurFXType = blurFXType; m_distance = distance; @@ -122,7 +122,7 @@ void BlurFX::filterImage(void) * This radius is always from the center to out of the image, we * calc a proportional radius from the center. */ -void BlurFX::zoomBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int Distance, QRect pArea) +void BlurFX::zoomBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int Distance, TQRect pArea) { if (Distance <= 1) return; int progress; @@ -238,7 +238,7 @@ void BlurFX::zoomBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, * angle. After this, we sum this pixel with others with the same * radius, but different angles. Here I'm using degrees angles. */ -void BlurFX::radialBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int Distance, QRect pArea) +void BlurFX::radialBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int Distance, TQRect pArea) { if (Distance <= 1) return; int progress; @@ -356,7 +356,7 @@ void BlurFX::radialBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X */ void BlurFX::focusBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int BlurRadius, int BlendRadius, - bool bInversed, QRect pArea) + bool bInversed, TQRect pArea) { int progress; @@ -1050,8 +1050,8 @@ void BlurFX::frostGlass(Digikam::DImg *orgImage, Digikam::DImg *destImage, int F // Randomize. - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); int range = sixteenBit ? 65535 : 255; diff --git a/digikam/imageplugins/blurfx/blurfx.h b/digikam/imageplugins/blurfx/blurfx.h index 63b03df..52579a7 100644 --- a/digikam/imageplugins/blurfx/blurfx.h +++ b/digikam/imageplugins/blurfx/blurfx.h @@ -40,7 +40,7 @@ class BlurFX : public Digikam::DImgThreadedFilter public: - BlurFX(Digikam::DImg *orgImage, QObject *parent=0, int blurFXType=ZoomBlur, + BlurFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int blurFXType=ZoomBlur, int distance=100, int level=45); ~BlurFX(){}; @@ -78,12 +78,12 @@ private: // BlurFX filter methods. // Backported from ImageProcessing version 2 void zoomBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, - int X, int Y, int Distance, QRect pArea=QRect()); + int X, int Y, int Distance, TQRect pArea=TQRect()); void radialBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, - int X, int Y, int Distance, QRect pArea=QRect()); + int X, int Y, int Distance, TQRect pArea=TQRect()); void focusBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, int BlurRadius, int BlendRadius, - bool bInversed=false, QRect pArea=QRect()); + bool bInversed=false, TQRect pArea=TQRect()); void farBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Distance); void motionBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Distance, double Angle=0.0); void smartBlur(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Radius, int Strenght); diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp index 7110d42..e630ec9 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.cpp +++ b/digikam/imageplugins/blurfx/blurfxtool.cpp @@ -22,14 +22,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> -#include <qwhatsthis.h> +#include <tqdatetime.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqwhatsthis.h> // KDE includes. @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamBlurFXImagesPlugin { -BlurFXTool::BlurFXTool(QObject* parent) - : EditorToolThreaded(parent) +BlurFXTool::BlurFXTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("blurfx"); setToolName(i18n("Blur FX")); @@ -75,9 +75,9 @@ BlurFXTool::BlurFXTool(QObject* parent) EditorToolSettings::Cancel| EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 6, 1); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 6, 1); - m_effectTypeLabel = new QLabel(i18n("Type:"), m_gboxSettings->plainPage()); + m_effectTypeLabel = new TQLabel(i18n("Type:"), m_gboxSettings->plainPage()); m_effectType = new RComboBox(m_gboxSettings->plainPage()); m_effectType->insertItem(i18n("Zoom Blur")); @@ -91,7 +91,7 @@ BlurFXTool::BlurFXTool(QObject* parent) m_effectType->insertItem(i18n("Frost Glass")); m_effectType->insertItem(i18n("Mosaic")); m_effectType->setDefaultItem(BlurFX::ZoomBlur); - QWhatsThis::add( m_effectType, i18n("<p>Select the blurring effect to apply to the image.<p>" + TQWhatsThis::add( m_effectType, i18n("<p>Select the blurring effect to apply to the image.<p>" "<b>Zoom Blur</b>: blurs the image along radial lines starting from " "a specified center point. This simulates the blur of a zooming camera.<p>" "<b>Radial Blur</b>: blurs the image by rotating the pixels around " @@ -115,17 +115,17 @@ BlurFXTool::BlurFXTool(QObject* parent) "<b>Mosaic</b>: divides the photograph into rectangular cells and then " "recreates it by filling those cells with average pixel value.")); - m_distanceLabel = new QLabel(i18n("Distance:"), m_gboxSettings->plainPage()); + m_distanceLabel = new TQLabel(i18n("Distance:"), m_gboxSettings->plainPage()); m_distanceInput = new RIntNumInput(m_gboxSettings->plainPage()); m_distanceInput->setRange(0, 100, 1); m_distanceInput->setDefaultValue(3); - QWhatsThis::add( m_distanceInput, i18n("<p>Set here the blur distance in pixels.")); + TQWhatsThis::add( m_distanceInput, i18n("<p>Set here the blur distance in pixels.")); - m_levelLabel = new QLabel(i18n("Level:"), m_gboxSettings->plainPage()); + m_levelLabel = new TQLabel(i18n("Level:"), m_gboxSettings->plainPage()); m_levelInput = new RIntNumInput(m_gboxSettings->plainPage()); m_levelInput->setRange(0, 360, 1); m_levelInput->setDefaultValue(128); - QWhatsThis::add( m_levelInput, i18n("<p>This value controls the level to use with the current effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>This value controls the level to use with the current effect.")); grid->addMultiCellWidget(m_effectTypeLabel, 0, 0, 0, 1); grid->addMultiCellWidget(m_effectType, 1, 1, 0, 1); @@ -148,14 +148,14 @@ BlurFXTool::BlurFXTool(QObject* parent) // ------------------------------------------------------------- - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); - connect(m_distanceInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_distanceInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } BlurFXTool::~BlurFXTool() @@ -376,7 +376,7 @@ void BlurFXTool::putPreviewData() case BlurFX::RadialBlur: case BlurFX::FocusBlur: { - QRect pRect = m_previewWidget->getOriginalImageRegionToRender(); + TQRect pRect = m_previewWidget->getOriginalImageRegionToRender(); DImg destImg = filter()->getTargetImage().copy(pRect); m_previewWidget->setPreviewImage(destImg); break; diff --git a/digikam/imageplugins/blurfx/blurfxtool.h b/digikam/imageplugins/blurfx/blurfxtool.h index f6a7d61..c0ae01d 100644 --- a/digikam/imageplugins/blurfx/blurfxtool.h +++ b/digikam/imageplugins/blurfx/blurfxtool.h @@ -29,7 +29,7 @@ #include "editortool.h" -class QLabel; +class TQLabel; namespace KDcrawIface { @@ -49,10 +49,11 @@ namespace DigikamBlurFXImagesPlugin class BlurFXTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - BlurFXTool(QObject *parent); + BlurFXTool(TQObject *tqparent); ~BlurFXTool(); private slots: @@ -73,9 +74,9 @@ private: private: - QLabel *m_effectTypeLabel; - QLabel *m_distanceLabel; - QLabel *m_levelLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_distanceLabel; + TQLabel *m_levelLabel; KDcrawIface::RComboBox *m_effectType; diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp index ae111ce..9241a3f 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp @@ -22,15 +22,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qslider.h> -#include <qimage.h> -#include <qcombobox.h> -#include <qdatetime.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqimage.h> +#include <tqcombobox.h> +#include <tqdatetime.h> // KDE includes. @@ -53,12 +53,12 @@ namespace DigikamBlurFXImagesPlugin { -ImageEffect_BlurFX::ImageEffect_BlurFX(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Apply Blurring Special Effect to Photograph"), +ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Blurring Special Effect to Photograph"), "blurfx", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Blur Effects"), @@ -84,12 +84,12 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 5, 1, 0, spacingHint()); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 5, 1, 0, spacingHint()); - m_effectTypeLabel = new QLabel(i18n("Type:"), gboxSettings); + m_effectTypeLabel = new TQLabel(i18n("Type:"), gboxSettings); - m_effectType = new QComboBox( false, gboxSettings ); + m_effectType = new TQComboBox( false, gboxSettings ); m_effectType->insertItem( i18n("Zoom Blur") ); m_effectType->insertItem( i18n("Radial Blur") ); m_effectType->insertItem( i18n("Far Blur") ); @@ -100,7 +100,7 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(QWidget* parent) m_effectType->insertItem( i18n("Smart Blur") ); m_effectType->insertItem( i18n("Frost Glass") ); m_effectType->insertItem( i18n("Mosaic") ); - QWhatsThis::add( m_effectType, i18n("<p>Select the blurring effect to apply to the image.<p>" + TQWhatsThis::add( m_effectType, i18n("<p>Select the blurring effect to apply to the image.<p>" "<b>Zoom Blur</b>: blurs the image along radial lines starting from " "a specified center point. This simulates the blur of a zooming camera.<p>" "<b>Radial Blur</b>: blurs the image by rotating the pixels around " @@ -126,18 +126,18 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(QWidget* parent) gridSettings->addMultiCellWidget(m_effectTypeLabel, 0, 0, 0, 1); gridSettings->addMultiCellWidget(m_effectType, 1, 1, 0, 1); - m_distanceLabel = new QLabel(i18n("Distance:"), gboxSettings); + m_distanceLabel = new TQLabel(i18n("Distance:"), gboxSettings); m_distanceInput = new KIntNumInput(gboxSettings); m_distanceInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_distanceInput, i18n("<p>Set here the blur distance in pixels.")); + TQWhatsThis::add( m_distanceInput, i18n("<p>Set here the blur distance in pixels.")); gridSettings->addMultiCellWidget(m_distanceLabel, 2, 2, 0, 1); gridSettings->addMultiCellWidget(m_distanceInput, 3, 3, 0, 1); - m_levelLabel = new QLabel(i18n("Level:"), gboxSettings); + m_levelLabel = new TQLabel(i18n("Level:"), gboxSettings); m_levelInput = new KIntNumInput(gboxSettings); m_levelInput->setRange(0, 360, 1, true); - QWhatsThis::add( m_levelInput, i18n("<p>This value controls the level to use with the current effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>This value controls the level to use with the current effect.")); gridSettings->addMultiCellWidget(m_levelLabel, 4, 4, 0, 1); gridSettings->addMultiCellWidget(m_levelInput, 5, 5, 0, 1); @@ -146,14 +146,14 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(QWidget* parent) // ------------------------------------------------------------- - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); - connect(m_distanceInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_distanceInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_BlurFX::~ImageEffect_BlurFX() @@ -359,7 +359,7 @@ void ImageEffect_BlurFX::putPreviewData(void) case BlurFX::RadialBlur: case BlurFX::FocusBlur: { - QRect pRect = m_imagePreviewWidget->getOriginalImageRegionToRender(); + TQRect pRect = m_imagePreviewWidget->getOriginalImageRegionToRender(); Digikam::DImg destImg = m_threadedFilter->getTargetImage().copy(pRect); m_imagePreviewWidget->setPreviewImage(destImg); break; diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.h b/digikam/imageplugins/blurfx/imageeffect_blurfx.h index 5c2b198..4f094a8 100644 --- a/digikam/imageplugins/blurfx/imageeffect_blurfx.h +++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.h @@ -29,8 +29,8 @@ #include "ctrlpaneldlg.h" -class QComboBox; -class QLabel; +class TQComboBox; +class TQLabel; class KIntNumInput; @@ -40,10 +40,11 @@ namespace DigikamBlurFXImagesPlugin class ImageEffect_BlurFX : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_BlurFX(QWidget *parent); + ImageEffect_BlurFX(TQWidget *tqparent); ~ImageEffect_BlurFX(); private slots: @@ -64,11 +65,11 @@ private: private: - QComboBox *m_effectType; + TQComboBox *m_effectType; - QLabel *m_effectTypeLabel; - QLabel *m_distanceLabel; - QLabel *m_levelLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_distanceLabel; + TQLabel *m_levelLabel; KIntNumInput *m_distanceInput; KIntNumInput *m_levelInput; diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp index 72d4fb6..fcab512 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp @@ -42,11 +42,11 @@ using namespace DigikamBlurFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_blurfx, KGenericFactory<ImagePlugin_BlurFX>("digikamimageplugin_blurfx")); -ImagePlugin_BlurFX::ImagePlugin_BlurFX(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_BlurFX") +ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_BlurFX") { m_blurfxAction = new KAction(i18n("Blur Effects..."), "blurfx", 0, - this, SLOT(slotBlurFX()), + this, TQT_SLOT(slotBlurFX()), actionCollection(), "imageplugin_blurfx"); setXMLFile( "digikamimageplugin_blurfx_ui.rc" ); diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.h b/digikam/imageplugins/blurfx/imageplugin_blurfx.h index 45cadcf..d13eba8 100644 --- a/digikam/imageplugins/blurfx/imageplugin_blurfx.h +++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_BlurFX : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_BlurFX(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_BlurFX(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_BlurFX(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/border/border.cpp b/digikam/imageplugins/border/border.cpp index ab9de57..df5f90e 100644 --- a/digikam/imageplugins/border/border.cpp +++ b/digikam/imageplugins/border/border.cpp @@ -27,11 +27,11 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qpoint.h> -#include <qregion.h> -#include <qpointarray.h> +#include <tqpoint.h> +#include <tqregion.h> +#include <tqpointarray.h> // Local includes. @@ -42,8 +42,8 @@ namespace DigikamBorderImagesPlugin { -Border::Border(Digikam::DImg *image, QObject *parent, int orgWidth, int orgHeight, - QString borderPath, int borderType, float borderPercent, +Border::Border(Digikam::DImg *image, TQObject *tqparent, int orgWidth, int orgHeight, + TQString borderPath, int borderType, float borderPercent, Digikam::DColor solidColor, Digikam::DColor niepceBorderColor, Digikam::DColor niepceLineColor, @@ -51,7 +51,7 @@ Border::Border(Digikam::DImg *image, QObject *parent, int orgWidth, int orgHeigh Digikam::DColor bevelLowerRightColor, Digikam::DColor decorativeFirstColor, Digikam::DColor decorativeSecondColor) - : Digikam::DImgThreadedFilter(image, parent, "Border") + : Digikam::DImgThreadedFilter(image, tqparent, "Border") { m_orgWidth = orgWidth; m_orgHeight = orgHeight; @@ -78,8 +78,8 @@ Border::Border(Digikam::DImg *image, QObject *parent, int orgWidth, int orgHeigh initFilter(); } -Border::Border(Digikam::DImg *orgImage, QObject *parent, int orgWidth, int orgHeight, - QString borderPath, int borderType, +Border::Border(Digikam::DImg *orgImage, TQObject *tqparent, int orgWidth, int orgHeight, + TQString borderPath, int borderType, int borderWidth1, int borderWidth2, int borderWidth3, int borderWidth4, Digikam::DColor solidColor, Digikam::DColor niepceBorderColor, @@ -88,7 +88,7 @@ Border::Border(Digikam::DImg *orgImage, QObject *parent, int orgWidth, int orgHe Digikam::DColor bevelLowerRightColor, Digikam::DColor decorativeFirstColor, Digikam::DColor decorativeSecondColor) - : Digikam::DImgThreadedFilter(orgImage, parent, "Border") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Border") { m_orgWidth = orgWidth; m_orgHeight = orgHeight; @@ -218,17 +218,17 @@ void Border::bevel(Digikam::DImg &src, Digikam::DImg &dest, const Digikam::DColo dest = Digikam::DImg(width, height, src.sixteenBit(), src.hasAlpha()); dest.fill(topColor); - QPointArray btTriangle(3); + TQPointArray btTriangle(3); btTriangle.setPoint(0, width, 0); btTriangle.setPoint(1, 0, height); btTriangle.setPoint(2, width, height); - QRegion btRegion(btTriangle); + TQRegion btRegion(btTriangle); for(int x=0 ; x < width ; x++) { for(int y=0 ; y < height ; y++) { - if (btRegion.contains(QPoint(x, y))) + if (btRegion.tqcontains(TQPoint(x, y))) dest.setPixelColor(x, y, btmColor); } } diff --git a/digikam/imageplugins/border/border.h b/digikam/imageplugins/border/border.h index 1ac49ae..f85b2a9 100644 --- a/digikam/imageplugins/border/border.h +++ b/digikam/imageplugins/border/border.h @@ -25,11 +25,11 @@ #ifndef BORDER_H #define BORDER_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qcolor.h> -#include <qimage.h> +#include <tqstring.h> +#include <tqcolor.h> +#include <tqimage.h> // Digikam includes. @@ -69,8 +69,8 @@ public: public: /** Constructor using settings to preserve aspect ratio of image. */ - Border(Digikam::DImg *orgImage, QObject *parent=0, int orgWidth=0, int orgHeight=0, - QString borderPath=QString(), int borderType=SolidBorder, float borderPercent=0.1, + Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0, + TQString borderPath=TQString(), int borderType=SolidBorder, float borderPercent=0.1, Digikam::DColor solidColor = Digikam::DColor(), Digikam::DColor niepceBorderColor = Digikam::DColor(), Digikam::DColor niepceLineColor = Digikam::DColor(), @@ -80,8 +80,8 @@ public: Digikam::DColor decorativeSecondColor = Digikam::DColor()); /** Constructor using settings to not-preserve aspect ratio of image. */ - Border(Digikam::DImg *orgImage, QObject *parent=0, int orgWidth=0, int orgHeight=0, - QString borderPath=QString(), int borderType=SolidBorder, + Border(Digikam::DImg *orgImage, TQObject *tqparent=0, int orgWidth=0, int orgHeight=0, + TQString borderPath=TQString(), int borderType=SolidBorder, int borderWidth1=100, int borderWidth2=20, int borderWidth3=20, int borderWidth4=10, Digikam::DColor solidColor = Digikam::DColor(), Digikam::DColor niepceBorderColor = Digikam::DColor(), @@ -135,7 +135,7 @@ private: float m_orgRatio; - QString m_borderPath; + TQString m_borderPath; Digikam::DColor m_solidColor; Digikam::DColor m_niepceBorderColor; diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index 3ba12e7..c521871 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -23,12 +23,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -63,14 +63,14 @@ using namespace Digikam; namespace DigikamBorderImagesPlugin { -BorderTool::BorderTool(QObject* parent) - : EditorToolThreaded(parent) +BorderTool::BorderTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("border"); setToolName(i18n("Add Border")); setToolIcon(SmallIcon("bordertool")); - m_previewWidget = new ImageWidget("bordertool Tool", 0, QString(), + m_previewWidget = new ImageWidget("bordertool Tool", 0, TQString(), false, ImageGuideWidget::HVGuideMode, false); setToolView(m_previewWidget); @@ -80,9 +80,9 @@ BorderTool::BorderTool(QObject* parent) m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 11, 2); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 11, 2); - QLabel *label1 = new QLabel(i18n("Type:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Type:"), m_gboxSettings->plainPage()); m_borderType = new RComboBox(m_gboxSettings->plainPage()); m_borderType->insertItem( i18n("Solid") ); @@ -106,29 +106,29 @@ BorderTool::BorderTool(QObject* parent) m_borderType->insertItem( i18n("Decorative Rock") ); m_borderType->insertItem( i18n("Decorative Wall") ); m_borderType->setDefaultItem(Border::SolidBorder); - QWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); + TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); - KSeparator *line1 = new KSeparator(Horizontal, m_gboxSettings->plainPage()); + KSeparator *line1 = new KSeparatorQt::Horizontal, m_gboxSettings->plainPage()); // ------------------------------------------------------------------- - m_preserveAspectRatio = new QCheckBox(m_gboxSettings->plainPage()); + m_preserveAspectRatio = new TQCheckBox(m_gboxSettings->plainPage()); m_preserveAspectRatio->setText(i18n("Preserve Aspect Ratio")); - QWhatsThis::add(m_preserveAspectRatio, i18n("Enable this option if you want to preserve the aspect " + TQWhatsThis::add(m_preserveAspectRatio, i18n("Enable this option if you want to preserve the aspect " "ratio of the image. If enabled, the border width will be " "in percent of the image size, else the border width will " "in pixels.")); - m_labelBorderPercent = new QLabel(i18n("Width (%):"), m_gboxSettings->plainPage()); + m_labelBorderPercent = new TQLabel(i18n("Width (%):"), m_gboxSettings->plainPage()); m_borderPercent = new RIntNumInput(m_gboxSettings->plainPage()); m_borderPercent->setRange(1, 50, 1); m_borderPercent->setDefaultValue(10); - QWhatsThis::add(m_borderPercent, i18n("<p>Set here the border width in percent of the image size.")); + TQWhatsThis::add(m_borderPercent, i18n("<p>Set here the border width in percent of the image size.")); - m_labelBorderWidth = new QLabel(i18n("Width (pixels):"), m_gboxSettings->plainPage()); + m_labelBorderWidth = new TQLabel(i18n("Width (pixels):"), m_gboxSettings->plainPage()); m_borderWidth = new RIntNumInput(m_gboxSettings->plainPage()); m_borderWidth->setDefaultValue(100); - QWhatsThis::add(m_borderWidth, i18n("<p>Set here the border width in pixels to add around the image.")); + TQWhatsThis::add(m_borderWidth, i18n("<p>Set here the border width in pixels to add around the image.")); ImageIface iface(0, 0); int w = iface.originalWidth(); @@ -139,14 +139,14 @@ BorderTool::BorderTool(QObject* parent) else m_borderWidth->setRange(1, w/2, 1); - KSeparator *line2 = new KSeparator(Horizontal, m_gboxSettings->plainPage()); + KSeparator *line2 = new KSeparatorQt::Horizontal, m_gboxSettings->plainPage()); // ------------------------------------------------------------------- - m_labelForeground = new QLabel(m_gboxSettings->plainPage()); - m_firstColorButton = new KColorButton( QColor::QColor( 192, 192, 192 ), m_gboxSettings->plainPage() ); - m_labelBackground = new QLabel(m_gboxSettings->plainPage()); - m_secondColorButton = new KColorButton( QColor::QColor( 128, 128, 128 ), m_gboxSettings->plainPage() ); + m_labelForeground = new TQLabel(m_gboxSettings->plainPage()); + m_firstColorButton = new KColorButton( TQColor::TQColor( 192, 192, 192 ), m_gboxSettings->plainPage() ); + m_labelBackground = new TQLabel(m_gboxSettings->plainPage()); + m_secondColorButton = new KColorButton( TQColor::TQColor( 128, 128, 128 ), m_gboxSettings->plainPage() ); // ------------------------------------------------------------------- @@ -172,23 +172,23 @@ BorderTool::BorderTool(QObject* parent) // ------------------------------------------------------------- - connect(m_preserveAspectRatio, SIGNAL(toggled(bool)), - this, SLOT(slotPreserveAspectRatioToggled(bool))); + connect(m_preserveAspectRatio, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPreserveAspectRatioToggled(bool))); - connect(m_borderType, SIGNAL(activated(int)), - this, SLOT(slotBorderTypeChanged(int))); + connect(m_borderType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotBorderTypeChanged(int))); - connect(m_borderPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_borderPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_borderWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_borderWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_firstColorButton, SIGNAL(changed(const QColor &)), - this, SLOT(slotColorForegroundChanged(const QColor &))); + connect(m_firstColorButton, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(slotColorForegroundChanged(const TQColor &))); - connect(m_secondColorButton, SIGNAL(changed(const QColor &)), - this, SLOT(slotColorBackgroundChanged(const QColor &))); + connect(m_secondColorButton, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(slotColorBackgroundChanged(const TQColor &))); } BorderTool::~BorderTool() @@ -212,10 +212,10 @@ void BorderTool::readSettings() m_borderWidth->setValue(config->readNumEntry("Border Width", m_borderWidth->defaultValue())); m_preserveAspectRatio->setChecked(config->readBoolEntry("Preserve Aspect Ratio", true)); - QColor black(0, 0, 0); - QColor white(255, 255, 255); - QColor gray1(192, 192, 192); - QColor gray2(128, 128, 128); + TQColor black(0, 0, 0); + TQColor white(255, 255, 255); + TQColor gray1(192, 192, 192); + TQColor gray2(128, 128, 128); m_solidColor = config->readColorEntry("Solid Color", &black); m_niepceBorderColor = config->readColorEntry("Niepce Border Color", &white); @@ -272,13 +272,13 @@ void BorderTool::slotResetSettings() m_borderWidth->slotReset(); m_preserveAspectRatio->setChecked(true); - m_solidColor = QColor(0, 0, 0); - m_niepceBorderColor = QColor(255, 255, 255); - m_niepceLineColor = QColor(0, 0, 0); - m_bevelUpperLeftColor = QColor(192, 192, 192); - m_bevelLowerRightColor = QColor(128, 128, 128); - m_decorativeFirstColor = QColor(0, 0, 0); - m_decorativeSecondColor = QColor(0, 0, 0); + m_solidColor = TQColor(0, 0, 0); + m_niepceBorderColor = TQColor(255, 255, 255); + m_niepceLineColor = TQColor(0, 0, 0); + m_bevelUpperLeftColor = TQColor(192, 192, 192); + m_bevelLowerRightColor = TQColor(128, 128, 128); + m_decorativeFirstColor = TQColor(0, 0, 0); + m_decorativeSecondColor = TQColor(0, 0, 0); m_borderType->blockSignals(false); m_borderPercent->blockSignals(false); @@ -301,7 +301,7 @@ void BorderTool::renderingFinished() toggleBorderSlider(m_preserveAspectRatio->isChecked()); } -void BorderTool::slotColorForegroundChanged(const QColor &color) +void BorderTool::slotColorForegroundChanged(const TQColor &color) { switch (m_borderType->currentItem()) { @@ -340,7 +340,7 @@ void BorderTool::slotColorForegroundChanged(const QColor &color) slotEffect(); } -void BorderTool::slotColorBackgroundChanged(const QColor &color) +void BorderTool::slotColorBackgroundChanged(const TQColor &color) { switch (m_borderType->currentItem()) { @@ -383,8 +383,8 @@ void BorderTool::slotBorderTypeChanged(int borderType) { m_labelForeground->setText(i18n("First:")); m_labelBackground->setText(i18n("Second:")); - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the foreground color of the border.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the Background color of the border.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the foreground color of the border.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the Background color of the border.")); m_firstColorButton->setEnabled(true); m_secondColorButton->setEnabled(true); m_labelForeground->setEnabled(true); @@ -400,15 +400,15 @@ void BorderTool::slotBorderTypeChanged(int borderType) break; case Border::NiepceBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the main border.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the line.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the main border.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the line.")); m_firstColorButton->setColor( m_niepceBorderColor ); m_secondColorButton->setColor( m_niepceLineColor ); break; case Border::BeveledBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the upper left area.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the lower right area.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the upper left area.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the lower right area.")); m_firstColorButton->setColor( m_bevelUpperLeftColor ); m_secondColorButton->setColor( m_bevelLowerRightColor ); break; @@ -429,8 +429,8 @@ void BorderTool::slotBorderTypeChanged(int borderType) case Border::GraniteBorder: case Border::RockBorder: case Border::WallBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the first line.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the second line.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the first line.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the second line.")); m_firstColorButton->setColor( m_decorativeFirstColor ); m_secondColorButton->setColor( m_decorativeSecondColor ); break; @@ -462,7 +462,7 @@ void BorderTool::prepareEffect() int borderType = m_borderType->currentItem(); float ratio = (float)w/(float)orgWidth; int borderWidth = (int)((float)m_borderWidth->value()*ratio); - QString border = getBorderPath( m_borderType->currentItem() ); + TQString border = getBorderPath( m_borderType->currentItem() ); if (m_preserveAspectRatio->isChecked()) { @@ -504,7 +504,7 @@ void BorderTool::prepareFinal() int borderType = m_borderType->currentItem(); int borderWidth = m_borderWidth->value(); float borderRatio = m_borderPercent->value()/100.0; - QString border = getBorderPath( m_borderType->currentItem() ); + TQString border = getBorderPath( m_borderType->currentItem() ); ImageIface iface(0, 0); int orgWidth = iface.originalWidth(); @@ -549,7 +549,7 @@ void BorderTool::putPreviewData() int w = iface->previewWidth(); int h = iface->previewHeight(); - DImg imTemp = filter()->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + DImg imTemp = filter()->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); DImg imDest( w, h, filter()->getTargetImage().sixteenBit(), filter()->getTargetImage().hasAlpha() ); @@ -572,9 +572,9 @@ void BorderTool::putFinalData() targetImage.width(), targetImage.height()); } -QString BorderTool::getBorderPath(int border) +TQString BorderTool::getBorderPath(int border) { - QString pattern; + TQString pattern; switch (border) { @@ -643,7 +643,7 @@ QString BorderTool::getBorderPath(int border) break; default: - return QString(); + return TQString(); } KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + diff --git a/digikam/imageplugins/border/bordertool.h b/digikam/imageplugins/border/bordertool.h index 2604d24..f63144e 100644 --- a/digikam/imageplugins/border/bordertool.h +++ b/digikam/imageplugins/border/bordertool.h @@ -26,17 +26,17 @@ #ifndef BORDERTOOL_H #define BORDERTOOL_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "editortool.h" -class QLabel; -class QCheckBox; -class QColor; +class TQLabel; +class TQCheckBox; +class TQColor; class KColorButton; @@ -58,22 +58,23 @@ namespace DigikamBorderImagesPlugin class BorderTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - BorderTool(QObject *parent); + BorderTool(TQObject *tqparent); ~BorderTool(); private: - QString getBorderPath(int border); + TQString getBorderPath(int border); private slots: void slotPreserveAspectRatioToggled(bool); void slotBorderTypeChanged(int borderType); - void slotColorForegroundChanged(const QColor &color); - void slotColorBackgroundChanged(const QColor &color); + void slotColorForegroundChanged(const TQColor &color); + void slotColorBackgroundChanged(const TQColor &color); void slotResetSettings(); private: @@ -89,20 +90,20 @@ private: private: - QLabel *m_labelBorderPercent; - QLabel *m_labelBorderWidth; - QLabel *m_labelForeground; - QLabel *m_labelBackground; + TQLabel *m_labelBorderPercent; + TQLabel *m_labelBorderWidth; + TQLabel *m_labelForeground; + TQLabel *m_labelBackground; - QCheckBox *m_preserveAspectRatio; + TQCheckBox *m_preserveAspectRatio; - QColor m_solidColor; - QColor m_niepceBorderColor; - QColor m_niepceLineColor; - QColor m_bevelUpperLeftColor; - QColor m_bevelLowerRightColor; - QColor m_decorativeFirstColor; - QColor m_decorativeSecondColor; + TQColor m_solidColor; + TQColor m_niepceBorderColor; + TQColor m_niepceLineColor; + TQColor m_bevelUpperLeftColor; + TQColor m_bevelLowerRightColor; + TQColor m_decorativeFirstColor; + TQColor m_decorativeSecondColor; KDcrawIface::RComboBox *m_borderType; diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index 438a7c7..6330e79 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -23,13 +23,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> // KDE includes. @@ -56,15 +56,15 @@ namespace DigikamBorderImagesPlugin { -ImageEffect_Border::ImageEffect_Border(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Add Border Around Photograph"), +ImageEffect_Border::ImageEffect_Border(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Add Border Around Photograph"), "border", false, false, false, Digikam::ImageGuideWidget::HVGuideMode) { // No need Abort button action. showButton(User1, false); - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Add Border"), @@ -86,12 +86,12 @@ ImageEffect_Border::ImageEffect_Border(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout(gboxSettings, 10, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 10, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("Type:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Type:"), gboxSettings); - m_borderType = new QComboBox( false, gboxSettings ); + m_borderType = new TQComboBox( false, gboxSettings ); m_borderType->insertItem( i18n("Solid") ); // Niepce is Real name. This is the first guy in the world to have built a camera. m_borderType->insertItem( "Niepce" ); @@ -112,27 +112,27 @@ ImageEffect_Border::ImageEffect_Border(QWidget* parent) m_borderType->insertItem( i18n("Decorative Granite") ); m_borderType->insertItem( i18n("Decorative Rock") ); m_borderType->insertItem( i18n("Decorative Wall") ); - QWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); + TQWhatsThis::add( m_borderType, i18n("<p>Select the border type to add around the image.")); - KSeparator *line1 = new KSeparator(Horizontal, gboxSettings); + KSeparator *line1 = new KSeparatorQt::Horizontal, gboxSettings); // ------------------------------------------------------------------- - m_preserveAspectRatio = new QCheckBox(gboxSettings); + m_preserveAspectRatio = new TQCheckBox(gboxSettings); m_preserveAspectRatio->setText(i18n("Preserve Aspect Ratio")); - QWhatsThis::add(m_preserveAspectRatio, i18n("Enable this option if you want to preserve the aspect " + TQWhatsThis::add(m_preserveAspectRatio, i18n("Enable this option if you want to preserve the aspect " "ratio of the image. If enabled, the border width will be " "in percent of the image size, else the border width will " "in pixels.")); - m_labelBorderPercent = new QLabel(i18n("Width (%):"), gboxSettings); + m_labelBorderPercent = new TQLabel(i18n("Width (%):"), gboxSettings); m_borderPercent = new KIntNumInput(gboxSettings); m_borderPercent->setRange(1, 50, 1, true); - QWhatsThis::add(m_borderPercent, i18n("<p>Set here the border width in percent of the image size.")); + TQWhatsThis::add(m_borderPercent, i18n("<p>Set here the border width in percent of the image size.")); - m_labelBorderWidth = new QLabel(i18n("Width (pixels):"), gboxSettings); + m_labelBorderWidth = new TQLabel(i18n("Width (pixels):"), gboxSettings); m_borderWidth = new KIntNumInput(gboxSettings); - QWhatsThis::add(m_borderWidth, i18n("<p>Set here the border width in pixels to add around the image.")); + TQWhatsThis::add(m_borderWidth, i18n("<p>Set here the border width in pixels to add around the image.")); Digikam::ImageIface iface(0, 0); int w = iface.originalWidth(); @@ -143,14 +143,14 @@ ImageEffect_Border::ImageEffect_Border(QWidget* parent) else m_borderWidth->setRange(1, w/2, 1, true); - KSeparator *line2 = new KSeparator(Horizontal, gboxSettings); + KSeparator *line2 = new KSeparatorQt::Horizontal, gboxSettings); // ------------------------------------------------------------------- - m_labelForeground = new QLabel(gboxSettings); - m_firstColorButton = new KColorButton( QColor::QColor( 192, 192, 192 ), gboxSettings ); - m_labelBackground = new QLabel(gboxSettings); - m_secondColorButton = new KColorButton( QColor::QColor( 128, 128, 128 ), gboxSettings ); + m_labelForeground = new TQLabel(gboxSettings); + m_firstColorButton = new KColorButton( TQColor::TQColor( 192, 192, 192 ), gboxSettings ); + m_labelBackground = new TQLabel(gboxSettings); + m_secondColorButton = new KColorButton( TQColor::TQColor( 128, 128, 128 ), gboxSettings ); // ------------------------------------------------------------------- @@ -172,23 +172,23 @@ ImageEffect_Border::ImageEffect_Border(QWidget* parent) // ------------------------------------------------------------- - connect(m_preserveAspectRatio, SIGNAL(toggled(bool)), - this, SLOT(slotPreserveAspectRatioToggled(bool))); + connect(m_preserveAspectRatio, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPreserveAspectRatioToggled(bool))); - connect(m_borderType, SIGNAL(activated(int)), - this, SLOT(slotBorderTypeChanged(int))); + connect(m_borderType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotBorderTypeChanged(int))); - connect(m_borderPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_borderPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_borderWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_borderWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_firstColorButton, SIGNAL(changed(const QColor &)), - this, SLOT(slotColorForegroundChanged(const QColor &))); + connect(m_firstColorButton, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(slotColorForegroundChanged(const TQColor &))); - connect(m_secondColorButton, SIGNAL(changed(const QColor &)), - this, SLOT(slotColorBackgroundChanged(const QColor &))); + connect(m_secondColorButton, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(slotColorBackgroundChanged(const TQColor &))); } ImageEffect_Border::~ImageEffect_Border() @@ -212,10 +212,10 @@ void ImageEffect_Border::readUserSettings(void) m_borderWidth->setValue(config->readNumEntry("Border Width", 100) ); m_preserveAspectRatio->setChecked(config->readBoolEntry("Preserve Aspect Ratio", true) ); - QColor black(0, 0, 0); - QColor white(255, 255, 255); - QColor gray1(192, 192, 192); - QColor gray2(128, 128, 128); + TQColor black(0, 0, 0); + TQColor white(255, 255, 255); + TQColor gray1(192, 192, 192); + TQColor gray2(128, 128, 128); m_solidColor = config->readColorEntry("Solid Color", &black); m_niepceBorderColor = config->readColorEntry("Niepce Border Color", &white); @@ -270,13 +270,13 @@ void ImageEffect_Border::resetValues() m_borderWidth->setValue(100); m_preserveAspectRatio->setChecked(true); - m_solidColor = QColor(0, 0, 0); - m_niepceBorderColor = QColor(255, 255, 255); - m_niepceLineColor = QColor(0, 0, 0); - m_bevelUpperLeftColor = QColor(192, 192, 192); - m_bevelLowerRightColor = QColor(128, 128, 128); - m_decorativeFirstColor = QColor(0, 0, 0); - m_decorativeSecondColor = QColor(0, 0, 0); + m_solidColor = TQColor(0, 0, 0); + m_niepceBorderColor = TQColor(255, 255, 255); + m_niepceLineColor = TQColor(0, 0, 0); + m_bevelUpperLeftColor = TQColor(192, 192, 192); + m_bevelLowerRightColor = TQColor(128, 128, 128); + m_decorativeFirstColor = TQColor(0, 0, 0); + m_decorativeSecondColor = TQColor(0, 0, 0); m_borderType->blockSignals(false); m_borderPercent->blockSignals(false); @@ -299,7 +299,7 @@ void ImageEffect_Border::renderingFinished() toggleBorderSlider(m_preserveAspectRatio->isChecked()); } -void ImageEffect_Border::slotColorForegroundChanged(const QColor &color) +void ImageEffect_Border::slotColorForegroundChanged(const TQColor &color) { switch (m_borderType->currentItem()) { @@ -338,7 +338,7 @@ void ImageEffect_Border::slotColorForegroundChanged(const QColor &color) slotEffect(); } -void ImageEffect_Border::slotColorBackgroundChanged(const QColor &color) +void ImageEffect_Border::slotColorBackgroundChanged(const TQColor &color) { switch (m_borderType->currentItem()) { @@ -381,8 +381,8 @@ void ImageEffect_Border::slotBorderTypeChanged(int borderType) { m_labelForeground->setText(i18n("First:")); m_labelBackground->setText(i18n("Second:")); - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the foreground color of the border.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the Background color of the border.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the foreground color of the border.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the Background color of the border.")); m_firstColorButton->setEnabled(true); m_secondColorButton->setEnabled(true); m_labelForeground->setEnabled(true); @@ -398,15 +398,15 @@ void ImageEffect_Border::slotBorderTypeChanged(int borderType) break; case Border::NiepceBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the main border.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the line.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the main border.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the line.")); m_firstColorButton->setColor( m_niepceBorderColor ); m_secondColorButton->setColor( m_niepceLineColor ); break; case Border::BeveledBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the upper left area.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the lower right area.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the upper left area.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the lower right area.")); m_firstColorButton->setColor( m_bevelUpperLeftColor ); m_secondColorButton->setColor( m_bevelLowerRightColor ); break; @@ -427,8 +427,8 @@ void ImageEffect_Border::slotBorderTypeChanged(int borderType) case Border::GraniteBorder: case Border::RockBorder: case Border::WallBorder: - QWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the first line.")); - QWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the second line.")); + TQWhatsThis::add( m_firstColorButton, i18n("<p>Set here the color of the first line.")); + TQWhatsThis::add( m_secondColorButton, i18n("<p>Set here the color of the second line.")); m_firstColorButton->setColor( m_decorativeFirstColor ); m_secondColorButton->setColor( m_decorativeSecondColor ); break; @@ -460,7 +460,7 @@ void ImageEffect_Border::prepareEffect() int borderType = m_borderType->currentItem(); float ratio = (float)w/(float)orgWidth; int borderWidth = (int)((float)m_borderWidth->value()*ratio); - QString border = getBorderPath( m_borderType->currentItem() ); + TQString border = getBorderPath( m_borderType->currentItem() ); if (m_preserveAspectRatio->isChecked()) { @@ -502,7 +502,7 @@ void ImageEffect_Border::prepareFinal() int borderType = m_borderType->currentItem(); int borderWidth = m_borderWidth->value(); float borderRatio = m_borderPercent->value()/100.0; - QString border = getBorderPath( m_borderType->currentItem() ); + TQString border = getBorderPath( m_borderType->currentItem() ); Digikam::ImageIface iface(0, 0); int orgWidth = iface.originalWidth(); @@ -547,7 +547,7 @@ void ImageEffect_Border::putPreviewData(void) int w = iface->previewWidth(); int h = iface->previewHeight(); - Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); Digikam::DImg imDest( w, h, m_threadedFilter->getTargetImage().sixteenBit(), m_threadedFilter->getTargetImage().hasAlpha() ); @@ -570,9 +570,9 @@ void ImageEffect_Border::putFinalData(void) targetImage.width(), targetImage.height()); } -QString ImageEffect_Border::getBorderPath(int border) +TQString ImageEffect_Border::getBorderPath(int border) { - QString pattern; + TQString pattern; switch (border) { @@ -641,7 +641,7 @@ QString ImageEffect_Border::getBorderPath(int border) break; default: - return QString(); + return TQString(); } KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + diff --git a/digikam/imageplugins/border/imageeffect_border.h b/digikam/imageplugins/border/imageeffect_border.h index aae18d6..19c9529 100644 --- a/digikam/imageplugins/border/imageeffect_border.h +++ b/digikam/imageplugins/border/imageeffect_border.h @@ -26,18 +26,18 @@ #ifndef IMAGEEFFECT_BORDER_H #define IMAGEEFFECT_BORDER_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "imageguidedlg.h" -class QComboBox; -class QLabel; -class QCheckBox; -class QColor; +class TQComboBox; +class TQLabel; +class TQCheckBox; +class TQColor; class KIntNumInput; class KColorButton; @@ -48,22 +48,23 @@ namespace DigikamBorderImagesPlugin class ImageEffect_Border : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Border(QWidget *parent); + ImageEffect_Border(TQWidget *tqparent); ~ImageEffect_Border(); private: - QString getBorderPath(int border); + TQString getBorderPath(int border); private slots: void slotPreserveAspectRatioToggled(bool); void slotBorderTypeChanged(int borderType); - void slotColorForegroundChanged(const QColor &color); - void slotColorBackgroundChanged(const QColor &color); + void slotColorForegroundChanged(const TQColor &color); + void slotColorBackgroundChanged(const TQColor &color); void readUserSettings(); private: @@ -79,22 +80,22 @@ private: private: - QLabel *m_labelBorderPercent; - QLabel *m_labelBorderWidth; - QLabel *m_labelForeground; - QLabel *m_labelBackground; + TQLabel *m_labelBorderPercent; + TQLabel *m_labelBorderWidth; + TQLabel *m_labelForeground; + TQLabel *m_labelBackground; - QComboBox *m_borderType; + TQComboBox *m_borderType; - QCheckBox *m_preserveAspectRatio; + TQCheckBox *m_preserveAspectRatio; - QColor m_solidColor; - QColor m_niepceBorderColor; - QColor m_niepceLineColor; - QColor m_bevelUpperLeftColor; - QColor m_bevelLowerRightColor; - QColor m_decorativeFirstColor; - QColor m_decorativeSecondColor; + TQColor m_solidColor; + TQColor m_niepceBorderColor; + TQColor m_niepceLineColor; + TQColor m_bevelUpperLeftColor; + TQColor m_bevelLowerRightColor; + TQColor m_decorativeFirstColor; + TQColor m_decorativeSecondColor; KIntNumInput *m_borderPercent; KIntNumInput *m_borderWidth; diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp index 9f59632..1d0f2e9 100644 --- a/digikam/imageplugins/border/imageplugin_border.cpp +++ b/digikam/imageplugins/border/imageplugin_border.cpp @@ -42,12 +42,12 @@ using namespace DigikamBorderImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_border, KGenericFactory<ImagePlugin_Border>("digikamimageplugin_border")); -ImagePlugin_Border::ImagePlugin_Border(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Border") +ImagePlugin_Border::ImagePlugin_Border(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Border") { m_borderAction = new KAction(i18n("Add Border..."), "bordertool", 0, - this, SLOT(slotBorder()), + this, TQT_SLOT(slotBorder()), actionCollection(), "imageplugin_border"); setXMLFile("digikamimageplugin_border_ui.rc"); diff --git a/digikam/imageplugins/border/imageplugin_border.h b/digikam/imageplugins/border/imageplugin_border.h index cf58244..567b3de 100644 --- a/digikam/imageplugins/border/imageplugin_border.h +++ b/digikam/imageplugins/border/imageplugin_border.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Border : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Border(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Border(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Border(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index 4c2d100..ca85b30 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -33,26 +33,26 @@ #include <cstdlib> #include <cerrno> -// Qt includes. - -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qvbox.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qcheckbox.h> -#include <qfile.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqtooltip.h> // KDE includes. @@ -88,8 +88,8 @@ namespace DigikamChannelMixerImagesPlugin { -ChannelMixerDialog::ChannelMixerDialog(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Color Channel Mixer"), +ChannelMixerDialog::ChannelMixerDialog(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Color Channel Mixer"), "channelmixer", true, false) { m_destinationPreviewData = 0L; @@ -120,47 +120,47 @@ ChannelMixerDialog::ChannelMixerDialog(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* grid = new QGridLayout( gboxSettings, 9, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* grid = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->setCurrentText( i18n("Red") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the color channel to mix here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the color channel to mix here:<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -170,40 +170,40 @@ ChannelMixerDialog::ChannelMixerDialog(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "mixer settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); grid->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - QLabel *redLabel = new QLabel(i18n("Red:"), gboxSettings); + TQLabel *redLabel = new TQLabel(i18n("Red:"), gboxSettings); m_redGain = new KDoubleNumInput(gboxSettings); m_redGain->setPrecision(0); m_redGain->setRange(-200.0, 200.0, 1, true); - QWhatsThis::add( m_redGain, i18n("<p>Select the red color gain in percent for the current channel here.")); + TQWhatsThis::add( m_redGain, i18n("<p>Select the red color gain in percent for the current channel here.")); - QLabel *blueLabel = new QLabel(i18n("Blue:"), gboxSettings); + TQLabel *blueLabel = new TQLabel(i18n("Blue:"), gboxSettings); m_greenGain = new KDoubleNumInput(gboxSettings); m_greenGain->setPrecision(0); m_greenGain->setRange(-200.0, 200.0, 1, true); - QWhatsThis::add( m_greenGain, i18n("<p>Select the green color gain in percent for the current channel here.")); + TQWhatsThis::add( m_greenGain, i18n("<p>Select the green color gain in percent for the current channel here.")); - QLabel *greenLabel = new QLabel(i18n("Green:"), gboxSettings); + TQLabel *greenLabel = new TQLabel(i18n("Green:"), gboxSettings); m_blueGain = new KDoubleNumInput(gboxSettings); m_blueGain->setPrecision(0); m_blueGain->setRange(-200.0, 200.0, 1, true); - QWhatsThis::add( m_blueGain, i18n("<p>Select the blue color gain in percent for the current channel here.")); + TQWhatsThis::add( m_blueGain, i18n("<p>Select the blue color gain in percent for the current channel here.")); - m_resetButton = new QPushButton(i18n("&Reset"), gboxSettings); - QWhatsThis::add( m_resetButton, i18n("Reset color channels' gains settings from the currently selected channel.")); + m_resetButton = new TQPushButton(i18n("&Reset"), gboxSettings); + TQWhatsThis::add( m_resetButton, i18n("Reset color channels' gains settings from the currently selected channel.")); grid->addMultiCellWidget(redLabel, 3, 3, 0, 0); grid->addMultiCellWidget(greenLabel, 4, 4, 0, 0); @@ -215,12 +215,12 @@ ChannelMixerDialog::ChannelMixerDialog(QWidget* parent) // ------------------------------------------------------------- - m_monochrome = new QCheckBox( i18n("Monochrome"), gboxSettings); - QWhatsThis::add( m_monochrome, i18n("<p>Enable this option if you want the image rendered in monochrome mode. " + m_monochrome = new TQCheckBox( i18n("Monochrome"), gboxSettings); + TQWhatsThis::add( m_monochrome, i18n("<p>Enable this option if you want the image rendered in monochrome mode. " "In this mode, the histogram will display only luminosity values.")); - m_preserveLuminosity = new QCheckBox( i18n("Preserve luminosity"), gboxSettings); - QWhatsThis::add( m_preserveLuminosity, i18n("<p>Enable this option is you want preserve the image luminosity.")); + m_preserveLuminosity = new TQCheckBox( i18n("Preserve luminosity"), gboxSettings); + TQWhatsThis::add( m_preserveLuminosity, i18n("<p>Enable this option is you want preserve the image luminosity.")); grid->addMultiCellWidget(m_monochrome, 7, 7, 0, 4); grid->addMultiCellWidget(m_preserveLuminosity, 8, 8, 0, 4); @@ -231,41 +231,41 @@ ChannelMixerDialog::ChannelMixerDialog(QWidget* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Gains settings slots. - connect(m_redGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_redGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_greenGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_greenGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_blueGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_blueGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_preserveLuminosity, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_preserveLuminosity, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_monochrome, SIGNAL(toggled (bool)), - this, SLOT(slotMonochromeActived(bool))); + connect(m_monochrome, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotMonochromeActived(bool))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); } ChannelMixerDialog::~ChannelMixerDialog() @@ -490,29 +490,29 @@ void ChannelMixerDialog::slotChannelChanged(int channel) { case GreenChannelGains: // Green. m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannelGains: // Blue. m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; default: // Red or monochrome. if ( m_monochrome->isChecked() ) { m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); } else { m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); } break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); adjustSliders(); slotEffect(); } @@ -520,7 +520,7 @@ void ChannelMixerDialog::slotChannelChanged(int channel) void ChannelMixerDialog::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ChannelMixerDialog::readUserSettings() @@ -627,12 +627,12 @@ void ChannelMixerDialog::slotUser3() bool monochrome; loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Select Gimp Gains Mixer File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) return; - fp = fopen(QFile::encodeName(loadGainsFileUrl.path()), "r"); + fp = fopen(TQFile::encodeName(loadGainsFileUrl.path()), "r"); if ( fp ) { @@ -712,12 +712,12 @@ void ChannelMixerDialog::slotUser2() FILE *fp = 0L; saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Gimp Gains Mixer File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) return; - fp = fopen(QFile::encodeName(saveGainsFileUrl.path()), "w"); + fp = fopen(TQFile::encodeName(saveGainsFileUrl.path()), "w"); if ( fp ) { diff --git a/digikam/imageplugins/channelmixer/channelmixer.h b/digikam/imageplugins/channelmixer/channelmixer.h index a3f985f..fe863ee 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.h +++ b/digikam/imageplugins/channelmixer/channelmixer.h @@ -28,10 +28,10 @@ #include "imagedlgbase.h" -class QCheckBox; -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQCheckBox; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; class KDoubleNumInput; @@ -49,10 +49,11 @@ namespace DigikamChannelMixerImagesPlugin class ChannelMixerDialog : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ChannelMixerDialog(QWidget *parent); + ChannelMixerDialog(TQWidget *tqparent); ~ChannelMixerDialog(); private: @@ -107,18 +108,18 @@ private: double m_blackGreenGain; double m_blackBlueGain; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDoubleNumInput *m_redGain; KDoubleNumInput *m_greenGain; KDoubleNumInput *m_blueGain; - QPushButton *m_resetButton; + TQPushButton *m_resetButton; - QCheckBox *m_preserveLuminosity; - QCheckBox *m_monochrome; + TQCheckBox *m_preserveLuminosity; + TQCheckBox *m_monochrome; Digikam::ColorGradientWidget *m_hGradient; diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index b78b554..845b93a 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -29,26 +29,26 @@ #include <cstdlib> #include <cerrno> -// Qt includes. - -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -91,8 +91,8 @@ using namespace Digikam; namespace DigikamChannelMixerImagesPlugin { -ChannelMixerTool::ChannelMixerTool(QObject* parent) - : EditorTool(parent) +ChannelMixerTool::ChannelMixerTool(TQObject* tqparent) + : EditorTool(tqparent) { m_destinationPreviewData = 0; @@ -115,46 +115,46 @@ ChannelMixerTool::ChannelMixerTool(QObject* parent) EditorToolSettings::SaveAs| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 9, 4); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, m_gboxSettings->plainPage() ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); m_channelCB->setCurrentText( i18n("Red") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the color channel to mix here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the color channel to mix here:<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -162,50 +162,50 @@ ChannelMixerTool::ChannelMixerTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "mixer settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); // ------------------------------------------------------------- - QLabel *redLabel = new QLabel(i18n("Red:"), m_gboxSettings->plainPage()); + TQLabel *redLabel = new TQLabel(i18n("Red:"), m_gboxSettings->plainPage()); m_redGain = new RDoubleNumInput(m_gboxSettings->plainPage()); m_redGain->setPrecision(0); m_redGain->setRange(-200.0, 200.0, 1); m_redGain->setDefaultValue(0); - QWhatsThis::add( m_redGain, i18n("<p>Select the red color gain in percent for the current channel here.")); + TQWhatsThis::add( m_redGain, i18n("<p>Select the red color gain in percent for the current channel here.")); - QLabel *blueLabel = new QLabel(i18n("Blue:"), m_gboxSettings->plainPage()); + TQLabel *blueLabel = new TQLabel(i18n("Blue:"), m_gboxSettings->plainPage()); m_greenGain = new RDoubleNumInput(m_gboxSettings->plainPage()); m_greenGain->setPrecision(0); m_greenGain->setRange(-200.0, 200.0, 1); m_greenGain->setDefaultValue(0); - QWhatsThis::add( m_greenGain, i18n("<p>Select the green color gain in percent for the current channel here.")); + TQWhatsThis::add( m_greenGain, i18n("<p>Select the green color gain in percent for the current channel here.")); - QLabel *greenLabel = new QLabel(i18n("Green:"), m_gboxSettings->plainPage()); + TQLabel *greenLabel = new TQLabel(i18n("Green:"), m_gboxSettings->plainPage()); m_blueGain = new RDoubleNumInput(m_gboxSettings->plainPage()); m_blueGain->setPrecision(0); m_blueGain->setRange(-200.0, 200.0, 1); m_blueGain->setDefaultValue(0); - QWhatsThis::add( m_blueGain, i18n("<p>Select the blue color gain in percent for the current channel here.")); + TQWhatsThis::add( m_blueGain, i18n("<p>Select the blue color gain in percent for the current channel here.")); - m_resetButton = new QPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); - QWhatsThis::add( m_resetButton, i18n("Reset color channels' gains settings from the currently selected channel.")); + m_resetButton = new TQPushButton(i18n("&Reset"), m_gboxSettings->plainPage()); + TQWhatsThis::add( m_resetButton, i18n("Reset color channels' gains settings from the currently selected channel.")); // ------------------------------------------------------------- - m_monochrome = new QCheckBox( i18n("Monochrome"), m_gboxSettings->plainPage()); - QWhatsThis::add( m_monochrome, i18n("<p>Enable this option if you want the image rendered in monochrome mode. " + m_monochrome = new TQCheckBox( i18n("Monochrome"), m_gboxSettings->plainPage()); + TQWhatsThis::add( m_monochrome, i18n("<p>Enable this option if you want the image rendered in monochrome mode. " "In this mode, the histogram will display only luminosity values.")); - m_preserveLuminosity = new QCheckBox( i18n("Preserve luminosity"), m_gboxSettings->plainPage()); - QWhatsThis::add( m_preserveLuminosity, i18n("<p>Enable this option is you want preserve the image luminosity.")); + m_preserveLuminosity = new TQCheckBox( i18n("Preserve luminosity"), m_gboxSettings->plainPage()); + TQWhatsThis::add( m_preserveLuminosity, i18n("<p>Enable this option is you want preserve the image luminosity.")); grid->addMultiCellLayout(l1, 0, 0, 0, 4); grid->addMultiCellWidget(histoBox, 1, 2, 0, 4); @@ -228,41 +228,41 @@ ChannelMixerTool::ChannelMixerTool(QObject* parent) // ------------------------------------------------------------- // Channels and scale selection slots. - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Gains settings slots. - connect(m_redGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_redGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_greenGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_greenGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_blueGain, SIGNAL(valueChanged(double)), - this, SLOT(slotGainsChanged())); + connect(m_blueGain, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotGainsChanged())); - connect(m_preserveLuminosity, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_preserveLuminosity, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_monochrome, SIGNAL(toggled (bool)), - this, SLOT(slotMonochromeActived(bool))); + connect(m_monochrome, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotMonochromeActived(bool))); // ------------------------------------------------------------- // Bouttons slots. - connect(m_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetCurrentChannel())); + connect(m_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurrentChannel())); } ChannelMixerTool::~ChannelMixerTool() @@ -482,29 +482,29 @@ void ChannelMixerTool::slotChannelChanged(int channel) { case GreenChannelGains: // Green. m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannelGains: // Blue. m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; default: // Red or monochrome. if ( m_monochrome->isChecked() ) { m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); } else { m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); } break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); adjustSliders(); slotEffect(); } @@ -512,7 +512,7 @@ void ChannelMixerTool::slotChannelChanged(int channel) void ChannelMixerTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ChannelMixerTool::readSettings() @@ -619,12 +619,12 @@ void ChannelMixerTool::slotLoadSettings() bool monochrome; loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Select Gimp Gains Mixer File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) return; - fp = fopen(QFile::encodeName(loadGainsFileUrl.path()), "r"); + fp = fopen(TQFile::encodeName(loadGainsFileUrl.path()), "r"); if ( fp ) { @@ -703,12 +703,12 @@ void ChannelMixerTool::slotSaveAsSettings() FILE *fp = 0L; saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Gimp Gains Mixer File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) return; - fp = fopen(QFile::encodeName(saveGainsFileUrl.path()), "w"); + fp = fopen(TQFile::encodeName(saveGainsFileUrl.path()), "w"); if ( fp ) { diff --git a/digikam/imageplugins/channelmixer/channelmixertool.h b/digikam/imageplugins/channelmixer/channelmixertool.h index 588b3b0..213f168 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.h +++ b/digikam/imageplugins/channelmixer/channelmixertool.h @@ -28,10 +28,10 @@ #include "editortool.h" -class QCheckBox; -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQCheckBox; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; namespace KDcrawIface { @@ -52,10 +52,11 @@ namespace DigikamChannelMixerImagesPlugin class ChannelMixerTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - ChannelMixerTool(QObject *parent); + ChannelMixerTool(TQObject *tqparent); ~ChannelMixerTool(); private: @@ -110,18 +111,18 @@ private: double m_blackGreenGain; double m_blackBlueGain; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDcrawIface::RDoubleNumInput *m_redGain; KDcrawIface::RDoubleNumInput *m_greenGain; KDcrawIface::RDoubleNumInput *m_blueGain; - QPushButton *m_resetButton; + TQPushButton *m_resetButton; - QCheckBox *m_preserveLuminosity; - QCheckBox *m_monochrome; + TQCheckBox *m_preserveLuminosity; + TQCheckBox *m_monochrome; Digikam::ColorGradientWidget *m_hGradient; diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp index a454221..f109d70 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp @@ -41,13 +41,13 @@ using namespace DigikamChannelMixerImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_channelmixer, KGenericFactory<ImagePlugin_ChannelMixer>("digikamimageplugin_channelmixer")) -ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(QObject *parent, const char*, - const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_ChannelMixer") +ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *tqparent, const char*, + const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_ChannelMixer") { m_channelMixerAction = new KAction(i18n("Channel Mixer..."), "channelmixer", CTRL+Key_H, - this, SLOT(slotChannelMixer()), + this, TQT_SLOT(slotChannelMixer()), actionCollection(), "imageplugin_channelmixer"); setXMLFile("digikamimageplugin_channelmixer_ui.rc"); diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h index f4f6834..a717084 100644 --- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h +++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_ChannelMixer(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_ChannelMixer(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_ChannelMixer(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/charcoal/charcoal.cpp b/digikam/imageplugins/charcoal/charcoal.cpp index 2ac3b6a..9c271fd 100644 --- a/digikam/imageplugins/charcoal/charcoal.cpp +++ b/digikam/imageplugins/charcoal/charcoal.cpp @@ -42,8 +42,8 @@ namespace DigikamCharcoalImagesPlugin { -Charcoal::Charcoal(Digikam::DImg *orgImage, QObject *parent, double pencil, double smooth) - : Digikam::DImgThreadedFilter(orgImage, parent, "Charcoal") +Charcoal::Charcoal(Digikam::DImg *orgImage, TQObject *tqparent, double pencil, double smooth) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Charcoal") { m_pencil = pencil; m_smooth = smooth; diff --git a/digikam/imageplugins/charcoal/charcoal.h b/digikam/imageplugins/charcoal/charcoal.h index 38a7b15..8139b60 100644 --- a/digikam/imageplugins/charcoal/charcoal.h +++ b/digikam/imageplugins/charcoal/charcoal.h @@ -36,7 +36,7 @@ class Charcoal : public Digikam::DImgThreadedFilter public: - Charcoal(Digikam::DImg *orgImage, QObject *parent=0, double pencil=5.0, double smooth=10.0); + Charcoal(Digikam::DImg *orgImage, TQObject *tqparent=0, double pencil=5.0, double smooth=10.0); ~Charcoal(){}; private: diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp index 7e4bc0d..a9d77ff 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.cpp +++ b/digikam/imageplugins/charcoal/charcoaltool.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> // KDE includes. @@ -59,8 +59,8 @@ using namespace Digikam; namespace DigikamCharcoalImagesPlugin { -CharcoalTool::CharcoalTool(QObject* parent) - : EditorToolThreaded(parent) +CharcoalTool::CharcoalTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("charcoal"); setToolName(i18n("Charcoal")); @@ -73,22 +73,22 @@ CharcoalTool::CharcoalTool(QObject* parent) EditorToolSettings::Cancel| EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 4, 1); - QLabel *label1 = new QLabel(i18n("Pencil size:"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 4, 1); + TQLabel *label1 = new TQLabel(i18n("Pencil size:"), m_gboxSettings->plainPage()); m_pencilInput = new RIntNumInput(m_gboxSettings->plainPage()); m_pencilInput->setRange(1, 100, 1); m_pencilInput->setDefaultValue(5); - QWhatsThis::add( m_pencilInput, i18n("<p>Set here the charcoal pencil size used to simulate the drawing.")); + TQWhatsThis::add( m_pencilInput, i18n("<p>Set here the charcoal pencil size used to simulate the drawing.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Smooth:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Smooth:"), m_gboxSettings->plainPage()); m_smoothInput = new RIntNumInput(m_gboxSettings->plainPage()); m_smoothInput->setRange(1, 100, 1); m_smoothInput->setDefaultValue(10); - QWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect of the pencil " + TQWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect of the pencil " "under the canvas.")); grid->addMultiCellWidget(label1, 0, 0, 0, 1); @@ -110,11 +110,11 @@ CharcoalTool::CharcoalTool(QObject* parent) // ------------------------------------------------------------- - connect(m_pencilInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_pencilInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_smoothInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_smoothInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } CharcoalTool::~CharcoalTool() diff --git a/digikam/imageplugins/charcoal/charcoaltool.h b/digikam/imageplugins/charcoal/charcoaltool.h index f58b63e..3accf24 100644 --- a/digikam/imageplugins/charcoal/charcoaltool.h +++ b/digikam/imageplugins/charcoal/charcoaltool.h @@ -46,10 +46,11 @@ namespace DigikamCharcoalImagesPlugin class CharcoalTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - CharcoalTool(QObject* parent); + CharcoalTool(TQObject* tqparent); ~CharcoalTool(); private slots: diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp index ef9258a..475e726 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> // KDE includes. @@ -52,12 +52,12 @@ namespace DigikamCharcoalImagesPlugin { -ImageEffect_Charcoal::ImageEffect_Charcoal(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Charcoal Drawing"), +ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Charcoal Drawing"), "charcoal", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Charcoal Drawing"), @@ -75,26 +75,26 @@ ImageEffect_Charcoal::ImageEffect_Charcoal(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 3, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Pencil size:"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 3, 1, 0, spacingHint()); + TQLabel *label1 = new TQLabel(i18n("Pencil size:"), gboxSettings); m_pencilInput = new KIntNumInput(gboxSettings); m_pencilInput->setRange(1, 100, 1, true); m_pencilInput->setValue(5); - QWhatsThis::add( m_pencilInput, i18n("<p>Set here the charcoal pencil size used to simulate the drawing.")); + TQWhatsThis::add( m_pencilInput, i18n("<p>Set here the charcoal pencil size used to simulate the drawing.")); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); gridSettings->addMultiCellWidget(m_pencilInput, 1, 1, 0, 1); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Smooth:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Smooth:"), gboxSettings); m_smoothInput = new KIntNumInput(gboxSettings); m_smoothInput->setRange(1, 100, 1, true); m_smoothInput->setValue(10); - QWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect of the pencil " + TQWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect of the pencil " "under the canvas.")); gridSettings->addMultiCellWidget(label2, 2, 2, 0, 1); @@ -104,11 +104,11 @@ ImageEffect_Charcoal::ImageEffect_Charcoal(QWidget* parent) // ------------------------------------------------------------- - connect(m_pencilInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_pencilInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_smoothInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_smoothInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_Charcoal::~ImageEffect_Charcoal() diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.h b/digikam/imageplugins/charcoal/imageeffect_charcoal.h index 7ca35c9..473120f 100644 --- a/digikam/imageplugins/charcoal/imageeffect_charcoal.h +++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.h @@ -37,10 +37,11 @@ namespace DigikamCharcoalImagesPlugin class ImageEffect_Charcoal : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Charcoal(QWidget* parent); + ImageEffect_Charcoal(TQWidget* tqparent); ~ImageEffect_Charcoal(); private slots: diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp index a835dc1..5e0514c 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp @@ -43,12 +43,12 @@ using namespace DigikamCharcoalImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_charcoal, KGenericFactory<ImagePlugin_Charcoal>("digikamimageplugin_charcoal")); -ImagePlugin_Charcoal::ImagePlugin_Charcoal(QObject *parent, const char*, - const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Charcoal") +ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *tqparent, const char*, + const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Charcoal") { m_charcoalAction = new KAction(i18n("Charcoal Drawing..."), "charcoaltool", 0, - this, SLOT(slotCharcoal()), + this, TQT_SLOT(slotCharcoal()), actionCollection(), "imageplugin_charcoal"); setXMLFile( "digikamimageplugin_charcoal_ui.rc" ); diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.h b/digikam/imageplugins/charcoal/imageplugin_charcoal.h index 65a7ee5..d799943 100644 --- a/digikam/imageplugins/charcoal/imageplugin_charcoal.h +++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Charcoal : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Charcoal(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Charcoal(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Charcoal(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index f7bd546..a0f81f3 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -23,19 +23,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qcombobox.h> -#include <qframe.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -76,8 +76,8 @@ using namespace Digikam; namespace DigikamColorFXImagesPlugin { -ColorFXTool::ColorFXTool(QObject* parent) - : EditorTool(parent) +ColorFXTool::ColorFXTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("coloreffects"); setToolName(i18n("Color Effects")); @@ -98,47 +98,47 @@ ColorFXTool::ColorFXTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(gboxSettings->plainPage(), 9, 4); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 9, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -146,19 +146,19 @@ ColorFXTool::ColorFXTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); // ------------------------------------------------------------- - m_effectTypeLabel = new QLabel(i18n("Type:"), gboxSettings->plainPage()); + m_effectTypeLabel = new TQLabel(i18n("Type:"), gboxSettings->plainPage()); m_effectType = new RComboBox(gboxSettings->plainPage()); m_effectType->insertItem(i18n("Solarize")); @@ -166,7 +166,7 @@ ColorFXTool::ColorFXTool(QObject* parent) m_effectType->insertItem(i18n("Neon")); m_effectType->insertItem(i18n("Find Edges")); m_effectType->setDefaultItem(Solarize); - QWhatsThis::add( m_effectType, i18n("<p>Select the effect type to apply to the image here.<p>" + TQWhatsThis::add( m_effectType, i18n("<p>Select the effect type to apply to the image here.<p>" "<b>Solarize</b>: simulates solarization of photograph.<p>" "<b>Vivid</b>: simulates the Velvia(tm) slide film colors.<p>" "<b>Neon</b>: coloring the edges in a photograph to " @@ -175,17 +175,17 @@ ColorFXTool::ColorFXTool(QObject* parent) "and their strength." )); - m_levelLabel = new QLabel(i18n("Level:"), gboxSettings->plainPage()); + m_levelLabel = new TQLabel(i18n("Level:"), gboxSettings->plainPage()); m_levelInput = new RIntNumInput(gboxSettings->plainPage()); m_levelInput->setRange(0, 100, 1); m_levelInput->setDefaultValue(0); - QWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); - m_iterationLabel = new QLabel(i18n("Iteration:"), gboxSettings->plainPage()); + m_iterationLabel = new TQLabel(i18n("Iteration:"), gboxSettings->plainPage()); m_iterationInput = new RIntNumInput(gboxSettings->plainPage()); m_iterationInput->setRange(0, 100, 1); m_iterationInput->setDefaultValue(0); - QWhatsThis::add( m_iterationInput, i18n("<p>This value controls the number of iterations " + TQWhatsThis::add( m_iterationInput, i18n("<p>This value controls the number of iterations " "to use with the Neon and Find Edges effects.")); gridSettings->addMultiCellLayout(l1, 0, 0, 0, 4); @@ -203,26 +203,26 @@ ColorFXTool::ColorFXTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const DColor & ))); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_iterationInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); } ColorFXTool::~ColorFXTool() @@ -281,32 +281,32 @@ void ColorFXTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ColorFXTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ColorFXTool::slotColorSelectedFromTarget(const DColor &color) @@ -396,7 +396,7 @@ void ColorFXTool::finalRendering() if (data) { colorEffect(data, w, h, sb); - QString name; + TQString name; switch (m_effectType->currentItem()) { @@ -453,7 +453,7 @@ void ColorFXTool::solarize(int factor, uchar *data, int w, int h, bool sb) if (!sb) // 8 bits image. { uint threshold = (uint)((100-factor)*(255+1)/100); - threshold = QMAX(1, threshold); + threshold = TQMAX(1, threshold); uchar *ptr = data; uchar a, r, g, b; @@ -491,7 +491,7 @@ void ColorFXTool::solarize(int factor, uchar *data, int w, int h, bool sb) else // 16 bits image. { uint threshold = (uint)((100-factor)*(65535+1)/100); - threshold = QMAX(1, threshold); + threshold = TQMAX(1, threshold); unsigned short *ptr = (unsigned short *)data; unsigned short a, r, g, b; @@ -555,17 +555,17 @@ void ColorFXTool::vivid(int factor, uchar *data, int w, int h, bool sb) if (!sb) // 8 bits image. { - Curves.setCurvePoint(ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 5, QPoint(63, 60)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 10, QPoint(191, 194)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 16, QPoint(255, 255)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 5, TQPoint(63, 60)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 10, TQPoint(191, 194)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 16, TQPoint(255, 255)); } else // 16 bits image. { - Curves.setCurvePoint(ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 5, QPoint(16128, 15360)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 10, QPoint(48896, 49664)); - Curves.setCurvePoint(ImageHistogram::ValueChannel, 16, QPoint(65535, 65535)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 5, TQPoint(16128, 15360)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 10, TQPoint(48896, 49664)); + Curves.setCurvePoint(ImageHistogram::ValueChannel, 16, TQPoint(65535, 65535)); } Curves.curvesCalculateCurve(ImageHistogram::AlphaChannel); // Calculate cure on all channels. diff --git a/digikam/imageplugins/colorfx/colorfxtool.h b/digikam/imageplugins/colorfx/colorfxtool.h index 75f1403..4feeba6 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.h +++ b/digikam/imageplugins/colorfx/colorfxtool.h @@ -30,9 +30,9 @@ #include "editortool.h" -class QHButtonGroup; -class QComboBox; -class QLabel; +class TQHButtonGroup; +class TQComboBox; +class TQLabel; namespace KDcrawIface { @@ -54,10 +54,11 @@ namespace DigikamColorFXImagesPlugin class ColorFXTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - ColorFXTool(QObject *parent); + ColorFXTool(TQObject *tqparent); ~ColorFXTool(); private: @@ -110,13 +111,13 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QLabel *m_effectTypeLabel; - QLabel *m_levelLabel; - QLabel *m_iterationLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_levelLabel; + TQLabel *m_iterationLabel; KDcrawIface::RIntNumInput *m_levelInput; KDcrawIface::RIntNumInput *m_iterationInput; diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 546a50a..59637c3 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -23,19 +23,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qvgroupbox.h> -#include <qhgroupbox.h> -#include <qhbuttongroup.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qvbox.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqhgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqvbox.h> +#include <tqtooltip.h> // KDE includes. @@ -68,8 +68,8 @@ namespace DigikamColorFXImagesPlugin { -ImageEffect_ColorFX::ImageEffect_ColorFX(QWidget* parent) - : Digikam::ImageDlgBase(parent, +ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Apply Color Special Effects to Photograph"), "coloreffect", false, false) { @@ -103,48 +103,48 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 9, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -154,28 +154,28 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - m_effectTypeLabel = new QLabel(i18n("Type:"), gboxSettings); + m_effectTypeLabel = new TQLabel(i18n("Type:"), gboxSettings); - m_effectType = new QComboBox( false, gboxSettings ); + m_effectType = new TQComboBox( false, gboxSettings ); m_effectType->insertItem( i18n("Solarize") ); m_effectType->insertItem( i18n("Vivid") ); m_effectType->insertItem( i18n("Neon") ); m_effectType->insertItem( i18n("Find Edges") ); - QWhatsThis::add( m_effectType, i18n("<p>Select the effect type to apply to the image here.<p>" + TQWhatsThis::add( m_effectType, i18n("<p>Select the effect type to apply to the image here.<p>" "<b>Solarize</b>: simulates solarization of photograph.<p>" "<b>Vivid</b>: simulates the Velvia(tm) slide film colors.<p>" "<b>Neon</b>: coloring the edges in a photograph to " @@ -186,18 +186,18 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(QWidget* parent) gridSettings->addMultiCellWidget(m_effectTypeLabel, 3, 3, 0, 4); gridSettings->addMultiCellWidget(m_effectType, 4, 4, 0, 4); - m_levelLabel = new QLabel(i18n("Level:"), gboxSettings); + m_levelLabel = new TQLabel(i18n("Level:"), gboxSettings); m_levelInput = new KIntNumInput(gboxSettings); m_levelInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); gridSettings->addMultiCellWidget(m_levelLabel, 5, 5, 0, 4); gridSettings->addMultiCellWidget(m_levelInput, 6, 6, 0, 4); - m_iterationLabel = new QLabel(i18n("Iteration:"), gboxSettings); + m_iterationLabel = new TQLabel(i18n("Iteration:"), gboxSettings); m_iterationInput = new KIntNumInput(gboxSettings); m_iterationInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_iterationInput, i18n("<p>This value controls the number of iterations " + TQWhatsThis::add( m_iterationInput, i18n("<p>This value controls the number of iterations " "to use with the Neon and Find Edges effects.")); gridSettings->addMultiCellWidget(m_iterationLabel, 7, 7, 0, 4); @@ -208,26 +208,26 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_iterationInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); } ImageEffect_ColorFX::~ImageEffect_ColorFX() @@ -271,32 +271,32 @@ void ImageEffect_ColorFX::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_ColorFX::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_ColorFX::slotColorSelectedFromTarget( const Digikam::DColor &color ) @@ -386,7 +386,7 @@ void ImageEffect_ColorFX::finalRendering() if (data) { colorEffect(data, w, h, sb); - QString name; + TQString name; switch (m_effectType->currentItem()) { @@ -444,7 +444,7 @@ void ImageEffect_ColorFX::solarize(int factor, uchar *data, int w, int h, bool s if (!sb) // 8 bits image. { uint threshold = (uint)((100-factor)*(255+1)/100); - threshold = QMAX(1, threshold); + threshold = TQMAX(1, threshold); uchar *ptr = data; uchar a, r, g, b; @@ -482,7 +482,7 @@ void ImageEffect_ColorFX::solarize(int factor, uchar *data, int w, int h, bool s else // 16 bits image. { uint threshold = (uint)((100-factor)*(65535+1)/100); - threshold = QMAX(1, threshold); + threshold = TQMAX(1, threshold); unsigned short *ptr = (unsigned short *)data; unsigned short a, r, g, b; @@ -546,17 +546,17 @@ void ImageEffect_ColorFX::vivid(int factor, uchar *data, int w, int h, bool sb) if (!sb) // 8 bits image. { - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 5, QPoint(63, 60)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 10, QPoint(191, 194)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(255, 255)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 5, TQPoint(63, 60)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 10, TQPoint(191, 194)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(255, 255)); } else // 16 bits image. { - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 5, QPoint(16128, 15360)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 10, QPoint(48896, 49664)); - Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(65535, 65535)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 5, TQPoint(16128, 15360)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 10, TQPoint(48896, 49664)); + Curves.setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(65535, 65535)); } Curves.curvesCalculateCurve(Digikam::ImageHistogram::AlphaChannel); // Calculate cure on all channels. diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.h b/digikam/imageplugins/colorfx/imageeffect_colorfx.h index 1541efa..3f83f82 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.h +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.h @@ -30,9 +30,9 @@ #include "imagedlgbase.h" -class QHButtonGroup; -class QComboBox; -class QLabel; +class TQHButtonGroup; +class TQComboBox; +class TQLabel; class KIntNumInput; @@ -50,10 +50,11 @@ namespace DigikamColorFXImagesPlugin class ImageEffect_ColorFX : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_ColorFX(QWidget *parent); + ImageEffect_ColorFX(TQWidget *tqparent); ~ImageEffect_ColorFX(); private: @@ -106,14 +107,14 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; - QComboBox *m_effectType; + TQComboBox *m_channelCB; + TQComboBox *m_effectType; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QLabel *m_effectTypeLabel; - QLabel *m_levelLabel; - QLabel *m_iterationLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_levelLabel; + TQLabel *m_iterationLabel; KIntNumInput *m_levelInput; KIntNumInput *m_iterationInput; diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp index 5ce598d..2e08181 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp @@ -44,11 +44,11 @@ using namespace DigikamColorFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_colorfx, KGenericFactory<ImagePlugin_ColorFX>("digikamimageplugin_colorfx")); -ImagePlugin_ColorFX::ImagePlugin_ColorFX(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX") +ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_ColorFX") { m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0, - this, SLOT(slotColorFX()), + this, TQT_SLOT(slotColorFX()), actionCollection(), "imageplugin_colorfx"); setXMLFile( "digikamimageplugin_colorfx_ui.rc" ); diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.h b/digikam/imageplugins/colorfx/imageplugin_colorfx.h index 8ce2e8f..8b4896d 100644 --- a/digikam/imageplugins/colorfx/imageplugin_colorfx.h +++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.h @@ -36,10 +36,11 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ColorFX : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_ColorFX(QObject *parent, const char* name, const QStringList &args); + ImagePlugin_ColorFX(TQObject *tqparent, const char* name, const TQStringList &args); ~ImagePlugin_ColorFX(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 736f524..252505f 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -21,25 +21,25 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -72,8 +72,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -AutoCorrectionTool::AutoCorrectionTool(QObject* parent) - : EditorTool(parent) +AutoCorrectionTool::AutoCorrectionTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("autocorrection"); setToolName(i18n("Auto-Correction")); @@ -91,54 +91,54 @@ AutoCorrectionTool::AutoCorrectionTool(QObject* parent) // ------------------------------------------------------------- ImageIface iface(0, 0); - m_thumbnailImage = iface.getOriginalImg()->smoothScale(128, 128, QSize::ScaleMin); + m_thumbnailImage = iface.getOriginalImg()->smoothScale(128, 128, TQSize::ScaleMin); m_destinationPreviewData = 0; EditorToolSettings *gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(gboxSettings->plainPage(), 2, 4); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 2, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings->plainPage() ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -146,25 +146,25 @@ AutoCorrectionTool::AutoCorrectionTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); // ------------------------------------------------------------- - m_correctionTools = new QListBox(gboxSettings->plainPage()); + m_correctionTools = new TQListBox(gboxSettings->plainPage()); m_correctionTools->setColumnMode(1); m_correctionTools->setVariableWidth(false); m_correctionTools->setVariableHeight(false); ListBoxWhatsThis* whatsThis = new ListBoxWhatsThis(m_correctionTools); - QPixmap pix = getThumbnailForEffect(AutoLevelsCorrection); + TQPixmap pix = getThumbnailForEffect(AutoLevelsCorrection); ListBoxPreviewItem *item = new ListBoxPreviewItem(pix, i18n("Auto Levels")); whatsThis->add( item, i18n("<b>Auto Levels</b>:" "<p>This option maximizes the tonal range in the Red, " @@ -229,20 +229,20 @@ AutoCorrectionTool::AutoCorrectionTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const DColor&))); - connect(m_correctionTools, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_correctionTools, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); } AutoCorrectionTool::~AutoCorrectionTool() @@ -257,32 +257,32 @@ void AutoCorrectionTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void AutoCorrectionTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color) @@ -349,7 +349,7 @@ void AutoCorrectionTool::slotEffect() kapp->restoreOverrideCursor(); } -QPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type) +TQPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type) { DImg thumb = m_thumbnailImage.copy(); autoCorrection(thumb.bits(), thumb.width(), thumb.height(), thumb.sixteenBit(), type); @@ -370,7 +370,7 @@ void AutoCorrectionTool::finalRendering() { int type = m_correctionTools->currentItem(); autoCorrection(data, w, h, sb, type); - QString name; + TQString name; switch (type) { diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.h b/digikam/imageplugins/coreplugin/autocorrectiontool.h index b9d1b44..60c9214 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.h +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.h @@ -24,18 +24,18 @@ #ifndef AUTOCORRECTIONTOOL_H #define AUTOCORRECTIONTOOL_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "editortool.h" -class QHButtonGroup; -class QComboBox; -class QListBox; -class QButtonGroup; +class TQHButtonGroup; +class TQComboBox; +class TQListBox; +class TQButtonGroup; namespace Digikam { @@ -52,10 +52,11 @@ namespace DigikamImagesPluginCore class AutoCorrectionTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - AutoCorrectionTool(QObject *parent); + AutoCorrectionTool(TQObject *tqparent); ~AutoCorrectionTool(); protected: @@ -87,7 +88,7 @@ private: void writeSettings(); void autoCorrection(uchar *data, int w, int h, bool sb, int type); - QPixmap getThumbnailForEffect(AutoCorrectionType type); + TQPixmap getThumbnailForEffect(AutoCorrectionType type); private: @@ -107,11 +108,11 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QListBox *m_correctionTools; + TQListBox *m_correctionTools; Digikam::ImageWidget *m_previewWidget; diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index a6fba7b..993bcde 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -23,22 +23,22 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -74,8 +74,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -BCGTool::BCGTool(QObject* parent) - : EditorTool(parent) +BCGTool::BCGTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("bcgadjust"); setToolName(i18n("Brightness / Contrast / Gamma")); @@ -97,47 +97,47 @@ BCGTool::BCGTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 9, 4); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 9, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -145,36 +145,36 @@ BCGTool::BCGTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Brightness:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Brightness:"), m_gboxSettings->plainPage()); m_bInput = new RIntNumInput(m_gboxSettings->plainPage()); m_bInput->setRange(-100, 100, 1); m_bInput->setDefaultValue(0); - QWhatsThis::add( m_bInput, i18n("<p>Set here the brightness adjustment of the image.")); + TQWhatsThis::add( m_bInput, i18n("<p>Set here the brightness adjustment of the image.")); - QLabel *label3 = new QLabel(i18n("Contrast:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Contrast:"), m_gboxSettings->plainPage()); m_cInput = new RIntNumInput(m_gboxSettings->plainPage()); m_cInput->setRange(-100, 100, 1); m_cInput->setDefaultValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); - QLabel *label4 = new QLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); m_gInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_gInput->setPrecision(2); m_gInput->setRange(0.1, 3.0, 0.01); m_gInput->setDefaultValue(1.0); - QWhatsThis::add( m_gInput, i18n("<p>Set here the gamma adjustment of the image.")); + TQWhatsThis::add( m_gInput, i18n("<p>Set here the gamma adjustment of the image.")); // ------------------------------------------------------------- @@ -193,26 +193,26 @@ BCGTool::BCGTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_bInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_gInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_gInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -231,32 +231,32 @@ void BCGTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void BCGTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void BCGTool::slotColorSelectedFromTarget(const DColor &color) diff --git a/digikam/imageplugins/coreplugin/bcgtool.h b/digikam/imageplugins/coreplugin/bcgtool.h index 3e797de..8190094 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.h +++ b/digikam/imageplugins/coreplugin/bcgtool.h @@ -30,9 +30,9 @@ #include "editortool.h" -class QCheckBox; -class QComboBox; -class QHButtonGroup; +class TQCheckBox; +class TQComboBox; +class TQHButtonGroup; namespace KDcrawIface { @@ -54,10 +54,11 @@ namespace DigikamImagesPluginCore class BCGTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - BCGTool(QObject *parent); + BCGTool(TQObject *tqparent); ~BCGTool(); private slots: @@ -92,9 +93,9 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDcrawIface::RIntNumInput *m_bInput; KDcrawIface::RIntNumInput *m_cInput; diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp index 38b0b10..cc7ff53 100644 --- a/digikam/imageplugins/coreplugin/blurtool.cpp +++ b/digikam/imageplugins/coreplugin/blurtool.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> // KDE includes. @@ -59,8 +59,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -BlurTool::BlurTool(QObject* parent) - : EditorToolThreaded(parent) +BlurTool::BlurTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("gaussianblur"); setToolName(i18n("Blur")); @@ -74,13 +74,13 @@ BlurTool::BlurTool(QObject* parent) EditorToolSettings::Cancel| EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 2, 1); - QLabel *label = new QLabel(i18n("Smoothness:"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1); + TQLabel *label = new TQLabel(i18n("Smoothness:"), m_gboxSettings->plainPage()); m_radiusInput = new RIntNumInput(m_gboxSettings->plainPage()); m_radiusInput->setRange(0, 100, 1); m_radiusInput->setDefaultValue(0); - QWhatsThis::add(m_radiusInput, i18n("<p>A smoothness of 0 has no effect, " + TQWhatsThis::add(m_radiusInput, i18n("<p>A smoothness of 0 has no effect, " "1 and above determine the Gaussian blur matrix radius " "that determines how much to blur the image.")); diff --git a/digikam/imageplugins/coreplugin/blurtool.h b/digikam/imageplugins/coreplugin/blurtool.h index b94e874..9552f20 100644 --- a/digikam/imageplugins/coreplugin/blurtool.h +++ b/digikam/imageplugins/coreplugin/blurtool.h @@ -45,10 +45,11 @@ namespace DigikamImagesPluginCore class BlurTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - BlurTool(QObject *parent); + BlurTool(TQObject *tqparent); ~BlurTool(); private slots: diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index c32dccf..b2d3d56 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -22,26 +22,26 @@ * * ============================================================ */ -// Qt includes. - -#include <qcolor.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qintdict.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqintdict.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -86,44 +86,44 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -class PreviewPixmapFactory : public QObject +class PreviewPixmapFactory : public TQObject { public: PreviewPixmapFactory(BWSepiaTool* bwSepia); - void invalidate() { m_previewPixmapMap.clear(); } + void tqinvalidate() { m_previewPixmapMap.clear(); } - const QPixmap* pixmap(int id); + const TQPixmap* pixmap(int id); private: - QPixmap makePixmap(int id); + TQPixmap makePixmap(int id); - QIntDict<QPixmap> m_previewPixmapMap; + TQIntDict<TQPixmap> m_previewPixmapMap; BWSepiaTool *m_bwSepia; }; PreviewPixmapFactory::PreviewPixmapFactory(BWSepiaTool* bwSepia) - : QObject(bwSepia), m_bwSepia(bwSepia) + : TQObject(bwSepia), m_bwSepia(bwSepia) { m_previewPixmapMap.setAutoDelete(true); } -const QPixmap* PreviewPixmapFactory::pixmap(int id) +const TQPixmap* PreviewPixmapFactory::pixmap(int id) { - if (m_previewPixmapMap.find(id) == 0) + if (m_previewPixmapMap.tqfind(id) == 0) { - QPixmap pix = makePixmap(id); - m_previewPixmapMap.insert(id, new QPixmap(pix)); + TQPixmap pix = makePixmap(id); + m_previewPixmapMap.insert(id, new TQPixmap(pix)); } - QPixmap* res = m_previewPixmapMap[id]; + TQPixmap* res = m_previewPixmapMap[id]; return res; } -QPixmap PreviewPixmapFactory::makePixmap(int id) +TQPixmap PreviewPixmapFactory::makePixmap(int id) { return m_bwSepia->getThumbnailForEffect(id); } @@ -135,15 +135,15 @@ class ListBoxBWPreviewItem : public ListBoxPreviewItem public: - ListBoxBWPreviewItem(QListBox *listbox, const QString &text, + ListBoxBWPreviewItem(TQListBox *listbox, const TQString &text, PreviewPixmapFactory* factory, int id) - : ListBoxPreviewItem(listbox, QPixmap(), text) + : ListBoxPreviewItem(listbox, TQPixmap(), text) { m_previewPixmapFactory = factory; m_id = id; }; - virtual const QPixmap* pixmap() const; + virtual const TQPixmap* pixmap() const; private: @@ -151,15 +151,15 @@ private: PreviewPixmapFactory* m_previewPixmapFactory; }; -const QPixmap* ListBoxBWPreviewItem::pixmap() const +const TQPixmap* ListBoxBWPreviewItem::pixmap() const { return m_previewPixmapFactory->pixmap(m_id); } // ----------------------------------------------------------------------------------- -BWSepiaTool::BWSepiaTool(QObject* parent) - : EditorTool(parent) +BWSepiaTool::BWSepiaTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("convertbw"); setToolName(i18n("Black && White")); @@ -170,7 +170,7 @@ BWSepiaTool::BWSepiaTool(QObject* parent) ImageIface iface(0, 0); m_originalImage = iface.getOriginalImg(); - m_thumbnailImage = m_originalImage->smoothScale(128, 128, QSize::ScaleMin); + m_thumbnailImage = m_originalImage->smoothScale(128, 128, TQSize::ScaleMin); // ------------------------------------------------------------- @@ -188,47 +188,47 @@ BWSepiaTool::BWSepiaTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(gboxSettings->plainPage(), 4, 4); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 4, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -238,15 +238,15 @@ BWSepiaTool::BWSepiaTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); @@ -254,7 +254,7 @@ BWSepiaTool::BWSepiaTool(QObject* parent) m_tab = new KTabWidget(gboxSettings->plainPage()); - m_bwFilm = new QListBox(m_tab); + m_bwFilm = new TQListBox(m_tab); m_bwFilm->setColumnMode(1); m_bwFilm->setVariableWidth(false); m_bwFilm->setVariableHeight(false); @@ -339,9 +339,9 @@ BWSepiaTool::BWSepiaTool(QObject* parent) // ------------------------------------------------------------- - QVBox *vbox = new QVBox(m_tab); + TQVBox *vbox = new TQVBox(m_tab); - m_bwFilters = new QListBox(vbox); + m_bwFilters = new TQListBox(vbox); m_bwFilters->setColumnMode(1); m_bwFilters->setVariableWidth(false); m_bwFilters->setVariableHeight(false); @@ -386,11 +386,11 @@ BWSepiaTool::BWSepiaTool(QObject* parent) m_strengthInput->input()->setLabel(i18n("Strength:"), AlignLeft | AlignVCenter); m_strengthInput->setRange(1, 5, 1); m_strengthInput->setDefaultValue(1); - QWhatsThis::add(m_strengthInput, i18n("<p>Here, set the strength adjustment of the lens filter.")); + TQWhatsThis::add(m_strengthInput, i18n("<p>Here, set the strength adjustment of the lens filter.")); // ------------------------------------------------------------- - m_bwTone = new QListBox(m_tab); + m_bwTone = new TQListBox(m_tab); m_bwTone->setColumnMode(1); m_bwTone->setVariableWidth(false); m_bwTone->setVariableHeight(false); @@ -441,35 +441,35 @@ BWSepiaTool::BWSepiaTool(QObject* parent) // ------------------------------------------------------------- - QWidget *curveBox = new QWidget( m_tab ); - QGridLayout *gridTab2 = new QGridLayout(curveBox, 5, 2, 0); + TQWidget *curveBox = new TQWidget( m_tab ); + TQGridLayout *gridTab2 = new TQGridLayout(curveBox, 5, 2, 0); ColorGradientWidget* vGradient = new ColorGradientWidget( ColorGradientWidget::Vertical, 10, curveBox); - vGradient->setColors(QColor("white"), QColor("black")); + vGradient->setColors(TQColor("white"), TQColor("black")); - QLabel *spacev = new QLabel(curveBox); + TQLabel *spacev = new TQLabel(curveBox); spacev->setFixedWidth(1); m_curvesWidget = new CurvesWidget(256, 256, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), curveBox); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); - QLabel *spaceh = new QLabel(curveBox); + TQLabel *spaceh = new TQLabel(curveBox); spaceh->setFixedHeight(1); ColorGradientWidget *hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, curveBox); - hGradient->setColors(QColor("black"), QColor("white")); + hGradient->setColors(TQColor("black"), TQColor("white")); m_cInput = new RIntNumInput(curveBox); m_cInput->input()->setLabel(i18n("Contrast:"), AlignLeft | AlignVCenter); m_cInput->setRange(-100, 100, 1); m_cInput->setDefaultValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); gridTab2->addMultiCellWidget(vGradient, 0, 0, 0, 0); gridTab2->addMultiCellWidget(spacev, 0, 0, 1, 1); @@ -494,38 +494,38 @@ BWSepiaTool::BWSepiaTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bwFilters, SIGNAL(highlighted(int)), - this, SLOT(slotFilterSelected(int))); + connect(m_bwFilters, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotFilterSelected(int))); - connect(m_strengthInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_strengthInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_bwFilm, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_bwFilm, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_bwTone, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_bwTone, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); } BWSepiaTool::~BWSepiaTool() @@ -544,7 +544,7 @@ void BWSepiaTool::slotFilterSelected(int filter) slotEffect(); } -QPixmap BWSepiaTool::getThumbnailForEffect(int type) +TQPixmap BWSepiaTool::getThumbnailForEffect(int type) { DImg thumb = m_thumbnailImage.copy(); int w = thumb.width(); @@ -588,34 +588,34 @@ void BWSepiaTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void BWSepiaTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); m_curvesWidget->m_scaleType = scale; - m_curvesWidget->repaint(false); + m_curvesWidget->tqrepaint(false); } void BWSepiaTool::slotSpotColorChanged(const DColor &color) @@ -650,8 +650,8 @@ void BWSepiaTool::readSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentPoint%1").arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -686,7 +686,7 @@ void BWSepiaTool::writeSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); + TQPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -694,7 +694,7 @@ void BWSepiaTool::writeSettings() p.setY(p.y()/255); } - config->writeEntry(QString("CurveAjustmentPoint%1").arg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); } m_previewWidget->writeSettings(); @@ -733,7 +733,7 @@ void BWSepiaTool::slotResetSettings() m_strengthInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->invalidate(); + m_previewPixmapFactory->tqinvalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); @@ -840,7 +840,7 @@ void BWSepiaTool::finalRendering() void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type) { - // Value to multiply RGB 8 bits component of mask used by changeTonality() method. + // Value to multiply RGB 8 bits component of tqmask used by changeTonality() method. int mul = sb ? 255 : 1; DImgImageFilters filter; double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0); @@ -1064,22 +1064,22 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in void BWSepiaTool::slotLoadSettings() { KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Black & White Settings File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) return; - QFile file(loadFile.path()); + TQFile file(loadFile.path()); if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); if (stream.readLine() != "# Black & White Configuration File") { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Black & White settings text file.") - .arg(loadFile.fileName())); + .tqarg(loadFile.fileName())); file.close(); return; } @@ -1100,8 +1100,8 @@ void BWSepiaTool::slotLoadSettings() for (int j = 0; j < 17; j++) { - QPoint disable(-1, -1); - QPoint p; + TQPoint disable(-1, -1); + TQPoint p; p.setX(stream.readLine().toInt()); p.setY(stream.readLine().toInt()); @@ -1122,7 +1122,7 @@ void BWSepiaTool::slotLoadSettings() m_cInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->invalidate(); + m_previewPixmapFactory->tqinvalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); @@ -1140,16 +1140,16 @@ void BWSepiaTool::slotLoadSettings() void BWSepiaTool::slotSaveAsSettings() { KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Black & White Settings File to Save"))); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Black & White Settings File to Save"))); if( saveFile.isEmpty() ) return; - QFile file(saveFile.path()); + TQFile file(saveFile.path()); if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); stream << "# Black & White Configuration File\n"; stream << m_bwFilters->currentItem() << "\n"; stream << m_bwTone->currentItem() << "\n"; @@ -1157,7 +1157,7 @@ void BWSepiaTool::slotSaveAsSettings() for (int j = 0; j < 17; j++) { - QPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); + TQPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit()) { p.setX(p.x() / 255); diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.h b/digikam/imageplugins/coreplugin/bwsepiatool.h index 476281b..cd8cde4 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.h +++ b/digikam/imageplugins/coreplugin/bwsepiatool.h @@ -26,18 +26,18 @@ #ifndef BWSEPIATOOL_H #define BWSEPIATOOL_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "editortool.h" -class QHButtonGroup; -class QComboBox; -class QButtonGroup; -class QListBox; +class TQHButtonGroup; +class TQComboBox; +class TQButtonGroup; +class TQListBox; class KTabWidget; @@ -64,17 +64,18 @@ class PreviewPixmapFactory; class BWSepiaTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - BWSepiaTool(QObject *parent); + BWSepiaTool(TQObject *tqparent); ~BWSepiaTool(); friend class PreviewPixmapFactory; protected: - QPixmap getThumbnailForEffect(int type); + TQPixmap getThumbnailForEffect(int type); void finalRendering(); private: @@ -160,13 +161,13 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QListBox *m_bwFilters; - QListBox *m_bwFilm; - QListBox *m_bwTone; + TQListBox *m_bwFilters; + TQListBox *m_bwFilm; + TQListBox *m_bwTone; KDcrawIface::RIntNumInput *m_cInput; KDcrawIface::RIntNumInput *m_strengthInput; diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 5a9d521..40bc6a7 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -22,22 +22,22 @@ * * ============================================================ */ -// Qt includes. - -#include <qcolor.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -75,8 +75,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -HSLTool::HSLTool(QObject* parent) - : EditorTool(parent) +HSLTool::HSLTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("adjusthsl"); setToolName(i18n("Hue / Saturation / Lightness")); @@ -101,47 +101,47 @@ HSLTool::HSLTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 11, 4); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 11, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -151,55 +151,55 @@ HSLTool::HSLTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- m_HSSelector = new KHSSelector(m_gboxSettings->plainPage()); - QWhatsThis::add( m_HSSelector, i18n("<p>Select the hue and saturation adjustments of the image here.")); + TQWhatsThis::add( m_HSSelector, i18n("<p>Select the hue and saturation adjustments of the image here.")); m_HSSelector->setMinimumSize(256, 142); gridSettings->addMultiCellWidget(m_HSSelector, 3, 3, 0, 4); m_HSPreview = new HSPreviewWidget(m_gboxSettings->plainPage()); - QWhatsThis::add( m_HSPreview, i18n("<p>You can see here a color preview of the hue and " + TQWhatsThis::add( m_HSPreview, i18n("<p>You can see here a color preview of the hue and " "saturation adjustments.")); m_HSPreview->setMinimumSize(256, 15); gridSettings->addMultiCellWidget(m_HSPreview, 4, 4, 0, 4); - QLabel *label2 = new QLabel(i18n("Hue:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Hue:"), m_gboxSettings->plainPage()); m_hInput = new RDoubleNumInput(m_gboxSettings); m_hInput->setPrecision(0); m_hInput->setRange(-180.0, 180.0, 1.0); m_hInput->setDefaultValue(0.0); - QWhatsThis::add( m_hInput, i18n("<p>Set here the hue adjustment of the image.")); + TQWhatsThis::add( m_hInput, i18n("<p>Set here the hue adjustment of the image.")); gridSettings->addMultiCellWidget(label2, 5, 5, 0, 4); gridSettings->addMultiCellWidget(m_hInput, 6, 6, 0, 4); - QLabel *label3 = new QLabel(i18n("Saturation:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Saturation:"), m_gboxSettings->plainPage()); m_sInput = new RDoubleNumInput(m_gboxSettings); m_sInput->setPrecision(2); m_sInput->setRange(-100.0, 100.0, 0.01); m_sInput->setDefaultValue(0.0); - QWhatsThis::add( m_sInput, i18n("<p>Set here the saturation adjustment of the image.")); + TQWhatsThis::add( m_sInput, i18n("<p>Set here the saturation adjustment of the image.")); gridSettings->addMultiCellWidget(label3, 7, 7, 0, 4); gridSettings->addMultiCellWidget(m_sInput, 8, 8, 0, 4); - QLabel *label4 = new QLabel(i18n("Lightness:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Lightness:"), m_gboxSettings->plainPage()); m_lInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_lInput->setPrecision(2); m_lInput->setRange(-100.0, 100.0, 0.01); m_lInput->setDefaultValue(0.0); - QWhatsThis::add( m_lInput, i18n("<p>Set here the lightness adjustment of the image.")); + TQWhatsThis::add( m_lInput, i18n("<p>Set here the lightness adjustment of the image.")); gridSettings->addMultiCellWidget(label4, 9, 9, 0, 4); gridSettings->addMultiCellWidget(m_lInput, 10, 10, 0, 4); @@ -209,35 +209,35 @@ HSLTool::HSLTool(QObject* parent) // ------------------------------------------------------------- - connect(m_HSSelector, SIGNAL(valueChanged(int, int)), - this, SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotHSChanged(int, int))); - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_hInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_hInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_hInput, SIGNAL(valueChanged (double)), - this, SLOT(slotHChanged(double))); + connect(m_hInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotHChanged(double))); - connect(m_sInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_sInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_sInput, SIGNAL(valueChanged (double)), - this, SLOT(slotSChanged(double))); + connect(m_sInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotSChanged(double))); - connect(m_lInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_lInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -256,32 +256,32 @@ void HSLTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void HSLTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void HSLTool::slotColorSelectedFromTarget( const DColor &color ) diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.h b/digikam/imageplugins/coreplugin/hsl/hsltool.h index be63182..29b0207 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.h +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.h @@ -29,8 +29,8 @@ #include "editortool.h" -class QComboBox; -class QHButtonGroup; +class TQComboBox; +class TQHButtonGroup; class KHSSelector; @@ -56,10 +56,11 @@ class HSPreviewWidget; class HSLTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - HSLTool(QObject *parent); + HSLTool(TQObject *tqparent); ~HSLTool(); private slots: @@ -97,9 +98,9 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDcrawIface::RDoubleNumInput *m_hInput; KDcrawIface::RDoubleNumInput *m_sInput; diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp index 4bdcdfa..bbfb1b3 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdrawutil.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqdrawutil.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpixmap.h> // KDE includes. @@ -60,11 +60,11 @@ public: double hue; double sat; - QPixmap pixmap; + TQPixmap pixmap; }; -HSPreviewWidget::HSPreviewWidget(QWidget *parent, int xBorder) - : QWidget(parent, 0, Qt::WDestructiveClose) +HSPreviewWidget::HSPreviewWidget(TQWidget *tqparent, int xBorder) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new HSPreviewWidgetPrivate; d->xBorder = xBorder; @@ -83,12 +83,12 @@ void HSPreviewWidget::setHS(double hue, double sat) update(); } -void HSPreviewWidget::resizeEvent( QResizeEvent * ) +void HSPreviewWidget::resizeEvent( TQResizeEvent * ) { updatePixmap(); } -void HSPreviewWidget::paintEvent( QPaintEvent * ) +void HSPreviewWidget::paintEvent( TQPaintEvent * ) { bitBlt(this, 0+d->xBorder, 0, &d->pixmap); } @@ -99,7 +99,7 @@ void HSPreviewWidget::updatePixmap() int ySize = height(); Digikam::DImg image(xSize, ySize, false, false, 0, false); - QColor col; + TQColor col; uint *p; for ( int s = ySize-1; s >= 0; s-- ) diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h index aebc314..2fed9c9 100644 --- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h +++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.h @@ -24,30 +24,31 @@ #ifndef HSPREVIEWWIDGET_H #define HSPREVIEWWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace DigikamImagesPluginCore { class HSPreviewWidgetPrivate; -class HSPreviewWidget : public QWidget +class HSPreviewWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - HSPreviewWidget(QWidget *parent=0, int xBorder=0); + HSPreviewWidget(TQWidget *tqparent=0, int xBorder=0); ~HSPreviewWidget(); void setHS(double hue, double sat); protected: - void resizeEvent( QResizeEvent * ); - void paintEvent( QPaintEvent * ); + void resizeEvent( TQResizeEvent * ); + void paintEvent( TQPaintEvent * ); private: diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index 7940b51..6cd1161 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -22,23 +22,23 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qvbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qtimer.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqvbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqtimer.h> // KDE includes. @@ -68,8 +68,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_HSL::ImageEffect_HSL(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Hue/Saturation/Lightness"), "hsladjust", false) +ImageEffect_HSL::ImageEffect_HSL(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Hue/Saturation/Lightness"), "hsladjust", false) { m_destinationPreviewData = 0L; setHelp("hsladjusttool.anchor", "digikam"); @@ -83,48 +83,48 @@ ImageEffect_HSL::ImageEffect_HSL(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout(gboxSettings, 11, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -134,55 +134,55 @@ ImageEffect_HSL::ImageEffect_HSL(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- m_HSSelector = new KHSSelector(gboxSettings); - QWhatsThis::add( m_HSSelector, i18n("<p>Select the hue and saturation adjustments of the image here.")); + TQWhatsThis::add( m_HSSelector, i18n("<p>Select the hue and saturation adjustments of the image here.")); m_HSSelector->setMinimumSize(256, 142); gridSettings->addMultiCellWidget(m_HSSelector, 3, 3, 0, 4); m_HSPreview = new HSPreviewWidget(gboxSettings, spacingHint()); - QWhatsThis::add( m_HSPreview, i18n("<p>You can see here a color preview of the hue and " + TQWhatsThis::add( m_HSPreview, i18n("<p>You can see here a color preview of the hue and " "saturation adjustments.")); m_HSPreview->setMinimumSize(256, 15); gridSettings->addMultiCellWidget(m_HSPreview, 4, 4, 0, 4); - QLabel *label2 = new QLabel(i18n("Hue:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Hue:"), gboxSettings); m_hInput = new KDoubleNumInput(gboxSettings); m_hInput->setPrecision(0); m_hInput->setRange(-180.0, 180.0, 1.0, true); m_hInput->setValue(0.0); - QWhatsThis::add( m_hInput, i18n("<p>Set here the hue adjustment of the image.")); + TQWhatsThis::add( m_hInput, i18n("<p>Set here the hue adjustment of the image.")); gridSettings->addMultiCellWidget(label2, 5, 5, 0, 4); gridSettings->addMultiCellWidget(m_hInput, 6, 6, 0, 4); - QLabel *label3 = new QLabel(i18n("Saturation:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Saturation:"), gboxSettings); m_sInput = new KDoubleNumInput(gboxSettings); m_sInput->setPrecision(2); m_sInput->setRange(-100.0, 100.0, 0.01, true); m_sInput->setValue(0.0); - QWhatsThis::add( m_sInput, i18n("<p>Set here the saturation adjustment of the image.")); + TQWhatsThis::add( m_sInput, i18n("<p>Set here the saturation adjustment of the image.")); gridSettings->addMultiCellWidget(label3, 7, 7, 0, 4); gridSettings->addMultiCellWidget(m_sInput, 8, 8, 0, 4); - QLabel *label4 = new QLabel(i18n("Lightness:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Lightness:"), gboxSettings); m_lInput = new KDoubleNumInput(gboxSettings); m_lInput->setPrecision(2); m_lInput->setRange(-100.0, 100.0, 0.01, true); m_lInput->setValue(0.0); - QWhatsThis::add( m_lInput, i18n("<p>Set here the lightness adjustment of the image.")); + TQWhatsThis::add( m_lInput, i18n("<p>Set here the lightness adjustment of the image.")); gridSettings->addMultiCellWidget(label4, 9, 9, 0, 4); gridSettings->addMultiCellWidget(m_lInput, 10, 10, 0, 4); @@ -191,35 +191,35 @@ ImageEffect_HSL::ImageEffect_HSL(QWidget* parent) // ------------------------------------------------------------- - connect(m_HSSelector, SIGNAL(valueChanged(int, int)), - this, SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotHSChanged(int, int))); - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_hInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_hInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_hInput, SIGNAL(valueChanged (double)), - this, SLOT(slotHChanged(double))); + connect(m_hInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotHChanged(double))); - connect(m_sInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_sInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_sInput, SIGNAL(valueChanged (double)), - this, SLOT(slotSChanged(double))); + connect(m_sInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotSChanged(double))); - connect(m_lInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_lInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -243,32 +243,32 @@ void ImageEffect_HSL::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_HSL::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_HSL::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h index c2f5db5..7596608 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.h @@ -29,8 +29,8 @@ #include "imagedlgbase.h" -class QComboBox; -class QHButtonGroup; +class TQComboBox; +class TQHButtonGroup; class KDoubleNumInput; class KHSSelector; @@ -50,10 +50,11 @@ class HSPreviewWidget; class ImageEffect_HSL : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_HSL(QWidget *parent); + ImageEffect_HSL(TQWidget *tqparent); ~ImageEffect_HSL(); private slots: @@ -91,9 +92,9 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDoubleNumInput *m_hInput; KDoubleNumInput *m_sInput; diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 76fd506..acdacd8 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -23,27 +23,27 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpoint.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qtextstream.h> -#include <qtoolbox.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpoint.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqtextstream.h> +#include <tqtoolbox.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> // KDE includes. @@ -96,8 +96,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -ICCProofTool::ICCProofTool(QObject* parent) - : EditorTool(parent) +ICCProofTool::ICCProofTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("colormanagement"); setToolName(i18n("Color Management")); @@ -125,48 +125,48 @@ ICCProofTool::ICCProofTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout *gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 3, 2); + TQGridLayout *gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2); - QLabel *label1 = new QLabel(i18n("Channel: "), m_gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel: "), m_gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red channel values.<p>" "<b>Green</b>: display the green channel values.<p>" "<b>Blue</b>: display the blue channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add(m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add(m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal values are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal values are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -176,56 +176,56 @@ ICCProofTool::ICCProofTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "of the selected image channel. " "This one is updated after setting changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 2); // ------------------------------------------------------------- - m_toolBoxWidgets = new QToolBox(m_gboxSettings->plainPage()); - QWidget *generalOptions = new QWidget(m_toolBoxWidgets); - QWidget *inProfiles = new QWidget(m_toolBoxWidgets); - QWidget *spaceProfiles = new QWidget(m_toolBoxWidgets); - QWidget *proofProfiles = new QWidget(m_toolBoxWidgets); - QWidget *lightnessadjust = new QWidget(m_toolBoxWidgets); + m_toolBoxWidgets = new TQToolBox(m_gboxSettings->plainPage()); + TQWidget *generalOptions = new TQWidget(m_toolBoxWidgets); + TQWidget *inProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *spaceProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *proofProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *lightnessadjust = new TQWidget(m_toolBoxWidgets); //---------- "General" Page Setup ---------------------------------- m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions, SmallIconSet("misc"), i18n("General Settings")); - QWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); + TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); - QGridLayout *zeroPageLayout = new QGridLayout(generalOptions, 5, 1); + TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1); - m_doSoftProofBox = new QCheckBox(generalOptions); + m_doSoftProofBox = new TQCheckBox(generalOptions); m_doSoftProofBox->setText(i18n("Soft-proofing")); - QWhatsThis::add(m_doSoftProofBox, i18n("<p>Rendering emulation of the device described " + TQWhatsThis::add(m_doSoftProofBox, i18n("<p>Rendering emulation of the device described " "by the \"Proofing\" profile. Useful to preview the final " "result without rendering to physical medium.</p>")); - m_checkGamutBox = new QCheckBox(generalOptions); + m_checkGamutBox = new TQCheckBox(generalOptions); m_checkGamutBox->setText(i18n("Check gamut")); - QWhatsThis::add(m_checkGamutBox, i18n("<p>You can use this option if you want to show " + TQWhatsThis::add(m_checkGamutBox, i18n("<p>You can use this option if you want to show " "the colors that are outside the printer's gamut<p>")); - m_embeddProfileBox = new QCheckBox(generalOptions); + m_embeddProfileBox = new TQCheckBox(generalOptions); m_embeddProfileBox->setChecked(true); m_embeddProfileBox->setText(i18n("Assign profile")); - QWhatsThis::add(m_embeddProfileBox, i18n("<p>You can use this option to embed " + TQWhatsThis::add(m_embeddProfileBox, i18n("<p>You can use this option to embed " "the selected workspace color profile into the image.</p>")); - m_BPCBox = new QCheckBox(generalOptions); + m_BPCBox = new TQCheckBox(generalOptions); m_BPCBox->setText(i18n("Use BPC")); - QWhatsThis::add(m_BPCBox, i18n("<p>The Black Point Compensation (BPC) feature does work in conjunction " + TQWhatsThis::add(m_BPCBox, i18n("<p>The Black Point Compensation (BPC) feature does work in conjunction " "with Relative Colorimetric Intent. Perceptual intent should make no " "difference, since BPC is always on, and in Absolute Colorimetric " "Intent it is always turned off.</p>" @@ -233,14 +233,14 @@ ICCProofTool::ICCProofTool(QObject* parent) "With BPC the dark tones are optimally mapped (no clipping) from original media " "to the destination rendering media, e.g. the combination of paper and ink.</p>")); - QLabel *intent = new QLabel(i18n("Rendering Intent:"), generalOptions); + TQLabel *intent = new TQLabel(i18n("Rendering Intent:"), generalOptions); m_renderingIntentsCB = new RComboBox(generalOptions); m_renderingIntentsCB->insertItem("Perceptual"); m_renderingIntentsCB->insertItem("Absolute Colorimetric"); m_renderingIntentsCB->insertItem("Relative Colorimetric"); m_renderingIntentsCB->insertItem("Saturation"); m_renderingIntentsCB->setDefaultItem(0); - QWhatsThis::add( m_renderingIntentsCB, i18n("<ul><li>Perceptual intent causes the full gamut " + TQWhatsThis::add( m_renderingIntentsCB, i18n("<ul><li>Perceptual intent causes the full gamut " "of the image to be compressed or expanded to fill the gamut of the destination media, " "so that gray balance is preserved but colorimetric accuracy may not be preserved.<br>" "In other words, if certain colors in an image fall outside of the range of colors that " @@ -267,13 +267,13 @@ ICCProofTool::ICCProofTool(QObject* parent) "specific color.</li></ul>")); KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions); - lcmsLogoLabel->setAlignment(AlignTop | AlignRight); - lcmsLogoLabel->setText(QString()); + lcmsLogoLabel->tqsetAlignment(AlignTop | AlignRight); + lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); - lcmsLogoLabel->setPixmap(QPixmap(directory + "logo-lcms.png")); - QToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); + lcmsLogoLabel->setPixmap(TQPixmap(directory + "logo-lcms.png")); + TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); zeroPageLayout->addMultiCellWidget(m_doSoftProofBox, 0, 0, 0, 0); zeroPageLayout->addMultiCellWidget(m_checkGamutBox, 1, 1, 0, 0); @@ -287,26 +287,26 @@ ICCProofTool::ICCProofTool(QObject* parent) //---------- "Input" Page Setup ---------------------------------- m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile")); - QWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color " + TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color " "Profiles.</p>")); - QGridLayout *firstPageLayout = new QGridLayout(inProfiles, 4, 2); + TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2); - m_inProfileBG = new QButtonGroup(4, Qt::Vertical, inProfiles); - m_inProfileBG->setFrameStyle(QFrame::NoFrame); + m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); + m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setInsideMargin(0); - m_useEmbeddedProfile = new QRadioButton(m_inProfileBG); + m_useEmbeddedProfile = new TQRadioButton(m_inProfileBG); m_useEmbeddedProfile->setText(i18n("Use embedded profile")); - m_useSRGBDefaultProfile = new QRadioButton(m_inProfileBG); + m_useSRGBDefaultProfile = new TQRadioButton(m_inProfileBG); m_useSRGBDefaultProfile->setText(i18n("Use builtin sRGB profile")); m_useSRGBDefaultProfile->setChecked(true); - m_useInDefaultProfile = new QRadioButton(m_inProfileBG); + m_useInDefaultProfile = new TQRadioButton(m_inProfileBG); m_useInDefaultProfile->setText(i18n("Use default profile")); - m_useInSelectedProfile = new QRadioButton(m_inProfileBG); + m_useInSelectedProfile = new TQRadioButton(m_inProfileBG); m_useInSelectedProfile->setText(i18n("Use selected profile")); m_inProfilesPath = new KURLRequester(inProfiles); @@ -316,12 +316,12 @@ ICCProofTool::ICCProofTool(QObject* parent) m_iccInPreviewWidget = new ICCPreviewWidget(inProfiles_dialog); inProfiles_dialog->setPreviewWidget(m_iccInPreviewWidget); - QPushButton *inProfilesInfo = new QPushButton(i18n("Info..."), inProfiles); + TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); - QGroupBox *pictureInfo = new QGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); - new QLabel(i18n("Make:"), pictureInfo); + TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); + new TQLabel(i18n("Make:"), pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); - new QLabel(i18n("Model:"), pictureInfo); + new TQLabel(i18n("Model:"), pictureInfo); KSqueezedTextLabel *model = new KSqueezedTextLabel(0, pictureInfo); make->setText(iface.getPhotographInformations().make); model->setText(iface.getPhotographInformations().model); @@ -337,19 +337,19 @@ ICCProofTool::ICCProofTool(QObject* parent) m_toolBoxWidgets->insertItem(WORKSPACEPAGE, spaceProfiles, SmallIconSet("tablet"), i18n("Workspace Profile")); - QWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace " + TQWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace " "Profiles.</p>")); - QGridLayout *secondPageLayout = new QGridLayout(spaceProfiles, 3, 2); + TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2); - m_spaceProfileBG = new QButtonGroup(2, Qt::Vertical, spaceProfiles); - m_spaceProfileBG->setFrameStyle(QFrame::NoFrame); + m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); + m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setInsideMargin(0); - m_useSpaceDefaultProfile = new QRadioButton(m_spaceProfileBG); + m_useSpaceDefaultProfile = new TQRadioButton(m_spaceProfileBG); m_useSpaceDefaultProfile->setText(i18n("Use default workspace profile")); - m_useSpaceSelectedProfile = new QRadioButton(m_spaceProfileBG); + m_useSpaceSelectedProfile = new TQRadioButton(m_spaceProfileBG); m_useSpaceSelectedProfile->setText(i18n("Use selected profile")); m_spaceProfilePath = new KURLRequester(spaceProfiles); @@ -359,7 +359,7 @@ ICCProofTool::ICCProofTool(QObject* parent) m_iccSpacePreviewWidget = new ICCPreviewWidget(spaceProfiles_dialog); spaceProfiles_dialog->setPreviewWidget(m_iccSpacePreviewWidget); - QPushButton *spaceProfilesInfo = new QPushButton(i18n("Info..."), spaceProfiles); + TQPushButton *spaceProfilesInfo = new TQPushButton(i18n("Info..."), spaceProfiles); secondPageLayout->addMultiCellWidget(m_spaceProfileBG, 0, 1, 0, 0); secondPageLayout->addMultiCellWidget(spaceProfilesInfo, 0, 0, 2, 2); @@ -371,19 +371,19 @@ ICCProofTool::ICCProofTool(QObject* parent) m_toolBoxWidgets->insertItem(PROOFINGPAGE, proofProfiles, SmallIconSet("printer1"), i18n("Proofing Profile")); - QWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color " + TQWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color " "Profiles.</p>")); - QGridLayout *thirdPageLayout = new QGridLayout(proofProfiles, 3, 2); + TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2); - m_proofProfileBG = new QButtonGroup(2, Qt::Vertical, proofProfiles); - m_proofProfileBG->setFrameStyle(QFrame::NoFrame); + m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); + m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setInsideMargin(0); - m_useProofDefaultProfile = new QRadioButton(m_proofProfileBG); + m_useProofDefaultProfile = new TQRadioButton(m_proofProfileBG); m_useProofDefaultProfile->setText(i18n("Use default proof profile")); - m_useProofSelectedProfile = new QRadioButton(m_proofProfileBG); + m_useProofSelectedProfile = new TQRadioButton(m_proofProfileBG); m_useProofSelectedProfile->setText(i18n("Use selected profile")); m_proofProfilePath = new KURLRequester(proofProfiles); @@ -393,7 +393,7 @@ ICCProofTool::ICCProofTool(QObject* parent) m_iccProofPreviewWidget = new ICCPreviewWidget(proofProfiles_dialog); proofProfiles_dialog->setPreviewWidget(m_iccProofPreviewWidget); - QPushButton *proofProfilesInfo = new QPushButton(i18n("Info..."), proofProfiles); + TQPushButton *proofProfilesInfo = new TQPushButton(i18n("Info..."), proofProfiles); thirdPageLayout->addMultiCellWidget(m_proofProfileBG, 0, 1, 0, 0); thirdPageLayout->addMultiCellWidget(proofProfilesInfo, 0, 0, 2, 2); @@ -405,36 +405,36 @@ ICCProofTool::ICCProofTool(QObject* parent) m_toolBoxWidgets->insertItem(LIGHTNESSPAGE, lightnessadjust, SmallIconSet("blend"), i18n("Lightness Adjustments")); - QWhatsThis::add(lightnessadjust, i18n("<p>Set here all lightness adjustments to the target image.</p>")); + TQWhatsThis::add(lightnessadjust, i18n("<p>Set here all lightness adjustments to the target image.</p>")); - QGridLayout *fourPageLayout = new QGridLayout( lightnessadjust, 5, 2); + TQGridLayout *fourPageLayout = new TQGridLayout( lightnessadjust, 5, 2); ColorGradientWidget* vGradient = new ColorGradientWidget(ColorGradientWidget::Vertical, 10, lightnessadjust ); - vGradient->setColors(QColor("white"), QColor("black")); + vGradient->setColors(TQColor("white"), TQColor("black")); - QLabel *spacev = new QLabel(lightnessadjust); + TQLabel *spacev = new TQLabel(lightnessadjust); spacev->setFixedWidth(1); m_curvesWidget = new CurvesWidget(256, 192, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), lightnessadjust); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); - QLabel *spaceh = new QLabel(lightnessadjust); + TQLabel *spaceh = new TQLabel(lightnessadjust); spaceh->setFixedHeight(1); ColorGradientWidget *hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, lightnessadjust); - hGradient->setColors(QColor("black"), QColor("white")); + hGradient->setColors(TQColor("black"), TQColor("white")); m_cInput = new RIntNumInput(lightnessadjust); m_cInput->input()->setLabel(i18n("Contrast:"), AlignLeft | AlignVCenter); m_cInput->setRange(-100, 100, 1); m_cInput->setDefaultValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); fourPageLayout->addMultiCellWidget(vGradient, 0, 0, 0, 0); fourPageLayout->addMultiCellWidget(spacev, 0, 0, 1, 1); @@ -455,78 +455,78 @@ ICCProofTool::ICCProofTool(QObject* parent) // ------------------------------------------------------------- - connect(lcmsLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processLCMSURL(const QString&))); + connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processLCMSURL(const TQString&))); - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_renderingIntentsCB, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_renderingIntentsCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); //-- Check box options connections ------------------------------------------- - connect(m_doSoftProofBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_doSoftProofBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_checkGamutBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_checkGamutBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_BPCBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_BPCBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); //-- Button Group ICC profile options connections ---------------------------- - connect(m_inProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_inProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); - connect(m_spaceProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_spaceProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); - connect(m_proofProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_proofProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); //-- url requester ICC profile connections ----------------------------------- - connect(m_inProfilesPath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_inProfilesPath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); - connect(m_spaceProfilePath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_spaceProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); - connect(m_proofProfilePath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_proofProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); //-- Image preview widget connections ---------------------------- - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); //-- ICC profile preview connections ----------------------------- - connect(inProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotInICCInfo())); + connect(inProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotInICCInfo())); - connect(spaceProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotSpaceICCInfo())); + connect(spaceProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSpaceICCInfo())); - connect(proofProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotProofICCInfo())); + connect(proofProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotProofICCInfo())); } ICCProofTool::~ICCProofTool() @@ -537,7 +537,7 @@ ICCProofTool::~ICCProofTool() void ICCProofTool::readSettings() { - QString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = KGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -554,13 +554,13 @@ void ICCProofTool::readSettings() m_spacePath = config->readPathEntry("WorkProfileFile"); m_proofPath = config->readPathEntry("ProofProfileFile"); - if (QFile::exists(config->readPathEntry("DefaultPath"))) + if (TQFile::exists(config->readPathEntry("DefaultPath"))) { defaultICCPath = config->readPathEntry("DefaultPath"); } else { - QString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\ + TQString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\ options.<p>Please fix this in the digiKam ICC setup."); slotToggledWidgets( false ); KMessageBox::information(kapp->activeWindow(), message); @@ -593,8 +593,8 @@ void ICCProofTool::readSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentPoint%1").arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -635,7 +635,7 @@ void ICCProofTool::writeSettings() for (int j = 0; j < 17; j++) { - QPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); + TQPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -643,14 +643,14 @@ void ICCProofTool::writeSettings() p.setY(p.y() / 255); } - config->writeEntry(QString("CurveAjustmentPoint%1").arg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); } m_previewWidget->writeSettings(); config->sync(); } -void ICCProofTool::processLCMSURL(const QString& url) +void ICCProofTool::processLCMSURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -671,32 +671,32 @@ void ICCProofTool::slotChannelChanged( int channel ) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ICCProofTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ICCProofTool::slotResetSettings() @@ -735,9 +735,9 @@ void ICCProofTool::slotEffect() DImg preview(w, h, sb, a, m_destinationPreviewData); - QString tmpInPath = QString(); - QString tmpProofPath = QString(); - QString tmpSpacePath = QString(); + TQString tmpInPath = TQString(); + TQString tmpProofPath = TQString(); + TQString tmpSpacePath = TQString(); bool proofCondition = false; bool spaceCondition = false; @@ -751,7 +751,7 @@ void ICCProofTool::slotEffect() else if (useSelectedInProfile()) { tmpInPath = m_inProfilesPath->url(); - QFileInfo info(tmpInPath); + TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -770,7 +770,7 @@ void ICCProofTool::slotEffect() else { tmpProofPath = m_proofProfilePath->url(); - QFileInfo info(tmpProofPath); + TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -792,7 +792,7 @@ void ICCProofTool::slotEffect() else { tmpSpacePath = m_spaceProfilePath->url(); - QFileInfo info(tmpSpacePath); + TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -834,7 +834,7 @@ void ICCProofTool::slotEffect() if ( proofCondition || spaceCondition ) { kapp->restoreOverrideCursor(); - QString error = i18n("<p>Your settings are not sufficient.</p>" + TQString error = i18n("<p>Your settings are not sufficient.</p>" "<p>To apply a color transform, you need at least two ICC profiles:</p>" "<ul><li>An \"Input\" profile.</li>" "<li>A \"Workspace\" profile.</li></ul>" @@ -852,7 +852,7 @@ void ICCProofTool::slotEffect() } else { - QByteArray fakeProfile = QByteArray(); + TQByteArray fakeProfile = TQByteArray(); transform.apply(preview, fakeProfile, m_renderingIntentsCB->currentItem(), useBPC(), m_checkGamutBox->isChecked(), useBuiltinProfile()); } @@ -899,9 +899,9 @@ void ICCProofTool::finalRendering() DImg img(w, h, sb, a, data); - QString tmpInPath; - QString tmpProofPath; - QString tmpSpacePath; + TQString tmpInPath; + TQString tmpProofPath; + TQString tmpSpacePath; bool proofCondition; //-- Input profile parameters ------------------ @@ -913,7 +913,7 @@ void ICCProofTool::finalRendering() else if (useSelectedInProfile()) { tmpInPath = m_inProfilesPath->url(); - QFileInfo info(tmpInPath); + TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -932,7 +932,7 @@ void ICCProofTool::finalRendering() else { tmpProofPath = m_proofProfilePath->url(); - QFileInfo info(tmpProofPath); + TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -954,7 +954,7 @@ void ICCProofTool::finalRendering() else { tmpSpacePath = m_spaceProfilePath->url(); - QFileInfo info(tmpSpacePath); + TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile()) { KMessageBox::information(kapp->activeWindow(), @@ -998,7 +998,7 @@ void ICCProofTool::finalRendering() } else { - QByteArray fakeProfile = QByteArray(); + TQByteArray fakeProfile = TQByteArray(); transform.apply(img, fakeProfile, m_renderingIntentsCB->currentItem(), useBPC(), m_checkGamutBox->isChecked(), useBuiltinProfile()); } @@ -1008,7 +1008,7 @@ void ICCProofTool::finalRendering() if (m_embeddProfileBox->isChecked()) { iface->setEmbeddedICCToOriginalImage(tmpSpacePath); - DDebug() << k_funcinfo << QFile::encodeName(tmpSpacePath) << endl; + DDebug() << k_funcinfo << TQFile::encodeName(tmpSpacePath) << endl; } //-- Calculate and apply the curve on image after transformation ------------- @@ -1046,7 +1046,7 @@ void ICCProofTool::slotInICCInfo() } else if (useBuiltinProfile()) { - QString message = i18n("<p>You have selected the \"Default builtin sRGB profile\"</p>"); + TQString message = i18n("<p>You have selected the \"Default builtin sRGB profile\"</p>"); message.append(i18n("<p>This profile is built on the fly, so there is no relevant information " "about it.</p>")); KMessageBox::information(kapp->activeWindow(), message); @@ -1085,7 +1085,7 @@ void ICCProofTool::slotSpaceICCInfo() } } -void ICCProofTool::getICCInfo(const QString& profile) +void ICCProofTool::getICCInfo(const TQString& profile) { if (profile.isEmpty()) { @@ -1099,7 +1099,7 @@ void ICCProofTool::getICCInfo(const QString& profile) infoDlg.exec(); } -void ICCProofTool::getICCInfo(const QByteArray& profile) +void ICCProofTool::getICCInfo(const TQByteArray& profile) { if (profile.isNull()) { @@ -1109,7 +1109,7 @@ void ICCProofTool::getICCInfo(const QByteArray& profile) return; } - ICCProfileInfoDlg infoDlg(kapp->activeWindow(), QString(), profile); + ICCProfileInfoDlg infoDlg(kapp->activeWindow(), TQString(), profile); infoDlg.exec(); } @@ -1117,7 +1117,7 @@ void ICCProofTool::slotCMDisabledWarning() { if (!m_cmEnabled) { - QString message = i18n("<p>You have not enabled Color Management in the digiKam preferences.</p>"); + TQString message = i18n("<p>You have not enabled Color Management in the digiKam preferences.</p>"); message.append(i18n("<p>\"Use of default profile\" options will be disabled now.</p>")); KMessageBox::information(kapp->activeWindow(), message); slotToggledWidgets(false); @@ -1187,22 +1187,22 @@ bool ICCProofTool::useDefaultProofProfile() void ICCProofTool::slotLoadSettings() { KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString("*"), kapp->activeWindow(), - QString(i18n("Color Management Settings File to Load"))); + TQString("*"), kapp->activeWindow(), + TQString(i18n("Color Management Settings File to Load"))); if (loadColorManagementFile.isEmpty()) return; - QFile file(loadColorManagementFile.path()); + TQFile file(loadColorManagementFile.path()); if (file.open(IO_ReadOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); if (stream.readLine() != "# Color Management Configuration File") { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Color Management settings text file.") - .arg(loadColorManagementFile.fileName())); + .tqarg(loadColorManagementFile.fileName())); file.close(); return; } @@ -1230,8 +1230,8 @@ void ICCProofTool::slotLoadSettings() for (int j = 0; j < 17; j++) { - QPoint disable(-1, -1); - QPoint p; + TQPoint disable(-1, -1); + TQPoint p; p.setX(stream.readLine().toInt()); p.setY(stream.readLine().toInt()); @@ -1264,16 +1264,16 @@ void ICCProofTool::slotLoadSettings() void ICCProofTool::slotSaveAsSettings() { KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString(i18n("Color Management Settings File to Save"))); + TQString( "*" ), kapp->activeWindow(), + TQString(i18n("Color Management Settings File to Save"))); if (saveColorManagementFile.isEmpty()) return; - QFile file(saveColorManagementFile.path()); + TQFile file(saveColorManagementFile.path()); if (file.open(IO_WriteOnly)) { - QTextStream stream(&file); + TQTextStream stream(&file); stream << "# Color Management Configuration File\n"; stream << m_renderingIntentsCB->currentItem() << "\n"; stream << m_doSoftProofBox->isChecked() << "\n"; @@ -1290,7 +1290,7 @@ void ICCProofTool::slotSaveAsSettings() for (int j = 0; j < 17; j++) { - QPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); + TQPoint p = m_curvesWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit()) { p.setX(p.x() / 255); diff --git a/digikam/imageplugins/coreplugin/iccprooftool.h b/digikam/imageplugins/coreplugin/iccprooftool.h index cd1d783..0481fc8 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.h +++ b/digikam/imageplugins/coreplugin/iccprooftool.h @@ -30,14 +30,14 @@ #include "editortool.h" -class QCheckBox; -class QComboBox; -class QVButtonGroup; -class QButtonGroup; -class QHButtonGroup; -class QRadioButton; -class QPushButton; -class QToolBox; +class TQCheckBox; +class TQComboBox; +class TQVButtonGroup; +class TQButtonGroup; +class TQHButtonGroup; +class TQRadioButton; +class TQPushButton; +class TQToolBox; class KURLRequester; @@ -64,10 +64,11 @@ namespace DigikamImagesPluginCore class ICCProofTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - ICCProofTool(QObject* parent); + ICCProofTool(TQObject* tqparent); ~ICCProofTool(); protected: @@ -79,8 +80,8 @@ private: void readSettings(); void writeSettings(); - void getICCInfo(const QString&); - void getICCInfo(const QByteArray&); + void getICCInfo(const TQString&); + void getICCInfo(const TQByteArray&); bool useBPC(); bool doProof(); @@ -113,7 +114,7 @@ private slots: void slotProofICCInfo(); void slotSpaceICCInfo(); void slotCMDisabledWarning(); - void processLCMSURL(const QString&); + void processLCMSURL(const TQString&); private: @@ -145,38 +146,38 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QCheckBox *m_doSoftProofBox; - QCheckBox *m_checkGamutBox; - QCheckBox *m_embeddProfileBox; - QCheckBox *m_BPCBox; + TQCheckBox *m_doSoftProofBox; + TQCheckBox *m_checkGamutBox; + TQCheckBox *m_embeddProfileBox; + TQCheckBox *m_BPCBox; - QRadioButton *m_useEmbeddedProfile; - QRadioButton *m_useInDefaultProfile; - QRadioButton *m_useInSelectedProfile; - QRadioButton *m_useProofDefaultProfile; - QRadioButton *m_useProofSelectedProfile; - QRadioButton *m_useSpaceDefaultProfile; - QRadioButton *m_useSpaceSelectedProfile; - QRadioButton *m_useSRGBDefaultProfile; + TQRadioButton *m_useEmbeddedProfile; + TQRadioButton *m_useInDefaultProfile; + TQRadioButton *m_useInSelectedProfile; + TQRadioButton *m_useProofDefaultProfile; + TQRadioButton *m_useProofSelectedProfile; + TQRadioButton *m_useSpaceDefaultProfile; + TQRadioButton *m_useSpaceSelectedProfile; + TQRadioButton *m_useSRGBDefaultProfile; - QString m_inPath; - QString m_spacePath; - QString m_proofPath; + TQString m_inPath; + TQString m_spacePath; + TQString m_proofPath; - QButtonGroup *m_optionsBG; - QButtonGroup *m_inProfileBG; - QButtonGroup *m_spaceProfileBG; - QButtonGroup *m_proofProfileBG; + TQButtonGroup *m_optionsBG; + TQButtonGroup *m_inProfileBG; + TQButtonGroup *m_spaceProfileBG; + TQButtonGroup *m_proofProfileBG; - QHButtonGroup *m_scaleBG; - QVButtonGroup *m_renderingIntentBG; - QVButtonGroup *m_profilesBG; + TQHButtonGroup *m_scaleBG; + TQVButtonGroup *m_renderingIntentBG; + TQVButtonGroup *m_profilesBG; - QByteArray m_embeddedICC; + TQByteArray m_embeddedICC; - QToolBox *m_toolBoxWidgets; + TQToolBox *m_toolBoxWidgets; KURLRequester *m_inProfilesPath; KURLRequester *m_spaceProfilePath; diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index 1d4a232..7842d54 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -21,28 +21,28 @@ * * ============================================================ */ - // Qt includes. + // TQt includes. -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qradiobutton.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqradiobutton.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -71,8 +71,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Auto Color Correction"), +ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Auto Color Correction"), "autocorrection", false), m_destinationPreviewData(0L) { setHelp("autocolorcorrectiontool.anchor", "digikam"); @@ -88,50 +88,50 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(QWidget* parent) // ------------------------------------------------------------- Digikam::ImageIface iface(0, 0); - m_thumbnailImage = iface.getOriginalImg()->smoothScale(128, 128, QSize::ScaleMin); + m_thumbnailImage = iface.getOriginalImg()->smoothScale(128, 128, TQSize::ScaleMin); - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 4, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -141,27 +141,27 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - m_correctionTools = new QListBox(gboxSettings); + m_correctionTools = new TQListBox(gboxSettings); m_correctionTools->setColumnMode(1); m_correctionTools->setVariableWidth(false); m_correctionTools->setVariableHeight(false); Digikam::ListBoxWhatsThis* whatsThis = new Digikam::ListBoxWhatsThis(m_correctionTools); - QPixmap pix = getThumbnailForEffect(AutoLevelsCorrection); + TQPixmap pix = getThumbnailForEffect(AutoLevelsCorrection); Digikam::ListBoxPreviewItem *item = new Digikam::ListBoxPreviewItem(pix, i18n("Auto Levels")); whatsThis->add( item, i18n("<b>Auto Levels</b>:" "<p>This option maximizes the tonal range in the Red, " @@ -220,20 +220,20 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_correctionTools, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_correctionTools, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); } ImageEffect_AutoCorrection::~ImageEffect_AutoCorrection() @@ -253,32 +253,32 @@ void ImageEffect_AutoCorrection::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_AutoCorrection::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DColor &color ) @@ -341,7 +341,7 @@ void ImageEffect_AutoCorrection::slotEffect() kapp->restoreOverrideCursor(); } -QPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType type) +TQPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType type) { Digikam::DImg thumb = m_thumbnailImage.copy(); autoCorrection(thumb.bits(), thumb.width(), thumb.height(), thumb.sixteenBit(), type); @@ -362,7 +362,7 @@ void ImageEffect_AutoCorrection::finalRendering() { int type = m_correctionTools->currentItem(); autoCorrection(data, w, h, sb, type); - QString name; + TQString name; switch (type) { diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h index 286fc01..638930e 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.h @@ -24,18 +24,18 @@ #ifndef IMAGEEFFECT_AUTOCORRECTION_H #define IMAGEEFFECT_AUTOCORRECTION_H -// Qt Includes. +// TQt Includes. -#include <qstring.h> +#include <tqstring.h> // Digikam include. #include "imagedlgbase.h" -class QHButtonGroup; -class QComboBox; -class QListBox; -class QButtonGroup; +class TQHButtonGroup; +class TQComboBox; +class TQListBox; +class TQButtonGroup; namespace Digikam { @@ -52,10 +52,11 @@ namespace DigikamImagesPluginCore class ImageEffect_AutoCorrection : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_AutoCorrection(QWidget *parent); + ImageEffect_AutoCorrection(TQWidget *tqparent); ~ImageEffect_AutoCorrection(); protected: @@ -87,7 +88,7 @@ private: void resetValues(); void autoCorrection(uchar *data, int w, int h, bool sb, int type); - QPixmap getThumbnailForEffect(AutoCorrectionType type); + TQPixmap getThumbnailForEffect(AutoCorrectionType type); private: @@ -107,11 +108,11 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QListBox *m_correctionTools; + TQListBox *m_correctionTools; Digikam::ImageWidget *m_previewWidget; diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index 9607e04..e523e99 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -23,23 +23,23 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -67,8 +67,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_BCG::ImageEffect_BCG(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Brightness Contrast Gamma Adjustments"), +ImageEffect_BCG::ImageEffect_BCG(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Brightness Contrast Gamma Adjustments"), "bcgadjust", false) { m_destinationPreviewData = 0L; @@ -83,48 +83,48 @@ ImageEffect_BCG::ImageEffect_BCG(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 9, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -134,42 +134,42 @@ ImageEffect_BCG::ImageEffect_BCG(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Brightness:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Brightness:"), gboxSettings); m_bInput = new KIntNumInput(gboxSettings); m_bInput->setRange(-100, 100, 1, true); m_bInput->setValue(0); - QWhatsThis::add( m_bInput, i18n("<p>Set here the brightness adjustment of the image.")); + TQWhatsThis::add( m_bInput, i18n("<p>Set here the brightness adjustment of the image.")); gridSettings->addMultiCellWidget(label2, 3, 3, 0, 4); gridSettings->addMultiCellWidget(m_bInput, 4, 4, 0, 4); - QLabel *label3 = new QLabel(i18n("Contrast:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Contrast:"), gboxSettings); m_cInput = new KIntNumInput(gboxSettings); m_cInput->setRange(-100, 100, 1, true); m_cInput->setValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); gridSettings->addMultiCellWidget(label3, 5, 5, 0, 4); gridSettings->addMultiCellWidget(m_cInput, 6, 6, 0, 4); - QLabel *label4 = new QLabel(i18n("Gamma:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Gamma:"), gboxSettings); m_gInput = new KDoubleNumInput(gboxSettings); m_gInput->setPrecision(2); m_gInput->setRange(0.1, 3.0, 0.01, true); m_gInput->setValue(1.0); - QWhatsThis::add( m_gInput, i18n("<p>Set here the gamma adjustment of the image.")); + TQWhatsThis::add( m_gInput, i18n("<p>Set here the gamma adjustment of the image.")); gridSettings->addMultiCellWidget(label4, 7, 7, 0, 4); gridSettings->addMultiCellWidget(m_gInput, 8, 8, 0, 4); @@ -178,26 +178,26 @@ ImageEffect_BCG::ImageEffect_BCG(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_bInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_gInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_gInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -221,32 +221,32 @@ void ImageEffect_BCG::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_BCG::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.h b/digikam/imageplugins/coreplugin/imageeffect_bcg.h index c2ce110..165bb6f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.h @@ -30,9 +30,9 @@ #include "imagedlgbase.h" -class QCheckBox; -class QComboBox; -class QHButtonGroup; +class TQCheckBox; +class TQComboBox; +class TQHButtonGroup; class KIntNumInput; class KDoubleNumInput; @@ -51,10 +51,11 @@ namespace DigikamImagesPluginCore class ImageEffect_BCG : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_BCG(QWidget *parent); + ImageEffect_BCG(TQWidget *tqparent); ~ImageEffect_BCG(); private slots: @@ -89,9 +90,9 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KIntNumInput *m_bInput; KIntNumInput *m_cInput; diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp index d11d156..e90fc8b 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> // KDE includes. @@ -50,20 +50,20 @@ namespace DigikamImagesPluginCore { -ImageEffect_Blur::ImageEffect_Blur(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Apply Gaussian Blur on Photograph"), +ImageEffect_Blur::ImageEffect_Blur(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Gaussian Blur on Photograph"), "gaussianblur", false, true, true) { setHelp("blursharpentool.anchor", "digikam"); - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 1, 1, 0, spacingHint()); - QLabel *label = new QLabel(i18n("Smoothness:"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint()); + TQLabel *label = new TQLabel(i18n("Smoothness:"), gboxSettings); m_radiusInput = new KIntNumInput(gboxSettings); m_radiusInput->setRange(0, 100, 1, true); m_radiusInput->setValue(0); - QWhatsThis::add( m_radiusInput, i18n("<p>A smoothness of 0 has no effect, " + TQWhatsThis::add( m_radiusInput, i18n("<p>A smoothness of 0 has no effect, " "1 and above determine the Gaussian blur matrix radius " "that determines how much to blur the image.")); diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.h b/digikam/imageplugins/coreplugin/imageeffect_blur.h index c0448f7..a2383d7 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_blur.h +++ b/digikam/imageplugins/coreplugin/imageeffect_blur.h @@ -36,10 +36,11 @@ namespace DigikamImagesPluginCore class ImageEffect_Blur : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Blur(QWidget *parent); + ImageEffect_Blur(TQWidget *tqparent); ~ImageEffect_Blur(); private slots: diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 11aed2f..b5a79d0 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -22,27 +22,27 @@ * * ============================================================ */ - // Qt includes. + // TQt includes. -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qlistbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qintdict.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qvbox.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqlistbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqintdict.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqvbox.h> // KDE includes. @@ -79,44 +79,44 @@ namespace DigikamImagesPluginCore { -class PreviewPixmapFactory : public QObject +class PreviewPixmapFactory : public TQObject { public: PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia); - void invalidate() { m_previewPixmapMap.clear(); } + void tqinvalidate() { m_previewPixmapMap.clear(); } - const QPixmap* pixmap(int id); + const TQPixmap* pixmap(int id); private: - QPixmap makePixmap(int id); + TQPixmap makePixmap(int id); - QIntDict<QPixmap> m_previewPixmapMap; + TQIntDict<TQPixmap> m_previewPixmapMap; ImageEffect_BWSepia *m_bwSepia; }; PreviewPixmapFactory::PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia) - : QObject(bwSepia), m_bwSepia(bwSepia) + : TQObject(bwSepia), m_bwSepia(bwSepia) { m_previewPixmapMap.setAutoDelete(true); } -const QPixmap* PreviewPixmapFactory::pixmap(int id) +const TQPixmap* PreviewPixmapFactory::pixmap(int id) { - if (m_previewPixmapMap.find(id) == 0) + if (m_previewPixmapMap.tqfind(id) == 0) { - QPixmap pix = makePixmap(id); - m_previewPixmapMap.insert(id, new QPixmap(pix)); + TQPixmap pix = makePixmap(id); + m_previewPixmapMap.insert(id, new TQPixmap(pix)); } - QPixmap* res = m_previewPixmapMap[id]; + TQPixmap* res = m_previewPixmapMap[id]; return res; } -QPixmap PreviewPixmapFactory::makePixmap(int id) +TQPixmap PreviewPixmapFactory::makePixmap(int id) { return m_bwSepia->getThumbnailForEffect(id); } @@ -128,15 +128,15 @@ class ListBoxBWPreviewItem : public Digikam::ListBoxPreviewItem public: - ListBoxBWPreviewItem(QListBox *listbox, const QString &text, + ListBoxBWPreviewItem(TQListBox *listbox, const TQString &text, PreviewPixmapFactory* factory, int id) - : ListBoxPreviewItem(listbox, QPixmap(), text) + : ListBoxPreviewItem(listbox, TQPixmap(), text) { m_previewPixmapFactory = factory; m_id = id; }; - virtual const QPixmap* pixmap() const; + virtual const TQPixmap* pixmap() const; private: @@ -144,15 +144,15 @@ private: PreviewPixmapFactory* m_previewPixmapFactory; }; -const QPixmap* ListBoxBWPreviewItem::pixmap() const +const TQPixmap* ListBoxBWPreviewItem::pixmap() const { return m_previewPixmapFactory->pixmap(m_id); } // ----------------------------------------------------------------------------------- -ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Convert to Black & White"), +ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Convert to Black & White"), "convertbw", true, false), m_destinationPreviewData(0L), m_channelCB(0), @@ -172,7 +172,7 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) Digikam::ImageIface iface(0, 0); m_originalImage = iface.getOriginalImg(); - m_thumbnailImage = m_originalImage->smoothScale(128, 128, QSize::ScaleMin); + m_thumbnailImage = m_originalImage->smoothScale(128, 128, TQSize::ScaleMin); m_curves = new Digikam::ImageCurves(m_originalImage->sixteenBit()); // ------------------------------------------------------------- @@ -185,48 +185,48 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 4, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 4, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -236,15 +236,15 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); @@ -252,7 +252,7 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) m_tab = new KTabWidget(gboxSettings); - m_bwFilm = new QListBox(m_tab); + m_bwFilm = new TQListBox(m_tab); m_bwFilm->setColumnMode(1); m_bwFilm->setVariableWidth(false); m_bwFilm->setVariableHeight(false); @@ -337,10 +337,10 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) // ------------------------------------------------------------- - QVBox *vbox = new QVBox(m_tab); + TQVBox *vbox = new TQVBox(m_tab); vbox->setSpacing(spacingHint()); - m_bwFilters = new QListBox(vbox); + m_bwFilters = new TQListBox(vbox); m_bwFilters->setColumnMode(1); m_bwFilters->setVariableWidth(false); m_bwFilters->setVariableHeight(false); @@ -385,11 +385,11 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) m_strengthInput->setLabel(i18n("Strength:"), AlignLeft | AlignVCenter); m_strengthInput->setRange(1, 5, 1, true); m_strengthInput->setValue(1); - QWhatsThis::add(m_strengthInput, i18n("<p>Here, set the strength adjustment of the lens filter.")); + TQWhatsThis::add(m_strengthInput, i18n("<p>Here, set the strength adjustment of the lens filter.")); // ------------------------------------------------------------- - m_bwTone = new QListBox(m_tab); + m_bwTone = new TQListBox(m_tab); m_bwTone->setColumnMode(1); m_bwTone->setVariableWidth(false); m_bwTone->setVariableHeight(false); @@ -440,35 +440,35 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) // ------------------------------------------------------------- - QWidget *curveBox = new QWidget( m_tab ); - QGridLayout *gridTab2 = new QGridLayout(curveBox, 5, 2, spacingHint(), 0); + TQWidget *curveBox = new TQWidget( m_tab ); + TQGridLayout *gridTab2 = new TQGridLayout(curveBox, 5, 2, spacingHint(), 0); Digikam::ColorGradientWidget* vGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Vertical, 10, curveBox ); - vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); - QLabel *spacev = new QLabel(curveBox); + TQLabel *spacev = new TQLabel(curveBox); spacev->setFixedWidth(1); m_curvesWidget = new Digikam::CurvesWidget(256, 256, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), m_curves, curveBox); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); - QLabel *spaceh = new QLabel(curveBox); + TQLabel *spaceh = new TQLabel(curveBox); spaceh->setFixedHeight(1); Digikam::ColorGradientWidget *hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, curveBox ); - hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_cInput = new KIntNumInput(curveBox); m_cInput->setLabel(i18n("Contrast:"), AlignLeft | AlignVCenter); m_cInput->setRange(-100, 100, 1, true); m_cInput->setValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); gridTab2->addMultiCellWidget(vGradient, 0, 0, 0, 0); gridTab2->addMultiCellWidget(spacev, 0, 0, 1, 1); @@ -492,38 +492,38 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotSpotColorChanged(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotSpotColorChanged(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_bwFilters, SIGNAL(highlighted(int)), - this, SLOT(slotFilterSelected(int))); + connect(m_bwFilters, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotFilterSelected(int))); - connect(m_strengthInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_strengthInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_bwFilm, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_bwFilm, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_bwTone, SIGNAL(highlighted(int)), - this, SLOT(slotEffect())); + connect(m_bwTone, TQT_SIGNAL(highlighted(int)), + this, TQT_SLOT(slotEffect())); - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); } ImageEffect_BWSepia::~ImageEffect_BWSepia() @@ -548,7 +548,7 @@ void ImageEffect_BWSepia::slotFilterSelected(int filter) slotEffect(); } -QPixmap ImageEffect_BWSepia::getThumbnailForEffect(int type) +TQPixmap ImageEffect_BWSepia::getThumbnailForEffect(int type) { Digikam::DImg thumb = m_thumbnailImage.copy(); int w = thumb.width(); @@ -592,34 +592,34 @@ void ImageEffect_BWSepia::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_BWSepia::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); m_curvesWidget->m_scaleType = scale; - m_curvesWidget->repaint(false); + m_curvesWidget->tqrepaint(false); } void ImageEffect_BWSepia::slotSpotColorChanged(const Digikam::DColor &color) @@ -654,8 +654,8 @@ void ImageEffect_BWSepia::readUserSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentPoint%1").arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -689,7 +689,7 @@ void ImageEffect_BWSepia::writeUserSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); + TQPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -697,7 +697,7 @@ void ImageEffect_BWSepia::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(QString("CurveAjustmentPoint%1").arg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); } config->sync(); @@ -729,7 +729,7 @@ void ImageEffect_BWSepia::resetValues() m_strengthInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->invalidate(); + m_previewPixmapFactory->tqinvalidate(); 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->invalidate(); + m_previewPixmapFactory->tqinvalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); } @@ -846,7 +846,7 @@ void ImageEffect_BWSepia::finalRendering() void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type) { - // Value to multiply RGB 8 bits component of mask used by changeTonality() method. + // Value to multiply RGB 8 bits component of tqmask used by changeTonality() method. int mul = sb ? 255 : 1; Digikam::DImgImageFilters filter; double strength = 1.0 + ((double)m_strengthInput->value() - 1.0) * (1.0 / 3.0); @@ -1070,22 +1070,22 @@ void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, boo void ImageEffect_BWSepia::slotUser3() { KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Black & White Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) return; - QFile file(loadFile.path()); + TQFile file(loadFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Black & White Configuration File" ) { KMessageBox::error(this, i18n("\"%1\" is not a Black & White settings text file.") - .arg(loadFile.fileName())); + .tqarg(loadFile.fileName())); file.close(); return; } @@ -1106,8 +1106,8 @@ void ImageEffect_BWSepia::slotUser3() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p; + TQPoint disable(-1, -1); + TQPoint p; p.setX( stream.readLine().toInt() ); p.setY( stream.readLine().toInt() ); @@ -1128,7 +1128,7 @@ void ImageEffect_BWSepia::slotUser3() m_cInput->blockSignals(false); m_histogramWidget->reset(); - m_previewPixmapFactory->invalidate(); + m_previewPixmapFactory->tqinvalidate(); m_bwFilters->triggerUpdate(false); m_bwTone->triggerUpdate(false); @@ -1145,16 +1145,16 @@ void ImageEffect_BWSepia::slotUser3() void ImageEffect_BWSepia::slotUser2() { KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Black & White Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Black & White Settings File to Save")) ); if( saveFile.isEmpty() ) return; - QFile file(saveFile.path()); + TQFile file(saveFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Black & White Configuration File\n"; stream << m_bwFilters->currentItem() << "\n"; stream << m_bwTone->currentItem() << "\n"; @@ -1162,7 +1162,7 @@ void ImageEffect_BWSepia::slotUser2() for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); + TQPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit()) { p.setX(p.x()/255); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h index 49e8c66..5a31f0d 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.h @@ -26,17 +26,17 @@ #ifndef IMAGEEFFECT_BWSEPIA_H #define IMAGEEFFECT_BWSEPIA_H -// Qt Includes. +// TQt Includes. -#include <qstring.h> +#include <tqstring.h> // Digikam include. #include "imagedlgbase.h" -class QHButtonGroup; -class QComboBox; -class QButtonGroup; +class TQHButtonGroup; +class TQComboBox; +class TQButtonGroup; class KIntNumInput; class KTabWidget; @@ -60,17 +60,18 @@ class PreviewPixmapFactory; class ImageEffect_BWSepia : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_BWSepia(QWidget *parent); + ImageEffect_BWSepia(TQWidget *tqparent); ~ImageEffect_BWSepia(); friend class PreviewPixmapFactory; protected: - QPixmap getThumbnailForEffect(int type); + TQPixmap getThumbnailForEffect(int type); void finalRendering(); protected slots: @@ -160,13 +161,13 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QListBox *m_bwFilters; - QListBox *m_bwFilm; - QListBox *m_bwTone; + TQListBox *m_bwFilters; + TQListBox *m_bwFilm; + TQListBox *m_bwTone; KIntNumInput *m_cInput; KIntNumInput *m_strengthInput; diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index 34c32f8..bc0908d 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -23,28 +23,28 @@ * * ============================================================ */ -// Qt includes. - -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qhbuttongroup.h> -#include <qvbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qpoint.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qradiobutton.h> -#include <qfile.h> -#include <qtoolbox.h> -#include <qtextstream.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqhbuttongroup.h> +#include <tqvbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqpoint.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqradiobutton.h> +#include <tqfile.h> +#include <tqtoolbox.h> +#include <tqtextstream.h> // KDE includes. @@ -89,8 +89,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) - : Digikam::ImageDlgBase(parent,i18n("Color Management"), +ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent,i18n("Color Management"), "colormanagement", true, false) { m_destinationPreviewData = 0; @@ -111,49 +111,49 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) // ------------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout *gridSettings = new QGridLayout( gboxSettings, 3, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout *gridSettings = new TQGridLayout( gboxSettings, 3, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel: "), gboxSettings); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Channel: "), gboxSettings); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, gboxSettings); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red channel values.<p>" "<b>Green</b>: display the green channel values.<p>" "<b>Blue</b>: display the blue channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal values are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal values are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -163,56 +163,56 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "of the selected image channel. " "This one is updated after setting changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 2); // ------------------------------------------------------------- - m_toolBoxWidgets = new QToolBox(gboxSettings); - QWidget *generalOptions = new QWidget(m_toolBoxWidgets); - QWidget *inProfiles = new QWidget(m_toolBoxWidgets); - QWidget *spaceProfiles = new QWidget(m_toolBoxWidgets); - QWidget *proofProfiles = new QWidget(m_toolBoxWidgets); - QWidget *lightnessadjust = new QWidget(m_toolBoxWidgets); + m_toolBoxWidgets = new TQToolBox(gboxSettings); + TQWidget *generalOptions = new TQWidget(m_toolBoxWidgets); + TQWidget *inProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *spaceProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *proofProfiles = new TQWidget(m_toolBoxWidgets); + TQWidget *lightnessadjust = new TQWidget(m_toolBoxWidgets); //---------- "General" Page Setup ---------------------------------- m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions, SmallIconSet("misc"), i18n("General Settings")); - QWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); + TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); - QGridLayout *zeroPageLayout = new QGridLayout(generalOptions, 5, 1, spacingHint()); + TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1, spacingHint()); - m_doSoftProofBox = new QCheckBox(generalOptions); + m_doSoftProofBox = new TQCheckBox(generalOptions); m_doSoftProofBox->setText(i18n("Soft-proofing")); - QWhatsThis::add(m_doSoftProofBox, i18n("<p>Rendering emulation of the device described " + TQWhatsThis::add(m_doSoftProofBox, i18n("<p>Rendering emulation of the device described " "by the \"Proofing\" profile. Useful to preview the final " "result without rendering to physical medium.</p>")); - m_checkGamutBox = new QCheckBox(generalOptions); + m_checkGamutBox = new TQCheckBox(generalOptions); m_checkGamutBox->setText(i18n("Check gamut")); - QWhatsThis::add(m_checkGamutBox, i18n("<p>You can use this option if you want to show " + TQWhatsThis::add(m_checkGamutBox, i18n("<p>You can use this option if you want to show " "the colors that are outside the printer's gamut<p>")); - m_embeddProfileBox = new QCheckBox(generalOptions); + m_embeddProfileBox = new TQCheckBox(generalOptions); m_embeddProfileBox->setChecked(true); m_embeddProfileBox->setText(i18n("Assign profile")); - QWhatsThis::add(m_embeddProfileBox, i18n("<p>You can use this option to embed " + TQWhatsThis::add(m_embeddProfileBox, i18n("<p>You can use this option to embed " "the selected workspace color profile into the image.</p>")); - m_BPCBox = new QCheckBox(generalOptions); + m_BPCBox = new TQCheckBox(generalOptions); m_BPCBox->setText(i18n("Use BPC")); - QWhatsThis::add(m_BPCBox, i18n("<p>The Black Point Compensation (BPC) feature does work in conjunction " + TQWhatsThis::add(m_BPCBox, i18n("<p>The Black Point Compensation (BPC) feature does work in conjunction " "with Relative Colorimetric Intent. Perceptual intent should make no " "difference, since BPC is always on, and in Absolute Colorimetric " "Intent it is always turned off.</p>" @@ -220,13 +220,13 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) "With BPC the dark tones are optimally mapped (no clipping) from original media " "to the destination rendering media, e.g. the combination of paper and ink.</p>")); - QLabel *intent = new QLabel(i18n("Rendering Intent:"), generalOptions); - m_renderingIntentsCB = new QComboBox(false, generalOptions); + TQLabel *intent = new TQLabel(i18n("Rendering Intent:"), generalOptions); + m_renderingIntentsCB = new TQComboBox(false, generalOptions); m_renderingIntentsCB->insertItem("Perceptual"); m_renderingIntentsCB->insertItem("Absolute Colorimetric"); m_renderingIntentsCB->insertItem("Relative Colorimetric"); m_renderingIntentsCB->insertItem("Saturation"); - QWhatsThis::add( m_renderingIntentsCB, i18n("<ul><li>Perceptual intent causes the full gamut " + TQWhatsThis::add( m_renderingIntentsCB, i18n("<ul><li>Perceptual intent causes the full gamut " "of the image to be compressed or expanded to fill the gamut of the destination media, " "so that gray balance is preserved but colorimetric accuracy may not be preserved.<br>" "In other words, if certain colors in an image fall outside of the range of colors that " @@ -253,13 +253,13 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) "specific color.</li></ul>")); KURLLabel *lcmsLogoLabel = new KURLLabel(generalOptions); - lcmsLogoLabel->setAlignment( AlignTop | AlignRight ); - lcmsLogoLabel->setText(QString()); + lcmsLogoLabel->tqsetAlignment( AlignTop | AlignRight ); + lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); - lcmsLogoLabel->setPixmap( QPixmap( directory + "logo-lcms.png" ) ); - QToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); + lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) ); + TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); zeroPageLayout->addMultiCellWidget(m_doSoftProofBox, 0, 0, 0, 0); zeroPageLayout->addMultiCellWidget(m_checkGamutBox, 1, 1, 0, 0); @@ -273,26 +273,26 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) //---------- "Input" Page Setup ---------------------------------- m_toolBoxWidgets->insertItem(INPUTPAGE, inProfiles, SmallIconSet("camera"), i18n("Input Profile")); - QWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color " + TQWhatsThis::add(inProfiles, i18n("<p>Set here all parameters relevant of Input Color " "Profiles.</p>")); - QGridLayout *firstPageLayout = new QGridLayout(inProfiles, 4, 2, spacingHint()); + TQGridLayout *firstPageLayout = new TQGridLayout(inProfiles, 4, 2, spacingHint()); - m_inProfileBG = new QButtonGroup(4, Qt::Vertical, inProfiles); - m_inProfileBG->setFrameStyle(QFrame::NoFrame); + m_inProfileBG = new TQButtonGroup(4, Qt::Vertical, inProfiles); + m_inProfileBG->setFrameStyle(TQFrame::NoFrame); m_inProfileBG->setInsideMargin(0); - m_useEmbeddedProfile = new QRadioButton(m_inProfileBG); + m_useEmbeddedProfile = new TQRadioButton(m_inProfileBG); m_useEmbeddedProfile->setText(i18n("Use embedded profile")); - m_useSRGBDefaultProfile = new QRadioButton(m_inProfileBG); + m_useSRGBDefaultProfile = new TQRadioButton(m_inProfileBG); m_useSRGBDefaultProfile->setText(i18n("Use builtin sRGB profile")); m_useSRGBDefaultProfile->setChecked(true); - m_useInDefaultProfile = new QRadioButton(m_inProfileBG); + m_useInDefaultProfile = new TQRadioButton(m_inProfileBG); m_useInDefaultProfile->setText(i18n("Use default profile")); - m_useInSelectedProfile = new QRadioButton(m_inProfileBG); + m_useInSelectedProfile = new TQRadioButton(m_inProfileBG); m_useInSelectedProfile->setText(i18n("Use selected profile")); m_inProfilesPath = new KURLRequester(inProfiles); @@ -302,12 +302,12 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_iccInPreviewWidget = new Digikam::ICCPreviewWidget(inProfiles_dialog); inProfiles_dialog->setPreviewWidget(m_iccInPreviewWidget); - QPushButton *inProfilesInfo = new QPushButton(i18n("Info..."), inProfiles); + TQPushButton *inProfilesInfo = new TQPushButton(i18n("Info..."), inProfiles); - QGroupBox *pictureInfo = new QGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); - new QLabel(i18n("Make:"), pictureInfo); + TQGroupBox *pictureInfo = new TQGroupBox(2, Qt::Horizontal, i18n("Camera information"), inProfiles); + new TQLabel(i18n("Make:"), pictureInfo); KSqueezedTextLabel *make = new KSqueezedTextLabel(0, pictureInfo); - new QLabel(i18n("Model:"), pictureInfo); + new TQLabel(i18n("Model:"), pictureInfo); KSqueezedTextLabel *model = new KSqueezedTextLabel(0, pictureInfo); make->setText(iface.getPhotographInformations().make); model->setText(iface.getPhotographInformations().model); @@ -323,19 +323,19 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_toolBoxWidgets->insertItem(WORKSPACEPAGE, spaceProfiles, SmallIconSet("tablet"), i18n("Workspace Profile")); - QWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace " + TQWhatsThis::add(spaceProfiles, i18n("<p>Set here all parameters relevant to Color Workspace " "Profiles.</p>")); - QGridLayout *secondPageLayout = new QGridLayout(spaceProfiles, 3, 2, spacingHint()); + TQGridLayout *secondPageLayout = new TQGridLayout(spaceProfiles, 3, 2, spacingHint()); - m_spaceProfileBG = new QButtonGroup(2, Qt::Vertical, spaceProfiles); - m_spaceProfileBG->setFrameStyle(QFrame::NoFrame); + m_spaceProfileBG = new TQButtonGroup(2, Qt::Vertical, spaceProfiles); + m_spaceProfileBG->setFrameStyle(TQFrame::NoFrame); m_spaceProfileBG->setInsideMargin(0); - m_useSpaceDefaultProfile = new QRadioButton(m_spaceProfileBG); + m_useSpaceDefaultProfile = new TQRadioButton(m_spaceProfileBG); m_useSpaceDefaultProfile->setText(i18n("Use default workspace profile")); - m_useSpaceSelectedProfile = new QRadioButton(m_spaceProfileBG); + m_useSpaceSelectedProfile = new TQRadioButton(m_spaceProfileBG); m_useSpaceSelectedProfile->setText(i18n("Use selected profile")); m_spaceProfilePath = new KURLRequester(spaceProfiles); @@ -345,7 +345,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_iccSpacePreviewWidget = new Digikam::ICCPreviewWidget(spaceProfiles_dialog); spaceProfiles_dialog->setPreviewWidget(m_iccSpacePreviewWidget); - QPushButton *spaceProfilesInfo = new QPushButton(i18n("Info..."), spaceProfiles); + TQPushButton *spaceProfilesInfo = new TQPushButton(i18n("Info..."), spaceProfiles); secondPageLayout->addMultiCellWidget(m_spaceProfileBG, 0, 1, 0, 0); secondPageLayout->addMultiCellWidget(spaceProfilesInfo, 0, 0, 2, 2); @@ -357,20 +357,20 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_toolBoxWidgets->insertItem(PROOFINGPAGE, proofProfiles, SmallIconSet("printer1"), i18n("Proofing Profile")); - QWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color " + TQWhatsThis::add(proofProfiles, i18n("<p>Set here all parameters relevant to Proofing Color " "Profiles.</p>")); - QGridLayout *thirdPageLayout = new QGridLayout(proofProfiles, 3, 2, + TQGridLayout *thirdPageLayout = new TQGridLayout(proofProfiles, 3, 2, spacingHint(), spacingHint()); - m_proofProfileBG = new QButtonGroup(2, Qt::Vertical, proofProfiles); - m_proofProfileBG->setFrameStyle(QFrame::NoFrame); + m_proofProfileBG = new TQButtonGroup(2, Qt::Vertical, proofProfiles); + m_proofProfileBG->setFrameStyle(TQFrame::NoFrame); m_proofProfileBG->setInsideMargin(0); - m_useProofDefaultProfile = new QRadioButton(m_proofProfileBG); + m_useProofDefaultProfile = new TQRadioButton(m_proofProfileBG); m_useProofDefaultProfile->setText(i18n("Use default proof profile")); - m_useProofSelectedProfile = new QRadioButton(m_proofProfileBG); + m_useProofSelectedProfile = new TQRadioButton(m_proofProfileBG); m_useProofSelectedProfile->setText(i18n("Use selected profile")); m_proofProfilePath = new KURLRequester(proofProfiles); @@ -380,7 +380,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_iccProofPreviewWidget = new Digikam::ICCPreviewWidget(proofProfiles_dialog); proofProfiles_dialog->setPreviewWidget(m_iccProofPreviewWidget); - QPushButton *proofProfilesInfo = new QPushButton(i18n("Info..."), proofProfiles); + TQPushButton *proofProfilesInfo = new TQPushButton(i18n("Info..."), proofProfiles); thirdPageLayout->addMultiCellWidget(m_proofProfileBG, 0, 1, 0, 0); thirdPageLayout->addMultiCellWidget(proofProfilesInfo, 0, 0, 2, 2); @@ -392,36 +392,36 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) m_toolBoxWidgets->insertItem(LIGHTNESSPAGE, lightnessadjust, SmallIconSet("blend"), i18n("Lightness Adjustments")); - QWhatsThis::add(lightnessadjust, i18n("<p>Set here all lightness adjustments to the target image.</p>")); + TQWhatsThis::add(lightnessadjust, i18n("<p>Set here all lightness adjustments to the target image.</p>")); - QGridLayout *fourPageLayout = new QGridLayout( lightnessadjust, 5, 2, spacingHint(), 0); + TQGridLayout *fourPageLayout = new TQGridLayout( lightnessadjust, 5, 2, spacingHint(), 0); Digikam::ColorGradientWidget* vGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Vertical, 10, lightnessadjust ); - vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); - QLabel *spacev = new QLabel(lightnessadjust); + TQLabel *spacev = new TQLabel(lightnessadjust); spacev->setFixedWidth(1); m_curvesWidget = new Digikam::CurvesWidget(256, 192, m_originalImage->bits(), m_originalImage->width(), m_originalImage->height(), m_originalImage->sixteenBit(), m_curves, lightnessadjust); - QWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); + TQWhatsThis::add( m_curvesWidget, i18n("<p>This is the curve adjustment of the image luminosity")); - QLabel *spaceh = new QLabel(lightnessadjust); + TQLabel *spaceh = new TQLabel(lightnessadjust); spaceh->setFixedHeight(1); Digikam::ColorGradientWidget *hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, lightnessadjust ); - hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); m_cInput = new KIntNumInput(lightnessadjust); m_cInput->setLabel(i18n("Contrast:"), AlignLeft | AlignVCenter); m_cInput->setRange(-100, 100, 1, true); m_cInput->setValue(0); - QWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add( m_cInput, i18n("<p>Set here the contrast adjustment of the image.")); fourPageLayout->addMultiCellWidget(vGradient, 0, 0, 0, 0); fourPageLayout->addMultiCellWidget(spacev, 0, 0, 1, 1); @@ -440,78 +440,78 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(QWidget* parent) // ------------------------------------------------------------- - connect(lcmsLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processLCMSURL(const QString&))); + connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processLCMSURL(const TQString&))); - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_curvesWidget, SIGNAL(signalCurvesChanged()), - this, SLOT(slotTimer())); + connect(m_curvesWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SLOT(slotTimer())); - connect(m_cInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_cInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_renderingIntentsCB, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_renderingIntentsCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); //-- Check box options connections ------------------------------------------- - connect(m_doSoftProofBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_doSoftProofBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_checkGamutBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_checkGamutBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_BPCBox, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_BPCBox, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); //-- Button Group ICC profile options connections ---------------------------- - connect(m_inProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_inProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); - connect(m_spaceProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_spaceProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); - connect(m_proofProfileBG, SIGNAL(released (int)), - this, SLOT(slotEffect())); + connect(m_proofProfileBG, TQT_SIGNAL(released (int)), + this, TQT_SLOT(slotEffect())); //-- url requester ICC profile connections ----------------------------------- - connect(m_inProfilesPath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_inProfilesPath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); - connect(m_spaceProfilePath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_spaceProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); - connect(m_proofProfilePath, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotEffect())); + connect(m_proofProfilePath, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotEffect())); //-- Image preview widget connections ---------------------------- - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotSpotColorChanged( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotSpotColorChanged( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); //-- ICC profile preview connections ----------------------------- - connect(inProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotInICCInfo())); + connect(inProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotInICCInfo())); - connect(spaceProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotSpaceICCInfo())); + connect(spaceProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSpaceICCInfo())); - connect(proofProfilesInfo, SIGNAL(clicked()), - this, SLOT(slotProofICCInfo())); + connect(proofProfilesInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotProofICCInfo())); } ImageEffect_ICCProof::~ImageEffect_ICCProof() @@ -527,7 +527,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof() void ImageEffect_ICCProof::readUserSettings() { - QString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = KGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -544,13 +544,13 @@ void ImageEffect_ICCProof::readUserSettings() m_spacePath = config->readPathEntry("WorkProfileFile"); m_proofPath = config->readPathEntry("ProofProfileFile"); - if (QFile::exists(config->readPathEntry("DefaultPath"))) + if (TQFile::exists(config->readPathEntry("DefaultPath"))) { defaultICCPath = config->readPathEntry("DefaultPath"); } else { - QString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\ + TQString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\ options.<p>Please fix this in the digiKam ICC setup."); slotToggledWidgets( false ); KMessageBox::information(this, message); @@ -583,8 +583,8 @@ void ImageEffect_ICCProof::readUserSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentPoint%1").arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -624,7 +624,7 @@ void ImageEffect_ICCProof::writeUserSettings() for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); + TQPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit() && p.x() != -1) { @@ -632,13 +632,13 @@ void ImageEffect_ICCProof::writeUserSettings() p.setY(p.y()/255); } - config->writeEntry(QString("CurveAjustmentPoint%1").arg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); } config->sync(); } -void ImageEffect_ICCProof::processLCMSURL(const QString& url) +void ImageEffect_ICCProof::processLCMSURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -659,32 +659,32 @@ void ImageEffect_ICCProof::slotChannelChanged( int channel ) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_ICCProof::slotScaleChanged( int scale ) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_ICCProof::resetValues() @@ -719,9 +719,9 @@ void ImageEffect_ICCProof::slotEffect() Digikam::DImg preview(w, h, sb, a, m_destinationPreviewData); - QString tmpInPath = QString(); - QString tmpProofPath = QString(); - QString tmpSpacePath = QString(); + TQString tmpInPath = TQString(); + TQString tmpProofPath = TQString(); + TQString tmpSpacePath = TQString(); bool proofCondition = false; bool spaceCondition = false; @@ -735,7 +735,7 @@ void ImageEffect_ICCProof::slotEffect() else if (useSelectedInProfile()) { tmpInPath = m_inProfilesPath->url(); - QFileInfo info(tmpInPath); + TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>The selected ICC input profile path seems to be invalid.<p>" @@ -753,7 +753,7 @@ void ImageEffect_ICCProof::slotEffect() else { tmpProofPath = m_proofProfilePath->url(); - QFileInfo info(tmpProofPath); + TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>The selected ICC proof profile path seems to be invalid.<p>" @@ -774,7 +774,7 @@ void ImageEffect_ICCProof::slotEffect() else { tmpSpacePath = m_spaceProfilePath->url(); - QFileInfo info(tmpSpacePath); + TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>Selected ICC workspace profile path seems to be invalid.<p>" @@ -815,7 +815,7 @@ void ImageEffect_ICCProof::slotEffect() if ( proofCondition || spaceCondition ) { kapp->restoreOverrideCursor(); - QString error = i18n("<p>Your settings are not sufficient.</p>" + TQString error = i18n("<p>Your settings are not sufficient.</p>" "<p>To apply a color transform, you need at least two ICC profiles:</p>" "<ul><li>An \"Input\" profile.</li>" "<li>A \"Workspace\" profile.</li></ul>" @@ -833,7 +833,7 @@ void ImageEffect_ICCProof::slotEffect() } else { - QByteArray fakeProfile = QByteArray(); + TQByteArray fakeProfile = TQByteArray(); transform.apply(preview, fakeProfile, m_renderingIntentsCB->currentItem(), useBPC(), m_checkGamutBox->isChecked(), useBuiltinProfile()); } @@ -880,9 +880,9 @@ void ImageEffect_ICCProof::finalRendering() Digikam::DImg img(w, h, sb, a, data); - QString tmpInPath; - QString tmpProofPath; - QString tmpSpacePath; + TQString tmpInPath; + TQString tmpProofPath; + TQString tmpSpacePath; bool proofCondition; //-- Input profile parameters ------------------ @@ -894,7 +894,7 @@ void ImageEffect_ICCProof::finalRendering() else if (useSelectedInProfile()) { tmpInPath = m_inProfilesPath->url(); - QFileInfo info(tmpInPath); + TQFileInfo info(tmpInPath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>Selected ICC input profile path seems " @@ -912,7 +912,7 @@ void ImageEffect_ICCProof::finalRendering() else { tmpProofPath = m_proofProfilePath->url(); - QFileInfo info(tmpProofPath); + TQFileInfo info(tmpProofPath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>The selected ICC proof profile path seems " @@ -933,7 +933,7 @@ void ImageEffect_ICCProof::finalRendering() else { tmpSpacePath = m_spaceProfilePath->url(); - QFileInfo info(tmpSpacePath); + TQFileInfo info(tmpSpacePath); if (!info.exists() || !info.isReadable() || !info.isFile() ) { KMessageBox::information(this, i18n("<p>Selected ICC workspace profile path seems " @@ -976,7 +976,7 @@ void ImageEffect_ICCProof::finalRendering() } else { - QByteArray fakeProfile = QByteArray(); + TQByteArray fakeProfile = TQByteArray(); transform.apply(img, fakeProfile, m_renderingIntentsCB->currentItem(), useBPC(), m_checkGamutBox->isChecked(), useBuiltinProfile()); } @@ -986,7 +986,7 @@ void ImageEffect_ICCProof::finalRendering() if (m_embeddProfileBox->isChecked()) { iface->setEmbeddedICCToOriginalImage( tmpSpacePath ); - DDebug() << k_funcinfo << QFile::encodeName(tmpSpacePath) << endl; + DDebug() << k_funcinfo << TQFile::encodeName(tmpSpacePath) << endl; } //-- Calculate and apply the curve on image after transformation ------------- @@ -1026,7 +1026,7 @@ void ImageEffect_ICCProof::slotInICCInfo() } else if(useBuiltinProfile()) { - QString message = i18n("<p>You have selected the \"Default builtin sRGB profile\"</p>"); + TQString message = i18n("<p>You have selected the \"Default builtin sRGB profile\"</p>"); message.append(i18n("<p>This profile is built on the fly, so there is no relevant information " "about it.</p>")); KMessageBox::information(this, message); @@ -1065,7 +1065,7 @@ void ImageEffect_ICCProof::slotSpaceICCInfo() } } -void ImageEffect_ICCProof::getICCInfo(const QString& profile) +void ImageEffect_ICCProof::getICCInfo(const TQString& profile) { if (profile.isEmpty()) { @@ -1077,7 +1077,7 @@ void ImageEffect_ICCProof::getICCInfo(const QString& profile) infoDlg.exec(); } -void ImageEffect_ICCProof::getICCInfo(const QByteArray& profile) +void ImageEffect_ICCProof::getICCInfo(const TQByteArray& profile) { if (profile.isNull()) { @@ -1085,7 +1085,7 @@ void ImageEffect_ICCProof::getICCInfo(const QByteArray& profile) return; } - Digikam::ICCProfileInfoDlg infoDlg(this, QString(), profile); + Digikam::ICCProfileInfoDlg infoDlg(this, TQString(), profile); infoDlg.exec(); } @@ -1093,7 +1093,7 @@ void ImageEffect_ICCProof::slotCMDisabledWarning() { if (!m_cmEnabled) { - QString message = i18n("<p>You have not enabled Color Management in the digiKam preferences.</p>"); + TQString message = i18n("<p>You have not enabled Color Management in the digiKam preferences.</p>"); message.append( i18n("<p>\"Use of default profile\" options will be disabled now.</p>")); KMessageBox::information(this, message); slotToggledWidgets(false); @@ -1163,22 +1163,22 @@ bool ImageEffect_ICCProof::useDefaultProofProfile() void ImageEffect_ICCProof::slotUser3() { KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Color Management Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Color Management Settings File to Load")) ); if( loadColorManagementFile.isEmpty() ) return; - QFile file(loadColorManagementFile.path()); + TQFile file(loadColorManagementFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Color Management Configuration File" ) { KMessageBox::error(this, i18n("\"%1\" is not a Color Management settings text file.") - .arg(loadColorManagementFile.fileName())); + .tqarg(loadColorManagementFile.fileName())); file.close(); return; } @@ -1206,8 +1206,8 @@ void ImageEffect_ICCProof::slotUser3() for (int j = 0 ; j < 17 ; j++) { - QPoint disable(-1, -1); - QPoint p; + TQPoint disable(-1, -1); + TQPoint p; p.setX( stream.readLine().toInt() ); p.setY( stream.readLine().toInt() ); @@ -1239,16 +1239,16 @@ void ImageEffect_ICCProof::slotUser3() void ImageEffect_ICCProof::slotUser2() { KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Color Management Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Color Management Settings File to Save")) ); if( saveColorManagementFile.isEmpty() ) return; - QFile file(saveColorManagementFile.path()); + TQFile file(saveColorManagementFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Color Management Configuration File\n"; stream << m_renderingIntentsCB->currentItem() << "\n"; stream << m_doSoftProofBox->isChecked() << "\n"; @@ -1265,7 +1265,7 @@ void ImageEffect_ICCProof::slotUser2() for (int j = 0 ; j < 17 ; j++) { - QPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); + TQPoint p = m_curves->getCurvePoint(Digikam::ImageHistogram::ValueChannel, j); if (m_originalImage->sixteenBit()) { p.setX(p.x()/255); diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h index 08a8a50..d5fc5e2 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.h +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.h @@ -30,14 +30,14 @@ #include "imagedlgbase.h" -class QCheckBox; -class QComboBox; -class QVButtonGroup; -class QButtonGroup; -class QHButtonGroup; -class QRadioButton; -class QPushButton; -class QToolBox; +class TQCheckBox; +class TQComboBox; +class TQVButtonGroup; +class TQButtonGroup; +class TQHButtonGroup; +class TQRadioButton; +class TQPushButton; +class TQToolBox; class KURLRequester; class KIntNumInput; @@ -60,10 +60,11 @@ namespace DigikamImagesPluginCore class ImageEffect_ICCProof : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_ICCProof(QWidget* parent); + ImageEffect_ICCProof(TQWidget* tqparent); ~ImageEffect_ICCProof(); protected: @@ -76,8 +77,8 @@ private: void writeUserSettings(); void resetValues(); - void getICCInfo(const QString&); - void getICCInfo(const QByteArray&); + void getICCInfo(const TQString&); + void getICCInfo(const TQByteArray&); bool useBPC(); bool doProof(); @@ -109,7 +110,7 @@ private slots: void slotProofICCInfo(); void slotSpaceICCInfo(); void slotCMDisabledWarning(); - void processLCMSURL(const QString&); + void processLCMSURL(const TQString&); private: @@ -141,39 +142,39 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; - QComboBox *m_renderingIntentsCB; + TQComboBox *m_channelCB; + TQComboBox *m_renderingIntentsCB; - QCheckBox *m_doSoftProofBox; - QCheckBox *m_checkGamutBox; - QCheckBox *m_embeddProfileBox; - QCheckBox *m_BPCBox; + TQCheckBox *m_doSoftProofBox; + TQCheckBox *m_checkGamutBox; + TQCheckBox *m_embeddProfileBox; + TQCheckBox *m_BPCBox; - QRadioButton *m_useEmbeddedProfile; - QRadioButton *m_useInDefaultProfile; - QRadioButton *m_useInSelectedProfile; - QRadioButton *m_useProofDefaultProfile; - QRadioButton *m_useProofSelectedProfile; - QRadioButton *m_useSpaceDefaultProfile; - QRadioButton *m_useSpaceSelectedProfile; - QRadioButton *m_useSRGBDefaultProfile; + TQRadioButton *m_useEmbeddedProfile; + TQRadioButton *m_useInDefaultProfile; + TQRadioButton *m_useInSelectedProfile; + TQRadioButton *m_useProofDefaultProfile; + TQRadioButton *m_useProofSelectedProfile; + TQRadioButton *m_useSpaceDefaultProfile; + TQRadioButton *m_useSpaceSelectedProfile; + TQRadioButton *m_useSRGBDefaultProfile; - QString m_inPath; - QString m_spacePath; - QString m_proofPath; + TQString m_inPath; + TQString m_spacePath; + TQString m_proofPath; - QButtonGroup *m_optionsBG; - QButtonGroup *m_inProfileBG; - QButtonGroup *m_spaceProfileBG; - QButtonGroup *m_proofProfileBG; + TQButtonGroup *m_optionsBG; + TQButtonGroup *m_inProfileBG; + TQButtonGroup *m_spaceProfileBG; + TQButtonGroup *m_proofProfileBG; - QHButtonGroup *m_scaleBG; - QVButtonGroup *m_renderingIntentBG; - QVButtonGroup *m_profilesBG; + TQHButtonGroup *m_scaleBG; + TQVButtonGroup *m_renderingIntentBG; + TQVButtonGroup *m_profilesBG; - QByteArray m_embeddedICC; + TQByteArray m_embeddedICC; - QToolBox *m_toolBoxWidgets; + TQToolBox *m_toolBoxWidgets; KIntNumInput *m_cInput; diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index ad5054d..9a4c435 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -22,22 +22,22 @@ * * ============================================================ */ -// Qt includes. - -#include <qcolor.h> -#include <qhbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -68,8 +68,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RedEye::ImageEffect_RedEye(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Red Eye Reduction"), "redeye", false) +ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Red Eye Reduction"), "redeye", false) { m_destinationPreviewData = 0; setHelp("redeyecorrectiontool.anchor", "digikam"); @@ -82,48 +82,48 @@ ImageEffect_RedEye::ImageEffect_RedEye(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout(gboxSettings, 11, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 11, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image channel values.<p>" "<b>Green</b>: display the green image channel values.<p>" "<b>Blue</b>: display the blue image channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximum counts are small, you can use the linear scale.<p>" "The logarithmic scale can be used when the maximal counts are big " "to show all values (small and large) on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -131,47 +131,47 @@ ImageEffect_RedEye::ImageEffect_RedEye(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "of the selected image channel. It is " "updated upon setting changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget(Digikam::ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); // ------------------------------------------------------------- - m_thresholdLabel = new QLabel(i18n("Sensitivity:"), gboxSettings); + m_thresholdLabel = new TQLabel(i18n("Sensitivity:"), gboxSettings); m_redThreshold = new KIntNumInput(gboxSettings); m_redThreshold->setRange(10, 90, 1, true); m_redThreshold->setValue(20); - QWhatsThis::add(m_redThreshold, i18n("<p>Sets the red color pixels selection threshold. " + TQWhatsThis::add(m_redThreshold, i18n("<p>Sets the red color pixels selection threshold. " "Low values will select more red color pixels (agressive correction), high " "values less (mild correction). Use low value if eye have been selected " "exactly. Use high value if other parts of the face are also selected.")); - m_smoothLabel = new QLabel(i18n("Smooth:"), gboxSettings); + m_smoothLabel = new TQLabel(i18n("Smooth:"), gboxSettings); m_smoothLevel = new KIntNumInput(gboxSettings); m_smoothLevel->setRange(0, 5, 1, true); m_smoothLevel->setValue(1); - QWhatsThis::add(m_smoothLevel, i18n("<p>Sets the smoothness value when blurring the border " + TQWhatsThis::add(m_smoothLevel, i18n("<p>Sets the smoothness value when blurring the border " "of the changed pixels. " "This leads to a more naturally looking pupil.")); - QLabel *label3 = new QLabel(i18n("Coloring Tint:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Coloring Tint:"), gboxSettings); m_HSSelector = new KHSSelector(gboxSettings); m_VSelector = new KValueSelector(gboxSettings); m_HSSelector->setMinimumSize(200, 142); m_VSelector->setMinimumSize(26, 142); - QWhatsThis::add(m_HSSelector, i18n("<p>Sets a custom color to re-colorize the eyes.")); + TQWhatsThis::add(m_HSSelector, i18n("<p>Sets a custom color to re-colorize the eyes.")); - QLabel *label4 = new QLabel(i18n("Tint Level:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Tint Level:"), gboxSettings); m_tintLevel = new KIntNumInput(gboxSettings); m_tintLevel->setRange(1, 200, 1, true); m_tintLevel->setValue(128); - QWhatsThis::add(m_tintLevel, i18n("<p>Set the tint level to adjust the luminosity of " + TQWhatsThis::add(m_tintLevel, i18n("<p>Set the tint level to adjust the luminosity of " "the new color of the pupil.")); gridSettings->addMultiCellLayout(l1, 0, 0, 0, 4); @@ -191,32 +191,32 @@ ImageEffect_RedEye::ImageEffect_RedEye(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_redThreshold, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_redThreshold, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_smoothLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_smoothLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_HSSelector, SIGNAL(valueChanged(int, int)), - this, SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotHSChanged(int, int))); - connect(m_VSelector, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_tintLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_tintLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_RedEye::~ImageEffect_RedEye() @@ -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->repaint(false); + m_VSelector->tqrepaint(false); m_VSelector->blockSignals(false); slotTimer(); } @@ -247,32 +247,32 @@ void ImageEffect_RedEye::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_RedEye::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& color) @@ -394,10 +394,10 @@ void ImageEffect_RedEye::finalRendering() void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) { - Digikam::DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true, + Digikam::DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true, selection.bits(), true); - selection = mask.copy(); + selection = tqmask.copy(); float redThreshold = m_redThreshold->value()/10.0; int hue = m_HSSelector->xValue(); int sat = m_HSSelector->yValue(); @@ -437,12 +437,12 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) green_norm *= coloring.green() / level; blue_norm *= coloring.blue() / level; - // Perform a red color pixels detection in selection image and create a correction mask using an alpha channel. + // Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel. if (!selection.sixteenBit()) // 8 bits image. { uchar* ptr = selection.bits(); - uchar* mptr = mask.bits(); + uchar* mptr = tqmask.bits(); uchar r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -454,22 +454,22 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) if (r >= ( redThreshold * g)) { - r1 = QMIN(255, (int)(red_norm * (red_chan.red_gain * r + + r1 = TQMIN(255, (int)(red_norm * (red_chan.red_gain * r + red_chan.green_gain * g + red_chan.blue_gain * b))); - g1 = QMIN(255, (int)(green_norm * (green_chan.red_gain * r + + g1 = TQMIN(255, (int)(green_norm * (green_chan.red_gain * r + green_chan.green_gain * g + green_chan.blue_gain * b))); - b1 = QMIN(255, (int)(blue_norm * (blue_chan.red_gain * r + + b1 = TQMIN(255, (int)(blue_norm * (blue_chan.red_gain * r + blue_chan.green_gain * g + blue_chan.blue_gain * b))); mptr[0] = b1; mptr[1] = g1; mptr[2] = r1; - mptr[3] = QMIN( (int)((r-g) / 150.0 * 255.0), 255); + mptr[3] = TQMIN( (int)((r-g) / 150.0 * 255.0), 255); } ptr += 4; @@ -479,7 +479,7 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) else // 16 bits image. { unsigned short* ptr = (unsigned short*)selection.bits(); - unsigned short* mptr = (unsigned short*)mask.bits(); + unsigned short* mptr = (unsigned short*)tqmask.bits(); unsigned short r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -491,22 +491,22 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) if (r >= ( redThreshold * g)) { - r1 = QMIN(65535, (int)(red_norm * (red_chan.red_gain * r + + r1 = TQMIN(65535, (int)(red_norm * (red_chan.red_gain * r + red_chan.green_gain * g + red_chan.blue_gain * b))); - g1 = QMIN(65535, (int)(green_norm * (green_chan.red_gain * r + + g1 = TQMIN(65535, (int)(green_norm * (green_chan.red_gain * r + green_chan.green_gain * g + green_chan.blue_gain * b))); - b1 = QMIN(65535, (int)(blue_norm * (blue_chan.red_gain * r + + b1 = TQMIN(65535, (int)(blue_norm * (blue_chan.red_gain * r + blue_chan.green_gain * g + blue_chan.blue_gain * b))); mptr[0] = b1; mptr[1] = g1; mptr[2] = r1; - mptr[3] = QMIN( (int)((r-g) / 38400.0 * 65535.0), 65535);; + mptr[3] = TQMIN( (int)((r-g) / 38400.0 * 65535.0), 65535);; } ptr += 4; @@ -514,19 +514,19 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } } - // Now, we will blur only the transparency pixels from the mask. + // Now, we will blur only the transparency pixels from the tqmask. - Digikam::DImg mask2 = mask.copy(); + Digikam::DImg tqmask2 = tqmask.copy(); Digikam::DImgImageFilters filter; - filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(), - mask2.sixteenBit(), m_smoothLevel->value()); + filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(), + tqmask2.sixteenBit(), m_smoothLevel->value()); if (!selection.sixteenBit()) // 8 bits image. { - uchar* mptr = mask.bits(); - uchar* mptr2 = mask2.bits(); + uchar* mptr = tqmask.bits(); + uchar* mptr2 = tqmask2.bits(); - for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) + for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) { if (mptr2[3] < 255) { @@ -542,10 +542,10 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } else // 16 bits image. { - unsigned short* mptr = (unsigned short*)mask.bits(); - unsigned short* mptr2 = (unsigned short*)mask2.bits(); + unsigned short* mptr = (unsigned short*)tqmask.bits(); + unsigned short* mptr2 = (unsigned short*)tqmask2.bits(); - for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) + for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) { if (mptr2[3] < 65535) { @@ -560,14 +560,14 @@ void ImageEffect_RedEye::redEyeFilter(Digikam::DImg& selection) } } - // - Perform pixels blending using alpha channel between the mask and the selection. + // - Perform pixels blending using alpha channel between the tqmask and the selection. Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffSrcOver); - // NOTE: 'mask' is the Source image, 'selection' is the Destination image. + // NOTE: 'tqmask' is the Source image, 'selection' is the Destination image. - selection.bitBlendImage(composer, &mask, - 0, 0, mask.width(), mask.height(), + selection.bitBlendImage(composer, &tqmask, + 0, 0, tqmask.width(), tqmask.height(), 0, 0); } diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.h b/digikam/imageplugins/coreplugin/imageeffect_redeye.h index 3300be3..e015ef2 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.h +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.h @@ -34,9 +34,9 @@ #include "imagedlgbase.h" -class QLabel; -class QComboBox; -class QHButtonGroup; +class TQLabel; +class TQComboBox; +class TQHButtonGroup; class KHSSelector; class KValueSelector; @@ -58,8 +58,8 @@ class RedEyePassivePopup : public KPassivePopup { public: - RedEyePassivePopup(QWidget* parent) - : KPassivePopup(parent), m_parent(parent) + RedEyePassivePopup(TQWidget* tqparent) + : KPassivePopup(tqparent), m_parent(tqparent) { } @@ -72,7 +72,7 @@ protected: private: - QWidget* m_parent; + TQWidget* m_parent; }; // ---------------------------------------------------------------- @@ -80,10 +80,11 @@ private: class ImageEffect_RedEye : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_RedEye(QWidget *parent); + ImageEffect_RedEye(TQWidget *tqparent); ~ImageEffect_RedEye(); private slots: @@ -126,12 +127,12 @@ private: uchar *m_destinationPreviewData; - QLabel *m_thresholdLabel; - QLabel *m_smoothLabel; + TQLabel *m_thresholdLabel; + TQLabel *m_smoothLabel; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KIntNumInput *m_tintLevel; KIntNumInput *m_redThreshold; diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index 6101134..b57dfb2 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -21,25 +21,25 @@ * * ============================================================ */ -// Qt includes. - -#include <qspinbox.h> -#include <qslider.h> -#include <qcolor.h> -#include <qgroupbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqspinbox.h> +#include <tqslider.h> +#include <tqcolor.h> +#include <tqgroupbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -66,8 +66,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Color Balance"), "colorbalance", false) +ImageEffect_RGB::ImageEffect_RGB(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Color Balance"), "colorbalance", false) { m_destinationPreviewData = 0L; setHelp("colorbalancetool.anchor", "digikam"); @@ -81,48 +81,48 @@ ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 7, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 7, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -132,29 +132,29 @@ ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - QLabel *labelLeft = new QLabel(i18n("Cyan"), gboxSettings); - labelLeft->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_rSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_rSlider"); - m_rSlider->setTickmarks(QSlider::Below); + TQLabel *labelLeft = new TQLabel(i18n("Cyan"), gboxSettings); + labelLeft->tqsetAlignment ( 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); - QWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); - QLabel *labelRight = new QLabel(i18n("Red"), gboxSettings); - labelRight->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter ); - m_rInput = new QSpinBox(-100, 100, 1, gboxSettings, "m_rInput"); + 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 ); + m_rInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_rInput"); gridSettings->addMultiCellWidget(labelLeft, 3, 3, 0, 0); gridSettings->addMultiCellWidget(m_rSlider, 3, 3, 1, 1); @@ -163,15 +163,15 @@ ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) // ------------------------------------------------------------- - labelLeft = new QLabel(i18n("Magenta"), gboxSettings); - labelLeft->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_gSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_gSlider"); - m_gSlider->setTickmarks(QSlider::Below); + labelLeft = new TQLabel(i18n("Magenta"), gboxSettings); + labelLeft->tqsetAlignment ( 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); - QWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); - labelRight = new QLabel(i18n("Green"), gboxSettings); - labelRight->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter ); - m_gInput = new QSpinBox(-100, 100, 1, gboxSettings, "m_gInput"); + 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 ); + m_gInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_gInput"); gridSettings->addMultiCellWidget(labelLeft, 4, 4, 0, 0); gridSettings->addMultiCellWidget(m_gSlider, 4, 4, 1, 1); @@ -180,15 +180,15 @@ ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) // ------------------------------------------------------------- - labelLeft = new QLabel(i18n("Yellow"), gboxSettings); - labelLeft->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_bSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, gboxSettings, "m_bSlider"); - m_bSlider->setTickmarks(QSlider::Below); + labelLeft = new TQLabel(i18n("Yellow"), gboxSettings); + labelLeft->tqsetAlignment ( 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); - QWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); - labelRight = new QLabel(i18n("Blue"), gboxSettings); - labelRight->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter ); - m_bInput = new QSpinBox(-100, 100, 1, gboxSettings, "m_bInput"); + 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 ); + m_bInput = new TQSpinBox(-100, 100, 1, gboxSettings, "m_bInput"); gridSettings->addMultiCellWidget(labelLeft, 5, 5, 0, 0); gridSettings->addMultiCellWidget(m_bSlider, 5, 5, 1, 1); @@ -204,38 +204,38 @@ ImageEffect_RGB::ImageEffect_RGB(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_rSlider, SIGNAL(valueChanged(int)), - m_rInput, SLOT(setValue(int))); - connect(m_rInput, SIGNAL(valueChanged (int)), - m_rSlider, SLOT(setValue(int))); - connect(m_rInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); - - connect(m_gSlider, SIGNAL(valueChanged(int)), - m_gInput, SLOT(setValue(int))); - connect(m_gInput, SIGNAL(valueChanged (int)), - m_gSlider, SLOT(setValue(int))); - connect(m_gInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); - - connect(m_bSlider, SIGNAL(valueChanged(int)), - m_bInput, SLOT(setValue(int))); - connect(m_bInput, SIGNAL(valueChanged (int)), - m_bSlider, SLOT(setValue(int))); - connect(m_bInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); - - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_rSlider, TQT_SIGNAL(valueChanged(int)), + m_rInput, TQT_SLOT(setValue(int))); + connect(m_rInput, TQT_SIGNAL(valueChanged (int)), + m_rSlider, TQT_SLOT(setValue(int))); + connect(m_rInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); + + connect(m_gSlider, TQT_SIGNAL(valueChanged(int)), + m_gInput, TQT_SLOT(setValue(int))); + connect(m_gInput, TQT_SIGNAL(valueChanged (int)), + m_gSlider, TQT_SLOT(setValue(int))); + connect(m_gInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); + + connect(m_bSlider, TQT_SIGNAL(valueChanged(int)), + m_bInput, TQT_SLOT(setValue(int))); + connect(m_bInput, TQT_SIGNAL(valueChanged (int)), + m_bSlider, TQT_SLOT(setValue(int))); + connect(m_bInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); + + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -259,32 +259,32 @@ void ImageEffect_RGB::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_RGB::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.h b/digikam/imageplugins/coreplugin/imageeffect_rgb.h index 4327764..23e4bd9 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.h +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.h @@ -28,11 +28,11 @@ #include "imagedlgbase.h" -class QComboBox; -class QHButtonGroup; +class TQComboBox; +class TQHButtonGroup; -class QSpinBox; -class QSlider; +class TQSpinBox; +class TQSlider; namespace Digikam { @@ -48,10 +48,11 @@ namespace DigikamImagesPluginCore class ImageEffect_RGB : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_RGB(QWidget *parent); + ImageEffect_RGB(TQWidget *tqparent); ~ImageEffect_RGB(); private: @@ -87,17 +88,17 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QSpinBox *m_rInput; - QSpinBox *m_gInput; - QSpinBox *m_bInput; + TQSpinBox *m_rInput; + TQSpinBox *m_gInput; + TQSpinBox *m_bInput; - QSlider *m_rSlider; - QSlider *m_gSlider; - QSlider *m_bSlider; + TQSlider *m_rSlider; + TQSlider *m_gSlider; + TQSlider *m_bSlider; Digikam::ImageWidget *m_previewWidget; diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp index cf9a459..9fcc6a9 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp +++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp @@ -59,73 +59,73 @@ using namespace Digikam; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_core, KGenericFactory<ImagePlugin_Core>("digikam")); -ImagePlugin_Core::ImagePlugin_Core(QObject *parent, const char*, const QStringList&) - : ImagePlugin(parent, "ImagePlugin_Core") +ImagePlugin_Core::ImagePlugin_Core(TQObject *tqparent, const char*, const TQStringList&) + : ImagePlugin(tqparent, "ImagePlugin_Core") { //------------------------------- // Fix and Colors menu actions m_blurAction = new KAction(i18n("Blur..."), "blurimage", 0, - this, SLOT(slotBlur()), + this, TQT_SLOT(slotBlur()), actionCollection(), "implugcore_blur"); m_sharpenAction = new KAction(i18n("Sharpen..."), "sharpenimage", 0, - this, SLOT(slotSharpen()), + this, TQT_SLOT(slotSharpen()), actionCollection(), "implugcore_sharpen"); m_redeyeAction = new KAction(i18n("Red Eye..."), "redeyes", 0, - this, SLOT(slotRedEye()), + this, TQT_SLOT(slotRedEye()), actionCollection(), "implugcore_redeye"); m_redeyeAction->setWhatsThis( i18n( "This filter can be used to correct red eyes in a photo. " "Select a region including the eyes to use this option.") ); m_BCGAction = new KAction(i18n("Brightness/Contrast/Gamma..."), "contrast", 0, - this, SLOT(slotBCG()), + this, TQT_SLOT(slotBCG()), actionCollection(), "implugcore_bcg"); m_HSLAction = new KAction(i18n("Hue/Saturation/Lightness..."), "adjusthsl", CTRL+Key_U, // NOTE: Photoshop 7 use CTRL+U. - this, SLOT(slotHSL()), + this, TQT_SLOT(slotHSL()), actionCollection(), "implugcore_hsl"); m_RGBAction = new KAction(i18n("Color Balance..."), "adjustrgb", CTRL+Key_B, // NOTE: Photoshop 7 use CTRL+B. - this, SLOT(slotRGB()), + this, TQT_SLOT(slotRGB()), actionCollection(), "implugcore_rgb"); m_autoCorrectionAction = new KAction(i18n("Auto-Correction..."), "autocorrection", CTRL+SHIFT+Key_B, // NOTE: Photoshop 7 use CTRL+SHIFT+B with 'Auto-Color' option. - this, SLOT(slotAutoCorrection()), + this, TQT_SLOT(slotAutoCorrection()), actionCollection(), "implugcore_autocorrection"); m_invertAction = new KAction(i18n("Invert"), "invertimage", CTRL+Key_I, // NOTE: Photoshop 7 use CTRL+I. - this, SLOT(slotInvert()), + this, TQT_SLOT(slotInvert()), actionCollection(), "implugcore_invert"); m_convertTo8Bits = new KAction(i18n("8 bits"), "depth16to8", 0, - this, SLOT(slotConvertTo8Bits()), + this, TQT_SLOT(slotConvertTo8Bits()), actionCollection(), "implugcore_convertto8bits"); m_convertTo16Bits = new KAction(i18n("16 bits"), "depth8to16", 0, - this, SLOT(slotConvertTo16Bits()), + this, TQT_SLOT(slotConvertTo16Bits()), actionCollection(), "implugcore_convertto16bits"); m_colorManagementAction = new KAction(i18n("Color Management..."), "colormanagement", 0, - this, SLOT(slotColorManagement()), + this, TQT_SLOT(slotColorManagement()), actionCollection(), "implugcore_colormanagement"); //------------------------------- // Filters menu actions. m_BWAction = new KAction(i18n("Black && White..."), "bwtonal", 0, - this, SLOT(slotBW()), + this, TQT_SLOT(slotBW()), actionCollection(), "implugcore_blackwhite"); //------------------------------- // Transform menu actions. m_aspectRatioCropAction = new KAction(i18n("Aspect Ratio Crop..."), "ratiocrop", 0, - this, SLOT(slotRatioCrop()), + this, TQT_SLOT(slotRatioCrop()), actionCollection(), "implugcore_ratiocrop"); //------------------------------- @@ -268,9 +268,9 @@ void ImagePlugin_Core::slotConvertTo8Bits() if (KMessageBox::warningContinueCancel( kapp->activeWindow(), i18n("Performing this operation will reduce image color quality. " - "Do you want to continue?"), QString(), + "Do you want to continue?"), TQString(), KStdGuiItem::cont(), - QString("ImagePluginCore16To8Bits")) == KMessageBox::Cancel) + TQString("ImagePluginCore16To8Bits")) == KMessageBox::Cancel) return; } diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.h b/digikam/imageplugins/coreplugin/imageplugin_core.h index 55f0ebe..eeb88ee 100644 --- a/digikam/imageplugins/coreplugin/imageplugin_core.h +++ b/digikam/imageplugins/coreplugin/imageplugin_core.h @@ -35,10 +35,11 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Core : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Core(QObject *parent, const char* name, const QStringList &args); + ImagePlugin_Core(TQObject *tqparent, const char* name, const TQStringList &args); ~ImagePlugin_Core(); void setEnabledSelectionActions(bool enable); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index f138e25..19adc06 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -23,20 +23,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qframe.h> -#include <qrect.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qimage.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qcheckbox.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqframe.h> +#include <tqrect.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqimage.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqcheckbox.h> // KDE includes. @@ -61,8 +61,8 @@ namespace DigikamImagesPluginCore { -ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Aspect Ratio Crop & Composition Guide"), +ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Aspect Ratio Crop & Composition Guide"), "aspectratiocrop", false) { setHelp("ratiocroptool.anchor", "digikam"); @@ -73,12 +73,12 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(plainPage()); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(plainPage()); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); m_imageSelectionWidget = new ImageSelectionWidget(480, 320, frame); l->addWidget(m_imageSelectionWidget); - QWhatsThis::add( m_imageSelectionWidget, i18n("<p>Here you can see the aspect ratio selection preview " + TQWhatsThis::add( m_imageSelectionWidget, i18n("<p>Here you can see the aspect ratio selection preview " "used for cropping. You can use the mouse to move and " "resize the crop area. " "Press and hold the CTRL key to move the opposite corner too. " @@ -91,17 +91,17 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- - QWidget *gbox2 = new QWidget(plainPage()); - QGridLayout *gridBox2 = new QGridLayout( gbox2, 2, 0); + TQWidget *gbox2 = new TQWidget(plainPage()); + TQGridLayout *gridBox2 = new TQGridLayout( gbox2, 2, 0); - QFrame *cropSelection = new QFrame( gbox2 ); - cropSelection->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QGridLayout* grid = new QGridLayout( cropSelection, 6, 4, spacingHint()); + TQFrame *cropSelection = new TQFrame( gbox2 ); + cropSelection->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQGridLayout* grid = new TQGridLayout( cropSelection, 6, 4, spacingHint()); - QLabel *label = new QLabel(i18n("Aspect ratio:"), cropSelection); - m_ratioCB = new QComboBox( false, cropSelection ); + TQLabel *label = new TQLabel(i18n("Aspect ratio:"), cropSelection); + m_ratioCB = new TQComboBox( false, cropSelection ); setRatioCBText(ImageSelectionWidget::Landscape); - QWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " + TQWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " "Aspect Ratio Crop tool uses a relative ratio. That means it " "is the same if you use centimeters or inches and it doesn't " "specify the physical size.<p>" @@ -118,17 +118,17 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) "is considered visually harmonious but can be unadapted to print on " "standard photographic paper.")); - m_preciseCrop = new QCheckBox(i18n("Exact"), cropSelection); - QWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop.")); + m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection); + TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop.")); - m_orientLabel = new QLabel(i18n("Orientation:"), cropSelection); - m_orientCB = new QComboBox( false, cropSelection ); + m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection); + m_orientCB = new TQComboBox( false, cropSelection ); m_orientCB->insertItem( i18n("Landscape") ); m_orientCB->insertItem( i18n("Portrait") ); - QWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); + TQWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); - m_autoOrientation = new QCheckBox(i18n("Auto"), cropSelection); - QWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); + m_autoOrientation = new TQCheckBox(i18n("Auto"), cropSelection); + TQWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); grid->addMultiCellWidget(label, 0, 0, 0, 0); grid->addMultiCellWidget(m_ratioCB, 0, 0, 1, 3); @@ -139,14 +139,14 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- - m_customLabel1 = new QLabel(i18n("Custom ratio:"), cropSelection); - m_customLabel1->setAlignment(AlignLeft|AlignVCenter); + m_customLabel1 = new TQLabel(i18n("Custom ratio:"), cropSelection); + m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter); m_customRatioNInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection); - QWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value.")); - m_customLabel2 = new QLabel(" : ", cropSelection); - m_customLabel2->setAlignment(AlignCenter|AlignVCenter); + 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_customRatioDInput = new KIntSpinBox(1, 10000, 1, 1, 10, cropSelection); - QWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); + TQWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); grid->addMultiCellWidget(m_customLabel1, 1, 1, 0, 0); grid->addMultiCellWidget(m_customRatioNInput, 1, 1, 1, 1); @@ -156,22 +156,22 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- m_xInput = new KIntNumInput(cropSelection); - QWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_xInput->setLabel(i18n("X:"), AlignLeft|AlignVCenter); m_xInput->setRange(0, m_imageSelectionWidget->getOriginalImageWidth(), 1, true); m_widthInput = new KIntNumInput(cropSelection); m_widthInput->setLabel(i18n("Width:"), AlignLeft|AlignVCenter); - QWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); + TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); m_widthInput->setRange(m_imageSelectionWidget->getMinWidthRange(), m_imageSelectionWidget->getMaxWidthRange(), m_imageSelectionWidget->getWidthStep(), true); - m_centerWidth = new QPushButton(cropSelection); + m_centerWidth = new TQPushButton(cropSelection); KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); - m_centerWidth->setPixmap( QPixmap( directory + "centerwidth.png" ) ); - QWhatsThis::add( m_centerWidth, i18n("<p>Set width position to center.")); + TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + m_centerWidth->setPixmap( TQPixmap( directory + "centerwidth.png" ) ); + TQWhatsThis::add( m_centerWidth, i18n("<p>Set width position to center.")); grid->addMultiCellWidget(m_xInput, 3, 3, 0, 3); grid->addMultiCellWidget(m_widthInput, 4, 4, 0, 3); @@ -181,21 +181,21 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) m_yInput = new KIntNumInput(cropSelection); m_yInput->setLabel(i18n("Y:"), AlignLeft|AlignVCenter); - QWhatsThis::add( m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add( m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_yInput->setRange(0, m_imageSelectionWidget->getOriginalImageHeight(), 1, true); m_heightInput = new KIntNumInput(cropSelection); m_heightInput->setLabel(i18n("Height:"), AlignLeft|AlignVCenter); - QWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); + TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); m_heightInput->setRange(m_imageSelectionWidget->getMinHeightRange(), m_imageSelectionWidget->getMaxHeightRange(), m_imageSelectionWidget->getHeightStep(), true); - m_centerHeight = new QPushButton(cropSelection); + m_centerHeight = new TQPushButton(cropSelection); KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); - m_centerHeight->setPixmap( QPixmap( directory + "centerheight.png" ) ); - QWhatsThis::add( m_centerHeight, i18n("<p>Set height position to center.")); + m_centerHeight->setPixmap( TQPixmap( directory + "centerheight.png" ) ); + TQWhatsThis::add( m_centerHeight, i18n("<p>Set height position to center.")); grid->addMultiCellWidget(m_yInput, 5, 5, 0, 3); grid->addMultiCellWidget(m_heightInput, 6, 6, 0, 3); @@ -205,43 +205,43 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- - QFrame* compositionGuide = new QFrame( gbox2 ); - QGridLayout* grid2 = new QGridLayout( compositionGuide, 7, 2, spacingHint()); - compositionGuide->setFrameStyle(QFrame::Panel|QFrame::Sunken); + TQFrame* compositionGuide = new TQFrame( gbox2 ); + TQGridLayout* grid2 = new TQGridLayout( compositionGuide, 7, 2, spacingHint()); + compositionGuide->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - QLabel *labelGuideLines = new QLabel(i18n("Composition guide:"), compositionGuide); - m_guideLinesCB = new QComboBox( false, compositionGuide ); + TQLabel *labelGuideLines = new TQLabel(i18n("Composition guide:"), compositionGuide); + m_guideLinesCB = new TQComboBox( false, compositionGuide ); m_guideLinesCB->insertItem( i18n("Rules of Thirds") ); m_guideLinesCB->insertItem( i18n("Harmonious Triangles") ); m_guideLinesCB->insertItem( i18n("Golden Mean") ); m_guideLinesCB->insertItem( i18n("None") ); m_guideLinesCB->setCurrentText( i18n("None") ); - QWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " + TQWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " "which help you to compose your photograph.")); - m_goldenSectionBox = new QCheckBox(i18n("Golden sections"), compositionGuide); - QWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); + m_goldenSectionBox = new TQCheckBox(i18n("Golden sections"), compositionGuide); + TQWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); - m_goldenSpiralSectionBox = new QCheckBox(i18n("Golden spiral sections"), compositionGuide); - QWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); + m_goldenSpiralSectionBox = new TQCheckBox(i18n("Golden spiral sections"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); - m_goldenSpiralBox = new QCheckBox(i18n("Golden spiral"), compositionGuide); - QWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); + m_goldenSpiralBox = new TQCheckBox(i18n("Golden spiral"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); - m_goldenTriangleBox = new QCheckBox(i18n("Golden triangles"), compositionGuide); - QWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); + m_goldenTriangleBox = new TQCheckBox(i18n("Golden triangles"), compositionGuide); + TQWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); - m_flipHorBox = new QCheckBox(i18n("Flip horizontally"), compositionGuide); - QWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); + m_flipHorBox = new TQCheckBox(i18n("Flip horizontally"), compositionGuide); + TQWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); - m_flipVerBox = new QCheckBox(i18n("Flip vertically"), compositionGuide); - QWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); + m_flipVerBox = new TQCheckBox(i18n("Flip vertically"), compositionGuide); + TQWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); - m_colorGuideLabel = new QLabel(i18n("Color and width:"), compositionGuide); - m_guideColorBt = new KColorButton( QColor( 250, 250, 255 ), compositionGuide ); - m_guideSize = new QSpinBox( 1, 5, 1, compositionGuide); - QWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); - QWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); + m_colorGuideLabel = new TQLabel(i18n("Color and width:"), compositionGuide); + m_guideColorBt = new KColorButton( TQColor( 250, 250, 255 ), compositionGuide ); + m_guideSize = new TQSpinBox( 1, 5, 1, compositionGuide); + TQWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); + TQWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); grid2->addMultiCellWidget(labelGuideLines, 0, 0, 0, 0); grid2->addMultiCellWidget(m_guideLinesCB, 0, 0, 1, 2); @@ -262,77 +262,77 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(QWidget* parent) // ------------------------------------------------------------- - connect(m_ratioCB, SIGNAL(activated(int)), - this, SLOT(slotRatioChanged(int))); + connect(m_ratioCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotRatioChanged(int))); - connect(m_preciseCrop, SIGNAL(toggled(bool)), - this, SLOT(slotPreciseCropChanged(bool))); + connect(m_preciseCrop, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPreciseCropChanged(bool))); - connect(m_orientCB, SIGNAL(activated(int)), - this, SLOT(slotOrientChanged(int))); + connect(m_orientCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotOrientChanged(int))); - connect(m_autoOrientation, SIGNAL(toggled(bool)), - this, SLOT(slotAutoOrientChanged(bool))); + connect(m_autoOrientation, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAutoOrientChanged(bool))); - connect(m_xInput, SIGNAL(valueChanged(int)), - this, SLOT(slotXChanged(int))); + connect(m_xInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotXChanged(int))); - connect(m_yInput, SIGNAL(valueChanged(int)), - this, SLOT(slotYChanged(int))); + connect(m_yInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotYChanged(int))); - connect(m_customRatioNInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomNRatioChanged(int))); + connect(m_customRatioNInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomNRatioChanged(int))); - connect(m_customRatioDInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomDRatioChanged(int))); + connect(m_customRatioDInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomDRatioChanged(int))); - connect(m_guideLinesCB, SIGNAL(activated(int)), - this, SLOT(slotGuideTypeChanged(int))); + connect(m_guideLinesCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotGuideTypeChanged(int))); - connect(m_goldenSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenTriangleBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenTriangleBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipHorBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipHorBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipVerBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipVerBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_guideColorBt, SIGNAL(changed(const QColor &)), - m_imageSelectionWidget, SLOT(slotChangeGuideColor(const QColor &))); + connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor &)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); - connect(m_guideSize, SIGNAL(valueChanged(int)), - m_imageSelectionWidget, SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideSize(int))); - connect(m_widthInput, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthChanged(int))); + connect(m_widthInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthChanged(int))); - connect(m_heightInput, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightChanged(int))); + connect(m_heightInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightChanged(int))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionChanged(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionChanged(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionMoved(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionMoved(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionOrientationChanged(int)), - this, SLOT(slotSelectionOrientationChanged(int))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionOrientationChanged(int)), + this, TQT_SLOT(slotSelectionOrientationChanged(int))); - connect(m_centerWidth, SIGNAL(clicked()), - this, SLOT(slotCenterWidth())); + connect(m_centerWidth, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterWidth())); - connect(m_centerHeight, SIGNAL(clicked()), - this, SLOT(slotCenterHeight())); + connect(m_centerHeight, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterHeight())); // ------------------------------------------------------------- @@ -348,7 +348,7 @@ ImageEffect_RatioCrop::~ImageEffect_RatioCrop() void ImageEffect_RatioCrop::readSettings() { - QColor defaultGuideColor(250, 250, 255); + TQColor defaultGuideColor(250, 250, 255); KConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool Dialog"); @@ -359,8 +359,8 @@ void ImageEffect_RatioCrop::readSettings() m_goldenSpiralSectionBox->setChecked( config->readBoolEntry("Golden Spiral Section", false) ); m_goldenSpiralBox->setChecked( config->readBoolEntry("Golden Spiral", false) ); m_goldenTriangleBox->setChecked( config->readBoolEntry("Golden Triangle", false) ); - m_flipHorBox->setChecked( config->readBoolEntry("Golden Flip Horizontal", false) ); - m_flipVerBox->setChecked( config->readBoolEntry("Golden Flip Vertical", false) ); + m_flipHorBox->setChecked( config->readBoolEntry("Golden FlipQt::Horizontal", false) ); + m_flipVerBox->setChecked( config->readBoolEntry("Golden FlipQt::Vertical", false) ); m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); m_guideSize->setValue(config->readNumEntry("Guide Width", 1)); m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem()); @@ -371,7 +371,7 @@ void ImageEffect_RatioCrop::readSettings() if (m_originalIsLandscape) { - m_orientCB->setCurrentItem( config->readNumEntry("Hor.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem( config->readNumEntry("Hor.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Landscape) ); m_imageSelectionWidget->setSelectionOrientation(m_orientCB->currentItem()); @@ -395,7 +395,7 @@ void ImageEffect_RatioCrop::readSettings() } else { - m_orientCB->setCurrentItem( config->readNumEntry("Ver.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem( config->readNumEntry("Ver.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Portrait) ); m_imageSelectionWidget->setSelectionOrientation(m_orientCB->currentItem()); @@ -418,7 +418,7 @@ void ImageEffect_RatioCrop::readSettings() m_heightInput->setValue( config->readNumEntry("Ver.Oriented Custom Aspect Ratio Height", 600) ); } - m_autoOrientation->setChecked( config->readBoolEntry("Auto Orientation", false) ); + m_autoOrientation->setChecked( config->readBoolEntry("Auto Qt::Orientation", false) ); slotAutoOrientChanged( m_autoOrientation->isChecked() ); } @@ -430,7 +430,7 @@ void ImageEffect_RatioCrop::writeSettings() if (m_originalIsLandscape) { config->writeEntry( "Hor.Oriented Aspect Ratio", m_ratioCB->currentItem() ); - config->writeEntry( "Hor.Oriented Aspect Ratio Orientation", m_orientCB->currentItem() ); + config->writeEntry( "Hor.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem() ); config->writeEntry( "Hor.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value() ); config->writeEntry( "Hor.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value() ); @@ -442,7 +442,7 @@ void ImageEffect_RatioCrop::writeSettings() else { config->writeEntry( "Ver.Oriented Aspect Ratio", m_ratioCB->currentItem() ); - config->writeEntry( "Ver.Oriented Aspect Ratio Orientation", m_orientCB->currentItem() ); + config->writeEntry( "Ver.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem() ); config->writeEntry( "Ver.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value() ); config->writeEntry( "Ver.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value() ); @@ -453,14 +453,14 @@ void ImageEffect_RatioCrop::writeSettings() } config->writeEntry( "Precise Aspect Ratio Crop", m_preciseCrop->isChecked() ); - config->writeEntry( "Auto Orientation", m_autoOrientation->isChecked() ); + config->writeEntry( "Auto Qt::Orientation", m_autoOrientation->isChecked() ); config->writeEntry( "Guide Lines Type", m_guideLinesCB->currentItem() ); config->writeEntry( "Golden Section", m_goldenSectionBox->isChecked() ); config->writeEntry( "Golden Spiral Section", m_goldenSpiralSectionBox->isChecked() ); config->writeEntry( "Golden Spiral", m_goldenSpiralBox->isChecked() ); config->writeEntry( "Golden Triangle", m_goldenTriangleBox->isChecked() ); - config->writeEntry( "Golden Flip Horizontal", m_flipHorBox->isChecked() ); - config->writeEntry( "Golden Flip Vertical", m_flipVerBox->isChecked() ); + config->writeEntry( "Golden FlipQt::Horizontal", m_flipHorBox->isChecked() ); + config->writeEntry( "Golden FlipQt::Vertical", m_flipVerBox->isChecked() ); config->writeEntry( "Guide Color", m_guideColorBt->color() ); config->writeEntry( "Guide Width", m_guideSize->value() ); config->sync(); @@ -486,7 +486,7 @@ void ImageEffect_RatioCrop::slotCenterHeight() m_imageSelectionWidget->setCenterSelection(ImageSelectionWidget::CenterHeight); } -void ImageEffect_RatioCrop::slotSelectionChanged(QRect rect) +void ImageEffect_RatioCrop::slotSelectionChanged(TQRect rect) { m_xInput->blockSignals(true); m_yInput->blockSignals(true); @@ -552,7 +552,7 @@ void ImageEffect_RatioCrop::slotSelectionOrientationChanged(int newOrientation) setRatioCBText(newOrientation); - // Change Orientation ComboBox + // Change Qt::Orientation ComboBox m_orientCB->setCurrentItem(newOrientation); @@ -773,7 +773,7 @@ void ImageEffect_RatioCrop::slotOk() { kapp->setOverrideCursor( KCursor::waitCursor() ); - QRect currentRegion = m_imageSelectionWidget->getRegionSelection(); + TQRect currentRegion = m_imageSelectionWidget->getRegionSelection(); Digikam::ImageIface* iface = m_imageSelectionWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -781,7 +781,7 @@ void ImageEffect_RatioCrop::slotOk() bool a = iface->originalHasAlpha(); bool sb = iface->originalSixteenBit(); - QRect normalizedRegion = currentRegion.normalize(); + TQRect normalizedRegion = currentRegion.normalize(); if (normalizedRegion.right() > w) normalizedRegion.setRight(w); if (normalizedRegion.bottom() > h) normalizedRegion.setBottom(h); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h index ec16321..3851b76 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.h @@ -30,11 +30,11 @@ #include "imagedlgbase.h" -class QLabel; -class QComboBox; -class QPushButton; -class QCheckBox; -class QSpinBox; +class TQLabel; +class TQComboBox; +class TQPushButton; +class TQCheckBox; +class TQSpinBox; class KIntNumInput; class KIntSpinBox; @@ -48,10 +48,11 @@ class ImageSelectionWidget; class ImageEffect_RatioCrop : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_RatioCrop(QWidget *parent); + ImageEffect_RatioCrop(TQWidget *tqparent); ~ImageEffect_RatioCrop(); private: @@ -81,7 +82,7 @@ private slots: void slotOrientChanged(int o); void slotAutoOrientChanged(bool a); void slotRatioChanged(int a); - void slotSelectionChanged(QRect rect ); + void slotSelectionChanged(TQRect rect ); void slotSelectionOrientationChanged(int); void slotGuideTypeChanged(int t); void slotGoldenGuideTypeChanged(); @@ -90,28 +91,28 @@ private: bool m_originalIsLandscape; - QLabel *m_customLabel1; - QLabel *m_customLabel2; - QLabel *m_orientLabel; - QLabel *m_colorGuideLabel; + TQLabel *m_customLabel1; + TQLabel *m_customLabel2; + TQLabel *m_orientLabel; + TQLabel *m_colorGuideLabel; - QComboBox *m_ratioCB; - QComboBox *m_orientCB; - QComboBox *m_guideLinesCB; + TQComboBox *m_ratioCB; + TQComboBox *m_orientCB; + TQComboBox *m_guideLinesCB; - QPushButton *m_centerWidth; - QPushButton *m_centerHeight; + TQPushButton *m_centerWidth; + TQPushButton *m_centerHeight; - QCheckBox *m_goldenSectionBox; - QCheckBox *m_goldenSpiralSectionBox; - QCheckBox *m_goldenSpiralBox; - QCheckBox *m_goldenTriangleBox; - QCheckBox *m_flipHorBox; - QCheckBox *m_flipVerBox; - QCheckBox *m_autoOrientation; - QCheckBox *m_preciseCrop; + TQCheckBox *m_goldenSectionBox; + TQCheckBox *m_goldenSpiralSectionBox; + TQCheckBox *m_goldenSpiralBox; + TQCheckBox *m_goldenTriangleBox; + TQCheckBox *m_flipHorBox; + TQCheckBox *m_flipVerBox; + TQCheckBox *m_autoOrientation; + TQCheckBox *m_preciseCrop; - QSpinBox *m_guideSize; + TQSpinBox *m_guideSize; KIntNumInput *m_widthInput; KIntNumInput *m_heightInput; diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index b43544e..ada82c2 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -42,18 +42,18 @@ #include <cmath> #include <cstdlib> -// Qt includes. - -#include <qregion.h> -#include <qcolor.h> -#include <qpainter.h> -#include <qbrush.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qpen.h> -#include <qpoint.h> -#include <qtimer.h> -#include <qsizepolicy.h> +// TQt includes. + +#include <tqregion.h> +#include <tqcolor.h> +#include <tqpainter.h> +#include <tqbrush.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqpen.h> +#include <tqpoint.h> +#include <tqtimer.h> +#include <tqsizepolicy.h> // KDE includes. @@ -117,32 +117,32 @@ public: float currentWidthRatioValue; float currentHeightRatioValue; - QPoint lastPos; + TQPoint lastPos; - QRect rect; - QRect image; // Real image dimension. - QRect regionSelection; // Real size image selection. - QRect localRegionSelection; // Local size selection. + TQRect rect; + TQRect image; // Real image dimension. + TQRect regionSelection; // Real size image selection. + TQRect localRegionSelection; // Local size selection. // Draggable local region selection corners. - QRect localTopLeftCorner; - QRect localBottomLeftCorner; - QRect localTopRightCorner; - QRect localBottomRightCorner; + TQRect localTopLeftCorner; + TQRect localBottomLeftCorner; + TQRect localTopRightCorner; + TQRect localBottomRightCorner; - QPixmap *pixmap; + TQPixmap *pixmap; - QColor guideColor; + TQColor guideColor; Digikam::DImg preview; Digikam::ImageIface *iface; }; -ImageSelectionWidget::ImageSelectionWidget(int w, int h, QWidget *parent, +ImageSelectionWidget::ImageSelectionWidget(int w, int h, TQWidget *tqparent, int widthRatioValue, int heightRatioValue, int aspectRatioType, int orient, int guideLinesType) - : QWidget(parent, 0, Qt::WDestructiveClose) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new ImageSelectionWidgetPriv; d->currentAspectRatioType = aspectRatioType; @@ -155,7 +155,7 @@ ImageSelectionWidget::ImageSelectionWidget(int w, int h, QWidget *parent, d->moving = true; reverseRatioValues(); - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); setMouseTracking(true); @@ -168,10 +168,10 @@ ImageSelectionWidget::ImageSelectionWidget(int w, int h, QWidget *parent, d->preview = Digikam::DImg(width, height, sixteenBit, hasAlpha, data); delete [] data; d->preview.convertToEightBit(); - d->pixmap = new QPixmap(w, h); + d->pixmap = new TQPixmap(w, h); - d->image = QRect(0, 0, d->iface->originalWidth(), d->iface->originalHeight()); - d->rect = QRect(w/2-d->preview.width()/2, h/2-d->preview.height()/2, + d->image = TQRect(0, 0, d->iface->originalWidth(), d->iface->originalHeight()); + d->rect = TQRect(w/2-d->preview.width()/2, h/2-d->preview.height()/2, d->preview.width(), d->preview.height()); updatePixmap(); setGoldenGuideTypes(true, false, false, false, false, false); @@ -189,7 +189,7 @@ Digikam::ImageIface* ImageSelectionWidget::imageIface() return d->iface; } -void ImageSelectionWidget::resizeEvent(QResizeEvent *e) +void ImageSelectionWidget::resizeEvent(TQResizeEvent *e) { delete d->pixmap; @@ -205,9 +205,9 @@ void ImageSelectionWidget::resizeEvent(QResizeEvent *e) delete [] data; d->preview.convertToEightBit(); - d->pixmap = new QPixmap(w, h); + d->pixmap = new TQPixmap(w, h); - d->rect = QRect(w/2-d->preview.width()/2, h/2-d->preview.height()/2, + d->rect = TQRect(w/2-d->preview.width()/2, h/2-d->preview.height()/2, d->preview.width(), d->preview.height()); updatePixmap(); } @@ -222,7 +222,7 @@ int ImageSelectionWidget::getOriginalImageHeight() return d->image.height(); } -QRect ImageSelectionWidget::getRegionSelection() +TQRect ImageSelectionWidget::getRegionSelection() { return d->regionSelection; } @@ -317,7 +317,7 @@ void ImageSelectionWidget::setCenterSelection(int centerType) } // Set center point for selection - QPoint center = d->image.center(); + TQPoint center = d->image.center(); switch (centerType) { case CenterWidth: @@ -332,7 +332,7 @@ void ImageSelectionWidget::setCenterSelection(int centerType) // Repaint updatePixmap(); - repaint(false); + tqrepaint(false); regionSelectionChanged(); } @@ -363,21 +363,21 @@ void ImageSelectionWidget::slotGuideLines(int guideLinesType) { d->guideLinesType = guideLinesType; updatePixmap(); - repaint(false); + tqrepaint(false); } -void ImageSelectionWidget::slotChangeGuideColor(const QColor &color) +void ImageSelectionWidget::slotChangeGuideColor(const TQColor &color) { d->guideColor = color; updatePixmap(); - repaint(false); + tqrepaint(false); } void ImageSelectionWidget::slotChangeGuideSize(int size) { d->guideSize = size; updatePixmap(); - repaint(false); + tqrepaint(false); } void ImageSelectionWidget::setSelectionOrientation(int orient) @@ -546,12 +546,12 @@ void ImageSelectionWidget::setSelectionHeight(int h) regionSelectionChanged(); } -QPoint ImageSelectionWidget::convertPoint(const QPoint pm, bool localToReal) +TQPoint ImageSelectionWidget::convertPoint(const TQPoint pm, bool localToReal) { return convertPoint(pm.x(), pm.y(), localToReal); } -QPoint ImageSelectionWidget::convertPoint(int x, int y, bool localToReal) +TQPoint ImageSelectionWidget::convertPoint(int x, int y, bool localToReal) { int pmX, pmY; @@ -572,7 +572,7 @@ QPoint ImageSelectionWidget::convertPoint(int x, int y, bool localToReal) (float)d->image.height() ); } - return QPoint(pmX, pmY); + return TQPoint(pmX, pmY); } int ImageSelectionWidget::computePreciseSize(int size, int step) @@ -584,10 +584,10 @@ int ImageSelectionWidget::computePreciseSize(int size, int step) return size; } -void ImageSelectionWidget::applyAspectRatio(bool useHeight, bool repaintWidget) +void ImageSelectionWidget::applyAspectRatio(bool useHeight, bool tqrepaintWidget) { // Save selection area for re-adjustment after changing width and height. - QRect oldRegionSelection = d->regionSelection; + TQRect oldRegionSelection = d->regionSelection; if ( !useHeight ) // Width changed. { @@ -644,10 +644,10 @@ void ImageSelectionWidget::applyAspectRatio(bool useHeight, bool repaintWidget) break; } - if (repaintWidget) + if (tqrepaintWidget) { updatePixmap(); - repaint(false); + tqrepaint(false); } } @@ -673,7 +673,7 @@ void ImageSelectionWidget::regionSelectionMoved() normalizeRegion(); updatePixmap(); - repaint(false); + tqrepaint(false); emit signalSelectionMoved( d->regionSelection ); } @@ -681,7 +681,7 @@ void ImageSelectionWidget::regionSelectionMoved() void ImageSelectionWidget::regionSelectionChanged() { // Compute the intersection of selection region and image region - QRect cut = d->regionSelection & d->image; + TQRect cut = d->regionSelection & d->image; // Adjust selection size if it was cropped if ( d->regionSelection.width() > cut.width() ) @@ -717,7 +717,7 @@ void ImageSelectionWidget::updatePixmap() d->localRegionSelection.bottom() - 7, 8, 8); // Drawing background and image. - d->pixmap->fill(colorGroup().background()); + d->pixmap->fill(tqcolorGroup().background()); if (d->preview.isNull()) return; @@ -733,7 +733,7 @@ void ImageSelectionWidget::updatePixmap() { for (int x=d->rect.left() ; x <= d->rect.right() ; x++) { - if (! d->localRegionSelection.contains(x, y, true) ) + if (! d->localRegionSelection.tqcontains(x, y, true) ) { b = ptr[0]; g = ptr[1]; @@ -752,18 +752,18 @@ void ImageSelectionWidget::updatePixmap() } } - QPixmap pix = d->iface->convertToPixmap(image); + TQPixmap pix = d->iface->convertToPixmap(image); bitBlt(d->pixmap, d->rect.x(), d->rect.y(), &pix); // Stop here if no selection to draw if ( d->regionSelection.isEmpty() ) return; - QPainter p(d->pixmap); + TQPainter p(d->pixmap); // Drawing selection borders. - p.setPen(QPen(QColor(250, 250, 255), 1, Qt::SolidLine)); + p.setPen(TQPen(TQColor(250, 250, 255), 1, TQt::SolidLine)); p.drawRect(d->localRegionSelection); // Drawing selection corners. @@ -788,7 +788,7 @@ void ImageSelectionWidget::updatePixmap() int xThird = d->localRegionSelection.width() / 3; int yThird = d->localRegionSelection.height() / 3; - p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, d->guideSize, TQt::SolidLine)); p.drawLine( d->localRegionSelection.left() + xThird, d->localRegionSelection.top(), d->localRegionSelection.left() + xThird, d->localRegionSelection.bottom() ); p.drawLine( d->localRegionSelection.left() + 2*xThird, d->localRegionSelection.top(), @@ -799,7 +799,7 @@ void ImageSelectionWidget::updatePixmap() p.drawLine( d->localRegionSelection.left(), d->localRegionSelection.top() + 2*yThird, d->localRegionSelection.right(), d->localRegionSelection.top() + 2*yThird ); - p.setPen(QPen(d->guideColor, d->guideSize, Qt::DotLine)); + p.setPen(TQPen(d->guideColor, d->guideSize, TQt::DotLine)); p.drawLine( d->localRegionSelection.left() + xThird, d->localRegionSelection.top(), d->localRegionSelection.left() + xThird, d->localRegionSelection.bottom() ); p.drawLine( d->localRegionSelection.left() + 2*xThird, d->localRegionSelection.top(), @@ -820,7 +820,7 @@ void ImageSelectionWidget::updatePixmap() float w = (float)d->localRegionSelection.width(); float h = (float)d->localRegionSelection.height(); - p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, d->guideSize, TQt::SolidLine)); if (w > h) { p.drawLine( 0, 0, h, h); @@ -837,7 +837,7 @@ void ImageSelectionWidget::updatePixmap() p.drawLine( 0, h, w, h-w); } - p.setPen(QPen(d->guideColor, d->guideSize, Qt::DotLine)); + p.setPen(TQPen(d->guideColor, d->guideSize, TQt::DotLine)); if (w > h) { p.drawLine( 0, 0, h, h); @@ -873,7 +873,7 @@ void ImageSelectionWidget::updatePixmap() float h = (float)d->localRegionSelection.height(); int dst = (int)((h*cos(atan(w/h)) / (cos(atan(h/w))))); - p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, d->guideSize, TQt::SolidLine)); p.drawLine( -d->localRegionSelection.width()/2, -d->localRegionSelection.height()/2, d->localRegionSelection.width()/2, d->localRegionSelection.height()/2); @@ -883,7 +883,7 @@ void ImageSelectionWidget::updatePixmap() p.drawLine( d->localRegionSelection.width()/2, -d->localRegionSelection.height()/2, d->localRegionSelection.width()/2 - dst, d->localRegionSelection.height()/2); - p.setPen(QPen(d->guideColor, d->guideSize, Qt::DotLine)); + p.setPen(TQPen(d->guideColor, d->guideSize, TQt::DotLine)); p.drawLine( -d->localRegionSelection.width()/2, -d->localRegionSelection.height()/2, d->localRegionSelection.width()/2, d->localRegionSelection.height()/2); @@ -917,23 +917,23 @@ void ImageSelectionWidget::updatePixmap() int w_2 = w/2; int h_2 = h/2; - QRect R1(-w_2, -h_2, w_g, h); + TQRect R1(-w_2, -h_2, w_g, h); // w - 2*w_2 corrects for one-pixel difference // so that R2.right() is really at the right end of the region - QRect R2(w_g-w_2, h_2-h_g, w-w_g+1-(w - 2*w_2), h_g); + TQRect R2(w_g-w_2, h_2-h_g, w-w_g+1-(w - 2*w_2), h_g); - QRect R3((int)(w_2 - R2.width()*INVPHI), -h_2, + TQRect R3((int)(w_2 - R2.width()*INVPHI), -h_2, (int)(R2.width()*INVPHI), h - R2.height()); - QRect R4(R2.x(), R1.y(), R3.x() - R2.x(), + TQRect R4(R2.x(), R1.y(), R3.x() - R2.x(), (int)(R3.height()*INVPHI)); - QRect R5(R4.x(), R4.bottom(), (int)(R4.width()*INVPHI), + TQRect R5(R4.x(), R4.bottom(), (int)(R4.width()*INVPHI), R3.height() - R4.height()); - QRect R6(R5.x() + R5.width(), R5.bottom() - (int)(R5.height()*INVPHI), + TQRect R6(R5.x() + R5.width(), R5.bottom() - (int)(R5.height()*INVPHI), R3.x() - R5.right(), (int)(R5.height()*INVPHI)); - QRect R7(R6.right() - (int)(R6.width()*INVPHI), R4.bottom(), + TQRect R7(R6.right() - (int)(R6.width()*INVPHI), R4.bottom(), (int)(R6.width()*INVPHI), R5.height() - R6.height()); - p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, d->guideSize, TQt::SolidLine)); // Drawing Golden sections. if (d->drawGoldenSection) @@ -1017,7 +1017,7 @@ void ImageSelectionWidget::updatePixmap() 0, 90*16); } - p.setPen(QPen(d->guideColor, d->guideSize, Qt::DotLine)); + p.setPen(TQPen(d->guideColor, d->guideSize, TQt::DotLine)); // Drawing Golden sections. if (d->drawGoldenSection) @@ -1110,14 +1110,14 @@ void ImageSelectionWidget::updatePixmap() p.end(); } -void ImageSelectionWidget::paintEvent( QPaintEvent * ) +void ImageSelectionWidget::paintEvent( TQPaintEvent * ) { bitBlt(this, 0, 0, d->pixmap); } -QPoint ImageSelectionWidget::opposite() +TQPoint ImageSelectionWidget::opposite() { - QPoint opp; + TQPoint opp; switch(d->currentResizing) { @@ -1142,7 +1142,7 @@ QPoint ImageSelectionWidget::opposite() return opp; } -float ImageSelectionWidget::distance(QPoint a, QPoint b) +float ImageSelectionWidget::distance(TQPoint a, TQPoint b) { return sqrt(pow(a.x() - b.x(), 2) + pow(a.y() - b.y(), 2)); } @@ -1169,12 +1169,12 @@ void ImageSelectionWidget::setCursorResizing() } } -void ImageSelectionWidget::placeSelection(QPoint pm, bool symmetric, QPoint center) +void ImageSelectionWidget::placeSelection(TQPoint pm, bool symmetric, TQPoint center) { // Set orientation if ( d->autoOrientation ) { - QPoint rel = pm - opposite(); + TQPoint rel = pm - opposite(); if ( abs(rel.x()) > abs(rel.y()) ) { @@ -1236,25 +1236,25 @@ void ImageSelectionWidget::placeSelection(QPoint pm, bool symmetric, QPoint cent // Repaint updatePixmap(); - repaint(false); + tqrepaint(false); } -void ImageSelectionWidget::mousePressEvent ( QMouseEvent * e ) +void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton ) { - QPoint pm = QPoint(e->x(), e->y()); - QPoint pmVirtual = convertPoint(pm); + TQPoint pm = TQPoint(e->x(), e->y()); + TQPoint pmVirtual = convertPoint(pm); d->moving = false; - if ( (e->state() & Qt::ShiftButton) == Qt::ShiftButton ) + if ( (e->state() & TQt::ShiftButton) == TQt::ShiftButton ) { - bool symmetric = (e->state() & Qt::ControlButton ) == Qt::ControlButton; - QPoint center = d->regionSelection.center(); + bool symmetric = (e->state() & TQt::ControlButton ) == TQt::ControlButton; + TQPoint center = d->regionSelection.center(); // Find the closest corner - QPoint points[] = { d->regionSelection.topLeft(), + TQPoint points[] = { d->regionSelection.topLeft(), d->regionSelection.topRight(), d->regionSelection.bottomLeft(), d->regionSelection.bottomRight() }; @@ -1265,7 +1265,7 @@ void ImageSelectionWidget::mousePressEvent ( QMouseEvent * e ) float dist = -1; for (int i = 0 ; i < 4 ; i++) { - QPoint point = points[i]; + TQPoint point = points[i]; float dist2 = distance(pmVirtual, point); if (dist2 < dist || d->currentResizing == ImageSelectionWidgetPriv::ResizingNone) { @@ -1280,20 +1280,20 @@ void ImageSelectionWidget::mousePressEvent ( QMouseEvent * e ) } else { - if ( d->localTopLeftCorner.contains( pm ) ) + if ( d->localTopLeftCorner.tqcontains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingTopLeft; - else if ( d->localTopRightCorner.contains( pm ) ) + else if ( d->localTopRightCorner.tqcontains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingTopRight; - else if ( d->localBottomLeftCorner.contains( pm ) ) + else if ( d->localBottomLeftCorner.tqcontains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingBottomLeft; - else if ( d->localBottomRightCorner.contains( pm ) ) + else if ( d->localBottomRightCorner.tqcontains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingBottomRight; else { d->lastPos = pmVirtual; setCursor( KCursor::sizeAllCursor() ); - if (d->regionSelection.contains( pmVirtual ) ) + if (d->regionSelection.tqcontains( pmVirtual ) ) { d->moving = true; } @@ -1302,14 +1302,14 @@ void ImageSelectionWidget::mousePressEvent ( QMouseEvent * e ) d->regionSelection.moveCenter( pmVirtual ); normalizeRegion(); updatePixmap(); - repaint(false); + tqrepaint(false); } } } } } -void ImageSelectionWidget::mouseReleaseEvent ( QMouseEvent * ) +void ImageSelectionWidget::mouseReleaseEvent ( TQMouseEvent * ) { if ( d->currentResizing != ImageSelectionWidgetPriv::ResizingNone ) { @@ -1317,7 +1317,7 @@ void ImageSelectionWidget::mouseReleaseEvent ( QMouseEvent * ) regionSelectionChanged(); d->currentResizing = ImageSelectionWidgetPriv::ResizingNone; } - else if ( d->regionSelection.contains( d->lastPos ) ) + else if ( d->regionSelection.tqcontains( d->lastPos ) ) { setCursor( KCursor::handCursor() ); regionSelectionMoved(); @@ -1329,14 +1329,14 @@ void ImageSelectionWidget::mouseReleaseEvent ( QMouseEvent * ) } } -void ImageSelectionWidget::mouseMoveEvent ( QMouseEvent * e ) +void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( ( e->state() & Qt::LeftButton ) == Qt::LeftButton ) { if ( d->moving ) { setCursor( KCursor::sizeAllCursor() ); - QPoint newPos = convertPoint(e->x(), e->y()); + TQPoint newPos = convertPoint(e->x(), e->y()); d->regionSelection.moveBy( newPos.x() - d->lastPos.x(), newPos.y() - d->lastPos.y() ); @@ -1346,11 +1346,11 @@ void ImageSelectionWidget::mouseMoveEvent ( QMouseEvent * e ) normalizeRegion(); updatePixmap(); - repaint(false); + tqrepaint(false); } else { - QPoint pmVirtual = convertPoint(e->x(), e->y()); + TQPoint pmVirtual = convertPoint(e->x(), e->y()); if ( d->currentResizing == ImageSelectionWidgetPriv::ResizingNone ) { @@ -1359,13 +1359,13 @@ void ImageSelectionWidget::mouseMoveEvent ( QMouseEvent * e ) d->currentResizing = ImageSelectionWidgetPriv::ResizingTopLeft; // set to anything } - QPoint center = d->regionSelection.center(); - bool symmetric = (e->state() & Qt::ControlButton ) == Qt::ControlButton; + TQPoint center = d->regionSelection.center(); + bool symmetric = (e->state() & TQt::ControlButton ) == TQt::ControlButton; // Change resizing mode - QPoint opp = symmetric ? center : opposite(); - QPoint dir = pmVirtual - opp; + TQPoint opp = symmetric ? center : opposite(); + TQPoint dir = pmVirtual - opp; if ( dir.x() > 0 && dir.y() > 0 && d->currentResizing != ImageSelectionWidgetPriv::ResizingBottomRight) { @@ -1406,13 +1406,13 @@ void ImageSelectionWidget::mouseMoveEvent ( QMouseEvent * e ) } else { - if ( d->localTopLeftCorner.contains( e->x(), e->y() ) || - d->localBottomRightCorner.contains( e->x(), e->y() ) ) + if ( d->localTopLeftCorner.tqcontains( e->x(), e->y() ) || + d->localBottomRightCorner.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::sizeFDiagCursor() ); - else if ( d->localTopRightCorner.contains( e->x(), e->y() ) || - d->localBottomLeftCorner.contains( e->x(), e->y() ) ) + else if ( d->localTopRightCorner.tqcontains( e->x(), e->y() ) || + d->localBottomLeftCorner.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::sizeBDiagCursor() ); - else if ( d->localRegionSelection.contains( e->x(), e->y() ) ) + else if ( d->localRegionSelection.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::handCursor() ); else setCursor( KCursor::arrowCursor() ); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h index 5b4a576..9eabcaf 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.h @@ -26,11 +26,11 @@ #ifndef IMAGESELECTIONWIDGET_H #define IMAGESELECTIONWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qrect.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqrect.h> +#include <tqcolor.h> namespace Digikam { @@ -42,10 +42,11 @@ namespace DigikamImagesPluginCore class ImageSelectionWidgetPriv; -class ImageSelectionWidget : public QWidget +class ImageSelectionWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -89,7 +90,7 @@ public: public: - ImageSelectionWidget(int width, int height, QWidget *parent=0, + ImageSelectionWidget(int width, int height, TQWidget *tqparent=0, int widthRatioValue=1, int heightRatioValue=1, int aspectRatio=RATIO01X01, int orient=Landscape, int guideLinesType=GuideNone); @@ -111,7 +112,7 @@ public: int getOriginalImageWidth(); int getOriginalImageHeight(); - QRect getRegionSelection(); + TQRect getRegionSelection(); int getMinWidthRange(); int getMinHeightRange(); @@ -130,22 +131,22 @@ public: public slots: void slotGuideLines(int guideLinesType); - void slotChangeGuideColor(const QColor &color); + void slotChangeGuideColor(const TQColor &color); void slotChangeGuideSize(int size); signals: - void signalSelectionMoved( QRect rect ); - void signalSelectionChanged( QRect rect ); + void signalSelectionMoved( TQRect rect ); + void signalSelectionChanged( TQRect rect ); void signalSelectionOrientationChanged( int newOrientation ); protected: - void paintEvent( QPaintEvent *e ); - void mousePressEvent ( QMouseEvent * e ); - void mouseReleaseEvent ( QMouseEvent * e ); - void mouseMoveEvent ( QMouseEvent * e ); - void resizeEvent(QResizeEvent * e); + void paintEvent( TQPaintEvent *e ); + void mousePressEvent ( TQMouseEvent * e ); + void mouseReleaseEvent ( TQMouseEvent * e ); + void mouseMoveEvent ( TQMouseEvent * e ); + void resizeEvent(TQResizeEvent * e); private: @@ -153,16 +154,16 @@ private: void regionSelectionMoved(); void regionSelectionChanged(); - QPoint convertPoint(const QPoint pm, bool localToReal=true); - QPoint convertPoint(int x, int y, bool localToReal=true); + TQPoint convertPoint(const TQPoint pm, bool localToReal=true); + TQPoint convertPoint(int x, int y, bool localToReal=true); void normalizeRegion(); void reverseRatioValues(); int computePreciseSize(int size, int step); - void applyAspectRatio(bool useHeight, bool repaintWidget=true); + void applyAspectRatio(bool useHeight, bool tqrepaintWidget=true); void updatePixmap(); - QPoint opposite(); - float distance(QPoint a, QPoint b); - void placeSelection(QPoint pm, bool symetric, QPoint center); + TQPoint opposite(); + float distance(TQPoint a, TQPoint b); + void placeSelection(TQPoint pm, bool symetric, TQPoint center); void setCursorResizing(); private: diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index e869137..91c8a7f 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -23,20 +23,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qframe.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qrect.h> -#include <qspinbox.h> -#include <qtimer.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqrect.h> +#include <tqspinbox.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RatioCropTool::RatioCropTool(QObject* parent) - : EditorTool(parent) +RatioCropTool::RatioCropTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("aspectratiocrop"); setToolName(i18n("Aspect Ratio Crop")); @@ -82,7 +82,7 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- m_imageSelectionWidget = new ImageSelectionWidget(480, 320); - QWhatsThis::add(m_imageSelectionWidget, + TQWhatsThis::add(m_imageSelectionWidget, i18n("<p>Here you can see the aspect ratio selection preview " "used for cropping. You can use the mouse to move and " "resize the crop area. " @@ -109,24 +109,24 @@ RatioCropTool::RatioCropTool(QObject* parent) // now we can set the correct text for the button m_gboxSettings->button(EditorToolSettings::Try)->setText(i18n("Max. Aspect")); - QToolTip::add(m_gboxSettings->button(EditorToolSettings::Try), + TQToolTip::add(m_gboxSettings->button(EditorToolSettings::Try), i18n("<p>Set selection area to the maximum size according " "to the current ratio.")); // ------------------------------------------------------------- - QGridLayout *gboxLayout = new QGridLayout(m_gboxSettings->plainPage(), 3, 2); + TQGridLayout *gboxLayout = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2); - QFrame *cropSelection = new QFrame(m_gboxSettings->plainPage()); - cropSelection->setFrameStyle(QFrame::Panel | QFrame::Sunken); + TQFrame *cropSelection = new TQFrame(m_gboxSettings->plainPage()); + cropSelection->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - QGridLayout* grid = new QGridLayout(cropSelection, 7, 5); + TQGridLayout* grid = new TQGridLayout(cropSelection, 7, 5); - QLabel *label = new QLabel(i18n("Ratio:"), cropSelection); + TQLabel *label = new TQLabel(i18n("Ratio:"), cropSelection); m_ratioCB = new RComboBox(cropSelection); m_ratioCB->setDefaultItem(ImageSelectionWidget::RATIO03X04); setRatioCBText(ImageSelectionWidget::Landscape); - QWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " + TQWhatsThis::add( m_ratioCB, i18n("<p>Select your constrained aspect ratio for cropping. " "Aspect Ratio Crop tool uses a relative ratio. That means it " "is the same if you use centimeters or inches and it doesn't " "specify the physical size.<p>" @@ -143,34 +143,34 @@ RatioCropTool::RatioCropTool(QObject* parent) "is considered visually harmonious but can be unadapted to print on " "standard photographic paper.")); - m_preciseCrop = new QCheckBox(i18n("Exact"), cropSelection); - QWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop.")); + m_preciseCrop = new TQCheckBox(i18n("Exact"), cropSelection); + TQWhatsThis::add( m_preciseCrop, i18n("<p>Enable this option to force exact aspect ratio crop.")); - m_orientLabel = new QLabel(i18n("Orientation:"), cropSelection); + m_orientLabel = new TQLabel(i18n("Qt::Orientation:"), cropSelection); m_orientCB = new RComboBox(cropSelection); m_orientCB->insertItem( i18n("Landscape")); m_orientCB->insertItem( i18n("Portrait")); m_orientCB->setDefaultItem(ImageSelectionWidget::Landscape); - QWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); + TQWhatsThis::add( m_orientCB, i18n("<p>Select constrained aspect ratio orientation.")); - m_autoOrientation = new QCheckBox(i18n("Auto"), cropSelection); - QWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); + m_autoOrientation = new TQCheckBox(i18n("Auto"), cropSelection); + TQWhatsThis::add( m_autoOrientation, i18n("<p>Enable this option to automatically set the orientation.")); // ------------------------------------------------------------- - m_customLabel1 = new QLabel(i18n("Custom:"), cropSelection); - m_customLabel1->setAlignment(AlignLeft|AlignVCenter); + m_customLabel1 = new TQLabel(i18n("Custom:"), cropSelection); + m_customLabel1->tqsetAlignment(AlignLeft|AlignVCenter); m_customRatioNInput = new RIntNumInput(cropSelection); m_customRatioNInput->input()->setRange(1, 10000, 1, false); m_customRatioNInput->setDefaultValue(1); - QWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value.")); + TQWhatsThis::add( m_customRatioNInput, i18n("<p>Set here the desired custom aspect numerator value.")); - m_customLabel2 = new QLabel(" : ", cropSelection); - m_customLabel2->setAlignment(AlignCenter|AlignVCenter); + m_customLabel2 = new TQLabel(" : ", cropSelection); + m_customLabel2->tqsetAlignment(AlignCenter|AlignVCenter); m_customRatioDInput = new RIntNumInput(cropSelection); m_customRatioDInput->input()->setRange(1, 10000, 1, false); m_customRatioDInput->setDefaultValue(1); - QWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); + TQWhatsThis::add( m_customRatioDInput, i18n("<p>Set here the desired custom aspect denominator value.")); // ------------------------------------------------------------- @@ -178,7 +178,7 @@ RatioCropTool::RatioCropTool(QObject* parent) m_xInput->input()->setLabel(i18n("X:"), AlignLeft|AlignVCenter); m_xInput->setRange(0, m_imageSelectionWidget->getOriginalImageWidth(), 1); m_xInput->setDefaultValue(50); - QWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add( m_xInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_widthInput = new RIntNumInput(cropSelection); m_widthInput->input()->setLabel(i18n("Width:"), AlignLeft|AlignVCenter); @@ -186,13 +186,13 @@ RatioCropTool::RatioCropTool(QObject* parent) m_imageSelectionWidget->getMaxWidthRange(), m_imageSelectionWidget->getWidthStep()); m_widthInput->setDefaultValue(800); - QWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); + TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); - m_centerWidth = new QToolButton(cropSelection); + m_centerWidth = new TQToolButton(cropSelection); KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); - m_centerWidth->setPixmap(QPixmap(directory + "centerwidth.png")); - QWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); + TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png")); + TQWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); // ------------------------------------------------------------- @@ -200,7 +200,7 @@ RatioCropTool::RatioCropTool(QObject* parent) m_yInput->input()->setLabel(i18n("Y:"), AlignLeft | AlignVCenter); m_yInput->setRange(0, m_imageSelectionWidget->getOriginalImageHeight(), 1); m_yInput->setDefaultValue(50); - QWhatsThis::add(m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); + TQWhatsThis::add(m_yInput, i18n("<p>Set here the top left selection corner position for cropping.")); m_heightInput = new RIntNumInput(cropSelection); m_heightInput->input()->setLabel(i18n("Height:"), AlignLeft | AlignVCenter); @@ -208,13 +208,13 @@ RatioCropTool::RatioCropTool(QObject* parent) m_imageSelectionWidget->getMaxHeightRange(), m_imageSelectionWidget->getHeightStep()); m_heightInput->setDefaultValue(600); - QWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); + TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); - m_centerHeight = new QToolButton(cropSelection); + m_centerHeight = new TQToolButton(cropSelection); KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); - m_centerHeight->setPixmap(QPixmap(directory + "centerheight.png")); - QWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); + m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png")); + TQWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); grid->addMultiCellWidget(label, 0, 0, 0, 0); grid->addMultiCellWidget(m_ratioCB, 0, 0, 1, 3); @@ -237,11 +237,11 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- - QFrame* compositionGuide = new QFrame(m_gboxSettings->plainPage()); - QGridLayout* grid2 = new QGridLayout(compositionGuide, 8, 3); - compositionGuide->setFrameStyle(QFrame::Panel|QFrame::Sunken); + TQFrame* compositionGuide = new TQFrame(m_gboxSettings->plainPage()); + TQGridLayout* grid2 = new TQGridLayout(compositionGuide, 8, 3); + compositionGuide->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - QLabel *labelGuideLines = new QLabel(i18n("Composition guide:"), compositionGuide); + TQLabel *labelGuideLines = new TQLabel(i18n("Composition guide:"), compositionGuide); m_guideLinesCB = new RComboBox(compositionGuide); m_guideLinesCB->insertItem( i18n("Rules of Thirds")); m_guideLinesCB->insertItem( i18n("Diagonal Method")); @@ -249,34 +249,34 @@ RatioCropTool::RatioCropTool(QObject* parent) m_guideLinesCB->insertItem( i18n("Golden Mean")); m_guideLinesCB->insertItem( i18n("None")); m_guideLinesCB->setDefaultItem(ImageSelectionWidget::GuideNone); - QWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " + TQWhatsThis::add( m_guideLinesCB, i18n("<p>With this option, you can display guide lines " "which help you to compose your photograph.")); - m_goldenSectionBox = new QCheckBox(i18n("Golden sections"), compositionGuide); - QWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); + m_goldenSectionBox = new TQCheckBox(i18n("Golden sections"), compositionGuide); + TQWhatsThis::add( m_goldenSectionBox, i18n("<p>Enable this option to show golden sections.")); - m_goldenSpiralSectionBox = new QCheckBox(i18n("Golden spiral sections"), compositionGuide); - QWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); + m_goldenSpiralSectionBox = new TQCheckBox(i18n("Golden spiral sections"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralSectionBox, i18n("<p>Enable this option to show golden spiral sections.")); - m_goldenSpiralBox = new QCheckBox(i18n("Golden spiral"), compositionGuide); - QWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); + m_goldenSpiralBox = new TQCheckBox(i18n("Golden spiral"), compositionGuide); + TQWhatsThis::add( m_goldenSpiralBox, i18n("<p>Enable this option to show golden spiral guide.")); - m_goldenTriangleBox = new QCheckBox(i18n("Golden triangles"), compositionGuide); - QWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); + m_goldenTriangleBox = new TQCheckBox(i18n("Golden triangles"), compositionGuide); + TQWhatsThis::add( m_goldenTriangleBox, i18n("<p>Enable this option to show golden triangles.")); - m_flipHorBox = new QCheckBox(i18n("Flip horizontally"), compositionGuide); - QWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); + m_flipHorBox = new TQCheckBox(i18n("Flip horizontally"), compositionGuide); + TQWhatsThis::add( m_flipHorBox, i18n("<p>Enable this option to flip horizontally guidelines.")); - m_flipVerBox = new QCheckBox(i18n("Flip vertically"), compositionGuide); - QWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); + m_flipVerBox = new TQCheckBox(i18n("Flip vertically"), compositionGuide); + TQWhatsThis::add( m_flipVerBox, i18n("<p>Enable this option to flip vertically guidelines.")); - m_colorGuideLabel = new QLabel(i18n("Color and width:"), compositionGuide); - m_guideColorBt = new KColorButton(QColor(250, 250, 255), compositionGuide); + m_colorGuideLabel = new TQLabel(i18n("Color and width:"), compositionGuide); + m_guideColorBt = new KColorButton(TQColor(250, 250, 255), compositionGuide); m_guideSize = new RIntNumInput(compositionGuide); m_guideSize->input()->setRange(1, 5, 1, false); m_guideSize->setDefaultValue(1); - QWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); - QWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); + TQWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw composition guides.")); + TQWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw composition guides.")); grid2->addMultiCellWidget(labelGuideLines, 0, 0, 0, 0); grid2->addMultiCellWidget(m_guideLinesCB, 0, 0, 1, 2); @@ -306,84 +306,84 @@ RatioCropTool::RatioCropTool(QObject* parent) // ------------------------------------------------------------- - connect(m_ratioCB, SIGNAL(activated(int)), - this, SLOT(slotRatioChanged(int))); + connect(m_ratioCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotRatioChanged(int))); - connect(m_preciseCrop, SIGNAL(toggled(bool)), - this, SLOT(slotPreciseCropChanged(bool))); + connect(m_preciseCrop, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPreciseCropChanged(bool))); - connect(m_orientCB, SIGNAL(activated(int)), - this, SLOT(slotOrientChanged(int))); + connect(m_orientCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotOrientChanged(int))); - connect(m_autoOrientation, SIGNAL(toggled(bool)), - this, SLOT(slotAutoOrientChanged(bool))); + connect(m_autoOrientation, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAutoOrientChanged(bool))); - connect(m_xInput, SIGNAL(valueChanged(int)), - this, SLOT(slotXChanged(int))); + connect(m_xInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotXChanged(int))); - connect(m_yInput, SIGNAL(valueChanged(int)), - this, SLOT(slotYChanged(int))); + connect(m_yInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotYChanged(int))); - connect(m_customRatioNInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomNRatioChanged(int))); + connect(m_customRatioNInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomNRatioChanged(int))); - connect(m_customRatioDInput, SIGNAL(valueChanged(int)), - this, SLOT(slotCustomDRatioChanged(int))); + connect(m_customRatioDInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotCustomDRatioChanged(int))); - connect(m_guideLinesCB, SIGNAL(activated(int)), - this, SLOT(slotGuideTypeChanged(int))); + connect(m_guideLinesCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotGuideTypeChanged(int))); - connect(m_goldenSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralSectionBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralSectionBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenSpiralBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenSpiralBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_goldenTriangleBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_goldenTriangleBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipHorBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipHorBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_flipVerBox, SIGNAL(toggled(bool)), - this, SLOT(slotGoldenGuideTypeChanged())); + connect(m_flipVerBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotGoldenGuideTypeChanged())); - connect(m_guideColorBt, SIGNAL(changed(const QColor&)), - m_imageSelectionWidget, SLOT(slotChangeGuideColor(const QColor&))); + connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor&)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideColor(const TQColor&))); - connect(m_guideSize, SIGNAL(valueChanged(int)), - m_imageSelectionWidget, SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), + m_imageSelectionWidget, TQT_SLOT(slotChangeGuideSize(int))); - connect(m_widthInput, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthChanged(int))); + connect(m_widthInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthChanged(int))); - connect(m_heightInput, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightChanged(int))); + connect(m_heightInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightChanged(int))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionChanged(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionChanged(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionMoved(QRect)), - this, SLOT(slotSelectionChanged(QRect))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionMoved(TQRect)), + this, TQT_SLOT(slotSelectionChanged(TQRect))); - connect(m_imageSelectionWidget, SIGNAL(signalSelectionOrientationChanged(int)), - this, SLOT(slotSelectionOrientationChanged(int))); + connect(m_imageSelectionWidget, TQT_SIGNAL(signalSelectionOrientationChanged(int)), + this, TQT_SLOT(slotSelectionOrientationChanged(int))); - connect(m_centerWidth, SIGNAL(clicked()), - this, SLOT(slotCenterWidth())); + connect(m_centerWidth, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterWidth())); - connect(m_centerHeight, SIGNAL(clicked()), - this, SLOT(slotCenterHeight())); + connect(m_centerHeight, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCenterHeight())); // we need to disconnect the standard connection of the Try button first - disconnect(m_gboxSettings, SIGNAL(signalTryClicked()), - this, SLOT(slotEffect())); + disconnect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), + this, TQT_SLOT(slotEffect())); - connect(m_gboxSettings, SIGNAL(signalTryClicked()), - this, SLOT(slotMaxAspectRatio())); + connect(m_gboxSettings, TQT_SIGNAL(signalTryClicked()), + this, TQT_SLOT(slotMaxAspectRatio())); // ------------------------------------------------------------- @@ -397,7 +397,7 @@ RatioCropTool::~RatioCropTool() void RatioCropTool::readSettings() { - QColor defaultGuideColor(250, 250, 255); + TQColor defaultGuideColor(250, 250, 255); KConfig *config = kapp->config(); config->setGroup("aspectratiocrop Tool"); @@ -407,8 +407,8 @@ void RatioCropTool::readSettings() m_goldenSpiralSectionBox->setChecked(config->readBoolEntry("Golden Spiral Section", false)); m_goldenSpiralBox->setChecked(config->readBoolEntry("Golden Spiral", false)); m_goldenTriangleBox->setChecked(config->readBoolEntry("Golden Triangle", false)); - m_flipHorBox->setChecked(config->readBoolEntry("Golden Flip Horizontal", false)); - m_flipVerBox->setChecked(config->readBoolEntry("Golden Flip Vertical", false)); + m_flipHorBox->setChecked(config->readBoolEntry("Golden FlipQt::Horizontal", false)); + m_flipVerBox->setChecked(config->readBoolEntry("Golden FlipQt::Vertical", false)); m_guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); m_guideSize->setValue(config->readNumEntry("Guide Width", m_guideSize->defaultValue())); m_imageSelectionWidget->slotGuideLines(m_guideLinesCB->currentItem()); @@ -443,20 +443,20 @@ void RatioCropTool::readSettings() if (m_originalIsLandscape) { - m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Hor.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Landscape)); m_orientCB->setDefaultItem(ImageSelectionWidget::Landscape); } else { - m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Orientation", + m_orientCB->setCurrentItem(config->readNumEntry("Ver.Oriented Aspect Ratio Qt::Orientation", ImageSelectionWidget::Portrait)); m_orientCB->setDefaultItem(ImageSelectionWidget::Portrait); } applyRatioChanges(m_ratioCB->currentItem()); - m_autoOrientation->setChecked( config->readBoolEntry("Auto Orientation", false) ); + m_autoOrientation->setChecked( config->readBoolEntry("Auto Qt::Orientation", false) ); slotAutoOrientChanged( m_autoOrientation->isChecked() ); } @@ -468,7 +468,7 @@ void RatioCropTool::writeSettings() if (m_originalIsLandscape) { config->writeEntry("Hor.Oriented Aspect Ratio", m_ratioCB->currentItem()); - config->writeEntry("Hor.Oriented Aspect Ratio Orientation", m_orientCB->currentItem()); + config->writeEntry("Hor.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem()); config->writeEntry("Hor.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value()); config->writeEntry("Hor.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value()); @@ -480,7 +480,7 @@ void RatioCropTool::writeSettings() else { config->writeEntry("Ver.Oriented Aspect Ratio", m_ratioCB->currentItem()); - config->writeEntry("Ver.Oriented Aspect Ratio Orientation", m_orientCB->currentItem()); + config->writeEntry("Ver.Oriented Aspect Ratio Qt::Orientation", m_orientCB->currentItem()); config->writeEntry("Ver.Oriented Custom Aspect Ratio Num", m_customRatioNInput->value()); config->writeEntry("Ver.Oriented Custom Aspect Ratio Den", m_customRatioDInput->value()); @@ -491,14 +491,14 @@ void RatioCropTool::writeSettings() } config->writeEntry("Precise Aspect Ratio Crop", m_preciseCrop->isChecked()); - config->writeEntry("Auto Orientation", m_autoOrientation->isChecked()); + config->writeEntry("Auto Qt::Orientation", m_autoOrientation->isChecked()); config->writeEntry("Guide Lines Type", m_guideLinesCB->currentItem()); config->writeEntry("Golden Section", m_goldenSectionBox->isChecked()); config->writeEntry("Golden Spiral Section", m_goldenSpiralSectionBox->isChecked()); config->writeEntry("Golden Spiral", m_goldenSpiralBox->isChecked()); config->writeEntry("Golden Triangle", m_goldenTriangleBox->isChecked()); - config->writeEntry("Golden Flip Horizontal", m_flipHorBox->isChecked()); - config->writeEntry("Golden Flip Vertical", m_flipVerBox->isChecked()); + config->writeEntry("Golden FlipQt::Horizontal", m_flipHorBox->isChecked()); + config->writeEntry("Golden FlipQt::Vertical", m_flipVerBox->isChecked()); config->writeEntry("Guide Color", m_guideColorBt->color()); config->writeEntry("Guide Width", m_guideSize->value()); config->sync(); @@ -524,7 +524,7 @@ void RatioCropTool::slotCenterHeight() m_imageSelectionWidget->setCenterSelection(ImageSelectionWidget::CenterHeight); } -void RatioCropTool::slotSelectionChanged(QRect rect) +void RatioCropTool::slotSelectionChanged(TQRect rect) { m_xInput->blockSignals(true); m_yInput->blockSignals(true); @@ -592,7 +592,7 @@ void RatioCropTool::slotSelectionOrientationChanged(int newOrientation) setRatioCBText(newOrientation); - // Change Orientation ComboBox + // Change Qt::Orientation ComboBox m_orientCB->setCurrentItem(newOrientation); @@ -825,7 +825,7 @@ void RatioCropTool::finalRendering() { kapp->setOverrideCursor( KCursor::waitCursor() ); - QRect currentRegion = m_imageSelectionWidget->getRegionSelection(); + TQRect currentRegion = m_imageSelectionWidget->getRegionSelection(); ImageIface* iface = m_imageSelectionWidget->imageIface(); uchar *data = iface->getOriginalImage(); int w = iface->originalWidth(); @@ -833,7 +833,7 @@ void RatioCropTool::finalRendering() bool a = iface->originalHasAlpha(); bool sb = iface->originalSixteenBit(); - QRect normalizedRegion = currentRegion.normalize(); + TQRect normalizedRegion = currentRegion.normalize(); if (normalizedRegion.right() > w) normalizedRegion.setRight(w); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h index d2adf3b..d7625b1 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.h @@ -30,9 +30,9 @@ #include "editortool.h" -class QCheckBox; -class QLabel; -class QToolButton; +class TQCheckBox; +class TQLabel; +class TQToolButton; class KColorButton; @@ -50,10 +50,11 @@ class ImageSelectionWidget; class RatioCropTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - RatioCropTool(QObject *parent); + RatioCropTool(TQObject *tqparent); ~RatioCropTool(); private: @@ -83,7 +84,7 @@ private slots: void slotOrientChanged(int o); void slotAutoOrientChanged(bool a); void slotRatioChanged(int a); - void slotSelectionChanged(QRect rect ); + void slotSelectionChanged(TQRect rect ); void slotSelectionOrientationChanged(int); void slotGuideTypeChanged(int t); void slotGoldenGuideTypeChanged(); @@ -92,23 +93,23 @@ private: bool m_originalIsLandscape; - QLabel *m_customLabel1; - QLabel *m_customLabel2; - QLabel *m_orientLabel; - QLabel *m_colorGuideLabel; + TQLabel *m_customLabel1; + TQLabel *m_customLabel2; + TQLabel *m_orientLabel; + TQLabel *m_colorGuideLabel; - QToolButton *m_centerWidth; - QToolButton *m_centerHeight; + TQToolButton *m_centerWidth; + TQToolButton *m_centerHeight; - QCheckBox *m_goldenSectionBox; - QCheckBox *m_goldenSpiralSectionBox; - QCheckBox *m_goldenSpiralBox; - QCheckBox *m_goldenTriangleBox; - QCheckBox *m_flipHorBox; - QCheckBox *m_flipVerBox; - QCheckBox *m_autoOrientation; - QCheckBox *m_preciseCrop; + TQCheckBox *m_goldenSectionBox; + TQCheckBox *m_goldenSpiralSectionBox; + TQCheckBox *m_goldenSpiralBox; + TQCheckBox *m_goldenTriangleBox; + TQCheckBox *m_flipHorBox; + TQCheckBox *m_flipVerBox; + TQCheckBox *m_autoOrientation; + TQCheckBox *m_preciseCrop; KDcrawIface::RComboBox *m_guideLinesCB; KDcrawIface::RComboBox *m_orientCB; diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index 937ba1c..b9438b9 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -22,22 +22,22 @@ * * ============================================================ */ -// Qt includes. - -#include <qcolor.h> -#include <qhbox.h> -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qhbuttongroup.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> // KDE includes. @@ -76,8 +76,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RedEyeTool::RedEyeTool(QObject* parent) - : EditorTool(parent) +RedEyeTool::RedEyeTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("redeye"); setToolName(i18n("Red Eye")); @@ -98,47 +98,47 @@ RedEyeTool::RedEyeTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(gboxSettings->plainPage(), 11, 4); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings->plainPage(), 11, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image channel values.<p>" "<b>Green</b>: display the green image channel values.<p>" "<b>Blue</b>: display the blue image channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximum counts are small, you can use the linear scale.<p>" "The logarithmic scale can be used when the maximal counts are big " "to show all values (small and large) on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -146,47 +146,47 @@ RedEyeTool::RedEyeTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "of the selected image channel. It is " "updated upon setting changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); // ------------------------------------------------------------- - m_thresholdLabel = new QLabel(i18n("Sensitivity:"), gboxSettings->plainPage()); + m_thresholdLabel = new TQLabel(i18n("Sensitivity:"), gboxSettings->plainPage()); m_redThreshold = new RIntNumInput(gboxSettings->plainPage()); m_redThreshold->setRange(10, 90, 1); m_redThreshold->setDefaultValue(20); - QWhatsThis::add(m_redThreshold, i18n("<p>Sets the red color pixels selection threshold. " + TQWhatsThis::add(m_redThreshold, i18n("<p>Sets the red color pixels selection threshold. " "Low values will select more red color pixels (agressive correction), high " "values less (mild correction). Use low value if eye have been selected " "exactly. Use high value if other parts of the face are also selected.")); - m_smoothLabel = new QLabel(i18n("Smooth:"), gboxSettings->plainPage()); + m_smoothLabel = new TQLabel(i18n("Smooth:"), gboxSettings->plainPage()); m_smoothLevel = new RIntNumInput(gboxSettings->plainPage()); m_smoothLevel->setRange(0, 5, 1); m_smoothLevel->setDefaultValue(1); - QWhatsThis::add(m_smoothLevel, i18n("<p>Sets the smoothness value when blurring the border " + TQWhatsThis::add(m_smoothLevel, i18n("<p>Sets the smoothness value when blurring the border " "of the changed pixels. " "This leads to a more naturally looking pupil.")); - QLabel *label3 = new QLabel(i18n("Coloring Tint:"), gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Coloring Tint:"), gboxSettings->plainPage()); m_HSSelector = new KHSSelector(gboxSettings->plainPage()); m_VSelector = new KValueSelector(gboxSettings->plainPage()); m_HSSelector->setMinimumSize(200, 142); m_VSelector->setMinimumSize(26, 142); - QWhatsThis::add(m_HSSelector, i18n("<p>Sets a custom color to re-colorize the eyes.")); + TQWhatsThis::add(m_HSSelector, i18n("<p>Sets a custom color to re-colorize the eyes.")); - QLabel *label4 = new QLabel(i18n("Tint Level:"), gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Tint Level:"), gboxSettings->plainPage()); m_tintLevel = new RIntNumInput(gboxSettings->plainPage()); m_tintLevel->setRange(1, 200, 1); m_tintLevel->setDefaultValue(128); - QWhatsThis::add(m_tintLevel, i18n("<p>Set the tint level to adjust the luminosity of " + TQWhatsThis::add(m_tintLevel, i18n("<p>Set the tint level to adjust the luminosity of " "the new color of the pupil.")); gridSettings->addMultiCellLayout(l1, 0, 0, 0, 4); @@ -208,32 +208,32 @@ RedEyeTool::RedEyeTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); - connect(m_redThreshold, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_redThreshold, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_smoothLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_smoothLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_HSSelector, SIGNAL(valueChanged(int, int)), - this, SLOT(slotHSChanged(int, int))); + connect(m_HSSelector, TQT_SIGNAL(valueChanged(int, int)), + this, TQT_SLOT(slotHSChanged(int, int))); - connect(m_VSelector, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_tintLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_tintLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } RedEyeTool::~RedEyeTool() @@ -248,7 +248,7 @@ void RedEyeTool::slotHSChanged(int h, int s) m_VSelector->setHue(h); m_VSelector->setSaturation(s); m_VSelector->updateContents(); - m_VSelector->repaint(false); + m_VSelector->tqrepaint(false); m_VSelector->blockSignals(false); slotTimer(); } @@ -259,32 +259,32 @@ void RedEyeTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void RedEyeTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void RedEyeTool::slotColorSelectedFromTarget(const DColor& color) @@ -407,10 +407,10 @@ void RedEyeTool::finalRendering() void RedEyeTool::redEyeFilter(DImg& selection) { - DImg mask(selection.width(), selection.height(), selection.sixteenBit(), true, + DImg tqmask(selection.width(), selection.height(), selection.sixteenBit(), true, selection.bits(), true); - selection = mask.copy(); + selection = tqmask.copy(); float redThreshold = m_redThreshold->value()/10.0; int hue = m_HSSelector->xValue(); int sat = m_HSSelector->yValue(); @@ -450,12 +450,12 @@ void RedEyeTool::redEyeFilter(DImg& selection) green_norm *= coloring.green() / level; blue_norm *= coloring.blue() / level; - // Perform a red color pixels detection in selection image and create a correction mask using an alpha channel. + // Perform a red color pixels detection in selection image and create a correction tqmask using an alpha channel. if (!selection.sixteenBit()) // 8 bits image. { uchar* ptr = selection.bits(); - uchar* mptr = mask.bits(); + uchar* mptr = tqmask.bits(); uchar r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -467,22 +467,22 @@ void RedEyeTool::redEyeFilter(DImg& selection) if (r >= ( redThreshold * g)) { - r1 = QMIN(255, (int)(red_norm * (red_chan.red_gain * r + + r1 = TQMIN(255, (int)(red_norm * (red_chan.red_gain * r + red_chan.green_gain * g + red_chan.blue_gain * b))); - g1 = QMIN(255, (int)(green_norm * (green_chan.red_gain * r + + g1 = TQMIN(255, (int)(green_norm * (green_chan.red_gain * r + green_chan.green_gain * g + green_chan.blue_gain * b))); - b1 = QMIN(255, (int)(blue_norm * (blue_chan.red_gain * r + + b1 = TQMIN(255, (int)(blue_norm * (blue_chan.red_gain * r + blue_chan.green_gain * g + blue_chan.blue_gain * b))); mptr[0] = b1; mptr[1] = g1; mptr[2] = r1; - mptr[3] = QMIN( (int)((r-g) / 150.0 * 255.0), 255); + mptr[3] = TQMIN( (int)((r-g) / 150.0 * 255.0), 255); } ptr += 4; @@ -492,7 +492,7 @@ void RedEyeTool::redEyeFilter(DImg& selection) else // 16 bits image. { unsigned short* ptr = (unsigned short*)selection.bits(); - unsigned short* mptr = (unsigned short*)mask.bits(); + unsigned short* mptr = (unsigned short*)tqmask.bits(); unsigned short r, g, b, r1, g1, b1; for (uint i = 0 ; i < selection.width() * selection.height() ; i++) @@ -504,22 +504,22 @@ void RedEyeTool::redEyeFilter(DImg& selection) if (r >= ( redThreshold * g)) { - r1 = QMIN(65535, (int)(red_norm * (red_chan.red_gain * r + + r1 = TQMIN(65535, (int)(red_norm * (red_chan.red_gain * r + red_chan.green_gain * g + red_chan.blue_gain * b))); - g1 = QMIN(65535, (int)(green_norm * (green_chan.red_gain * r + + g1 = TQMIN(65535, (int)(green_norm * (green_chan.red_gain * r + green_chan.green_gain * g + green_chan.blue_gain * b))); - b1 = QMIN(65535, (int)(blue_norm * (blue_chan.red_gain * r + + b1 = TQMIN(65535, (int)(blue_norm * (blue_chan.red_gain * r + blue_chan.green_gain * g + blue_chan.blue_gain * b))); mptr[0] = b1; mptr[1] = g1; mptr[2] = r1; - mptr[3] = QMIN( (int)((r-g) / 38400.0 * 65535.0), 65535);; + mptr[3] = TQMIN( (int)((r-g) / 38400.0 * 65535.0), 65535);; } ptr += 4; @@ -527,19 +527,19 @@ void RedEyeTool::redEyeFilter(DImg& selection) } } - // Now, we will blur only the transparency pixels from the mask. + // Now, we will blur only the transparency pixels from the tqmask. - DImg mask2 = mask.copy(); + DImg tqmask2 = tqmask.copy(); DImgImageFilters filter; - filter.gaussianBlurImage(mask2.bits(), mask2.width(), mask2.height(), - mask2.sixteenBit(), m_smoothLevel->value()); + filter.gaussianBlurImage(tqmask2.bits(), tqmask2.width(), tqmask2.height(), + tqmask2.sixteenBit(), m_smoothLevel->value()); if (!selection.sixteenBit()) // 8 bits image. { - uchar* mptr = mask.bits(); - uchar* mptr2 = mask2.bits(); + uchar* mptr = tqmask.bits(); + uchar* mptr2 = tqmask2.bits(); - for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) + for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) { if (mptr2[3] < 255) { @@ -555,10 +555,10 @@ void RedEyeTool::redEyeFilter(DImg& selection) } else // 16 bits image. { - unsigned short* mptr = (unsigned short*)mask.bits(); - unsigned short* mptr2 = (unsigned short*)mask2.bits(); + unsigned short* mptr = (unsigned short*)tqmask.bits(); + unsigned short* mptr2 = (unsigned short*)tqmask2.bits(); - for (uint i = 0 ; i < mask2.width() * mask2.height() ; i++) + for (uint i = 0 ; i < tqmask2.width() * tqmask2.height() ; i++) { if (mptr2[3] < 65535) { @@ -573,14 +573,14 @@ void RedEyeTool::redEyeFilter(DImg& selection) } } - // - Perform pixels blending using alpha channel between the mask and the selection. + // - Perform pixels blending using alpha channel between the tqmask and the selection. DColorComposer *composer = DColorComposer::getComposer(DColorComposer::PorterDuffSrcOver); - // NOTE: 'mask' is the Source image, 'selection' is the Destination image. + // NOTE: 'tqmask' is the Source image, 'selection' is the Destination image. - selection.bitBlendImage(composer, &mask, - 0, 0, mask.width(), mask.height(), + selection.bitBlendImage(composer, &tqmask, + 0, 0, tqmask.width(), tqmask.height(), 0, 0); } diff --git a/digikam/imageplugins/coreplugin/redeyetool.h b/digikam/imageplugins/coreplugin/redeyetool.h index aa9d048..b1d85ae 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.h +++ b/digikam/imageplugins/coreplugin/redeyetool.h @@ -34,9 +34,9 @@ #include "editortool.h" -class QLabel; -class QComboBox; -class QHButtonGroup; +class TQLabel; +class TQComboBox; +class TQHButtonGroup; class KHSSelector; class KValueSelector; @@ -62,8 +62,8 @@ class RedEyePassivePopup : public KPassivePopup { public: - RedEyePassivePopup(QWidget* parent) - : KPassivePopup(parent), m_parent(parent) + RedEyePassivePopup(TQWidget* tqparent) + : KPassivePopup(tqparent), m_parent(tqparent) { } @@ -76,7 +76,7 @@ protected: private: - QWidget* m_parent; + TQWidget* m_parent; }; // ---------------------------------------------------------------- @@ -84,10 +84,11 @@ private: class RedEyeTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - RedEyeTool(QObject *parent); + RedEyeTool(TQObject *tqparent); ~RedEyeTool(); private slots: @@ -130,12 +131,12 @@ private: uchar *m_destinationPreviewData; - QLabel *m_thresholdLabel; - QLabel *m_smoothLabel; + TQLabel *m_thresholdLabel; + TQLabel *m_smoothLabel; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDcrawIface::RIntNumInput *m_tintLevel; KDcrawIface::RIntNumInput *m_redThreshold; diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index 629d65e..545409e 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -21,23 +21,23 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -73,8 +73,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -RGBTool::RGBTool(QObject* parent) - : EditorTool(parent) +RGBTool::RGBTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("colorbalance"); setToolName(i18n("Color Balance")); @@ -95,47 +95,47 @@ RGBTool::RGBTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 7, 4); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 7, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_channelCB = new QComboBox(false, m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + m_channelCB = new TQComboBox(false, m_gboxSettings->plainPage()); m_channelCB->insertItem(i18n("Luminosity")); m_channelCB->insertItem(i18n("Red")); m_channelCB->insertItem(i18n("Green")); m_channelCB->insertItem(i18n("Blue")); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin(0); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(linHistoButton, i18n("<p>Linear")); + TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap(QPixmap(directory + "histogram-lin.png")); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap(TQPixmap(directory + "histogram-lin.png")); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton(m_scaleBG); - QToolTip::add(logHistoButton, i18n("<p>Logarithmic")); + TQPushButton *logHistoButton = new TQPushButton(m_scaleBG); + TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap(QPixmap(directory + "histogram-log.png")); + logHistoButton->setPixmap(TQPixmap(directory + "histogram-log.png")); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -145,28 +145,28 @@ RGBTool::RGBTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); gridSettings->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - QLabel *labelLeft = new QLabel(i18n("Cyan"), m_gboxSettings->plainPage()); - labelLeft->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_rSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_rSlider"); - m_rSlider->setTickmarks(QSlider::Below); + TQLabel *labelLeft = new TQLabel(i18n("Cyan"), m_gboxSettings->plainPage()); + labelLeft->tqsetAlignment ( 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); - QWhatsThis::add( m_rSlider, i18n("<p>Set here the cyan/red color adjustment of the image.")); - QLabel *labelRight = new QLabel(i18n("Red"), m_gboxSettings->plainPage()); - labelRight->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter ); + 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 ); m_rInput = new RIntNumInput(m_gboxSettings->plainPage()); m_rInput->setDefaultValue(0); m_rInput->input()->setRange(-100, 100, 1, false); @@ -178,14 +178,14 @@ RGBTool::RGBTool(QObject* parent) // ------------------------------------------------------------- - labelLeft = new QLabel(i18n("Magenta"), m_gboxSettings->plainPage()); - labelLeft->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - m_gSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_gSlider"); - m_gSlider->setTickmarks(QSlider::Below); + labelLeft = new TQLabel(i18n("Magenta"), m_gboxSettings->plainPage()); + labelLeft->tqsetAlignment(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); - QWhatsThis::add( m_gSlider, i18n("<p>Set here the magenta/green color adjustment of the image.")); - labelRight = new QLabel(i18n("Green"), m_gboxSettings->plainPage()); - labelRight->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + 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); m_gInput = new RIntNumInput(m_gboxSettings->plainPage()); m_gInput->setDefaultValue(0); m_gInput->input()->setRange(-100, 100, 1, false); @@ -197,14 +197,14 @@ RGBTool::RGBTool(QObject* parent) // ------------------------------------------------------------- - labelLeft = new QLabel(i18n("Yellow"), m_gboxSettings->plainPage()); - labelLeft->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_bSlider = new QSlider(-100, 100, 1, 0, Qt::Horizontal, m_gboxSettings->plainPage(), "m_bSlider"); - m_bSlider->setTickmarks(QSlider::Below); + labelLeft = new TQLabel(i18n("Yellow"), m_gboxSettings->plainPage()); + labelLeft->tqsetAlignment ( 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); - QWhatsThis::add( m_bSlider, i18n("<p>Set here the yellow/blue color adjustment of the image.")); - labelRight = new QLabel(i18n("Blue"), m_gboxSettings->plainPage()); - labelRight->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + 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); m_bInput = new RIntNumInput(m_gboxSettings->plainPage()); m_bInput->setDefaultValue(0); m_bInput->input()->setRange(-100, 100, 1, false); @@ -224,38 +224,38 @@ RGBTool::RGBTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_rSlider, SIGNAL(valueChanged(int)), - m_rInput, SLOT(setValue(int))); - connect(m_rInput, SIGNAL(valueChanged (int)), - m_rSlider, SLOT(setValue(int))); - connect(m_rInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_rSlider, TQT_SIGNAL(valueChanged(int)), + m_rInput, TQT_SLOT(setValue(int))); + connect(m_rInput, TQT_SIGNAL(valueChanged (int)), + m_rSlider, TQT_SLOT(setValue(int))); + connect(m_rInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_gSlider, SIGNAL(valueChanged(int)), - m_gInput, SLOT(setValue(int))); - connect(m_gInput, SIGNAL(valueChanged (int)), - m_gSlider, SLOT(setValue(int))); - connect(m_gInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_gSlider, TQT_SIGNAL(valueChanged(int)), + m_gInput, TQT_SLOT(setValue(int))); + connect(m_gInput, TQT_SIGNAL(valueChanged (int)), + m_gSlider, TQT_SLOT(setValue(int))); + connect(m_gInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_bSlider, SIGNAL(valueChanged(int)), - m_bInput, SLOT(setValue(int))); - connect(m_bInput, SIGNAL(valueChanged (int)), - m_bSlider, SLOT(setValue(int))); - connect(m_bInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_bSlider, TQT_SIGNAL(valueChanged(int)), + m_bInput, TQT_SLOT(setValue(int))); + connect(m_bInput, TQT_SIGNAL(valueChanged (int)), + m_bSlider, TQT_SLOT(setValue(int))); + connect(m_bInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- @@ -274,32 +274,32 @@ void RGBTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors(QColor("black"), QColor("white")); + m_hGradient->setColors(TQColor("black"), TQColor("white")); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("red")); + m_hGradient->setColors(TQColor("black"), TQColor("red")); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("green")); + m_hGradient->setColors(TQColor("black"), TQColor("green")); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors(QColor("black"), QColor("blue")); + m_hGradient->setColors(TQColor("black"), TQColor("blue")); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void RGBTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void RGBTool::slotColorSelectedFromTarget(const DColor &color) diff --git a/digikam/imageplugins/coreplugin/rgbtool.h b/digikam/imageplugins/coreplugin/rgbtool.h index 9b635e3..7031ad4 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.h +++ b/digikam/imageplugins/coreplugin/rgbtool.h @@ -28,10 +28,10 @@ #include "editortool.h" -class QComboBox; -class QHButtonGroup; +class TQComboBox; +class TQHButtonGroup; -class QSlider; +class TQSlider; namespace KDcrawIface { @@ -52,10 +52,11 @@ namespace DigikamImagesPluginCore class RGBTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - RGBTool(QObject *parent); + RGBTool(TQObject *tqparent); ~RGBTool(); private: @@ -91,17 +92,17 @@ private: uchar *m_destinationPreviewData; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; KDcrawIface::RIntNumInput *m_rInput; KDcrawIface::RIntNumInput *m_gInput; KDcrawIface::RIntNumInput *m_bInput; - QSlider *m_rSlider; - QSlider *m_gSlider; - QSlider *m_bSlider; + TQSlider *m_rSlider; + TQSlider *m_gSlider; + TQSlider *m_bSlider; Digikam::ImageWidget *m_previewWidget; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c index de6f2cc..265f089 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/err.c @@ -150,13 +150,13 @@ f__fatal(int n, char *s) else fprintf(stderr,"%s: %s\n",s,F_err[n-100]); if (f__curunit) { - fprintf(stderr,"apparent state: unit %d ", + fprintf(stderr,"aptqparent state: unit %d ", (int)(f__curunit-f__units)); fprintf(stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n", f__curunit->ufnm); } else - fprintf(stderr,"apparent state: internal I/O\n"); + fprintf(stderr,"aptqparent state: internal I/O\n"); if (f__fmtbuf) fprintf(stderr,"last format: %s\n",f__fmtbuf); fprintf(stderr,"lately %s %s %s %s",f__reading?"reading":"writing", diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h index 19065a2..d24eb0c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmt.h @@ -51,7 +51,7 @@ typedef union #endif char ic; integer il; -#ifdef Allow_TYQUAD +#ifdef Allow_TYTQUAD longint ili; #endif } Uint; @@ -85,12 +85,12 @@ extern int f__scale; #define PUT(x) (*f__putn)(x) extern int f__cursor; -#undef TYQUAD -#ifndef Allow_TYQUAD +#undef TYTQUAD +#ifndef Allow_TYTQUAD #undef longint #define longint long #else -#define TYQUAD 14 +#define TYTQUAD 14 #endif #ifdef KR_headers diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c index 91483fc..9221dae 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c @@ -2,7 +2,7 @@ #define MAXINTLENGTH 23 #include "f2c.h" -#ifndef Allow_TYQUAD +#ifndef Allow_TYTQUAD #undef longint #define longint long #undef ulongint diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c index 58299ff..d36b67e 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/ilaenv.c @@ -232,9 +232,9 @@ L110: } else { nb = 64; } - } else if (s_cmp(c3, "QRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, + } else if (s_cmp(c3, "TQRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "RQF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "LQF", (ftnlen) - 3, (ftnlen)3) == 0 || s_cmp(c3, "QLF", (ftnlen)3, (ftnlen)3) + 3, (ftnlen)3) == 0 || s_cmp(c3, "TQLF", (ftnlen)3, (ftnlen)3) == 0) { if (sname) { nb = 32; @@ -390,9 +390,9 @@ L200: nbmin = 2; if (s_cmp(c2, "GE", (ftnlen)2, (ftnlen)2) == 0) { - if (s_cmp(c3, "QRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "RQF", ( + if (s_cmp(c3, "TQRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "RQF", ( ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "LQF", (ftnlen)3, ( - ftnlen)3) == 0 || s_cmp(c3, "QLF", (ftnlen)3, (ftnlen)3) == 0) + ftnlen)3) == 0 || s_cmp(c3, "TQLF", (ftnlen)3, (ftnlen)3) == 0) { if (sname) { nbmin = 2; @@ -482,9 +482,9 @@ L300: nx = 0; if (s_cmp(c2, "GE", (ftnlen)2, (ftnlen)2) == 0) { - if (s_cmp(c3, "QRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "RQF", ( + if (s_cmp(c3, "TQRF", (ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "RQF", ( ftnlen)3, (ftnlen)3) == 0 || s_cmp(c3, "LQF", (ftnlen)3, ( - ftnlen)3) == 0 || s_cmp(c3, "QLF", (ftnlen)3, (ftnlen)3) == 0) + ftnlen)3) == 0 || s_cmp(c3, "TQLF", (ftnlen)3, (ftnlen)3) == 0) { if (sname) { nx = 128; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c index 493aaea..5c775fd 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c @@ -209,7 +209,7 @@ integer f_open(olist *a) #ifdef NON_ANSI_STDIO (void) strcpy(buf,"tmp.FXXXXXX"); (void) mktemp(buf); - goto replace; + goto tqreplace; #else if (!(b->ufd = tmpfile())) opnerr(a->oerr,errno,"open") @@ -236,7 +236,7 @@ integer f_open(olist *a) case 'r': /* Fortran 90 replace option */ case 'R': #ifdef NON_ANSI_STDIO - replace: + tqreplace: #endif if (tf = fopen(buf,f__w_mode[0])) fclose(tf); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c index 477c40f..56ba693 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c @@ -130,7 +130,7 @@ wrt_I(Uint *n, int w, ftnlen len, register int base) char *ans; if(len==sizeof(integer)) x=n->il; else if(len == sizeof(char)) x = n->ic; -#ifdef Allow_TYQUAD +#ifdef Allow_TYTQUAD else if (len == sizeof(longint)) x = n->ili; #endif else x=n->is; @@ -158,7 +158,7 @@ wrt_IM(Uint *n, int w, int m, ftnlen len, int base) char *ans; if(sizeof(integer)==len) x=n->il; else if(len == sizeof(char)) x = n->ic; -#ifdef Allow_TYQUAD +#ifdef Allow_TYTQUAD else if (len == sizeof(longint)) x = n->ili; #endif else x=n->is; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index 25ef715..17adbe0 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -27,13 +27,13 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcombobox.h> -#include <qwidgetstack.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> +#include <tqwidgetstack.h> // KDE includes. @@ -62,26 +62,26 @@ namespace DigikamImagesPluginCore { -ImageEffect_Sharpen::ImageEffect_Sharpen(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Sharpening Photograph"), "sharpen", +ImageEffect_Sharpen::ImageEffect_Sharpen(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Sharpening Photograph"), "sharpen", true, true, true) { setHelp("blursharpentool.anchor", "digikam"); // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 2, 1, 0, spacingHint()); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Method:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Method:"), gboxSettings); - m_sharpMethod = new QComboBox( false, gboxSettings ); + m_sharpMethod = new TQComboBox( false, gboxSettings ); m_sharpMethod->insertItem( i18n("Simple sharp") ); - m_sharpMethod->insertItem( i18n("Unsharp mask") ); + m_sharpMethod->insertItem( i18n("Unsharp tqmask") ); m_sharpMethod->insertItem( i18n("Refocus") ); - QWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image.")); + TQWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image.")); - m_stack = new QWidgetStack(gboxSettings); + m_stack = new TQWidgetStack(gboxSettings); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_sharpMethod, 0, 0, 1, 1); @@ -90,14 +90,14 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(QWidget* parent) // ------------------------------------------------------------- - QWidget *simpleSharpSettings = new QWidget(m_stack); - QGridLayout* grid1 = new QGridLayout( simpleSharpSettings, 2, 1, 0, spacingHint()); + TQWidget *simpleSharpSettings = new TQWidget(m_stack); + TQGridLayout* grid1 = new TQGridLayout( simpleSharpSettings, 2, 1, 0, spacingHint()); - QLabel *label = new QLabel(i18n("Sharpness:"), simpleSharpSettings); + TQLabel *label = new TQLabel(i18n("Sharpness:"), simpleSharpSettings); m_radiusInput = new KIntNumInput(simpleSharpSettings); m_radiusInput->setRange(0, 100, 1, true); m_radiusInput->setValue(0); - QWhatsThis::add( m_radiusInput, i18n("<p>A sharpness of 0 has no effect, " + TQWhatsThis::add( m_radiusInput, i18n("<p>A sharpness of 0 has no effect, " "1 and above determine the sharpen matrix radius " "that determines how much to sharpen the image.")); @@ -108,27 +108,27 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(QWidget* parent) // ------------------------------------------------------------- - QWidget *unsharpMaskSettings = new QWidget(m_stack); - QGridLayout* grid2 = new QGridLayout( unsharpMaskSettings, 6, 1, 0, spacingHint()); + TQWidget *unsharpMaskSettings = new TQWidget(m_stack); + TQGridLayout* grid2 = new TQGridLayout( unsharpMaskSettings, 6, 1, 0, spacingHint()); - QLabel *label2 = new QLabel(i18n("Radius:"), unsharpMaskSettings); + TQLabel *label2 = new TQLabel(i18n("Radius:"), unsharpMaskSettings); m_radiusInput2 = new KIntNumInput(unsharpMaskSettings); m_radiusInput2->setRange(1, 120, 1, true); - QWhatsThis::add( m_radiusInput2, i18n("<p>Radius value is the gaussian blur matrix radius value " + TQWhatsThis::add( m_radiusInput2, i18n("<p>Radius value is the gaussian blur matrix radius value " "used to determines how much to blur the image.") ); - QLabel *label3 = new QLabel(i18n("Amount:"), unsharpMaskSettings); + TQLabel *label3 = new TQLabel(i18n("Amount:"), unsharpMaskSettings); m_amountInput = new KDoubleNumInput(unsharpMaskSettings); m_amountInput->setPrecision(1); m_amountInput->setRange(0.0, 5.0, 0.1, true); - QWhatsThis::add( m_amountInput, i18n("<p>The value of the difference between the " + TQWhatsThis::add( m_amountInput, i18n("<p>The value of the difference between the " "original and the blur image that is added back into the original.") ); - QLabel *label4 = new QLabel(i18n("Threshold:"), unsharpMaskSettings); + TQLabel *label4 = new TQLabel(i18n("Threshold:"), unsharpMaskSettings); m_thresholdInput = new KDoubleNumInput(unsharpMaskSettings); m_thresholdInput->setPrecision(2); m_thresholdInput->setRange(0.0, 1.0, 0.01, true); - QWhatsThis::add( m_thresholdInput, i18n("<p>The threshold, as a fraction of the maximum " + TQWhatsThis::add( m_thresholdInput, i18n("<p>The threshold, as a fraction of the maximum " "luminosity value, needed to apply the difference amount.") ); grid2->addMultiCellWidget(label2, 0, 0, 0, 1); @@ -142,49 +142,49 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(QWidget* parent) // ------------------------------------------------------------- - QWidget *refocusSettings = new QWidget(m_stack); - QGridLayout* grid3 = new QGridLayout(refocusSettings, 10, 1, 0, spacingHint()); + TQWidget *refocusSettings = new TQWidget(m_stack); + TQGridLayout* grid3 = new TQGridLayout(refocusSettings, 10, 1, 0, spacingHint()); - QLabel *label5 = new QLabel(i18n("Circular sharpness:"), refocusSettings); + TQLabel *label5 = new TQLabel(i18n("Circular sharpness:"), refocusSettings); m_radius = new KDoubleNumInput(refocusSettings); m_radius->setPrecision(2); m_radius->setRange(0.0, 5.0, 0.01, true); - QWhatsThis::add( m_radius, i18n("<p>This is the radius of the circular convolution. It is the most important " + TQWhatsThis::add( m_radius, i18n("<p>This is the radius of the circular convolution. It is the most important " "parameter for using this plugin. For most images the default value of 1.0 " "should give good results. Select a higher value when your image is very blurred.")); - QLabel *label6 = new QLabel(i18n("Correlation:"), refocusSettings); + TQLabel *label6 = new TQLabel(i18n("Correlation:"), refocusSettings); m_correlation = new KDoubleNumInput(refocusSettings); m_correlation->setPrecision(2); m_correlation->setRange(0.0, 1.0, 0.01, true); - QWhatsThis::add( m_correlation, i18n("<p>Increasing the correlation may help to reduce artifacts. The correlation can " + TQWhatsThis::add( m_correlation, i18n("<p>Increasing the correlation may help to reduce artifacts. The correlation can " "range from 0-1. Useful values are 0.5 and values close to 1, e.g. 0.95 and 0.99. " "Using a high value for the correlation will reduce the sharpening effect of the " "plugin.")); - QLabel *label7 = new QLabel(i18n("Noise filter:"), refocusSettings); + TQLabel *label7 = new TQLabel(i18n("Noise filter:"), refocusSettings); m_noise = new KDoubleNumInput(refocusSettings); m_noise->setPrecision(3); m_noise->setRange(0.0, 1.0, 0.001, true); - QWhatsThis::add( m_noise, i18n("<p>Increasing the noise filter parameter may help to reduce artifacts. The noise filter " + TQWhatsThis::add( m_noise, i18n("<p>Increasing the noise filter parameter may help to reduce artifacts. The noise filter " "can range from 0-1 but values higher than 0.1 are rarely helpful. When the noise filter " "value is too low, e.g. 0.0 the image quality will be very poor. A useful value is 0.01. " "Using a high value for the noise filter will reduce the sharpening " "effect of the plugin.")); - QLabel *label8 = new QLabel(i18n("Gaussian sharpness:"), refocusSettings); + TQLabel *label8 = new TQLabel(i18n("Gaussian sharpness:"), refocusSettings); m_gauss = new KDoubleNumInput(refocusSettings); m_gauss->setPrecision(2); m_gauss->setRange(0.0, 1.0, 0.01, true); - QWhatsThis::add( m_gauss, i18n("<p>This is the sharpness for the gaussian convolution. Use this parameter when your " + TQWhatsThis::add( m_gauss, i18n("<p>This is the sharpness for the gaussian convolution. Use this parameter when your " "blurring is of a Gaussian type. In most cases you should set this parameter to 0, because " "it causes nasty artifacts. When you use non-zero values, you will probably have to " "increase the correlation and/or noise filter parameters too.")); - QLabel *label9 = new QLabel(i18n("Matrix size:"), refocusSettings); + TQLabel *label9 = new TQLabel(i18n("Matrix size:"), refocusSettings); m_matrixSize = new KIntNumInput(refocusSettings); m_matrixSize->setRange(0, MAX_MATRIX_SIZE, 1, true); - QWhatsThis::add( m_matrixSize, i18n("<p>This parameter determines the size of the transformation matrix. " + TQWhatsThis::add( m_matrixSize, i18n("<p>This parameter determines the size of the transformation matrix. " "Increasing the matrix width may give better results, especially when you have " "chosen large values for circular or gaussian sharpness.")); @@ -205,8 +205,8 @@ ImageEffect_Sharpen::ImageEffect_Sharpen(QWidget* parent) // ------------------------------------------------------------- - connect(m_sharpMethod, SIGNAL(activated(int)), - this, SLOT(slotSharpMethodActived(int))); + connect(m_sharpMethod, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSharpMethodActived(int))); // ------------------------------------------------------------- @@ -484,8 +484,8 @@ void ImageEffect_Sharpen::prepareEffect() double c = m_correlation->value(); double n = m_noise->value(); - QRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); - QRect tmpRect; + TQRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); + TQRect tmpRect; tmpRect.setLeft(area.left()-2*ms); tmpRect.setRight(area.right()+2*ms); tmpRect.setTop(area.top()-2*ms); @@ -587,7 +587,7 @@ void ImageEffect_Sharpen::putPreviewData(void) case Refocus: { int ms = m_matrixSize->value(); - QRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); + TQRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); Digikam::DImg imDest = m_threadedFilter->getTargetImage() .copy(2*ms, 2*ms, area.width(), area.height()); @@ -618,7 +618,7 @@ void ImageEffect_Sharpen::putFinalData(void) case Refocus: { - QRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); + TQRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); Digikam::ImageIface iface(0, 0); iface.putOriginalImage(i18n("Refocus"), m_threadedFilter->getTargetImage() @@ -634,21 +634,21 @@ void ImageEffect_Sharpen::putFinalData(void) void ImageEffect_Sharpen::slotUser3() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Refocus Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Refocus Configuration File" ) { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Refocus settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -670,16 +670,16 @@ void ImageEffect_Sharpen::slotUser3() void ImageEffect_Sharpen::slotUser2() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Refocus Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Photograph Refocus Configuration File\n"; stream << m_matrixSize->value() << "\n"; stream << m_radius->value() << "\n"; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h index 0bec84d..e6c7358 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.h @@ -28,8 +28,8 @@ #include "ctrlpaneldlg.h" -class QComboBox; -class QWidgetStack; +class TQComboBox; +class TQWidgetStack; class KIntNumInput; class KDoubleNumInput; @@ -45,10 +45,11 @@ namespace DigikamImagesPluginCore class ImageEffect_Sharpen : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Sharpen(QWidget *parent); + ImageEffect_Sharpen(TQWidget *tqparent); ~ImageEffect_Sharpen(); private slots: @@ -78,9 +79,9 @@ private: Refocus }; - QWidgetStack *m_stack; + TQWidgetStack *m_stack; - QComboBox *m_sharpMethod; + TQComboBox *m_sharpMethod; KIntNumInput *m_matrixSize; KIntNumInput *m_radiusInput; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp index 016b012..88ef607 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp @@ -40,10 +40,10 @@ extern "C" #include <cmath> -// Qt includes. +// TQt includes. -#include <qglobal.h> -#include <qstring.h> +#include <tqglobal.h> +#include <tqstring.h> // Local includes. @@ -116,13 +116,13 @@ void RefocusMatrix::finish_c_mat (CMat * mat) inline double *RefocusMatrix::c_mat_eltptr (CMat * mat, const int col, const int row) { - Q_ASSERT ((QABS (row) <= mat->radius) && (QABS (col) <= mat->radius)); + Q_ASSERT ((TQABS (row) <= mat->radius) && (TQABS (col) <= mat->radius)); return (mat->center + mat->row_stride * row + col); } inline double RefocusMatrix::c_mat_elt (const CMat * const mat, const int col, const int row) { - Q_ASSERT ((QABS (row) <= mat->radius) && (QABS (col) <= mat->radius)); + Q_ASSERT ((TQABS (row) <= mat->radius) && (TQABS (col) <= mat->radius)); return (mat->center[mat->row_stride * row + col]); } @@ -134,10 +134,10 @@ void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const { for (xr = -result->radius; xr <= result->radius; xr++) { - const int ya_low = QMAX (-mata->radius, yr - matb->radius); - const int ya_high = QMIN (mata->radius, yr + matb->radius); - const int xa_low = QMAX (-mata->radius, xr - matb->radius); - const int xa_high = QMIN (mata->radius, xr + matb->radius); + const int ya_low = TQMAX (-mata->radius, yr - matb->radius); + const int ya_high = TQMIN (mata->radius, yr + matb->radius); + const int xa_low = TQMAX (-mata->radius, xr - matb->radius); + const int xa_high = TQMIN (mata->radius, xr + matb->radius); register double val = 0.0; for (ya = ya_low; ya <= ya_high; ya++) @@ -162,10 +162,10 @@ void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, c { for (xr = -result->radius; xr <= result->radius; xr++) { - const int ya_low = QMAX (-mata->radius, -matb->radius - yr); - const int ya_high = QMIN (mata->radius, matb->radius - yr); - const int xa_low = QMAX (-mata->radius, -matb->radius - xr); - const int xa_high = QMIN (mata->radius, matb->radius - xr); + const int ya_low = TQMAX (-mata->radius, -matb->radius - yr); + const int ya_high = TQMIN (mata->radius, matb->radius - yr); + const int xa_low = TQMAX (-mata->radius, -matb->radius - xr); + const int xa_high = TQMIN (mata->radius, matb->radius - xr); register double val = 0.0; for (ya = ya_low; ya <= ya_high; ya++) @@ -212,8 +212,8 @@ int RefocusMatrix::as_idx (const int k, const int l, const int m) int RefocusMatrix::as_cidx (const int k, const int l) { - const int a = QMAX (QABS (k), QABS (l)); - const int b = QMIN (QABS (k), QABS (l)); + const int a = TQMAX (TQABS (k), TQABS (l)); + const int b = TQMIN (TQABS (k), TQABS (l)); return ((a * (a + 1)) / 2 + b); } @@ -223,7 +223,7 @@ void RefocusMatrix::print_c_mat (const CMat * const mat) for (y = -mat->radius; y <= mat->radius; y++) { - QString output, num; + TQString output, num; for (x = -mat->radius; x <= mat->radius; x++) { @@ -240,7 +240,7 @@ void RefocusMatrix::print_matrix (Mat * matrix) for (row_idx = 0; row_idx < matrix->rows; row_idx++) { - QString output, num; + TQString output, num; for (col_idx = 0; col_idx < matrix->cols; col_idx++) { @@ -589,8 +589,8 @@ double RefocusMatrix::circle_intensity (const int x, const int y, const double r } else { - register double xlo = QABS (x) - 0.5, xhi = QABS (x) + 0.5, - ylo = QABS (y) - 0.5, yhi = QABS (y) + 0.5; + register double xlo = TQABS (x) - 0.5, xhi = TQABS (x) + 0.5, + ylo = TQABS (y) - 0.5, yhi = TQABS (y) + 0.5; register double symmetry_factor = 1, xc1, xc2; if (xlo < 0) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h index 6b2f65c..60d0def 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h @@ -37,7 +37,7 @@ namespace DigikamImagesPluginCore * * Centered matrix. This is a square matrix where * the indices range from [-radius, radius]. -* The matrix contains (2 * radius + 1) ** 2 elements. +* The matrix tqcontains (2 * radius + 1) ** 2 elements. * **/ typedef struct diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp index 480bc6c..4198ba2 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.cpp @@ -37,9 +37,9 @@ namespace DigikamImagesPluginCore { -Refocus::Refocus(Digikam::DImg *orgImage, QObject *parent, int matrixSize, double radius, +Refocus::Refocus(Digikam::DImg *orgImage, TQObject *tqparent, int matrixSize, double radius, double gauss, double correlation, double noise) - : Digikam::DImgThreadedFilter(orgImage, parent, "Refocus") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Refocus") { m_matrixSize = matrixSize; m_radius = radius; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h index 7cf7b56..32cff8a 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/refocus.h @@ -36,7 +36,7 @@ class Refocus : public Digikam::DImgThreadedFilter public: - Refocus(Digikam::DImg *orgImage, QObject *parent=0, int matrixSize=5, double radius=0.9, + Refocus(Digikam::DImg *orgImage, TQObject *tqparent=0, int matrixSize=5, double radius=0.9, double gauss=0.0, double correlation=0.5, double noise=0.01); ~Refocus(){}; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index a1e41f7..fbe3397 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -27,12 +27,12 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> // KDE includes. @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamImagesPluginCore { -SharpenTool::SharpenTool(QObject* parent) - : EditorToolThreaded(parent) +SharpenTool::SharpenTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("sharpen"); setToolName(i18n("Sharpen")); @@ -88,18 +88,18 @@ SharpenTool::SharpenTool(QObject* parent) EditorToolSettings::SaveAs| EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 3, 1); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 3, 1); - QLabel *label1 = new QLabel(i18n("Method:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Method:"), m_gboxSettings->plainPage()); m_sharpMethod = new RComboBox(m_gboxSettings->plainPage()); m_sharpMethod->insertItem( i18n("Simple sharp") ); - m_sharpMethod->insertItem( i18n("Unsharp mask") ); + m_sharpMethod->insertItem( i18n("Unsharp tqmask") ); m_sharpMethod->insertItem( i18n("Refocus") ); m_sharpMethod->setDefaultItem(SimpleSharp); - QWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image.")); + TQWhatsThis::add( m_sharpMethod, i18n("<p>Select the sharpening method to apply to the image.")); - m_stack = new QWidgetStack(m_gboxSettings->plainPage()); + m_stack = new TQWidgetStack(m_gboxSettings->plainPage()); grid->addMultiCellWidget(label1, 0, 0, 0, 0); grid->addMultiCellWidget(m_sharpMethod, 0, 0, 1, 1); @@ -111,14 +111,14 @@ SharpenTool::SharpenTool(QObject* parent) // ------------------------------------------------------------- - QWidget *simpleSharpSettings = new QWidget(m_stack); - QGridLayout* grid1 = new QGridLayout( simpleSharpSettings, 2, 1); + TQWidget *simpleSharpSettings = new TQWidget(m_stack); + TQGridLayout* grid1 = new TQGridLayout( simpleSharpSettings, 2, 1); - QLabel *label = new QLabel(i18n("Sharpness:"), simpleSharpSettings); + TQLabel *label = new TQLabel(i18n("Sharpness:"), simpleSharpSettings); m_radiusInput = new RIntNumInput(simpleSharpSettings); m_radiusInput->setRange(0, 100, 1); m_radiusInput->setDefaultValue(0); - QWhatsThis::add( m_radiusInput, i18n("<p>A sharpness of 0 has no effect, " + TQWhatsThis::add( m_radiusInput, i18n("<p>A sharpness of 0 has no effect, " "1 and above determine the sharpen matrix radius " "that determines how much to sharpen the image.")); @@ -132,30 +132,30 @@ SharpenTool::SharpenTool(QObject* parent) // ------------------------------------------------------------- - QWidget *unsharpMaskSettings = new QWidget(m_stack); - QGridLayout* grid2 = new QGridLayout( unsharpMaskSettings, 6, 1); + TQWidget *unsharpMaskSettings = new TQWidget(m_stack); + TQGridLayout* grid2 = new TQGridLayout( unsharpMaskSettings, 6, 1); - QLabel *label2 = new QLabel(i18n("Radius:"), unsharpMaskSettings); + TQLabel *label2 = new TQLabel(i18n("Radius:"), unsharpMaskSettings); m_radiusInput2 = new RIntNumInput(unsharpMaskSettings); m_radiusInput2->setRange(1, 120, 1); m_radiusInput2->setDefaultValue(1); - QWhatsThis::add( m_radiusInput2, i18n("<p>Radius value is the gaussian blur matrix radius value " + TQWhatsThis::add( m_radiusInput2, i18n("<p>Radius value is the gaussian blur matrix radius value " "used to determines how much to blur the image.") ); - QLabel *label3 = new QLabel(i18n("Amount:"), unsharpMaskSettings); + TQLabel *label3 = new TQLabel(i18n("Amount:"), unsharpMaskSettings); m_amountInput = new RDoubleNumInput(unsharpMaskSettings); m_amountInput->setPrecision(1); m_amountInput->setRange(0.0, 5.0, 0.1); m_amountInput->setDefaultValue(1.0); - QWhatsThis::add( m_amountInput, i18n("<p>The value of the difference between the " + TQWhatsThis::add( m_amountInput, i18n("<p>The value of the difference between the " "original and the blur image that is added back into the original.") ); - QLabel *label4 = new QLabel(i18n("Threshold:"), unsharpMaskSettings); + TQLabel *label4 = new TQLabel(i18n("Threshold:"), unsharpMaskSettings); m_thresholdInput = new RDoubleNumInput(unsharpMaskSettings); m_thresholdInput->setPrecision(2); m_thresholdInput->setRange(0.0, 1.0, 0.01); m_thresholdInput->setDefaultValue(0.05); - QWhatsThis::add( m_thresholdInput, i18n("<p>The threshold, as a fraction of the maximum " + TQWhatsThis::add( m_thresholdInput, i18n("<p>The threshold, as a fraction of the maximum " "luminosity value, needed to apply the difference amount.") ); grid2->addMultiCellWidget(label2, 0, 0, 0, 1); @@ -172,54 +172,54 @@ SharpenTool::SharpenTool(QObject* parent) // ------------------------------------------------------------- - QWidget *refocusSettings = new QWidget(m_stack); - QGridLayout* grid3 = new QGridLayout(refocusSettings, 10, 1); + TQWidget *refocusSettings = new TQWidget(m_stack); + TQGridLayout* grid3 = new TQGridLayout(refocusSettings, 10, 1); - QLabel *label5 = new QLabel(i18n("Circular sharpness:"), refocusSettings); + TQLabel *label5 = new TQLabel(i18n("Circular sharpness:"), refocusSettings); m_radius = new RDoubleNumInput(refocusSettings); m_radius->setPrecision(2); m_radius->setRange(0.0, 5.0, 0.01); m_radius->setDefaultValue(1.0); - QWhatsThis::add( m_radius, i18n("<p>This is the radius of the circular convolution. It is the most important " + TQWhatsThis::add( m_radius, i18n("<p>This is the radius of the circular convolution. It is the most important " "parameter for using this plugin. For most images the default value of 1.0 " "should give good results. Select a higher value when your image is very blurred.")); - QLabel *label6 = new QLabel(i18n("Correlation:"), refocusSettings); + TQLabel *label6 = new TQLabel(i18n("Correlation:"), refocusSettings); m_correlation = new RDoubleNumInput(refocusSettings); m_correlation->setPrecision(2); m_correlation->setRange(0.0, 1.0, 0.01); m_correlation->setDefaultValue(0.5); - QWhatsThis::add( m_correlation, i18n("<p>Increasing the correlation may help to reduce artifacts. The correlation can " + TQWhatsThis::add( m_correlation, i18n("<p>Increasing the correlation may help to reduce artifacts. The correlation can " "range from 0-1. Useful values are 0.5 and values close to 1, e.g. 0.95 and 0.99. " "Using a high value for the correlation will reduce the sharpening effect of the " "plugin.")); - QLabel *label7 = new QLabel(i18n("Noise filter:"), refocusSettings); + TQLabel *label7 = new TQLabel(i18n("Noise filter:"), refocusSettings); m_noise = new RDoubleNumInput(refocusSettings); m_noise->setPrecision(3); m_noise->setRange(0.0, 1.0, 0.001); m_noise->setDefaultValue(0.03); - QWhatsThis::add( m_noise, i18n("<p>Increasing the noise filter parameter may help to reduce artifacts. The noise filter " + TQWhatsThis::add( m_noise, i18n("<p>Increasing the noise filter parameter may help to reduce artifacts. The noise filter " "can range from 0-1 but values higher than 0.1 are rarely helpful. When the noise filter " "value is too low, e.g. 0.0 the image quality will be very poor. A useful value is 0.01. " "Using a high value for the noise filter will reduce the sharpening " "effect of the plugin.")); - QLabel *label8 = new QLabel(i18n("Gaussian sharpness:"), refocusSettings); + TQLabel *label8 = new TQLabel(i18n("Gaussian sharpness:"), refocusSettings); m_gauss = new RDoubleNumInput(refocusSettings); m_gauss->setPrecision(2); m_gauss->setRange(0.0, 1.0, 0.01); m_gauss->setDefaultValue(0.0); - QWhatsThis::add( m_gauss, i18n("<p>This is the sharpness for the gaussian convolution. Use this parameter when your " + TQWhatsThis::add( m_gauss, i18n("<p>This is the sharpness for the gaussian convolution. Use this parameter when your " "blurring is of a Gaussian type. In most cases you should set this parameter to 0, because " "it causes nasty artifacts. When you use non-zero values, you will probably have to " "increase the correlation and/or noise filter parameters too.")); - QLabel *label9 = new QLabel(i18n("Matrix size:"), refocusSettings); + TQLabel *label9 = new TQLabel(i18n("Matrix size:"), refocusSettings); m_matrixSize = new RIntNumInput(refocusSettings); m_matrixSize->setRange(0, MAX_MATRIX_SIZE, 1); m_matrixSize->setDefaultValue(5); - QWhatsThis::add( m_matrixSize, i18n("<p>This parameter determines the size of the transformation matrix. " + TQWhatsThis::add( m_matrixSize, i18n("<p>This parameter determines the size of the transformation matrix. " "Increasing the matrix width may give better results, especially when you have " "chosen large values for circular or gaussian sharpness.")); @@ -248,8 +248,8 @@ SharpenTool::SharpenTool(QObject* parent) // ------------------------------------------------------------- - connect(m_sharpMethod, SIGNAL(activated(int)), - this, SLOT(slotSharpMethodActived(int))); + connect(m_sharpMethod, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSharpMethodActived(int))); // ------------------------------------------------------------- @@ -533,8 +533,8 @@ void SharpenTool::prepareEffect() double c = m_correlation->value(); double n = m_noise->value(); - QRect area = m_previewWidget->getOriginalImageRegionToRender(); - QRect tmpRect; + TQRect area = m_previewWidget->getOriginalImageRegionToRender(); + TQRect tmpRect; tmpRect.setLeft(area.left()-2*ms); tmpRect.setRight(area.right()+2*ms); tmpRect.setTop(area.top()-2*ms); @@ -632,7 +632,7 @@ void SharpenTool::putPreviewData() case Refocus: { int ms = m_matrixSize->value(); - QRect area = m_previewWidget->getOriginalImageRegionToRender(); + TQRect area = m_previewWidget->getOriginalImageRegionToRender(); DImg imDest = filter()->getTargetImage() .copy(2*ms, 2*ms, area.width(), area.height()); @@ -663,7 +663,7 @@ void SharpenTool::putFinalData() case Refocus: { - QRect area = m_previewWidget->getOriginalImageRegionToRender(); + TQRect area = m_previewWidget->getOriginalImageRegionToRender(); ImageIface iface(0, 0); iface.putOriginalImage(i18n("Refocus"), filter()->getTargetImage() @@ -679,21 +679,21 @@ void SharpenTool::putFinalData() void SharpenTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Refocus Settings File to Load")) ); + TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), + TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Refocus Configuration File" ) { - KMessageBox::error(kapp->activeWindow(), + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("\"%1\" is not a Photograph Refocus settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -707,7 +707,7 @@ void SharpenTool::slotLoadSettings() blockSignals(false); } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file.")); + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot load settings from the Photograph Refocus text file.")); file.close(); } @@ -715,16 +715,16 @@ void SharpenTool::slotLoadSettings() void SharpenTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Refocus Settings File to Save")) ); + TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), + TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Photograph Refocus Configuration File\n"; stream << m_matrixSize->value() << "\n"; stream << m_radius->value() << "\n"; @@ -733,7 +733,7 @@ void SharpenTool::slotSaveAsSettings() stream << m_noise->value() << "\n"; } else - KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file.")); + KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot save settings to the Photograph Refocus text file.")); file.close(); } diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h index b14f1a8..1056f0c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.h @@ -28,7 +28,7 @@ #include "editortool.h" -class QWidgetStack; +class TQWidgetStack; namespace KDcrawIface { @@ -50,10 +50,11 @@ namespace DigikamImagesPluginCore class SharpenTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - SharpenTool(QObject *parent); + SharpenTool(TQObject *tqparent); ~SharpenTool(); private slots: @@ -83,7 +84,7 @@ private: Refocus }; - QWidgetStack *m_stack; + TQWidgetStack *m_stack; KDcrawIface::RComboBox *m_sharpMethod; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp index a565ccf..f6e829f 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.cpp @@ -38,9 +38,9 @@ namespace DigikamImagesPluginCore { -UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, QObject *parent, int radius, +UnsharpMask::UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent, int radius, double amount, double threshold) - : DImgThreadedFilter(orgImage, parent, "UnsharpMask") + : DImgThreadedFilter(orgImage, tqparent, "UnsharpMask") { m_radius = radius; m_amount = amount; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h index 74ff431..5c4b472 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/unsharp.h @@ -36,7 +36,7 @@ class UnsharpMask : public Digikam::DImgThreadedFilter public: - UnsharpMask(Digikam::DImg *orgImage, QObject *parent=0, int radius=1, + UnsharpMask(Digikam::DImg *orgImage, TQObject *tqparent=0, int radius=1, double amount=1.0, double threshold=0.05); ~UnsharpMask(){}; diff --git a/digikam/imageplugins/distortionfx/distortionfx.cpp b/digikam/imageplugins/distortionfx/distortionfx.cpp index d6d79e4..a2e424a 100644 --- a/digikam/imageplugins/distortionfx/distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/distortionfx.cpp @@ -33,9 +33,9 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qdatetime.h> +#include <tqdatetime.h> // Local includes. @@ -46,9 +46,9 @@ namespace DigikamDistortionFXImagesPlugin { -DistortionFX::DistortionFX(Digikam::DImg *orgImage, QObject *parent, int effectType, +DistortionFX::DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent, int effectType, int level, int iteration, bool antialiasing) - : Digikam::DImgThreadedFilter(orgImage, parent, "DistortionFX") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "DistortionFX") { m_effectType = effectType; m_level = level; @@ -214,7 +214,7 @@ void DistortionFX::fisheye(Digikam::DImg *orgImage, Digikam::DImg *destImage, do else if (Height > Width) lfXScale = (double)Height / (double)Width; - lfRadMax = (double)QMAX(Height, Width) / 2.0; + lfRadMax = (double)TQMAX(Height, Width) / 2.0; lfCoeff = lfRadMax / log (fabs (lfCoeffStep) * lfRadMax + 1.0); // main loop @@ -306,7 +306,7 @@ void DistortionFX::twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int // the angle step is twirl divided by 10000 lfAngleStep = Twirl / 10000.0; // now, we get the minimum radius - lfRadMax = (double)QMAX(Width, Height) / 2.0; + lfRadMax = (double)TQMAX(Width, Height) / 2.0; // main loop @@ -360,8 +360,8 @@ void DistortionFX::twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int * Width => Width of image. * Height => Height of image. * Coeff => Cilindrical value. - * Horizontal => Apply horizontally. - * Vertical => Apply vertically. + *Qt::Horizontal => Apply horizontally. + *Qt::Vertical => Apply vertically. * Antialias => Smart bluring result. * * Theory => This is a great effect, similar to Spherize (Photoshop). @@ -371,10 +371,10 @@ void DistortionFX::twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int * environment. */ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, - bool Horizontal, bool Vertical, bool AntiAlias) + boolQt::Horizontal, boolQt::Vertical, bool AntiAlias) { - if ((Coeff == 0.0) || (! (Horizontal || Vertical))) + if ((Coeff == 0.0) || (! Qt::Horizontal ||Qt::Vertical))) return; int Width = orgImage->width(); @@ -392,9 +392,9 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage int nHalfW = Width / 2, nHalfH = Height / 2; double lfCoeffX = 1.0, lfCoeffY = 1.0, lfCoeffStep = Coeff / 1000.0; - if (Horizontal) + if Qt::Horizontal) lfCoeffX = (double)nHalfW / log (fabs (lfCoeffStep) * nHalfW + 1.0); - if (Vertical) + if Qt::Vertical) lfCoeffY = (double)nHalfH / log (fabs (lfCoeffStep) * nHalfH + 1.0); // initial copy @@ -410,7 +410,7 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage nh = fabs ((double)(h - nHalfH)); nw = fabs ((double)(w - nHalfW)); - if (Horizontal) + if Qt::Horizontal) { if (Coeff > 0.0) nw = (exp (nw / lfCoeffX) - 1.0) / lfCoeffStep; @@ -418,7 +418,7 @@ void DistortionFX::cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage nw = lfCoeffX * log (1.0 + (-1.0 * lfCoeffStep) * nw); } - if (Vertical) + if Qt::Vertical) { if (Coeff > 0.0) nh = (exp (nh / lfCoeffY) - 1.0) / lfCoeffStep; @@ -539,7 +539,7 @@ void DistortionFX::polarCoordinates(Digikam::DImg *orgImage, Digikam::DImg *dest else if (Height > Width) lfXScale = (double)Height / (double)Width; - lfRadMax = (double)QMAX(Height, Width) / 2.0; + lfRadMax = (double)TQMAX(Height, Width) / 2.0; // main loop @@ -657,7 +657,7 @@ void DistortionFX::circularWaves(Digikam::DImg *orgImage, Digikam::DImg *destIma * Amplitude => Sinoidal maximum height. * Frequency => Frequency value. * FillSides => Like a boolean variable. - * Direction => Vertical or horizontal flag. + * Direction =>Qt::Vertical or horizontal flag. * * Theory => This is an amazing effect, very funny, and very simple to * understand. You just need understand how sin and cos works. @@ -675,7 +675,7 @@ void DistortionFX::waves(Digikam::DImg *orgImage, Digikam::DImg *destImage, int progress; int h, w; - if (Direction) // Horizontal + if (Direction) //Qt::Horizontal { int tx; @@ -815,8 +815,8 @@ void DistortionFX::tile(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Width = orgImage->width(); int Height = orgImage->height(); - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); int tx, ty, h, w, progress; @@ -854,8 +854,8 @@ double DistortionFX::maximumRadius(int Height, int Width, double Angle) double MaxRad, MinRad; double Radius, DegAngle = fabs (Angle * 57.295); // Rads -> Degrees - MinRad = QMIN (Height, Width) / 2.0; // Gets the minor radius - MaxRad = QMAX (Height, Width) / 2.0; // Gets the major radius + MinRad = TQMIN (Height, Width) / 2.0; // Gets the minor radius + MaxRad = TQMAX (Height, Width) / 2.0; // Gets the major radius // Find the quadrant between -PI/2 and PI/2 if (DegAngle > 90.0) diff --git a/digikam/imageplugins/distortionfx/distortionfx.h b/digikam/imageplugins/distortionfx/distortionfx.h index 484c693..a79209f 100644 --- a/digikam/imageplugins/distortionfx/distortionfx.h +++ b/digikam/imageplugins/distortionfx/distortionfx.h @@ -28,9 +28,9 @@ #ifndef DISTORTION_FX_H #define DISTORTION_FX_H -// Qt includes. +// TQt includes. -#include <qsize.h> +#include <tqsize.h> // Digikam includes. @@ -44,7 +44,7 @@ class DistortionFX : public Digikam::DImgThreadedFilter public: - DistortionFX(Digikam::DImg *orgImage, QObject *parent=0, int effectType=0, + DistortionFX(Digikam::DImg *orgImage, TQObject *tqparent=0, int effectType=0, int level=0, int iteration=0, bool antialiasing=true); ~DistortionFX(){}; @@ -79,7 +79,7 @@ private: void fisheye(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, bool AntiAlias=true); void twirl(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Twirl, bool AntiAlias=true); void cilindrical(Digikam::DImg *orgImage, Digikam::DImg *destImage, double Coeff, - bool Horizontal, bool Vertical, bool AntiAlias=true); + boolQt::Horizontal, boolQt::Vertical, bool AntiAlias=true); void multipleCorners(Digikam::DImg *orgImage, Digikam::DImg *destImage, int Factor, bool AntiAlias=true); void polarCoordinates(Digikam::DImg *orgImage, Digikam::DImg *destImage, bool Type, bool AntiAlias=true); void circularWaves(Digikam::DImg *orgImage, Digikam::DImg *destImage, int X, int Y, double Amplitude, diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp index 1f70cf0..5b02ed9 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp +++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp @@ -25,14 +25,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qframe.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qwhatsthis.h> +#include <tqframe.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -69,8 +69,8 @@ using namespace Digikam; namespace DigikamDistortionFXImagesPlugin { -DistortionFXTool::DistortionFXTool(QObject* parent) - : EditorToolThreaded(parent) +DistortionFXTool::DistortionFXTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("distortionfx"); setToolName(i18n("Distortion Effects")); @@ -90,9 +90,9 @@ DistortionFXTool::DistortionFXTool(QObject* parent) EditorToolSettings::Cancel, EditorToolSettings::ColorGuide); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 7, 2); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 7, 2); - m_effectTypeLabel = new QLabel(i18n("Type:"), m_gboxSettings->plainPage()); + m_effectTypeLabel = new TQLabel(i18n("Type:"), m_gboxSettings->plainPage()); m_effectType = new RComboBox(m_gboxSettings->plainPage()); m_effectType->insertItem(i18n("Fish Eyes")); @@ -112,8 +112,8 @@ DistortionFXTool::DistortionFXTool(QObject* parent) m_effectType->insertItem(i18n("Unpolar Coordinates")); m_effectType->insertItem(i18n("Tile")); m_effectType->setDefaultItem(DistortionFX::FishEye); - QWhatsThis::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 shape to " + 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 " "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>" @@ -122,8 +122,8 @@ DistortionFXTool::DistortionFXTool(QObject* parent) "and horizontal.<p>" "<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>" "<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>" - "<b>Waves Horizontal</b>: distorts the photograph with horizontal waves.<p>" - "<b>Waves Vertical</b>: distorts the photograph with vertical waves.<p>" + "<b>WavesQt::Horizontal</b>: distorts the photograph with horizontal waves.<p>" + "<b>WavesQt::Vertical</b>: distorts the photograph with vertical waves.<p>" "<b>Block Waves 1</b>: divides the image into cells and makes it look as " "if it is being viewed through glass blocks.<p>" "<b>Block Waves 2</b>: like Block Waves 1 but with another version " @@ -137,18 +137,18 @@ DistortionFXTool::DistortionFXTool(QObject* parent) "them randomly inside the image.<p>" )); - m_levelLabel = new QLabel(i18n("Level:"), m_gboxSettings->plainPage()); + m_levelLabel = new TQLabel(i18n("Level:"), m_gboxSettings->plainPage()); m_levelInput = new RIntNumInput(m_gboxSettings->plainPage()); m_levelInput->setRange(0, 100, 1); m_levelInput->setDefaultValue(50); - QWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); - m_iterationLabel = new QLabel(i18n("Iteration:"), m_gboxSettings->plainPage()); + m_iterationLabel = new TQLabel(i18n("Iteration:"), m_gboxSettings->plainPage()); m_iterationInput = new RIntNumInput(m_gboxSettings->plainPage()); m_iterationInput->setRange(0, 100, 1); m_iterationInput->setDefaultValue(10); - QWhatsThis::add( m_iterationInput, i18n("<p>This value controls the iterations to use for Waves, " + TQWhatsThis::add( m_iterationInput, i18n("<p>This value controls the iterations to use for Waves, " "Tile, and Neon effects.")); gridSettings->addMultiCellWidget(m_effectTypeLabel, 0, 0, 0, 1); @@ -164,17 +164,17 @@ DistortionFXTool::DistortionFXTool(QObject* parent) // ------------------------------------------------------------- - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_iterationInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_gboxSettings, SIGNAL(signalColorGuideChanged()), - this, SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), + this, TQT_SLOT(slotColorGuideChanged())); } DistortionFXTool::~DistortionFXTool() diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.h b/digikam/imageplugins/distortionfx/distortionfxtool.h index be53d4a..9eac642 100644 --- a/digikam/imageplugins/distortionfx/distortionfxtool.h +++ b/digikam/imageplugins/distortionfx/distortionfxtool.h @@ -32,7 +32,7 @@ #include "editortool.h" -class QLabel; +class TQLabel; namespace KDcrawIface { @@ -51,10 +51,11 @@ namespace DigikamDistortionFXImagesPlugin class DistortionFXTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - DistortionFXTool(QObject *parent); + DistortionFXTool(TQObject *tqparent); ~DistortionFXTool(); private slots: @@ -76,9 +77,9 @@ private: private: - QLabel *m_effectTypeLabel; - QLabel *m_levelLabel; - QLabel *m_iterationLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_levelLabel; + TQLabel *m_iterationLabel; KDcrawIface::RComboBox *m_effectType; diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp index e34f7e2..583c70f 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp @@ -25,15 +25,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qimage.h> -#include <qspinbox.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqimage.h> +#include <tqspinbox.h> +#include <tqcombobox.h> // KDE includes. @@ -61,8 +61,8 @@ namespace DigikamDistortionFXImagesPlugin { -ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Distortion Effects"), +ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Distortion Effects"), "distortionfx", false, true, false, Digikam::ImageGuideWidget::HVGuideMode) { @@ -89,17 +89,17 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) setAboutData(about); - QWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the preview of the distortion effect " + TQWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the preview of the distortion effect " "applied to the photograph.") ); // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 5, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 5, 2, spacingHint()); - m_effectTypeLabel = new QLabel(i18n("Type:"), gboxSettings); + m_effectTypeLabel = new TQLabel(i18n("Type:"), gboxSettings); - m_effectType = new QComboBox( false, gboxSettings ); + m_effectType = new TQComboBox( false, gboxSettings ); m_effectType->insertItem( i18n("Fish Eyes") ); m_effectType->insertItem( i18n("Twirl") ); m_effectType->insertItem( i18n("Cylindrical Hor.") ); @@ -116,8 +116,8 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) m_effectType->insertItem( i18n("Polar Coordinates") ); m_effectType->insertItem( i18n("Unpolar Coordinates") ); m_effectType->insertItem( i18n("Tile") ); - QWhatsThis::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 shape to " + 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 " "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>" @@ -126,8 +126,8 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) "and horizontal.<p>" "<b>Caricature</b>: distorts the photograph with the 'Fish Eyes' effect inverted.<p>" "<b>Multiple Corners</b>: splits the photograph like a multiple corners pattern.<p>" - "<b>Waves Horizontal</b>: distorts the photograph with horizontal waves.<p>" - "<b>Waves Vertical</b>: distorts the photograph with vertical waves.<p>" + "<b>WavesQt::Horizontal</b>: distorts the photograph with horizontal waves.<p>" + "<b>WavesQt::Vertical</b>: distorts the photograph with vertical waves.<p>" "<b>Block Waves 1</b>: divides the image into cells and makes it look as " "if it is being viewed through glass blocks.<p>" "<b>Block Waves 2</b>: like Block Waves 1 but with another version " @@ -143,18 +143,18 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) gridSettings->addMultiCellWidget(m_effectTypeLabel, 0, 0, 0, 2); gridSettings->addMultiCellWidget(m_effectType, 1, 1, 0, 2); - m_levelLabel = new QLabel(i18n("Level:"), gboxSettings); + m_levelLabel = new TQLabel(i18n("Level:"), gboxSettings); m_levelInput = new KIntNumInput(gboxSettings); m_levelInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); + TQWhatsThis::add( m_levelInput, i18n("<p>Set here the level of the effect.")); gridSettings->addMultiCellWidget(m_levelLabel, 2, 2, 0, 2); gridSettings->addMultiCellWidget(m_levelInput, 3, 3, 0, 2); - m_iterationLabel = new QLabel(i18n("Iteration:"), gboxSettings); + m_iterationLabel = new TQLabel(i18n("Iteration:"), gboxSettings); m_iterationInput = new KIntNumInput(gboxSettings); m_iterationInput->setRange(0, 100, 1, true); - QWhatsThis::add( m_iterationInput, i18n("<p>This value controls the iterations to use for Waves, " + TQWhatsThis::add( m_iterationInput, i18n("<p>This value controls the iterations to use for Waves, " "Tile, and Neon effects.")); gridSettings->addMultiCellWidget(m_iterationLabel, 4, 4, 0, 2); @@ -164,14 +164,14 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(QWidget* parent) // ------------------------------------------------------------- - connect(m_effectType, SIGNAL(activated(int)), - this, SLOT(slotEffectTypeChanged(int))); + connect(m_effectType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffectTypeChanged(int))); - connect(m_levelInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_levelInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_iterationInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_iterationInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_DistortionFX::~ImageEffect_DistortionFX() diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h index fe7bacf..5419407 100644 --- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.h @@ -32,8 +32,8 @@ #include "imageguidedlg.h" -class QComboBox; -class QLabel; +class TQComboBox; +class TQLabel; class KIntNumInput; @@ -43,10 +43,11 @@ namespace DigikamDistortionFXImagesPlugin class ImageEffect_DistortionFX : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_DistortionFX(QWidget *parent); + ImageEffect_DistortionFX(TQWidget *tqparent); ~ImageEffect_DistortionFX(); private slots: @@ -66,11 +67,11 @@ private: private: - QComboBox *m_effectType; + TQComboBox *m_effectType; - QLabel *m_effectTypeLabel; - QLabel *m_levelLabel; - QLabel *m_iterationLabel; + TQLabel *m_effectTypeLabel; + TQLabel *m_levelLabel; + TQLabel *m_iterationLabel; KIntNumInput *m_levelInput; KIntNumInput *m_iterationInput; diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp index 3375f46..1c82b3a 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp @@ -44,11 +44,11 @@ using namespace DigikamDistortionFXImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_distortionfx, KGenericFactory<ImagePlugin_DistortionFX>("digikamimageplugin_distortionfx")); -ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX") +ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_DistortionFX") { m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0, - this, SLOT(slotDistortionFX()), + this, TQT_SLOT(slotDistortionFX()), actionCollection(), "imageplugin_distortionfx"); setXMLFile( "digikamimageplugin_distortionfx_ui.rc" ); diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h index 559f76b..42c5efa 100644 --- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h +++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h @@ -37,11 +37,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_DistortionFX : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_DistortionFX(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_DistortionFX(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_DistortionFX(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/emboss/emboss.cpp b/digikam/imageplugins/emboss/emboss.cpp index 0b9a055..fde6933 100644 --- a/digikam/imageplugins/emboss/emboss.cpp +++ b/digikam/imageplugins/emboss/emboss.cpp @@ -39,8 +39,8 @@ namespace DigikamEmbossImagesPlugin { -Emboss::Emboss(Digikam::DImg *orgImage, QObject *parent, int depth) - : Digikam::DImgThreadedFilter(orgImage, parent, "Emboss") +Emboss::Emboss(Digikam::DImg *orgImage, TQObject *tqparent, int depth) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Emboss") { m_depth = depth; initFilter(); diff --git a/digikam/imageplugins/emboss/emboss.h b/digikam/imageplugins/emboss/emboss.h index 6cc23a6..03ff8bd 100644 --- a/digikam/imageplugins/emboss/emboss.h +++ b/digikam/imageplugins/emboss/emboss.h @@ -40,7 +40,7 @@ class Emboss : public Digikam::DImgThreadedFilter public: - Emboss(Digikam::DImg *orgImage, QObject *parent=0, int depth=30); + Emboss(Digikam::DImg *orgImage, TQObject *tqparent=0, int depth=30); ~Emboss(){}; private: diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp index eb79e0f..2f1341a 100644 --- a/digikam/imageplugins/emboss/embosstool.cpp +++ b/digikam/imageplugins/emboss/embosstool.cpp @@ -23,11 +23,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -58,8 +58,8 @@ using namespace Digikam; namespace DigikamEmbossImagesPlugin { -EmbossTool::EmbossTool(QObject* parent) - : EditorToolThreaded(parent) +EmbossTool::EmbossTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("emboss"); setToolName(i18n("Emboss")); @@ -71,13 +71,13 @@ EmbossTool::EmbossTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel| EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 2, 1); - QLabel *label1 = new QLabel(i18n("Depth:"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1); + TQLabel *label1 = new TQLabel(i18n("Depth:"), m_gboxSettings->plainPage()); m_depthInput = new RIntNumInput(m_gboxSettings->plainPage()); m_depthInput->setRange(10, 300, 1); m_depthInput->setDefaultValue(30); - QWhatsThis::add( m_depthInput, i18n("<p>Set here the depth of the embossing image effect.") ); + TQWhatsThis::add( m_depthInput, i18n("<p>Set here the depth of the embossing image effect.") ); grid->addMultiCellWidget(label1, 0, 0, 0, 1); grid->addMultiCellWidget(m_depthInput, 1, 1, 0, 1); @@ -96,8 +96,8 @@ EmbossTool::EmbossTool(QObject* parent) // ------------------------------------------------------------- - connect(m_depthInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_depthInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); } EmbossTool::~EmbossTool() diff --git a/digikam/imageplugins/emboss/embosstool.h b/digikam/imageplugins/emboss/embosstool.h index 5b9e366..6f4ca88 100644 --- a/digikam/imageplugins/emboss/embosstool.h +++ b/digikam/imageplugins/emboss/embosstool.h @@ -47,10 +47,11 @@ namespace DigikamEmbossImagesPlugin class EmbossTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - EmbossTool(QObject* parent); + EmbossTool(TQObject* tqparent); ~EmbossTool(); private slots: diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp index 2960255..8385e92 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp +++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp @@ -23,11 +23,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> // KDE includes. @@ -51,11 +51,11 @@ namespace DigikamEmbossImagesPlugin { -ImageEffect_Emboss::ImageEffect_Emboss(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Emboss Image"), "emboss", false, false, true, +ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Emboss Image"), "emboss", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Emboss Image"), @@ -80,13 +80,13 @@ ImageEffect_Emboss::ImageEffect_Emboss(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 1, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Depth:"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint()); + TQLabel *label1 = new TQLabel(i18n("Depth:"), gboxSettings); m_depthInput = new KIntNumInput(gboxSettings); m_depthInput->setRange(10, 300, 1, true); - QWhatsThis::add( m_depthInput, i18n("<p>Set here the depth of the embossing image effect.") ); + TQWhatsThis::add( m_depthInput, i18n("<p>Set here the depth of the embossing image effect.") ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); gridSettings->addMultiCellWidget(m_depthInput, 1, 1, 0, 1); @@ -95,8 +95,8 @@ ImageEffect_Emboss::ImageEffect_Emboss(QWidget* parent) // ------------------------------------------------------------- - connect(m_depthInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_depthInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_Emboss::~ImageEffect_Emboss() diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.h b/digikam/imageplugins/emboss/imageeffect_emboss.h index d4a3eda..89f7abb 100644 --- a/digikam/imageplugins/emboss/imageeffect_emboss.h +++ b/digikam/imageplugins/emboss/imageeffect_emboss.h @@ -38,10 +38,11 @@ namespace DigikamEmbossImagesPlugin class ImageEffect_Emboss : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Emboss(QWidget* parent); + ImageEffect_Emboss(TQWidget* tqparent); ~ImageEffect_Emboss(); private slots: diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp index 229c483..1f50718 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp +++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp @@ -43,12 +43,12 @@ using namespace DigikamEmbossImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_emboss, KGenericFactory<ImagePlugin_Emboss>("digikamimageplugin_emboss")); -ImagePlugin_Emboss::ImagePlugin_Emboss(QObject *parent, const char*, - const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Emboss") +ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *tqparent, const char*, + const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Emboss") { m_embossAction = new KAction(i18n("Emboss..."), "embosstool", 0, - this, SLOT(slotEmboss()), + this, TQT_SLOT(slotEmboss()), actionCollection(), "imageplugin_emboss"); setXMLFile( "digikamimageplugin_emboss_ui.rc" ); diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.h b/digikam/imageplugins/emboss/imageplugin_emboss.h index 01969d3..c69ec19 100644 --- a/digikam/imageplugins/emboss/imageplugin_emboss.h +++ b/digikam/imageplugins/emboss/imageplugin_emboss.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Emboss : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Emboss(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Emboss(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Emboss(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/filmgrain/filmgrain.cpp b/digikam/imageplugins/filmgrain/filmgrain.cpp index 337e51f..6890b50 100644 --- a/digikam/imageplugins/filmgrain/filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/filmgrain.cpp @@ -27,9 +27,9 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qdatetime.h> +#include <tqdatetime.h> // Local includes. @@ -44,8 +44,8 @@ namespace DigikamFilmGrainImagesPlugin { -FilmGrain::FilmGrain(Digikam::DImg *orgImage, QObject *parent, int sensibility) - : Digikam::DImgThreadedFilter(orgImage, parent, "FilmGrain") +FilmGrain::FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "FilmGrain") { m_sensibility = sensibility; initFilter(); @@ -72,31 +72,31 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) uchar* data = orgImage->bits(); Digikam::DImg grain(Width, Height, sixteenBit); // Grain blured without curves adjustment. - Digikam::DImg mask(Width, Height, sixteenBit); // Grain mask with curves adjustment. + Digikam::DImg tqmask(Width, Height, sixteenBit); // Grain tqmask with curves adjustment. uchar* pGrainBits = grain.bits(); - uchar* pMaskBits = mask.bits(); - uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original. + uchar* pMaskBits = tqmask.bits(); + uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original. int Noise, Shade, nRand, component, progress; uchar *ptr; - Digikam::DColor blendData, grainData, maskData, outData; + Digikam::DColor blendData, grainData, tqmaskData, outData; if (sixteenBit) Noise = (Sensibility / 10 + 1) * 256 - 1; else Noise = Sensibility / 10; - // This value controls the shading pixel effect between original image and grain mask. + // This value controls the shading pixel effect between original image and grain tqmask. if (sixteenBit) Shade = (52 + 1) * 256 - 1; else Shade = 52; - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = (uint) dt.secsTo(Y2000); - // Make gray grain mask. + // Make gray grain tqmask. grainData.setSixteenBit(sixteenBit); @@ -127,7 +127,7 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) postProgress( progress ); } - // Smooth grain mask using gaussian blur with radius 1. + // Smooth grain tqmask using gaussian blur with radius 1. Digikam::DImgGaussianBlur(this, grain, grain, 25, 30, 1); // Normally, film grain tends to be most noticeable in the midtones, and much less @@ -138,15 +138,15 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) // We modify only global luminosity of the grain. if (sixteenBit) { - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, QPoint(32768, 32768)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(65535, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, TQPoint(32768, 32768)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(65535, 0)); } else { - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, QPoint(128, 128)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(255, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, TQPoint(128, 128)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(255, 0)); } // Calculate curves and lut to apply on grain. @@ -174,15 +174,15 @@ void FilmGrain::filmgrainImage(Digikam::DImg *orgImage, int Sensibility) // read color from orig image blendData.setColor(data + offset, sixteenBit); - // read color from mask - maskData.setColor(pMaskBits + offset, sixteenBit); + // read color from tqmask + tqmaskData.setColor(pMaskBits + offset, sixteenBit); // set shade as alpha value - it will be used as source alpha when blending - maskData.setAlpha(Shade); + tqmaskData.setAlpha(Shade); // compose, write result to blendData. // Preserve alpha, do not blend it (taken from old algorithm - correct?) alpha = blendData.alpha(); - composer->compose(blendData, maskData); + composer->compose(blendData, tqmaskData); blendData.setAlpha(alpha); // write to destination diff --git a/digikam/imageplugins/filmgrain/filmgrain.h b/digikam/imageplugins/filmgrain/filmgrain.h index 31b39a7..26b83b7 100644 --- a/digikam/imageplugins/filmgrain/filmgrain.h +++ b/digikam/imageplugins/filmgrain/filmgrain.h @@ -38,7 +38,7 @@ class FilmGrain : public Digikam::DImgThreadedFilter public: - FilmGrain(Digikam::DImg *orgImage, QObject *parent=0, int sensibility=12); + FilmGrain(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=12); ~FilmGrain(){}; diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp index 4518769..69d3583 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.cpp +++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp @@ -23,14 +23,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlcdnumber.h> -#include <qslider.h> -#include <qlayout.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlcdnumber.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqimage.h> // KDE includes. @@ -58,8 +58,8 @@ using namespace Digikam; namespace DigikamFilmGrainImagesPlugin { -FilmGrainTool::FilmGrainTool(QObject* parent) - : EditorToolThreaded(parent) +FilmGrainTool::FilmGrainTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("filmgrain"); setToolName(i18n("Film Grain")); @@ -73,22 +73,22 @@ FilmGrainTool::FilmGrainTool(QObject* parent) EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 2, 1); - QLabel *label1 = new QLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 2, 1); + TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); - m_sensibilitySlider = new QSlider(2, 30, 1, 12, Qt::Horizontal, m_gboxSettings->plainPage()); + m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTickInterval(1); - m_sensibilitySlider->setTickmarks(QSlider::Below); + m_sensibilitySlider->setTickmarks(TQSlider::Below); - m_sensibilityLCDValue = new QLCDNumber(4, m_gboxSettings->plainPage()); - m_sensibilityLCDValue->setSegmentStyle(QLCDNumber::Flat); - m_sensibilityLCDValue->display(QString::number(2400)); - QString whatsThis = i18n("<p>Set here the film ISO-sensitivity to " + m_sensibilityLCDValue = new TQLCDNumber(4, m_gboxSettings->plainPage()); + m_sensibilityLCDValue->setSegmentStyle(TQLCDNumber::Flat); + m_sensibilityLCDValue->display(TQString::number(2400)); + TQString whatsThis = i18n("<p>Set here the film ISO-sensitivity to " "use for simulating the film graininess."); - QWhatsThis::add(m_sensibilityLCDValue, whatsThis); - QWhatsThis::add(m_sensibilitySlider, whatsThis); + TQWhatsThis::add(m_sensibilityLCDValue, whatsThis); + TQWhatsThis::add(m_sensibilitySlider, whatsThis); grid->addMultiCellWidget(label1, 0, 0, 0, 1); grid->addMultiCellWidget(m_sensibilitySlider, 1, 1, 0, 0); @@ -108,16 +108,16 @@ FilmGrainTool::FilmGrainTool(QObject* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, SIGNAL(sliderMoved(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); } FilmGrainTool::~FilmGrainTool() @@ -157,7 +157,7 @@ void FilmGrainTool::slotResetSettings() void FilmGrainTool::slotSliderMoved(int v) { - m_sensibilityLCDValue->display( QString::number(400+200*v) ); + m_sensibilityLCDValue->display( TQString::number(400+200*v) ); } void FilmGrainTool::prepareEffect() diff --git a/digikam/imageplugins/filmgrain/filmgraintool.h b/digikam/imageplugins/filmgrain/filmgraintool.h index 3520396..33c5c6e 100644 --- a/digikam/imageplugins/filmgrain/filmgraintool.h +++ b/digikam/imageplugins/filmgrain/filmgraintool.h @@ -30,8 +30,8 @@ #include "editortool.h" -class QSlider; -class QLCDNumber; +class TQSlider; +class TQLCDNumber; namespace Digikam { @@ -45,10 +45,11 @@ namespace DigikamFilmGrainImagesPlugin class FilmGrainTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - FilmGrainTool(QObject* parent); + FilmGrainTool(TQObject* tqparent); ~FilmGrainTool(); private slots: @@ -68,9 +69,9 @@ private: private: - QSlider *m_sensibilitySlider; + TQSlider *m_sensibilitySlider; - QLCDNumber *m_sensibilityLCDValue; + TQLCDNumber *m_sensibilityLCDValue; Digikam::ImagePanelWidget *m_previewWidget; diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp index dd9d125..03d9195 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp @@ -23,14 +23,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlcdnumber.h> -#include <qslider.h> -#include <qlayout.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlcdnumber.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqimage.h> // KDE includes. @@ -55,12 +55,12 @@ namespace DigikamFilmGrainImagesPlugin { -ImageEffect_FilmGrain::ImageEffect_FilmGrain(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Add Film Grain to Photograph"), +ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Add Film Grain to Photograph"), "filmgrain", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Film Grain"), @@ -83,22 +83,22 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 1, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Sensitivity (ISO):"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 1, 1, 0, spacingHint()); + TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); - m_sensibilitySlider = new QSlider(2, 30, 1, 12, Qt::Horizontal, gboxSettings); + m_sensibilitySlider = new TQSlider(2, 30, 1, 12, Qt::Horizontal, gboxSettings); m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTickInterval(1); - m_sensibilitySlider->setTickmarks(QSlider::Below); + m_sensibilitySlider->setTickmarks(TQSlider::Below); - m_sensibilityLCDValue = new QLCDNumber (4, gboxSettings); - m_sensibilityLCDValue->setSegmentStyle ( QLCDNumber::Flat ); - m_sensibilityLCDValue->display( QString::number(2400) ); + m_sensibilityLCDValue = new TQLCDNumber (4, gboxSettings); + m_sensibilityLCDValue->setSegmentStyle ( TQLCDNumber::Flat ); + m_sensibilityLCDValue->display( TQString::number(2400) ); whatsThis = i18n("<p>Set here the film ISO-sensitivity to use for simulating the film graininess."); - QWhatsThis::add( m_sensibilityLCDValue, whatsThis); - QWhatsThis::add( m_sensibilitySlider, whatsThis); + TQWhatsThis::add( m_sensibilityLCDValue, whatsThis); + TQWhatsThis::add( m_sensibilitySlider, whatsThis); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); gridSettings->addMultiCellWidget(m_sensibilitySlider, 1, 1, 0, 0); @@ -108,16 +108,16 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(QWidget* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, SIGNAL(sliderMoved(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); } ImageEffect_FilmGrain::~ImageEffect_FilmGrain() @@ -156,7 +156,7 @@ void ImageEffect_FilmGrain::resetValues() void ImageEffect_FilmGrain::slotSliderMoved(int v) { - m_sensibilityLCDValue->display( QString::number(400+200*v) ); + m_sensibilityLCDValue->display( TQString::number(400+200*v) ); } void ImageEffect_FilmGrain::prepareEffect() diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h index 5b703de..eb83eb5 100644 --- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.h @@ -31,8 +31,8 @@ #include "ctrlpaneldlg.h" -class QSlider; -class QLCDNumber; +class TQSlider; +class TQLCDNumber; namespace DigikamFilmGrainImagesPlugin { @@ -40,10 +40,11 @@ namespace DigikamFilmGrainImagesPlugin class ImageEffect_FilmGrain : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_FilmGrain(QWidget* parent); + ImageEffect_FilmGrain(TQWidget* tqparent); ~ImageEffect_FilmGrain(); private slots: @@ -63,9 +64,9 @@ private: private: - QSlider *m_sensibilitySlider; + TQSlider *m_sensibilitySlider; - QLCDNumber *m_sensibilityLCDValue; + TQLCDNumber *m_sensibilityLCDValue; }; } // NameSpace DigikamFilmGrainImagesPlugin diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp index 964f10e..39aec33 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp @@ -43,11 +43,11 @@ using namespace DigikamFilmGrainImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_filmgrain, KGenericFactory<ImagePlugin_FilmGrain>("digikamimageplugin_filmgrain")); -ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_FilmGrain") +ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_FilmGrain") { m_filmgrainAction = new KAction(i18n("Add Film Grain..."), "filmgrain", 0, - this, SLOT(slotFilmGrain()), + this, TQT_SLOT(slotFilmGrain()), actionCollection(), "imageplugin_filmgrain"); setXMLFile( "digikamimageplugin_filmgrain_ui.rc" ); diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h index 3362d98..278c907 100644 --- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h +++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FilmGrain : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_FilmGrain(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_FilmGrain(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_FilmGrain(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/freerotation/freerotation.cpp b/digikam/imageplugins/freerotation/freerotation.cpp index 3bd318c..cd2e34b 100644 --- a/digikam/imageplugins/freerotation/freerotation.cpp +++ b/digikam/imageplugins/freerotation/freerotation.cpp @@ -38,9 +38,9 @@ namespace DigikamFreeRotationImagesPlugin { -FreeRotation::FreeRotation(Digikam::DImg *orgImage, QObject *parent, double angle, bool antialiasing, - int autoCrop, QColor backgroundColor, int orgW, int orgH) - : Digikam::DImgThreadedFilter(orgImage, parent, "FreeRotation") +FreeRotation::FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent, double angle, bool antialiasing, + int autoCrop, TQColor backgroundColor, int orgW, int orgH) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "FreeRotation") { m_angle = angle; m_orgW = orgW; @@ -174,7 +174,7 @@ void FreeRotation::filterImage(void) } // Auto-cropping destination image without black holes around. - QRect autoCrop; + TQRect autoCrop; switch(m_autoCrop) { @@ -192,7 +192,7 @@ void FreeRotation::filterImage(void) m_destImage = Digikam::DImg(m_orgImage.width(), m_orgImage.height(), m_orgImage.sixteenBit(), m_orgImage.hasAlpha()); m_destImage.fill( Digikam::DColor(m_backgroundColor.rgb(), sixteenBit) ); - m_newSize = QSize(); + m_newSize = TQSize(); } else { @@ -222,14 +222,14 @@ void FreeRotation::filterImage(void) autoCrop.setWidth( (int)((float)autoCrop.height() * tan(gamma)) ); } - autoCrop.moveCenter( QPoint(nNewWidth/2, nNewHeight/2)); + autoCrop.moveCenter( TQPoint(nNewWidth/2, nNewHeight/2)); if (!autoCrop.isValid()) { m_destImage = Digikam::DImg(m_orgImage.width(), m_orgImage.height(), m_orgImage.sixteenBit(), m_orgImage.hasAlpha()); m_destImage.fill( Digikam::DColor(m_backgroundColor.rgb(), sixteenBit) ); - m_newSize = QSize(); + m_newSize = TQSize(); } else { diff --git a/digikam/imageplugins/freerotation/freerotation.h b/digikam/imageplugins/freerotation/freerotation.h index 322d3a5..941e15c 100644 --- a/digikam/imageplugins/freerotation/freerotation.h +++ b/digikam/imageplugins/freerotation/freerotation.h @@ -24,10 +24,10 @@ #ifndef FREE_ROTATION_H #define FREE_ROTATION_H -// Qt includes. +// TQt includes. -#include <qsize.h> -#include <qcolor.h> +#include <tqsize.h> +#include <tqcolor.h> // Digikam includes. @@ -41,13 +41,13 @@ class FreeRotation : public Digikam::DImgThreadedFilter public: - FreeRotation(Digikam::DImg *orgImage, QObject *parent=0, double angle=0.0, - bool antialiasing=true, int autoCrop=NoAutoCrop, QColor backgroundColor=Qt::black, + FreeRotation(Digikam::DImg *orgImage, TQObject *tqparent=0, double angle=0.0, + bool antialiasing=true, int autoCrop=NoAutoCrop, TQColor backgroundColor=TQt::black, int orgW=0, int orgH=0); ~FreeRotation(){}; - QSize getNewSize(void){ return m_newSize; }; + TQSize getNewSize(void){ return m_newSize; }; public: @@ -84,9 +84,9 @@ private: double m_angle; - QSize m_newSize; + TQSize m_newSize; - QColor m_backgroundColor; + TQColor m_backgroundColor; }; } // NameSpace DigikamFreeRotationImagesPlugin diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp index 7e5c7a7..825b88d 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.cpp +++ b/digikam/imageplugins/freerotation/freerotationtool.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcheckbox.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -64,8 +64,8 @@ using namespace Digikam; namespace DigikamFreeRotationImagesPlugin { -FreeRotationTool::FreeRotationTool(QObject* parent) - : EditorToolThreaded(parent) +FreeRotationTool::FreeRotationTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("freerotation"); setToolName(i18n("Free Rotation")); @@ -84,52 +84,52 @@ FreeRotationTool::FreeRotationTool(QObject* parent) // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel, EditorToolSettings::ColorGuide); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 9, 2); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 2); - QLabel *label1 = new QLabel(i18n("New width:"), m_gboxSettings->plainPage()); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + 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 ); - QLabel *label2 = new QLabel(i18n("New height:"), m_gboxSettings->plainPage()); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->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 ); - KSeparator *line = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); - QLabel *label3 = new QLabel(i18n("Main angle:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Main angle:"), m_gboxSettings->plainPage()); m_angleInput = new RIntNumInput(m_gboxSettings->plainPage()); m_angleInput->setRange(-180, 180, 1); m_angleInput->setDefaultValue(0); - QWhatsThis::add( m_angleInput, i18n("<p>An angle in degrees by which to rotate the image. " + TQWhatsThis::add( m_angleInput, i18n("<p>An angle in degrees by which to rotate the image. " "A positive angle rotates the image clockwise; " "a negative angle rotates it counter-clockwise.")); - QLabel *label4 = new QLabel(i18n("Fine angle:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Fine angle:"), m_gboxSettings->plainPage()); m_fineAngleInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_fineAngleInput->setRange(-5.0, 5.0, 0.01); m_fineAngleInput->setDefaultValue(0); - QWhatsThis::add( m_fineAngleInput, i18n("<p>This value in degrees will be added to main angle value " + TQWhatsThis::add( m_fineAngleInput, i18n("<p>This value in degrees will be added to main angle value " "to set fine target angle.")); - m_antialiasInput = new QCheckBox(i18n("Anti-Aliasing"), m_gboxSettings->plainPage()); - QWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " + m_antialiasInput = new TQCheckBox(i18n("Anti-Aliasing"), m_gboxSettings->plainPage()); + TQWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " "to the rotated image. " "In order to smooth the target image, it will be blurred a little.")); - QLabel *label5 = new QLabel(i18n("Auto-crop:"), m_gboxSettings->plainPage()); + TQLabel *label5 = new TQLabel(i18n("Auto-crop:"), m_gboxSettings->plainPage()); m_autoCropCB = new RComboBox(m_gboxSettings->plainPage()); m_autoCropCB->insertItem( i18n("None") ); m_autoCropCB->insertItem( i18n("Widest Area") ); m_autoCropCB->insertItem( i18n("Largest Area") ); m_autoCropCB->setDefaultItem(FreeRotation::NoAutoCrop); - QWhatsThis::add( m_autoCropCB, i18n("<p>Select the method to process image auto-cropping " + TQWhatsThis::add( m_autoCropCB, i18n("<p>Select the method to process image auto-cropping " "to remove black frames around a rotated image.")); grid->addMultiCellWidget(label1, 0, 0, 0, 0); @@ -153,20 +153,20 @@ FreeRotationTool::FreeRotationTool(QObject* parent) // ------------------------------------------------------------- - connect(m_angleInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_angleInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineAngleInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_fineAngleInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_antialiasInput, SIGNAL(toggled(bool)), - this, SLOT(slotEffect())); + connect(m_antialiasInput, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotEffect())); - connect(m_autoCropCB, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_autoCropCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); - connect(m_gboxSettings, SIGNAL(signalColorGuideChanged()), - this, SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), + this, TQT_SLOT(slotColorGuideChanged())); } FreeRotationTool::~FreeRotationTool() @@ -187,7 +187,7 @@ void FreeRotationTool::readSettings() m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", m_fineAngleInput->defaultValue())); m_autoCropCB->setCurrentItem(config->readNumEntry("Auto Crop Type", m_autoCropCB->defaultItem())); m_antialiasInput->setChecked(config->readBoolEntry("Anti Aliasing", true)); - m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &Qt::red)); + m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &TQt::red)); m_gboxSettings->setGuideSize(config->readNumEntry("Guide Width", 1)); slotColorGuideChanged(); @@ -235,7 +235,7 @@ void FreeRotationTool::prepareEffect() double angle = m_angleInput->value() + m_fineAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); int autocrop = m_autoCropCB->currentItem(); - QColor background = toolView()->paletteBackgroundColor().rgb(); + TQColor background = toolView()->paletteBackgroundColor().rgb(); ImageIface* iface = m_previewWidget->imageIface(); int orgW = iface->originalWidth(); int orgH = iface->originalHeight(); @@ -259,7 +259,7 @@ void FreeRotationTool::prepareFinal() double angle = m_angleInput->value() + m_fineAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); int autocrop = m_autoCropCB->currentItem(); - QColor background = Qt::black; + TQColor background = TQt::black; ImageIface iface(0, 0); int orgW = iface.originalWidth(); @@ -279,7 +279,7 @@ void FreeRotationTool::putPreviewData() int w = iface->previewWidth(); int h = iface->previewHeight(); - DImg imTemp = filter()->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + DImg imTemp = filter()->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); DImg imDest( w, h, filter()->getTargetImage().sixteenBit(), filter()->getTargetImage().hasAlpha() ); @@ -291,8 +291,8 @@ void FreeRotationTool::putPreviewData() iface->previewHeight())).bits()); m_previewWidget->updatePreview(); - QSize newSize = dynamic_cast<FreeRotation*>(filter())->getNewSize(); - QString temp; + TQSize newSize = dynamic_cast<FreeRotation*>(filter())->getNewSize(); + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); } diff --git a/digikam/imageplugins/freerotation/freerotationtool.h b/digikam/imageplugins/freerotation/freerotationtool.h index 587ca20..6d6cb90 100644 --- a/digikam/imageplugins/freerotation/freerotationtool.h +++ b/digikam/imageplugins/freerotation/freerotationtool.h @@ -29,9 +29,9 @@ #include "editortool.h" -class QFrame; -class QLabel; -class QCheckBox; +class TQFrame; +class TQLabel; +class TQCheckBox; namespace KDcrawIface { @@ -52,10 +52,11 @@ namespace DigikamFreeRotationImagesPlugin class FreeRotationTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - FreeRotationTool(QObject *parent); + FreeRotationTool(TQObject *tqparent); ~FreeRotationTool(); private slots: @@ -75,10 +76,10 @@ private: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; - QCheckBox *m_antialiasInput; + TQCheckBox *m_antialiasInput; KDcrawIface::RComboBox *m_autoCropCB; diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp index ee46d23..50ab488 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp @@ -22,14 +22,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qimage.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqcombobox.h> // KDE includes. @@ -57,14 +57,14 @@ namespace DigikamFreeRotationImagesPlugin { -ImageEffect_FreeRotation::ImageEffect_FreeRotation(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Free Rotation"), "freerotation", +ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Free Rotation"), "freerotation", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { // No need Abort button action. showButton(User1, false); - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Free Rotation"), @@ -84,7 +84,7 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(QWidget* parent) setAboutData(about); - QWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the free image operation preview. " + TQWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the free image operation preview. " "If you move the mouse cursor on this preview, " "a vertical and horizontal dashed line will be drawn " "to guide you in adjusting the free rotation correction. " @@ -93,61 +93,61 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(QWidget* parent) // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 9, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 9, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("New width:"), gboxSettings); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings); + m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); + m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); - QLabel *label2 = new QLabel(i18n("New height:"), gboxSettings); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings); - m_newHeightLabel->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 ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0); gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2); - KSeparator *line = new KSeparator (Horizontal, gboxSettings); + KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); gridSettings->addMultiCellWidget(line, 2, 2, 0, 2); - QLabel *label3 = new QLabel(i18n("Main angle:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Main angle:"), gboxSettings); m_angleInput = new KIntNumInput(gboxSettings); m_angleInput->setRange(-180, 180, 1, true); m_angleInput->setValue(0); - QWhatsThis::add( m_angleInput, i18n("<p>An angle in degrees by which to rotate the image. " + TQWhatsThis::add( m_angleInput, i18n("<p>An angle in degrees by which to rotate the image. " "A positive angle rotates the image clockwise; " "a negative angle rotates it counter-clockwise.")); gridSettings->addMultiCellWidget(label3, 3, 3, 0, 2); gridSettings->addMultiCellWidget(m_angleInput, 4, 4, 0, 2); - QLabel *label4 = new QLabel(i18n("Fine angle:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Fine angle:"), gboxSettings); m_fineAngleInput = new KDoubleNumInput(gboxSettings); m_fineAngleInput->setRange(-5.0, 5.0, 0.01, true); m_fineAngleInput->setValue(0); - QWhatsThis::add( m_fineAngleInput, i18n("<p>This value in degrees will be added to main angle value " + TQWhatsThis::add( m_fineAngleInput, i18n("<p>This value in degrees will be added to main angle value " "to set fine target angle.")); gridSettings->addMultiCellWidget(label4, 5, 5, 0, 2); gridSettings->addMultiCellWidget(m_fineAngleInput, 6, 6, 0, 2); - m_antialiasInput = new QCheckBox(i18n("Anti-Aliasing"), gboxSettings); - QWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " + m_antialiasInput = new TQCheckBox(i18n("Anti-Aliasing"), gboxSettings); + TQWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " "to the rotated image. " "In order to smooth the target image, it will be blurred a little.")); gridSettings->addMultiCellWidget(m_antialiasInput, 7, 7, 0, 2); - QLabel *label5 = new QLabel(i18n("Auto-crop:"), gboxSettings); - m_autoCropCB = new QComboBox(false, gboxSettings); + TQLabel *label5 = new TQLabel(i18n("Auto-crop:"), gboxSettings); + m_autoCropCB = new TQComboBox(false, gboxSettings); m_autoCropCB->insertItem( i18n("None") ); m_autoCropCB->insertItem( i18n("Widest Area") ); m_autoCropCB->insertItem( i18n("Largest Area") ); - QWhatsThis::add( m_autoCropCB, i18n("<p>Select the method to process image auto-cropping " + TQWhatsThis::add( m_autoCropCB, i18n("<p>Select the method to process image auto-cropping " "to remove black frames around a rotated image.")); gridSettings->addMultiCellWidget(label5, 8, 8, 0, 0); gridSettings->addMultiCellWidget(m_autoCropCB, 8, 8, 1, 2); @@ -156,17 +156,17 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(QWidget* parent) // ------------------------------------------------------------- - connect(m_angleInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_angleInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineAngleInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_fineAngleInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_antialiasInput, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_antialiasInput, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); - connect(m_autoCropCB, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_autoCropCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); } ImageEffect_FreeRotation::~ImageEffect_FreeRotation() @@ -220,7 +220,7 @@ void ImageEffect_FreeRotation::prepareEffect() double angle = m_angleInput->value() + m_fineAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); int autocrop = m_autoCropCB->currentItem(); - QColor background = paletteBackgroundColor().rgb(); + TQColor background = paletteBackgroundColor().rgb(); Digikam::ImageIface* iface = m_imagePreviewWidget->imageIface(); int orgW = iface->originalWidth(); @@ -246,7 +246,7 @@ void ImageEffect_FreeRotation::prepareFinal() double angle = m_angleInput->value() + m_fineAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); int autocrop = m_autoCropCB->currentItem(); - QColor background = Qt::black; + TQColor background = TQt::black; Digikam::ImageIface iface(0, 0); int orgW = iface.originalWidth(); @@ -268,7 +268,7 @@ void ImageEffect_FreeRotation::putPreviewData(void) int w = iface->previewWidth(); int h = iface->previewHeight(); - Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); Digikam::DImg imDest( w, h, m_threadedFilter->getTargetImage().sixteenBit(), m_threadedFilter->getTargetImage().hasAlpha() ); @@ -280,8 +280,8 @@ void ImageEffect_FreeRotation::putPreviewData(void) iface->previewHeight())).bits()); m_imagePreviewWidget->updatePreview(); - QSize newSize = dynamic_cast<FreeRotation *>(m_threadedFilter)->getNewSize(); - QString temp; + TQSize newSize = dynamic_cast<FreeRotation *>(m_threadedFilter)->getNewSize(); + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); } diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.h b/digikam/imageplugins/freerotation/imageeffect_freerotation.h index eb14b62..586cf27 100644 --- a/digikam/imageplugins/freerotation/imageeffect_freerotation.h +++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.h @@ -29,10 +29,10 @@ #include "imageguidedlg.h" -class QFrame; -class QLabel; -class QCheckBox; -class QComboBox; +class TQFrame; +class TQLabel; +class TQCheckBox; +class TQComboBox; class KIntNumInput; class KDoubleNumInput; @@ -43,10 +43,11 @@ namespace DigikamFreeRotationImagesPlugin class ImageEffect_FreeRotation : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_FreeRotation(QWidget *parent); + ImageEffect_FreeRotation(TQWidget *tqparent); ~ImageEffect_FreeRotation(); private slots: @@ -65,12 +66,12 @@ protected: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; - QCheckBox *m_antialiasInput; + TQCheckBox *m_antialiasInput; - QComboBox *m_autoCropCB; + TQComboBox *m_autoCropCB; KIntNumInput *m_angleInput; diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp index 1638647..d6a72d2 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp @@ -42,11 +42,11 @@ using namespace DigikamFreeRotationImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_freerotation, KGenericFactory<ImagePlugin_FreeRotation>("digikamimageplugin_freerotation")); -ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_FreeRotation") +ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_FreeRotation") { m_freerotationAction = new KAction(i18n("Free Rotation..."), "freerotation", 0, - this, SLOT(slotFreeRotation()), + this, TQT_SLOT(slotFreeRotation()), actionCollection(), "imageplugin_freerotation"); setXMLFile("digikamimageplugin_freerotation_ui.rc"); diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.h b/digikam/imageplugins/freerotation/imageplugin_freerotation.h index 8a0151f..e70b41c 100644 --- a/digikam/imageplugins/freerotation/imageplugin_freerotation.h +++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FreeRotation : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_FreeRotation(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_FreeRotation(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_FreeRotation(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp index ace21c2..4d169a8 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.cpp +++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp @@ -24,10 +24,10 @@ #define THUMB_WIDTH 150 -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqtooltip.h> // Local includes. @@ -37,48 +37,48 @@ namespace DigikamHotPixelsImagesPlugin { -BlackFrameListView::BlackFrameListView(QWidget* parent) - : QListView(parent) +BlackFrameListView::BlackFrameListView(TQWidget* tqparent) + : TQListView(tqparent) { addColumn(i18n("Preview")); addColumn(i18n("Size")); addColumn(i18n("This is a column which will contain the amount of HotPixels " "found in the black frame file", "HP")); setAllColumnsShowFocus(true); - setResizeMode(QListView::LastColumn); - setSelectionMode(QListView::Single); + setResizeMode(TQListView::LastColumn); + setSelectionMode(TQListView::Single); } // -------------------------------------------------------------------------- -BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url) - : QObject(parent), QListViewItem(parent) +BlackFrameListViewItem::BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url) + : TQObject(tqparent), TQListViewItem(tqparent) { - m_parent = parent; + m_parent = tqparent; m_blackFrameURL = url; - m_parser = new BlackFrameParser(parent); + m_parser = new BlackFrameParser(tqparent); m_parser->parseBlackFrame(url); - connect(m_parser, SIGNAL(parsed(QValueList<HotPixel>)), - this, SLOT(slotParsed(QValueList<HotPixel>))); + connect(m_parser, TQT_SIGNAL(parsed(TQValueList<HotPixel>)), + this, TQT_SLOT(slotParsed(TQValueList<HotPixel>))); - connect(this, SIGNAL(parsed(QValueList<HotPixel>, const KURL&)), - parent, SLOT(slotParsed(QValueList<HotPixel>, const KURL&))); + connect(this, TQT_SIGNAL(parsed(TQValueList<HotPixel>, const KURL&)), + tqparent, TQT_SLOT(slotParsed(TQValueList<HotPixel>, const KURL&))); - connect(m_parser, SIGNAL(signalLoadingProgress(float)), - this, SIGNAL(signalLoadingProgress(float))); + connect(m_parser, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SIGNAL(signalLoadingProgress(float))); - connect(m_parser, SIGNAL(signalLoadingComplete()), - this, SIGNAL(signalLoadingComplete())); + connect(m_parser, TQT_SIGNAL(signalLoadingComplete()), + this, TQT_SIGNAL(signalLoadingComplete())); } void BlackFrameListViewItem::activate() { - QToolTip::add( m_parent, m_blackFrameDesc); + TQToolTip::add( m_parent, m_blackFrameDesc); emit parsed(m_hotPixels, m_blackFrameURL); } -QString BlackFrameListViewItem::text(int column)const +TQString BlackFrameListViewItem::text(int column)const { switch (column) { @@ -91,73 +91,73 @@ QString BlackFrameListViewItem::text(int column)const { // The image size. if (!m_imageSize.isEmpty()) - return (QString("%1x%2").arg(m_imageSize.width()).arg(m_imageSize.height())); + return (TQString("%1x%2").tqarg(m_imageSize.width()).tqarg(m_imageSize.height())); break; } case 2: { // The amount of hot pixels found in the black frame. - return (QString::number(m_hotPixels.count())); + return (TQString::number(m_hotPixels.count())); break; } } - return QString(); + return TQString(); } -void BlackFrameListViewItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align) +void BlackFrameListViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align) { //Let the normal listview item draw it all for now - QListViewItem::paintCell(p, cg, column, width, align); + TQListViewItem::paintCell(p, cg, column, width, align); } -void BlackFrameListViewItem::slotParsed(QValueList<HotPixel> hotPixels) +void BlackFrameListViewItem::slotParsed(TQValueList<HotPixel> hotPixels) { m_hotPixels = hotPixels; m_image = m_parser->image(); m_imageSize = m_image.size(); - m_thumb = thumb(QSize(THUMB_WIDTH, THUMB_WIDTH/3*2)); + m_thumb = thumb(TQSize(THUMB_WIDTH, THUMB_WIDTH/3*2)); setPixmap(0, m_thumb); - m_blackFrameDesc = QString("<p><b>" + m_blackFrameURL.fileName() + "</b>:<p>"); - QValueList <HotPixel>::Iterator end(m_hotPixels.end()); - for (QValueList <HotPixel>::Iterator it = m_hotPixels.begin() ; it != end ; ++it) - m_blackFrameDesc.append( QString("[%1,%2] ").arg((*it).x()).arg((*it).y()) ); + 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()) ); emit parsed(m_hotPixels, m_blackFrameURL); } -QPixmap BlackFrameListViewItem::thumb(const QSize& size) +TQPixmap BlackFrameListViewItem::thumb(const TQSize& size) { - QPixmap thumb; + TQPixmap thumb; //First scale it down to the size - thumb = m_image.smoothScale(size, QImage::ScaleMin); + thumb = m_image.smoothScale(size, TQ_ScaleMin); //And draw the hot pixel positions on the thumb - QPainter p(&thumb); + TQPainter p(&thumb); //Take scaling into account float xRatio, yRatio; float hpThumbX, hpThumbY; - QRect hpRect; + TQRect hpRect; xRatio = (float)size.width()/(float)m_image.width(); yRatio = (float)size.height()/(float)m_image.height(); //Draw hot pixels one by one - QValueList <HotPixel>::Iterator it; - QValueList <HotPixel>::Iterator end(m_hotPixels.end()); + TQValueList <HotPixel>::Iterator it; + TQValueList <HotPixel>::Iterator end(m_hotPixels.end()); for (it=m_hotPixels.begin() ; it!=end ; ++it) { hpRect = (*it).rect; hpThumbX = (hpRect.x()+hpRect.width()/2)*xRatio; hpThumbY = (hpRect.y()+hpRect.height()/2)*yRatio; - p.setPen(QPen(Qt::black)); + p.setPen(TQPen(TQt::black)); p.drawLine((int)hpThumbX, (int)hpThumbY-1, (int)hpThumbX, (int)hpThumbY+1); p.drawLine((int)hpThumbX-1, (int)hpThumbY, (int)hpThumbX+1, (int)hpThumbY); - p.setPen(QPen(Qt::white)); + p.setPen(TQPen(TQt::white)); p.drawPoint((int)hpThumbX-1, (int)hpThumbY-1); p.drawPoint((int)hpThumbX+1, (int)hpThumbY+1); p.drawPoint((int)hpThumbX-1, (int)hpThumbY+1); @@ -167,10 +167,10 @@ QPixmap BlackFrameListViewItem::thumb(const QSize& size) return thumb; } -int BlackFrameListViewItem::width(const QFontMetrics& fm,const QListView* lv,int c)const +int BlackFrameListViewItem::width(const TQFontMetrics& fm,const TQListView* lv,int c)const { if (c==0) return THUMB_WIDTH; - else return QListViewItem::width(fm,lv,c); + else return TQListViewItem::width(fm,lv,c); } } // NameSpace DigikamHotPixelsImagesPlugin diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/digikam/imageplugins/hotpixels/blackframelistview.h index 4fdb4f6..7a3e956 100644 --- a/digikam/imageplugins/hotpixels/blackframelistview.h +++ b/digikam/imageplugins/hotpixels/blackframelistview.h @@ -25,14 +25,14 @@ #ifndef BLACKFRAMELISTVIEW_H #define BLACKFRAMELISTVIEW_H -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qstring.h> -#include <qsize.h> -#include <qpoint.h> -#include <qvaluelist.h> -#include <qlistview.h> +#include <tqimage.h> +#include <tqstring.h> +#include <tqsize.h> +#include <tqpoint.h> +#include <tqvaluelist.h> +#include <tqlistview.h> // KDE includes. @@ -47,22 +47,23 @@ namespace DigikamHotPixelsImagesPlugin { -class BlackFrameListView : public QListView +class BlackFrameListView : public TQListView { Q_OBJECT + TQ_OBJECT public: - BlackFrameListView(QWidget* parent=0); + BlackFrameListView(TQWidget* tqparent=0); ~BlackFrameListView(){}; signals: - void blackFrameSelected(QValueList<HotPixel>, const KURL&); + void blackFrameSelected(TQValueList<HotPixel>, const KURL&); private slots: - void slotParsed(QValueList<HotPixel> hotPixels, const KURL& blackFrameURL) + void slotParsed(TQValueList<HotPixel> hotPixels, const KURL& blackFrameURL) { emit blackFrameSelected(hotPixels, blackFrameURL); }; @@ -70,22 +71,23 @@ private slots: // -------------------------------------------------------------------------- -class BlackFrameListViewItem : public QObject, QListViewItem +class BlackFrameListViewItem : public TQObject, TQListViewItem { Q_OBJECT + TQ_OBJECT public: - BlackFrameListViewItem(BlackFrameListView* parent, const KURL &url); + BlackFrameListViewItem(BlackFrameListView* tqparent, const KURL &url); ~BlackFrameListViewItem(){}; - virtual QString text(int column)const; - virtual void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); - virtual int width(const QFontMetrics& fm, const QListView* lv, int c)const; + virtual TQString text(int column)const; + virtual void paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align); + virtual int width(const TQFontMetrics& fm, const TQListView* lv, int c)const; signals: - void parsed(QValueList<HotPixel>, const KURL&); + void parsed(TQValueList<HotPixel>, const KURL&); void signalLoadingProgress(float); void signalLoadingComplete(); @@ -95,23 +97,23 @@ protected: private: - QPixmap thumb(const QSize& size); + TQPixmap thumb(const TQSize& size); private slots: - void slotParsed(QValueList<HotPixel>); + void slotParsed(TQValueList<HotPixel>); private: // Data contained within each listview item - QImage m_thumb; - QImage m_image; + TQImage m_thumb; + TQImage m_image; - QSize m_imageSize; + TQSize m_imageSize; - QValueList <HotPixel> m_hotPixels; + TQValueList <HotPixel> m_hotPixels; - QString m_blackFrameDesc; + TQString m_blackFrameDesc; KURL m_blackFrameURL; diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp index 822f385..e5cffd3 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.cpp +++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp @@ -27,19 +27,19 @@ * ============================================================ */ // Denominator for relative quantities. -#define DENOM (DENOM_SQRT * DENOM_SQRT) +#define DENOM (DENOM_STQRT * DENOM_STQRT) // Square root of denominator for relative quantities. -#define DENOM_SQRT 10000 +#define DENOM_STQRT 10000 // Convert relative to absolute numbers. Care must be taken not to overflow integers. #define REL_TO_ABS(n,m) \ - ((((n) / DENOM_SQRT) * (m) + ((n) % DENOM_SQRT) * (m) / DENOM_SQRT) / DENOM_SQRT) + ((((n) / DENOM_STQRT) * (m) + ((n) % DENOM_STQRT) * (m) / DENOM_STQRT) / DENOM_STQRT) -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qstringlist.h> +#include <tqimage.h> +#include <tqstringlist.h> // KDE includes. @@ -56,8 +56,8 @@ namespace DigikamHotPixelsImagesPlugin { -BlackFrameParser::BlackFrameParser(QObject *parent) - : QObject(parent) +BlackFrameParser::BlackFrameParser(TQObject *tqparent) + : TQObject(tqparent) { m_imageLoaderThread = 0; } @@ -67,7 +67,7 @@ BlackFrameParser::~BlackFrameParser() delete m_imageLoaderThread; } -void BlackFrameParser::parseHotPixels(const QString &file) +void BlackFrameParser::parseHotPixels(const TQString &file) { parseBlackFrame(KURL(file)); } @@ -84,11 +84,11 @@ void BlackFrameParser::parseBlackFrame(const KURL &url) { m_imageLoaderThread = new LoadSaveThread(); - connect(m_imageLoaderThread, SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), - this, SLOT(slotLoadingProgress(const LoadingDescription&, float))); + connect(m_imageLoaderThread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), + this, TQT_SLOT(slotLoadingProgress(const LoadingDescription&, float))); - connect(m_imageLoaderThread, SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), - this, SLOT(slotLoadImageFromUrlComplete(const LoadingDescription&, const DImg&))); + connect(m_imageLoaderThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), + this, TQT_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription&, const DImg&))); } LoadingDescription desc = LoadingDescription(m_localFile, DRawDecoding()); @@ -103,12 +103,12 @@ void BlackFrameParser::slotLoadingProgress(const LoadingDescription&, float v) void BlackFrameParser::slotLoadImageFromUrlComplete(const LoadingDescription&, const DImg& img) { DImg image(img); - m_Image = image.copyQImage(); + m_Image = image.copyTQImage(); blackFrameParsing(); emit signalLoadingComplete(); } -void BlackFrameParser::parseBlackFrame(QImage& img) +void BlackFrameParser::parseBlackFrame(TQImage& img) { m_Image = img; blackFrameParsing(); @@ -119,15 +119,15 @@ void BlackFrameParser::parseBlackFrame(QImage& img) void BlackFrameParser::blackFrameParsing() { // Now find the hot pixels and store them in a list - QValueList<HotPixel> hpList; + TQValueList<HotPixel> hpList; for (int y=0 ; y < m_Image.height() ; ++y) { for (int x=0 ; x < m_Image.width() ; ++x) { //Get each point in the image - QRgb pixrgb = m_Image.pixel(x,y); - QColor color; color.setRgb(pixrgb); + TQRgb pixrgb = m_Image.pixel(x,y); + TQColor color; color.setRgb(pixrgb); // Find maximum component value. int maxValue; @@ -140,7 +140,7 @@ void BlackFrameParser::blackFrameParsing() if (maxValue > threshold_value) { HotPixel point; - point.rect = QRect (x, y, 1, 1); + point.rect = TQRect (x, y, 1, 1); //TODO:check this point.luminosity = ((2 * DENOM) / 255 ) * maxValue / 2; @@ -158,14 +158,14 @@ void BlackFrameParser::blackFrameParsing() // Consolidate adjacent points into larger points. -void BlackFrameParser::consolidatePixels (QValueList<HotPixel>& list) +void BlackFrameParser::consolidatePixels (TQValueList<HotPixel>& list) { if (list.isEmpty()) return; /* Consolidate horizontally. */ - QValueList<HotPixel>::iterator it, prevPointIt; + TQValueList<HotPixel>::iterator it, prevPointIt; prevPointIt = list.begin(); it = list.begin(); @@ -174,7 +174,7 @@ void BlackFrameParser::consolidatePixels (QValueList<HotPixel>& list) HotPixel tmp; HotPixel point; HotPixel point_below; - QValueList<HotPixel>::iterator end(list.end()); + TQValueList<HotPixel>::iterator end(list.end()); for (; it != end; ++it ) { while (1) @@ -182,8 +182,8 @@ void BlackFrameParser::consolidatePixels (QValueList<HotPixel>& list) point = (*it); tmp = point; - QValueList<HotPixel>::Iterator point_below_it; - point_below_it = list.find (tmp); //find any intersecting hotp below tmp + TQValueList<HotPixel>::Iterator point_below_it; + point_below_it = list.tqfind (tmp); //find any intersecting hotp below tmp if (point_below_it != list.end()) { point_below =* point_below_it; diff --git a/digikam/imageplugins/hotpixels/blackframeparser.h b/digikam/imageplugins/hotpixels/blackframeparser.h index 4a3e78a..ea23368 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.h +++ b/digikam/imageplugins/hotpixels/blackframeparser.h @@ -32,13 +32,13 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qobject.h> -#include <qvaluelist.h> -#include <qstring.h> -#include <qrect.h> +#include <tqimage.h> +#include <tqobject.h> +#include <tqvaluelist.h> +#include <tqstring.h> +#include <tqrect.h> // KDE includes. @@ -55,23 +55,24 @@ using namespace Digikam; namespace DigikamHotPixelsImagesPlugin { -class BlackFrameParser: public QObject +class BlackFrameParser: public TQObject { Q_OBJECT + TQ_OBJECT public: - BlackFrameParser(QObject *parent); + BlackFrameParser(TQObject *tqparent); ~BlackFrameParser(); - void parseHotPixels(const QString &file); + void parseHotPixels(const TQString &file); void parseBlackFrame(const KURL &url); - void parseBlackFrame(QImage& img); - QImage image(){return m_Image;} + void parseBlackFrame(TQImage& img); + TQImage image(){return m_Image;} signals: - void parsed(QValueList<HotPixel>); + void parsed(TQValueList<HotPixel>); void signalLoadingProgress(float); void signalLoadingComplete(); @@ -83,15 +84,15 @@ private slots: private: void blackFrameParsing(); - void consolidatePixels(QValueList<HotPixel>& list); + void consolidatePixels(TQValueList<HotPixel>& list); void validateAndConsolidate(HotPixel *a, HotPixel *b); private: - QString m_OutputString; - QString m_localFile; + TQString m_OutputString; + TQString m_localFile; - QImage m_Image; + TQImage m_Image; LoadSaveThread *m_imageLoaderThread; }; diff --git a/digikam/imageplugins/hotpixels/hotpixel.h b/digikam/imageplugins/hotpixels/hotpixel.h index b8bc650..bceb539 100644 --- a/digikam/imageplugins/hotpixels/hotpixel.h +++ b/digikam/imageplugins/hotpixels/hotpixel.h @@ -25,9 +25,9 @@ #ifndef HOTPIXEL_H #define HOTPIXEL_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> namespace DigikamHotPixelsImagesPlugin { @@ -37,7 +37,7 @@ class HotPixel public: - QRect rect; + TQRect rect; int luminosity; int y() const {return rect.y(); }; int x() const {return rect.x(); }; @@ -56,7 +56,7 @@ public: private: - bool diagonal(QRect r1,QRect r2) const + bool diagonal(TQRect r1,TQRect r2) const { //locate next-to positions diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp index 58a1fb6..190e094 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp @@ -27,11 +27,11 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qregexp.h> -#include <qstringlist.h> +#include <tqcolor.h> +#include <tqregexp.h> +#include <tqstringlist.h> // Local includes. @@ -55,9 +55,9 @@ namespace DigikamHotPixelsImagesPlugin { -HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, QObject *parent, const QValueList<HotPixel>& hpList, +HotPixelFixer::HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent, const TQValueList<HotPixel>& hpList, int interpolationMethod) - : Digikam::DImgThreadedFilter(orgImage, parent, "HotPixels") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "HotPixels") { m_hpList = hpList; m_interpolationMethod = interpolationMethod; @@ -72,8 +72,8 @@ HotPixelFixer::~HotPixelFixer() void HotPixelFixer::filterImage(void) { - QValueList <HotPixel>::ConstIterator it; - QValueList <HotPixel>::ConstIterator end(m_hpList.end()); + TQValueList <HotPixel>::ConstIterator it; + TQValueList <HotPixel>::ConstIterator end(m_hpList.end()); for (it = m_hpList.begin() ; it != end ; ++it) { HotPixel hp = *it; @@ -107,7 +107,7 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) for (x = xPos; x < xPos+hp.width(); ++x) { - if (validPoint(img,QPoint(x,yPos-1))) + if (validPoint(img,TQPoint(x,yPos-1))) { col=img.getPixelColor(x,yPos-1); vr += col.red(); @@ -115,7 +115,7 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) vb += col.blue(); ++sum_weight; } - if (validPoint(img,QPoint(x,yPos+hp.height()))) + if (validPoint(img,TQPoint(x,yPos+hp.height()))) { col=img.getPixelColor(x,yPos+hp.height()); vr += col.red(); @@ -127,7 +127,7 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) for (y = yPos; y < hp.height(); ++y) { - if (validPoint(img,QPoint(xPos-1,y))) + if (validPoint(img,TQPoint(xPos-1,y))) { col=img.getPixelColor(xPos,y); vr += col.red(); @@ -135,7 +135,7 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) vb += col.blue(); ++sum_weight; } - if (validPoint(img,QPoint(xPos+hp.width(),y))) + if (validPoint(img,TQPoint(xPos+hp.width(),y))) { col=img.getPixelColor(xPos+hp.width(),y); vr += col.red(); @@ -154,7 +154,7 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) for (x = 0; x < hp.width(); ++x) for (y = 0; y < hp.height(); ++y) - if (validPoint(img,QPoint(xPos+x,yPos+y))) + if (validPoint(img,TQPoint(xPos+x,yPos+y))) { int alpha=sixtBits ? 65535 : 255; int ir=(int )round(vr),ig=(int) round(vg),ib=(int) round(vb); @@ -169,9 +169,9 @@ void HotPixelFixer::interpolate (Digikam::DImg &img, HotPixel &hp, int method) weightPixels (img,hp,LINEAR_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535: 255); break; - case QUADRATIC_INTERPOLATION: + case TQUADRATIC_INTERPOLATION: // (Bi)quadratic interpolation. - weightPixels (img,hp,QUADRATIC_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535 : 255); + weightPixels (img,hp,TQUADRATIC_INTERPOLATION,TWODIM_DIRECTION,sixtBits ? 65535 : 255); break; case CUBIC_INTERPOLATION: @@ -199,7 +199,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, case LINEAR_INTERPOLATION: polynomeOrder=1; break; - case QUADRATIC_INTERPOLATION: + case TQUADRATIC_INTERPOLATION: polynomeOrder=2; break; case CUBIC_INTERPOLATION: @@ -220,7 +220,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, //for now I don't think it is finding the duplicates fine, so it uses //the previous one always... - //if (mWeightList.find(w)==mWeightList.end()) + //if (mWeightList.tqfind(w)==mWeightList.end()) //{ w.calculateWeights(); @@ -233,7 +233,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, { for (int x = 0; x < px.width(); ++x) { - if (validPoint (img,QPoint(px.x()+x,px.y()+y))) + if (validPoint (img,TQPoint(px.x()+x,px.y()+y))) { double sum_weight = 0.0, v = 0.0; size_t i; @@ -246,7 +246,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, const int yy = px.y()+(dir == HORIZONTAL_DIRECTION ? y : w.positions()[i].y()); - if (validPoint (img,QPoint(xx, yy))) + if (validPoint (img,TQPoint(xx, yy))) { //TODO: check this. I think it is broken double weight; diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.h b/digikam/imageplugins/hotpixels/hotpixelfixer.h index 159ea15..032d66b 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.h +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.h @@ -26,13 +26,13 @@ #ifndef HOTPIXELFIXER_H #define HOTPIXELFIXER_H -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qobject.h> -#include <qvaluelist.h> -#include <qrect.h> -#include <qstring.h> +#include <tqimage.h> +#include <tqobject.h> +#include <tqvaluelist.h> +#include <tqrect.h> +#include <tqstring.h> // Digikam includes. @@ -55,7 +55,7 @@ public: { AVERAGE_INTERPOLATION = 0, LINEAR_INTERPOLATION = 1, - QUADRATIC_INTERPOLATION = 2, + TQUADRATIC_INTERPOLATION = 2, CUBIC_INTERPOLATION = 3 }; @@ -68,8 +68,8 @@ public: public: - HotPixelFixer(Digikam::DImg *orgImage, QObject *parent, - const QValueList<HotPixel>& hpList, int interpolationMethod); + HotPixelFixer(Digikam::DImg *orgImage, TQObject *tqparent, + const TQValueList<HotPixel>& hpList, int interpolationMethod); ~HotPixelFixer(); private: @@ -79,18 +79,18 @@ private: void interpolate (Digikam::DImg &img,HotPixel &hp, int method); void weightPixels (Digikam::DImg &img, HotPixel &px, int method, Direction dir, int maxComponent); - inline bool validPoint(Digikam::DImg &img, QPoint p) + inline bool validPoint(Digikam::DImg &img, TQPoint p) { return (p.x()>=0 && p.y()>=0 && p.x()<(long) img.width() && p.y()<(long) img.height()); }; - QValueList <Weights> mWeightList; + TQValueList <Weights> mWeightList; private: int m_interpolationMethod; - QValueList<HotPixel> m_hpList; + TQValueList<HotPixel> m_hpList; }; } // NameSpace DigikamHotPixelsImagesPlugin diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 105b6e7..43d30d7 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -23,14 +23,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qpointarray.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqpointarray.h> // KDE includes. @@ -69,8 +69,8 @@ using namespace Digikam; namespace DigikamHotPixelsImagesPlugin { -HotPixelsTool::HotPixelsTool(QObject* parent) - : EditorToolThreaded(parent) +HotPixelsTool::HotPixelsTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("hotpixels"); setToolName(i18n("Hot Pixels")); @@ -83,18 +83,18 @@ HotPixelsTool::HotPixelsTool(QObject* parent) EditorToolSettings::Cancel, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 3, 2); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 2); - QLabel *filterMethodLabel = new QLabel(i18n("Filter:"), m_gboxSettings->plainPage()); + TQLabel *filterMethodLabel = new TQLabel(i18n("Filter:"), m_gboxSettings->plainPage()); m_filterMethodCombo = new RComboBox(m_gboxSettings->plainPage()); m_filterMethodCombo->insertItem(i18n("Average")); m_filterMethodCombo->insertItem(i18n("Linear")); m_filterMethodCombo->insertItem(i18n("Quadratic")); m_filterMethodCombo->insertItem(i18n("Cubic")); - m_filterMethodCombo->setDefaultItem(HotPixelFixer::QUADRATIC_INTERPOLATION); + m_filterMethodCombo->setDefaultItem(HotPixelFixer::TQUADRATIC_INTERPOLATION); - m_blackFrameButton = new QPushButton(i18n("Black Frame..."), m_gboxSettings->plainPage()); - QWhatsThis::add(m_blackFrameButton, i18n("<p>Use this button to " + m_blackFrameButton = new TQPushButton(i18n("Black Frame..."), m_gboxSettings->plainPage()); + TQWhatsThis::add(m_blackFrameButton, i18n("<p>Use this button to " "add a new black frame file which will be used by the hot pixels removal filter.")); m_blackFrameListView = new BlackFrameListView(m_gboxSettings->plainPage()); @@ -119,14 +119,14 @@ HotPixelsTool::HotPixelsTool(QObject* parent) // ------------------------------------------------------------- - connect(m_filterMethodCombo, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_filterMethodCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); - connect(m_blackFrameButton, SIGNAL(clicked()), - this, SLOT(slotAddBlackFrame())); + connect(m_blackFrameButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddBlackFrame())); - connect(m_blackFrameListView, SIGNAL(blackFrameSelected(QValueList<HotPixel>, const KURL&)), - this, SLOT(slotBlackFrame(QValueList<HotPixel>, const KURL&))); + connect(m_blackFrameListView, TQT_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), + this, TQT_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); } HotPixelsTool::~HotPixelsTool() @@ -137,7 +137,7 @@ void HotPixelsTool::readSettings() { KConfig *config = kapp->config(); config->setGroup("hotpixels Tool"); - m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", QString())); + m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", m_filterMethodCombo->defaultItem())); @@ -146,11 +146,11 @@ void HotPixelsTool::readSettings() EditorToolIface::editorToolIface()->setToolStartProgress(i18n("Loading: ")); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, SIGNAL(signalLoadingProgress(float)), - this, SLOT(slotLoadingProgress(float))); + connect(item, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SLOT(slotLoadingProgress(float))); - connect(item, SIGNAL(signalLoadingComplete()), - this, SLOT(slotLoadingComplete())); + connect(item, TQT_SIGNAL(signalLoadingComplete()), + this, TQT_SLOT(slotLoadingComplete())); } } @@ -193,11 +193,11 @@ void HotPixelsTool::slotAddBlackFrame() m_blackFrameListView->clear(); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, SIGNAL(signalLoadingProgress(float)), - this, SLOT(slotLoadingProgress(float))); + connect(item, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SLOT(slotLoadingProgress(float))); - connect(item, SIGNAL(signalLoadingComplete()), - this, SLOT(slotLoadingComplete())); + connect(item, TQT_SIGNAL(signalLoadingComplete()), + this, TQT_SLOT(slotLoadingComplete())); } } @@ -215,17 +215,17 @@ void HotPixelsTool::prepareEffect() DImg image = m_previewWidget->getOriginalRegionImage(); int interpolationMethod = m_filterMethodCombo->currentItem(); - QValueList<HotPixel> hotPixelsRegion; - QRect area = m_previewWidget->getOriginalImageRegionToRender(); - QValueList<HotPixel>::Iterator end(m_hotPixelsList.end()); + TQValueList<HotPixel> hotPixelsRegion; + TQRect area = m_previewWidget->getOriginalImageRegionToRender(); + TQValueList<HotPixel>::Iterator end(m_hotPixelsList.end()); - for (QValueList<HotPixel>::Iterator it = m_hotPixelsList.begin() ; it != end ; ++it ) + for (TQValueList<HotPixel>::Iterator it = m_hotPixelsList.begin() ; it != end ; ++it ) { HotPixel hp = (*it); - if ( area.contains( hp.rect ) ) + if ( area.tqcontains( hp.rect ) ) { - hp.rect.moveTopLeft(QPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); + hp.rect.moveTopLeft(TQPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); hotPixelsRegion.append(hp); } } @@ -255,15 +255,15 @@ void HotPixelsTool::putFinalData() iface.putOriginalImage(i18n("Hot Pixels Correction"), filter()->getTargetImage().bits()); } -void HotPixelsTool::slotBlackFrame(QValueList<HotPixel> hpList, const KURL& blackFrameURL) +void HotPixelsTool::slotBlackFrame(TQValueList<HotPixel> hpList, const KURL& blackFrameURL) { m_blackFrameURL = blackFrameURL; m_hotPixelsList = hpList; - QPointArray pointList(m_hotPixelsList.size()); - QValueList <HotPixel>::Iterator it; + TQPointArray pointList(m_hotPixelsList.size()); + TQValueList <HotPixel>::Iterator it; int i = 0; - QValueList <HotPixel>::Iterator end(m_hotPixelsList.end()); + TQValueList <HotPixel>::Iterator end(m_hotPixelsList.end()); for (it = m_hotPixelsList.begin() ; it != end ; ++it, i++) pointList.setPoint(i, (*it).rect.center()); diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.h b/digikam/imageplugins/hotpixels/hotpixelstool.h index 07d5479..f0497ad 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.h +++ b/digikam/imageplugins/hotpixels/hotpixelstool.h @@ -28,9 +28,9 @@ #define MAX_PIXEL_DEPTH 4 -// Qt includes. +// TQt includes. -#include <qvaluelist.h> +#include <tqvaluelist.h> // KDE includes. @@ -44,7 +44,7 @@ #include "hotpixelfixer.h" -class QPushButton; +class TQPushButton; namespace KDcrawIface { @@ -65,15 +65,16 @@ class BlackFrameListView; class HotPixelsTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - HotPixelsTool(QObject *parent); + HotPixelsTool(TQObject *tqparent); ~HotPixelsTool(); private slots: - void slotBlackFrame(QValueList<HotPixel> hpList, const KURL& blackFrameURL); + void slotBlackFrame(TQValueList<HotPixel> hpList, const KURL& blackFrameURL); void slotResetSettings(); void slotAddBlackFrame(); void slotLoadingProgress(float); @@ -92,9 +93,9 @@ private: private: - QPushButton *m_blackFrameButton; + TQPushButton *m_blackFrameButton; - QValueList<HotPixel> m_hotPixelsList; + TQValueList<HotPixel> m_hotPixelsList; KURL m_blackFrameURL; diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 81f7a5b..85b1584 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -23,14 +23,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qpointarray.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqpointarray.h> // KDE includes. @@ -58,15 +58,15 @@ namespace DigikamHotPixelsImagesPlugin { -ImageEffect_HotPixels::ImageEffect_HotPixels(QWidget* parent) - : CtrlPanelDlg(parent, i18n("Hot Pixels Correction"), +ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* tqparent) + : CtrlPanelDlg(tqparent, i18n("Hot Pixels Correction"), "hotpixels", false, false, false, Digikam::ImagePannelWidget::SeparateViewDuplicate) { // No need Abort button action. showButton(User1, false); - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Hot Pixels Correction"), @@ -88,17 +88,17 @@ ImageEffect_HotPixels::ImageEffect_HotPixels(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout(gboxSettings, 3, 2, 0, spacingHint()); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 3, 2, 0, spacingHint()); - QLabel *filterMethodLabel = new QLabel(i18n("Filter:"), gboxSettings); - m_filterMethodCombo = new QComboBox(gboxSettings); + TQLabel *filterMethodLabel = new TQLabel(i18n("Filter:"), gboxSettings); + m_filterMethodCombo = new TQComboBox(gboxSettings); m_filterMethodCombo->insertItem(i18n("Average")); m_filterMethodCombo->insertItem(i18n("Linear")); m_filterMethodCombo->insertItem(i18n("Quadratic")); m_filterMethodCombo->insertItem(i18n("Cubic")); - m_blackFrameButton = new QPushButton(i18n("Black Frame..."), gboxSettings); + m_blackFrameButton = new TQPushButton(i18n("Black Frame..."), gboxSettings); setButtonWhatsThis( Apply, i18n("<p>Use this button to add a new black frame file which will " "be used by the hot pixels removal filter.") ); @@ -117,14 +117,14 @@ ImageEffect_HotPixels::ImageEffect_HotPixels(QWidget* parent) // ------------------------------------------------------------- - connect(m_filterMethodCombo, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_filterMethodCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); - connect(m_blackFrameButton, SIGNAL(clicked()), - this, SLOT(slotAddBlackFrame())); + connect(m_blackFrameButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddBlackFrame())); - connect(m_blackFrameListView, SIGNAL(blackFrameSelected(QValueList<HotPixel>, const KURL&)), - this, SLOT(slotBlackFrame(QValueList<HotPixel>, const KURL&))); + connect(m_blackFrameListView, TQT_SIGNAL(blackFrameSelected(TQValueList<HotPixel>, const KURL&)), + this, TQT_SLOT(slotBlackFrame(TQValueList<HotPixel>, const KURL&))); } ImageEffect_HotPixels::~ImageEffect_HotPixels() @@ -135,19 +135,19 @@ void ImageEffect_HotPixels::readUserSettings() { KConfig *config = kapp->config(); config->setGroup("hotpixels Tool Dialog"); - m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", QString())); + m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString())); m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method", - HotPixelFixer::QUADRATIC_INTERPOLATION)); + HotPixelFixer::TQUADRATIC_INTERPOLATION)); if (m_blackFrameURL.isValid()) { BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, SIGNAL(signalLoadingProgress(float)), - this, SLOT(slotLoadingProgress(float))); + connect(item, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SLOT(slotLoadingProgress(float))); - connect(item, SIGNAL(signalLoadingComplete()), - this, SLOT(slotLoadingComplete())); + connect(item, TQT_SIGNAL(signalLoadingComplete()), + this, TQT_SLOT(slotLoadingComplete())); } } @@ -163,7 +163,7 @@ void ImageEffect_HotPixels::writeUserSettings() void ImageEffect_HotPixels::resetValues() { m_filterMethodCombo->blockSignals(true); - m_filterMethodCombo->setCurrentItem(HotPixelFixer::QUADRATIC_INTERPOLATION); + m_filterMethodCombo->setCurrentItem(HotPixelFixer::TQUADRATIC_INTERPOLATION); m_filterMethodCombo->blockSignals(false); } @@ -180,11 +180,11 @@ void ImageEffect_HotPixels::slotAddBlackFrame() m_blackFrameListView->clear(); BlackFrameListViewItem *item = new BlackFrameListViewItem(m_blackFrameListView, m_blackFrameURL); - connect(item, SIGNAL(signalLoadingProgress(float)), - this, SLOT(slotLoadingProgress(float))); + connect(item, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SLOT(slotLoadingProgress(float))); - connect(item, SIGNAL(signalLoadingComplete()), - this, SLOT(slotLoadingComplete())); + connect(item, TQT_SIGNAL(signalLoadingComplete()), + this, TQT_SLOT(slotLoadingComplete())); } } @@ -215,17 +215,17 @@ void ImageEffect_HotPixels::prepareEffect() Digikam::DImg image = m_imagePreviewWidget->getOriginalRegionImage(); int interpolationMethod = m_filterMethodCombo->currentItem(); - QValueList<HotPixel> hotPixelsRegion; - QRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); - QValueList<HotPixel>::Iterator end(m_hotPixelsList.end()); + TQValueList<HotPixel> hotPixelsRegion; + TQRect area = m_imagePreviewWidget->getOriginalImageRegionToRender(); + TQValueList<HotPixel>::Iterator end(m_hotPixelsList.end()); - for (QValueList<HotPixel>::Iterator it = m_hotPixelsList.begin() ; it != end ; ++it ) + for (TQValueList<HotPixel>::Iterator it = m_hotPixelsList.begin() ; it != end ; ++it ) { HotPixel hp = (*it); - if ( area.contains( hp.rect ) ) + if ( area.tqcontains( hp.rect ) ) { - hp.rect.moveTopLeft(QPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); + hp.rect.moveTopLeft(TQPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); hotPixelsRegion.append(hp); } } @@ -258,15 +258,15 @@ void ImageEffect_HotPixels::putFinalData() iface.putOriginalImage(i18n("Hot Pixels Correction"), m_threadedFilter->getTargetImage().bits()); } -void ImageEffect_HotPixels::slotBlackFrame(QValueList<HotPixel> hpList, const KURL& blackFrameURL) +void ImageEffect_HotPixels::slotBlackFrame(TQValueList<HotPixel> hpList, const KURL& blackFrameURL) { m_blackFrameURL = blackFrameURL; m_hotPixelsList = hpList; - QPointArray pointList(m_hotPixelsList.size()); - QValueList <HotPixel>::Iterator it; + TQPointArray pointList(m_hotPixelsList.size()); + TQValueList <HotPixel>::Iterator it; int i = 0; - QValueList <HotPixel>::Iterator end(m_hotPixelsList.end()); + TQValueList <HotPixel>::Iterator end(m_hotPixelsList.end()); for (it = m_hotPixelsList.begin() ; it != end ; ++it, i++) pointList.setPoint(i, (*it).rect.center()); diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h index 1fcb2a0..c2cd33d 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.h @@ -28,9 +28,9 @@ #define MAX_PIXEL_DEPTH 4 -// Qt includes. +// TQt includes. -#include <qvaluelist.h> +#include <tqvaluelist.h> // KDE includes. @@ -44,8 +44,8 @@ #include "hotpixelfixer.h" -class QComboBox; -class QPushButton; +class TQComboBox; +class TQPushButton; class KProgress; @@ -57,10 +57,11 @@ class BlackFrameListView; class ImageEffect_HotPixels : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_HotPixels(QWidget *parent); + ImageEffect_HotPixels(TQWidget *tqparent); ~ImageEffect_HotPixels(); private slots: @@ -68,7 +69,7 @@ private slots: void slotLoadingProgress(float v); void slotLoadingComplete(); - void slotBlackFrame(QValueList<HotPixel> hpList, const KURL& blackFrameURL); + void slotBlackFrame(TQValueList<HotPixel> hpList, const KURL& blackFrameURL); void slotAddBlackFrame(); void readUserSettings(); @@ -85,11 +86,11 @@ private: private: - QComboBox *m_filterMethodCombo; + TQComboBox *m_filterMethodCombo; - QPushButton *m_blackFrameButton; + TQPushButton *m_blackFrameButton; - QValueList<HotPixel> m_hotPixelsList; + TQValueList<HotPixel> m_hotPixelsList; KURL m_blackFrameURL; diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp index d1bc155..ee4d105 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp @@ -44,11 +44,11 @@ using namespace DigikamHotPixelsImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_hotpixels, KGenericFactory<ImagePlugin_HotPixels>("digikamimageplugin_hotpixels")); -ImagePlugin_HotPixels::ImagePlugin_HotPixels(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_HotPixels") +ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_HotPixels") { m_hotpixelsAction = new KAction(i18n("Hot Pixels..."), "hotpixels", 0, - this, SLOT(slotHotPixels()), + this, TQT_SLOT(slotHotPixels()), actionCollection(), "imageplugin_hotpixels"); setXMLFile("digikamimageplugin_hotpixels_ui.rc"); diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h index 5b370c3..206429b 100644 --- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h +++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h @@ -34,11 +34,12 @@ class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_HotPixels : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_HotPixels(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_HotPixels(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_HotPixels(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/hotpixels/weights.cpp b/digikam/imageplugins/hotpixels/weights.cpp index 724f9fa..e0d3f24 100644 --- a/digikam/imageplugins/hotpixels/weights.cpp +++ b/digikam/imageplugins/hotpixels/weights.cpp @@ -101,7 +101,7 @@ void Weights::calculateWeights() || (x < 0 && y >= 0 && y < iHeight) || (x >= iWidth && y >= 0 && y < iHeight) || (y < 0 && x >= 0 && x < iWidth ) || (y >= iHeight && x >= 0 && x < iWidth)) { - QPoint position(x,y); + TQPoint position(x,y); mPositions.append(position); } } @@ -113,13 +113,13 @@ void Weights::calculateWeights() for (y = -mPolynomeOrder; y < 0; ++y) { - QPoint position(0,y); + TQPoint position(0,y); mPositions.append(position); } for (y = (int) height(); y < (int) height() + (int) mPolynomeOrder; ++y) { - QPoint position(0,y); + TQPoint position(0,y); mPositions.append(position); } } diff --git a/digikam/imageplugins/hotpixels/weights.h b/digikam/imageplugins/hotpixels/weights.h index 7d12b5a..b82fde8 100644 --- a/digikam/imageplugins/hotpixels/weights.h +++ b/digikam/imageplugins/hotpixels/weights.h @@ -24,10 +24,10 @@ #ifndef WEIGHTS_H #define WEIGHTS_H -// Qt includes. +// TQt includes. -#include <qrect.h> -#include <qvaluelist.h> +#include <tqrect.h> +#include <tqvaluelist.h> namespace DigikamHotPixelsImagesPlugin { @@ -62,7 +62,7 @@ public: void calculateWeights(); bool operator==(const Weights& ws) const; double** operator[](int n) const { return mWeightMatrices[n]; }; - const QValueList <QPoint> positions() const { return mPositions; }; + const TQValueList <TQPoint> positions() const { return mPositions; }; protected: @@ -82,7 +82,7 @@ private: bool mTwoDim; unsigned int mPolynomeOrder; double *** mWeightMatrices; //Stores a list of weight matrices - QValueList <QPoint> mPositions; + TQValueList <TQPoint> mPositions; }; } // NameSpace DigikamHotPixelsImagesPlugin diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp index 87b185f..32987e7 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp +++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp @@ -23,16 +23,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlcdnumber.h> -#include <qslider.h> -#include <qlayout.h> -#include <qdatetime.h> -#include <qcheckbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlcdnumber.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqdatetime.h> +#include <tqcheckbox.h> // KDE includes. @@ -57,12 +57,12 @@ namespace DigikamInfraredImagesPlugin { -ImageEffect_Infrared::ImageEffect_Infrared(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Simulate Infrared Film to Photograph"), +ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Simulate Infrared Film to Photograph"), "infrared", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Infrared Film"), @@ -84,18 +84,18 @@ ImageEffect_Infrared::ImageEffect_Infrared(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 2, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Sensitivity (ISO):"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint()); + TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), gboxSettings); - m_sensibilitySlider = new QSlider(1, 25, 1, 1, Qt::Horizontal, gboxSettings); + m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, gboxSettings); m_sensibilitySlider->setTracking ( false ); m_sensibilitySlider->setTickInterval(1); - m_sensibilitySlider->setTickmarks(QSlider::Below); + m_sensibilitySlider->setTickmarks(TQSlider::Below); - m_sensibilityLCDValue = new QLCDNumber (4, gboxSettings); - m_sensibilityLCDValue->setSegmentStyle ( QLCDNumber::Flat ); - m_sensibilityLCDValue->display( QString::number(200) ); + m_sensibilityLCDValue = new TQLCDNumber (4, gboxSettings); + m_sensibilityLCDValue->setSegmentStyle ( TQLCDNumber::Flat ); + m_sensibilityLCDValue->display( TQString::number(200) ); whatsThis = i18n("<p>Set here the ISO-sensitivity of the simulated infrared film. " "Increasing this value will increase the proportion of green color in the mix. " "It will also increase the halo effect on the hightlights, and the film " @@ -104,8 +104,8 @@ ImageEffect_Infrared::ImageEffect_Infrared(QWidget* parent) "A sensitivity over 800 simulates <b>Kodak HIE</b> high-speed infrared film. This last one creates a more " "dramatic photographic style.</p>"); - QWhatsThis::add( m_sensibilityLCDValue, whatsThis); - QWhatsThis::add( m_sensibilitySlider, whatsThis); + TQWhatsThis::add( m_sensibilityLCDValue, whatsThis); + TQWhatsThis::add( m_sensibilitySlider, whatsThis); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); gridSettings->addMultiCellWidget(m_sensibilitySlider, 1, 1, 0, 0); @@ -113,9 +113,9 @@ ImageEffect_Infrared::ImageEffect_Infrared(QWidget* parent) // ------------------------------------------------------------- - m_addFilmGrain = new QCheckBox( i18n("Add film grain"), gboxSettings); + m_addFilmGrain = new TQCheckBox( i18n("Add film grain"), gboxSettings); m_addFilmGrain->setChecked( true ); - QWhatsThis::add( m_addFilmGrain, i18n("<p>This option adds infrared film grain to " + TQWhatsThis::add( m_addFilmGrain, i18n("<p>This option adds infrared film grain to " "the image depending on ISO-sensitivity.")); gridSettings->addMultiCellWidget(m_addFilmGrain, 2, 2, 0, 1); @@ -123,19 +123,19 @@ ImageEffect_Infrared::ImageEffect_Infrared(QWidget* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, SIGNAL(sliderMoved(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_addFilmGrain, SIGNAL(toggled (bool)), - this, SLOT(slotEffect()) ); + connect( m_addFilmGrain, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect()) ); } ImageEffect_Infrared::~ImageEffect_Infrared() @@ -182,7 +182,7 @@ void ImageEffect_Infrared::resetValues() void ImageEffect_Infrared::slotSliderMoved(int v) { - m_sensibilityLCDValue->display( QString::number(100 + 100 * v) ); + m_sensibilityLCDValue->display( TQString::number(100 + 100 * v) ); } void ImageEffect_Infrared::prepareEffect() diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.h b/digikam/imageplugins/infrared/imageeffect_infrared.h index 38ad660..887a4e6 100644 --- a/digikam/imageplugins/infrared/imageeffect_infrared.h +++ b/digikam/imageplugins/infrared/imageeffect_infrared.h @@ -30,9 +30,9 @@ #include "ctrlpaneldlg.h" -class QSlider; -class QLCDNumber; -class QCheckBox; +class TQSlider; +class TQLCDNumber; +class TQCheckBox; namespace DigikamInfraredImagesPlugin { @@ -40,10 +40,11 @@ namespace DigikamInfraredImagesPlugin class ImageEffect_Infrared : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Infrared(QWidget* parent); + ImageEffect_Infrared(TQWidget* tqparent); ~ImageEffect_Infrared(); private slots: @@ -63,11 +64,11 @@ private: private: - QCheckBox *m_addFilmGrain; + TQCheckBox *m_addFilmGrain; - QSlider *m_sensibilitySlider; + TQSlider *m_sensibilitySlider; - QLCDNumber *m_sensibilityLCDValue; + TQLCDNumber *m_sensibilityLCDValue; }; } // NameSpace DigikamInfraredImagesPlugin diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp index 7389ca2..a7e4593 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp +++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp @@ -43,11 +43,11 @@ using namespace DigikamInfraredImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_infrared, KGenericFactory<ImagePlugin_Infrared>("digikamimageplugin_infrared")); -ImagePlugin_Infrared::ImagePlugin_Infrared(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Infrared") +ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Infrared") { m_infraredAction = new KAction(i18n("Infrared Film..."), "infrared", 0, - this, SLOT(slotInfrared()), + this, TQT_SLOT(slotInfrared()), actionCollection(), "imageplugin_infrared"); setXMLFile( "digikamimageplugin_infrared_ui.rc" ); diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.h b/digikam/imageplugins/infrared/imageplugin_infrared.h index 9193876..5e8111f 100644 --- a/digikam/imageplugins/infrared/imageplugin_infrared.h +++ b/digikam/imageplugins/infrared/imageplugin_infrared.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Infrared : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Infrared(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Infrared(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Infrared(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/infrared/infrared.cpp b/digikam/imageplugins/infrared/infrared.cpp index dcf4c2f..f0e361b 100644 --- a/digikam/imageplugins/infrared/infrared.cpp +++ b/digikam/imageplugins/infrared/infrared.cpp @@ -27,9 +27,9 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qdatetime.h> +#include <tqdatetime.h> // Local includes. @@ -44,8 +44,8 @@ namespace DigikamInfraredImagesPlugin { -Infrared::Infrared(Digikam::DImg *orgImage, QObject *parent, int sensibility, bool grain) - : Digikam::DImgThreadedFilter(orgImage, parent, "Infrared") +Infrared::Infrared(Digikam::DImg *orgImage, TQObject *tqparent, int sensibility, bool grain) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Infrared") { m_sensibility = sensibility; m_grain = grain; @@ -110,11 +110,11 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai uchar* pBWBits = 0; // Black and White conversion. uchar* pBWBlurBits = 0; // Black and White with blur. uchar* pGrainBits = 0; // Grain blured without curves adjustment. - uchar* pMaskBits = 0; // Grain mask with curves adjustment. + uchar* pMaskBits = 0; // Grain tqmask with curves adjustment. uchar* pOverlayBits = 0; // Overlay to merge with original converted in gray scale. - uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain mask and original. + uchar* pOutBits = m_destImage.bits(); // Destination image with merged grain tqmask and original. - Digikam::DColor bwData, bwBlurData, grainData, maskData, overData, outData; + Digikam::DColor bwData, bwBlurData, grainData, tqmaskData, overData, outData; //------------------------------------------ // 1 - Create GrayScale green boosted image. @@ -153,17 +153,17 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai } //----------------------------------------------------------------- - // 2 - Create Gaussian blured averlay mask with grain if necessary. + // 2 - Create Gaussian blured averlay tqmask with grain if necessary. //----------------------------------------------------------------- if (Grain) { - // Create gray grain mask. + // Create gray grain tqmask. - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = ((uint) dt.secsTo(Y2000)); pGrainBits = new uchar[numBytes]; // Grain blured without curves adjustment. @@ -198,7 +198,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai postProgress( progress ); } - // Smooth grain mask using gaussian blur. + // Smooth grain tqmask using gaussian blur. Digikam::DImgImageFilters().gaussianBlurImage(pGrainBits, Width, Height, sixteenBit, 1); @@ -223,20 +223,20 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai if (Grain) { Digikam::ImageCurves *grainCurves = new Digikam::ImageCurves(sixteenBit); - pMaskBits = new uchar[numBytes]; // Grain mask with curves adjustment. + pMaskBits = new uchar[numBytes]; // Grain tqmask with curves adjustment. // We modify only global luminosity of the grain. if (sixteenBit) { - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, QPoint(32768, 32768)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(65535, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, TQPoint(32768, 32768)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(65535, 0)); } else { - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, QPoint(0, 0)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, QPoint(128, 128)); - grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, QPoint(255, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 0, TQPoint(0, 0)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 8, TQPoint(128, 128)); + grainCurves->setCurvePoint(Digikam::ImageHistogram::ValueChannel, 16, TQPoint(255, 0)); } // Calculate curves and lut to apply on grain. @@ -268,7 +268,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffNone); int alpha; - int Shade = 52; // This value control the shading pixel effect between original image and grain mask. + int Shade = 52; // This value control the shading pixel effect between original image and grain tqmask. if (sixteenBit) Shade = (Shade + 1) * 256 - 1; @@ -280,15 +280,15 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai // read color from orig image bwBlurData.setColor(pBWBlurBits + offset, sixteenBit); - // read color from mask - maskData.setColor(pMaskBits + offset, sixteenBit); + // read color from tqmask + tqmaskData.setColor(pMaskBits + offset, sixteenBit); // set shade as alpha value - it will be used as source alpha when blending - maskData.setAlpha(Shade); + tqmaskData.setAlpha(Shade); // compose, write result to blendData. // Preserve alpha, do not blend it (taken from old algorithm - correct?) alpha = bwBlurData.alpha(); - composer->compose(bwBlurData, maskData); + composer->compose(bwBlurData, tqmaskData); bwBlurData.setAlpha(alpha); // write to destination @@ -317,7 +317,7 @@ void Infrared::infraredImage(Digikam::DImg *orgImage, int Sensibility, bool Grai } //------------------------------------------ - // 3 - Merge Grayscale image & overlay mask. + // 3 - Merge Grayscale image & overlay tqmask. //------------------------------------------ // Merge overlay and gray scale image using 'Overlay' Gimp method for increase the highlight. diff --git a/digikam/imageplugins/infrared/infrared.h b/digikam/imageplugins/infrared/infrared.h index b43b7c7..ec9fb6f 100644 --- a/digikam/imageplugins/infrared/infrared.h +++ b/digikam/imageplugins/infrared/infrared.h @@ -37,7 +37,7 @@ class Infrared : public Digikam::DImgThreadedFilter public: - Infrared(Digikam::DImg *orgImage, QObject *parent=0, int sensibility=1, bool grain=true); + Infrared(Digikam::DImg *orgImage, TQObject *tqparent=0, int sensibility=1, bool grain=true); ~Infrared(){}; diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp index 82b8e20..9969d24 100644 --- a/digikam/imageplugins/infrared/infraredtool.cpp +++ b/digikam/imageplugins/infrared/infraredtool.cpp @@ -23,16 +23,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlcdnumber.h> -#include <qslider.h> -#include <qlayout.h> -#include <qdatetime.h> -#include <qcheckbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlcdnumber.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqdatetime.h> +#include <tqcheckbox.h> // KDE includes. @@ -60,8 +60,8 @@ using namespace Digikam; namespace DigikamInfraredImagesPlugin { -InfraredTool::InfraredTool(QObject* parent) - : EditorToolThreaded(parent) +InfraredTool::InfraredTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("infrared"); setToolName(i18n("Infrared")); @@ -75,18 +75,18 @@ InfraredTool::InfraredTool(QObject* parent) EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 3, 1); - QLabel *label1 = new QLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 3, 1); + TQLabel *label1 = new TQLabel(i18n("Sensitivity (ISO):"), m_gboxSettings->plainPage()); - m_sensibilitySlider = new QSlider(1, 25, 1, 1, Qt::Horizontal, m_gboxSettings->plainPage()); + m_sensibilitySlider = new TQSlider(1, 25, 1, 1, Qt::Horizontal, m_gboxSettings->plainPage()); m_sensibilitySlider->setTracking(false); m_sensibilitySlider->setTickInterval(1); - m_sensibilitySlider->setTickmarks(QSlider::Below); + m_sensibilitySlider->setTickmarks(TQSlider::Below); - m_sensibilityLCDValue = new QLCDNumber(4, m_gboxSettings->plainPage()); - m_sensibilityLCDValue->setSegmentStyle(QLCDNumber::Flat); - m_sensibilityLCDValue->display(QString::number(200)); - QString whatsThis = i18n("<p>Set here the ISO-sensitivity of the simulated infrared film. " + m_sensibilityLCDValue = new TQLCDNumber(4, m_gboxSettings->plainPage()); + m_sensibilityLCDValue->setSegmentStyle(TQLCDNumber::Flat); + m_sensibilityLCDValue->display(TQString::number(200)); + TQString whatsThis = i18n("<p>Set here the ISO-sensitivity of the simulated infrared film. " "Increasing this value will increase the proportion of green color in the mix. " "It will also increase the halo effect on the hightlights, and the film " "graininess (if that box is checked).</p>" @@ -94,14 +94,14 @@ InfraredTool::InfraredTool(QObject* parent) "A sensitivity over 800 simulates <b>Kodak HIE</b> high-speed infrared film. This last one creates a more " "dramatic photographic style.</p>"); - QWhatsThis::add(m_sensibilityLCDValue, whatsThis); - QWhatsThis::add(m_sensibilitySlider, whatsThis); + TQWhatsThis::add(m_sensibilityLCDValue, whatsThis); + TQWhatsThis::add(m_sensibilitySlider, whatsThis); // ------------------------------------------------------------- - m_addFilmGrain = new QCheckBox(i18n("Add film grain"), m_gboxSettings->plainPage()); + m_addFilmGrain = new TQCheckBox(i18n("Add film grain"), m_gboxSettings->plainPage()); m_addFilmGrain->setChecked(true); - QWhatsThis::add( m_addFilmGrain, i18n("<p>This option adds infrared film grain to " + TQWhatsThis::add( m_addFilmGrain, i18n("<p>This option adds infrared film grain to " "the image depending on ISO-sensitivity.")); grid->addMultiCellWidget(label1, 0, 0, 0, 1); @@ -123,19 +123,19 @@ InfraredTool::InfraredTool(QObject* parent) // ------------------------------------------------------------- - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer()) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer()) ); // this connection is necessary to change the LCD display when // the value is changed by single clicking on the slider - connect( m_sensibilitySlider, SIGNAL(valueChanged(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_sensibilitySlider, SIGNAL(sliderMoved(int)), - this, SLOT(slotSliderMoved(int)) ); + connect( m_sensibilitySlider, TQT_SIGNAL(sliderMoved(int)), + this, TQT_SLOT(slotSliderMoved(int)) ); - connect( m_addFilmGrain, SIGNAL(toggled (bool)), - this, SLOT(slotEffect()) ); + connect( m_addFilmGrain, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect()) ); } InfraredTool::~InfraredTool() @@ -183,7 +183,7 @@ void InfraredTool::slotResetSettings() void InfraredTool::slotSliderMoved(int v) { - m_sensibilityLCDValue->display( QString::number(100 + 100 * v) ); + m_sensibilityLCDValue->display( TQString::number(100 + 100 * v) ); } void InfraredTool::prepareEffect() diff --git a/digikam/imageplugins/infrared/infraredtool.h b/digikam/imageplugins/infrared/infraredtool.h index 7e0a68b..18b4da2 100644 --- a/digikam/imageplugins/infrared/infraredtool.h +++ b/digikam/imageplugins/infrared/infraredtool.h @@ -30,9 +30,9 @@ #include "editortool.h" -class QSlider; -class QLCDNumber; -class QCheckBox; +class TQSlider; +class TQLCDNumber; +class TQCheckBox; namespace Digikam { @@ -46,10 +46,11 @@ namespace DigikamInfraredImagesPlugin class InfraredTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - InfraredTool(QObject* parent); + InfraredTool(TQObject* tqparent); ~InfraredTool(); private slots: @@ -69,11 +70,11 @@ private: private: - QCheckBox *m_addFilmGrain; + TQCheckBox *m_addFilmGrain; - QSlider *m_sensibilitySlider; + TQSlider *m_sensibilitySlider; - QLCDNumber *m_sensibilityLCDValue; + TQLCDNumber *m_sensibilityLCDValue; Digikam::ImagePanelWidget *m_previewWidget; diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index d1c272a..5b078e5 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -28,24 +28,24 @@ #include <cmath> #include <cstring> -// Qt includes. - -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qtimer.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qbrush.h> -#include <qfile.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqtimer.h> +#include <tqevent.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqbrush.h> +#include <tqfile.h> // KDE includes. @@ -83,7 +83,7 @@ class InPaintingPassivePopup : public KPassivePopup { public: - InPaintingPassivePopup(QWidget* parent) : KPassivePopup(parent), m_parent(parent) {} + InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {} protected: @@ -91,12 +91,12 @@ protected: private: - QWidget* m_parent; + TQWidget* m_parent; }; //------------------------------------------------------------------------------------------ -void ImageEffect_InPainting::inPainting(QWidget* parent) +void ImageEffect_InPainting::inPainting(TQWidget* tqparent) { // -- check if we actually have a selection -------------------- @@ -107,7 +107,7 @@ void ImageEffect_InPainting::inPainting(QWidget* parent) if (!w || !h) { - InPaintingPassivePopup* popup = new InPaintingPassivePopup(parent); + InPaintingPassivePopup* popup = new InPaintingPassivePopup(tqparent); popup->setView(i18n("Inpainting Photograph Tool"), i18n("You need to select a region to inpaint to use " "this tool")); @@ -119,20 +119,20 @@ void ImageEffect_InPainting::inPainting(QWidget* parent) // -- run the dlg ---------------------------------------------- - ImageEffect_InPainting_Dialog dlg(parent); + ImageEffect_InPainting_Dialog dlg(tqparent); dlg.exec(); } //------------------------------------------------------------------------------------------ -ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Photograph Inpainting"), +ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Photograph Inpainting"), "inpainting", true, true, false, Digikam::ImageGuideWidget::HVGuideMode, 0, true, true, true) { m_isComputed = false; - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Photograph Inpainting"), @@ -156,30 +156,30 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout(gboxSettings, 2, 1, spacingHint()); - m_mainTab = new QTabWidget( gboxSettings ); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout(gboxSettings, 2, 1, spacingHint()); + m_mainTab = new TQTabWidget( gboxSettings ); - QWidget* firstPage = new QWidget( m_mainTab ); - QGridLayout* grid = new QGridLayout( firstPage, 2, 2, marginHint(), spacingHint()); + TQWidget* firstPage = new TQWidget( m_mainTab ); + TQGridLayout* grid = new TQGridLayout( firstPage, 2, 2, marginHint(), spacingHint()); m_mainTab->addTab( firstPage, i18n("Preset") ); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); - cimgLogoLabel->setText(QString()); + cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); - cimgLogoLabel->setPixmap( QPixmap( directory + "logo-cimg.png" ) ); - QToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); + TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); - QLabel *typeLabel = new QLabel(i18n("Filtering type:"), firstPage); - typeLabel->setAlignment ( Qt::AlignRight | Qt::AlignVCenter); - m_inpaintingTypeCB = new QComboBox( false, firstPage ); + TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); + typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + m_inpaintingTypeCB = new TQComboBox( false, firstPage ); m_inpaintingTypeCB->insertItem( i18n("None") ); m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") ); m_inpaintingTypeCB->insertItem( i18n("Remove Medium Artefact") ); m_inpaintingTypeCB->insertItem( i18n("Remove Large Artefact") ); - QWhatsThis::add( m_inpaintingTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" + TQWhatsThis::add( m_inpaintingTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" "<b>None</b>: Most common values. Puts settings to default.<p>" "<b>Remove Small Artefact</b>: inpaint small image artefact like image glitch.<p>" "<b>Remove Medium Artefact</b>: inpaint medium image artefact.<p>" @@ -195,16 +195,16 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(QWidget* parent) m_settingsWidget = new Digikam::GreycstorationWidget(m_mainTab); gridSettings->addMultiCellWidget(m_mainTab, 0, 0, 1, 1); - gridSettings->addMultiCellWidget(new QLabel(gboxSettings), 1, 1, 1, 1); + gridSettings->addMultiCellWidget(new TQLabel(gboxSettings), 1, 1, 1, 1); setUserAreaWidget(gboxSettings); // ------------------------------------------------------------- - connect(cimgLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processCImgURL(const QString&))); + connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processCImgURL(const TQString&))); - connect(m_inpaintingTypeCB, SIGNAL(activated(int)), - this, SLOT(slotResetValues(int))); + connect(m_inpaintingTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotResetValues(int))); } ImageEffect_InPainting_Dialog::~ImageEffect_InPainting_Dialog() @@ -307,7 +307,7 @@ void ImageEffect_InPainting_Dialog::resetValues() m_settingsWidget->setSettings(settings); } -void ImageEffect_InPainting_Dialog::processCImgURL(const QString& url) +void ImageEffect_InPainting_Dialog::processCImgURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -322,24 +322,24 @@ void ImageEffect_InPainting_Dialog::prepareEffect() iface.originalSixteenBit(), iface.originalHasAlpha(), data); delete [] data; - // Selected area from the image and mask creation: + // Selected area from the image and tqmask creation: // // We optimize the computation time to use the current selected area in image editor - // and to create an inpainting mask with it. Because inpainting is done by interpolation + // and to create an inpainting tqmask with it. Because inpainting is done by interpolation // neighboor pixels which can be located far from the selected area, we need to ajust the - // mask size in according with the parameter algorithms, especially 'amplitude'. + // tqmask size in according with the parameter algorithms, especially 'amplitude'. // Mask size is computed like this : // // (image_size_x + 2*amplitude , image_size_y + 2*amplitude) - QRect selectionRect = QRect(iface.selectedXOrg(), iface.selectedYOrg(), + TQRect selectionRect = TQRect(iface.selectedXOrg(), iface.selectedYOrg(), iface.selectedWidth(), iface.selectedHeight()); - QPixmap inPaintingMask(iface.originalWidth(), iface.originalHeight()); - inPaintingMask.fill(Qt::black); - QPainter p(&inPaintingMask); - p.fillRect( selectionRect, QBrush(Qt::white) ); + TQPixmap inPaintingMask(iface.originalWidth(), iface.originalHeight()); + inPaintingMask.fill(TQt::black); + TQPainter p(&inPaintingMask); + p.fillRect( selectionRect, TQBrush(TQt::white) ); p.end(); Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); @@ -348,18 +348,18 @@ void ImageEffect_InPainting_Dialog::prepareEffect() int y1 = (int)(selectionRect.top() - 2*settings.amplitude); int x2 = (int)(selectionRect.right() + 2*settings.amplitude); int y2 = (int)(selectionRect.bottom() + 2*settings.amplitude); - m_maskRect = QRect(x1, y1, x2-x1, y2-y1); + m_tqmaskRect = TQRect(x1, y1, x2-x1, y2-y1); // Mask area normalization. - // We need to check if mask area is out of image size else inpainting give strange results. + // We need to check if tqmask area is out of image size else inpainting give strange results. - if (m_maskRect.left() < 0) m_maskRect.setLeft(0); - if (m_maskRect.top() < 0) m_maskRect.setTop(0); - if (m_maskRect.right() > iface.originalWidth()) m_maskRect.setRight(iface.originalWidth()); - if (m_maskRect.bottom() > iface.originalHeight()) m_maskRect.setBottom(iface.originalHeight()); + if (m_tqmaskRect.left() < 0) m_tqmaskRect.setLeft(0); + if (m_tqmaskRect.top() < 0) m_tqmaskRect.setTop(0); + if (m_tqmaskRect.right() > iface.originalWidth()) m_tqmaskRect.setRight(iface.originalWidth()); + if (m_tqmaskRect.bottom() > iface.originalHeight()) m_tqmaskRect.setBottom(iface.originalHeight()); - m_maskImage = inPaintingMask.convertToImage().copy(m_maskRect); - m_cropImage = m_originalImage.copy(m_maskRect); + m_tqmaskImage = inPaintingMask.convertToImage().copy(m_tqmaskRect); + m_cropImage = m_originalImage.copy(m_tqmaskRect); m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>( new Digikam::GreycstorationIface( @@ -367,7 +367,7 @@ void ImageEffect_InPainting_Dialog::prepareEffect() settings, Digikam::GreycstorationIface::InPainting, 0, 0, - m_maskImage, this)); + m_tqmaskImage, this)); } void ImageEffect_InPainting_Dialog::prepareFinal() @@ -391,7 +391,7 @@ void ImageEffect_InPainting_Dialog::putPreviewData() Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings(); m_cropImage = m_threadedFilter->getTargetImage(); - QRect cropSel((int)(2*settings.amplitude), (int)(2*settings.amplitude), + TQRect cropSel((int)(2*settings.amplitude), (int)(2*settings.amplitude), iface->selectedWidth(), iface->selectedHeight()); Digikam::DImg imDest = m_cropImage.copy(cropSel); @@ -408,7 +408,7 @@ void ImageEffect_InPainting_Dialog::putFinalData(void) if (!m_isComputed) m_cropImage = m_threadedFilter->getTargetImage(); - m_originalImage.bitBltImage(&m_cropImage, m_maskRect.left(), m_maskRect.top()); + m_originalImage.bitBltImage(&m_cropImage, m_tqmaskRect.left(), m_tqmaskRect.top()); iface.putOriginalImage(i18n("InPainting"), m_originalImage.bits()); } @@ -416,20 +416,20 @@ void ImageEffect_InPainting_Dialog::putFinalData(void) void ImageEffect_InPainting_Dialog::slotUser3() { KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Inpainting Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) return; - QFile file(loadInpaintingFile.path()); + TQFile file(loadInpaintingFile.path()); if ( file.open(IO_ReadOnly) ) { - if (!m_settingsWidget->loadSettings(file, QString("# Photograph Inpainting Configuration File V2"))) + if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Inpainting Configuration File V2"))) { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Inpainting settings text file.") - .arg(loadInpaintingFile.fileName())); + .tqarg(loadInpaintingFile.fileName())); file.close(); return; } @@ -447,15 +447,15 @@ void ImageEffect_InPainting_Dialog::slotUser3() void ImageEffect_InPainting_Dialog::slotUser2() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Inpainting Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) - m_settingsWidget->saveSettings(file, QString("# Photograph Inpainting Configuration File V2")); + m_settingsWidget->saveSettings(file, TQString("# Photograph Inpainting Configuration File V2")); else KMessageBox::error(this, i18n("Cannot save settings to the Photograph Inpainting text file.")); diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.h b/digikam/imageplugins/inpainting/imageeffect_inpainting.h index 5eb05ad..4c86509 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.h +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.h @@ -26,19 +26,19 @@ #ifndef IMAGEEFFECT_INPAINTING_H #define IMAGEEFFECT_INPAINTING_H -// Qt include. +// TQt include. -#include <qimage.h> -#include <qrect.h> -#include <qstring.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqstring.h> // Digikam includes. #include "dimg.h" #include "imageguidedlg.h" -class QTabWidget; -class QComboBox; +class TQTabWidget; +class TQComboBox; namespace Digikam { @@ -52,7 +52,7 @@ class ImageEffect_InPainting { public: - static void inPainting(QWidget *parent); + static void inPainting(TQWidget *tqparent); }; //----------------------------------------------------------- @@ -60,10 +60,11 @@ public: class ImageEffect_InPainting_Dialog : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_InPainting_Dialog(QWidget* parent); + ImageEffect_InPainting_Dialog(TQWidget* tqparent); ~ImageEffect_InPainting_Dialog(); private slots: @@ -71,7 +72,7 @@ private slots: void slotUser2(); void slotUser3(); void readUserSettings(); - void processCImgURL(const QString&); + void processCImgURL(const TQString&); void slotResetValues(int); private: @@ -96,13 +97,13 @@ private: bool m_isComputed; - QRect m_maskRect; + TQRect m_tqmaskRect; - QImage m_maskImage; + TQImage m_tqmaskImage; - QComboBox *m_inpaintingTypeCB; + TQComboBox *m_inpaintingTypeCB; - QTabWidget *m_mainTab; + TQTabWidget *m_mainTab; Digikam::DImg m_originalImage; Digikam::DImg m_cropImage; diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp index 87f28f2..bc4220a 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp @@ -45,12 +45,12 @@ using namespace Digikam; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inpainting, KGenericFactory<ImagePlugin_InPainting>("digikamimageplugin_inpainting")); -ImagePlugin_InPainting::ImagePlugin_InPainting(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_InPainting") +ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_InPainting") { m_inPaintingAction = new KAction(i18n("Inpainting..."), "inpainting", CTRL+Key_E, - this, SLOT(slotInPainting()), + this, TQT_SLOT(slotInPainting()), actionCollection(), "imageplugin_inpainting"); m_inPaintingAction->setWhatsThis( i18n( "This filter can be used to inpaint a part in a photo. " diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.h b/digikam/imageplugins/inpainting/imageplugin_inpainting.h index 947b8f4..2d5b036 100644 --- a/digikam/imageplugins/inpainting/imageplugin_inpainting.h +++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InPainting : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_InPainting(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_InPainting(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_InPainting(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index ce6efec..63f3028 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -28,24 +28,24 @@ #include <cmath> #include <cstring> -// Qt includes. - -#include <qbrush.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qevent.h> -#include <qfile.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqbrush.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqevent.h> +#include <tqfile.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -82,8 +82,8 @@ using namespace Digikam; namespace DigikamInPaintingImagesPlugin { -InPaintingTool::InPaintingTool(QObject* parent) - : EditorToolThreaded(parent) +InPaintingTool::InPaintingTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("inpainting"); setToolName(i18n("Inpainting")); @@ -105,29 +105,29 @@ InPaintingTool::InPaintingTool(QObject* parent) EditorToolSettings::SaveAs| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 2, 1); - m_mainTab = new QTabWidget( m_gboxSettings->plainPage() ); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 2, 1); + m_mainTab = new TQTabWidget( m_gboxSettings->plainPage() ); - QWidget* firstPage = new QWidget( m_mainTab ); - QGridLayout* grid = new QGridLayout( firstPage, 2, 2); + TQWidget* firstPage = new TQWidget( m_mainTab ); + TQGridLayout* grid = new TQGridLayout( firstPage, 2, 2); m_mainTab->addTab( firstPage, i18n("Preset") ); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); - cimgLogoLabel->setText(QString()); + cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); - cimgLogoLabel->setPixmap( QPixmap( directory + "logo-cimg.png" ) ); - QToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); + TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); - QLabel *typeLabel = new QLabel(i18n("Filtering type:"), firstPage); - typeLabel->setAlignment ( Qt::AlignRight | Qt::AlignVCenter); - m_inpaintingTypeCB = new QComboBox( false, firstPage ); + TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); + typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + m_inpaintingTypeCB = new TQComboBox( false, firstPage ); m_inpaintingTypeCB->insertItem( i18n("None") ); m_inpaintingTypeCB->insertItem( i18n("Remove Small Artefact") ); m_inpaintingTypeCB->insertItem( i18n("Remove Medium Artefact") ); m_inpaintingTypeCB->insertItem( i18n("Remove Large Artefact") ); - QWhatsThis::add( m_inpaintingTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" + TQWhatsThis::add( m_inpaintingTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" "<b>None</b>: Most common values. Puts settings to default.<p>" "<b>Remove Small Artefact</b>: inpaint small image artefact like image glitch.<p>" "<b>Remove Medium Artefact</b>: inpaint medium image artefact.<p>" @@ -145,7 +145,7 @@ InPaintingTool::InPaintingTool(QObject* parent) m_settingsWidget = new GreycstorationWidget(m_mainTab); gridSettings->addMultiCellWidget(m_mainTab, 0, 0, 1, 1); - gridSettings->addMultiCellWidget(new QLabel(m_gboxSettings->plainPage()), 1, 1, 1, 1); + gridSettings->addMultiCellWidget(new TQLabel(m_gboxSettings->plainPage()), 1, 1, 1, 1); gridSettings->setMargin(m_gboxSettings->spacingHint()); gridSettings->setSpacing(m_gboxSettings->spacingHint()); gridSettings->setRowStretch(1, 10); @@ -155,11 +155,11 @@ InPaintingTool::InPaintingTool(QObject* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processCImgURL(const QString&))); + connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processCImgURL(const TQString&))); - connect(m_inpaintingTypeCB, SIGNAL(activated(int)), - this, SLOT(slotResetValues(int))); + connect(m_inpaintingTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotResetValues(int))); // ------------------------------------------------------------- @@ -271,7 +271,7 @@ void InPaintingTool::slotResetSettings() m_settingsWidget->setSettings(settings); } -void InPaintingTool::processCImgURL(const QString& url) +void InPaintingTool::processCImgURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -286,24 +286,24 @@ void InPaintingTool::prepareEffect() iface.originalSixteenBit(), iface.originalHasAlpha(), data); delete [] data; - // Selected area from the image and mask creation: + // Selected area from the image and tqmask creation: // // We optimize the computation time to use the current selected area in image editor - // and to create an inpainting mask with it. Because inpainting is done by interpolation + // and to create an inpainting tqmask with it. Because inpainting is done by interpolation // neighboor pixels which can be located far from the selected area, we need to ajust the - // mask size in according with the parameter algorithms, especially 'amplitude'. + // tqmask size in according with the parameter algorithms, especially 'amplitude'. // Mask size is computed like this : // // (image_size_x + 2*amplitude , image_size_y + 2*amplitude) - QRect selectionRect = QRect(iface.selectedXOrg(), iface.selectedYOrg(), + TQRect selectionRect = TQRect(iface.selectedXOrg(), iface.selectedYOrg(), iface.selectedWidth(), iface.selectedHeight()); - QPixmap inPaintingMask(iface.originalWidth(), iface.originalHeight()); - inPaintingMask.fill(Qt::black); - QPainter p(&inPaintingMask); - p.fillRect( selectionRect, QBrush(Qt::white) ); + TQPixmap inPaintingMask(iface.originalWidth(), iface.originalHeight()); + inPaintingMask.fill(TQt::black); + TQPainter p(&inPaintingMask); + p.fillRect( selectionRect, TQBrush(TQt::white) ); p.end(); GreycstorationSettings settings = m_settingsWidget->getSettings(); @@ -312,18 +312,18 @@ void InPaintingTool::prepareEffect() int y1 = (int)(selectionRect.top() - 2*settings.amplitude); int x2 = (int)(selectionRect.right() + 2*settings.amplitude); int y2 = (int)(selectionRect.bottom() + 2*settings.amplitude); - m_maskRect = QRect(x1, y1, x2-x1, y2-y1); + m_tqmaskRect = TQRect(x1, y1, x2-x1, y2-y1); // Mask area normalization. - // We need to check if mask area is out of image size else inpainting give strange results. + // We need to check if tqmask area is out of image size else inpainting give strange results. - if (m_maskRect.left() < 0) m_maskRect.setLeft(0); - if (m_maskRect.top() < 0) m_maskRect.setTop(0); - if (m_maskRect.right() > iface.originalWidth()) m_maskRect.setRight(iface.originalWidth()); - if (m_maskRect.bottom() > iface.originalHeight()) m_maskRect.setBottom(iface.originalHeight()); + if (m_tqmaskRect.left() < 0) m_tqmaskRect.setLeft(0); + if (m_tqmaskRect.top() < 0) m_tqmaskRect.setTop(0); + if (m_tqmaskRect.right() > iface.originalWidth()) m_tqmaskRect.setRight(iface.originalWidth()); + if (m_tqmaskRect.bottom() > iface.originalHeight()) m_tqmaskRect.setBottom(iface.originalHeight()); - m_maskImage = inPaintingMask.convertToImage().copy(m_maskRect); - m_cropImage = m_originalImage.copy(m_maskRect); + m_tqmaskImage = inPaintingMask.convertToImage().copy(m_tqmaskRect); + m_cropImage = m_originalImage.copy(m_tqmaskRect); setFilter(dynamic_cast<DImgThreadedFilter*>( new GreycstorationIface( @@ -331,7 +331,7 @@ void InPaintingTool::prepareEffect() settings, GreycstorationIface::InPainting, 0, 0, - m_maskImage, this))); + m_tqmaskImage, this))); } void InPaintingTool::prepareFinal() @@ -346,7 +346,7 @@ void InPaintingTool::prepareFinal() eventData->progress = 100; eventData->starting = false; eventData->success = true; - QApplication::postEvent(this, new QCustomEvent(QEvent::User, eventData)); + TQApplication::postEvent(this, new TQCustomEvent(TQEvent::User, eventData)); } } @@ -356,7 +356,7 @@ void InPaintingTool::putPreviewData() GreycstorationSettings settings = m_settingsWidget->getSettings(); m_cropImage = filter()->getTargetImage(); - QRect cropSel((int)(2*settings.amplitude), (int)(2*settings.amplitude), + TQRect cropSel((int)(2*settings.amplitude), (int)(2*settings.amplitude), iface->selectedWidth(), iface->selectedHeight()); DImg imDest = m_cropImage.copy(cropSel); @@ -373,7 +373,7 @@ void InPaintingTool::putFinalData() if (!m_isComputed) m_cropImage = filter()->getTargetImage(); - m_originalImage.bitBltImage(&m_cropImage, m_maskRect.left(), m_maskRect.top()); + m_originalImage.bitBltImage(&m_cropImage, m_tqmaskRect.left(), m_tqmaskRect.top()); iface.putOriginalImage(i18n("InPainting"), m_originalImage.bits()); } @@ -381,20 +381,20 @@ void InPaintingTool::putFinalData() void InPaintingTool::slotLoadSettings() { KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Inpainting Settings File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) return; - QFile file(loadInpaintingFile.path()); + TQFile file(loadInpaintingFile.path()); if ( file.open(IO_ReadOnly) ) { - if (!m_settingsWidget->loadSettings(file, QString("# Photograph Inpainting Configuration File V2"))) + if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Inpainting Configuration File V2"))) { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Inpainting settings text file.") - .arg(loadInpaintingFile.fileName())); + .tqarg(loadInpaintingFile.fileName())); file.close(); return; } @@ -412,15 +412,15 @@ void InPaintingTool::slotLoadSettings() void InPaintingTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Inpainting Settings File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) - m_settingsWidget->saveSettings(file, QString("# Photograph Inpainting Configuration File V2")); + m_settingsWidget->saveSettings(file, TQString("# Photograph Inpainting Configuration File V2")); else KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Inpainting text file.")); diff --git a/digikam/imageplugins/inpainting/inpaintingtool.h b/digikam/imageplugins/inpainting/inpaintingtool.h index be63f98..97796c5 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.h +++ b/digikam/imageplugins/inpainting/inpaintingtool.h @@ -25,11 +25,11 @@ #ifndef INPAINTINGTOOL_H #define INPAINTINGTOOL_H -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qrect.h> -#include <qstring.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqstring.h> // KDE includes. @@ -40,8 +40,8 @@ #include "dimg.h" #include "editortool.h" -class QTabWidget; -class QComboBox; +class TQTabWidget; +class TQComboBox; namespace Digikam { @@ -57,7 +57,7 @@ class InPaintingPassivePopup : public KPassivePopup { public: - InPaintingPassivePopup(QWidget* parent) : KPassivePopup(parent), m_parent(parent) {} + InPaintingPassivePopup(TQWidget* tqparent) : KPassivePopup(tqparent), m_parent(tqparent) {} protected: @@ -65,7 +65,7 @@ protected: private: - QWidget* m_parent; + TQWidget* m_parent; }; //----------------------------------------------------------- @@ -73,15 +73,16 @@ private: class InPaintingTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - InPaintingTool(QObject* parent); + InPaintingTool(TQObject* tqparent); ~InPaintingTool(); private slots: - void processCImgURL(const QString&); + void processCImgURL(const TQString&); void slotResetValues(int); void slotResetSettings(); void slotSaveAsSettings(); @@ -109,13 +110,13 @@ private: bool m_isComputed; - QRect m_maskRect; + TQRect m_tqmaskRect; - QImage m_maskImage; + TQImage m_tqmaskImage; - QComboBox *m_inpaintingTypeCB; + TQComboBox *m_inpaintingTypeCB; - QTabWidget *m_mainTab; + TQTabWidget *m_mainTab; Digikam::DImg m_originalImage; Digikam::DImg m_cropImage; diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index cfc8d05..7102c1a 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -24,21 +24,21 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qfont.h> -#include <qfontdatabase.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qscrollbar.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqfont.h> +#include <tqfontdatabase.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqscrollbar.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -52,7 +52,7 @@ #include <klocale.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <qlineedit.h> +#include <tqlineedit.h> // Local includes. @@ -68,114 +68,114 @@ public: FontChooserWidgetPrivate() { - m_palette.setColor(QPalette::Active, QColorGroup::Text, Qt::black); - m_palette.setColor(QPalette::Active, QColorGroup::Base, Qt::white); + m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); + m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); } - QPalette m_palette; + TQPalette m_palette; }; -FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, - bool onlyFixed, const QStringList &fontList, +FontChooserWidget::FontChooserWidget(TQWidget *tqparent, const char *name, + bool onlyFixed, const TQStringList &fontList, int visibleListSize, bool diff, - QButton::ToggleState *sizeIsRelativeState ) - : QWidget(parent, name), usingFixed(onlyFixed) + TQButton::ToggleState *sizeIsRelativeState ) + : TQWidget(tqparent, name), usingFixed(onlyFixed) { charsetsCombo = 0; - QString mainWhatsThisText = i18n( "Here you can choose the font to be used." ); - QWhatsThis::add( this, mainWhatsThisText ); + TQString mainWhatsThisText = i18n( "Here you can choose the font to be used." ); + TQWhatsThis::add( this, mainWhatsThisText ); d = new FontChooserWidgetPrivate; - QVBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); int checkBoxGap = KDialog::spacingHint() / 2; int row = 0; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); topLayout->addWidget(page); - QGridLayout *gridLayout = new QGridLayout( page, 4, 3, 0, KDialog::spacingHint() ); + TQGridLayout *gridLayout = new TQGridLayout( page, 4, 3, 0, KDialog::spacingHint() ); // First, create the labels across the top - QHBoxLayout *familyLayout = new QHBoxLayout(); + TQHBoxLayout *familyLayout = new TQHBoxLayout(); familyLayout->addSpacing( checkBoxGap ); if (diff) { - familyCheckbox = new QCheckBox(i18n("Font"), page); + familyCheckbox = new TQCheckBox(i18n("Font"), page); - connect(familyCheckbox, SIGNAL(toggled(bool)), - this, SLOT(toggled_checkbox())); + connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(toggled_checkbox())); - familyLayout->addWidget(familyCheckbox, 0, Qt::AlignLeft); - QString familyCBToolTipText = + familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); + TQString familyCBToolTipText = i18n("Change font family?"); - QString familyCBWhatsThisText = + TQString familyCBWhatsThisText = i18n("Enable this checkbox to change the font family settings."); - QWhatsThis::add( familyCheckbox, familyCBWhatsThisText ); - QToolTip::add( familyCheckbox, familyCBToolTipText ); + TQWhatsThis::add( familyCheckbox, familyCBWhatsThisText ); + TQToolTip::add( familyCheckbox, familyCBToolTipText ); familyLabel = 0; } else { familyCheckbox = 0; - familyLabel = new QLabel( i18n("Font:"), page, "familyLabel" ); - familyLayout->addWidget(familyLabel, 1, Qt::AlignLeft); + familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" ); + familyLayout->addWidget(familyLabel, 1, TQt::AlignLeft); } gridLayout->addLayout(familyLayout, row, 0 ); - QHBoxLayout *styleLayout = new QHBoxLayout(); + TQHBoxLayout *styleLayout = new TQHBoxLayout(); if (diff) { - styleCheckbox = new QCheckBox(i18n("Style:"), page); + styleCheckbox = new TQCheckBox(i18n("Style:"), page); - connect(styleCheckbox, SIGNAL(toggled(bool)), - this, SLOT(toggled_checkbox())); + connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(toggled_checkbox())); - styleLayout->addWidget(styleCheckbox, 0, Qt::AlignLeft); - QString styleCBToolTipText = + styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); + TQString styleCBToolTipText = i18n("Change font style?"); - QString styleCBWhatsThisText = + TQString styleCBWhatsThisText = i18n("Enable this checkbox to change the font style settings."); - QWhatsThis::add( styleCheckbox, styleCBWhatsThisText ); - QToolTip::add( styleCheckbox, styleCBToolTipText ); + TQWhatsThis::add( styleCheckbox, styleCBWhatsThisText ); + TQToolTip::add( styleCheckbox, styleCBToolTipText ); styleLabel = 0; } else { styleCheckbox = 0; - styleLabel = new QLabel( i18n("Style:"), page, "styleLabel"); - styleLayout->addWidget(styleLabel, 1, Qt::AlignLeft); + styleLabel = new TQLabel( i18n("Style:"), page, "styleLabel"); + styleLayout->addWidget(styleLabel, 1, TQt::AlignLeft); } styleLayout->addSpacing( checkBoxGap ); gridLayout->addLayout(styleLayout, row, 1 ); - QHBoxLayout *sizeLayout = new QHBoxLayout(); + TQHBoxLayout *sizeLayout = new TQHBoxLayout(); if (diff) { - sizeCheckbox = new QCheckBox(i18n("Size"),page); + sizeCheckbox = new TQCheckBox(i18n("Size"),page); - connect(sizeCheckbox, SIGNAL(toggled(bool)), - this, SLOT(toggled_checkbox())); + connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(toggled_checkbox())); - sizeLayout->addWidget(sizeCheckbox, 0, Qt::AlignLeft); - QString sizeCBToolTipText = + sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); + TQString sizeCBToolTipText = i18n("Change font size?"); - QString sizeCBWhatsThisText = + TQString sizeCBWhatsThisText = i18n("Enable this checkbox to change the font size settings."); - QWhatsThis::add( sizeCheckbox, sizeCBWhatsThisText ); - QToolTip::add( sizeCheckbox, sizeCBToolTipText ); + TQWhatsThis::add( sizeCheckbox, sizeCBWhatsThisText ); + TQToolTip::add( sizeCheckbox, sizeCBToolTipText ); sizeLabel = 0; } else { sizeCheckbox = 0; - sizeLabel = new QLabel( i18n("Size:"), page, "sizeLabel"); - sizeLayout->addWidget(sizeLabel, 1, Qt::AlignLeft); + sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel"); + sizeLayout->addWidget(sizeLabel, 1, TQt::AlignLeft); } sizeLayout->addSpacing( checkBoxGap ); @@ -189,12 +189,12 @@ FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, familyListBox = new KListBox( page, "familyListBox"); familyListBox->setEnabled( !diff ); gridLayout->addWidget( familyListBox, row, 0 ); - QString fontFamilyWhatsThisText = i18n("Here you can choose the font family to be used." ); - QWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); - QWhatsThis::add(diff?(QWidget *) familyCheckbox:(QWidget *) familyLabel, fontFamilyWhatsThisText ); + TQString fontFamilyWhatsThisText = i18n("Here you can choose the font family to be used." ); + TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); + TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText ); - connect(familyListBox, SIGNAL(highlighted(const QString &)), - this, SLOT(family_chosen_slot(const QString &))); + connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)), + this, TQT_SLOT(family_chosen_slot(const TQString &))); if(!fontList.isEmpty()) { @@ -210,9 +210,9 @@ FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, styleListBox = new KListBox( page, "styleListBox"); styleListBox->setEnabled( !diff ); gridLayout->addWidget(styleListBox, row, 1); - QString fontStyleWhatsThisText = i18n("Here you can choose the font style to be used." ); - QWhatsThis::add( styleListBox, fontStyleWhatsThisText ); - QWhatsThis::add(diff?(QWidget *)styleCheckbox:(QWidget *)styleLabel, fontFamilyWhatsThisText ); + TQString fontStyleWhatsThisText = i18n("Here you can choose the font style to be used." ); + TQWhatsThis::add( styleListBox, fontStyleWhatsThisText ); + TQWhatsThis::add(diff?(TQWidget *)styleCheckbox:(TQWidget *)styleLabel, fontFamilyWhatsThisText ); styleListBox->insertItem(i18n("Regular")); styleListBox->insertItem(i18n("Italic")); styleListBox->insertItem(i18n("Bold")); @@ -220,8 +220,8 @@ FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, styleListBox->setMinimumWidth( minimumListWidth( styleListBox ) ); styleListBox->setMinimumHeight( minimumListHeight( styleListBox, visibleListSize ) ); - connect(styleListBox, SIGNAL(highlighted(const QString &)), - this, SLOT(style_chosen_slot(const QString &))); + connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)), + this, TQT_SLOT(style_chosen_slot(const TQString &))); sizeListBox = new KListBox( page, "sizeListBox"); sizeOfFont = new KIntNumInput( page, "sizeOfFont"); @@ -232,65 +232,65 @@ FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, if( sizeIsRelativeState ) { - QString sizeIsRelativeCBText = + TQString sizeIsRelativeCBText = i18n("Relative"); - QString sizeIsRelativeCBToolTipText = + TQString sizeIsRelativeCBToolTipText = i18n("Font size<br><i>fixed</i> or <i>relative</i><br>to environment"); - QString sizeIsRelativeCBWhatsThisText = + TQString sizeIsRelativeCBWhatsThisText = i18n("Here you can switch between fixed a font size and a font size " "to be calculated dynamically and adjusted to any changing " "environment (e.g. widget dimensions, paper size)." ); - sizeIsRelativeCheckBox = new QCheckBox( sizeIsRelativeCBText, + sizeIsRelativeCheckBox = new TQCheckBox( sizeIsRelativeCBText, page, "sizeIsRelativeCheckBox" ); sizeIsRelativeCheckBox->setTristate( diff ); - QGridLayout *sizeLayout2 = new QGridLayout( 3,2, KDialog::spacingHint()/2, "sizeLayout2" ); + TQGridLayout *sizeLayout2 = new TQGridLayout( 3,2, KDialog::spacingHint()/2, "sizeLayout2" ); gridLayout->addLayout(sizeLayout2, row, 2); sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1); sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1); - sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, Qt::AlignLeft); - QWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText ); - QToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText ); + sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, TQt::AlignLeft); + TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText ); + TQToolTip::add( sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText ); } else { sizeIsRelativeCheckBox = 0L; - QGridLayout *sizeLayout2 = new QGridLayout( 2,1, KDialog::spacingHint()/2, "sizeLayout2" ); + TQGridLayout *sizeLayout2 = new TQGridLayout( 2,1, KDialog::spacingHint()/2, "sizeLayout2" ); gridLayout->addLayout(sizeLayout2, row, 2); sizeLayout2->addWidget( sizeOfFont, 0, 0); sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,0); } - QString fontSizeWhatsThisText = i18n("Here you can choose the font size to be used." ); - QWhatsThis::add( sizeListBox, fontSizeWhatsThisText ); - QWhatsThis::add( diff?(QWidget *)sizeCheckbox:(QWidget *)sizeLabel, fontSizeWhatsThisText ); + TQString fontSizeWhatsThisText = i18n("Here you can choose the font size to be used." ); + TQWhatsThis::add( sizeListBox, fontSizeWhatsThisText ); + TQWhatsThis::add( diff?(TQWidget *)sizeCheckbox:(TQWidget *)sizeLabel, fontSizeWhatsThisText ); fillSizeList(); sizeListBox->setMinimumWidth( minimumListWidth(sizeListBox) + sizeListBox->fontMetrics().maxWidth() ); sizeListBox->setMinimumHeight( minimumListHeight( sizeListBox, visibleListSize ) ); - connect( sizeOfFont, SIGNAL( valueChanged(int) ), - this, SLOT(size_value_slot(int))); + connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ), + this, TQT_SLOT(size_value_slot(int))); - connect( sizeListBox, SIGNAL(highlighted(const QString&)), - this, SLOT(size_chosen_slot(const QString&)) ); + connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), + this, TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->findItem(QString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; row ++; - QVBoxLayout *vbox; - page = new QWidget( this ); + TQVBoxLayout *vbox; + page = new TQWidget( this ); topLayout->addWidget(page); - vbox = new QVBoxLayout( page, 0, KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n("Actual Font"), page ); + vbox = new TQVBoxLayout( page, 0, KDialog::spacingHint() ); + TQLabel *label = new TQLabel( i18n("Actual Font"), page ); vbox->addWidget( label ); - xlfdEdit = new QLineEdit( page, "xlfdEdit" ); + xlfdEdit = new TQLineEdit( page, "xlfdEdit" ); vbox->addWidget( xlfdEdit ); // lets initialize the display if possible @@ -301,8 +301,8 @@ FontChooserWidget::FontChooserWidget(QWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, QString::fromLatin1("General")); - showXLFDArea(config->readBoolEntry(QString::fromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); } FontChooserWidget::~FontChooserWidget() @@ -310,14 +310,14 @@ FontChooserWidget::~FontChooserWidget() delete d; } -int FontChooserWidget::minimumListWidth( const QListBox *list ) +int FontChooserWidget::minimumListWidth( const TQListBox *list ) { int w=0; for( uint i=0; i<list->count(); i++ ) { int itemWidth = list->item(i)->width(list); - w = QMAX(w,itemWidth); + w = TQMAX(w,itemWidth); } if( w == 0 ) @@ -326,11 +326,11 @@ int FontChooserWidget::minimumListWidth( const QListBox *list ) } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->sizeHint().width(); + w += list->verticalScrollBar()->tqsizeHint().width(); return w; } -int FontChooserWidget::minimumListHeight( const QListBox *list, int numVisibleEntry ) +int FontChooserWidget::minimumListHeight( const TQListBox *list, int numVisibleEntry ) { int w = list->count() > 0 ? list->item(0)->height(list) : list->fontMetrics().lineSpacing(); @@ -362,52 +362,52 @@ void FontChooserWidget::fillSizeList() for(int i = 0; c[i]; ++i) { - sizeListBox->insertItem(QString::number(c[i])); + sizeListBox->insertItem(TQString::number(c[i])); } } -void FontChooserWidget::setColor( const QColor & col ) +void FontChooserWidget::setColor( const TQColor & col ) { - d->m_palette.setColor( QPalette::Active, QColorGroup::Text, col ); + d->m_palette.setColor( TQPalette::Active, TQColorGroup::Text, col ); } -QColor FontChooserWidget::color() const +TQColor FontChooserWidget::color() const { - return d->m_palette.color( QPalette::Active, QColorGroup::Text ); + return d->m_palette.color( TQPalette::Active, TQColorGroup::Text ); } -void FontChooserWidget::setBackgroundColor( const QColor & col ) +void FontChooserWidget::setBackgroundColor( const TQColor & col ) { - d->m_palette.setColor( QPalette::Active, QColorGroup::Base, col ); + d->m_palette.setColor( TQPalette::Active, TQColorGroup::Base, col ); } -QColor FontChooserWidget::backgroundColor() const +TQColor FontChooserWidget::backgroundColor() const { - return d->m_palette.color( QPalette::Active, QColorGroup::Base ); + return d->m_palette.color( TQPalette::Active, TQColorGroup::Base ); } -void FontChooserWidget::setSizeIsRelative( QButton::ToggleState relative ) +void FontChooserWidget::setSizeIsRelative( TQButton::ToggleState relative ) { // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeCheckBox ) { - if( QButton::NoChange == relative ) + if( TQButton::NoChange == relative ) sizeIsRelativeCheckBox->setNoChange(); else - sizeIsRelativeCheckBox->setChecked( QButton::On == relative ); + sizeIsRelativeCheckBox->setChecked( TQButton::On == relative ); } } -QButton::ToggleState FontChooserWidget::sizeIsRelative() const +TQButton::ToggleState FontChooserWidget::sizeIsRelative() const { return sizeIsRelativeCheckBox ? sizeIsRelativeCheckBox->state() - : QButton::NoChange; + : TQButton::NoChange; } -QSize FontChooserWidget::sizeHint( void ) const +TQSize FontChooserWidget::tqsizeHint( void ) const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void FontChooserWidget::enableColumn( int column, bool state ) @@ -426,12 +426,12 @@ void FontChooserWidget::enableColumn( int column, bool state ) } } -void FontChooserWidget::setFont( const QFont& aFont, bool onlyFixed ) +void FontChooserWidget::setFont( const TQFont& aFont, bool onlyFixed ) { selFont = aFont; selectedSize=aFont.pointSize(); if (selectedSize == -1) - selectedSize = QFontInfo(aFont).pointSize(); + selectedSize = TQFontInfo(aFont).pointSize(); if( onlyFixed != usingFixed) { @@ -461,22 +461,22 @@ void FontChooserWidget::toggled_checkbox() sizeOfFont->setEnabled( sizeCheckbox->isChecked() ); } -void FontChooserWidget::family_chosen_slot(const QString& family) +void FontChooserWidget::family_chosen_slot(const TQString& family) { - QFontDatabase dbase; - QStringList styles = QStringList(dbase.styles(family)); + TQFontDatabase dbase; + TQStringList styles = TQStringList(dbase.styles(family)); styleListBox->clear(); currentStyles.clear(); - QStringList::Iterator end(styles.end()); - for ( QStringList::Iterator it = styles.begin(); it != end; ++it ) + TQStringList::Iterator end(styles.end()); + for ( TQStringList::Iterator it = styles.begin(); it != end; ++it ) { - QString style = *it; - int pos = style.find("Plain"); - if(pos >=0) style = style.replace(pos,5,i18n("Regular")); - pos = style.find("Normal"); - if(pos >=0) style = style.replace(pos,6,i18n("Regular")); - pos = style.find("Oblique"); - if(pos >=0) style = style.replace(pos,7,i18n("Italic")); + TQString style = *it; + int pos = style.tqfind("Plain"); + if(pos >=0) style = style.tqreplace(pos,5,i18n("Regular")); + pos = style.tqfind("Normal"); + if(pos >=0) style = style.tqreplace(pos,6,i18n("Regular")); + pos = style.tqfind("Oblique"); + if(pos >=0) style = style.tqreplace(pos,7,i18n("Italic")); if(!styleListBox->findItem(style)) { styleListBox->insertItem(i18n(style.utf8())); @@ -490,17 +490,17 @@ void FontChooserWidget::family_chosen_slot(const QString& family) } styleListBox->blockSignals(true); - QListBoxItem *item = styleListBox->findItem(selectedStyle); + TQListBoxItem *item = styleListBox->findItem(selectedStyle); if (item) styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); - style_chosen_slot(QString()); + style_chosen_slot(TQString()); } -void FontChooserWidget::size_chosen_slot(const QString& size) +void FontChooserWidget::size_chosen_slot(const TQString& size) { selectedSize=size.toInt(); sizeOfFont->setValue(selectedSize); @@ -514,9 +514,9 @@ void FontChooserWidget::size_value_slot(int val) emit fontSelected(selFont); } -void FontChooserWidget::style_chosen_slot(const QString& style) +void FontChooserWidget::style_chosen_slot(const TQString& style) { - QString currentStyle; + TQString currentStyle; if (style.isEmpty()) currentStyle = styleListBox->currentText(); else @@ -525,7 +525,7 @@ void FontChooserWidget::style_chosen_slot(const QString& style) int diff=0; // the difference between the font size requested and what we can show. sizeListBox->clear(); - QFontDatabase dbase; + TQFontDatabase dbase; if(dbase.isSmoothlyScalable(familyListBox->currentText(), currentStyles[currentStyle])) { // is vector font //sampleEdit->setPaletteBackgroundPixmap( VectorPixmap ); // TODO @@ -534,23 +534,23 @@ void FontChooserWidget::style_chosen_slot(const QString& style) else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - QValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { - QValueList<int>::iterator it; + TQValueList<int>::iterator it; diff=1000; - QValueList<int>::iterator end(sizes.end()); + TQValueList<int>::iterator end(sizes.end()); for ( it = sizes.begin(); it != end; ++it ) { if(*it <= selectedSize || diff > *it - selectedSize) diff = selectedSize - *it; - sizeListBox->insertItem(QString::number(*it)); + sizeListBox->insertItem(TQString::number(*it)); } } else // there are times QT does not provide the list.. fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->findItem(QString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -560,7 +560,7 @@ void FontChooserWidget::style_chosen_slot(const QString& style) selectedStyle = style; } -void FontChooserWidget::displaySample(const QFont& font) +void FontChooserWidget::displaySample(const TQFont& font) { xlfdEdit->setText(font.rawName()); xlfdEdit->setCursorPosition(0); @@ -570,12 +570,12 @@ void FontChooserWidget::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. - QString family = selFont.family().lower(); + TQString family = selFont.family().lower(); int style = (selFont.bold() ? 2 : 0) + (selFont.italic() ? 1 : 0); int size = selFont.pointSize(); if (size == -1) - size = QFontInfo(selFont).pointSize(); - QString sizeStr = QString::number(size); + size = TQFontInfo(selFont).pointSize(); + TQString sizeStr = TQString::number(size); int numEntries, i; @@ -592,9 +592,9 @@ void FontChooserWidget::setupDisplay() // 1st Fallback if ( (i == numEntries) ) { - if (family.contains('[')) + if (family.tqcontains('[')) { - family = family.left(family.find('[')).stripWhiteSpace(); + family = family.left(family.tqfind('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) @@ -609,7 +609,7 @@ void FontChooserWidget::setupDisplay() // 2nd Fallback if ( (i == numEntries) ) { - QString fallback = family+" ["; + TQString fallback = family+" ["; for (i = 0; i < numEntries; i++) { if (familyListBox->text(i).lower().startsWith(fallback)) @@ -652,17 +652,17 @@ void FontChooserWidget::setupDisplay() sizeOfFont->setValue(size); } -void FontChooserWidget::getFontList( QStringList &list, uint fontListCriteria) +void FontChooserWidget::getFontList( TQStringList &list, uint fontListCriteria) { - QFontDatabase dbase; - QStringList lstSys(dbase.families()); + TQFontDatabase dbase; + TQStringList lstSys(dbase.families()); // if we have criteria; then check fonts before adding if (fontListCriteria) { - QStringList lstFonts; - QStringList::Iterator end(lstSys.end()); - for (QStringList::Iterator it = lstSys.begin(); it != end; ++it) + TQStringList lstFonts; + TQStringList::Iterator end(lstSys.end()); + for (TQStringList::Iterator it = lstSys.begin(); it != end; ++it) { if ((fontListCriteria & FixedWidthFonts) > 0 && !dbase.isFixedPitch(*it)) continue; if (((fontListCriteria & (SmoothScalableFonts | ScalableFonts)) == ScalableFonts) && @@ -673,7 +673,7 @@ void FontChooserWidget::getFontList( QStringList &list, uint fontListCriteria) if((fontListCriteria & FixedWidthFonts) > 0) { // Fallback.. if there are no fixed fonts found, it is probably a - // bug in the font server or Qt. In this case, just use 'fixed' + // bug in the font server or TQt. In this case, just use 'fixed' if (lstFonts.count() == 0) lstFonts.append("fixed"); } @@ -686,7 +686,7 @@ void FontChooserWidget::getFontList( QStringList &list, uint fontListCriteria) list = lstSys; } -void FontChooserWidget::addFont( QStringList &list, const char *xfont ) +void FontChooserWidget::addFont( TQStringList &list, const char *xfont ) { const char *ptr = strchr( xfont, '-' ); if ( !ptr ) @@ -696,17 +696,17 @@ void FontChooserWidget::addFont( QStringList &list, const char *xfont ) if ( !ptr ) return; - QString font = QString::fromLatin1(ptr + 1); + TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.find( '-' ) ) > 0 ) { + if ( ( pos = font.tqfind( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( QString::fromLatin1("open look"), 0, false ) >= 0 ) + if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; - QStringList::Iterator it = list.begin(); - QStringList::Iterator end(list.end()); + TQStringList::Iterator it = list.begin(); + TQStringList::Iterator end(list.end()); for ( ; it != end; ++it ) if ( *it == font ) return; @@ -716,7 +716,7 @@ void FontChooserWidget::addFont( QStringList &list, const char *xfont ) void FontChooserWidget::fillFamilyListBox(bool onlyFixedFonts) { - QStringList fontList; + TQStringList fontList; getFontList(fontList, onlyFixedFonts?FixedWidthFonts:0); familyListBox->clear(); familyListBox->insertStringList(fontList); @@ -726,11 +726,11 @@ void FontChooserWidget::showXLFDArea(bool show) { if( show ) { - xlfdEdit->parentWidget()->show(); + xlfdEdit->tqparentWidget()->show(); } else { - xlfdEdit->parentWidget()->hide(); + xlfdEdit->tqparentWidget()->hide(); } } diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h index 2fb7670..496a460 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.h +++ b/digikam/imageplugins/inserttext/fontchooserwidget.h @@ -27,15 +27,15 @@ #ifndef FONT_CHOOSER_WIDGET_H #define FONT_CHOOSER_WIDGET_H -#include <qlineedit.h> -#include <qbutton.h> +#include <tqlineedit.h> +#include <tqbutton.h> -class QComboBox; -class QCheckBox; -class QFont; -class QGroupBox; -class QLabel; -class QStringList; +class TQComboBox; +class TQCheckBox; +class TQFont; +class TQGroupBox; +class TQLabel; +class TQStringList; class KListBox; class KIntNumInput; @@ -43,10 +43,11 @@ class KIntNumInput; namespace DigikamInsertTextImagesPlugin { -class FontChooserWidget : public QWidget +class FontChooserWidget : public TQWidget { Q_OBJECT - Q_PROPERTY( QFont font READ font WRITE setFont ) + TQ_OBJECT + TQ_PROPERTY( TQFont font READ font WRITE setFont ) public: @@ -73,42 +74,42 @@ public: public: - FontChooserWidget(QWidget *parent = 0L, const char *name = 0L, + FontChooserWidget(TQWidget *tqparent = 0L, const char *name = 0L, bool onlyFixed = false, - const QStringList &fontList = QStringList(), + const TQStringList &fontList = TQStringList(), int visibleListSize=8, bool diff = false, - QButton::ToggleState *sizeIsRelativeState = 0L ); + TQButton::ToggleState *sizeIsRelativeState = 0L ); ~FontChooserWidget(); - void setFont( const QFont &font, bool onlyFixed = false ); - void setColor( const QColor & col ); - void setBackgroundColor( const QColor & col ); - void setSizeIsRelative( QButton::ToggleState relative ); + void setFont( const TQFont &font, bool onlyFixed = false ); + void setColor( const TQColor & col ); + void setBackgroundColor( const TQColor & col ); + void setSizeIsRelative( TQButton::ToggleState relative ); - QFont font() const { return selFont; }; - QColor color() const; - QColor backgroundColor() const; - static void getFontList( QStringList &list, uint fontListCriteria); - QButton::ToggleState sizeIsRelative() const; - static QString getXLFD( const QFont &theFont ) { return theFont.rawName(); }; + TQFont font() const { return selFont; }; + TQColor color() const; + TQColor backgroundColor() const; + static void getFontList( TQStringList &list, uint fontListCriteria); + TQButton::ToggleState sizeIsRelative() const; + static TQString getXLFD( const TQFont &theFont ) { return theFont.rawName(); }; int fontDiffFlags(); void enableColumn( int column, bool state ); - virtual QSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; signals: - void fontSelected( const QFont &font ); + void fontSelected( const TQFont &font ); private slots: void toggled_checkbox(); - void family_chosen_slot(const QString&); - void size_chosen_slot(const QString&); - void style_chosen_slot(const QString&); - void displaySample(const QFont &font); + void family_chosen_slot(const TQString&); + void size_chosen_slot(const TQString&); + void style_chosen_slot(const TQString&); + void displaySample(const TQFont &font); void showXLFDArea(bool); void size_value_slot(int); @@ -117,41 +118,41 @@ private: void fillFamilyListBox(bool onlyFixedFonts = false); void fillSizeList(); - void addFont( QStringList &list, const char *xfont ); + void addFont( TQStringList &list, const char *xfont ); void setupDisplay(); - int minimumListWidth( const QListBox *list ); - int minimumListHeight( const QListBox *list, int numVisibleEntry ); + int minimumListWidth( const TQListBox *list ); + int minimumListHeight( const TQListBox *list, int numVisibleEntry ); private: bool usingFixed; int selectedSize; - QMap<QString, QString> currentStyles; + TQMap<TQString, TQString> currentStyles; // pointer to an optinally supplied list of fonts to // inserted into the fontdialog font-family combo-box - QStringList fontList; + TQStringList fontList; - QLineEdit *xlfdEdit; + TQLineEdit *xlfdEdit; - QLabel *familyLabel; - QLabel *styleLabel; + TQLabel *familyLabel; + TQLabel *styleLabel; - QCheckBox *familyCheckbox; - QCheckBox *styleCheckbox; - QCheckBox *sizeCheckbox; - QCheckBox *sizeIsRelativeCheckBox; + TQCheckBox *familyCheckbox; + TQCheckBox *styleCheckbox; + TQCheckBox *sizeCheckbox; + TQCheckBox *sizeIsRelativeCheckBox; - QComboBox *charsetsCombo; + TQComboBox *charsetsCombo; - QFont selFont; + TQFont selFont; - QString selectedStyle; + TQString selectedStyle; - QLabel *sizeLabel; + TQLabel *sizeLabel; KIntNumInput *sizeOfFont; diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index f34a018..93b5cb9 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -22,24 +22,24 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qbrush.h> -#include <qpen.h> -#include <qfont.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qtooltip.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqbrush.h> +#include <tqpen.h> +#include <tqfont.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqtooltip.h> // KDE includes. @@ -69,11 +69,11 @@ namespace DigikamInsertTextImagesPlugin { -ImageEffect_InsertText::ImageEffect_InsertText(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Insert Text on Photograph"), +ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Insert Text on Photograph"), "inserttext", false, false) { - QString whatsThis; + TQString whatsThis; // About data and help button. @@ -97,92 +97,92 @@ ImageEffect_InsertText::ImageEffect_InsertText(QWidget* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(plainPage()); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(plainPage()); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); m_previewWidget = new InsertTextWidget(480, 320, frame); l->addWidget(m_previewWidget); - QWhatsThis::add( m_previewWidget, i18n("<p>This previews the text inserted in the image. " + TQWhatsThis::add( m_previewWidget, i18n("<p>This previews the text inserted in the image. " "You can use the mouse to move the text to the right location.")); setPreviewAreaWidget(frame); // ------------------------------------------------------------- - QWidget *gbox2 = new QWidget(plainPage()); - QGridLayout *gridBox2 = new QGridLayout( gbox2, 9, 1, spacingHint()); + TQWidget *gbox2 = new TQWidget(plainPage()); + TQGridLayout *gridBox2 = new TQGridLayout( gbox2, 9, 1, spacingHint()); m_textEdit = new KTextEdit(gbox2); m_textEdit->setCheckSpellingEnabled(true); - m_textEdit->setWordWrap(QTextEdit::NoWrap); - QWhatsThis::add( m_textEdit, i18n("<p>Here, enter the text you want to insert in your image.")); + m_textEdit->setWordWrap(TQTextEdit::NoWrap); + TQWhatsThis::add( m_textEdit, i18n("<p>Here, enter the text you want to insert in your image.")); gridBox2->addMultiCellWidget(m_textEdit, 0, 2, 0, 1); // ------------------------------------------------------------- m_fontChooserWidget = new FontChooserWidget(gbox2); - QWhatsThis::add( m_textEdit, i18n("<p>Here you can choose the font to be used.")); + TQWhatsThis::add( m_textEdit, i18n("<p>Here you can choose the font to be used.")); gridBox2->addMultiCellWidget(m_fontChooserWidget, 3, 3, 0, 1); // ------------------------------------------------------------- KIconLoader icon; - m_alignButtonGroup = new QHButtonGroup(gbox2); + m_alignButtonGroup = new TQHButtonGroup(gbox2); - QPushButton *alignLeft = new QPushButton( m_alignButtonGroup ); + TQPushButton *alignLeft = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignLeft, ALIGN_LEFT); alignLeft->setPixmap( icon.loadIcon( "text_left", (KIcon::Group)KIcon::Small ) ); alignLeft->setToggleButton(true); - QToolTip::add( alignLeft, i18n( "Align text to the left" ) ); + TQToolTip::add( alignLeft, i18n( "Align text to the left" ) ); - QPushButton *alignRight = new QPushButton( m_alignButtonGroup ); + TQPushButton *alignRight = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignRight, ALIGN_RIGHT); alignRight->setPixmap( icon.loadIcon( "text_right", (KIcon::Group)KIcon::Small ) ); alignRight->setToggleButton(true); - QToolTip::add( alignRight, i18n( "Align text to the right" ) ); + TQToolTip::add( alignRight, i18n( "Align text to the right" ) ); - QPushButton *alignCenter = new QPushButton( m_alignButtonGroup ); + TQPushButton *alignCenter = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignCenter, ALIGN_CENTER); alignCenter->setPixmap( icon.loadIcon( "text_center", (KIcon::Group)KIcon::Small ) ); alignCenter->setToggleButton(true); - QToolTip::add( alignCenter, i18n( "Align text to center" ) ); + TQToolTip::add( alignCenter, i18n( "Align text to center" ) ); - QPushButton *alignBlock = new QPushButton( m_alignButtonGroup ); + TQPushButton *alignBlock = new TQPushButton( m_alignButtonGroup ); m_alignButtonGroup->insert(alignBlock, ALIGN_BLOCK); alignBlock->setPixmap( icon.loadIcon( "text_block", (KIcon::Group)KIcon::Small ) ); alignBlock->setToggleButton(true); - QToolTip::add( alignBlock, i18n( "Align text to a block" ) ); + TQToolTip::add( alignBlock, i18n( "Align text to a block" ) ); m_alignButtonGroup->setExclusive(true); - m_alignButtonGroup->setFrameShape(QFrame::NoFrame); + m_alignButtonGroup->setFrameShape(TQFrame::NoFrame); gridBox2->addMultiCellWidget(m_alignButtonGroup, 4, 4, 0, 1); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Rotation:"), gbox2); - m_textRotation = new QComboBox( false, gbox2 ); + TQLabel *label1 = new TQLabel(i18n("Rotation:"), gbox2); + m_textRotation = new TQComboBox( false, gbox2 ); m_textRotation->insertItem( i18n("None") ); m_textRotation->insertItem( i18n("90 Degrees") ); m_textRotation->insertItem( i18n("180 Degrees") ); m_textRotation->insertItem( i18n("270 Degrees") ); - QWhatsThis::add( m_textRotation, i18n("<p>Select the text rotation to use.")); + TQWhatsThis::add( m_textRotation, i18n("<p>Select the text rotation to use.")); gridBox2->addMultiCellWidget(label1, 5, 5, 0, 0); gridBox2->addMultiCellWidget(m_textRotation, 5, 5, 1, 1); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Color:"), gbox2); - m_fontColorButton = new KColorButton( Qt::black, gbox2 ); - QWhatsThis::add( m_fontColorButton, i18n("<p>Select the font color to use.")); + TQLabel *label2 = new TQLabel(i18n("Color:"), gbox2); + m_fontColorButton = new KColorButton( TQt::black, gbox2 ); + TQWhatsThis::add( m_fontColorButton, i18n("<p>Select the font color to use.")); gridBox2->addMultiCellWidget(label2, 6, 6, 0, 0); gridBox2->addMultiCellWidget(m_fontColorButton, 6, 6, 1, 1); // ------------------------------------------------------------- - m_borderText = new QCheckBox( i18n( "Add border"), gbox2 ); - QToolTip::add( m_borderText, i18n( "Add a solid border around text using current text color" ) ); + m_borderText = new TQCheckBox( i18n( "Add border"), gbox2 ); + TQToolTip::add( m_borderText, i18n( "Add a solid border around text using current text color" ) ); - m_transparentText = new QCheckBox( i18n( "Semi-transparent"), gbox2 ); - QToolTip::add( m_transparentText, i18n( "Use semi-transparent text background under image" ) ); + m_transparentText = new TQCheckBox( i18n( "Semi-transparent"), gbox2 ); + TQToolTip::add( m_transparentText, i18n( "Use semi-transparent text background under image" ) ); gridBox2->addMultiCellWidget(m_borderText, 7, 7, 0, 1); gridBox2->addMultiCellWidget(m_transparentText, 8, 8, 0, 1); @@ -192,28 +192,28 @@ ImageEffect_InsertText::ImageEffect_InsertText(QWidget* parent) // ------------------------------------------------------------- - connect(m_fontChooserWidget, SIGNAL(fontSelected (const QFont &)), - this, SLOT(slotFontPropertiesChanged(const QFont &))); + connect(m_fontChooserWidget, TQT_SIGNAL(fontSelected (const TQFont &)), + this, TQT_SLOT(slotFontPropertiesChanged(const TQFont &))); - connect(m_fontColorButton, SIGNAL(changed(const QColor &)), - this, SLOT(slotUpdatePreview())); + connect(m_fontColorButton, TQT_SIGNAL(changed(const TQColor &)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_textEdit, SIGNAL(textChanged()), - this, SLOT(slotUpdatePreview())); + connect(m_textEdit, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_alignButtonGroup, SIGNAL(released(int)), - this, SLOT(slotAlignModeChanged(int))); + connect(m_alignButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotAlignModeChanged(int))); - connect(m_borderText, SIGNAL(toggled(bool)), - this, SLOT(slotUpdatePreview())); + connect(m_borderText, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_transparentText, SIGNAL(toggled(bool)), - this, SLOT(slotUpdatePreview())); + connect(m_transparentText, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_textRotation, SIGNAL(activated(int)), - this, SLOT(slotUpdatePreview())); + connect(m_textRotation, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotUpdatePreview())); - connect(this, SIGNAL(signalUpdatePreview()), SLOT(slotUpdatePreview())); + connect(this, TQT_SIGNAL(signalUpdatePreview()), TQT_SLOT(slotUpdatePreview())); // ------------------------------------------------------------- slotUpdatePreview(); @@ -227,8 +227,8 @@ void ImageEffect_InsertText::readUserSettings() { KConfig *config = kapp->config(); config->setGroup("inserttext Tool Dialog"); - QColor black(0, 0, 0); - QFont defaultFont; + TQColor black(0, 0, 0); + TQFont defaultFont; int orgW = m_previewWidget->imageIface()->originalWidth(); int orgH = m_previewWidget->imageIface()->originalHeight(); @@ -247,7 +247,7 @@ void ImageEffect_InsertText::readUserSettings() m_transparentText->setChecked( config->readBoolEntry("Transparent Text", false) ); m_previewWidget->setPositionHint( config->readRectEntry("Position Hint") ); - static_cast<QPushButton*>(m_alignButtonGroup->find(m_alignTextMode))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(m_alignTextMode))->setOn(true); slotAlignModeChanged(m_alignTextMode); } @@ -275,15 +275,15 @@ void ImageEffect_InsertText::resetValues() m_fontChooserWidget->blockSignals(true); m_textRotation->setCurrentItem(0); // No rotation. - m_fontColorButton->setColor(Qt::black); - QFont defaultFont; + m_fontColorButton->setColor(TQt::black); + TQFont defaultFont; m_textFont = defaultFont; // Reset to default KDE font. m_textFont.setPointSize( m_defaultSizeFont ); m_fontChooserWidget->setFont(m_textFont); m_borderText->setChecked( false ); m_transparentText->setChecked( false ); m_previewWidget->resetEdit(); - static_cast<QPushButton*>(m_alignButtonGroup->find(ALIGN_LEFT))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(ALIGN_LEFT))->setOn(true); m_fontChooserWidget->blockSignals(false); m_fontColorButton->blockSignals(false); @@ -299,19 +299,19 @@ void ImageEffect_InsertText::slotAlignModeChanged(int mode) switch (m_alignTextMode) { case ALIGN_LEFT: - m_textEdit->setAlignment( Qt::AlignLeft ); + m_textEdit->tqsetAlignment( TQt::AlignLeft ); break; case ALIGN_RIGHT: - m_textEdit->setAlignment( Qt::AlignRight ); + m_textEdit->tqsetAlignment( TQt::AlignRight ); break; case ALIGN_CENTER: - m_textEdit->setAlignment( Qt::AlignHCenter ); + m_textEdit->tqsetAlignment( TQt::AlignHCenter ); break; case ALIGN_BLOCK: - m_textEdit->setAlignment( Qt::AlignJustify ); + m_textEdit->tqsetAlignment( TQt::AlignJustify ); break; } @@ -319,7 +319,7 @@ void ImageEffect_InsertText::slotAlignModeChanged(int mode) emit signalUpdatePreview(); } -void ImageEffect_InsertText::slotFontPropertiesChanged(const QFont &font) +void ImageEffect_InsertText::slotFontPropertiesChanged(const TQFont &font) { m_textFont = font; emit signalUpdatePreview(); diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.h b/digikam/imageplugins/inserttext/imageeffect_inserttext.h index 9728bf8..27d95e6 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.h +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.h @@ -24,20 +24,20 @@ #ifndef IMAGEEFFECT_INSERTEXT_H #define IMAGEEFFECT_INSERTEXT_H -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qimage.h> +#include <tqcolor.h> +#include <tqimage.h> // Digikam includes. #include "imagedlgbase.h" -class QLabel; -class QFont; -class QHButtonGroup; -class QComboBox; -class QCheckBox; +class TQLabel; +class TQFont; +class TQHButtonGroup; +class TQComboBox; +class TQCheckBox; class KTextEdit; class KColorButton; @@ -51,10 +51,11 @@ class FontChooserWidget; class ImageEffect_InsertText : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_InsertText(QWidget *parent); + ImageEffect_InsertText(TQWidget *tqparent); ~ImageEffect_InsertText(); signals: @@ -63,7 +64,7 @@ signals: private slots: - void slotFontPropertiesChanged(const QFont &font); + void slotFontPropertiesChanged(const TQFont &font); void slotUpdatePreview(); void slotAlignModeChanged(int mode); @@ -79,14 +80,14 @@ private: int m_alignTextMode; int m_defaultSizeFont; - QComboBox *m_textRotation; + TQComboBox *m_textRotation; - QCheckBox *m_borderText; - QCheckBox *m_transparentText; + TQCheckBox *m_borderText; + TQCheckBox *m_transparentText; - QHButtonGroup *m_alignButtonGroup; + TQHButtonGroup *m_alignButtonGroup; - QFont m_textFont; + TQFont m_textFont; KColorButton *m_fontColorButton; diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp index be2d9a9..23ac345 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp @@ -41,12 +41,12 @@ using namespace DigikamInsertTextImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inserttext, KGenericFactory<ImagePlugin_InsertText>("digikamimageplugin_inserttext")); -ImagePlugin_InsertText::ImagePlugin_InsertText(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_InsertText") +ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_InsertText") { m_insertTextAction = new KAction(i18n("Insert Text..."), "inserttext", SHIFT+CTRL+Key_T, - this, SLOT(slotInsertText()), + this, TQT_SLOT(slotInsertText()), actionCollection(), "imageplugin_inserttext"); setXMLFile("digikamimageplugin_inserttext_ui.rc"); diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.h b/digikam/imageplugins/inserttext/imageplugin_inserttext.h index 6c7936c..f310b4b 100644 --- a/digikam/imageplugins/inserttext/imageplugin_inserttext.h +++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_InsertText(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_InsertText(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_InsertText(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index f38db36..ae6b26b 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -22,23 +22,23 @@ * * ============================================================ */ -// Qt includes. - -#include <qbrush.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qframe.h> -#include <qhbuttongroup.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqbrush.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqframe.h> +#include <tqhbuttongroup.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -71,8 +71,8 @@ using namespace Digikam; namespace DigikamInsertTextImagesPlugin { -InsertTextTool::InsertTextTool(QObject* parent) - : EditorTool(parent) +InsertTextTool::InsertTextTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("inserttext"); setToolName(i18n("Insert Text")); @@ -80,12 +80,12 @@ InsertTextTool::InsertTextTool(QObject* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(0); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(0); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); m_previewWidget = new InsertTextWidget(480, 320, frame); l->addWidget(m_previewWidget); - QWhatsThis::add(m_previewWidget, i18n("<p>This previews the text inserted in the image. " + TQWhatsThis::add(m_previewWidget, i18n("<p>This previews the text inserted in the image. " "You can use the mouse to move the text to the right location.")); setToolView(frame); @@ -94,73 +94,73 @@ InsertTextTool::InsertTextTool(QObject* parent) m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout *grid = new QGridLayout(m_gboxSettings->plainPage(), 9, 1); + TQGridLayout *grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1); m_textEdit = new KTextEdit(m_gboxSettings->plainPage()); m_textEdit->setCheckSpellingEnabled(true); - m_textEdit->setWordWrap(QTextEdit::NoWrap); - QWhatsThis::add(m_textEdit, i18n("<p>Here, enter the text you want to insert in your image.")); + m_textEdit->setWordWrap(TQTextEdit::NoWrap); + TQWhatsThis::add(m_textEdit, i18n("<p>Here, enter the text you want to insert in your image.")); // ------------------------------------------------------------- m_fontChooserWidget = new FontChooserWidget(m_gboxSettings->plainPage()); - QWhatsThis::add( m_textEdit, i18n("<p>Here you can choose the font to be used.")); + TQWhatsThis::add( m_textEdit, i18n("<p>Here you can choose the font to be used.")); // ------------------------------------------------------------- KIconLoader icon; - m_alignButtonGroup = new QHButtonGroup(m_gboxSettings->plainPage()); + m_alignButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); - QPushButton *alignLeft = new QPushButton(m_alignButtonGroup); + TQPushButton *alignLeft = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignLeft, ALIGN_LEFT); alignLeft->setPixmap(icon.loadIcon("text_left", (KIcon::Group) KIcon::Small)); alignLeft->setToggleButton(true); - QToolTip::add(alignLeft, i18n("Align text to the left")); + TQToolTip::add(alignLeft, i18n("Align text to the left")); - QPushButton *alignRight = new QPushButton(m_alignButtonGroup); + TQPushButton *alignRight = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignRight, ALIGN_RIGHT); alignRight->setPixmap(icon.loadIcon("text_right", (KIcon::Group) KIcon::Small)); alignRight->setToggleButton(true); - QToolTip::add(alignRight, i18n("Align text to the right")); + TQToolTip::add(alignRight, i18n("Align text to the right")); - QPushButton *alignCenter = new QPushButton(m_alignButtonGroup); + TQPushButton *alignCenter = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignCenter, ALIGN_CENTER); alignCenter->setPixmap(icon.loadIcon("text_center", (KIcon::Group) KIcon::Small)); alignCenter->setToggleButton(true); - QToolTip::add(alignCenter, i18n("Align text to center")); + TQToolTip::add(alignCenter, i18n("Align text to center")); - QPushButton *alignBlock = new QPushButton(m_alignButtonGroup); + TQPushButton *alignBlock = new TQPushButton(m_alignButtonGroup); m_alignButtonGroup->insert(alignBlock, ALIGN_BLOCK); alignBlock->setPixmap(icon.loadIcon("text_block", (KIcon::Group) KIcon::Small)); alignBlock->setToggleButton(true); - QToolTip::add(alignBlock, i18n("Align text to a block")); + TQToolTip::add(alignBlock, i18n("Align text to a block")); m_alignButtonGroup->setExclusive(true); - m_alignButtonGroup->setFrameShape(QFrame::NoFrame); + m_alignButtonGroup->setFrameShape(TQFrame::NoFrame); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Rotation:"), m_gboxSettings->plainPage()); - m_textRotation = new QComboBox(false, m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Rotation:"), m_gboxSettings->plainPage()); + m_textRotation = new TQComboBox(false, m_gboxSettings->plainPage()); m_textRotation->insertItem(i18n("None")); m_textRotation->insertItem(i18n("90 Degrees")); m_textRotation->insertItem(i18n("180 Degrees")); m_textRotation->insertItem(i18n("270 Degrees")); - QWhatsThis::add( m_textRotation, i18n("<p>Select the text rotation to use.")); + TQWhatsThis::add( m_textRotation, i18n("<p>Select the text rotation to use.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Color:"), m_gboxSettings->plainPage()); - m_fontColorButton = new KColorButton( Qt::black, m_gboxSettings->plainPage() ); - QWhatsThis::add( m_fontColorButton, i18n("<p>Select the font color to use.")); + TQLabel *label2 = new TQLabel(i18n("Color:"), m_gboxSettings->plainPage()); + m_fontColorButton = new KColorButton( TQt::black, m_gboxSettings->plainPage() ); + TQWhatsThis::add( m_fontColorButton, i18n("<p>Select the font color to use.")); // ------------------------------------------------------------- - m_borderText = new QCheckBox(i18n("Add border"), m_gboxSettings->plainPage()); - QToolTip::add(m_borderText, i18n("Add a solid border around text using current text color")); + m_borderText = new TQCheckBox(i18n("Add border"), m_gboxSettings->plainPage()); + TQToolTip::add(m_borderText, i18n("Add a solid border around text using current text color")); - m_transparentText = new QCheckBox(i18n("Semi-transparent"), m_gboxSettings->plainPage()); - QToolTip::add(m_transparentText, i18n("Use semi-transparent text background under image")); + m_transparentText = new TQCheckBox(i18n("Semi-transparent"), m_gboxSettings->plainPage()); + TQToolTip::add(m_transparentText, i18n("Use semi-transparent text background under image")); grid->addMultiCellWidget(m_textEdit, 0, 2, 0, 1); grid->addMultiCellWidget(m_fontChooserWidget, 3, 3, 0, 1); @@ -180,29 +180,29 @@ InsertTextTool::InsertTextTool(QObject* parent) // ------------------------------------------------------------- - connect(m_fontChooserWidget, SIGNAL(fontSelected (const QFont&)), - this, SLOT(slotFontPropertiesChanged(const QFont&))); + connect(m_fontChooserWidget, TQT_SIGNAL(fontSelected (const TQFont&)), + this, TQT_SLOT(slotFontPropertiesChanged(const TQFont&))); - connect(m_fontColorButton, SIGNAL(changed(const QColor&)), - this, SLOT(slotUpdatePreview())); + connect(m_fontColorButton, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_textEdit, SIGNAL(textChanged()), - this, SLOT(slotUpdatePreview())); + connect(m_textEdit, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_alignButtonGroup, SIGNAL(released(int)), - this, SLOT(slotAlignModeChanged(int))); + connect(m_alignButtonGroup, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotAlignModeChanged(int))); - connect(m_borderText, SIGNAL(toggled(bool)), - this, SLOT(slotUpdatePreview())); + connect(m_borderText, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_transparentText, SIGNAL(toggled(bool)), - this, SLOT(slotUpdatePreview())); + connect(m_transparentText, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotUpdatePreview())); - connect(m_textRotation, SIGNAL(activated(int)), - this, SLOT(slotUpdatePreview())); + connect(m_textRotation, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotUpdatePreview())); - connect(this, SIGNAL(signalUpdatePreview()), - this, SLOT(slotUpdatePreview())); + connect(this, TQT_SIGNAL(signalUpdatePreview()), + this, TQT_SLOT(slotUpdatePreview())); // ------------------------------------------------------------- @@ -217,8 +217,8 @@ void InsertTextTool::readSettings() { KConfig *config = kapp->config(); config->setGroup("inserttext Tool"); - QColor black(0, 0, 0); - QFont defaultFont; + TQColor black(0, 0, 0); + TQFont defaultFont; int orgW = m_previewWidget->imageIface()->originalWidth(); int orgH = m_previewWidget->imageIface()->originalHeight(); @@ -237,7 +237,7 @@ void InsertTextTool::readSettings() m_transparentText->setChecked(config->readBoolEntry("Transparent Text", false)); m_previewWidget->setPositionHint(config->readRectEntry("Position Hint")); - static_cast<QPushButton*>(m_alignButtonGroup->find(m_alignTextMode))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(m_alignTextMode))->setOn(true); slotAlignModeChanged(m_alignTextMode); } @@ -265,15 +265,15 @@ void InsertTextTool::slotResetSettings() m_fontChooserWidget->blockSignals(true); m_textRotation->setCurrentItem(0); // No rotation. - m_fontColorButton->setColor(Qt::black); - QFont defaultFont; + m_fontColorButton->setColor(TQt::black); + TQFont defaultFont; m_textFont = defaultFont; // Reset to default KDE font. m_textFont.setPointSize(m_defaultSizeFont); m_fontChooserWidget->setFont(m_textFont); m_borderText->setChecked(false); m_transparentText->setChecked(false); m_previewWidget->resetEdit(); - static_cast<QPushButton*> (m_alignButtonGroup->find(ALIGN_LEFT))->setOn(true); + static_cast<TQPushButton*> (m_alignButtonGroup->tqfind(ALIGN_LEFT))->setOn(true); m_fontChooserWidget->blockSignals(false); m_fontColorButton->blockSignals(false); @@ -289,19 +289,19 @@ void InsertTextTool::slotAlignModeChanged(int mode) switch (m_alignTextMode) { case ALIGN_LEFT: - m_textEdit->setAlignment( Qt::AlignLeft ); + m_textEdit->tqsetAlignment( TQt::AlignLeft ); break; case ALIGN_RIGHT: - m_textEdit->setAlignment( Qt::AlignRight ); + m_textEdit->tqsetAlignment( TQt::AlignRight ); break; case ALIGN_CENTER: - m_textEdit->setAlignment( Qt::AlignHCenter ); + m_textEdit->tqsetAlignment( TQt::AlignHCenter ); break; case ALIGN_BLOCK: - m_textEdit->setAlignment( Qt::AlignJustify ); + m_textEdit->tqsetAlignment( TQt::AlignJustify ); break; } @@ -309,7 +309,7 @@ void InsertTextTool::slotAlignModeChanged(int mode) emit signalUpdatePreview(); } -void InsertTextTool::slotFontPropertiesChanged(const QFont& font) +void InsertTextTool::slotFontPropertiesChanged(const TQFont& font) { m_textFont = font; emit signalUpdatePreview(); diff --git a/digikam/imageplugins/inserttext/inserttexttool.h b/digikam/imageplugins/inserttext/inserttexttool.h index eacf78b..9053c45 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.h +++ b/digikam/imageplugins/inserttext/inserttexttool.h @@ -24,21 +24,21 @@ #ifndef INSERTEXTTOOL_H #define INSERTEXTTOOL_H -// Qt includes. +// TQt includes. -#include <qfont.h> -#include <qcolor.h> -#include <qimage.h> +#include <tqfont.h> +#include <tqcolor.h> +#include <tqimage.h> // Digikam includes. #include "editortool.h" -class QLabel; -class QFont; -class QHButtonGroup; -class QComboBox; -class QCheckBox; +class TQLabel; +class TQFont; +class TQHButtonGroup; +class TQComboBox; +class TQCheckBox; class KTextEdit; class KColorButton; @@ -57,10 +57,11 @@ class FontChooserWidget; class InsertTextTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - InsertTextTool(QObject *parent); + InsertTextTool(TQObject *tqparent); ~InsertTextTool(); signals: @@ -69,7 +70,7 @@ signals: private slots: - void slotFontPropertiesChanged(const QFont& font); + void slotFontPropertiesChanged(const TQFont& font); void slotUpdatePreview(); void slotAlignModeChanged(int mode); void slotResetSettings(); @@ -85,14 +86,14 @@ private: int m_alignTextMode; int m_defaultSizeFont; - QComboBox *m_textRotation; + TQComboBox *m_textRotation; - QCheckBox *m_borderText; - QCheckBox *m_transparentText; + TQCheckBox *m_borderText; + TQCheckBox *m_transparentText; - QHButtonGroup *m_alignButtonGroup; + TQHButtonGroup *m_alignButtonGroup; - QFont m_textFont; + TQFont m_textFont; KColorButton *m_fontColorButton; diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 63f2eb8..596470a 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -27,11 +27,11 @@ #include <cstdio> #include <cmath> -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qfont.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqfont.h> +#include <tqfontmetrics.h> // KDE includes. @@ -51,8 +51,8 @@ namespace DigikamInsertTextImagesPlugin { -InsertTextWidget::InsertTextWidget(int w, int h, QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +InsertTextWidget::InsertTextWidget(int w, int h, TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { m_currentMoving = false; @@ -60,17 +60,17 @@ InsertTextWidget::InsertTextWidget(int w, int h, QWidget *parent) m_data = m_iface->getPreviewImage(); m_w = m_iface->previewWidth(); m_h = m_iface->previewHeight(); - m_pixmap = new QPixmap(w, h); - m_pixmap->fill(colorGroup().background()); + m_pixmap = new TQPixmap(w, h); + m_pixmap->fill(tqcolorGroup().background()); - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); setMouseTracking(true); - m_rect = QRect(width()/2-m_w/2, height()/2-m_h/2, m_w, m_h); - m_textRect = QRect(); + m_rect = TQRect(width()/2-m_w/2, height()/2-m_h/2, m_w, m_h); + m_textRect = TQRect(); - m_backgroundColor = QColor(0xCC, 0xCC, 0xCC); + m_backgroundColor = TQColor(0xCC, 0xCC, 0xCC); m_transparency = 210; } @@ -89,12 +89,12 @@ Digikam::ImageIface* InsertTextWidget::imageIface() void InsertTextWidget::resetEdit() { // signal this needs to be filled by makePixmap - m_textRect = QRect(); + m_textRect = TQRect(); makePixmap(); - repaint(false); + tqrepaint(false); } -void InsertTextWidget::setText(QString text, QFont font, QColor color, int alignMode, +void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int alignMode, bool border, bool transparent, int rotation) { m_textString = text; @@ -106,19 +106,19 @@ void InsertTextWidget::setText(QString text, QFont font, QColor color, int align switch (alignMode) { case ALIGN_LEFT: - m_alignMode = Qt::AlignLeft; + m_alignMode = TQt::AlignLeft; break; case ALIGN_RIGHT: - m_alignMode = Qt::AlignRight; + m_alignMode = TQt::AlignRight; break; case ALIGN_CENTER: - m_alignMode = Qt::AlignHCenter; + m_alignMode = TQt::AlignHCenter; break; case ALIGN_BLOCK: - m_alignMode = Qt::AlignJustify; + m_alignMode = TQt::AlignJustify; break; } @@ -126,7 +126,7 @@ void InsertTextWidget::setText(QString text, QFont font, QColor color, int align /* if ( m_textFont.pointSize() != font.pointSize() && - !rect().contains( m_textRect.x(), m_textRect.y() ) ) + !rect().tqcontains( m_textRect.x(), m_textRect.y() ) ) { m_textFont = font; resetEdit(); @@ -137,25 +137,25 @@ void InsertTextWidget::setText(QString text, QFont font, QColor color, int align m_textFont = font; makePixmap(); - repaint(false); + tqrepaint(false); } -void InsertTextWidget::setPositionHint(QRect hint) +void InsertTextWidget::setPositionHint(TQRect hint) { // interpreted by composeImage m_positionHint = hint; if (m_textRect.isValid()) { - // invalidate current position so that hint is certainly interpreted - m_textRect = QRect(); + // tqinvalidate current position so that hint is certainly interpreted + m_textRect = TQRect(); makePixmap(); - repaint(); + tqrepaint(); } } -QRect InsertTextWidget::getPositionHint() +TQRect InsertTextWidget::getPositionHint() { - QRect hint; + TQRect hint; if (m_textRect.isValid()) { // We normalize on the size of the image, but we store as int. Precision loss is no problem. @@ -190,7 +190,7 @@ Digikam::DImg InsertTextWidget::makeInsertText(void) // Get original image Digikam::DImg image = m_iface->getOriginalImg()->copy(); - int borderWidth = QMAX(1, lroundf(ratioW)); + int borderWidth = TQMAX(1, lroundf(ratioW)); // compose and draw result on image composeImage(&image, 0, x, y, m_textFont, m_textFont.pointSizeFloat(), @@ -229,10 +229,10 @@ void InsertTextWidget::makePixmap(void) // paint pixmap for drawing this widget // First, fill with background color - m_pixmap->fill(colorGroup().background()); - QPainter p(m_pixmap); + m_pixmap->fill(tqcolorGroup().background()); + TQPainter p(m_pixmap); // Convert image to pixmap and draw it - QPixmap imagePixmap = image.convertToPixmap(); + TQPixmap imagePixmap = image.convertToPixmap(); p.drawPixmap(m_rect.x(), m_rect.y(), imagePixmap, 0, 0, imagePixmap.width(), imagePixmap.height()); @@ -241,7 +241,7 @@ void InsertTextWidget::makePixmap(void) p.translate(m_rect.x(), m_rect.y()); // compose image and draw result directly on pixmap, with correct offset - QRect textRect = composeImage(&image, &p, x, y, + TQRect textRect = composeImage(&image, &p, x, y, m_textFont, m_textFont.pointSizeFloat() * ((ratioW > ratioH) ? ratioW : ratioH), m_textRotation, m_textColor, m_alignMode, m_textString, m_textTransparent, m_backgroundColor, @@ -262,18 +262,18 @@ void InsertTextWidget::makePixmap(void) if destPainter is not null, draw directly using the painter. Returns modified area of image. */ -QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter, +TQRect InsertTextWidget::composeImage(Digikam::DImg *image, TQPainter *destPainter, int x, int y, - QFont font, float pointSize, int textRotation, QColor textColor, - int alignMode, const QString &textString, - bool transparentBackground, QColor backgroundColor, + TQFont font, float pointSize, int textRotation, TQColor textColor, + int alignMode, const TQString &textString, + bool transparentBackground, TQColor backgroundColor, BorderMode borderMode, int borderWidth, int spacing) { /* The problem we have to solve is that we have no pixel access to font rendering, - we have to let Qt do the drawing. On the other hand we need to support 16 bit, which - cannot be done with QPixmap. - The current solution cuts out the text area, lets Qt do its drawing, converts back and blits to original. + we have to let TQt do the drawing. On the other hand we need to support 16 bit, which + cannot be done with TQPixmap. + The current solution cuts out the text area, lets TQt do its drawing, converts back and blits to original. */ Digikam::DColorComposer *composer = Digikam::DColorComposer::getComposer(Digikam::DColorComposer::PorterDuffNone); @@ -291,8 +291,8 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter // find out size of the area that we are drawing to font.setPointSizeFloat(pointSize); - QFontMetrics fontMt( font ); - QRect fontRect = fontMt.boundingRect(0, 0, maxWidth, maxHeight, 0, textString); + TQFontMetrics fontMt( font ); + TQRect fontRect = fontMt.boundingRect(0, 0, maxWidth, maxHeight, 0, textString); int fontWidth, fontHeight; @@ -337,13 +337,13 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter // so if now the larger distance is actually too small, // fall back to standard placement, nothing to lose. if (x + fontWidth > maxWidth) - x = QMAX( (maxWidth - fontWidth) / 2, 0); + x = TQMAX( (maxWidth - fontWidth) / 2, 0); } else { x = maxWidth - (int)(fromRight * maxWidth) - fontWidth; if ( x < 0 ) - x = QMAX( (maxWidth - fontWidth) / 2, 0); + x = TQMAX( (maxWidth - fontWidth) / 2, 0); } // calculate vertical position @@ -351,53 +351,53 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter { y = (int)(fromTop * maxHeight); if (y + fontHeight > maxHeight) - y = QMAX( (maxHeight - fontHeight) / 2, 0); + y = TQMAX( (maxHeight - fontHeight) / 2, 0); } else { y = maxHeight - (int)(fromBottom * maxHeight) - fontHeight; if ( y < 0 ) - y = QMAX( (maxHeight - fontHeight) / 2, 0); + y = TQMAX( (maxHeight - fontHeight) / 2, 0); } - if (! QRect(x, y, fontWidth, fontHeight). - intersects(QRect(0, 0, maxWidth, maxHeight)) ) + if (! TQRect(x, y, fontWidth, fontHeight). + intersects(TQRect(0, 0, maxWidth, maxHeight)) ) { // emergency fallback - nothing is visible - x = QMAX( (maxWidth - fontWidth) / 2, 0); - y = QMAX( (maxHeight - fontHeight) / 2, 0); + x = TQMAX( (maxWidth - fontWidth) / 2, 0); + y = TQMAX( (maxHeight - fontHeight) / 2, 0); } - // invalidate position hint, use only once - m_positionHint = QRect(); + // tqinvalidate position hint, use only once + m_positionHint = TQRect(); } else { // use standard position - x = QMAX( (maxWidth - fontWidth) / 2, 0); - y = QMAX( (maxHeight - fontHeight) / 2, 0); + x = TQMAX( (maxWidth - fontWidth) / 2, 0); + y = TQMAX( (maxHeight - fontHeight) / 2, 0); } } // create a rectangle relative to image - QRect drawRect( x, y, fontWidth + 2 * borderWidth + 2 * spacing, fontHeight + 2 * borderWidth + 2 * spacing); + TQRect drawRect( x, y, fontWidth + 2 * borderWidth + 2 * spacing, fontHeight + 2 * borderWidth + 2 * spacing); // create a rectangle relative to textArea, excluding the border - QRect textAreaBackgroundRect( borderWidth, borderWidth, fontWidth + 2 * spacing, fontHeight + 2 * spacing); + TQRect textAreaBackgroundRect( borderWidth, borderWidth, fontWidth + 2 * spacing, fontHeight + 2 * spacing); // create a rectangle relative to textArea, excluding the border and spacing - QRect textAreaTextRect( borderWidth + spacing, borderWidth + spacing, fontWidth, fontHeight ); + TQRect textAreaTextRect( borderWidth + spacing, borderWidth + spacing, fontWidth, fontHeight ); // create a rectangle relative to textArea, including the border, - // for drawing the rectangle, taking into account that the width of the QPen goes in and out in equal parts - QRect textAreaDrawRect( borderWidth / 2, borderWidth / 2, fontWidth + borderWidth + 2 * spacing, + // for drawing the rectangle, taking into account that the width of the TQPen goes in and out in equal parts + TQRect textAreaDrawRect( borderWidth / 2, borderWidth / 2, fontWidth + borderWidth + 2 * spacing, fontHeight + borderWidth + 2 * spacing ); // cut out the text area Digikam::DImg textArea = image->copy(drawRect); if (textArea.isNull()) - return QRect(); + return TQRect(); // compose semi-transparent background over textArea if (transparentBackground) @@ -421,13 +421,13 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter else textNotDrawn = textArea; - // We have no direct pixel access to font rendering, so now we need to use Qt/X11 for the drawing + // We have no direct pixel access to font rendering, so now we need to use TQt/X11 for the drawing // convert text area to pixmap - QPixmap pixmap = textNotDrawn.convertToPixmap(); + TQPixmap pixmap = textNotDrawn.convertToPixmap(); // paint on pixmap - QPainter p(&pixmap); - p.setPen( QPen(textColor, 1) ) ; + TQPainter p(&pixmap); + p.setPen( TQPen(textColor, 1) ) ; p.setFont( font ); p.save(); @@ -466,23 +466,23 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter if (borderMode == BORDER_NORMAL) // Decorative border using text color. { - p.setPen( QPen(textColor, borderWidth, Qt::SolidLine, - Qt::SquareCap, Qt::RoundJoin) ) ; + p.setPen( TQPen(textColor, borderWidth, TQt::SolidLine, + TQt::SquareCap, TQt::RoundJoin) ) ; p.drawRect(textAreaDrawRect); } else if (borderMode == BORDER_SUPPORT) // Make simple dot line border to help user. { - p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); p.drawRect(textAreaDrawRect); - p.setPen(QPen(Qt::red, 1, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 1, TQt::DotLine)); p.drawRect(textAreaDrawRect); } p.end(); if (!destPainter) { - // convert to QImage, then to DImg - QImage pixmapImage = pixmap.convertToImage(); + // convert to TQImage, then to DImg + TQImage pixmapImage = pixmap.convertToImage(); Digikam::DImg textDrawn(pixmapImage.width(), pixmapImage.height(), false, true, pixmapImage.bits()); // This does not work: during the conversion, colors are altered significantly (diffs of 1 to 10 in each component), @@ -528,12 +528,12 @@ QRect InsertTextWidget::composeImage(Digikam::DImg *image, QPainter *destPainter return drawRect; } -void InsertTextWidget::paintEvent( QPaintEvent * ) +void InsertTextWidget::paintEvent( TQPaintEvent * ) { bitBlt(this, 0, 0, m_pixmap); } -void InsertTextWidget::resizeEvent(QResizeEvent * e) +void InsertTextWidget::resizeEvent(TQResizeEvent * e) { blockSignals(true); delete m_pixmap; @@ -549,8 +549,8 @@ void InsertTextWidget::resizeEvent(QResizeEvent * e) m_w = m_iface->previewWidth(); m_h = m_iface->previewHeight(); - m_pixmap = new QPixmap(w, h); - m_rect = QRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); + m_pixmap = new TQPixmap(w, h); + m_rect = TQRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); if (m_textRect.isValid()) { @@ -572,10 +572,10 @@ void InsertTextWidget::resizeEvent(QResizeEvent * e) blockSignals(false); } -void InsertTextWidget::mousePressEvent ( QMouseEvent * e ) +void InsertTextWidget::mousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton && - m_textRect.contains( e->x(), e->y() ) ) + m_textRect.tqcontains( e->x(), e->y() ) ) { m_xpos = e->x(); m_ypos = e->y(); @@ -584,15 +584,15 @@ void InsertTextWidget::mousePressEvent ( QMouseEvent * e ) } } -void InsertTextWidget::mouseReleaseEvent ( QMouseEvent * ) +void InsertTextWidget::mouseReleaseEvent ( TQMouseEvent * ) { setCursor ( KCursor::arrowCursor() ); m_currentMoving = false; } -void InsertTextWidget::mouseMoveEvent ( QMouseEvent * e ) +void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e ) { - if ( rect().contains( e->x(), e->y() ) ) + if ( rect().tqcontains( e->x(), e->y() ) ) { if ( e->state() == Qt::LeftButton && m_currentMoving ) { @@ -602,13 +602,13 @@ void InsertTextWidget::mouseMoveEvent ( QMouseEvent * e ) m_textRect.moveBy(newxpos - m_xpos, newypos - m_ypos); makePixmap(); - repaint(false); + tqrepaint(false); m_xpos = newxpos; m_ypos = newypos; setCursor( KCursor::handCursor() ); } - else if ( m_textRect.contains( e->x(), e->y() ) ) + else if ( m_textRect.tqcontains( e->x(), e->y() ) ) { setCursor ( KCursor::sizeAllCursor() ); } diff --git a/digikam/imageplugins/inserttext/inserttextwidget.h b/digikam/imageplugins/inserttext/inserttextwidget.h index 258597f..0c4ff35 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.h +++ b/digikam/imageplugins/inserttext/inserttextwidget.h @@ -25,16 +25,16 @@ #ifndef INSERTTEXTWIDGET_H #define INSERTTEXTWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qimage.h> -#include <qrect.h> -#include <qsize.h> -#include <qpixmap.h> -#include <qstring.h> -#include <qfont.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqfont.h> +#include <tqcolor.h> // KDE includes. @@ -44,7 +44,7 @@ #include "dimg.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -79,39 +79,40 @@ enum BorderMode BORDER_NORMAL }; -class InsertTextWidget : public QWidget +class InsertTextWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - InsertTextWidget(int w, int h, QWidget *parent=0); + InsertTextWidget(int w, int h, TQWidget *tqparent=0); ~InsertTextWidget(); Digikam::ImageIface* imageIface(); Digikam::DImg makeInsertText(void); - void setText(QString text, QFont font, QColor color, int alignMode, + void setText(TQString text, TQFont font, TQColor color, int alignMode, bool border, bool transparent, int rotation); void resetEdit(void); - void setPositionHint(QRect hint); - QRect getPositionHint(); + void setPositionHint(TQRect hint); + TQRect getPositionHint(); protected: - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent * e); - void mousePressEvent(QMouseEvent * e); - void mouseReleaseEvent(QMouseEvent * e); - void mouseMoveEvent(QMouseEvent * e); + void paintEvent(TQPaintEvent *e); + void resizeEvent(TQResizeEvent * e); + void mousePressEvent(TQMouseEvent * e); + void mouseReleaseEvent(TQMouseEvent * e); + void mouseMoveEvent(TQMouseEvent * e); void makePixmap(void); - QRect composeImage(Digikam::DImg *image, QPainter *destPainter, + TQRect composeImage(Digikam::DImg *image, TQPainter *destPainter, int x, int y, - QFont font, float pointSize, int textRotation, QColor textColor, - int alignMode, const QString &textString, - bool transparentBackground, QColor backgroundColor, + TQFont font, float pointSize, int textRotation, TQColor textColor, + int alignMode, const TQString &textString, + bool transparentBackground, TQColor backgroundColor, BorderMode borderMode, int borderWidth, int spacing); private: @@ -132,20 +133,20 @@ private: int m_transparency; - QPixmap *m_pixmap; + TQPixmap *m_pixmap; - QRect m_rect; - QRect m_textRect; + TQRect m_rect; + TQRect m_textRect; - QString m_textString; + TQString m_textString; - QFont m_textFont; + TQFont m_textFont; - QColor m_textColor; + TQColor m_textColor; - QColor m_backgroundColor; + TQColor m_backgroundColor; - QRect m_positionHint; + TQRect m_positionHint; Digikam::ImageIface *m_iface; }; diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp index 8c943ab..7747f39 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp @@ -28,15 +28,15 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qbrush.h> -#include <qpen.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqbrush.h> +#include <tqpen.h> // KDE includes. @@ -61,12 +61,12 @@ namespace DigikamLensDistortionImagesPlugin { -ImageEffect_LensDistortion::ImageEffect_LensDistortion(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Lens Distortion Correction"), +ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Lens Distortion Correction"), "lensdistortion", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Lens Distortion Correction"), @@ -92,23 +92,23 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 8, 1, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 8, 1, spacingHint()); - m_maskPreviewLabel = new QLabel( gboxSettings ); - m_maskPreviewLabel->setAlignment ( Qt::AlignHCenter | Qt::AlignVCenter ); - QWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction " + m_tqmaskPreviewLabel = new TQLabel( gboxSettings ); + m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + TQWhatsThis::add( m_tqmaskPreviewLabel, 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); + gridSettings->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 1); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Main:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Main:"), gboxSettings); m_mainInput = new KDoubleNumInput(gboxSettings); m_mainInput->setPrecision(1); m_mainInput->setRange(-100.0, 100.0, 0.1, true); - QWhatsThis::add( m_mainInput, i18n("<p>This value controls the amount of distortion. Negative values correct lens barrel " + TQWhatsThis::add( m_mainInput, i18n("<p>This value controls the amount of distortion. Negative values correct lens barrel " "distortion, while positive values correct lens pincushion distortion.")); gridSettings->addMultiCellWidget(label1, 1, 1, 0, 1); @@ -116,12 +116,12 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(QWidget* parent) // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Edge:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Edge:"), gboxSettings); m_edgeInput = new KDoubleNumInput(gboxSettings); m_edgeInput->setPrecision(1); m_edgeInput->setRange(-100.0, 100.0, 0.1, true); - QWhatsThis::add( m_edgeInput, i18n("<p>This value controls in the same manner as the Main control, but has more effect " + TQWhatsThis::add( m_edgeInput, i18n("<p>This value controls in the same manner as the Main control, but has more effect " "at the edges of the image than at the center.")); gridSettings->addMultiCellWidget(label2, 3, 3, 0, 1); @@ -129,24 +129,24 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(QWidget* parent) // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Zoom:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Zoom:"), gboxSettings); m_rescaleInput = new KDoubleNumInput(gboxSettings); m_rescaleInput->setPrecision(1); m_rescaleInput->setRange(-100.0, 100.0, 0.1, true); - QWhatsThis::add( m_rescaleInput, i18n("<p>This value rescales the overall image size.")); + TQWhatsThis::add( m_rescaleInput, i18n("<p>This value rescales the overall image size.")); gridSettings->addMultiCellWidget(label3, 5, 5, 0, 1); gridSettings->addMultiCellWidget(m_rescaleInput, 6, 6, 0, 1); // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Brighten:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Brighten:"), gboxSettings); m_brightenInput = new KDoubleNumInput(gboxSettings); m_brightenInput->setPrecision(1); m_brightenInput->setRange(-100.0, 100.0, 0.1, true); - QWhatsThis::add( m_brightenInput, i18n("<p>This value adjusts the brightness in image corners.")); + TQWhatsThis::add( m_brightenInput, i18n("<p>This value adjusts the brightness in image corners.")); gridSettings->addMultiCellWidget(label4, 7, 7, 0, 1); gridSettings->addMultiCellWidget(m_brightenInput, 8, 8, 0, 1); @@ -155,39 +155,39 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(QWidget* parent) // ------------------------------------------------------------- - connect(m_mainInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_mainInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_edgeInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_edgeInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_rescaleInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_rescaleInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_brightenInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_brightenInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); // ------------------------------------------------------------- /* Calc transform preview. We would like a checkered area to demonstrate the effect. - We do not have any drawing support in DImg, so we let Qt draw. - First we create a white QImage. We convert this to a QPixmap, - on which we can draw. Then we convert back to QImage, - convert the QImage to a DImg which we only need to create once, here. - Later, we apply the effect on a copy and convert the DImg to QPixmap. - Longing for Qt4 where we can paint directly on the QImage... + We do not have any drawing support in DImg, so we let TQt draw. + First we create a white TQImage. We convert this to a TQPixmap, + on which we can draw. Then we convert back to TQImage, + convert the TQImage to a DImg which we only need to create once, here. + Later, we apply the effect on a copy and convert the DImg to TQPixmap. + Longing for TQt4 where we can paint directly on the TQImage... */ - QImage preview(120, 120, 32); + TQImage preview(120, 120, 32); memset(preview.bits(), 255, preview.numBytes()); - QPixmap pix (preview); - QPainter pt(&pix); - pt.setPen( QPen(Qt::black, 1) ); - pt.fillRect( 0, 0, pix.width(), pix.height(), QBrush(Qt::black, Qt::CrossPattern) ); + TQPixmap pix (preview); + TQPainter pt(&pix); + pt.setPen( TQPen(TQt::black, 1) ); + pt.fillRect( 0, 0, pix.width(), pix.height(), TQBrush(TQt::black, TQt::CrossPattern) ); pt.drawRect( 0, 0, pix.width(), pix.height() ); pt.end(); - QImage preview2(pix.convertToImage()); + TQImage preview2(pix.convertToImage()); m_previewRasterImage = Digikam::DImg(preview2.width(), preview2.height(), false, false, preview2.bits()); } @@ -260,7 +260,7 @@ void ImageEffect_LensDistortion::prepareEffect() double b = m_brightenInput->value(); LensDistortion transformPreview(&m_previewRasterImage, 0L, m, e, r, b, 0, 0); - m_maskPreviewLabel->setPixmap(QPixmap::QPixmap(transformPreview.getTargetImage().convertToPixmap())); + m_tqmaskPreviewLabel->setPixmap(TQPixmap::TQPixmap(transformPreview.getTargetImage().convertToPixmap())); Digikam::ImageIface* iface = m_imagePreviewWidget->imageIface(); diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h index cf53f66..95ba581 100644 --- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.h @@ -25,16 +25,16 @@ #ifndef IMAGEEFFECT_LENSDISTORTION_H #define IMAGEEFFECT_LENSDISTORTION_H -// Qt includes. +// TQt includes. -#include <qimage.h> +#include <tqimage.h> // Digikam includes. #include "dimg.h" #include "imageguidedlg.h" -class QLabel; +class TQLabel; class KDoubleNumInput; @@ -44,10 +44,11 @@ namespace DigikamLensDistortionImagesPlugin class ImageEffect_LensDistortion : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_LensDistortion(QWidget *parent); + ImageEffect_LensDistortion(TQWidget *tqparent); ~ImageEffect_LensDistortion(); private slots: @@ -66,7 +67,7 @@ private: private: - QLabel *m_maskPreviewLabel; + TQLabel *m_tqmaskPreviewLabel; KDoubleNumInput *m_mainInput; KDoubleNumInput *m_edgeInput; diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp index 5bd2495..2333659 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp @@ -41,11 +41,11 @@ using namespace DigikamLensDistortionImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_lensdistortion, KGenericFactory<ImagePlugin_LensDistortion>("digikamimageplugin_lensdistortion")); -ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_LensDistortion") +ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_LensDistortion") { m_lensdistortionAction = new KAction(i18n("Lens Distortion..."), "lensdistortion", 0, - this, SLOT(slotLensDistortion()), + this, TQT_SLOT(slotLensDistortion()), actionCollection(), "imageplugin_lensdistortion"); setXMLFile("digikamimageplugin_lensdistortion_ui.rc"); diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h index ec21047..ab2891c 100644 --- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_LensDistortion(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_LensDistortion(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_LensDistortion(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.cpp b/digikam/imageplugins/lensdistortion/lensdistortion.cpp index 1d1e91d..03c9266 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortion.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortion.cpp @@ -37,10 +37,10 @@ namespace DigikamLensDistortionImagesPlugin { -LensDistortion::LensDistortion(Digikam::DImg *orgImage, QObject *parent, double main, +LensDistortion::LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent, double main, double edge, double rescale, double brighten, int center_x, int center_y) - : Digikam::DImgThreadedFilter(orgImage, parent, "LensDistortion") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "LensDistortion") { m_main = main; m_edge = edge; diff --git a/digikam/imageplugins/lensdistortion/lensdistortion.h b/digikam/imageplugins/lensdistortion/lensdistortion.h index 3d72812..7953839 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortion.h +++ b/digikam/imageplugins/lensdistortion/lensdistortion.h @@ -37,7 +37,7 @@ class LensDistortion : public Digikam::DImgThreadedFilter public: - LensDistortion(Digikam::DImg *orgImage, QObject *parent=0, double main=0.0, + LensDistortion(Digikam::DImg *orgImage, TQObject *tqparent=0, double main=0.0, double edge=0.0, double rescale=0.0, double brighten=0.0, int center_x=0, int center_y=0); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp index bec8cb8..7b63cd6 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp @@ -28,16 +28,16 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qbrush.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qwhatsthis.h> -#include <qimage.h> +#include <tqbrush.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqwhatsthis.h> +#include <tqimage.h> // KDE includes. @@ -69,14 +69,14 @@ using namespace Digikam; namespace DigikamLensDistortionImagesPlugin { -LensDistortionTool::LensDistortionTool(QObject* parent) - : EditorToolThreaded(parent) +LensDistortionTool::LensDistortionTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("lensdistortion"); setToolName(i18n("Lens Distortion")); setToolIcon(SmallIcon("lensdistortion")); - m_previewWidget = new ImageWidget("lensdistortion Tool", 0, QString(), + m_previewWidget = new ImageWidget("lensdistortion Tool", 0, TQString(), false, ImageGuideWidget::HVGuideMode); setToolView(m_previewWidget); @@ -87,56 +87,56 @@ LensDistortionTool::LensDistortionTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel, EditorToolSettings::ColorGuide); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 9, 1); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 9, 1); - m_maskPreviewLabel = new QLabel( m_gboxSettings->plainPage() ); - m_maskPreviewLabel->setAlignment ( Qt::AlignHCenter | Qt::AlignVCenter ); - QWhatsThis::add( m_maskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction " + m_tqmaskPreviewLabel = new TQLabel( m_gboxSettings->plainPage() ); + m_tqmaskPreviewLabel->tqsetAlignment ( TQt::AlignHCenter | TQt::AlignVCenter ); + TQWhatsThis::add( m_tqmaskPreviewLabel, i18n("<p>You can see here a thumbnail preview of the distortion correction " "applied to a cross pattern.") ); // ------------------------------------------------------------- - QLabel *label1 = new QLabel(i18n("Main:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Main:"), m_gboxSettings->plainPage()); m_mainInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_mainInput->setPrecision(1); m_mainInput->setRange(-100.0, 100.0, 0.1); m_mainInput->setDefaultValue(0.0); - QWhatsThis::add(m_mainInput, i18n("<p>This value controls the amount of distortion. Negative values correct lens barrel " + TQWhatsThis::add(m_mainInput, i18n("<p>This value controls the amount of distortion. Negative values correct lens barrel " "distortion, while positive values correct lens pincushion distortion.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Edge:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Edge:"), m_gboxSettings->plainPage()); m_edgeInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_edgeInput->setPrecision(1); m_edgeInput->setRange(-100.0, 100.0, 0.1); m_edgeInput->setDefaultValue(0.0); - QWhatsThis::add(m_edgeInput, i18n("<p>This value controls in the same manner as the Main control, but has more effect " + TQWhatsThis::add(m_edgeInput, i18n("<p>This value controls in the same manner as the Main control, but has more effect " "at the edges of the image than at the center.")); // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Zoom:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Zoom:"), m_gboxSettings->plainPage()); m_rescaleInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_rescaleInput->setPrecision(1); m_rescaleInput->setRange(-100.0, 100.0, 0.1); m_rescaleInput->setDefaultValue(0.0); - QWhatsThis::add(m_rescaleInput, i18n("<p>This value rescales the overall image size.")); + TQWhatsThis::add(m_rescaleInput, i18n("<p>This value rescales the overall image size.")); // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Brighten:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Brighten:"), m_gboxSettings->plainPage()); m_brightenInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_brightenInput->setPrecision(1); m_brightenInput->setRange(-100.0, 100.0, 0.1); m_brightenInput->setDefaultValue(0.0); - QWhatsThis::add(m_brightenInput, i18n("<p>This value adjusts the brightness in image corners.")); + TQWhatsThis::add(m_brightenInput, i18n("<p>This value adjusts the brightness in image corners.")); - grid->addMultiCellWidget(m_maskPreviewLabel, 0, 0, 0, 1); + grid->addMultiCellWidget(m_tqmaskPreviewLabel, 0, 0, 0, 1); grid->addMultiCellWidget(label1, 1, 1, 0, 1); grid->addMultiCellWidget(m_mainInput, 2, 2, 0, 1); grid->addMultiCellWidget(label2, 3, 3, 0, 1); @@ -154,42 +154,42 @@ LensDistortionTool::LensDistortionTool(QObject* parent) // ------------------------------------------------------------- - connect(m_mainInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_mainInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_edgeInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_edgeInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_rescaleInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_rescaleInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_brightenInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_brightenInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_gboxSettings, SIGNAL(signalColorGuideChanged()), - this, SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), + this, TQT_SLOT(slotColorGuideChanged())); // ------------------------------------------------------------- /* Calc transform preview. We would like a checkered area to demonstrate the effect. - We do not have any drawing support in DImg, so we let Qt draw. - First we create a white QImage. We convert this to a QPixmap, - on which we can draw. Then we convert back to QImage, - convert the QImage to a DImg which we only need to create once, here. - Later, we apply the effect on a copy and convert the DImg to QPixmap. - Longing for Qt4 where we can paint directly on the QImage... + We do not have any drawing support in DImg, so we let TQt draw. + First we create a white TQImage. We convert this to a TQPixmap, + on which we can draw. Then we convert back to TQImage, + convert the TQImage to a DImg which we only need to create once, here. + Later, we apply the effect on a copy and convert the DImg to TQPixmap. + Longing for TQt4 where we can paint directly on the TQImage... */ - QImage preview(120, 120, 32); + TQImage preview(120, 120, 32); memset(preview.bits(), 255, preview.numBytes()); - QPixmap pix (preview); - QPainter pt(&pix); - pt.setPen( QPen(Qt::black, 1) ); - pt.fillRect( 0, 0, pix.width(), pix.height(), QBrush(Qt::black, Qt::CrossPattern) ); + TQPixmap pix (preview); + TQPainter pt(&pix); + pt.setPen( TQPen(TQt::black, 1) ); + pt.fillRect( 0, 0, pix.width(), pix.height(), TQBrush(TQt::black, TQt::CrossPattern) ); pt.drawRect( 0, 0, pix.width(), pix.height() ); pt.end(); - QImage preview2(pix.convertToImage()); + TQImage preview2(pix.convertToImage()); m_previewRasterImage = DImg(preview2.width(), preview2.height(), false, false, preview2.bits()); } @@ -217,7 +217,7 @@ void LensDistortionTool::readSettings() m_edgeInput->setValue(config->readDoubleNumEntry("4th Order Distortion",m_edgeInput->defaultValue())); m_rescaleInput->setValue(config->readDoubleNumEntry("Zoom Factor", m_rescaleInput->defaultValue())); m_brightenInput->setValue(config->readDoubleNumEntry("Brighten", m_brightenInput->defaultValue())); - m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &Qt::red)); + m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &TQt::red)); m_gboxSettings->setGuideSize(config->readNumEntry("Guide Width", 1)); m_mainInput->blockSignals(false); @@ -274,7 +274,7 @@ void LensDistortionTool::prepareEffect() double b = m_brightenInput->value(); LensDistortion transformPreview(&m_previewRasterImage, 0L, m, e, r, b, 0, 0); - m_maskPreviewLabel->setPixmap(QPixmap(transformPreview.getTargetImage().convertToPixmap())); + m_tqmaskPreviewLabel->setPixmap(TQPixmap(transformPreview.getTargetImage().convertToPixmap())); ImageIface* iface = m_previewWidget->imageIface(); diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.h b/digikam/imageplugins/lensdistortion/lensdistortiontool.h index 9e594fc..1bc0019 100644 --- a/digikam/imageplugins/lensdistortion/lensdistortiontool.h +++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.h @@ -30,7 +30,7 @@ #include "dimg.h" #include "editortool.h" -class QLabel; +class TQLabel; namespace KDcrawIface { @@ -49,10 +49,11 @@ namespace DigikamLensDistortionImagesPlugin class LensDistortionTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - LensDistortionTool(QObject *parent); + LensDistortionTool(TQObject *tqparent); ~LensDistortionTool(); private slots: @@ -72,7 +73,7 @@ private: private: - QLabel *m_maskPreviewLabel; + TQLabel *m_tqmaskPreviewLabel; KDcrawIface::RDoubleNumInput *m_mainInput; KDcrawIface::RDoubleNumInput *m_edgeInput; diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index aed84cd..fd0d0a2 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -21,18 +21,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qcheckbox.h> -#include <qstring.h> -#include <qtabwidget.h> -#include <qimage.h> -#include <qlayout.h> -#include <qfile.h> -#include <qtextstream.h> +// TQt includes. + +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqcheckbox.h> +#include <tqstring.h> +#include <tqtabwidget.h> +#include <tqimage.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqtextstream.h> // KDE includes. @@ -61,12 +61,12 @@ namespace DigikamNoiseReductionImagesPlugin { -ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Noise Reduction"), +ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Noise Reduction"), "noisereduction", true, true, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Noise Reduction"), @@ -87,18 +87,18 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QTabWidget *mainTab = new QTabWidget(m_imagePreviewWidget); + TQTabWidget *mainTab = new TQTabWidget(m_imagePreviewWidget); - QWidget* firstPage = new QWidget( mainTab ); - QGridLayout* gridSettings = new QGridLayout( firstPage, 6, 1, spacingHint()); + TQWidget* firstPage = new TQWidget( mainTab ); + TQGridLayout* gridSettings = new TQGridLayout( firstPage, 6, 1, spacingHint()); mainTab->addTab( firstPage, i18n("Details") ); - QLabel *label1 = new QLabel(i18n("Radius:"), firstPage); + TQLabel *label1 = new TQLabel(i18n("Radius:"), firstPage); m_radiusInput = new KDoubleNumInput(firstPage); m_radiusInput->setPrecision(1); m_radiusInput->setRange(0.0, 10.0, 0.1, true); - QWhatsThis::add( m_radiusInput, i18n("<p><b>Radius</b>: this control selects the " + TQWhatsThis::add( m_radiusInput, i18n("<p><b>Radius</b>: this control selects the " "gliding window size used for the filter. Larger values do not increase " "the amount of time needed to filter each pixel in the image but " "can cause blurring. This window moves across the image, and the " @@ -112,12 +112,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Threshold:"), firstPage); + TQLabel *label3 = new TQLabel(i18n("Threshold:"), firstPage); m_thresholdInput = new KDoubleNumInput(firstPage); m_thresholdInput->setPrecision(2); m_thresholdInput->setRange(0.0, 1.0, 0.01, true); - QWhatsThis::add( m_thresholdInput, i18n("<p><b>Threshold</b>: use the slider for coarse adjustment, " + TQWhatsThis::add( m_thresholdInput, i18n("<p><b>Threshold</b>: use the slider for coarse adjustment, " "and the spin control for fine adjustment to control edge detection sensitivity. " "This value should be set so that edges and details are clearly visible " "and noise is smoothed out. " @@ -130,12 +130,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Texture:"), firstPage); + TQLabel *label4 = new TQLabel(i18n("Texture:"), firstPage); m_textureInput = new KDoubleNumInput(firstPage); m_textureInput->setPrecision(2); m_textureInput->setRange(-0.99, 0.99, 0.01, true); - QWhatsThis::add( m_textureInput, i18n("<p><b>Texture</b>: this control sets the texture accuracy. " + TQWhatsThis::add( m_textureInput, i18n("<p><b>Texture</b>: this control sets the texture accuracy. " "This value can be used, to get more or less texture accuracy. When decreased, " "then noise and texture are blurred out, when increased then texture is " "amplified, but also noise will increase. It has almost no effect on image edges.")); @@ -145,12 +145,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label7 = new QLabel(i18n("Sharpness:"), firstPage); // Filter setting "Lookahead". + TQLabel *label7 = new TQLabel(i18n("Sharpness:"), firstPage); // Filter setting "Lookahead". m_sharpnessInput = new KDoubleNumInput(firstPage); m_sharpnessInput->setPrecision(2); m_sharpnessInput->setRange(0.0, 1.0, 0.1, true); - QWhatsThis::add( m_sharpnessInput, i18n("<p><b>Sharpness</b>: " + TQWhatsThis::add( m_sharpnessInput, i18n("<p><b>Sharpness</b>: " "This value improves the frequency response for the filter. " "When it is too strong then not all noise can be removed, or spike noise may appear. " "Set it near to maximum, if you want to remove very weak noise or JPEG-artifacts, " @@ -161,12 +161,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label5 = new QLabel(i18n("Edge Lookahead:"), firstPage); // Filter setting "Sharp". + TQLabel *label5 = new TQLabel(i18n("Edge Lookahead:"), firstPage); // Filter setting "Sharp". m_lookaheadInput = new KDoubleNumInput(firstPage); m_lookaheadInput->setPrecision(2); m_lookaheadInput->setRange(0.01, 20.0, 0.01, true); - QWhatsThis::add( m_lookaheadInput, i18n("<p><b>Edge</b>: " + TQWhatsThis::add( m_lookaheadInput, i18n("<p><b>Edge</b>: " "This value defines the pixel distance to which the filter looks ahead for edges. " "When this value is increased, then spike noise is erased. " "You can eventually re-adjust the <b>Edge</b> filter, when you have changed this setting. " @@ -178,12 +178,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label10 = new QLabel(i18n("Erosion:"), firstPage); + TQLabel *label10 = new TQLabel(i18n("Erosion:"), firstPage); m_phaseInput = new KDoubleNumInput(firstPage); m_phaseInput->setPrecision(1); m_phaseInput->setRange(0.5, 20.0, 0.5, true); - QWhatsThis::add( m_phaseInput, i18n("<p><b>Erosion</b>: " + TQWhatsThis::add( m_phaseInput, i18n("<p><b>Erosion</b>: " "Use this to increase edge noise erosion and spike noise erosion " "(noise is removed by erosion).")); @@ -194,16 +194,16 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QWidget* secondPage = new QWidget( mainTab ); - QGridLayout* gridSettings2 = new QGridLayout( secondPage, 4, 1, spacingHint()); + TQWidget* secondPage = new TQWidget( mainTab ); + TQGridLayout* gridSettings2 = new TQGridLayout( secondPage, 4, 1, spacingHint()); mainTab->addTab( secondPage, i18n("Advanced") ); - QLabel *label2 = new QLabel(i18n("Luminance:"), secondPage); + TQLabel *label2 = new TQLabel(i18n("Luminance:"), secondPage); m_lumToleranceInput = new KDoubleNumInput(secondPage); m_lumToleranceInput->setPrecision(1); m_lumToleranceInput->setRange(0.0, 1.0, 0.1, true); - QWhatsThis::add( m_lumToleranceInput, i18n("<p><b>Luminance</b>: this control sets the luminance tolerance of the image." + TQWhatsThis::add( m_lumToleranceInput, i18n("<p><b>Luminance</b>: this control sets the luminance tolerance of the image." "We recommend using either the <b>Color</b> or the <b>Luminance</b> tolerance settings " "to make an image correction, not both at the same time. These settings " "do not influence the main smoothing process controlled by the <b>Details</b> " @@ -214,12 +214,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label6 = new QLabel(i18n("Color:"), secondPage); + TQLabel *label6 = new TQLabel(i18n("Color:"), secondPage); m_csmoothInput = new KDoubleNumInput(secondPage); m_csmoothInput->setPrecision(1); m_csmoothInput->setRange(0.0, 1.0, 0.1, true); - QWhatsThis::add( m_csmoothInput, i18n("<p><b>Color</b>: this control sets the color tolerance of the image. It is " + TQWhatsThis::add( m_csmoothInput, i18n("<p><b>Color</b>: this control sets the color tolerance of the image. It is " "recommended using either the <b>Color</b> or the <b>Luminance</b> tolerance " "to make image correction, not both at the same time. These settings " "do not influence the main smoothing process controlled by the <b>Details</b> " @@ -230,12 +230,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label8 = new QLabel(i18n("Gamma:"), secondPage); + TQLabel *label8 = new TQLabel(i18n("Gamma:"), secondPage); m_gammaInput = new KDoubleNumInput(secondPage); m_gammaInput->setPrecision(1); m_gammaInput->setRange(0.3, 3.0, 0.1, true); - QWhatsThis::add( m_gammaInput, i18n("<p><b>Gamma</b>: this control sets the gamma tolerance of the image. This value " + TQWhatsThis::add( m_gammaInput, i18n("<p><b>Gamma</b>: this control sets the gamma tolerance of the image. This value " "can be used to increase the tolerance values for darker areas (which commonly " "are noisier). This results in more blur for shadow areas.")); @@ -244,12 +244,12 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- - QLabel *label9 = new QLabel(i18n("Damping:"), secondPage); + TQLabel *label9 = new TQLabel(i18n("Damping:"), secondPage); m_dampingInput = new KDoubleNumInput(secondPage); m_dampingInput->setPrecision(1); m_dampingInput->setRange(0.5, 20.0, 0.5, true); - QWhatsThis::add( m_dampingInput, i18n("<p><b>Damping</b>: this control sets the phase-jitter damping adjustment. " + TQWhatsThis::add( m_dampingInput, i18n("<p><b>Damping</b>: this control sets the phase-jitter damping adjustment. " "This value defines how fast the adaptive filter-radius reacts to luminance " "variations. If increased, then edges appear smoother; if too high, then blur " "may occur. If at minimum, then noise and phase jitter at the edges can occur. It " @@ -265,35 +265,35 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(QWidget* parent) // ------------------------------------------------------------- -// connect(m_radiusInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_radiusInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_lumToleranceInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_lumToleranceInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_thresholdInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_thresholdInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_textureInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_textureInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_sharpnessInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_sharpnessInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_csmoothInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_csmoothInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_lookaheadInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_lookaheadInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_gammaInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_gammaInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_dampingInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_dampingInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); // -// connect(m_phaseInput, SIGNAL(valueChanged(double)), -// this, SLOT(slotTimer())); +// connect(m_phaseInput, TQT_SIGNAL(valueChanged(double)), +// this, TQT_SLOT(slotTimer())); } ImageEffect_NoiseReduction::~ImageEffect_NoiseReduction() @@ -478,21 +478,21 @@ void ImageEffect_NoiseReduction::putFinalData(void) void ImageEffect_NoiseReduction::slotUser3() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Noise Reduction Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Noise Reduction Configuration File" ) { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Noise Reduction settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -520,16 +520,16 @@ void ImageEffect_NoiseReduction::slotUser3() void ImageEffect_NoiseReduction::slotUser2() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Noise Reduction Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Photograph Noise Reduction Configuration File\n"; stream << m_radiusInput->value() << "\n"; stream << m_lumToleranceInput->value() << "\n"; diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h index b9c7b81..9aab21e 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.h @@ -36,10 +36,11 @@ namespace DigikamNoiseReductionImagesPlugin class ImageEffect_NoiseReduction : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_NoiseReduction(QWidget* parent); + ImageEffect_NoiseReduction(TQWidget* tqparent); ~ImageEffect_NoiseReduction(); private slots: diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp index 2d0851c..d8edb6b 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp @@ -42,11 +42,11 @@ using namespace DigikamNoiseReductionImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_noisereduction, KGenericFactory<ImagePlugin_NoiseReduction>("digikamimageplugin_noisereduction")); -ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_NoiseReduction") +ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_NoiseReduction") { m_noiseReductionAction = new KAction(i18n("Noise Reduction..."), "noisereduction", 0, - this, SLOT(slotNoiseReduction()), + this, TQT_SLOT(slotNoiseReduction()), actionCollection(), "imageplugin_noisereduction"); setXMLFile("digikamimageplugin_noisereduction_ui.rc"); diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h index 98260b0..270ba8e 100644 --- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h +++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_NoiseReduction : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_NoiseReduction(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_NoiseReduction(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_NoiseReduction(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/noisereduction/noisereduction.cpp b/digikam/imageplugins/noisereduction/noisereduction.cpp index 53423df..c981422 100644 --- a/digikam/imageplugins/noisereduction/noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/noisereduction.cpp @@ -48,10 +48,10 @@ namespace DigikamNoiseReductionImagesPlugin { -NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, QObject *parent, +NoiseReduction::NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent, double radius, double lsmooth, double effect, double texture, double sharp, double csmooth, double lookahead, double gamma, double damping, double phase) - : Digikam::DImgThreadedFilter(orgImage, parent, "NoiseReduction") + : Digikam::DImgThreadedFilter(orgImage, tqparent, "NoiseReduction") { m_radius = radius; /* default radius default = 1.0 */ m_sharp = sharp; /* Sharpness factor default = 0.25 */ @@ -107,18 +107,18 @@ void NoiseReduction::filterImage(void) // Allocate and init buffers - uchar *src = new uchar[ QMAX (width, height) * bytes ]; - uchar *dest = new uchar[ QMAX (width, height) * bytes ]; - float *data = new float[ QMAX (width, height) + 2*w ]; - float *data2 = new float[ QMAX (width, height) + 2*w ]; - float *buffer = new float[ QMAX (width, height) + 2*w ]; - float *rbuf = new float[ QMAX (width, height) + 2*w ]; - float *tbuf = new float[ QMAX (width, height) + 2*w ]; + uchar *src = new uchar[ TQMAX (width, height) * bytes ]; + uchar *dest = new uchar[ TQMAX (width, height) * bytes ]; + float *data = new float[ TQMAX (width, height) + 2*w ]; + float *data2 = new float[ TQMAX (width, height) + 2*w ]; + float *buffer = new float[ TQMAX (width, height) + 2*w ]; + float *rbuf = new float[ TQMAX (width, height) + 2*w ]; + float *tbuf = new float[ TQMAX (width, height) + 2*w ]; - memset (src, 0, QMAX (width, height) * bytes); - memset (dest, 0, QMAX (width, height) * bytes); + memset (src, 0, TQMAX (width, height) * bytes); + memset (dest, 0, TQMAX (width, height) * bytes); - for (i=0 ; i < QMAX(width,height)+2*w-1 ; i++) + for (i=0 ; i < TQMAX(width,height)+2*w-1 ; i++) data[i] = data2[i] = buffer[i] = rbuf[i] = tbuf[i] = 0.0; // Initialize the damping filter coefficients @@ -161,7 +161,7 @@ void NoiseReduction::filterImage(void) postProgress( progress ); } - // merge the source and destination (which currently contains + // merge the source and destination (which currently tqcontains // the blurred version) images for (row = 0 ; !m_cancel && (row < height) ; row++) diff --git a/digikam/imageplugins/noisereduction/noisereduction.h b/digikam/imageplugins/noisereduction/noisereduction.h index 0d9aafd..e3887f9 100644 --- a/digikam/imageplugins/noisereduction/noisereduction.h +++ b/digikam/imageplugins/noisereduction/noisereduction.h @@ -201,7 +201,7 @@ class NoiseReduction : public Digikam::DImgThreadedFilter public: - NoiseReduction(Digikam::DImg *orgImage, QObject *parent, + NoiseReduction(Digikam::DImg *orgImage, TQObject *tqparent, double radius, double lsmooth, double effect, double texture, double sharp, double csmooth, double lookahead, double gamma, double damping, double phase); ~NoiseReduction(){}; diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index 5b27b16..759f336 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -21,18 +21,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qcheckbox.h> -#include <qfile.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qstring.h> -#include <qtabwidget.h> -#include <qtextstream.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcheckbox.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqtabwidget.h> +#include <tqtextstream.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -68,8 +68,8 @@ using namespace Digikam; namespace DigikamNoiseReductionImagesPlugin { -NoiseReductionTool::NoiseReductionTool(QObject* parent) - : EditorToolThreaded(parent) +NoiseReductionTool::NoiseReductionTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("noisereduction"); setToolName(i18n("Noise Reduction")); @@ -85,19 +85,19 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 1, 1); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 1, 1); - QTabWidget *mainTab = new QTabWidget(m_gboxSettings->plainPage()); - QWidget* firstPage = new QWidget( mainTab ); - QGridLayout* grid1 = new QGridLayout(firstPage, 6, 1); + TQTabWidget *mainTab = new TQTabWidget(m_gboxSettings->plainPage()); + TQWidget* firstPage = new TQWidget( mainTab ); + TQGridLayout* grid1 = new TQGridLayout(firstPage, 6, 1); - QLabel *label1 = new QLabel(i18n("Radius:"), firstPage); + TQLabel *label1 = new TQLabel(i18n("Radius:"), firstPage); m_radiusInput = new RDoubleNumInput(firstPage); m_radiusInput->setPrecision(1); m_radiusInput->setRange(0.0, 10.0, 0.1); m_radiusInput->setDefaultValue(1.0); - QWhatsThis::add( m_radiusInput, i18n("<p><b>Radius</b>: this control selects the " + TQWhatsThis::add( m_radiusInput, i18n("<p><b>Radius</b>: this control selects the " "gliding window size used for the filter. Larger values do not increase " "the amount of time needed to filter each pixel in the image but " "can cause blurring. This window moves across the image, and the " @@ -108,13 +108,13 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Threshold:"), firstPage); + TQLabel *label3 = new TQLabel(i18n("Threshold:"), firstPage); m_thresholdInput = new RDoubleNumInput(firstPage); m_thresholdInput->setPrecision(2); m_thresholdInput->setRange(0.0, 1.0, 0.01); m_thresholdInput->setDefaultValue(0.08); - QWhatsThis::add( m_thresholdInput, i18n("<p><b>Threshold</b>: use the slider for coarse adjustment, " + TQWhatsThis::add( m_thresholdInput, i18n("<p><b>Threshold</b>: use the slider for coarse adjustment, " "and the spin control for fine adjustment to control edge detection sensitivity. " "This value should be set so that edges and details are clearly visible " "and noise is smoothed out. " @@ -124,26 +124,26 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label4 = new QLabel(i18n("Texture:"), firstPage); + TQLabel *label4 = new TQLabel(i18n("Texture:"), firstPage); m_textureInput = new RDoubleNumInput(firstPage); m_textureInput->setPrecision(2); m_textureInput->setRange(-0.99, 0.99, 0.01); m_textureInput->setDefaultValue(0.0); - QWhatsThis::add( m_textureInput, i18n("<p><b>Texture</b>: this control sets the texture accuracy. " + TQWhatsThis::add( m_textureInput, i18n("<p><b>Texture</b>: this control sets the texture accuracy. " "This value can be used, to get more or less texture accuracy. When decreased, " "then noise and texture are blurred out, when increased then texture is " "amplified, but also noise will increase. It has almost no effect on image edges.")); // ------------------------------------------------------------- - QLabel *label7 = new QLabel(i18n("Sharpness:"), firstPage); // Filter setting "Lookahead". + TQLabel *label7 = new TQLabel(i18n("Sharpness:"), firstPage); // Filter setting "Lookahead". m_sharpnessInput = new RDoubleNumInput(firstPage); m_sharpnessInput->setPrecision(2); m_sharpnessInput->setRange(0.0, 1.0, 0.1); m_sharpnessInput->setDefaultValue(0.25); - QWhatsThis::add( m_sharpnessInput, i18n("<p><b>Sharpness</b>: " + TQWhatsThis::add( m_sharpnessInput, i18n("<p><b>Sharpness</b>: " "This value improves the frequency response for the filter. " "When it is too strong then not all noise can be removed, or spike noise may appear. " "Set it near to maximum, if you want to remove very weak noise or JPEG-artifacts, " @@ -151,13 +151,13 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label5 = new QLabel(i18n("Edge Lookahead:"), firstPage); // Filter setting "Sharp". + TQLabel *label5 = new TQLabel(i18n("Edge Lookahead:"), firstPage); // Filter setting "Sharp". m_lookaheadInput = new RDoubleNumInput(firstPage); m_lookaheadInput->setPrecision(2); m_lookaheadInput->setRange(0.01, 20.0, 0.01); m_lookaheadInput->setDefaultValue(2.0); - QWhatsThis::add( m_lookaheadInput, i18n("<p><b>Edge</b>: " + TQWhatsThis::add( m_lookaheadInput, i18n("<p><b>Edge</b>: " "This value defines the pixel distance to which the filter looks ahead for edges. " "When this value is increased, then spike noise is erased. " "You can eventually re-adjust the <b>Edge</b> filter, when you have changed this setting. " @@ -166,13 +166,13 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label10 = new QLabel(i18n("Erosion:"), firstPage); + TQLabel *label10 = new TQLabel(i18n("Erosion:"), firstPage); m_phaseInput = new RDoubleNumInput(firstPage); m_phaseInput->setPrecision(1); m_phaseInput->setRange(0.5, 20.0, 0.5); m_phaseInput->setDefaultValue(1.0); - QWhatsThis::add( m_phaseInput, i18n("<p><b>Erosion</b>: " + TQWhatsThis::add( m_phaseInput, i18n("<p><b>Erosion</b>: " "Use this to increase edge noise erosion and spike noise erosion " "(noise is removed by erosion).")); @@ -197,16 +197,16 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QWidget* secondPage = new QWidget( mainTab ); - QGridLayout* grid2 = new QGridLayout( secondPage, 4, 1); + TQWidget* secondPage = new TQWidget( mainTab ); + TQGridLayout* grid2 = new TQGridLayout( secondPage, 4, 1); - QLabel *label2 = new QLabel(i18n("Luminance:"), secondPage); + TQLabel *label2 = new TQLabel(i18n("Luminance:"), secondPage); m_lumToleranceInput = new RDoubleNumInput(secondPage); m_lumToleranceInput->setPrecision(1); m_lumToleranceInput->setRange(0.0, 1.0, 0.1); m_lumToleranceInput->setDefaultValue(1.0); - QWhatsThis::add( m_lumToleranceInput, i18n("<p><b>Luminance</b>: this control sets the luminance tolerance of the image." + TQWhatsThis::add( m_lumToleranceInput, i18n("<p><b>Luminance</b>: this control sets the luminance tolerance of the image." "We recommend using either the <b>Color</b> or the <b>Luminance</b> tolerance settings " "to make an image correction, not both at the same time. These settings " "do not influence the main smoothing process controlled by the <b>Details</b> " @@ -214,13 +214,13 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label6 = new QLabel(i18n("Color:"), secondPage); + TQLabel *label6 = new TQLabel(i18n("Color:"), secondPage); m_csmoothInput = new RDoubleNumInput(secondPage); m_csmoothInput->setPrecision(1); m_csmoothInput->setRange(0.0, 1.0, 0.1); m_csmoothInput->setDefaultValue(1.0); - QWhatsThis::add( m_csmoothInput, i18n("<p><b>Color</b>: this control sets the color tolerance of the image. It is " + TQWhatsThis::add( m_csmoothInput, i18n("<p><b>Color</b>: this control sets the color tolerance of the image. It is " "recommended using either the <b>Color</b> or the <b>Luminance</b> tolerance " "to make image correction, not both at the same time. These settings " "do not influence the main smoothing process controlled by the <b>Details</b> " @@ -228,25 +228,25 @@ NoiseReductionTool::NoiseReductionTool(QObject* parent) // ------------------------------------------------------------- - QLabel *label8 = new QLabel(i18n("Gamma:"), secondPage); + TQLabel *label8 = new TQLabel(i18n("Gamma:"), secondPage); m_gammaInput = new RDoubleNumInput(secondPage); m_gammaInput->setPrecision(1); m_gammaInput->setRange(0.3, 3.0, 0.1); m_gammaInput->setDefaultValue(1.4); - QWhatsThis::add( m_gammaInput, i18n("<p><b>Gamma</b>: this control sets the gamma tolerance of the image. This value " + TQWhatsThis::add( m_gammaInput, i18n("<p><b>Gamma</b>: this control sets the gamma tolerance of the image. This value " "can be used to increase the tolerance values for darker areas (which commonly " "are noisier). This results in more blur for shadow areas.")); // ------------------------------------------------------------- - QLabel *label9 = new QLabel(i18n("Damping:"), secondPage); + TQLabel *label9 = new TQLabel(i18n("Damping:"), secondPage); m_dampingInput = new RDoubleNumInput(secondPage); m_dampingInput->setPrecision(1); m_dampingInput->setRange(0.5, 20.0, 0.5); m_dampingInput->setDefaultValue(5.0); - QWhatsThis::add( m_dampingInput, i18n("<p><b>Damping</b>: this control sets the phase-jitter damping adjustment. " + TQWhatsThis::add( m_dampingInput, i18n("<p><b>Damping</b>: this control sets the phase-jitter damping adjustment. " "This value defines how fast the adaptive filter-radius reacts to luminance " "variations. If increased, then edges appear smoother; if too high, then blur " "may occur. If at minimum, then noise and phase jitter at the edges can occur. It " @@ -463,21 +463,21 @@ void NoiseReductionTool::putFinalData() void NoiseReductionTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Noise Reduction Settings File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# Photograph Noise Reduction Configuration File" ) { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Noise Reduction settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -504,16 +504,16 @@ void NoiseReductionTool::slotLoadSettings() void NoiseReductionTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Noise Reduction Settings File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# Photograph Noise Reduction Configuration File\n"; stream << m_radiusInput->value() << "\n"; stream << m_lumToleranceInput->value() << "\n"; diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.h b/digikam/imageplugins/noisereduction/noisereductiontool.h index 7d1c209..92a6359 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.h +++ b/digikam/imageplugins/noisereduction/noisereductiontool.h @@ -45,10 +45,11 @@ namespace DigikamNoiseReductionImagesPlugin class NoiseReductionTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - NoiseReductionTool(QObject* parent); + NoiseReductionTool(TQObject* tqparent); ~NoiseReductionTool(); private: diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp index bbe7308..20462ea 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp @@ -22,12 +22,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qimage.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqimage.h> +#include <tqlayout.h> // KDE includes. @@ -54,12 +54,12 @@ namespace DigikamOilPaintImagesPlugin { -ImageEffect_OilPaint::ImageEffect_OilPaint(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Apply Oil Paint Effect"), +ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Oil Paint Effect"), "oilpaint", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Oil Paint"), @@ -84,13 +84,13 @@ ImageEffect_OilPaint::ImageEffect_OilPaint(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 3, 1, 0, spacingHint()); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 3, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Brush size:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Brush size:"), gboxSettings); m_brushSizeInput = new KIntNumInput(gboxSettings); m_brushSizeInput->setRange(1, 5, 1, true); - QWhatsThis::add( m_brushSizeInput, i18n("<p>Set here the brush size to use for " + TQWhatsThis::add( m_brushSizeInput, i18n("<p>Set here the brush size to use for " "simulating the oil painting.") ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); @@ -98,10 +98,10 @@ ImageEffect_OilPaint::ImageEffect_OilPaint(QWidget* parent) // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Smooth:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Smooth:"), gboxSettings); m_smoothInput = new KIntNumInput(gboxSettings); m_smoothInput->setRange(10, 255, 1, true); - QWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect " + TQWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect " "of the brush under the canvas.") ); gridSettings->addMultiCellWidget(label2, 2, 2, 0, 1); @@ -111,11 +111,11 @@ ImageEffect_OilPaint::ImageEffect_OilPaint(QWidget* parent) // ------------------------------------------------------------- - connect(m_brushSizeInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_brushSizeInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_smoothInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_smoothInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_OilPaint::~ImageEffect_OilPaint() diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h index 76c4122..14bf28f 100644 --- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.h @@ -37,10 +37,11 @@ namespace DigikamOilPaintImagesPlugin class ImageEffect_OilPaint : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_OilPaint(QWidget* parent); + ImageEffect_OilPaint(TQWidget* tqparent); ~ImageEffect_OilPaint(); private slots: diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp index d84efea..13da7ec 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp @@ -42,11 +42,11 @@ using namespace DigikamOilPaintImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_oilpaint, KGenericFactory<ImagePlugin_OilPaint>("digikamimageplugin_oilpaint")); -ImagePlugin_OilPaint::ImagePlugin_OilPaint(QObject *parent, const char*, const QStringList&) - : Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint") +ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *tqparent, const char*, const TQStringList&) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_OilPaint") { m_oilpaintAction = new KAction(i18n("Oil Paint..."), "oilpaint", 0, - this, SLOT(slotOilPaint()), + this, TQT_SLOT(slotOilPaint()), actionCollection(), "imageplugin_oilpaint"); setXMLFile( "digikamimageplugin_oilpaint_ui.rc" ); diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h index d7d8958..bd6e0f2 100644 --- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h +++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_OilPaint : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_OilPaint(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_OilPaint(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_OilPaint(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/oilpaint/oilpaint.cpp b/digikam/imageplugins/oilpaint/oilpaint.cpp index b17b240..0e29a23 100644 --- a/digikam/imageplugins/oilpaint/oilpaint.cpp +++ b/digikam/imageplugins/oilpaint/oilpaint.cpp @@ -41,8 +41,8 @@ namespace DigikamOilPaintImagesPlugin { -OilPaint::OilPaint(Digikam::DImg *orgImage, QObject *parent, int brushSize, int smoothness) - : Digikam::DImgThreadedFilter(orgImage, parent, "OilPaint") +OilPaint::OilPaint(Digikam::DImg *orgImage, TQObject *tqparent, int brushSize, int smoothness) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "OilPaint") { m_brushSize = brushSize; m_smoothness = smoothness; diff --git a/digikam/imageplugins/oilpaint/oilpaint.h b/digikam/imageplugins/oilpaint/oilpaint.h index b69c6d0..7e1829d 100644 --- a/digikam/imageplugins/oilpaint/oilpaint.h +++ b/digikam/imageplugins/oilpaint/oilpaint.h @@ -37,7 +37,7 @@ class OilPaint : public Digikam::DImgThreadedFilter public: - OilPaint(Digikam::DImg *orgImage, QObject *parent=0, int brushSize=1, int smoothness=30); + OilPaint(Digikam::DImg *orgImage, TQObject *tqparent=0, int brushSize=1, int smoothness=30); ~OilPaint(){}; diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp index 7d166d2..3436e1e 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.cpp +++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp @@ -22,12 +22,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamOilPaintImagesPlugin { -OilPaintTool::OilPaintTool(QObject* parent) - : EditorToolThreaded(parent) +OilPaintTool::OilPaintTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("oilpaint"); setToolName(i18n("Oil Paint")); @@ -75,22 +75,22 @@ OilPaintTool::OilPaintTool(QObject* parent) EditorToolSettings::Cancel| EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 4, 1); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 4, 1); - QLabel *label1 = new QLabel(i18n("Brush size:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Brush size:"), m_gboxSettings->plainPage()); m_brushSizeInput = new RIntNumInput(m_gboxSettings->plainPage()); m_brushSizeInput->setRange(1, 5, 1); m_brushSizeInput->setDefaultValue(1); - QWhatsThis::add( m_brushSizeInput, i18n("<p>Set here the brush size to use for " + TQWhatsThis::add( m_brushSizeInput, i18n("<p>Set here the brush size to use for " "simulating the oil painting.") ); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Smooth:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Smooth:"), m_gboxSettings->plainPage()); m_smoothInput = new RIntNumInput(m_gboxSettings->plainPage()); m_smoothInput->setRange(10, 255, 1); m_smoothInput->setDefaultValue(30); - QWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect " + TQWhatsThis::add( m_smoothInput, i18n("<p>This value controls the smoothing effect " "of the brush under the canvas.") ); @@ -115,11 +115,11 @@ OilPaintTool::OilPaintTool(QObject* parent) // this filter is relative slow, so we should use the try button instead right now - // connect(m_brushSizeInput, SIGNAL(valueChanged (int)), - // this, SLOT(slotTimer())); + // connect(m_brushSizeInput, TQT_SIGNAL(valueChanged (int)), + // this, TQT_SLOT(slotTimer())); // - // connect(m_smoothInput, SIGNAL(valueChanged (int)), - // this, SLOT(slotTimer())); + // connect(m_smoothInput, TQT_SIGNAL(valueChanged (int)), + // this, TQT_SLOT(slotTimer())); } OilPaintTool::~OilPaintTool() diff --git a/digikam/imageplugins/oilpaint/oilpainttool.h b/digikam/imageplugins/oilpaint/oilpainttool.h index 1c6d774..fe7d92d 100644 --- a/digikam/imageplugins/oilpaint/oilpainttool.h +++ b/digikam/imageplugins/oilpaint/oilpainttool.h @@ -46,10 +46,11 @@ namespace DigikamOilPaintImagesPlugin class OilPaintTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - OilPaintTool(QObject* parent); + OilPaintTool(TQObject* tqparent); ~OilPaintTool(); private slots: diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp index 94163ff..446f6ee 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp +++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qspinbox.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qcheckbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqspinbox.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqcheckbox.h> // KDE includes. @@ -60,11 +60,11 @@ namespace DigikamPerspectiveImagesPlugin { -ImageEffect_Perspective::ImageEffect_Perspective(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Adjust Photograph Perspective"), +ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Adjust Photograph Perspective"), "perspective", false, false) { - QString whatsThis; + TQString whatsThis; // About data and help button. @@ -88,31 +88,31 @@ ImageEffect_Perspective::ImageEffect_Perspective(QWidget* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(plainPage()); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(plainPage()); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); m_previewWidget = new PerspectiveWidget(525, 350, frame); l->addWidget(m_previewWidget); - QWhatsThis::add( m_previewWidget, i18n("<p>This is the perspective transformation operation preview. " + TQWhatsThis::add( m_previewWidget, i18n("<p>This is the perspective transformation operation preview. " "You can use the mouse for dragging the corner to adjust the " "perspective transformation area.")); setPreviewAreaWidget(frame); // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); - QWidget *gbox2 = new QWidget(plainPage()); - QGridLayout *gridLayout = new QGridLayout( gbox2, 13, 2, spacingHint()); + TQWidget *gbox2 = new TQWidget(plainPage()); + TQGridLayout *gridLayout = new TQGridLayout( gbox2, 13, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("New width:"), gbox2); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gbox2); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + TQLabel *label1 = new TQLabel(i18n("New width:"), gbox2); + m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gbox2); + m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); - QLabel *label2 = new QLabel(i18n("New height:"), gbox2); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gbox2); - m_newHeightLabel->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 ); gridLayout->addMultiCellWidget(label1, 0, 0, 0, 0); gridLayout->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); @@ -121,17 +121,17 @@ ImageEffect_Perspective::ImageEffect_Perspective(QWidget* parent) // ------------------------------------------------------------- - KSeparator *line = new KSeparator (Horizontal, gbox2); + KSeparator *line = new KSeparator(Qt::Horizontal, gbox2); - QLabel *angleLabel = new QLabel(i18n("Angles (in degrees):"), gbox2); - QLabel *label3 = new QLabel(i18n(" Top left:"), gbox2); - m_topLeftAngleLabel = new QLabel(gbox2); - QLabel *label4 = new QLabel(i18n(" Top right:"), gbox2); - m_topRightAngleLabel = new QLabel(gbox2); - QLabel *label5 = new QLabel(i18n(" Bottom left:"), gbox2); - m_bottomLeftAngleLabel = new QLabel(gbox2); - QLabel *label6 = new QLabel(i18n(" Bottom right:"), gbox2); - m_bottomRightAngleLabel = new QLabel(gbox2); + TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), gbox2); + TQLabel *label3 = new TQLabel(i18n(" Top left:"), gbox2); + m_topLeftAngleLabel = new TQLabel(gbox2); + TQLabel *label4 = new TQLabel(i18n(" Top right:"), gbox2); + m_topRightAngleLabel = new TQLabel(gbox2); + TQLabel *label5 = new TQLabel(i18n(" Bottom left:"), gbox2); + m_bottomLeftAngleLabel = new TQLabel(gbox2); + TQLabel *label6 = new TQLabel(i18n(" Bottom right:"), gbox2); + m_bottomRightAngleLabel = new TQLabel(gbox2); gridLayout->addMultiCellWidget(line, 2, 2, 0, 2); gridLayout->addMultiCellWidget(angleLabel, 3, 3, 0, 2); @@ -146,26 +146,26 @@ ImageEffect_Perspective::ImageEffect_Perspective(QWidget* parent) // ------------------------------------------------------------- - KSeparator *line2 = new KSeparator (Horizontal, gbox2); + KSeparator *line2 = new KSeparator(Qt::Horizontal, gbox2); - m_drawWhileMovingCheckBox = new QCheckBox(i18n("Draw preview while moving"), gbox2); + m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), gbox2); gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2); gridLayout->addMultiCellWidget(m_drawWhileMovingCheckBox, 9, 9, 0, 2); - m_drawGridCheckBox = new QCheckBox(i18n("Draw grid"), gbox2); + m_drawGridCheckBox = new TQCheckBox(i18n("Draw grid"), gbox2); gridLayout->addMultiCellWidget(m_drawGridCheckBox, 10, 10, 0, 2); // ------------------------------------------------------------- - QLabel *label7 = new QLabel(i18n("Guide color:"), gbox2); - m_guideColorBt = new KColorButton( QColor( Qt::red ), gbox2 ); - QWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); + TQLabel *label7 = new TQLabel(i18n("Guide color:"), gbox2); + m_guideColorBt = new KColorButton( TQColor( TQt::red ), gbox2 ); + TQWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); gridLayout->addMultiCellWidget(label7, 11, 11, 0, 0); gridLayout->addMultiCellWidget(m_guideColorBt, 11, 11, 2, 2); - QLabel *label8 = new QLabel(i18n("Guide width:"), gbox2); - m_guideSize = new QSpinBox( 1, 5, 1, gbox2); - QWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); + TQLabel *label8 = new TQLabel(i18n("Guide width:"), gbox2); + m_guideSize = new TQSpinBox( 1, 5, 1, gbox2); + TQWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); gridLayout->addMultiCellWidget(label8, 12, 12, 0, 0); gridLayout->addMultiCellWidget(m_guideSize, 12, 12, 2, 2); @@ -176,20 +176,20 @@ ImageEffect_Perspective::ImageEffect_Perspective(QWidget* parent) // ------------------------------------------------------------- - connect(m_previewWidget, SIGNAL(signalPerspectiveChanged(QRect, float, float, float, float)), - this, SLOT(slotUpdateInfo(QRect, float, float, float, float))); + connect(m_previewWidget, TQT_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), + this, TQT_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); - connect(m_drawWhileMovingCheckBox, SIGNAL(toggled(bool)), - m_previewWidget, SLOT(slotToggleDrawWhileMoving(bool))); + connect(m_drawWhileMovingCheckBox, TQT_SIGNAL(toggled(bool)), + m_previewWidget, TQT_SLOT(slotToggleDrawWhileMoving(bool))); - connect(m_drawGridCheckBox, SIGNAL(toggled(bool)), - m_previewWidget, SLOT(slotToggleDrawGrid(bool))); + connect(m_drawGridCheckBox, TQT_SIGNAL(toggled(bool)), + m_previewWidget, TQT_SLOT(slotToggleDrawGrid(bool))); - connect(m_guideColorBt, SIGNAL(changed(const QColor &)), - m_previewWidget, SLOT(slotChangeGuideColor(const QColor &))); + connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor &)), + m_previewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); - connect(m_guideSize, SIGNAL(valueChanged(int)), - m_previewWidget, SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), + m_previewWidget, TQT_SLOT(slotChangeGuideSize(int))); } ImageEffect_Perspective::~ImageEffect_Perspective() @@ -198,7 +198,7 @@ ImageEffect_Perspective::~ImageEffect_Perspective() void ImageEffect_Perspective::readUserSettings(void) { - QColor defaultGuideColor(Qt::red); + TQColor defaultGuideColor(TQt::red); KConfig *config = kapp->config(); config->setGroup("perspective Tool Dialog"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); @@ -235,10 +235,10 @@ void ImageEffect_Perspective::finalRendering() kapp->restoreOverrideCursor(); } -void ImageEffect_Perspective::slotUpdateInfo(QRect newSize, float topLeftAngle, float topRightAngle, +void ImageEffect_Perspective::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, float bottomLeftAngle, float bottomRightAngle) { - QString temp; + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.h b/digikam/imageplugins/perspective/imageeffect_perspective.h index a33fb46..4543ef6 100644 --- a/digikam/imageplugins/perspective/imageeffect_perspective.h +++ b/digikam/imageplugins/perspective/imageeffect_perspective.h @@ -24,17 +24,17 @@ #ifndef IMAGEEFFECT_PERSPECTIVE_H #define IMAGEEFFECT_PERSPECTIVE_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Digikam includes. #include "imagedlgbase.h" -class QLabel; -class QCheckBox; -class QSpinBox; +class TQLabel; +class TQCheckBox; +class TQSpinBox; class KColorButton; @@ -46,15 +46,16 @@ class PerspectiveWidget; class ImageEffect_Perspective : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Perspective(QWidget* parent); + ImageEffect_Perspective(TQWidget* tqparent); ~ImageEffect_Perspective(); private slots: - void slotUpdateInfo(QRect newSize, float topLeftAngle, float topRightAngle, + void slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, float bottomLeftAngle, float bottomRightAngle); private: @@ -66,17 +67,17 @@ private: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; - QLabel *m_topLeftAngleLabel; - QLabel *m_topRightAngleLabel; - QLabel *m_bottomLeftAngleLabel; - QLabel *m_bottomRightAngleLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; + TQLabel *m_topLeftAngleLabel; + TQLabel *m_topRightAngleLabel; + TQLabel *m_bottomLeftAngleLabel; + TQLabel *m_bottomRightAngleLabel; - QCheckBox *m_drawWhileMovingCheckBox; - QCheckBox *m_drawGridCheckBox; + TQCheckBox *m_drawWhileMovingCheckBox; + TQCheckBox *m_drawGridCheckBox; - QSpinBox *m_guideSize; + TQSpinBox *m_guideSize; KColorButton *m_guideColorBt; diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp index 8607aef..dfc55ad 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp +++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp @@ -41,11 +41,11 @@ using namespace DigikamPerspectiveImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_perspective, KGenericFactory<ImagePlugin_Perspective>("digikamimageplugin_perspective")); -ImagePlugin_Perspective::ImagePlugin_Perspective(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Perspective") +ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Perspective") { m_perspectiveAction = new KAction(i18n("Perspective Adjustment..."), "perspective", 0, - this, SLOT(slotPerspective()), + this, TQT_SLOT(slotPerspective()), actionCollection(), "imageplugin_perspective"); setXMLFile("digikamimageplugin_perspective_ui.rc"); diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.h b/digikam/imageplugins/perspective/imageplugin_perspective.h index e7616f6..0109d54 100644 --- a/digikam/imageplugins/perspective/imageplugin_perspective.h +++ b/digikam/imageplugins/perspective/imageplugin_perspective.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Perspective(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Perspective(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Perspective(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp index 06b0481..f493f51 100644 --- a/digikam/imageplugins/perspective/perspectivetool.cpp +++ b/digikam/imageplugins/perspective/perspectivetool.cpp @@ -22,15 +22,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcheckbox.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -67,8 +67,8 @@ using namespace Digikam; namespace DigikamPerspectiveImagesPlugin { -PerspectiveTool::PerspectiveTool(QObject* parent) - : EditorTool(parent) +PerspectiveTool::PerspectiveTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("perspective"); setToolName(i18n("Perspective")); @@ -76,72 +76,72 @@ PerspectiveTool::PerspectiveTool(QObject* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(0); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(0); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); m_previewWidget = new PerspectiveWidget(525, 350, frame); l->addWidget(m_previewWidget); - QWhatsThis::add(m_previewWidget, i18n("<p>This is the perspective transformation operation preview. " + TQWhatsThis::add(m_previewWidget, i18n("<p>This is the perspective transformation operation preview. " "You can use the mouse for dragging the corner to adjust the " "perspective transformation area.")); setToolView(frame); // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout *gridLayout = new QGridLayout( m_gboxSettings->plainPage(), 13, 2); + TQGridLayout *gridLayout = new TQGridLayout( m_gboxSettings->plainPage(), 13, 2); - QLabel *label1 = new QLabel(i18n("New width:"), m_gboxSettings->plainPage()); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + 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 ); - QLabel *label2 = new QLabel(i18n("New height:"), m_gboxSettings->plainPage()); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->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 ); // ------------------------------------------------------------- - KSeparator *line = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); - QLabel *angleLabel = new QLabel(i18n("Angles (in degrees):"), m_gboxSettings->plainPage()); - QLabel *label3 = new QLabel(i18n(" Top left:"), m_gboxSettings->plainPage()); - m_topLeftAngleLabel = new QLabel(m_gboxSettings->plainPage()); - QLabel *label4 = new QLabel(i18n(" Top right:"), m_gboxSettings->plainPage()); - m_topRightAngleLabel = new QLabel(m_gboxSettings->plainPage()); - QLabel *label5 = new QLabel(i18n(" Bottom left:"), m_gboxSettings->plainPage()); - m_bottomLeftAngleLabel = new QLabel(m_gboxSettings->plainPage()); - QLabel *label6 = new QLabel(i18n(" Bottom right:"), m_gboxSettings->plainPage()); - m_bottomRightAngleLabel = new QLabel(m_gboxSettings->plainPage()); + TQLabel *angleLabel = new TQLabel(i18n("Angles (in degrees):"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n(" Top left:"), m_gboxSettings->plainPage()); + m_topLeftAngleLabel = new TQLabel(m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n(" Top right:"), m_gboxSettings->plainPage()); + m_topRightAngleLabel = new TQLabel(m_gboxSettings->plainPage()); + TQLabel *label5 = new TQLabel(i18n(" Bottom left:"), m_gboxSettings->plainPage()); + m_bottomLeftAngleLabel = new TQLabel(m_gboxSettings->plainPage()); + TQLabel *label6 = new TQLabel(i18n(" Bottom right:"), m_gboxSettings->plainPage()); + m_bottomRightAngleLabel = new TQLabel(m_gboxSettings->plainPage()); // ------------------------------------------------------------- - KSeparator *line2 = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line2 = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); - m_drawWhileMovingCheckBox = new QCheckBox(i18n("Draw preview while moving"), m_gboxSettings->plainPage()); + m_drawWhileMovingCheckBox = new TQCheckBox(i18n("Draw preview while moving"), m_gboxSettings->plainPage()); gridLayout->addMultiCellWidget(line2, 8, 8, 0, 2); gridLayout->addMultiCellWidget(m_drawWhileMovingCheckBox, 9, 9, 0, 2); - m_drawGridCheckBox = new QCheckBox(i18n("Draw grid"), m_gboxSettings->plainPage()); + m_drawGridCheckBox = new TQCheckBox(i18n("Draw grid"), m_gboxSettings->plainPage()); // ------------------------------------------------------------- - QLabel *label7 = new QLabel(i18n("Guide color:"), m_gboxSettings->plainPage()); - m_guideColorBt = new KColorButton( QColor( Qt::red ), m_gboxSettings->plainPage() ); - QWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); + TQLabel *label7 = new TQLabel(i18n("Guide color:"), m_gboxSettings->plainPage()); + m_guideColorBt = new KColorButton( TQColor( TQt::red ), m_gboxSettings->plainPage() ); + TQWhatsThis::add( m_guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); gridLayout->addMultiCellWidget(label7, 11, 11, 0, 0); gridLayout->addMultiCellWidget(m_guideColorBt, 11, 11, 2, 2); - QLabel *label8 = new QLabel(i18n("Guide width:"), m_gboxSettings->plainPage()); + TQLabel *label8 = new TQLabel(i18n("Guide width:"), m_gboxSettings->plainPage()); m_guideSize = new RIntNumInput(m_gboxSettings->plainPage()); m_guideSize->input()->setRange(1, 5, 1, false); m_guideSize->setDefaultValue(1); - QWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); + TQWhatsThis::add( m_guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); gridLayout->addMultiCellWidget(label1, 0, 0, 0, 0); gridLayout->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); @@ -170,20 +170,20 @@ PerspectiveTool::PerspectiveTool(QObject* parent) // ------------------------------------------------------------- - connect(m_previewWidget, SIGNAL(signalPerspectiveChanged(QRect, float, float, float, float)), - this, SLOT(slotUpdateInfo(QRect, float, float, float, float))); + connect(m_previewWidget, TQT_SIGNAL(signalPerspectiveChanged(TQRect, float, float, float, float)), + this, TQT_SLOT(slotUpdateInfo(TQRect, float, float, float, float))); - connect(m_drawWhileMovingCheckBox, SIGNAL(toggled(bool)), - m_previewWidget, SLOT(slotToggleDrawWhileMoving(bool))); + connect(m_drawWhileMovingCheckBox, TQT_SIGNAL(toggled(bool)), + m_previewWidget, TQT_SLOT(slotToggleDrawWhileMoving(bool))); - connect(m_drawGridCheckBox, SIGNAL(toggled(bool)), - m_previewWidget, SLOT(slotToggleDrawGrid(bool))); + connect(m_drawGridCheckBox, TQT_SIGNAL(toggled(bool)), + m_previewWidget, TQT_SLOT(slotToggleDrawGrid(bool))); - connect(m_guideColorBt, SIGNAL(changed(const QColor&)), - m_previewWidget, SLOT(slotChangeGuideColor(const QColor&))); + connect(m_guideColorBt, TQT_SIGNAL(changed(const TQColor&)), + m_previewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor&))); - connect(m_guideSize, SIGNAL(valueChanged(int)), - m_previewWidget, SLOT(slotChangeGuideSize(int))); + connect(m_guideSize, TQT_SIGNAL(valueChanged(int)), + m_previewWidget, TQT_SLOT(slotChangeGuideSize(int))); } PerspectiveTool::~PerspectiveTool() @@ -192,7 +192,7 @@ PerspectiveTool::~PerspectiveTool() void PerspectiveTool::readSettings() { - QColor defaultGuideColor(Qt::red); + TQColor defaultGuideColor(TQt::red); KConfig *config = kapp->config(); config->setGroup("perspective Tool"); m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true)); @@ -228,10 +228,10 @@ void PerspectiveTool::finalRendering() kapp->restoreOverrideCursor(); } -void PerspectiveTool::slotUpdateInfo(QRect newSize, float topLeftAngle, float topRightAngle, +void PerspectiveTool::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, float bottomLeftAngle, float bottomRightAngle) { - QString temp; + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); diff --git a/digikam/imageplugins/perspective/perspectivetool.h b/digikam/imageplugins/perspective/perspectivetool.h index ad38a65..a71edda 100644 --- a/digikam/imageplugins/perspective/perspectivetool.h +++ b/digikam/imageplugins/perspective/perspectivetool.h @@ -24,16 +24,16 @@ #ifndef IMAGEEFFECT_PERSPECTIVE_H #define IMAGEEFFECT_PERSPECTIVE_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Digikam includes. #include "editortool.h" -class QLabel; -class QCheckBox; +class TQLabel; +class TQCheckBox; class KColorButton; @@ -55,16 +55,17 @@ class PerspectiveWidget; class PerspectiveTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - PerspectiveTool(QObject* parent); + PerspectiveTool(TQObject* tqparent); ~PerspectiveTool(); private slots: void slotResetSettings(); - void slotUpdateInfo(QRect newSize, float topLeftAngle, float topRightAngle, + void slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle, float bottomLeftAngle, float bottomRightAngle); private: @@ -75,15 +76,15 @@ private: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; - QLabel *m_topLeftAngleLabel; - QLabel *m_topRightAngleLabel; - QLabel *m_bottomLeftAngleLabel; - QLabel *m_bottomRightAngleLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; + TQLabel *m_topLeftAngleLabel; + TQLabel *m_topRightAngleLabel; + TQLabel *m_bottomLeftAngleLabel; + TQLabel *m_bottomRightAngleLabel; - QCheckBox *m_drawWhileMovingCheckBox; - QCheckBox *m_drawGridCheckBox; + TQCheckBox *m_drawWhileMovingCheckBox; + TQCheckBox *m_drawGridCheckBox; KDcrawIface::RIntNumInput *m_guideSize; diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index b79a27c..07491e7 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -31,15 +31,15 @@ #include <cstdlib> #include <cmath> -// Qt includes. +// TQt includes. -#include <qregion.h> -#include <qpainter.h> -#include <qpen.h> -#include <qbrush.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qpointarray.h> +#include <tqregion.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqbrush.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqpointarray.h> // KDE includes. @@ -60,17 +60,17 @@ namespace DigikamPerspectiveImagesPlugin { -PerspectiveWidget::PerspectiveWidget(int w, int h, QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +PerspectiveWidget::PerspectiveWidget(int w, int h, TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); setMouseTracking(true); m_drawGrid = false; m_drawWhileMoving = true; m_currentResizing = ResizingNone; - m_guideColor = Qt::red; + m_guideColor = TQt::red; m_guideSize = 1; m_iface = new Digikam::ImageIface(w, h); @@ -81,10 +81,10 @@ PerspectiveWidget::PerspectiveWidget(int w, int h, QWidget *parent) m_origH = m_iface->originalHeight(); m_previewImage = Digikam::DImg(m_w, m_h, m_iface->previewSixteenBit(), m_iface->previewHasAlpha(), data, false); - m_pixmap = new QPixmap(w, h); + m_pixmap = new TQPixmap(w, h); - m_rect = QRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); - m_grid = QPointArray(60); + m_rect = TQRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); + m_grid = TQPointArray(60); reset(); } @@ -100,33 +100,33 @@ Digikam::ImageIface* PerspectiveWidget::imageIface() return m_iface; } -QPoint PerspectiveWidget::getTopLeftCorner(void) +TQPoint PerspectiveWidget::getTopLeftCorner(void) { - return QPoint( lroundf((float)(m_topLeftPoint.x()*m_origW) / (float)m_w), + return TQPoint( lroundf((float)(m_topLeftPoint.x()*m_origW) / (float)m_w), lroundf((float)(m_topLeftPoint.y()*m_origH) / (float)m_h)); } -QPoint PerspectiveWidget::getTopRightCorner(void) +TQPoint PerspectiveWidget::getTopRightCorner(void) { - return QPoint( lroundf((float)(m_topRightPoint.x()*m_origW) / (float)m_w), + return TQPoint( lroundf((float)(m_topRightPoint.x()*m_origW) / (float)m_w), lroundf((float)(m_topRightPoint.y()*m_origH) / (float)m_h)); } -QPoint PerspectiveWidget::getBottomLeftCorner(void) +TQPoint PerspectiveWidget::getBottomLeftCorner(void) { - return QPoint( lroundf((float)(m_bottomLeftPoint.x()*m_origW) / (float)m_w), + return TQPoint( lroundf((float)(m_bottomLeftPoint.x()*m_origW) / (float)m_w), lroundf((float)(m_bottomLeftPoint.y()*m_origH) / (float)m_h)); } -QPoint PerspectiveWidget::getBottomRightCorner(void) +TQPoint PerspectiveWidget::getBottomRightCorner(void) { - return QPoint( lroundf((float)(m_bottomRightPoint.x()*m_origW) / (float)m_w), + return TQPoint( lroundf((float)(m_bottomRightPoint.x()*m_origW) / (float)m_w), lroundf((float)(m_bottomRightPoint.y()*m_origH) / (float)m_h)); } -QRect PerspectiveWidget::getTargetSize(void) +TQRect PerspectiveWidget::getTargetSize(void) { - QPointArray perspectiveArea; + TQPointArray perspectiveArea; perspectiveArea.putPoints( 0, 4, getTopLeftCorner().x(), getTopLeftCorner().y(), @@ -180,7 +180,7 @@ void PerspectiveWidget::reset(void) m_antiAlias = true; updatePixmap(); - repaint(false); + tqrepaint(false); } void PerspectiveWidget::applyPerspectiveAdjustment(void) @@ -192,7 +192,7 @@ void PerspectiveWidget::applyPerspectiveAdjustment(void) // Perform perspective adjustment. - buildPerspective(QPoint(0, 0), QPoint(m_origW, m_origH), + buildPerspective(TQPoint(0, 0), TQPoint(m_origW, m_origH), getTopLeftCorner(), getTopRightCorner(), getBottomLeftCorner(), getBottomRightCorner(), orgImage, &destImage, background); @@ -210,7 +210,7 @@ void PerspectiveWidget::slotToggleAntiAliasing(bool a) { m_antiAlias = a; updatePixmap(); - repaint(false); + tqrepaint(false); } void PerspectiveWidget::slotToggleDrawWhileMoving(bool draw) @@ -222,21 +222,21 @@ void PerspectiveWidget::slotToggleDrawGrid(bool grid) { m_drawGrid = grid; updatePixmap(); - repaint(false); + tqrepaint(false); } -void PerspectiveWidget::slotChangeGuideColor(const QColor &color) +void PerspectiveWidget::slotChangeGuideColor(const TQColor &color) { m_guideColor = color; updatePixmap(); - repaint(false); + tqrepaint(false); } void PerspectiveWidget::slotChangeGuideSize(int size) { m_guideSize = size; updatePixmap(); - repaint(false); + tqrepaint(false); } void PerspectiveWidget::updatePixmap(void) @@ -259,18 +259,18 @@ void PerspectiveWidget::updatePixmap(void) { int j = i*4; - // Horizontal line. + //Qt::Horizontal line. m_grid.setPoint(j , 0, i*gYS); m_grid.setPoint(j+1, m_w, i*gYS); - // Vertical line. + //Qt::Vertical line. m_grid.setPoint(j+2, i*gXS, 0); m_grid.setPoint(j+3, i*gXS, m_h); } // Draw background - m_pixmap->fill(colorGroup().background()); + m_pixmap->fill(tqcolorGroup().background()); // if we are resizing with the mouse, compute and draw only if drawWhileMoving is set if (m_currentResizing == ResizingNone || m_drawWhileMoving) @@ -280,9 +280,9 @@ void PerspectiveWidget::updatePixmap(void) Digikam::DImg destImage(m_previewImage.width(), m_previewImage.height(), m_previewImage.sixteenBit(), m_previewImage.hasAlpha()); - Digikam::DColor background(colorGroup().background()); + Digikam::DColor background(tqcolorGroup().background()); - m_transformedCenter = buildPerspective(QPoint(0, 0), QPoint(m_w, m_h), + m_transformedCenter = buildPerspective(TQPoint(0, 0), TQPoint(m_w, m_h), m_topLeftPoint, m_topRightPoint, m_bottomLeftPoint, m_bottomRightPoint, &m_previewImage, &destImage, background); @@ -296,15 +296,15 @@ void PerspectiveWidget::updatePixmap(void) } else { - m_transformedCenter = buildPerspective(QPoint(0, 0), QPoint(m_w, m_h), + m_transformedCenter = buildPerspective(TQPoint(0, 0), TQPoint(m_w, m_h), m_topLeftPoint, m_topRightPoint, m_bottomLeftPoint, m_bottomRightPoint); } // Drawing selection borders. - QPainter p(m_pixmap); - p.setPen(QPen(QColor(255, 64, 64), 1, Qt::SolidLine)); + TQPainter p(m_pixmap); + p.setPen(TQPen(TQColor(255, 64, 64), 1, TQt::SolidLine)); p.drawLine(m_topLeftPoint+m_rect.topLeft(), m_topRightPoint+m_rect.topLeft()); p.drawLine(m_topRightPoint+m_rect.topLeft(), m_bottomRightPoint+m_rect.topLeft()); p.drawLine(m_bottomRightPoint+m_rect.topLeft(), m_bottomLeftPoint+m_rect.topLeft()); @@ -312,7 +312,7 @@ void PerspectiveWidget::updatePixmap(void) // Drawing selection corners. - QBrush brush(QColor(255, 64, 64)); + TQBrush brush(TQColor(255, 64, 64)); p.fillRect(m_topLeftCorner, brush); p.fillRect(m_topRightCorner, brush); p.fillRect(m_bottomLeftCorner, brush); @@ -324,17 +324,17 @@ void PerspectiveWidget::updatePixmap(void) { for (uint i = 0 ; i < m_grid.size() ; i += 4) { - // Horizontal line. + //Qt::Horizontal line. p.drawLine(m_grid.point(i)+m_rect.topLeft(), m_grid.point(i+1)+m_rect.topLeft()); - // Vertical line. + //Qt::Vertical line. p.drawLine(m_grid.point(i+2)+m_rect.topLeft(), m_grid.point(i+3)+m_rect.topLeft()); } } // Drawing transformed center. - p.setPen(QPen(QColor(255, 64, 64), 3, Qt::SolidLine)); + p.setPen(TQPen(TQColor(255, 64, 64), 3, TQt::SolidLine)); p.drawEllipse( m_transformedCenter.x()+m_rect.topLeft().x()-2, m_transformedCenter.y()+m_rect.topLeft().y()-2, 4, 4 ); @@ -342,10 +342,10 @@ void PerspectiveWidget::updatePixmap(void) int xspot = m_spot.x() + m_rect.x(); int yspot = m_spot.y() + m_rect.y(); - p.setPen(QPen(Qt::white, m_guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, m_guideSize, TQt::SolidLine)); p.drawLine(xspot, m_rect.top(), xspot, m_rect.bottom()); p.drawLine(m_rect.left(), yspot, m_rect.right(), yspot); - p.setPen(QPen(m_guideColor, m_guideSize, Qt::DotLine)); + p.setPen(TQPen(m_guideColor, m_guideSize, TQt::DotLine)); p.drawLine(xspot, m_rect.top(), xspot, m_rect.bottom()); p.drawLine(m_rect.left(), yspot, m_rect.right(), yspot); @@ -355,9 +355,9 @@ void PerspectiveWidget::updatePixmap(void) getAngleBottomLeft(), getAngleBottomRight()); } -QPoint PerspectiveWidget::buildPerspective(QPoint orignTopLeft, QPoint orignBottomRight, - QPoint transTopLeft, QPoint transTopRight, - QPoint transBottomLeft, QPoint transBottomRight, +TQPoint PerspectiveWidget::buildPerspective(TQPoint orignTopLeft, TQPoint orignBottomRight, + TQPoint transTopLeft, TQPoint transTopRight, + TQPoint transBottomLeft, TQPoint transBottomRight, Digikam::DImg *orgImage, Digikam::DImg *destImage, Digikam::DColor background) { @@ -468,7 +468,7 @@ QPoint PerspectiveWidget::buildPerspective(QPoint orignTopLeft, QPoint orignBott double newCenterX, newCenterY; transform.transformPoint(x2/2.0, y2/2.0, &newCenterX, &newCenterY); - return QPoint(lround(newCenterX), lround(newCenterY)); + return TQPoint(lround(newCenterX), lround(newCenterY)); } void PerspectiveWidget::transformAffine(Digikam::DImg *orgImage, Digikam::DImg *destImage, @@ -631,12 +631,12 @@ void PerspectiveWidget::transformAffine(Digikam::DImg *orgImage, Digikam::DImg * delete [] dest; } -void PerspectiveWidget::paintEvent( QPaintEvent * ) +void PerspectiveWidget::paintEvent( TQPaintEvent * ) { bitBlt(this, 0, 0, m_pixmap); } -void PerspectiveWidget::resizeEvent(QResizeEvent * e) +void PerspectiveWidget::resizeEvent(TQResizeEvent * e) { int old_w = m_w; int old_h = m_h; @@ -649,22 +649,22 @@ void PerspectiveWidget::resizeEvent(QResizeEvent * e) m_h = m_iface->previewHeight(); m_previewImage = Digikam::DImg(m_w, m_h, m_iface->previewSixteenBit(), m_iface->previewHasAlpha(), data, false); - m_pixmap = new QPixmap(w, h); - QRect oldRect = m_rect; - m_rect = QRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); + m_pixmap = new TQPixmap(w, h); + TQRect oldRect = m_rect; + m_rect = TQRect(w/2-m_w/2, h/2-m_h/2, m_w, m_h); float xFactor = (float)m_rect.width()/(float)(oldRect.width()); float yFactor = (float)m_rect.height()/(float)(oldRect.height()); - m_topLeftPoint = QPoint(lroundf(m_topLeftPoint.x()*xFactor), + m_topLeftPoint = TQPoint(lroundf(m_topLeftPoint.x()*xFactor), lroundf(m_topLeftPoint.y()*yFactor)); - m_topRightPoint = QPoint(lroundf(m_topRightPoint.x()*xFactor), + m_topRightPoint = TQPoint(lroundf(m_topRightPoint.x()*xFactor), lroundf(m_topRightPoint.y()*yFactor)); - m_bottomLeftPoint = QPoint(lroundf(m_bottomLeftPoint.x()*xFactor), + m_bottomLeftPoint = TQPoint(lroundf(m_bottomLeftPoint.x()*xFactor), lroundf(m_bottomLeftPoint.y()*yFactor)); - m_bottomRightPoint = QPoint(lroundf(m_bottomRightPoint.x()*xFactor), + m_bottomRightPoint = TQPoint(lroundf(m_bottomRightPoint.x()*xFactor), lroundf(m_bottomRightPoint.y()*yFactor)); - m_transformedCenter = QPoint(lroundf(m_transformedCenter.x()*xFactor), + m_transformedCenter = TQPoint(lroundf(m_transformedCenter.x()*xFactor), lroundf(m_transformedCenter.y()*yFactor)); m_spot.setX((int)((float)m_spot.x() * ( (float)m_w / (float)old_w))); @@ -673,18 +673,18 @@ void PerspectiveWidget::resizeEvent(QResizeEvent * e) updatePixmap(); } -void PerspectiveWidget::mousePressEvent ( QMouseEvent * e ) +void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton && - m_rect.contains( e->x(), e->y() )) + m_rect.tqcontains( e->x(), e->y() )) { - if ( m_topLeftCorner.contains( e->x(), e->y() ) ) + if ( m_topLeftCorner.tqcontains( e->x(), e->y() ) ) m_currentResizing = ResizingTopLeft; - else if ( m_bottomRightCorner.contains( e->x(), e->y() ) ) + else if ( m_bottomRightCorner.tqcontains( e->x(), e->y() ) ) m_currentResizing = ResizingBottomRight; - else if ( m_topRightCorner.contains( e->x(), e->y() ) ) + else if ( m_topRightCorner.tqcontains( e->x(), e->y() ) ) m_currentResizing = ResizingTopRight; - else if ( m_bottomLeftCorner.contains( e->x(), e->y() ) ) + else if ( m_bottomLeftCorner.tqcontains( e->x(), e->y() ) ) m_currentResizing = ResizingBottomLeft; else { @@ -694,7 +694,7 @@ void PerspectiveWidget::mousePressEvent ( QMouseEvent * e ) } } -void PerspectiveWidget::mouseReleaseEvent ( QMouseEvent * e ) +void PerspectiveWidget::mouseReleaseEvent ( TQMouseEvent * e ) { if ( m_currentResizing != ResizingNone ) { @@ -705,7 +705,7 @@ void PerspectiveWidget::mouseReleaseEvent ( QMouseEvent * e ) if (!m_drawWhileMoving) { updatePixmap(); - repaint(false); + tqrepaint(false); } } else @@ -713,20 +713,20 @@ void PerspectiveWidget::mouseReleaseEvent ( QMouseEvent * e ) m_spot.setX(e->x()-m_rect.x()); m_spot.setY(e->y()-m_rect.y()); updatePixmap(); - repaint(false); + tqrepaint(false); } } -void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) +void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( e->state() == Qt::LeftButton ) { if ( m_currentResizing != ResizingNone ) { - QPointArray unsablePoints; - QPoint pm(e->x(), e->y()); + TQPointArray unsablePoints; + TQPoint pm(e->x(), e->y()); - if (!m_rect.contains( pm )) + if (!m_rect.tqcontains( pm )) { if (pm.x() > m_rect.right()) pm.setX(m_rect.right()); @@ -749,9 +749,9 @@ void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) m_topRightPoint.x()-10, m_topRightPoint.y(), m_topRightPoint.x()-10, 0, m_w-1, 0 ); - QRegion unsableArea(unsablePoints); + TQRegion unsableArea(unsablePoints); - if ( unsableArea.contains(pm) ) return; + if ( unsableArea.tqcontains(pm) ) return; m_topLeftPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeFDiagCursor() ); @@ -767,9 +767,9 @@ void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) m_bottomRightPoint.x(), m_bottomRightPoint.y()-10, m_w-1, m_bottomRightPoint.y()-10, m_w-1, m_h-1); - QRegion unsableArea(unsablePoints); + TQRegion unsableArea(unsablePoints); - if ( unsableArea.contains(pm) ) return; + if ( unsableArea.tqcontains(pm) ) return; m_topRightPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeBDiagCursor() ); @@ -785,9 +785,9 @@ void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) m_topLeftPoint.x(), m_topLeftPoint.y()+10, 0, m_topLeftPoint.y(), 0, 0); - QRegion unsableArea(unsablePoints); + TQRegion unsableArea(unsablePoints); - if ( unsableArea.contains(pm) ) return; + if ( unsableArea.tqcontains(pm) ) return; m_bottomLeftPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeBDiagCursor() ); @@ -803,9 +803,9 @@ void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) m_bottomLeftPoint.x()+10, m_bottomLeftPoint.y(), m_bottomLeftPoint.x()+10, m_w-1, 0, m_w-1); - QRegion unsableArea(unsablePoints); + TQRegion unsableArea(unsablePoints); - if ( unsableArea.contains(pm) ) return; + if ( unsableArea.tqcontains(pm) ) return; m_bottomRightPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeFDiagCursor() ); @@ -818,17 +818,17 @@ void PerspectiveWidget::mouseMoveEvent ( QMouseEvent * e ) } updatePixmap(); - repaint(false); + tqrepaint(false); } } else { - if ( m_topLeftCorner.contains( e->x(), e->y() ) || - m_bottomRightCorner.contains( e->x(), e->y() ) ) + if ( m_topLeftCorner.tqcontains( e->x(), e->y() ) || + m_bottomRightCorner.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::sizeFDiagCursor() ); - else if ( m_topRightCorner.contains( e->x(), e->y() ) || - m_bottomLeftCorner.contains( e->x(), e->y() ) ) + else if ( m_topRightCorner.tqcontains( e->x(), e->y() ) || + m_bottomLeftCorner.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::sizeBDiagCursor() ); else unsetCursor(); diff --git a/digikam/imageplugins/perspective/perspectivewidget.h b/digikam/imageplugins/perspective/perspectivewidget.h index 0fb5126..d84af47 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.h +++ b/digikam/imageplugins/perspective/perspectivewidget.h @@ -25,13 +25,13 @@ #ifndef PERSPECTIVEWIDGET_H #define PERSPECTIVEWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qpoint.h> -#include <qpointarray.h> -#include <qcolor.h> -#include <qrect.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqpointarray.h> +#include <tqcolor.h> +#include <tqrect.h> // Digikam includes. @@ -41,7 +41,7 @@ #include "matrix.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -51,20 +51,21 @@ class ImageIface; namespace DigikamPerspectiveImagesPlugin { -class PerspectiveWidget : public QWidget +class PerspectiveWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PerspectiveWidget(int width, int height, QWidget *parent=0); + PerspectiveWidget(int width, int height, TQWidget *tqparent=0); ~PerspectiveWidget(); - QRect getTargetSize(void); - QPoint getTopLeftCorner(void); - QPoint getTopRightCorner(void); - QPoint getBottomLeftCorner(void); - QPoint getBottomRightCorner(void); + TQRect getTargetSize(void); + TQPoint getTopLeftCorner(void); + TQPoint getTopRightCorner(void); + TQPoint getBottomLeftCorner(void); + TQPoint getBottomRightCorner(void); void reset(void); float getAngleTopLeft(void); @@ -82,21 +83,21 @@ public slots: void slotToggleDrawWhileMoving(bool draw); void slotToggleDrawGrid(bool grid); - void slotChangeGuideColor(const QColor &color); + void slotChangeGuideColor(const TQColor &color); void slotChangeGuideSize(int size); signals: - void signalPerspectiveChanged( QRect newSize, float topLeftAngle, float topRightAngle, + void signalPerspectiveChanged( TQRect newSize, float topLeftAngle, float topRightAngle, float bottomLeftAngle, float bottomRightAngle ); protected: - void paintEvent( QPaintEvent *e ); - void resizeEvent( QResizeEvent * e ); - void mousePressEvent ( QMouseEvent * e ); - void mouseReleaseEvent ( QMouseEvent * e ); - void mouseMoveEvent ( QMouseEvent * e ); + void paintEvent( TQPaintEvent *e ); + void resizeEvent( TQResizeEvent * e ); + void mousePressEvent ( TQMouseEvent * e ); + void mouseReleaseEvent ( TQMouseEvent * e ); + void mouseMoveEvent ( TQMouseEvent * e ); private: // Widget methods. @@ -105,9 +106,9 @@ private: // Widget methods. void transformAffine(Digikam::DImg *orgImage, Digikam::DImg *destImage, const Matrix &matrix, Digikam::DColor background); - QPoint buildPerspective(QPoint orignTopLeft, QPoint orignBottomRight, - QPoint transTopLeft, QPoint transTopRight, - QPoint transBottomLeft, QPoint transBottomRight, + TQPoint buildPerspective(TQPoint orignTopLeft, TQPoint orignBottomRight, + TQPoint transTopLeft, TQPoint transTopRight, + TQPoint transBottomLeft, TQPoint transBottomRight, Digikam::DImg *orgImage=0, Digikam::DImg *destImage=0, Digikam::DColor background=Digikam::DColor()); @@ -136,31 +137,31 @@ private: int m_guideSize; - QRect m_rect; + TQRect m_rect; // Tranformed center area for mouse position control. - QPoint m_transformedCenter; + TQPoint m_transformedCenter; // Draggable local region selection corners. - QRect m_topLeftCorner; - QRect m_topRightCorner; - QRect m_bottomLeftCorner; - QRect m_bottomRightCorner; + TQRect m_topLeftCorner; + TQRect m_topRightCorner; + TQRect m_bottomLeftCorner; + TQRect m_bottomRightCorner; - QPoint m_topLeftPoint; - QPoint m_topRightPoint; - QPoint m_bottomLeftPoint; - QPoint m_bottomRightPoint; - QPoint m_spot; + TQPoint m_topLeftPoint; + TQPoint m_topRightPoint; + TQPoint m_bottomLeftPoint; + TQPoint m_bottomRightPoint; + TQPoint m_spot; - QColor m_guideColor; + TQColor m_guideColor; // 60 points will be stored to compute a grid of 15x15 lines. - QPointArray m_grid; + TQPointArray m_grid; - QPixmap *m_pixmap; + TQPixmap *m_pixmap; Digikam::ImageIface *m_iface; Digikam::DImg m_previewImage; diff --git a/digikam/imageplugins/perspective/triangle.cpp b/digikam/imageplugins/perspective/triangle.cpp index 90f68ab..da4fb2c 100644 --- a/digikam/imageplugins/perspective/triangle.cpp +++ b/digikam/imageplugins/perspective/triangle.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-01-18 - * Description : triangle geometry calculation class. + * Description : triangle tqgeometry calculation class. * * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * @@ -34,7 +34,7 @@ namespace DigikamPerspectiveImagesPlugin { -Triangle::Triangle(QPoint A, QPoint B, QPoint C) +Triangle::Triangle(TQPoint A, TQPoint B, TQPoint C) { m_a = distanceP2P(B, C); m_b = distanceP2P(A, C); @@ -56,7 +56,7 @@ float Triangle::angleBAC(void) return( 57.295779513082 * acos( (m_a*m_a - m_b*m_b - m_c*m_c ) / (-2*m_b*m_c ) ) ); } -float Triangle::distanceP2P(const QPoint& p1, const QPoint& p2) +float Triangle::distanceP2P(const TQPoint& p1, const TQPoint& p2) { return(sqrt( abs( p2.x()-p1.x() ) * abs( p2.x()-p1.x() ) + abs( p2.y()-p1.y() ) * abs( p2.y()-p1.y() ) )); diff --git a/digikam/imageplugins/perspective/triangle.h b/digikam/imageplugins/perspective/triangle.h index dc6f4f5..2754c4c 100644 --- a/digikam/imageplugins/perspective/triangle.h +++ b/digikam/imageplugins/perspective/triangle.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-01-18 - * Description : triangle geometry calculation class. + * Description : triangle tqgeometry calculation class. * * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * @@ -24,9 +24,9 @@ #ifndef TRIANGLE_H #define TRIANGLE_H -// Qt includes. +// TQt includes. -#include <qpoint.h> +#include <tqpoint.h> namespace DigikamPerspectiveImagesPlugin { @@ -36,7 +36,7 @@ class Triangle public: - Triangle(QPoint A, QPoint B, QPoint C); + Triangle(TQPoint A, TQPoint B, TQPoint C); ~Triangle(){}; float angleABC(void); @@ -49,7 +49,7 @@ private: float m_b; float m_c; - float distanceP2P(const QPoint& p1, const QPoint& p2); + float distanceP2P(const TQPoint& p1, const TQPoint& p2); }; } // NameSpace DigikamPerspectiveImagesPlugin diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp index fa72990..62cb96a 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqimage.h> // KDE includes. @@ -53,12 +53,12 @@ namespace DigikamRainDropImagesPlugin { -ImageEffect_RainDrop::ImageEffect_RainDrop(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Add Raindrops to Photograph"), +ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Add Raindrops to Photograph"), "raindrops", false, true, false, Digikam::ImageGuideWidget::HVGuideMode) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Raindrops"), @@ -81,46 +81,46 @@ ImageEffect_RainDrop::ImageEffect_RainDrop(QWidget* parent) setAboutData(about); - QWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the preview of the Raindrop effect." + TQWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the preview of the Raindrop effect." "<p>Note: if you have previously selected an area in the editor, " "this will be unaffected by the filter. You can use this method to " "disable the Raindrops effect on a human face, for example.") ); // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 5, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 5, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("Drop size:"), gboxSettings); + TQLabel *label1 = new TQLabel(i18n("Drop size:"), gboxSettings); m_dropInput = new KIntNumInput(gboxSettings); m_dropInput->setRange(0, 200, 1, true); m_dropInput->setValue(80); - QWhatsThis::add( m_dropInput, i18n("<p>Set here the raindrops' size.")); + TQWhatsThis::add( m_dropInput, i18n("<p>Set here the raindrops' size.")); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 2); gridSettings->addMultiCellWidget(m_dropInput, 1, 1, 0, 2); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Number:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Number:"), gboxSettings); m_amountInput = new KIntNumInput(gboxSettings); m_amountInput->setRange(1, 500, 1, true); m_amountInput->setValue(150); - QWhatsThis::add( m_amountInput, i18n("<p>This value controls the maximum number of raindrops.")); + TQWhatsThis::add( m_amountInput, i18n("<p>This value controls the maximum number of raindrops.")); gridSettings->addMultiCellWidget(label2, 2, 2, 0, 2); gridSettings->addMultiCellWidget(m_amountInput, 3, 3, 0, 2); // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Fish eyes:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Fish eyes:"), gboxSettings); m_coeffInput = new KIntNumInput(gboxSettings); m_coeffInput->setRange(1, 100, 1, true); m_coeffInput->setValue(30); - QWhatsThis::add( m_coeffInput, i18n("<p>This value is the fish-eye-effect optical " + TQWhatsThis::add( m_coeffInput, i18n("<p>This value is the fish-eye-effect optical " "distortion coefficient.")); gridSettings->addMultiCellWidget(label3, 4, 4, 0, 2); @@ -130,14 +130,14 @@ ImageEffect_RainDrop::ImageEffect_RainDrop(QWidget* parent) // ------------------------------------------------------------- - connect(m_dropInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_dropInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_amountInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_amountInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_coeffInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_coeffInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_RainDrop::~ImageEffect_RainDrop() @@ -209,7 +209,7 @@ void ImageEffect_RainDrop::prepareEffect() Digikam::ImageIface* iface = m_imagePreviewWidget->imageIface(); // Selected data from the image - QRect selection( iface->selectedXOrg(), iface->selectedYOrg(), + TQRect selection( iface->selectedXOrg(), iface->selectedYOrg(), iface->selectedWidth(), iface->selectedHeight() ); m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>( @@ -229,7 +229,7 @@ void ImageEffect_RainDrop::prepareFinal() Digikam::ImageIface iface(0, 0); // Selected data from the image - QRect selection( iface.selectedXOrg(), iface.selectedYOrg(), + TQRect selection( iface.selectedXOrg(), iface.selectedYOrg(), iface.selectedWidth(), iface.selectedHeight() ); m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>( diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.h b/digikam/imageplugins/raindrop/imageeffect_raindrop.h index fd2eb0d..d5ef6c2 100644 --- a/digikam/imageplugins/raindrop/imageeffect_raindrop.h +++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.h @@ -37,10 +37,11 @@ namespace DigikamRainDropImagesPlugin class ImageEffect_RainDrop : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_RainDrop(QWidget *parent); + ImageEffect_RainDrop(TQWidget *tqparent); ~ImageEffect_RainDrop(); private slots: diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp index 55c5831..ec517c7 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp @@ -41,11 +41,11 @@ using namespace DigikamRainDropImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_raindrop, KGenericFactory<ImagePlugin_RainDrop>("digikamimageplugin_raindrop")); -ImagePlugin_RainDrop::ImagePlugin_RainDrop(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop") +ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_RainDrop") { m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0, - this, SLOT(slotRainDrop()), + this, TQT_SLOT(slotRainDrop()), actionCollection(), "imageplugin_raindrop"); setXMLFile( "digikamimageplugin_raindrop_ui.rc" ); diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.h b/digikam/imageplugins/raindrop/imageplugin_raindrop.h index 75e4657..24840e2 100644 --- a/digikam/imageplugins/raindrop/imageplugin_raindrop.h +++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_RainDrop : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_RainDrop(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_RainDrop(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_RainDrop(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/raindrop/raindrop.cpp b/digikam/imageplugins/raindrop/raindrop.cpp index d24d1b4..eb5926a 100644 --- a/digikam/imageplugins/raindrop/raindrop.cpp +++ b/digikam/imageplugins/raindrop/raindrop.cpp @@ -30,11 +30,11 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qdeepcopy.h> -#include <qdatetime.h> -#include <qrect.h> +#include <tqdeepcopy.h> +#include <tqdatetime.h> +#include <tqrect.h> // Local includes. @@ -45,9 +45,9 @@ namespace DigikamRainDropImagesPlugin { -RainDrop::RainDrop(Digikam::DImg *orgImage, QObject *parent, int drop, - int amount, int coeff, QRect *selection) - : Digikam::DImgThreadedFilter(orgImage, parent, "RainDrop") +RainDrop::RainDrop(Digikam::DImg *orgImage, TQObject *tqparent, int drop, + int amount, int coeff, TQRect *selection) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "RainDrop") { m_drop = drop; m_amount = amount; @@ -164,8 +164,8 @@ void RainDrop::rainDropsImage(Digikam::DImg *orgImage, Digikam::DImg *destImage, // Randomize. - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); uint seed = dt.secsTo(Y2000); for (i = 0; !m_cancel && (i < Amount); i++) diff --git a/digikam/imageplugins/raindrop/raindrop.h b/digikam/imageplugins/raindrop/raindrop.h index 7acf101..0bd1e7c 100644 --- a/digikam/imageplugins/raindrop/raindrop.h +++ b/digikam/imageplugins/raindrop/raindrop.h @@ -29,7 +29,7 @@ #include "dimgthreadedfilter.h" -class QRect; +class TQRect; namespace DigikamRainDropImagesPlugin { @@ -39,8 +39,8 @@ class RainDrop : public Digikam::DImgThreadedFilter public: - RainDrop(Digikam::DImg *orgImage, QObject *parent=0, int drop=80, - int amount=150, int coeff=30, QRect *selection=0L); + RainDrop(Digikam::DImg *orgImage, TQObject *tqparent=0, int drop=80, + int amount=150, int coeff=30, TQRect *selection=0L); ~RainDrop(){}; diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp index d43a79d..638aa6f 100644 --- a/digikam/imageplugins/raindrop/raindroptool.cpp +++ b/digikam/imageplugins/raindrop/raindroptool.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qframe.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqframe.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -60,8 +60,8 @@ using namespace Digikam; namespace DigikamRainDropImagesPlugin { -RainDropTool::RainDropTool(QObject* parent) - : EditorToolThreaded(parent) +RainDropTool::RainDropTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("raindrops"); setToolName(i18n("Raindrops")); @@ -82,32 +82,32 @@ RainDropTool::RainDropTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* gridSettings = new QGridLayout( m_gboxSettings->plainPage(), 7, 2); + TQGridLayout* gridSettings = new TQGridLayout( m_gboxSettings->plainPage(), 7, 2); - QLabel *label1 = new QLabel(i18n("Drop size:"), m_gboxSettings->plainPage()); + TQLabel *label1 = new TQLabel(i18n("Drop size:"), m_gboxSettings->plainPage()); m_dropInput = new RIntNumInput(m_gboxSettings->plainPage()); m_dropInput->setRange(0, 200, 1); m_dropInput->setDefaultValue(80); - QWhatsThis::add( m_dropInput, i18n("<p>Set here the raindrops' size.")); + TQWhatsThis::add( m_dropInput, i18n("<p>Set here the raindrops' size.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Number:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Number:"), m_gboxSettings->plainPage()); m_amountInput = new RIntNumInput(m_gboxSettings->plainPage()); m_amountInput->setRange(1, 500, 1); m_amountInput->setDefaultValue(150); - QWhatsThis::add( m_amountInput, i18n("<p>This value controls the maximum number of raindrops.")); + TQWhatsThis::add( m_amountInput, i18n("<p>This value controls the maximum number of raindrops.")); // ------------------------------------------------------------- - QLabel *label3 = new QLabel(i18n("Fish eyes:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Fish eyes:"), m_gboxSettings->plainPage()); m_coeffInput = new RIntNumInput(m_gboxSettings->plainPage()); m_coeffInput->setRange(1, 100, 1); m_coeffInput->setDefaultValue(30); - QWhatsThis::add( m_coeffInput, i18n("<p>This value is the fish-eye-effect optical " + TQWhatsThis::add( m_coeffInput, i18n("<p>This value is the fish-eye-effect optical " "distortion coefficient.")); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 1); @@ -123,14 +123,14 @@ RainDropTool::RainDropTool(QObject* parent) // ------------------------------------------------------------- - connect(m_dropInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_dropInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_amountInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_amountInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_coeffInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_coeffInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } RainDropTool::~RainDropTool() @@ -205,7 +205,7 @@ void RainDropTool::prepareEffect() ImageIface* iface = m_previewWidget->imageIface(); // Selected data from the image - QRect selection(iface->selectedXOrg(), iface->selectedYOrg(), + TQRect selection(iface->selectedXOrg(), iface->selectedYOrg(), iface->selectedWidth(), iface->selectedHeight()); setFilter(dynamic_cast<DImgThreadedFilter *> @@ -225,7 +225,7 @@ void RainDropTool::prepareFinal() ImageIface iface(0, 0); // Selected data from the image - QRect selection(iface.selectedXOrg(), iface.selectedYOrg(), + TQRect selection(iface.selectedXOrg(), iface.selectedYOrg(), iface.selectedWidth(), iface.selectedHeight()); setFilter(dynamic_cast<DImgThreadedFilter *> diff --git a/digikam/imageplugins/raindrop/raindroptool.h b/digikam/imageplugins/raindrop/raindroptool.h index 896047b..cce309f 100644 --- a/digikam/imageplugins/raindrop/raindroptool.h +++ b/digikam/imageplugins/raindrop/raindroptool.h @@ -45,10 +45,11 @@ namespace DigikamRainDropImagesPlugin class RainDropTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - RainDropTool(QObject *parent); + RainDropTool(TQObject *tqparent); ~RainDropTool(); private slots: diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index cdfcdf8..6840821 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qfile.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqfile.h> +#include <tqimage.h> // KDE includes. @@ -59,12 +59,12 @@ namespace DigikamRestorationImagesPlugin { -ImageEffect_Restoration::ImageEffect_Restoration(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Photograph Restoration"), +ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Photograph Restoration"), "restoration", true, true, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; // About data and help button. @@ -90,28 +90,28 @@ ImageEffect_Restoration::ImageEffect_Restoration(QWidget* parent) // ------------------------------------------------------------- - m_mainTab = new QTabWidget( m_imagePreviewWidget ); + m_mainTab = new TQTabWidget( m_imagePreviewWidget ); - QWidget* firstPage = new QWidget( m_mainTab ); - QGridLayout* grid = new QGridLayout( firstPage, 2, 2, spacingHint()); + TQWidget* firstPage = new TQWidget( m_mainTab ); + TQGridLayout* grid = new TQGridLayout( firstPage, 2, 2, spacingHint()); m_mainTab->addTab( firstPage, i18n("Preset") ); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); - cimgLogoLabel->setText(QString()); + cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); - cimgLogoLabel->setPixmap( QPixmap( directory + "logo-cimg.png" ) ); - QToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); + TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); - QLabel *typeLabel = new QLabel(i18n("Filtering type:"), firstPage); - typeLabel->setAlignment ( Qt::AlignRight | Qt::AlignVCenter); - m_restorationTypeCB = new QComboBox( false, firstPage ); + TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); + typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + m_restorationTypeCB = new TQComboBox( false, firstPage ); m_restorationTypeCB->insertItem( i18n("None") ); m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") ); m_restorationTypeCB->insertItem( i18n("Reduce JPEG Artefacts") ); m_restorationTypeCB->insertItem( i18n("Reduce Texturing") ); - QWhatsThis::add( m_restorationTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" + TQWhatsThis::add( m_restorationTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" "<b>None</b>: Most common values. Puts settings to default.<p>" "<b>Reduce Uniform Noise</b>: reduce small image artifacts like sensor noise.<p>" "<b>Reduce JPEG Artefacts</b>: reduce large image artifacts like JPEG compression mosaic.<p>" @@ -130,11 +130,11 @@ ImageEffect_Restoration::ImageEffect_Restoration(QWidget* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processCImgURL(const QString&))); + connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processCImgURL(const TQString&))); - connect(m_restorationTypeCB, SIGNAL(activated(int)), - this, SLOT(slotResetValues(int))); + connect(m_restorationTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotResetValues(int))); } ImageEffect_Restoration::~ImageEffect_Restoration() @@ -244,7 +244,7 @@ void ImageEffect_Restoration::resetValues() m_settingsWidget->setSettings(settings); } -void ImageEffect_Restoration::processCImgURL(const QString& url) +void ImageEffect_Restoration::processCImgURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -297,20 +297,20 @@ void ImageEffect_Restoration::putFinalData(void) void ImageEffect_Restoration::slotUser3() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Restoration Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - if (!m_settingsWidget->loadSettings(file, QString("# Photograph Restoration Configuration File V2"))) + if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Restoration Configuration File V2"))) { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Restoration settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -330,15 +330,15 @@ void ImageEffect_Restoration::slotUser3() void ImageEffect_Restoration::slotUser2() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Restoration Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) - m_settingsWidget->saveSettings(file, QString("# Photograph Restoration Configuration File V2")); + m_settingsWidget->saveSettings(file, TQString("# Photograph Restoration Configuration File V2")); else KMessageBox::error(this, i18n("Cannot save settings to the Photograph Restoration text file.")); diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.h b/digikam/imageplugins/restoration/imageeffect_restoration.h index eac9ae3..f87636f 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.h +++ b/digikam/imageplugins/restoration/imageeffect_restoration.h @@ -25,16 +25,16 @@ #ifndef IMAGEEFFECT_RESTORATION_H #define IMAGEEFFECT_RESTORATION_H -// Qt include. +// TQt include. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "ctrlpaneldlg.h" -class QComboBox; -class QTabWidget; +class TQComboBox; +class TQTabWidget; namespace Digikam { @@ -47,17 +47,18 @@ namespace DigikamRestorationImagesPlugin class ImageEffect_Restoration : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Restoration(QWidget* parent); + ImageEffect_Restoration(TQWidget* tqparent); ~ImageEffect_Restoration(); private slots: void slotUser2(); void slotUser3(); - void processCImgURL(const QString&); + void processCImgURL(const TQString&); void readUserSettings(); void slotResetValues(int); @@ -81,9 +82,9 @@ private: ReduceTexturing }; - QTabWidget *m_mainTab; + TQTabWidget *m_mainTab; - QComboBox *m_restorationTypeCB; + TQComboBox *m_restorationTypeCB; Digikam::GreycstorationWidget *m_settingsWidget; }; diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp index 09cdcfd..52e02d5 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp +++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp @@ -43,11 +43,11 @@ using namespace DigikamRestorationImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_restoration, KGenericFactory<ImagePlugin_Restoration>("digikamimageplugin_restoration")); -ImagePlugin_Restoration::ImagePlugin_Restoration(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Restoration") +ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Restoration") { m_restorationAction = new KAction(i18n("Restoration..."), "restoration", 0, - this, SLOT(slotRestoration()), + this, TQT_SLOT(slotRestoration()), actionCollection(), "imageplugin_restoration"); setXMLFile( "digikamimageplugin_restoration_ui.rc" ); diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.h b/digikam/imageplugins/restoration/imageplugin_restoration.h index 9c7eb7a..bbddbba 100644 --- a/digikam/imageplugins/restoration/imageplugin_restoration.h +++ b/digikam/imageplugins/restoration/imageplugin_restoration.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Restoration : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Restoration(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Restoration(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Restoration(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 0ffce80..c73a68a 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qfile.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqfile.h> +#include <tqimage.h> // KDE includes. @@ -63,8 +63,8 @@ using namespace Digikam; namespace DigikamRestorationImagesPlugin { -RestorationTool::RestorationTool(QObject* parent) - : EditorToolThreaded(parent) +RestorationTool::RestorationTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("restoration"); setToolName(i18n("Restoration")); @@ -80,29 +80,29 @@ RestorationTool::RestorationTool(QObject* parent) EditorToolSettings::Try, EditorToolSettings::PanIcon); - QGridLayout* gridSettings = new QGridLayout(m_gboxSettings->plainPage(), 2, 1); - m_mainTab = new QTabWidget( m_gboxSettings->plainPage() ); + TQGridLayout* gridSettings = new TQGridLayout(m_gboxSettings->plainPage(), 2, 1); + m_mainTab = new TQTabWidget( m_gboxSettings->plainPage() ); - QWidget* firstPage = new QWidget( m_mainTab ); - QGridLayout* grid = new QGridLayout(firstPage, 2, 2); + TQWidget* firstPage = new TQWidget( m_mainTab ); + TQGridLayout* grid = new TQGridLayout(firstPage, 2, 2); m_mainTab->addTab( firstPage, i18n("Preset") ); KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); - cimgLogoLabel->setText(QString()); + cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); - cimgLogoLabel->setPixmap( QPixmap( directory + "logo-cimg.png" ) ); - QToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); + TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); - QLabel *typeLabel = new QLabel(i18n("Filtering type:"), firstPage); - typeLabel->setAlignment ( Qt::AlignRight | Qt::AlignVCenter); - m_restorationTypeCB = new QComboBox(false, firstPage); + TQLabel *typeLabel = new TQLabel(i18n("Filtering type:"), firstPage); + typeLabel->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter); + m_restorationTypeCB = new TQComboBox(false, firstPage); m_restorationTypeCB->insertItem( i18n("None") ); m_restorationTypeCB->insertItem( i18n("Reduce Uniform Noise") ); m_restorationTypeCB->insertItem( i18n("Reduce JPEG Artefacts") ); m_restorationTypeCB->insertItem( i18n("Reduce Texturing") ); - QWhatsThis::add( m_restorationTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" + TQWhatsThis::add( m_restorationTypeCB, i18n("<p>Select the filter preset to use for photograph restoration:<p>" "<b>None</b>: Most common values. Puts settings to default.<p>" "<b>Reduce Uniform Noise</b>: reduce small image artifacts like sensor noise.<p>" "<b>Reduce JPEG Artefacts</b>: reduce large image artifacts like JPEG compression mosaic.<p>" @@ -118,7 +118,7 @@ RestorationTool::RestorationTool(QObject* parent) m_settingsWidget = new GreycstorationWidget( m_mainTab ); gridSettings->addMultiCellWidget(m_mainTab, 0, 0, 1, 1); - gridSettings->addMultiCellWidget(new QLabel(m_gboxSettings->plainPage()), 1, 1, 1, 1); + gridSettings->addMultiCellWidget(new TQLabel(m_gboxSettings->plainPage()), 1, 1, 1, 1); gridSettings->setMargin(m_gboxSettings->spacingHint()); gridSettings->setSpacing(m_gboxSettings->spacingHint()); gridSettings->setRowStretch(2, 10); @@ -134,11 +134,11 @@ RestorationTool::RestorationTool(QObject* parent) // ------------------------------------------------------------- - connect(cimgLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processCImgURL(const QString&))); + connect(cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processCImgURL(const TQString&))); - connect(m_restorationTypeCB, SIGNAL(activated(int)), - this, SLOT(slotResetValues(int))); + connect(m_restorationTypeCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotResetValues(int))); // ------------------------------------------------------------- @@ -257,7 +257,7 @@ void RestorationTool::slotResetSettings() m_settingsWidget->setSettings(settings); } -void RestorationTool::processCImgURL(const QString& url) +void RestorationTool::processCImgURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -304,20 +304,20 @@ void RestorationTool::putFinalData() void RestorationTool::slotLoadSettings() { KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Restoration Settings File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) return; - QFile file(loadRestorationFile.path()); + TQFile file(loadRestorationFile.path()); if ( file.open(IO_ReadOnly) ) { - if (!m_settingsWidget->loadSettings(file, QString("# Photograph Restoration Configuration File V2"))) + if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Restoration Configuration File V2"))) { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a Photograph Restoration settings text file.") - .arg(loadRestorationFile.fileName())); + .tqarg(loadRestorationFile.fileName())); file.close(); return; } @@ -337,15 +337,15 @@ void RestorationTool::slotLoadSettings() void RestorationTool::slotSaveAsSettings() { KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("Photograph Restoration Settings File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) return; - QFile file(saveRestorationFile.path()); + TQFile file(saveRestorationFile.path()); if ( file.open(IO_WriteOnly) ) - m_settingsWidget->saveSettings(file, QString("# Photograph Restoration Configuration File V2")); + m_settingsWidget->saveSettings(file, TQString("# Photograph Restoration Configuration File V2")); else KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Restoration text file.")); diff --git a/digikam/imageplugins/restoration/restorationtool.h b/digikam/imageplugins/restoration/restorationtool.h index 6adc37b..4b80e91 100644 --- a/digikam/imageplugins/restoration/restorationtool.h +++ b/digikam/imageplugins/restoration/restorationtool.h @@ -25,16 +25,16 @@ #ifndef RESTORATIONTOOL_H #define RESTORATIONTOOL_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "editortool.h" -class QComboBox; -class QTabWidget; +class TQComboBox; +class TQTabWidget; namespace Digikam { @@ -49,10 +49,11 @@ namespace DigikamRestorationImagesPlugin class RestorationTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - RestorationTool(QObject* parent); + RestorationTool(TQObject* tqparent); ~RestorationTool(); private slots: @@ -60,7 +61,7 @@ private slots: void slotSaveAsSettings(); void slotLoadSettings(); void slotResetSettings(); - void processCImgURL(const QString&); + void processCImgURL(const TQString&); void slotResetValues(int); private: @@ -83,9 +84,9 @@ private: ReduceTexturing }; - QTabWidget *m_mainTab; + TQTabWidget *m_mainTab; - QComboBox *m_restorationTypeCB; + TQComboBox *m_restorationTypeCB; Digikam::GreycstorationWidget *m_settingsWidget; diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp index 963d9ae..2dc66b9 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqimage.h> // KDE includes. @@ -55,15 +55,15 @@ namespace DigikamShearToolImagesPlugin { -ImageEffect_ShearTool::ImageEffect_ShearTool(QWidget* parent) - : Digikam::ImageGuideDlg(parent, i18n("Shear Tool"), "sheartool", +ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* tqparent) + : Digikam::ImageGuideDlg(tqparent, i18n("Shear Tool"), "sheartool", false, true, true, Digikam::ImageGuideWidget::HVGuideMode) { // No need Abort button action. showButton(User1, false); - QString whatsThis; + TQString whatsThis; // About data and help button. @@ -84,7 +84,7 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(QWidget* parent) setAboutData(about); - QWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the shearing image operation preview. " + TQWhatsThis::add( m_imagePreviewWidget, i18n("<p>This is the shearing image operation preview. " "If you move the mouse cursor on this preview, " "a vertical and horizontal dashed line will be drawn " "to guide you in adjusting the shearing correction. " @@ -93,64 +93,64 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(QWidget* parent) // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); - QWidget *gboxSettings = new QWidget(plainPage()); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 11, 2, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 11, 2, spacingHint()); - QLabel *label1 = new QLabel(i18n("New width:"), gboxSettings); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + TQLabel *label1 = new TQLabel(i18n("New width:"), gboxSettings); + m_newWidthLabel = new TQLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), gboxSettings); + m_newWidthLabel->tqsetAlignment( AlignBottom | AlignRight ); - QLabel *label2 = new QLabel(i18n("New height:"), gboxSettings); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), gboxSettings); - m_newHeightLabel->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 ); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_newWidthLabel, 0, 0, 1, 2); gridSettings->addMultiCellWidget(label2, 1, 1, 0, 0); gridSettings->addMultiCellWidget(m_newHeightLabel, 1, 1, 1, 2); - KSeparator *line = new KSeparator (Horizontal, gboxSettings); + KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); gridSettings->addMultiCellWidget(line, 2, 2, 0, 2); - QLabel *label3 = new QLabel(i18n("Main horizontal angle:"), gboxSettings); + TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), gboxSettings); m_mainHAngleInput = new KIntNumInput(gboxSettings); m_mainHAngleInput->setRange(-45, 45, 1, true); m_mainHAngleInput->setValue(0); - QWhatsThis::add( m_mainHAngleInput, i18n("<p>The main horizontal shearing angle, in degrees.")); + TQWhatsThis::add( m_mainHAngleInput, i18n("<p>The main horizontal shearing angle, in degrees.")); gridSettings->addMultiCellWidget(label3, 3, 3, 0, 2); gridSettings->addMultiCellWidget(m_mainHAngleInput, 4, 4, 0, 2); - QLabel *label4 = new QLabel(i18n("Fine horizontal angle:"), gboxSettings); + TQLabel *label4 = new TQLabel(i18n("Fine horizontal angle:"), gboxSettings); m_fineHAngleInput = new KDoubleNumInput(gboxSettings); m_fineHAngleInput->setRange(-5.0, 5.0, 0.01, true); m_fineHAngleInput->setValue(0); - QWhatsThis::add( m_fineHAngleInput, i18n("<p>This value in degrees will be added to main horizontal angle value " + TQWhatsThis::add( m_fineHAngleInput, i18n("<p>This value in degrees will be added to main horizontal angle value " "to set fine adjustments.")); gridSettings->addMultiCellWidget(label4, 5, 5, 0, 2); gridSettings->addMultiCellWidget(m_fineHAngleInput, 6, 6, 0, 2); - QLabel *label5 = new QLabel(i18n("Main vertical angle:"), gboxSettings); + TQLabel *label5 = new TQLabel(i18n("Main vertical angle:"), gboxSettings); m_mainVAngleInput = new KIntNumInput(gboxSettings); m_mainVAngleInput->setRange(-45, 45, 1, true); m_mainVAngleInput->setValue(0); - QWhatsThis::add( m_mainVAngleInput, i18n("<p>The main vertical shearing angle, in degrees.")); + TQWhatsThis::add( m_mainVAngleInput, i18n("<p>The main vertical shearing angle, in degrees.")); gridSettings->addMultiCellWidget(label5, 7, 7, 0, 0); gridSettings->addMultiCellWidget(m_mainVAngleInput, 8, 8, 0, 2); - QLabel *label6 = new QLabel(i18n("Fine vertical angle:"), gboxSettings); + TQLabel *label6 = new TQLabel(i18n("Fine vertical angle:"), gboxSettings); m_fineVAngleInput = new KDoubleNumInput(gboxSettings); m_fineVAngleInput->setRange(-5.0, 5.0, 0.01, true); m_fineVAngleInput->setValue(0); - QWhatsThis::add( m_fineVAngleInput, i18n("<p>This value in degrees will be added to main vertical angle value " + TQWhatsThis::add( m_fineVAngleInput, i18n("<p>This value in degrees will be added to main vertical angle value " "to set fine adjustments.")); gridSettings->addMultiCellWidget(label6, 9, 9, 0, 2); gridSettings->addMultiCellWidget(m_fineVAngleInput, 10, 10, 0, 2); - m_antialiasInput = new QCheckBox(i18n("Anti-Aliasing"), gboxSettings); - QWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " + m_antialiasInput = new TQCheckBox(i18n("Anti-Aliasing"), gboxSettings); + TQWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " "to the sheared image. " "To smooth the target image, it will be blurred a little.")); gridSettings->addMultiCellWidget(m_antialiasInput, 11, 11, 0, 2); @@ -159,20 +159,20 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(QWidget* parent) // ------------------------------------------------------------- - connect(m_mainHAngleInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_mainHAngleInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineHAngleInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_fineHAngleInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_mainVAngleInput, SIGNAL(valueChanged (int)), - this, SLOT(slotTimer())); + connect(m_mainVAngleInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineVAngleInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_fineVAngleInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_antialiasInput, SIGNAL(toggled (bool)), - this, SLOT(slotEffect())); + connect(m_antialiasInput, TQT_SIGNAL(toggled (bool)), + this, TQT_SLOT(slotEffect())); } ImageEffect_ShearTool::~ImageEffect_ShearTool() @@ -234,7 +234,7 @@ void ImageEffect_ShearTool::prepareEffect() float hAngle = m_mainHAngleInput->value() + m_fineHAngleInput->value(); float vAngle = m_mainVAngleInput->value() + m_fineVAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); - QColor background = paletteBackgroundColor().rgb(); + TQColor background = paletteBackgroundColor().rgb(); Digikam::ImageIface* iface = m_imagePreviewWidget->imageIface(); int orgW = iface->originalWidth(); @@ -260,7 +260,7 @@ void ImageEffect_ShearTool::prepareFinal() float hAngle = m_mainHAngleInput->value() + m_fineHAngleInput->value(); float vAngle = m_mainVAngleInput->value() + m_fineVAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); - QColor background = Qt::black; + TQColor background = TQt::black; Digikam::ImageIface iface(0, 0); int orgW = iface.originalWidth(); @@ -281,7 +281,7 @@ void ImageEffect_ShearTool::putPreviewData(void) int w = iface->previewWidth(); int h = iface->previewHeight(); - Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + Digikam::DImg imTemp = m_threadedFilter->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); Digikam::DImg imDest( w, h, m_threadedFilter->getTargetImage().sixteenBit(), m_threadedFilter->getTargetImage().hasAlpha() ); @@ -293,8 +293,8 @@ void ImageEffect_ShearTool::putPreviewData(void) iface->previewHeight())).bits()); m_imagePreviewWidget->updatePreview(); - QSize newSize = dynamic_cast<ShearTool *>(m_threadedFilter)->getNewSize(); - QString temp; + TQSize newSize = dynamic_cast<ShearTool *>(m_threadedFilter)->getNewSize(); + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); } diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.h b/digikam/imageplugins/sheartool/imageeffect_sheartool.h index c55dc8e..2724b5b 100644 --- a/digikam/imageplugins/sheartool/imageeffect_sheartool.h +++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.h @@ -28,10 +28,10 @@ #include "imageguidedlg.h" -class QFrame; -class QPushButton; -class QCheckBox; -class QLabel; +class TQFrame; +class TQPushButton; +class TQCheckBox; +class TQLabel; class KIntNumInput; class KDoubleNumInput; @@ -42,10 +42,11 @@ namespace DigikamShearToolImagesPlugin class ImageEffect_ShearTool : public Digikam::ImageGuideDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_ShearTool(QWidget* parent); + ImageEffect_ShearTool(TQWidget* tqparent); ~ImageEffect_ShearTool(); private slots: @@ -64,10 +65,10 @@ protected: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; - QCheckBox *m_antialiasInput; + TQCheckBox *m_antialiasInput; KIntNumInput *m_mainHAngleInput; KIntNumInput *m_mainVAngleInput; diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp index 1d29365..b4ffc78 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp @@ -41,11 +41,11 @@ using namespace DigikamShearToolImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_sheartool, KGenericFactory<ImagePlugin_ShearTool>("digikamimageplugin_sheartool")); -ImagePlugin_ShearTool::ImagePlugin_ShearTool(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_ShearTool") +ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_ShearTool") { m_sheartoolAction = new KAction(i18n("Shear..."), "shear", 0, - this, SLOT(slotShearTool()), + this, TQT_SLOT(slotShearTool()), actionCollection(), "imageplugin_sheartool"); setXMLFile("digikamimageplugin_sheartool_ui.rc"); diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.h b/digikam/imageplugins/sheartool/imageplugin_sheartool.h index 6a3fdc0..abff984 100644 --- a/digikam/imageplugins/sheartool/imageplugin_sheartool.h +++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ShearTool : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_ShearTool(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_ShearTool(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_ShearTool(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/sheartool/shear.cpp b/digikam/imageplugins/sheartool/shear.cpp index cfe84f2..2003cfd 100644 --- a/digikam/imageplugins/sheartool/shear.cpp +++ b/digikam/imageplugins/sheartool/shear.cpp @@ -41,9 +41,9 @@ namespace DigikamShearToolImagesPlugin { -Shear::Shear(Digikam::DImg *orgImage, QObject *parent, float hAngle, float vAngle, - bool antialiasing, QColor backgroundColor, int orgW, int orgH) - : Digikam::DImgThreadedFilter(orgImage, parent, "sheartool") +Shear::Shear(Digikam::DImg *orgImage, TQObject *tqparent, float hAngle, float vAngle, + bool antialiasing, TQColor backgroundColor, int orgW, int orgH) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "sheartool") { m_hAngle = hAngle; m_vAngle = vAngle; diff --git a/digikam/imageplugins/sheartool/shear.h b/digikam/imageplugins/sheartool/shear.h index de91fa5..ed97ce1 100644 --- a/digikam/imageplugins/sheartool/shear.h +++ b/digikam/imageplugins/sheartool/shear.h @@ -24,10 +24,10 @@ #ifndef SHEAR_H #define SHEAR_H -// Qt includes. +// TQt includes. -#include <qsize.h> -#include <qcolor.h> +#include <tqsize.h> +#include <tqcolor.h> // Digikam includes. @@ -41,12 +41,12 @@ class Shear : public Digikam::DImgThreadedFilter public: - Shear(Digikam::DImg *orgImage, QObject *parent=0, float hAngle=0.0, float vAngle=0.0, - bool antialiasing=true, QColor backgroundColor=Qt::black, int orgW=0, int orgH=0); + Shear(Digikam::DImg *orgImage, TQObject *tqparent=0, float hAngle=0.0, float vAngle=0.0, + bool antialiasing=true, TQColor backgroundColor=TQt::black, int orgW=0, int orgH=0); ~Shear(){}; - QSize getNewSize(void){ return m_newSize; }; + TQSize getNewSize(void){ return m_newSize; }; private: @@ -74,9 +74,9 @@ private: float m_hAngle; float m_vAngle; - QColor m_backgroundColor; + TQColor m_backgroundColor; - QSize m_newSize; + TQSize m_newSize; }; } // NameSpace DigikamShearToolImagesPlugin diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp index 307e49f..fb46867 100644 --- a/digikam/imageplugins/sheartool/sheartool.cpp +++ b/digikam/imageplugins/sheartool/sheartool.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcheckbox.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -62,8 +62,8 @@ using namespace Digikam; namespace DigikamShearToolImagesPlugin { -ShearTool::ShearTool(QObject* parent) - : EditorToolThreaded(parent) +ShearTool::ShearTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("sheartool"); setToolName(i18n("Shear Tool")); @@ -82,53 +82,53 @@ ShearTool::ShearTool(QObject* parent) // ------------------------------------------------------------- - QString temp; + TQString temp; Digikam::ImageIface iface(0, 0); m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel, EditorToolSettings::ColorGuide); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 12, 2); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 12, 2); - QLabel *label1 = new QLabel(i18n("New width:"), m_gboxSettings->plainPage()); - m_newWidthLabel = new QLabel(temp.setNum( iface.originalWidth()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newWidthLabel->setAlignment( AlignBottom | AlignRight ); + 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 ); - QLabel *label2 = new QLabel(i18n("New height:"), m_gboxSettings->plainPage()); - m_newHeightLabel = new QLabel(temp.setNum( iface.originalHeight()) + i18n(" px"), m_gboxSettings->plainPage()); - m_newHeightLabel->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 ); - KSeparator *line = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); - QLabel *label3 = new QLabel(i18n("Main horizontal angle:"), m_gboxSettings->plainPage()); + TQLabel *label3 = new TQLabel(i18n("Main horizontal angle:"), m_gboxSettings->plainPage()); m_mainHAngleInput = new RIntNumInput(m_gboxSettings->plainPage()); m_mainHAngleInput->setRange(-45, 45, 1); m_mainHAngleInput->setDefaultValue(0); - QWhatsThis::add( m_mainHAngleInput, i18n("<p>The main horizontal shearing angle, in degrees.")); + TQWhatsThis::add( m_mainHAngleInput, i18n("<p>The main horizontal shearing angle, in degrees.")); - QLabel *label4 = new QLabel(i18n("Fine horizontal angle:"), m_gboxSettings->plainPage()); + TQLabel *label4 = new TQLabel(i18n("Fine horizontal angle:"), m_gboxSettings->plainPage()); m_fineHAngleInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_fineHAngleInput->setRange(-5.0, 5.0, 0.01); m_fineHAngleInput->setDefaultValue(0); - QWhatsThis::add( m_fineHAngleInput, i18n("<p>This value in degrees will be added to main horizontal angle value " + TQWhatsThis::add( m_fineHAngleInput, i18n("<p>This value in degrees will be added to main horizontal angle value " "to set fine adjustments.")); - QLabel *label5 = new QLabel(i18n("Main vertical angle:"), m_gboxSettings->plainPage()); + TQLabel *label5 = new TQLabel(i18n("Main vertical angle:"), m_gboxSettings->plainPage()); m_mainVAngleInput = new RIntNumInput(m_gboxSettings->plainPage()); m_mainVAngleInput->setRange(-45, 45, 1); m_mainVAngleInput->setDefaultValue(0); - QWhatsThis::add( m_mainVAngleInput, i18n("<p>The main vertical shearing angle, in degrees.")); + TQWhatsThis::add( m_mainVAngleInput, i18n("<p>The main vertical shearing angle, in degrees.")); - QLabel *label6 = new QLabel(i18n("Fine vertical angle:"), m_gboxSettings->plainPage()); + TQLabel *label6 = new TQLabel(i18n("Fine vertical angle:"), m_gboxSettings->plainPage()); m_fineVAngleInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_fineVAngleInput->setRange(-5.0, 5.0, 0.01); m_fineVAngleInput->setDefaultValue(0); - QWhatsThis::add( m_fineVAngleInput, i18n("<p>This value in degrees will be added to main vertical angle value " + TQWhatsThis::add( m_fineVAngleInput, i18n("<p>This value in degrees will be added to main vertical angle value " "to set fine adjustments.")); - m_antialiasInput = new QCheckBox(i18n("Anti-Aliasing"), m_gboxSettings->plainPage()); - QWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " + m_antialiasInput = new TQCheckBox(i18n("Anti-Aliasing"), m_gboxSettings->plainPage()); + TQWhatsThis::add( m_antialiasInput, i18n("<p>Enable this option to apply the anti-aliasing filter " "to the sheared image. " "To smooth the target image, it will be blurred a little.")); @@ -155,23 +155,23 @@ ShearTool::ShearTool(QObject* parent) // ------------------------------------------------------------- - connect(m_mainHAngleInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_mainHAngleInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineHAngleInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_fineHAngleInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_mainVAngleInput, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_mainVAngleInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); - connect(m_fineVAngleInput, SIGNAL(valueChanged(double)), - this, SLOT(slotTimer())); + connect(m_fineVAngleInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTimer())); - connect(m_antialiasInput, SIGNAL(toggled(bool)), - this, SLOT(slotEffect())); + connect(m_antialiasInput, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotEffect())); - connect(m_gboxSettings, SIGNAL(signalColorGuideChanged()), - this, SLOT(slotColorGuideChanged())); + connect(m_gboxSettings, TQT_SIGNAL(signalColorGuideChanged()), + this, TQT_SLOT(slotColorGuideChanged())); } ShearTool::~ShearTool() @@ -193,7 +193,7 @@ void ShearTool::readSettings() m_fineHAngleInput->setValue(config->readDoubleNumEntry("Fine HAngle", m_fineHAngleInput->defaultValue())); m_fineVAngleInput->setValue(config->readDoubleNumEntry("Fine VAngle", m_fineVAngleInput->defaultValue())); m_antialiasInput->setChecked(config->readBoolEntry("Anti Aliasing", true)); - m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &Qt::red)); + m_gboxSettings->setGuideColor(config->readColorEntry("Guide Color", &TQt::red)); m_gboxSettings->setGuideSize(config->readNumEntry("Guide Width", 1)); slotColorGuideChanged(); @@ -248,7 +248,7 @@ void ShearTool::prepareEffect() float hAngle = m_mainHAngleInput->value() + m_fineHAngleInput->value(); float vAngle = m_mainVAngleInput->value() + m_fineVAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); - QColor background = m_previewWidget->paletteBackgroundColor().rgb(); + TQColor background = m_previewWidget->paletteBackgroundColor().rgb(); ImageIface* iface = m_previewWidget->imageIface(); int orgW = iface->originalWidth(); int orgH = iface->originalHeight(); @@ -272,7 +272,7 @@ void ShearTool::prepareFinal() float hAngle = m_mainHAngleInput->value() + m_fineHAngleInput->value(); float vAngle = m_mainVAngleInput->value() + m_fineVAngleInput->value(); bool antialiasing = m_antialiasInput->isChecked(); - QColor background = Qt::black; + TQColor background = TQt::black; ImageIface iface(0, 0); int orgW = iface.originalWidth(); @@ -291,7 +291,7 @@ void ShearTool::putPreviewData() ImageIface* iface = m_previewWidget->imageIface(); int w = iface->previewWidth(); int h = iface->previewHeight(); - DImg imTemp = filter()->getTargetImage().smoothScale(w, h, QSize::ScaleMin); + DImg imTemp = filter()->getTargetImage().smoothScale(w, h, TQSize::ScaleMin); DImg imDest( w, h, filter()->getTargetImage().sixteenBit(), filter()->getTargetImage().hasAlpha() ); @@ -303,8 +303,8 @@ void ShearTool::putPreviewData() iface->previewHeight())).bits()); m_previewWidget->updatePreview(); - QSize newSize = dynamic_cast<Shear*>(filter())->getNewSize(); - QString temp; + TQSize newSize = dynamic_cast<Shear*>(filter())->getNewSize(); + TQString temp; m_newWidthLabel->setText(temp.setNum( newSize.width()) + i18n(" px") ); m_newHeightLabel->setText(temp.setNum( newSize.height()) + i18n(" px") ); } diff --git a/digikam/imageplugins/sheartool/sheartool.h b/digikam/imageplugins/sheartool/sheartool.h index 5023834..10e99ae 100644 --- a/digikam/imageplugins/sheartool/sheartool.h +++ b/digikam/imageplugins/sheartool/sheartool.h @@ -28,10 +28,10 @@ #include "editortool.h" -class QFrame; -class QPushButton; -class QCheckBox; -class QLabel; +class TQFrame; +class TQPushButton; +class TQCheckBox; +class TQLabel; namespace KDcrawIface { @@ -51,10 +51,11 @@ namespace DigikamShearToolImagesPlugin class ShearTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - ShearTool(QObject* parent); + ShearTool(TQObject* tqparent); ~ShearTool(); private slots: @@ -74,10 +75,10 @@ private: private: - QLabel *m_newWidthLabel; - QLabel *m_newHeightLabel; + TQLabel *m_newWidthLabel; + TQLabel *m_newHeightLabel; - QCheckBox *m_antialiasInput; + TQCheckBox *m_antialiasInput; KDcrawIface::RIntNumInput *m_mainHAngleInput; KDcrawIface::RIntNumInput *m_mainVAngleInput; diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp index 78abc03..85770af 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.cpp +++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp @@ -23,12 +23,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qheader.h> -#include <qlistview.h> -#include <qdir.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqdir.h> // KDE includes. @@ -46,13 +46,13 @@ namespace DigikamSuperImposeImagesPlugin struct DirSelectWidget::Private { KFileTreeBranch* m_item; - QStringList m_pendingPath; - QString m_handled; + TQStringList m_pendingPath; + TQString m_handled; KURL m_rootUrl; }; -DirSelectWidget::DirSelectWidget(QWidget* parent, const char* name, QString headerLabel) - : KFileTreeView( parent, name) +DirSelectWidget::DirSelectWidget(TQWidget* tqparent, const char* name, TQString headerLabel) + : KFileTreeView( tqparent, name) { d = new Private; @@ -61,12 +61,12 @@ DirSelectWidget::DirSelectWidget(QWidget* parent, const char* name, QString head if ( headerLabel.isNull() ) header()->hide(); - setAlternateBackground(QColor::QColor()); + setAlternateBackground(TQColor::TQColor()); } DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl, - QWidget* parent, const char* name, QString headerLabel) - : KFileTreeView( parent, name) + TQWidget* tqparent, const char* name, TQString headerLabel) + : KFileTreeView( tqparent, name) { d = new Private; @@ -75,7 +75,7 @@ DirSelectWidget::DirSelectWidget(KURL rootUrl, KURL currentUrl, if ( headerLabel.isNull() ) header()->hide(); - setAlternateBackground(QColor::QColor()); + setAlternateBackground(TQColor::TQColor()); setRootPath(rootUrl, currentUrl); } @@ -93,14 +93,14 @@ void DirSelectWidget::load() { if ( d->m_pendingPath.isEmpty() ) { - disconnect( d->m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, SLOT( load() ) ); + disconnect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQT_SLOT( load() ) ); emit folderItemSelected(currentURL()); return; } - QString item = d->m_pendingPath.front(); + TQString item = d->m_pendingPath.front(); d->m_pendingPath.pop_front(); d->m_handled += item; KFileTreeViewItem* branch = findItem( d->m_item, d->m_handled ); @@ -126,17 +126,17 @@ void DirSelectWidget::setCurrentPath(KURL currentUrl) if ( !currentUrl.isValid() ) return; - QString currentPath = QDir::cleanDirPath(currentUrl.path()); + TQString currentPath = TQDir::cleanDirPath(currentUrl.path()); currentPath = currentPath.mid( d->m_rootUrl.path().length() ); d->m_pendingPath.clear(); - d->m_handled = QString(""); - d->m_pendingPath = QStringList::split( "/", currentPath, true ); + d->m_handled = TQString(""); + d->m_pendingPath = TQStringList::split( "/", currentPath, true ); if ( !d->m_pendingPath[0].isEmpty() ) d->m_pendingPath.prepend( "" ); // ensure we open the root first. - connect( d->m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, SLOT( load() ) ); + connect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQT_SLOT( load() ) ); load(); } @@ -144,28 +144,28 @@ void DirSelectWidget::setRootPath(KURL rootUrl, KURL currentUrl) { d->m_rootUrl = rootUrl; clear(); - QString root = QDir::cleanDirPath(rootUrl.path()); + TQString root = TQDir::cleanDirPath(rootUrl.path()); if ( !root.endsWith("/")) root.append("/"); - QString currentPath = QDir::cleanDirPath(currentUrl.isValid() ? currentUrl.path() : root); + TQString currentPath = TQDir::cleanDirPath(currentUrl.isValid() ? currentUrl.path() : root); d->m_item = addBranch( rootUrl, rootUrl.fileName() ); setDirOnlyMode( d->m_item, true ); currentPath = currentPath.mid( root.length() ); - d->m_pendingPath = QStringList::split( "/", currentPath, true ); + d->m_pendingPath = TQStringList::split( "/", currentPath, true ); if ( !d->m_pendingPath[0].isEmpty() ) d->m_pendingPath.prepend( "" ); // ensure we open the root first. - connect( d->m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), - this, SLOT( load() ) ); + connect( d->m_item, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), + this, TQT_SLOT( load() ) ); load(); - connect( this, SIGNAL( executed(QListViewItem *) ), - this, SLOT( slotFolderSelected(QListViewItem *) ) ); + connect( this, TQT_SIGNAL( executed(TQListViewItem *) ), + this, TQT_SLOT( slotFolderSelected(TQListViewItem *) ) ); } KURL DirSelectWidget::rootPath(void) @@ -173,7 +173,7 @@ KURL DirSelectWidget::rootPath(void) return d->m_rootUrl; } -void DirSelectWidget::slotFolderSelected(QListViewItem *) +void DirSelectWidget::slotFolderSelected(TQListViewItem *) { emit folderItemSelected(currentURL()); } diff --git a/digikam/imageplugins/superimpose/dirselectwidget.h b/digikam/imageplugins/superimpose/dirselectwidget.h index 3f69247..49211ba 100644 --- a/digikam/imageplugins/superimpose/dirselectwidget.h +++ b/digikam/imageplugins/superimpose/dirselectwidget.h @@ -26,10 +26,10 @@ #ifndef DIRSELECTWIDGET_H #define DIRSELECTWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -42,19 +42,20 @@ namespace DigikamSuperImposeImagesPlugin class DirSelectWidget : public KFileTreeView { Q_OBJECT + TQ_OBJECT public: - DirSelectWidget(QWidget* parent, const char* name=0, QString headerLabel=QString()); + DirSelectWidget(TQWidget* tqparent, const char* name=0, TQString headerLabel=TQString()); DirSelectWidget(KURL rootUrl=KURL("/"), KURL currentUrl=KURL(), - QWidget* parent=0, const char* name=0, QString headerLabel=QString()); + TQWidget* tqparent=0, const char* name=0, TQString headerLabel=TQString()); ~DirSelectWidget(); KURL path() const; KURL rootPath(void); - void setRootPath(KURL rootUrl, KURL currentUrl=KURL(QString())); + void setRootPath(KURL rootUrl, KURL currentUrl=KURL(TQString())); void setCurrentPath(KURL currentUrl); signals : @@ -64,7 +65,7 @@ signals : protected slots: void load(); - void slotFolderSelected(QListViewItem *); + void slotFolderSelected(TQListViewItem *); private: diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index a883709..0189763 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -23,20 +23,20 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qvgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qpixmap.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qframe.h> -#include <qdir.h> -#include <qfile.h> -#include <qhbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqpixmap.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqhbuttongroup.h> // KDE includes. @@ -71,11 +71,11 @@ namespace DigikamSuperImposeImagesPlugin { -ImageEffect_SuperImpose::ImageEffect_SuperImpose(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("Template Superimpose to Photograph"), +ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("Template Superimpose to Photograph"), "superimpose", false, false) { - QString whatsThis; + TQString whatsThis; // About data and help button. @@ -99,42 +99,42 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(QWidget* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(plainPage()); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); + TQFrame *frame = new TQFrame(plainPage()); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - QGridLayout* gridFrame = new QGridLayout( frame, 1, 2, spacingHint()); + TQGridLayout* gridFrame = new TQGridLayout( frame, 1, 2, spacingHint()); m_previewWidget = new SuperImposeWidget(400, 300, frame); gridFrame->addMultiCellWidget(m_previewWidget, 0, 0, 0, 2); gridFrame->setRowStretch(0, 10); - QWhatsThis::add( m_previewWidget, i18n("<p>This is the preview of the template " + TQWhatsThis::add( m_previewWidget, i18n("<p>This is the preview of the template " "superimposed onto the image.") ); // ------------------------------------------------------------- - QHButtonGroup *bGroup = new QHButtonGroup(frame); + TQHButtonGroup *bGroup = new TQHButtonGroup(frame); KIconLoader icon; bGroup->addSpace(0); - QPushButton *zoomInButton = new QPushButton( bGroup ); + TQPushButton *zoomInButton = new TQPushButton( bGroup ); bGroup->insert(zoomInButton, ZOOMIN); zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (KIcon::Group)KIcon::Toolbar ) ); zoomInButton->setToggleButton(true); - QToolTip::add( zoomInButton, i18n( "Zoom in" ) ); + TQToolTip::add( zoomInButton, i18n( "Zoom in" ) ); bGroup->addSpace(20); - QPushButton *zoomOutButton = new QPushButton( bGroup ); + TQPushButton *zoomOutButton = new TQPushButton( bGroup ); bGroup->insert(zoomOutButton, ZOOMOUT); zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (KIcon::Group)KIcon::Toolbar ) ); zoomOutButton->setToggleButton(true); - QToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); + TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); bGroup->addSpace(20); - QPushButton *moveButton = new QPushButton( bGroup ); + TQPushButton *moveButton = new TQPushButton( bGroup ); bGroup->insert(moveButton, MOVE); moveButton->setPixmap( icon.loadIcon( "move", (KIcon::Group)KIcon::Toolbar ) ); moveButton->setToggleButton(true); moveButton->setOn(true); - QToolTip::add( moveButton, i18n( "Move" ) ); + TQToolTip::add( moveButton, i18n( "Move" ) ); bGroup->addSpace(20); bGroup->setExclusive(true); - bGroup->setFrameShape(QFrame::NoFrame); + bGroup->setFrameShape(TQFrame::NoFrame); gridFrame->addMultiCellWidget(bGroup, 1, 1, 1, 1); gridFrame->setColStretch(0, 10); gridFrame->setColStretch(2, 10); @@ -143,13 +143,13 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(QWidget* parent) // ------------------------------------------------------------- - QWidget *gbox2 = new QWidget(plainPage()); - QGridLayout* grid = new QGridLayout( gbox2, 1, 1, marginHint(), spacingHint()); + TQWidget *gbox2 = new TQWidget(plainPage()); + TQGridLayout* grid = new TQGridLayout( gbox2, 1, 1, marginHint(), spacingHint()); m_thumbnailsBar = new Digikam::ThumbBarView(gbox2); m_dirSelect = new DirSelectWidget(gbox2); - QPushButton *templateDirButton = new QPushButton( i18n("Root Directory..."), gbox2 ); - QWhatsThis::add( templateDirButton, i18n("<p>Set here the current templates' root directory.") ); + TQPushButton *templateDirButton = new TQPushButton( i18n("Root Directory..."), gbox2 ); + TQWhatsThis::add( templateDirButton, i18n("<p>Set here the current templates' root directory.") ); grid->addMultiCellWidget(m_thumbnailsBar, 0, 1, 0, 0); grid->addMultiCellWidget(m_dirSelect, 0, 0, 1, 1); @@ -160,17 +160,17 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(QWidget* parent) // ------------------------------------------------------------- - connect(bGroup, SIGNAL(released(int)), - m_previewWidget, SLOT(slotEditModeChanged(int))); + connect(bGroup, TQT_SIGNAL(released(int)), + m_previewWidget, TQT_SLOT(slotEditModeChanged(int))); - connect(m_thumbnailsBar, SIGNAL(signalURLSelected(const KURL&)), - m_previewWidget, SLOT(slotSetCurrentTemplate(const KURL&))); + connect(m_thumbnailsBar, TQT_SIGNAL(signalURLSelected(const KURL&)), + m_previewWidget, TQT_SLOT(slotSetCurrentTemplate(const KURL&))); - connect(m_dirSelect, SIGNAL(folderItemSelected(const KURL &)), - this, SLOT(slotTemplateDirChanged(const KURL &))); + connect(m_dirSelect, TQT_SIGNAL(folderItemSelected(const KURL &)), + this, TQT_SLOT(slotTemplateDirChanged(const KURL &))); - connect(templateDirButton, SIGNAL(clicked()), - this, SLOT(slotRootTemplateDirChanged())); + connect(templateDirButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRootTemplateDirChanged())); // ------------------------------------------------------------- @@ -188,19 +188,19 @@ void ImageEffect_SuperImpose::populateTemplates(void) if (!m_templatesUrl.isValid() || !m_templatesUrl.isLocalFile()) return; - QDir dir(m_templatesUrl.path(), "*.png *.PNG"); + TQDir dir(m_templatesUrl.path(), "*.png *.PNG"); if (!dir.exists()) return; - dir.setFilter ( QDir::Files | QDir::NoSymLinks ); + dir.setFilter ( TQDir::Files | TQDir::NoSymLinks ); - const QFileInfoList* fileinfolist = dir.entryInfoList(); + const TQFileInfoList* fileinfolist = dir.entryInfoList(); if (!fileinfolist) return; - QFileInfoListIterator it(*fileinfolist); - QFileInfo* fi; + TQFileInfoListIterator it(*fileinfolist); + TQFileInfo* fi; while( (fi = it.current() ) ) { diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.h b/digikam/imageplugins/superimpose/imageeffect_superimpose.h index 17ce482..79cb980 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.h +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.h @@ -34,7 +34,7 @@ #include "imagedlgbase.h" -class QPushButton; +class TQPushButton; namespace Digikam { @@ -50,10 +50,11 @@ class SuperImposeWidget; class ImageEffect_SuperImpose : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_SuperImpose(QWidget* parent); + ImageEffect_SuperImpose(TQWidget* tqparent); ~ImageEffect_SuperImpose(); private slots: diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp index fd69a0f..6d4064f 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp @@ -43,11 +43,11 @@ using namespace DigikamSuperImposeImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_superimpose, KGenericFactory<ImagePlugin_SuperImpose>("digikamimageplugin_superimpose")); -ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_SuperImpose") +ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_SuperImpose") { m_superimposeAction = new KAction(i18n("Template Superimpose..."), "superimpose", 0, - this, SLOT(slotSuperImpose()), + this, TQT_SLOT(slotSuperImpose()), actionCollection(), "imageplugin_superimpose"); setXMLFile("digikamimageplugin_superimpose_ui.rc"); diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.h b/digikam/imageplugins/superimpose/imageplugin_superimpose.h index 6fcd3dd..a03abcd 100644 --- a/digikam/imageplugins/superimpose/imageplugin_superimpose.h +++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.h @@ -36,11 +36,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_SuperImpose(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_SuperImpose(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_SuperImpose(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/superimpose/superimpose.cpp b/digikam/imageplugins/superimpose/superimpose.cpp index a2118c5..7c0ac74 100644 --- a/digikam/imageplugins/superimpose/superimpose.cpp +++ b/digikam/imageplugins/superimpose/superimpose.cpp @@ -29,7 +29,7 @@ namespace DigikamSuperImposeImagesPlugin { SuperImpose::SuperImpose(Digikam::DImg *orgImage, Digikam::DImg *templ, - QRect orgImageSelection, + TQRect orgImageSelection, Digikam::DColorComposer::CompositingOperation compositeRule) { m_orgImage = *orgImage; diff --git a/digikam/imageplugins/superimpose/superimpose.h b/digikam/imageplugins/superimpose/superimpose.h index 8550c23..a0b7b6d 100644 --- a/digikam/imageplugins/superimpose/superimpose.h +++ b/digikam/imageplugins/superimpose/superimpose.h @@ -24,9 +24,9 @@ #ifndef SUPERIMPOSE_H #define SUPERIMPOSE_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Digikam includes. @@ -42,7 +42,7 @@ class SuperImpose public: SuperImpose(Digikam::DImg *orgImage, Digikam::DImg *templ, - QRect orgImageSelection, + TQRect orgImageSelection, Digikam::DColorComposer::CompositingOperation compositeRule = Digikam::DColorComposer::PorterDuffNone); @@ -54,7 +54,7 @@ private: private: - QRect m_selection; + TQRect m_selection; Digikam::DImg m_orgImage; Digikam::DImg m_template; diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index bf8c7bd..127e389 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -23,20 +23,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qvgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qpixmap.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qframe.h> -#include <qdir.h> -#include <qfile.h> -#include <qhbuttongroup.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqpixmap.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqhbuttongroup.h> // KDE includes. @@ -74,8 +74,8 @@ using namespace Digikam; namespace DigikamSuperImposeImagesPlugin { -SuperImposeTool::SuperImposeTool(QObject* parent) - : EditorTool(parent) +SuperImposeTool::SuperImposeTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("superimpose"); setToolName(i18n("Template Superimpose")); @@ -83,40 +83,40 @@ SuperImposeTool::SuperImposeTool(QObject* parent) // ------------------------------------------------------------- - QFrame *frame = new QFrame(0); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); + TQFrame *frame = new TQFrame(0); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - QGridLayout* gridFrame = new QGridLayout(frame, 1, 2); + TQGridLayout* gridFrame = new TQGridLayout(frame, 1, 2); m_previewWidget = new SuperImposeWidget(400, 300, frame); - QWhatsThis::add( m_previewWidget, i18n("<p>This is the preview of the template " + TQWhatsThis::add( m_previewWidget, i18n("<p>This is the preview of the template " "superimposed onto the image.") ); // ------------------------------------------------------------- - QHButtonGroup *bGroup = new QHButtonGroup(frame); + TQHButtonGroup *bGroup = new TQHButtonGroup(frame); KIconLoader icon; bGroup->addSpace(0); - QPushButton *zoomInButton = new QPushButton( bGroup ); + TQPushButton *zoomInButton = new TQPushButton( bGroup ); bGroup->insert(zoomInButton, ZOOMIN); zoomInButton->setPixmap( icon.loadIcon( "viewmag+", (KIcon::Group)KIcon::Toolbar ) ); zoomInButton->setToggleButton(true); - QToolTip::add( zoomInButton, i18n( "Zoom in" ) ); + TQToolTip::add( zoomInButton, i18n( "Zoom in" ) ); bGroup->addSpace(20); - QPushButton *zoomOutButton = new QPushButton( bGroup ); + TQPushButton *zoomOutButton = new TQPushButton( bGroup ); bGroup->insert(zoomOutButton, ZOOMOUT); zoomOutButton->setPixmap( icon.loadIcon( "viewmag-", (KIcon::Group)KIcon::Toolbar ) ); zoomOutButton->setToggleButton(true); - QToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); + TQToolTip::add( zoomOutButton, i18n( "Zoom out" ) ); bGroup->addSpace(20); - QPushButton *moveButton = new QPushButton( bGroup ); + TQPushButton *moveButton = new TQPushButton( bGroup ); bGroup->insert(moveButton, MOVE); moveButton->setPixmap( icon.loadIcon( "move", (KIcon::Group)KIcon::Toolbar ) ); moveButton->setToggleButton(true); moveButton->setOn(true); - QToolTip::add( moveButton, i18n( "Move" ) ); + TQToolTip::add( moveButton, i18n( "Move" ) ); bGroup->addSpace(20); bGroup->setExclusive(true); - bGroup->setFrameShape(QFrame::NoFrame); + bGroup->setFrameShape(TQFrame::NoFrame); gridFrame->addMultiCellWidget(m_previewWidget, 0, 0, 0, 2); gridFrame->addMultiCellWidget(bGroup, 1, 1, 1, 1); @@ -133,12 +133,12 @@ SuperImposeTool::SuperImposeTool(QObject* parent) m_gboxSettings = new EditorToolSettings(EditorToolSettings::Default| EditorToolSettings::Ok| EditorToolSettings::Cancel); - QGridLayout* grid = new QGridLayout(m_gboxSettings->plainPage(), 1, 1); + TQGridLayout* grid = new TQGridLayout(m_gboxSettings->plainPage(), 1, 1); m_thumbnailsBar = new ThumbBarView(m_gboxSettings->plainPage()); m_dirSelect = new DirSelectWidget(m_gboxSettings->plainPage()); - QPushButton *templateDirButton = new QPushButton( i18n("Root Directory..."), m_gboxSettings->plainPage() ); - QWhatsThis::add( templateDirButton, i18n("<p>Set here the current templates' root directory.") ); + TQPushButton *templateDirButton = new TQPushButton( i18n("Root Directory..."), m_gboxSettings->plainPage() ); + TQWhatsThis::add( templateDirButton, i18n("<p>Set here the current templates' root directory.") ); grid->addMultiCellWidget(m_thumbnailsBar, 0, 1, 0, 0); grid->addMultiCellWidget(m_dirSelect, 0, 0, 1, 1); @@ -152,17 +152,17 @@ SuperImposeTool::SuperImposeTool(QObject* parent) // ------------------------------------------------------------- - connect(bGroup, SIGNAL(released(int)), - m_previewWidget, SLOT(slotEditModeChanged(int))); + connect(bGroup, TQT_SIGNAL(released(int)), + m_previewWidget, TQT_SLOT(slotEditModeChanged(int))); - connect(m_thumbnailsBar, SIGNAL(signalURLSelected(const KURL&)), - m_previewWidget, SLOT(slotSetCurrentTemplate(const KURL&))); + connect(m_thumbnailsBar, TQT_SIGNAL(signalURLSelected(const KURL&)), + m_previewWidget, TQT_SLOT(slotSetCurrentTemplate(const KURL&))); - connect(m_dirSelect, SIGNAL(folderItemSelected(const KURL &)), - this, SLOT(slotTemplateDirChanged(const KURL &))); + connect(m_dirSelect, TQT_SIGNAL(folderItemSelected(const KURL &)), + this, TQT_SLOT(slotTemplateDirChanged(const KURL &))); - connect(templateDirButton, SIGNAL(clicked()), - this, SLOT(slotRootTemplateDirChanged())); + connect(templateDirButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRootTemplateDirChanged())); // ------------------------------------------------------------- @@ -180,19 +180,19 @@ void SuperImposeTool::populateTemplates() if (!m_templatesUrl.isValid() || !m_templatesUrl.isLocalFile()) return; - QDir dir(m_templatesUrl.path(), "*.png *.PNG"); + TQDir dir(m_templatesUrl.path(), "*.png *.PNG"); if (!dir.exists()) return; - dir.setFilter ( QDir::Files | QDir::NoSymLinks ); + dir.setFilter ( TQDir::Files | TQDir::NoSymLinks ); - const QFileInfoList* fileinfolist = dir.entryInfoList(); + const TQFileInfoList* fileinfolist = dir.entryInfoList(); if (!fileinfolist) return; - QFileInfoListIterator it(*fileinfolist); - QFileInfo* fi; + TQFileInfoListIterator it(*fileinfolist); + TQFileInfo* fi; while( (fi = it.current() ) ) { diff --git a/digikam/imageplugins/superimpose/superimposetool.h b/digikam/imageplugins/superimpose/superimposetool.h index e2e59cb..c35803c 100644 --- a/digikam/imageplugins/superimpose/superimposetool.h +++ b/digikam/imageplugins/superimpose/superimposetool.h @@ -34,7 +34,7 @@ #include "editortool.h" -class QPushButton; +class TQPushButton; namespace Digikam { @@ -51,10 +51,11 @@ class SuperImposeWidget; class SuperImposeTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - SuperImposeTool(QObject* parent); + SuperImposeTool(TQObject* tqparent); ~SuperImposeTool(); private slots: diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index e5c8b2f..aa0e50e 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -27,9 +27,9 @@ #include <cstdio> -// Qt includes. +// TQt includes. -#include <qpainter.h> +#include <tqpainter.h> // KDE includes. @@ -46,17 +46,17 @@ namespace DigikamSuperImposeImagesPlugin { -SuperImposeWidget::SuperImposeWidget(int w, int h, QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +SuperImposeWidget::SuperImposeWidget(int w, int h, TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { - m_pixmap = new QPixmap(w, h); + m_pixmap = new TQPixmap(w, h); m_editMode = MOVE; Digikam::ImageIface iface(0, 0); m_w = iface.originalWidth(); m_h = iface.originalHeight(); - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); setMouseTracking(true); @@ -79,10 +79,10 @@ Digikam::DImg SuperImposeWidget::makeSuperImpose(void) void SuperImposeWidget::resetEdit(void) { m_zoomFactor = 1.0; - m_currentSelection = QRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, + m_currentSelection = TQRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, m_rect.width(), m_rect.height()); makePixmap(); - repaint(false); + tqrepaint(false); } void SuperImposeWidget::makePixmap(void) @@ -91,20 +91,20 @@ void SuperImposeWidget::makePixmap(void) SuperImpose superimpose(iface.getOriginalImg(), &m_templateScaled, m_currentSelection); Digikam::DImg image = superimpose.getTargetImage(); - m_pixmap->fill(colorGroup().background()); - QPainter p(m_pixmap); - QPixmap imagePix = image.convertToPixmap(); + m_pixmap->fill(tqcolorGroup().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()); p.end(); } -void SuperImposeWidget::resizeEvent(QResizeEvent * e) +void SuperImposeWidget::resizeEvent(TQResizeEvent * e) { blockSignals(true); delete m_pixmap; int w = e->size().width(); int h = e->size().height(); - m_pixmap = new QPixmap(w, h); + m_pixmap = new TQPixmap(w, h); if (!m_template.isNull()) { @@ -114,12 +114,12 @@ void SuperImposeWidget::resizeEvent(QResizeEvent * e) if (templateWidth < templateHeight) { int neww = (int) ((float)height() / (float)templateHeight * (float)templateWidth); - m_rect = QRect(width()/2-neww/2, 0, neww, height()); + m_rect = TQRect(width()/2-neww/2, 0, neww, height()); } else { int newh = (int) ((float)width() / (float)templateWidth * (float)templateHeight); - m_rect = QRect(0, height()/2-newh/2, width(), newh); + m_rect = TQRect(0, height()/2-newh/2, width(), newh); } m_templateScaled = m_template.smoothScale(m_rect.width(), m_rect.height()); @@ -127,14 +127,14 @@ void SuperImposeWidget::resizeEvent(QResizeEvent * e) } else { - m_rect = QRect(); - m_pixmap->fill(colorGroup().background()); + m_rect = TQRect(); + m_pixmap->fill(tqcolorGroup().background()); } blockSignals(false); } -void SuperImposeWidget::paintEvent( QPaintEvent * ) +void SuperImposeWidget::paintEvent( TQPaintEvent * ) { bitBlt(this, 0, 0, m_pixmap); } @@ -150,7 +150,7 @@ void SuperImposeWidget::slotSetCurrentTemplate(const KURL& url) if (m_template.isNull()) { - m_rect = QRect(); + m_rect = TQRect(); return; } @@ -160,23 +160,23 @@ void SuperImposeWidget::slotSetCurrentTemplate(const KURL& url) if (templateWidth < templateHeight) { int neww = (int) ((float)height() / (float)templateHeight * (float)templateWidth); - m_rect = QRect(width()/2-neww/2, 0, neww, height()); + m_rect = TQRect(width()/2-neww/2, 0, neww, height()); } else { int newh = (int) ((float)width() / (float)templateWidth * (float)templateHeight); - m_rect = QRect(0, height()/2-newh/2, width(), newh); + m_rect = TQRect(0, height()/2-newh/2, width(), newh); } m_templateScaled = m_template.smoothScale(m_rect.width(), m_rect.height()); - m_currentSelection = QRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, m_rect.width(), m_rect.height()); + m_currentSelection = TQRect(m_w/2 - m_rect.width()/2, m_h/2 - m_rect.height()/2, m_rect.width(), m_rect.height()); zoomSelection(0); } void SuperImposeWidget::moveSelection(int dx, int dy) { - QRect selection = m_currentSelection; + TQRect selection = m_currentSelection; float wf = (float)selection.width() / (float)m_rect.width(); float hf = (float)selection.height() / (float)m_rect.height(); @@ -201,7 +201,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) if (newZoom < 0.0) return false; - QRect selection = m_currentSelection; + TQRect selection = m_currentSelection; int wf = (int)((float)m_rect.width() / newZoom); int hf = (int)((float)m_rect.height() / newZoom); int deltaX = (m_currentSelection.width() - wf) / 2; @@ -213,8 +213,8 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) selection.setHeight(hf); // check that selection is still inside original image - QRect orgImageRect(0, 0, m_w, m_h); - if (!orgImageRect.contains(selection)) + TQRect orgImageRect(0, 0, m_w, m_h); + if (!orgImageRect.tqcontains(selection)) { // try to adjust if (selection.left() < 0) @@ -227,7 +227,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) selection.moveRight(m_w); // was it successful? - if (selection.contains(orgImageRect)) + if (selection.tqcontains(orgImageRect)) return false; } @@ -236,15 +236,15 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) m_currentSelection = selection; makePixmap(); - repaint(false); + tqrepaint(false); return true; } -void SuperImposeWidget::mousePressEvent ( QMouseEvent * e ) +void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e ) { if ( isEnabled() && e->button() == Qt::LeftButton && - rect().contains( e->x(), e->y() ) ) + rect().tqcontains( e->x(), e->y() ) ) { switch (m_editMode) { @@ -265,12 +265,12 @@ void SuperImposeWidget::mousePressEvent ( QMouseEvent * e ) } } -void SuperImposeWidget::mouseReleaseEvent ( QMouseEvent * ) +void SuperImposeWidget::mouseReleaseEvent ( TQMouseEvent * ) { setEditModeCursor(); } -void SuperImposeWidget::mouseMoveEvent ( QMouseEvent * e ) +void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( isEnabled() ) { @@ -297,7 +297,7 @@ void SuperImposeWidget::mouseMoveEvent ( QMouseEvent * e ) moveSelection(newxpos - m_xpos, newypos - m_ypos); makePixmap(); - repaint(false); + tqrepaint(false); m_xpos = newxpos; m_ypos = newypos; @@ -305,7 +305,7 @@ void SuperImposeWidget::mouseMoveEvent ( QMouseEvent * e ) break; } } - else if (rect().contains( e->x(), e->y() )) + else if (rect().tqcontains( e->x(), e->y() )) { setEditModeCursor(); } diff --git a/digikam/imageplugins/superimpose/superimposewidget.h b/digikam/imageplugins/superimpose/superimposewidget.h index 6beacd9..8b661d3 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.h +++ b/digikam/imageplugins/superimpose/superimposewidget.h @@ -26,13 +26,13 @@ #ifndef SUPERIMPOSEWIDGET_H #define SUPERIMPOSEWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qimage.h> -#include <qrect.h> -#include <qsize.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqpixmap.h> // KDE includes. @@ -43,7 +43,7 @@ #include "imageiface.h" #include "dimg.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -60,19 +60,20 @@ enum Action MOVE }; -class SuperImposeWidget : public QWidget +class SuperImposeWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SuperImposeWidget(int w, int h, QWidget *parent=0); + SuperImposeWidget(int w, int h, TQWidget *tqparent=0); ~SuperImposeWidget(); void setEditMode(int mode); void resetEdit(void); - QRect getCurrentSelection(void); - QSize getTemplateSize(void); + TQRect getCurrentSelection(void); + TQSize getTemplateSize(void); Digikam::DImg makeSuperImpose(void); public slots: @@ -82,11 +83,11 @@ public slots: protected: - void paintEvent( QPaintEvent *e ); - void resizeEvent( QResizeEvent * e ); - void mousePressEvent ( QMouseEvent * e ); - void mouseReleaseEvent ( QMouseEvent * e ); - void mouseMoveEvent ( QMouseEvent * e ); + void paintEvent( TQPaintEvent *e ); + void resizeEvent( TQResizeEvent * e ); + void mousePressEvent ( TQMouseEvent * e ); + void mouseReleaseEvent ( TQMouseEvent * e ); + void mouseMoveEvent ( TQMouseEvent * e ); bool zoomSelection(float deltaZoomFactor); void moveSelection(int x, int y); @@ -103,10 +104,10 @@ private: int m_editMode; float m_zoomFactor; - QPixmap *m_pixmap; // For image region selection manipulations. + TQPixmap *m_pixmap; // For image region selection manipulations. - QRect m_rect; // For mouse drag position. - QRect m_currentSelection; // Region selection in image displayed in the widget. + TQRect m_rect; // For mouse drag position. + TQRect m_currentSelection; // Region selection in image displayed in the widget. Digikam::DImg m_template; // Full template data. Digikam::DImg m_templateScaled; // Template scaled to preview widget diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 39db0eb..7d619bc 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqimage.h> // KDE includes. @@ -54,12 +54,12 @@ namespace DigikamTextureImagesPlugin { -ImageEffect_Texture::ImageEffect_Texture(QWidget* parent) - : Digikam::CtrlPanelDlg(parent, i18n("Apply Texture"), +ImageEffect_Texture::ImageEffect_Texture(TQWidget* tqparent) + : Digikam::CtrlPanelDlg(tqparent, i18n("Apply Texture"), "texture", false, false, true, Digikam::ImagePannelWidget::SeparateViewAll) { - QString whatsThis; + TQString whatsThis; KAboutData* about = new KAboutData("digikam", I18N_NOOP("Apply Texture"), @@ -82,11 +82,11 @@ ImageEffect_Texture::ImageEffect_Texture(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(m_imagePreviewWidget); - QGridLayout* gridSettings = new QGridLayout( gboxSettings, 2, 1, 0, spacingHint()); - QLabel *label1 = new QLabel(i18n("Type:"), gboxSettings); + TQWidget *gboxSettings = new TQWidget(m_imagePreviewWidget); + TQGridLayout* gridSettings = new TQGridLayout( gboxSettings, 2, 1, 0, spacingHint()); + TQLabel *label1 = new TQLabel(i18n("Type:"), gboxSettings); - m_textureType = new QComboBox( false, gboxSettings ); + m_textureType = new TQComboBox( false, gboxSettings ); m_textureType->insertItem( i18n("Paper") ); m_textureType->insertItem( i18n("Paper 2") ); m_textureType->insertItem( i18n("Fabric") ); @@ -103,19 +103,19 @@ ImageEffect_Texture::ImageEffect_Texture(QWidget* parent) m_textureType->insertItem( i18n("Wall") ); m_textureType->insertItem( i18n("Moss") ); m_textureType->insertItem( i18n("Stone") ); - QWhatsThis::add( m_textureType, i18n("<p>Set here the texture type to apply to the image.")); + TQWhatsThis::add( m_textureType, i18n("<p>Set here the texture type to apply to the image.")); gridSettings->addMultiCellWidget(label1, 0, 0, 0, 0); gridSettings->addMultiCellWidget(m_textureType, 0, 0, 1, 1); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Relief:"), gboxSettings); + TQLabel *label2 = new TQLabel(i18n("Relief:"), gboxSettings); m_blendGain = new KIntNumInput(gboxSettings); m_blendGain->setRange(1, 255, 1, true); m_blendGain->setValue(200); - QWhatsThis::add( m_blendGain, i18n("<p>Set here the relief gain used to merge texture and image.")); + TQWhatsThis::add( m_blendGain, i18n("<p>Set here the relief gain used to merge texture and image.")); gridSettings->addMultiCellWidget(label2, 1, 1, 0, 1); gridSettings->addMultiCellWidget(m_blendGain, 2, 2, 0, 1); @@ -124,11 +124,11 @@ ImageEffect_Texture::ImageEffect_Texture(QWidget* parent) // ------------------------------------------------------------- - connect(m_textureType, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_textureType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); - connect(m_blendGain, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_blendGain, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } ImageEffect_Texture::~ImageEffect_Texture() @@ -178,7 +178,7 @@ void ImageEffect_Texture::prepareEffect() m_blendGain->setEnabled(false); Digikam::DImg image = m_imagePreviewWidget->getOriginalRegionImage(); - QString texture = getTexturePath( m_textureType->currentItem() ); + TQString texture = getTexturePath( m_textureType->currentItem() ); int b = 255 - m_blendGain->value(); @@ -194,7 +194,7 @@ void ImageEffect_Texture::prepareFinal() int b = 255 - m_blendGain->value(); Digikam::ImageIface iface(0, 0); - QString texture = getTexturePath( m_textureType->currentItem() ); + TQString texture = getTexturePath( m_textureType->currentItem() ); m_threadedFilter = dynamic_cast<Digikam::DImgThreadedFilter *>( new Texture(iface.getOriginalImg(), this, b, texture)); @@ -211,9 +211,9 @@ void ImageEffect_Texture::putFinalData(void) iface.putOriginalImage(i18n("Texture"), m_threadedFilter->getTargetImage().bits()); } -QString ImageEffect_Texture::getTexturePath(int texture) +TQString ImageEffect_Texture::getTexturePath(int texture) { - QString pattern; + TQString pattern; switch (texture) { diff --git a/digikam/imageplugins/texture/imageeffect_texture.h b/digikam/imageplugins/texture/imageeffect_texture.h index 4d3cfb4..3edfdbd 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.h +++ b/digikam/imageplugins/texture/imageeffect_texture.h @@ -25,15 +25,15 @@ #ifndef IMAGEEFFECT_TEXTURE_H #define IMAGEEFFECT_TEXTURE_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. #include "ctrlpaneldlg.h" -class QComboBox; +class TQComboBox; class KIntNumInput; @@ -43,15 +43,16 @@ namespace DigikamTextureImagesPlugin class ImageEffect_Texture : public Digikam::CtrlPanelDlg { Q_OBJECT + TQ_OBJECT public: - ImageEffect_Texture(QWidget* parent); + ImageEffect_Texture(TQWidget* tqparent); ~ImageEffect_Texture(); private: - QString getTexturePath(int texture); + TQString getTexturePath(int texture); private slots: @@ -89,7 +90,7 @@ private: StoneTexture }; - QComboBox *m_textureType; + TQComboBox *m_textureType; KIntNumInput *m_blendGain; }; diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp index 259c6a9..6dd4357 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.cpp +++ b/digikam/imageplugins/texture/imageplugin_texture.cpp @@ -42,11 +42,11 @@ using namespace DigikamTextureImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_texture, KGenericFactory<ImagePlugin_Texture>("digikamimageplugin_texture")); -ImagePlugin_Texture::ImagePlugin_Texture(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_Texture") +ImagePlugin_Texture::ImagePlugin_Texture(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_Texture") { m_textureAction = new KAction(i18n("Apply Texture..."), "texture", 0, - this, SLOT(slotTexture()), + this, TQT_SLOT(slotTexture()), actionCollection(), "imageplugin_texture"); setXMLFile( "digikamimageplugin_texture_ui.rc" ); diff --git a/digikam/imageplugins/texture/imageplugin_texture.h b/digikam/imageplugins/texture/imageplugin_texture.h index 800f5a2..8bc58e4 100644 --- a/digikam/imageplugins/texture/imageplugin_texture.h +++ b/digikam/imageplugins/texture/imageplugin_texture.h @@ -34,11 +34,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Texture : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_Texture(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_Texture(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_Texture(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/texture/texture.cpp b/digikam/imageplugins/texture/texture.cpp index 23a1cef..c649f2e 100644 --- a/digikam/imageplugins/texture/texture.cpp +++ b/digikam/imageplugins/texture/texture.cpp @@ -36,8 +36,8 @@ namespace DigikamTextureImagesPlugin { -Texture::Texture(Digikam::DImg *orgImage, QObject *parent, int blendGain, QString texturePath) - : Digikam::DImgThreadedFilter(orgImage, parent, "Texture") +Texture::Texture(Digikam::DImg *orgImage, TQObject *tqparent, int blendGain, TQString texturePath) + : Digikam::DImgThreadedFilter(orgImage, tqparent, "Texture") { m_blendGain = blendGain; m_texturePath = texturePath; @@ -100,7 +100,7 @@ void Texture::filterImage(void) else blendGain = m_blendGain; - // Make textured transparent layout. + // Make textured transparent tqlayout. for (int x = 0; !m_cancel && x < w; x++) { @@ -116,7 +116,7 @@ void Texture::filterImage(void) // in the old algorithm, this was //teData.channel.red = (teData.channel.red * (255 - m_blendGain) + // transData.channel.red * m_blendGain) >> 8; - // but transdata was uninitialized, its components were apparently 0, + // but transdata was uninitialized, its components were aptqparently 0, // so I removed the part after the "+". if (sixteenBit) @@ -139,7 +139,7 @@ void Texture::filterImage(void) postProgress(progress); } - // Merge layout and image using overlay method. + // Merge tqlayout and image using overlay method. for (int x = 0; !m_cancel && x < w; x++) { diff --git a/digikam/imageplugins/texture/texture.h b/digikam/imageplugins/texture/texture.h index 6185727..a71dbab 100644 --- a/digikam/imageplugins/texture/texture.h +++ b/digikam/imageplugins/texture/texture.h @@ -25,9 +25,9 @@ #ifndef TEXTURE_H #define TEXTURE_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. @@ -41,8 +41,8 @@ class Texture : public Digikam::DImgThreadedFilter public: - Texture(Digikam::DImg *orgImage, QObject *parent=0, int blendGain=200, - QString texturePath=QString()); + Texture(Digikam::DImg *orgImage, TQObject *tqparent=0, int blendGain=200, + TQString texturePath=TQString()); ~Texture(){}; @@ -54,7 +54,7 @@ private: int m_blendGain; - QString m_texturePath; + TQString m_texturePath; }; } // NameSpace DigikamTextureImagesPlugin diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 0658aeb..6644719 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -22,12 +22,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -61,8 +61,8 @@ using namespace Digikam; namespace DigikamTextureImagesPlugin { -TextureTool::TextureTool(QObject* parent) - : EditorToolThreaded(parent) +TextureTool::TextureTool(TQObject* tqparent) + : EditorToolThreaded(tqparent) { setName("texture"); setToolName(i18n("Texture")); @@ -74,8 +74,8 @@ TextureTool::TextureTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel| EditorToolSettings::PanIcon); - QGridLayout* grid = new QGridLayout( m_gboxSettings->plainPage(), 3, 1); - QLabel *label1 = new QLabel(i18n("Type:"), m_gboxSettings->plainPage()); + TQGridLayout* grid = new TQGridLayout( m_gboxSettings->plainPage(), 3, 1); + TQLabel *label1 = new TQLabel(i18n("Type:"), m_gboxSettings->plainPage()); m_textureType = new RComboBox(m_gboxSettings->plainPage()); m_textureType->insertItem(i18n("Paper")); @@ -95,16 +95,16 @@ TextureTool::TextureTool(QObject* parent) m_textureType->insertItem(i18n("Moss")); m_textureType->insertItem(i18n("Stone")); m_textureType->setDefaultItem(PaperTexture); - QWhatsThis::add( m_textureType, i18n("<p>Set here the texture type to apply to the image.")); + TQWhatsThis::add( m_textureType, i18n("<p>Set here the texture type to apply to the image.")); // ------------------------------------------------------------- - QLabel *label2 = new QLabel(i18n("Relief:"), m_gboxSettings->plainPage()); + TQLabel *label2 = new TQLabel(i18n("Relief:"), m_gboxSettings->plainPage()); m_blendGain = new RIntNumInput(m_gboxSettings->plainPage()); m_blendGain->setRange(1, 255, 1); m_blendGain->setDefaultValue(200); - QWhatsThis::add( m_blendGain, i18n("<p>Set here the relief gain used to merge texture and image.")); + TQWhatsThis::add( m_blendGain, i18n("<p>Set here the relief gain used to merge texture and image.")); grid->addMultiCellWidget(label1, 0, 0, 0, 0); grid->addMultiCellWidget(m_textureType, 0, 0, 1, 1); @@ -125,11 +125,11 @@ TextureTool::TextureTool(QObject* parent) // ------------------------------------------------------------- - connect(m_textureType, SIGNAL(activated(int)), - this, SLOT(slotEffect())); + connect(m_textureType, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotEffect())); - connect(m_blendGain, SIGNAL(valueChanged(int)), - this, SLOT(slotTimer())); + connect(m_blendGain, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTimer())); } TextureTool::~TextureTool() @@ -185,7 +185,7 @@ void TextureTool::prepareEffect() m_blendGain->setEnabled(false); DImg image = m_previewWidget->getOriginalRegionImage(); - QString texture = getTexturePath( m_textureType->currentItem() ); + TQString texture = getTexturePath( m_textureType->currentItem() ); int b = 255 - m_blendGain->value(); @@ -200,7 +200,7 @@ void TextureTool::prepareFinal() int b = 255 - m_blendGain->value(); ImageIface iface(0, 0); - QString texture = getTexturePath( m_textureType->currentItem() ); + TQString texture = getTexturePath( m_textureType->currentItem() ); setFilter(dynamic_cast<DImgThreadedFilter*>(new Texture(iface.getOriginalImg(), this, b, texture))); } @@ -216,9 +216,9 @@ void TextureTool::putFinalData() iface.putOriginalImage(i18n("Texture"), filter()->getTargetImage().bits()); } -QString TextureTool::getTexturePath(int texture) +TQString TextureTool::getTexturePath(int texture) { - QString pattern; + TQString pattern; switch (texture) { diff --git a/digikam/imageplugins/texture/texturetool.h b/digikam/imageplugins/texture/texturetool.h index 5f53417..787c39e 100644 --- a/digikam/imageplugins/texture/texturetool.h +++ b/digikam/imageplugins/texture/texturetool.h @@ -25,9 +25,9 @@ #ifndef TEXTURETOOL_H #define TEXTURETOOL_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Digikam includes. @@ -51,15 +51,16 @@ namespace DigikamTextureImagesPlugin class TextureTool : public Digikam::EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - TextureTool(QObject* parent); + TextureTool(TQObject* tqparent); ~TextureTool(); private: - QString getTexturePath(int texture); + TQString getTexturePath(int texture); private slots: diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index 129742f..502d3b1 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -23,23 +23,23 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qhgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qhbuttongroup.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qcombobox.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qpixmap.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qvbox.h> +#include <tqhgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqhbuttongroup.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqcombobox.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqpixmap.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqvbox.h> // KDE includes. @@ -79,11 +79,11 @@ namespace DigikamWhiteBalanceImagesPlugin { -ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) - : Digikam::ImageDlgBase(parent, i18n("White Color Balance Correction"), +ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* tqparent) + : Digikam::ImageDlgBase(tqparent, i18n("White Color Balance Correction"), "whitebalance", true, false) { - QString whatsThis; + TQString whatsThis; Digikam::ImageIface iface(0, 0); @@ -118,50 +118,50 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) // ------------------------------------------------------------- - QWidget *gboxSettings = new QWidget(plainPage()); - QVBoxLayout* layout2 = new QVBoxLayout( gboxSettings, spacingHint() ); - QGridLayout *grid = new QGridLayout( layout2, 2, 4, spacingHint()); + TQWidget *gboxSettings = new TQWidget(plainPage()); + TQVBoxLayout* tqlayout2 = new TQVBoxLayout( gboxSettings, spacingHint() ); + TQGridLayout *grid = new TQGridLayout( tqlayout2, 2, 4, spacingHint()); - QLabel *label1 = new QLabel(i18n("Channel:"), gboxSettings); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, gboxSettings ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), gboxSettings); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, gboxSettings ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(gboxSettings); + m_scaleBG = new TQHButtonGroup(gboxSettings); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -171,32 +171,32 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(gboxSettings); + TQVBox *histoBox = new TQVBox(gboxSettings); m_histogramWidget = new Digikam::HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "drawing of the selected image channel. This one is " "re-computed at any filter settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new Digikam::ColorGradientWidget( Digikam::ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); grid->addMultiCellWidget(histoBox, 1, 2, 0, 4); // ------------------------------------------------------------- - QGridLayout *grid2 = new QGridLayout(layout2, 13, 5, spacingHint()); + TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 13, 5, spacingHint()); m_temperatureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Color_temperature'>Color Temperature</a> " " (K): </qt>"), gboxSettings); - m_adjTemperatureLabel = new QLabel(i18n("Adjustment:"), gboxSettings); + m_adjTemperatureLabel = new TQLabel(i18n("Adjustment:"), gboxSettings); m_temperatureInput = new KDoubleNumInput(gboxSettings); m_temperatureInput->setPrecision(1); m_temperatureInput->setRange(2000.0, 12000.0, 10.0, true); - QWhatsThis::add( m_temperatureInput, i18n("<p>Set here the white balance color temperature in Kelvin.")); + TQWhatsThis::add( m_temperatureInput, i18n("<p>Set here the white balance color temperature in Kelvin.")); - m_temperaturePresetLabel = new QLabel(i18n("Preset:"), gboxSettings); - m_temperaturePresetCB = new QComboBox( false, gboxSettings ); + m_temperaturePresetLabel = new TQLabel(i18n("Preset:"), gboxSettings); + m_temperaturePresetCB = new TQComboBox( false, gboxSettings ); m_temperaturePresetCB->insertItem( i18n("Candle") ); m_temperaturePresetCB->insertItem( i18n("40W Lamp") ); m_temperaturePresetCB->insertItem( i18n("100W Lamp") ); @@ -211,7 +211,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) m_temperaturePresetCB->insertItem( i18n("Xenon Lamp") ); m_temperaturePresetCB->insertItem( i18n("Daylight D65") ); m_temperaturePresetCB->insertItem( i18n("None") ); - QWhatsThis::add( m_temperaturePresetCB, i18n("<p>Select the white balance color temperature " + TQWhatsThis::add( m_temperaturePresetCB, i18n("<p>Select the white balance color temperature " "preset to use here:<p>" "<b>Candle</b>: candle light (1850K).<p>" "<b>40W Lamp</b>: 40 Watt incandescent lamp (2680K).<p>" @@ -228,73 +228,73 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) "<b>Xenon Lamp</b>: xenon lamp or light arc (6420K).<p>" "<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>None</b>: no preset value.")); - m_pickTemperature = new QPushButton(gboxSettings); + m_pickTemperature = new TQPushButton(gboxSettings); KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); - m_pickTemperature->setPixmap( QPixmap( directory + "color-picker-grey.png" ) ); + m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); - QToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); - QWhatsThis::add( m_pickTemperature, i18n("<p>With this button, you can pick the color from original " + TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); + TQWhatsThis::add( m_pickTemperature, i18n("<p>With this button, you can pick the color from original " "image used to set white color balance temperature and " "green component.")); - KSeparator *line = new KSeparator (Horizontal, gboxSettings); + KSeparator *line = new KSeparator(Qt::Horizontal, gboxSettings); // ------------------------------------------------------------- - m_blackLabel = new QLabel(i18n("Black point:"), gboxSettings); + m_blackLabel = new TQLabel(i18n("Black point:"), gboxSettings); m_blackInput = new KDoubleNumInput(gboxSettings); m_blackInput->setPrecision(2); m_blackInput->setRange(0.0, 0.05, 0.01, true); - QWhatsThis::add( m_blackInput, i18n("<p>Set here the black level value.")); + TQWhatsThis::add( m_blackInput, i18n("<p>Set here the black level value.")); - m_darkLabel = new QLabel(i18n("Shadows:"), gboxSettings); + m_darkLabel = new TQLabel(i18n("Shadows:"), gboxSettings); m_darkInput = new KDoubleNumInput(gboxSettings); m_darkInput->setPrecision(2); m_darkInput->setRange(0.0, 1.0, 0.01, true); - QWhatsThis::add( m_darkInput, i18n("<p>Set here the shadows noise suppresion level.")); + TQWhatsThis::add( m_darkInput, i18n("<p>Set here the shadows noise suppresion level.")); - m_saturationLabel = new QLabel(i18n("Saturation:"), gboxSettings); + m_saturationLabel = new TQLabel(i18n("Saturation:"), gboxSettings); m_saturationInput = new KDoubleNumInput(gboxSettings); m_saturationInput->setPrecision(2); m_saturationInput->setRange(0.0, 2.0, 0.01, true); - QWhatsThis::add( m_saturationInput, i18n("<p>Set here the saturation value.")); + TQWhatsThis::add( m_saturationInput, i18n("<p>Set here the saturation value.")); - m_gammaLabel = new QLabel(i18n("Gamma:"), gboxSettings); + m_gammaLabel = new TQLabel(i18n("Gamma:"), gboxSettings); m_gammaInput = new KDoubleNumInput(gboxSettings); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01, true); - QWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma correction value.")); + TQWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma correction value.")); - m_greenLabel = new QLabel(i18n("Green:"), gboxSettings); + m_greenLabel = new TQLabel(i18n("Green:"), gboxSettings); m_greenInput = new KDoubleNumInput(gboxSettings); m_greenInput->setPrecision(2); m_greenInput->setRange(0.2, 2.5, 0.01, true); - QWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " + TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " "cast removal level.")); - KSeparator *line2 = new KSeparator (Horizontal, gboxSettings); + KSeparator *line2 = new KSeparator(Qt::Horizontal, gboxSettings); // ------------------------------------------------------------- m_exposureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Exposure_value'>Exposure Compensation</a> " " (E.V): </qt>"), gboxSettings); - m_mainExposureLabel = new QLabel(i18n("Main:"), gboxSettings); - m_autoAdjustExposure = new QPushButton(gboxSettings); + m_mainExposureLabel = new TQLabel(i18n("Main:"), gboxSettings); + m_autoAdjustExposure = new TQPushButton(gboxSettings); m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); - QToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); - QWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " + TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); + TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " "and Black Point values.")); m_mainExposureInput = new KDoubleNumInput(gboxSettings); m_mainExposureInput->setPrecision(2); m_mainExposureInput->setRange(-6.0, 8.0, 0.1, true); - QWhatsThis::add( m_mainExposureInput, i18n("<p>Set here the main exposure compensation value in E.V.")); + TQWhatsThis::add( m_mainExposureInput, i18n("<p>Set here the main exposure compensation value in E.V.")); - m_fineExposureLabel = new QLabel(i18n("Fine:"), gboxSettings); + m_fineExposureLabel = new TQLabel(i18n("Fine:"), gboxSettings); m_fineExposureInput = new KDoubleNumInput(gboxSettings); m_fineExposureInput->setPrecision(2); m_fineExposureInput->setRange(-0.5, 0.5, 0.01, true); - QWhatsThis::add( m_fineExposureInput, i18n("<p>This value in E.V will be added to main exposure " + TQWhatsThis::add( m_fineExposureInput, i18n("<p>This value in E.V will be added to main exposure " "compensation value to set fine exposure adjustment.")); // ------------------------------------------------------------- @@ -333,59 +333,59 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(QWidget* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromOriginal( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromOriginal( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotColorSelectedFromTarget( const Digikam::DColor & ))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Correction Filter Slider controls. - connect(m_temperaturePresetCB, SIGNAL(activated(int)), - this, SLOT(slotTemperaturePresetChanged(int))); + connect(m_temperaturePresetCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotTemperaturePresetChanged(int))); - connect(m_temperatureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTemperatureChanged(double))); + connect(m_temperatureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTemperatureChanged(double))); - connect(m_darkInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_darkInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_blackInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_blackInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_mainExposureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_mainExposureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_fineExposureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_fineExposureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_gammaInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_saturationInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_saturationInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_greenInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_greenInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoAdjustExposure, SIGNAL(clicked()), - this, SLOT(slotAutoAdjustExposure())); + connect(m_autoAdjustExposure, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAutoAdjustExposure())); - connect(m_pickTemperature, SIGNAL(released()), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickTemperature, TQT_SIGNAL(released()), + this, TQT_SLOT(slotPickerColorButtonActived())); } ImageEffect_WhiteBalance::~ImageEffect_WhiteBalance() @@ -537,7 +537,7 @@ void ImageEffect_WhiteBalance::slotColorSelectedFromOriginal(const Digikam::DCol if ( m_pickTemperature->isOn() ) { Digikam::DColor dc = color; - QColor tc = dc.getQColor(); + TQColor tc = dc.getTQColor(); double temperatureLevel, greenLevel; Digikam::WhiteBalance::autoWBAdjustementFromColor(tc, temperatureLevel, greenLevel); @@ -563,7 +563,7 @@ void ImageEffect_WhiteBalance::slotColorSelectedFromTarget( const Digikam::DColo void ImageEffect_WhiteBalance::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_WhiteBalance::slotChannelChanged(int channel) @@ -572,31 +572,31 @@ void ImageEffect_WhiteBalance::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = Digikam::HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void ImageEffect_WhiteBalance::slotAutoAdjustExposure() { - parentWidget()->setCursor( KCursor::waitCursor() ); + tqparentWidget()->setCursor( KCursor::waitCursor() ); Digikam::ImageIface* iface = m_previewWidget->imageIface(); uchar *data = iface->getOriginalImage(); @@ -614,7 +614,7 @@ void ImageEffect_WhiteBalance::slotAutoAdjustExposure() m_mainExposureInput->setValue(exposureLevel); m_fineExposureInput->setValue(0.0); - parentWidget()->unsetCursor(); + tqparentWidget()->unsetCursor(); slotEffect(); } @@ -769,22 +769,22 @@ void ImageEffect_WhiteBalance::writeUserSettings() void ImageEffect_WhiteBalance::slotUser3() { KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("White Color Balance Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) return; - QFile file(loadWhiteBalanceFile.path()); + TQFile file(loadWhiteBalanceFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# White Color Balance Configuration File V2" ) { KMessageBox::error(this, i18n("\"%1\" is not a White Color Balance settings text file.") - .arg(loadWhiteBalanceFile.fileName())); + .tqarg(loadWhiteBalanceFile.fileName())); file.close(); return; } @@ -812,16 +812,16 @@ void ImageEffect_WhiteBalance::slotUser3() void ImageEffect_WhiteBalance::slotUser2() { KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("White Color Balance Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) return; - QFile file(saveWhiteBalanceFile.path()); + TQFile file(saveWhiteBalanceFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# White Color Balance Configuration File V2\n"; stream << m_temperatureInput->value() << "\n"; stream << m_darkInput->value() << "\n"; diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h index 314a97c..1e89054 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.h @@ -26,19 +26,19 @@ #ifndef IMAGEEFFECT_WHITEBALANCE_H #define IMAGEEFFECT_WHITEBALANCE_H -// Qt include. +// TQt include. -#include <qcolor.h> +#include <tqcolor.h> // Digikam includes. #include "imagedlgbase.h" -class QPushButton; -class QLabel; -class QComboBox; -class QPushButton; -class QHButtonGroup; +class TQPushButton; +class TQLabel; +class TQComboBox; +class TQPushButton; +class TQHButtonGroup; class KDoubleNumInput; class KActiveLabel; @@ -57,10 +57,11 @@ namespace DigikamWhiteBalanceImagesPlugin class ImageEffect_WhiteBalance : public Digikam::ImageDlgBase { Q_OBJECT + TQ_OBJECT public: - ImageEffect_WhiteBalance(QWidget* parent); + ImageEffect_WhiteBalance(TQWidget* tqparent); ~ImageEffect_WhiteBalance(); protected: @@ -125,23 +126,23 @@ private: int m_currentPreviewMode; - QPushButton *m_pickTemperature; - QPushButton *m_autoAdjustExposure; + TQPushButton *m_pickTemperature; + TQPushButton *m_autoAdjustExposure; - QComboBox *m_temperaturePresetCB; - QComboBox *m_channelCB; + TQComboBox *m_temperaturePresetCB; + TQComboBox *m_channelCB; - QHButtonGroup *m_scaleBG; + TQHButtonGroup *m_scaleBG; - QLabel *m_adjTemperatureLabel; - QLabel *m_temperaturePresetLabel; - QLabel *m_darkLabel; - QLabel *m_blackLabel; - QLabel *m_mainExposureLabel; - QLabel *m_fineExposureLabel; - QLabel *m_gammaLabel; - QLabel *m_saturationLabel; - QLabel *m_greenLabel; + TQLabel *m_adjTemperatureLabel; + TQLabel *m_temperaturePresetLabel; + TQLabel *m_darkLabel; + TQLabel *m_blackLabel; + TQLabel *m_mainExposureLabel; + TQLabel *m_fineExposureLabel; + TQLabel *m_gammaLabel; + TQLabel *m_saturationLabel; + TQLabel *m_greenLabel; KActiveLabel *m_exposureLabel; KActiveLabel *m_temperatureLabel; diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp index a7691eb..1695865 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp @@ -42,12 +42,12 @@ using namespace DigikamWhiteBalanceImagesPlugin; K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_whitebalance, KGenericFactory<ImagePlugin_WhiteBalance>("digikamimageplugin_whitebalance")); -ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(QObject *parent, const char*, const QStringList &) - : Digikam::ImagePlugin(parent, "ImagePlugin_WhiteBalance") +ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *tqparent, const char*, const TQStringList &) + : Digikam::ImagePlugin(tqparent, "ImagePlugin_WhiteBalance") { m_whitebalanceAction = new KAction(i18n("White Balance..."), "whitebalance", CTRL+SHIFT+Key_W, - this, SLOT(slotWhiteBalance()), + this, TQT_SLOT(slotWhiteBalance()), actionCollection(), "imageplugin_whitebalance"); setXMLFile("digikamimageplugin_whitebalance_ui.rc"); diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h index 6b1ad91..5959f8e 100644 --- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h +++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h @@ -35,11 +35,12 @@ class KAction; class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::ImagePlugin { Q_OBJECT + TQ_OBJECT public: - ImagePlugin_WhiteBalance(QObject *parent, const char* name, - const QStringList &args); + ImagePlugin_WhiteBalance(TQObject *tqparent, const char* name, + const TQStringList &args); ~ImagePlugin_WhiteBalance(); void setEnabledActions(bool enable); diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index d136b65..8db9a6f 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -23,23 +23,23 @@ * * ============================================================ */ -// Qt includes. - -#include <qcombobox.h> -#include <qfile.h> -#include <qframe.h> -#include <qhbuttongroup.h> -#include <qhgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqframe.h> +#include <tqhbuttongroup.h> +#include <tqhgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -90,8 +90,8 @@ using namespace Digikam; namespace DigikamWhiteBalanceImagesPlugin { -WhiteBalanceTool::WhiteBalanceTool(QObject* parent) - : EditorTool(parent) +WhiteBalanceTool::WhiteBalanceTool(TQObject* tqparent) + : EditorTool(tqparent) { setName("whitebalance"); setToolName(i18n("White Balance")); @@ -115,49 +115,49 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) EditorToolSettings::Ok| EditorToolSettings::Cancel); - QVBoxLayout* layout2 = new QVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint()); - QGridLayout *grid = new QGridLayout(layout2, 2, 4); + TQVBoxLayout* tqlayout2 = new TQVBoxLayout(m_gboxSettings->plainPage(), m_gboxSettings->spacingHint()); + TQGridLayout *grid = new TQGridLayout(tqlayout2, 2, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), m_gboxSettings->plainPage()); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - m_channelCB = new QComboBox( false, m_gboxSettings->plainPage() ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), m_gboxSettings->plainPage()); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + m_channelCB = new TQComboBox( false, m_gboxSettings->plainPage() ); m_channelCB->insertItem( i18n("Luminosity") ); m_channelCB->insertItem( i18n("Red") ); m_channelCB->insertItem( i18n("Green") ); m_channelCB->insertItem( i18n("Blue") ); - QWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( m_channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>")); - m_scaleBG = new QHButtonGroup(m_gboxSettings->plainPage()); + m_scaleBG = new TQHButtonGroup(m_gboxSettings->plainPage()); m_scaleBG->setExclusive(true); - m_scaleBG->setFrameShape(QFrame::NoFrame); + m_scaleBG->setFrameShape(TQFrame::NoFrame); m_scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( m_scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( m_scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( m_scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QHBoxLayout* l1 = new QHBoxLayout(); + TQHBoxLayout* l1 = new TQHBoxLayout(); l1->addWidget(label1); l1->addWidget(m_channelCB); l1->addStretch(10); @@ -165,15 +165,15 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(m_gboxSettings->plainPage()); + TQVBox *histoBox = new TQVBox(m_gboxSettings->plainPage()); m_histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " + TQWhatsThis::add( m_histogramWidget, i18n("<p>Here you can see the target preview image histogram " "drawing of the selected image channel. This one is " "re-computed at any filter settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); m_hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, histoBox ); - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); grid->addMultiCellLayout(l1, 0, 0, 0, 4); grid->addMultiCellWidget(histoBox, 1, 2, 0, 4); @@ -182,18 +182,18 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) // ------------------------------------------------------------- - QGridLayout *grid2 = new QGridLayout(layout2, 13, 5); + TQGridLayout *grid2 = new TQGridLayout(tqlayout2, 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()); - m_adjTemperatureLabel = new QLabel(i18n("Adjustment:"), m_gboxSettings->plainPage()); + m_adjTemperatureLabel = new TQLabel(i18n("Adjustment:"), m_gboxSettings->plainPage()); m_temperatureInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_temperatureInput->setPrecision(1); m_temperatureInput->setRange(1750.0, 12000.0, 10.0); m_temperatureInput->setDefaultValue(6500.0); - QWhatsThis::add( m_temperatureInput, i18n("<p>Set here the white balance color temperature in Kelvin.")); + TQWhatsThis::add( m_temperatureInput, i18n("<p>Set here the white balance color temperature in Kelvin.")); - m_temperaturePresetLabel = new QLabel(i18n("Preset:"), m_gboxSettings->plainPage()); + m_temperaturePresetLabel = new TQLabel(i18n("Preset:"), m_gboxSettings->plainPage()); m_temperaturePresetCB = new RComboBox(m_gboxSettings->plainPage()); m_temperaturePresetCB->insertItem(i18n("Candle")); m_temperaturePresetCB->insertItem(i18n("40W Lamp")); @@ -210,7 +210,7 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) m_temperaturePresetCB->insertItem(i18n("Daylight D65")); m_temperaturePresetCB->insertItem(i18n("None")); m_temperaturePresetCB->setDefaultItem(DaylightD65); - QWhatsThis::add( m_temperaturePresetCB, i18n("<p>Select the white balance color temperature " + TQWhatsThis::add( m_temperaturePresetCB, i18n("<p>Select the white balance color temperature " "preset to use here:<p>" "<b>Candle</b>: candle light (1850K).<p>" "<b>40W Lamp</b>: 40 Watt incandescent lamp (2680K).<p>" @@ -227,80 +227,80 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) "<b>Xenon Lamp</b>: xenon lamp or light arc (6420K).<p>" "<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>None</b>: no preset value.")); - m_pickTemperature = new QPushButton(m_gboxSettings->plainPage()); + m_pickTemperature = new TQPushButton(m_gboxSettings->plainPage()); KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); - m_pickTemperature->setPixmap( QPixmap( directory + "color-picker-grey.png" ) ); + m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); - QToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); - QWhatsThis::add( m_pickTemperature, i18n("<p>With this button, you can pick the color from original " + TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); + TQWhatsThis::add( m_pickTemperature, i18n("<p>With this button, you can pick the color from original " "image used to set white color balance temperature and " "green component.")); - KSeparator *line = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); // ------------------------------------------------------------- - m_blackLabel = new QLabel(i18n("Black point:"), m_gboxSettings->plainPage()); + m_blackLabel = new TQLabel(i18n("Black point:"), m_gboxSettings->plainPage()); m_blackInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_blackInput->setPrecision(2); m_blackInput->setRange(0.0, 0.05, 0.01); m_blackInput->setDefaultValue(0.0); - QWhatsThis::add( m_blackInput, i18n("<p>Set here the black level value.")); + TQWhatsThis::add( m_blackInput, i18n("<p>Set here the black level value.")); - m_darkLabel = new QLabel(i18n("Shadows:"), m_gboxSettings->plainPage()); + m_darkLabel = new TQLabel(i18n("Shadows:"), m_gboxSettings->plainPage()); m_darkInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_darkInput->setPrecision(2); m_darkInput->setRange(0.0, 1.0, 0.01); m_darkInput->setDefaultValue(0.5); - QWhatsThis::add( m_darkInput, i18n("<p>Set here the shadows noise suppresion level.")); + TQWhatsThis::add( m_darkInput, i18n("<p>Set here the shadows noise suppresion level.")); - m_saturationLabel = new QLabel(i18n("Saturation:"), m_gboxSettings->plainPage()); + m_saturationLabel = new TQLabel(i18n("Saturation:"), m_gboxSettings->plainPage()); m_saturationInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_saturationInput->setPrecision(2); m_saturationInput->setRange(0.0, 2.0, 0.01); m_saturationInput->setDefaultValue(1.0); - QWhatsThis::add( m_saturationInput, i18n("<p>Set here the saturation value.")); + TQWhatsThis::add( m_saturationInput, i18n("<p>Set here the saturation value.")); - m_gammaLabel = new QLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); + m_gammaLabel = new TQLabel(i18n("Gamma:"), m_gboxSettings->plainPage()); m_gammaInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_gammaInput->setPrecision(2); m_gammaInput->setRange(0.1, 3.0, 0.01); m_gammaInput->setDefaultValue(1.0); - QWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma correction value.")); + TQWhatsThis::add( m_gammaInput, i18n("<p>Set here the gamma correction value.")); - m_greenLabel = new QLabel(i18n("Green:"), m_gboxSettings->plainPage()); + m_greenLabel = new TQLabel(i18n("Green:"), m_gboxSettings->plainPage()); m_greenInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_greenInput->setPrecision(2); m_greenInput->setRange(0.2, 2.5, 0.01); m_greenInput->setDefaultValue(1.0); - QWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " + TQWhatsThis::add(m_greenInput, i18n("<p>Set here the green component to set magenta color " "cast removal level.")); - KSeparator *line2 = new KSeparator (Horizontal, m_gboxSettings->plainPage()); + KSeparator *line2 = new KSeparator(Qt::Horizontal, m_gboxSettings->plainPage()); // ------------------------------------------------------------- m_exposureLabel = new KActiveLabel(i18n("<qt><a href='http://en.wikipedia.org/wiki/Exposure_value'>Exposure Compensation</a> " " (E.V): </qt>"), m_gboxSettings->plainPage()); - m_mainExposureLabel = new QLabel(i18n("Main:"), m_gboxSettings->plainPage()); - m_autoAdjustExposure = new QPushButton(m_gboxSettings->plainPage()); + m_mainExposureLabel = new TQLabel(i18n("Main:"), m_gboxSettings->plainPage()); + m_autoAdjustExposure = new TQPushButton(m_gboxSettings->plainPage()); m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("run", (KIcon::Group)KIcon::Toolbar)); - QToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); - QWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " + TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) ); + TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure " "and Black Point values.")); m_mainExposureInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_mainExposureInput->setPrecision(2); m_mainExposureInput->setRange(-6.0, 8.0, 0.1); m_mainExposureInput->setDefaultValue(0.0); - QWhatsThis::add( m_mainExposureInput, i18n("<p>Set here the main exposure compensation value in E.V.")); + TQWhatsThis::add( m_mainExposureInput, i18n("<p>Set here the main exposure compensation value in E.V.")); - m_fineExposureLabel = new QLabel(i18n("Fine:"), m_gboxSettings->plainPage()); + m_fineExposureLabel = new TQLabel(i18n("Fine:"), m_gboxSettings->plainPage()); m_fineExposureInput = new RDoubleNumInput(m_gboxSettings->plainPage()); m_fineExposureInput->setPrecision(2); m_fineExposureInput->setRange(-0.5, 0.5, 0.01); m_fineExposureInput->setDefaultValue(0.0); - QWhatsThis::add( m_fineExposureInput, i18n("<p>This value in E.V will be added to main exposure " + TQWhatsThis::add( m_fineExposureInput, i18n("<p>This value in E.V will be added to main exposure " "compensation value to set fine exposure adjustment.")); // ------------------------------------------------------------- @@ -342,59 +342,59 @@ WhiteBalanceTool::WhiteBalanceTool(QObject* parent) // ------------------------------------------------------------- - connect(m_channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(m_channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(m_scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(m_scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromOriginal(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromOriginal(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const QPoint&)), - this, SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); + connect(m_previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget(const Digikam::DColor&, const TQPoint&)), + this, TQT_SLOT(slotColorSelectedFromTarget(const Digikam::DColor&))); - connect(m_previewWidget, SIGNAL(signalResized()), - this, SLOT(slotEffect())); + connect(m_previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotEffect())); // ------------------------------------------------------------- // Correction Filter Slider controls. - connect(m_temperaturePresetCB, SIGNAL(activated(int)), - this, SLOT(slotTemperaturePresetChanged(int))); + connect(m_temperaturePresetCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotTemperaturePresetChanged(int))); - connect(m_temperatureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTemperatureChanged(double))); + connect(m_temperatureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTemperatureChanged(double))); - connect(m_darkInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_darkInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_blackInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_blackInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_mainExposureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_mainExposureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_fineExposureInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_fineExposureInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_gammaInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_gammaInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_saturationInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_saturationInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); - connect(m_greenInput, SIGNAL(valueChanged (double)), - this, SLOT(slotTimer())); + connect(m_greenInput, TQT_SIGNAL(valueChanged (double)), + this, TQT_SLOT(slotTimer())); // ------------------------------------------------------------- // Bouttons slots. - connect(m_autoAdjustExposure, SIGNAL(clicked()), - this, SLOT(slotAutoAdjustExposure())); + connect(m_autoAdjustExposure, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAutoAdjustExposure())); - connect(m_pickTemperature, SIGNAL(released()), - this, SLOT(slotPickerColorButtonActived())); + connect(m_pickTemperature, TQT_SIGNAL(released()), + this, TQT_SLOT(slotPickerColorButtonActived())); } WhiteBalanceTool::~WhiteBalanceTool() @@ -542,7 +542,7 @@ void WhiteBalanceTool::slotColorSelectedFromOriginal(const DColor &color) if ( m_pickTemperature->isOn() ) { DColor dc = color; - QColor tc = dc.getQColor(); + TQColor tc = dc.getTQColor(); double temperatureLevel, greenLevel; WhiteBalance::autoWBAdjustementFromColor(tc, temperatureLevel, greenLevel); @@ -568,7 +568,7 @@ void WhiteBalanceTool::slotColorSelectedFromTarget(const DColor& color) void WhiteBalanceTool::slotScaleChanged(int scale) { m_histogramWidget->m_scaleType = scale; - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void WhiteBalanceTool::slotChannelChanged(int channel) @@ -577,26 +577,26 @@ void WhiteBalanceTool::slotChannelChanged(int channel) { case LuminosityChannel: m_histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); break; case RedChannel: m_histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); break; case GreenChannel: m_histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); break; case BlueChannel: m_histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - m_hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + m_hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); break; } - m_histogramWidget->repaint(false); + m_histogramWidget->tqrepaint(false); } void WhiteBalanceTool::slotAutoAdjustExposure() @@ -779,22 +779,22 @@ void WhiteBalanceTool::writeSettings() void WhiteBalanceTool::slotLoadSettings() { KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("White Color Balance Settings File to Load")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) return; - QFile file(loadWhiteBalanceFile.path()); + TQFile file(loadWhiteBalanceFile.path()); if ( file.open(IO_ReadOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if ( stream.readLine() != "# White Color Balance Configuration File V2" ) { KMessageBox::error(kapp->activeWindow(), i18n("\"%1\" is not a White Color Balance settings text file.") - .arg(loadWhiteBalanceFile.fileName())); + .tqarg(loadWhiteBalanceFile.fileName())); file.close(); return; } @@ -821,16 +821,16 @@ void WhiteBalanceTool::slotLoadSettings() void WhiteBalanceTool::slotSaveAsSettings() { KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), kapp->activeWindow(), - QString( i18n("White Color Balance Settings File to Save")) ); + TQString( "*" ), kapp->activeWindow(), + TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) return; - QFile file(saveWhiteBalanceFile.path()); + TQFile file(saveWhiteBalanceFile.path()); if ( file.open(IO_WriteOnly) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << "# White Color Balance Configuration File V2\n"; stream << m_temperatureInput->value() << "\n"; stream << m_darkInput->value() << "\n"; diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.h b/digikam/imageplugins/whitebalance/whitebalancetool.h index ed07fff..13a8439 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.h +++ b/digikam/imageplugins/whitebalance/whitebalancetool.h @@ -26,19 +26,19 @@ #ifndef WHITEBALANCETOOL_H #define WHITEBALANCETOOL_H -// Qt includes. +// TQt includes. -#include <qcolor.h> +#include <tqcolor.h> // Digikam includes. #include "editortool.h" -class QComboBox; -class QPushButton; -class QLabel; -class QPushButton; -class QHButtonGroup; +class TQComboBox; +class TQPushButton; +class TQLabel; +class TQPushButton; +class TQHButtonGroup; class KActiveLabel; @@ -63,10 +63,11 @@ namespace DigikamWhiteBalanceImagesPlugin class WhiteBalanceTool : public Digikam::EditorTool { Q_OBJECT + TQ_OBJECT public: - WhiteBalanceTool(QObject* parent); + WhiteBalanceTool(TQObject* tqparent); ~WhiteBalanceTool(); private: @@ -128,24 +129,24 @@ private: int m_currentPreviewMode; - QComboBox *m_channelCB; + TQComboBox *m_channelCB; - QPushButton *m_pickTemperature; - QPushButton *m_autoAdjustExposure; + TQPushButton *m_pickTemperature; + TQPushButton *m_autoAdjustExposure; KDcrawIface::RComboBox *m_temperaturePresetCB; - QHButtonGroup *m_scaleBG; - - QLabel *m_adjTemperatureLabel; - QLabel *m_temperaturePresetLabel; - QLabel *m_darkLabel; - QLabel *m_blackLabel; - QLabel *m_mainExposureLabel; - QLabel *m_fineExposureLabel; - QLabel *m_gammaLabel; - QLabel *m_saturationLabel; - QLabel *m_greenLabel; + TQHButtonGroup *m_scaleBG; + + TQLabel *m_adjTemperatureLabel; + TQLabel *m_temperaturePresetLabel; + TQLabel *m_darkLabel; + TQLabel *m_blackLabel; + TQLabel *m_mainExposureLabel; + TQLabel *m_fineExposureLabel; + TQLabel *m_gammaLabel; + TQLabel *m_saturationLabel; + TQLabel *m_greenLabel; KActiveLabel *m_exposureLabel; KActiveLabel *m_temperatureLabel; diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 0d4a5ba..c4fae85 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -49,13 +49,13 @@ extern "C" #include <ctime> #include <cerrno> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qfileinfo.h> -#include <qdatastream.h> -#include <qregexp.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdatastream.h> +#include <tqregexp.h> +#include <tqdir.h> // KDE includes. @@ -86,8 +86,8 @@ extern "C" #include "digikam_export.h" #include "digikamalbums.h" -kio_digikamalbums::kio_digikamalbums(const QCString &pool_socket, - const QCString &app_socket) +kio_digikamalbums::kio_digikamalbums(const TQCString &pool_socket, + const TQCString &app_socket) : SlaveBase("kio_digikamalbums", pool_socket, app_socket) { } @@ -96,30 +96,30 @@ kio_digikamalbums::~kio_digikamalbums() { } -static QValueList<QRegExp> makeFilterList( const QString &filter ) +static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) { - QValueList<QRegExp> regExps; + TQValueList<TQRegExp> regExps; if ( filter.isEmpty() ) return regExps; - QChar sep( ';' ); - int i = filter.find( sep, 0 ); - if ( i == -1 && filter.find( ' ', 0 ) != -1 ) - sep = QChar( ' ' ); + TQChar sep( ';' ); + int i = filter.tqfind( sep, 0 ); + if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + sep = TQChar( ' ' ); - QStringList list = QStringList::split( sep, filter ); - QStringList::Iterator it = list.begin(); + TQStringList list = TQStringList::split( sep, filter ); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - regExps << QRegExp( (*it).stripWhiteSpace(), false, true ); + regExps << TQRegExp( (*it).stripWhiteSpace(), false, true ); ++it; } return regExps; } -static bool matchFilterList( const QValueList<QRegExp>& filters, - const QString &fileName ) +static bool matchFilterList( const TQValueList<TQRegExp>& filters, + const TQString &fileName ) { - QValueList<QRegExp>::ConstIterator rit = filters.begin(); + TQValueList<TQRegExp>::ConstIterator rit = filters.begin(); while ( rit != filters.end() ) { if ( (*rit).exactMatch(fileName) ) return true; @@ -128,21 +128,21 @@ static bool matchFilterList( const QValueList<QRegExp>& filters, return false; } -void kio_digikamalbums::special(const QByteArray& data) +void kio_digikamalbums::special(const TQByteArray& data) { bool folders = (metaData("folders") == "yes"); - QString libraryPath; + TQString libraryPath; KURL kurl; - QString url; - QString urlWithTrailingSlash; - QString filter; + TQString url; + TQString urlWithTrailingSlash; + TQString filter; int getDimensions; int scan = 0; int recurseAlbums; int recurseTags; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); ds >> libraryPath; ds >> kurl; ds >> filter; @@ -152,7 +152,7 @@ void kio_digikamalbums::special(const QByteArray& data) if (!ds.atEnd()) ds >> scan; - libraryPath = QDir::cleanDirPath(libraryPath); + libraryPath = TQDir::cleanDirPath(libraryPath); if (m_libraryPath != libraryPath) { @@ -170,52 +170,52 @@ void kio_digikamalbums::special(const QByteArray& data) return; } - QValueList<QRegExp> regex = makeFilterList(filter); - QByteArray ba; + TQValueList<TQRegExp> regex = makeFilterList(filter); + TQByteArray ba; if (folders) // Special mode to stats all album items { - QMap<int, int> albumsStatMap; - QStringList values, allAbumIDs; + TQMap<int, int> albumsStatMap; + TQStringList values, allAbumIDs; int albumID; // initialize allAbumIDs with all existing albums from db to prevent // wrong album image counters - m_sqlDB.execSql(QString("SELECT id from Albums"), &allAbumIDs); + m_sqlDB.execSql(TQString("SELECT id from Albums"), &allAbumIDs); - for ( QStringList::iterator it = allAbumIDs.begin(); it != allAbumIDs.end(); ++it) + for ( TQStringList::iterator it = allAbumIDs.begin(); it != allAbumIDs.end(); ++it) { albumID = (*it).toInt(); albumsStatMap.insert(albumID, 0); } // now we can count the images assigned to albums - m_sqlDB.execSql(QString("SELECT dirid, Images.name FROM Images " + m_sqlDB.execSql(TQString("SELECT dirid, Images.name FROM Images " "WHERE Images.dirid IN (SELECT DISTINCT id FROM Albums)"), &values); - for ( QStringList::iterator it = values.begin(); it != values.end(); ) + for ( TQStringList::iterator it = values.begin(); it != values.end(); ) { albumID = (*it).toInt(); ++it; if ( matchFilterList( regex, *it ) ) { - QMap<int, int>::iterator it2 = albumsStatMap.find(albumID); + TQMap<int, int>::iterator it2 = albumsStatMap.tqfind(albumID); if ( it2 == albumsStatMap.end() ) albumsStatMap.insert(albumID, 1); else - albumsStatMap.replace(albumID, it2.data() + 1); + albumsStatMap.tqreplace(albumID, it2.data() + 1); } ++it; } - QDataStream os(ba, IO_WriteOnly); + TQDataStream os(ba, IO_WriteOnly); os << albumsStatMap; } else { - QStringList albumvalues; + TQStringList albumvalues; if (recurseAlbums) { // Search for albums and sub-albums: @@ -224,34 +224,34 @@ void kio_digikamalbums::special(const QByteArray& data) // would be found in addition to "Paris/*". urlWithTrailingSlash = kurl.path(1); - m_sqlDB.execSql(QString("SELECT DISTINCT id, url FROM Albums WHERE url='%1' OR url LIKE '%2\%';") - .arg(escapeString(url)).arg(escapeString(urlWithTrailingSlash)), &albumvalues); + m_sqlDB.execSql(TQString("SELECT DISTINCT id, url FROM Albums WHERE url='%1' OR url LIKE '%2\%';") + .tqarg(escapeString(url)).tqarg(escapeString(urlWithTrailingSlash)), &albumvalues); } else { // Search for albums - m_sqlDB.execSql(QString("SELECT DISTINCT id, url FROM Albums WHERE url='%1';") - .arg(escapeString(url)), &albumvalues); + m_sqlDB.execSql(TQString("SELECT DISTINCT id, url FROM Albums WHERE url='%1';") + .tqarg(escapeString(url)), &albumvalues); } - QDataStream* os = new QDataStream(ba, IO_WriteOnly); + TQDataStream* os = new TQDataStream(ba, IO_WriteOnly); - QString base; - Q_LLONG id; - QString name; - QString date; - QSize dims; + TQString base; + TQ_LLONG id; + TQString name; + TQString date; + TQSize dims; struct stat stbuf; - QStringList values; - QString albumurl; + TQStringList values; + TQString albumurl; int albumid; // Loop over all albums: int count = 0 ; - for (QStringList::iterator albumit = albumvalues.begin(); albumit != albumvalues.end();) + for (TQStringList::iterator albumit = albumvalues.begin(); albumit != albumvalues.end();) { albumid = (*albumit).toLongLong(); ++albumit; @@ -261,12 +261,12 @@ void kio_digikamalbums::special(const QByteArray& data) base = libraryPath + albumurl + '/'; values.clear(); - m_sqlDB.execSql(QString("SELECT id, name, datetime FROM Images " + m_sqlDB.execSql(TQString("SELECT id, name, datetime FROM Images " "WHERE dirid = %1;") - .arg(albumid), &values); + .tqarg(albumid), &values); // Loop over all images in each album (specified by its albumid). - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { id = (*it).toLongLong(); ++it; @@ -278,21 +278,21 @@ void kio_digikamalbums::special(const QByteArray& data) if (!matchFilterList(regex, name)) continue; - if (::stat(QFile::encodeName(base + name), &stbuf) != 0) + if (::stat(TQFile::encodeName(base + name), &stbuf) != 0) continue; - dims = QSize(); + dims = TQSize(); if (getDimensions) { - QFileInfo fileInfo(base + name); + TQFileInfo fileInfo(base + name); #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) { Digikam::DMetadata metaData(base + name); dims = metaData.getImageDimensions(); @@ -340,7 +340,7 @@ void kio_digikamalbums::special(const QByteArray& data) ba.resize(0); count = 0; - os = new QDataStream(ba, IO_WriteOnly); + os = new TQDataStream(ba, IO_WriteOnly); } } count++; @@ -375,7 +375,7 @@ void kio_digikamalbums::get( const KURL& url ) kdDebug() << k_funcinfo << " : " << url << endl; // get the libraryPath - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -384,7 +384,7 @@ void kio_digikamalbums::get( const KURL& url ) // no need to open the db. we don't need to read/write to it - QCString path(QFile::encodeName(libraryPath + url.path())); + TQCString path(TQFile::encodeName(libraryPath + url.path())); KDE_struct_stat buff; if ( KDE_stat( path.data(), &buff ) == -1 ) { @@ -423,7 +423,7 @@ void kio_digikamalbums::get( const KURL& url ) totalSize( buff.st_size ); char buffer[ MAX_IPC_SIZE ]; - QByteArray array; + TQByteArray array; KIO::filesize_t processed_size = 0; while (1) @@ -448,7 +448,7 @@ void kio_digikamalbums::get( const KURL& url ) processedSize( processed_size ); } - data( QByteArray() ); + data( TQByteArray() ); close( fd ); processedSize( buff.st_size ); @@ -461,7 +461,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo kdDebug() << k_funcinfo << " : " << url.url() << endl; // get the libraryPath - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -479,18 +479,18 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo // build the album list buildAlbumList(); - // get the parent album + // get the tqparent album AlbumInfo album = findAlbum(url.directory()); if (album.id == -1) { error(KIO::ERR_UNKNOWN, i18n("Source album %1 not found in database") - .arg(url.directory())); + .tqarg(url.directory())); return; } - QString dest = libraryPath + url.path(); - QCString _dest( QFile::encodeName(dest)); + TQString dest = libraryPath + url.path(); + TQCString _dest( TQFile::encodeName(dest)); // check if the original file exists and we are not allowed to overwrite it KDE_struct_stat buff; @@ -528,7 +528,7 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo // Loop until we get 0 (end of data) do { - QByteArray buffer; + TQByteArray buffer; dataReq(); result = readData( buffer ); @@ -575,16 +575,16 @@ void kio_digikamalbums::put(const KURL& url, int permissions, bool overwrite, bo { if (::chmod(_dest.data(), permissions) != 0) { - // couldn't chmod. Eat the error if the filesystem apparently doesn't support it. + // couldn't chmod. Eat the error if the filesystem aptqparently doesn't support it. if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) ) - warning( i18n( "Could not change permissions for\n%1" ).arg( url.url() ) ); + warning( i18n( "Could not change permissions for\n%1" ).tqarg( url.url() ) ); } } // set modification time - const QString mtimeStr = metaData( "modified" ); + const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - QDateTime dt = QDateTime::fromString( mtimeStr, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest.data(), &dest_statbuf ) == 0) { @@ -615,7 +615,7 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o kdDebug() << k_funcinfo << "Src: " << src.path() << ", Dst: " << dst.path() << endl; // get the album library path - QString libraryPath = src.user(); + TQString libraryPath = src.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -623,13 +623,13 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o } // check that the src and dst album library paths match - QString dstLibraryPath = dst.user(); + TQString dstLibraryPath = dst.user(); if (libraryPath != dstLibraryPath) { error(KIO::ERR_UNKNOWN, - QString("Source and Destination have different Album Library Paths. ") + - QString("Src: ") + src.user() + - QString(", Dest: ") + dst.user()); + TQString("Source and Destination have different Album Library Paths. ") + + TQString("Src: ") + src.user() + + TQString(", Dest: ") + dst.user()); return; } @@ -644,21 +644,21 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o // build the album list buildAlbumList(); - // find the src parent album + // find the src tqparent album AlbumInfo srcAlbum = findAlbum(src.directory()); if (srcAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, QString("Source album %1 not found in database") - .arg(src.directory())); + error(KIO::ERR_UNKNOWN, TQString("Source album %1 not found in database") + .tqarg(src.directory())); return; } - // find the dst parent album + // find the dst tqparent album AlbumInfo dstAlbum = findAlbum(dst.directory()); if (dstAlbum.id == -1) { - error(KIO::ERR_UNKNOWN, QString("Destination album %1 not found in database") - .arg(dst.directory())); + error(KIO::ERR_UNKNOWN, TQString("Destination album %1 not found in database") + .tqarg(dst.directory())); return; } @@ -668,20 +668,20 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o { // no duplication in AlbumDB? // copy metadata of album to destination album - m_sqlDB.execSql( QString("UPDATE Albums SET date='%1', caption='%2', " + m_sqlDB.execSql( TQString("UPDATE Albums SET date='%1', caption='%2', " "collection='%3', icon=%4 ") - .arg(srcAlbum.date.toString(Qt::ISODate), + .tqarg(srcAlbum.date.toString(Qt::ISODate), escapeString(srcAlbum.caption), escapeString(srcAlbum.collection), - QString::number(srcAlbum.icon)) + - QString( " WHERE id=%1" ) - .arg(dstAlbum.id) ); + TQString::number(srcAlbum.icon)) + + TQString( " WHERE id=%1" ) + .tqarg(dstAlbum.id) ); finished(); return; } - QCString _src( QFile::encodeName(libraryPath + src.path())); - QCString _dst( QFile::encodeName(libraryPath + dst.path())); + TQCString _src( TQFile::encodeName(libraryPath + src.path())); + TQCString _dst( TQFile::encodeName(libraryPath + dst.path())); // stat the src file KDE_struct_stat buff_src; @@ -831,9 +831,9 @@ void kio_digikamalbums::copy( const KURL &src, const KURL &dst, int mode, bool o { if (::chmod(_dst.data(), mode) != 0) { - // Eat the error if the filesystem apparently doesn't support chmod. + // Eat the error if the filesystem aptqparently doesn't support chmod. if ( KIO::testFileSystemFlag( _dst, KIO::SupportsChmod ) ) - warning( i18n( "Could not change permissions for\n%1" ).arg( dst.url() ) ); + warning( i18n( "Could not change permissions for\n%1" ).tqarg( 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() << QString::fromLatin1("Couldn't preserve access and modification time for\n%1") - .arg( dst.url() ) << endl; + kdWarning() << TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1") + .tqarg( dst.url() ) << endl; } // now copy the metadata over @@ -866,22 +866,22 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite return; } - QString libraryPath = src.user(); + TQString libraryPath = src.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } - QString dstLibraryPath = dst.user(); + TQString dstLibraryPath = dst.user(); if (libraryPath != dstLibraryPath) { error(KIO::ERR_UNKNOWN, i18n("Source and Destination have different Album Library Paths.\n" "Source: %1\n" "Destination: %2") - .arg(src.user()) - .arg(dst.user())); + .tqarg(src.user()) + .tqarg(dst.user())); return; } @@ -893,8 +893,8 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite m_sqlDB.openDB(m_libraryPath); } - QCString csrc( QFile::encodeName(libraryPath + src.path())); - QCString cdst( QFile::encodeName(libraryPath + dst.path())); + TQCString csrc( TQFile::encodeName(libraryPath + src.path())); + TQCString cdst( TQFile::encodeName(libraryPath + dst.path())); // stat the source file/folder KDE_struct_stat buff_src; @@ -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") - .arg(src.url())); + .tqarg(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") - .arg(src.directory())); + .tqarg(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") - .arg(dst.directory())); + .tqarg(dst.directory())); return; } } @@ -968,7 +968,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite { if (( errno == EACCES ) || (errno == EPERM)) { - QFileInfo toCheck(libraryPath + src.path()); + TQFileInfo toCheck(libraryPath + src.path()); if (!toCheck.isWritable()) error( KIO::ERR_CANNOT_RENAME_ORIGINAL, src.path() ); else @@ -1007,7 +1007,7 @@ void kio_digikamalbums::rename( const KURL& src, const KURL& dst, bool overwrite void kio_digikamalbums::stat( const KURL& url ) { - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -1030,7 +1030,7 @@ void kio_digikamalbums::listDir( const KURL& url ) // Code duplication from file:// ioslave? kdDebug() << k_funcinfo << " : " << url.path() << endl; - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -1039,23 +1039,23 @@ void kio_digikamalbums::listDir( const KURL& url ) } KDE_struct_stat stbuf; - QString path = libraryPath + url.path(); - if (KDE_stat(QFile::encodeName(path), &stbuf) != 0) + TQString path = libraryPath + url.path(); + if (KDE_stat(TQFile::encodeName(path), &stbuf) != 0) { error(KIO::ERR_DOES_NOT_EXIST, url.path(-1)); return; } - QDir dir(path); + TQDir dir(path); if (!dir.isReadable()) { error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path()); return; } - const QFileInfoList *list = dir.entryInfoList(QDir::All|QDir::Hidden); - QFileInfoListIterator it( *list ); - QFileInfo *fi; + const TQFileInfoList *list = dir.entryInfoList(TQDir::All|TQDir::Hidden); + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; KIO::UDSEntry entry; createDigikamPropsUDSEntry(entry); @@ -1080,7 +1080,7 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) // Code duplication from file:// ioslave? kdDebug() << k_funcinfo << " : " << url.url() << endl; - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -1094,8 +1094,8 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) m_sqlDB.openDB(m_libraryPath); } - QString path = libraryPath + url.path(); - QCString _path( QFile::encodeName(path)); + TQString path = libraryPath + url.path(); + TQCString _path( TQFile::encodeName(path)); KDE_struct_stat buff; if ( KDE_stat( _path, &buff ) == -1 ) @@ -1121,10 +1121,10 @@ void kio_digikamalbums::mkdir( const KURL& url, int permissions ) else { // code similar to AlbumDB::addAlbum - m_sqlDB.execSql( QString("REPLACE INTO Albums (url, date) " + m_sqlDB.execSql( TQString("REPLACE INTO Albums (url, date) " "VALUES('%1','%2')") - .arg(escapeString(url.path()), - QDate::currentDate().toString(Qt::ISODate)) ); + .tqarg(escapeString(url.path()), + TQDate::tqcurrentDate().toString(Qt::ISODate)) ); if ( permissions != -1 ) { @@ -1154,14 +1154,14 @@ void kio_digikamalbums::chmod( const KURL& url, int permissions ) kdDebug() << k_funcinfo << " : " << url.url() << endl; // get the album library path - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); return; } - QCString path( QFile::encodeName(libraryPath + url.path())); + TQCString path( TQFile::encodeName(libraryPath + url.path())); if ( ::chmod( path.data(), permissions ) == -1 ) error( KIO::ERR_CANNOT_CHMOD, url.url() ); else @@ -1174,7 +1174,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) kdDebug() << k_funcinfo << " : " << url.url() << endl; // get the album library path - QString libraryPath = url.user(); + TQString libraryPath = url.user(); if (libraryPath.isEmpty()) { error(KIO::ERR_UNKNOWN, "Album Library Path not supplied to kioslave"); @@ -1192,7 +1192,7 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) // build the album list buildAlbumList(); - QCString path( QFile::encodeName(libraryPath + url.path())); + TQCString path( TQFile::encodeName(libraryPath + url.path())); if (isfile) { @@ -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") - .arg(url.directory())); + .tqarg(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") - .arg(url.path())); + .tqarg(url.path())); return; } @@ -1267,12 +1267,12 @@ void kio_digikamalbums::del( const KURL& url, bool isfile) } -bool kio_digikamalbums::createUDSEntry(const QString& path, KIO::UDSEntry& entry) +bool kio_digikamalbums::createUDSEntry(const TQString& path, KIO::UDSEntry& entry) { entry.clear(); KDE_struct_stat stbuf; - if (KDE_stat(QFile::encodeName(path), &stbuf) != 0) + if (KDE_stat(TQFile::encodeName(path), &stbuf) != 0) return false; KIO::UDSAtom atom; @@ -1298,7 +1298,7 @@ bool kio_digikamalbums::createUDSEntry(const QString& path, KIO::UDSEntry& entry entry.append( atom ); atom.m_uds = KIO::UDS_NAME; - atom.m_str = QFileInfo(path).fileName(); + atom.m_str = TQFileInfo(path).fileName(); entry.append(atom); /* @@ -1336,11 +1336,11 @@ void kio_digikamalbums::createDigikamPropsUDSEntry(KIO::UDSEntry& entry) entry.append( atom ); atom.m_uds = KIO::UDS_MODIFICATION_TIME; - atom.m_long = QDateTime::currentDateTime().toTime_t(); + atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t(); entry.append( atom ); atom.m_uds = KIO::UDS_ACCESS_TIME; - atom.m_long = QDateTime::currentDateTime().toTime_t(); + atom.m_long = TQDateTime::tqcurrentDateTime().toTime_t(); entry.append( atom ); atom.m_uds = KIO::UDS_NAME; @@ -1353,11 +1353,11 @@ void kio_digikamalbums::buildAlbumList() // simplified from AlbumDB::scanAlbums() m_albumList.clear(); - QStringList values; - m_sqlDB.execSql( QString("SELECT id, url, date, caption, collection, icon " + TQStringList values; + m_sqlDB.execSql( TQString("SELECT id, url, date, caption, collection, icon " "FROM Albums;"), &values ); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { AlbumInfo info; @@ -1365,7 +1365,7 @@ void kio_digikamalbums::buildAlbumList() ++it; info.url = *it; ++it; - info.date = QDate::fromString(*it, Qt::ISODate); + info.date = TQDate::fromString(*it, Qt::ISODate); ++it; info.caption = *it; ++it; @@ -1378,11 +1378,11 @@ void kio_digikamalbums::buildAlbumList() } } -AlbumInfo kio_digikamalbums::findAlbum(const QString& url, bool addIfNotExists) +AlbumInfo kio_digikamalbums::findAlbum(const TQString& url, bool addIfNotExists) { // similar to AlbumDB::getOrCreateAlbumId AlbumInfo album; - for (QValueList<AlbumInfo>::const_iterator it = m_albumList.begin(); + for (TQValueList<AlbumInfo>::const_iterator it = m_albumList.begin(); it != m_albumList.end(); ++it) { if ((*it).url == url) @@ -1396,13 +1396,13 @@ AlbumInfo kio_digikamalbums::findAlbum(const QString& url, bool addIfNotExists) if (addIfNotExists) { - QFileInfo fi(m_libraryPath + url); + TQFileInfo fi(m_libraryPath + url); if (!fi.exists() || !fi.isDir()) return album; - m_sqlDB.execSql(QString("INSERT INTO Albums (url, date) " + m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") - .arg(escapeString(url), + .tqarg(escapeString(url), fi.lastModified().date().toString(Qt::ISODate))); album.id = m_sqlDB.lastInsertedRow(); @@ -1419,45 +1419,45 @@ AlbumInfo kio_digikamalbums::findAlbum(const QString& url, bool addIfNotExists) void kio_digikamalbums::delAlbum(int albumID) { // code duplication from AlbumDB::deleteAlbum - m_sqlDB.execSql(QString("DELETE FROM Albums WHERE id='%1'") - .arg(albumID)); + m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE id='%1'") + .tqarg(albumID)); } -void kio_digikamalbums::renameAlbum(const QString& oldURL, const QString& newURL) +void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newURL) { // similar to AlbumDB::setAlbumURL, but why more extended? // first update the url of the album which was renamed - m_sqlDB.execSql( QString("UPDATE Albums SET url='%1' WHERE url='%2'") - .arg(escapeString(newURL), + m_sqlDB.execSql( TQString("UPDATE Albums SET url='%1' WHERE url='%2'") + .tqarg(escapeString(newURL), escapeString(oldURL))); // now find the list of all subalbums which need to be updated - QStringList values; - m_sqlDB.execSql( QString("SELECT url FROM Albums WHERE url LIKE '%1/%';") - .arg(oldURL), &values ); + TQStringList values; + m_sqlDB.execSql( TQString("SELECT url FROM Albums WHERE url LIKE '%1/%';") + .tqarg(oldURL), &values ); // and update their url - QString newChildURL; - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + TQString newChildURL; + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { newChildURL = *it; - newChildURL.replace(oldURL, newURL); - m_sqlDB.execSql(QString("UPDATE Albums SET url='%1' WHERE url='%2'") - .arg(escapeString(newChildURL), + newChildURL.tqreplace(oldURL, newURL); + m_sqlDB.execSql(TQString("UPDATE Albums SET url='%1' WHERE url='%2'") + .tqarg(escapeString(newChildURL), escapeString(*it))); } } -bool kio_digikamalbums::findImage(int albumID, const QString& name) const +bool kio_digikamalbums::findImage(int albumID, const TQString& name) const { // no similar method in AlbumDB? - QStringList values; + TQStringList values; - m_sqlDB.execSql( QString("SELECT name FROM Images " + m_sqlDB.execSql( TQString("SELECT name FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(name)), + .tqarg(albumID) + .tqarg(escapeString(name)), &values ); return !(values.isEmpty()); @@ -1468,22 +1468,22 @@ class TagInfo { public: - typedef QValueList<TagInfo> List; + typedef TQValueList<TagInfo> List; int id; int pid; - QString name; - QString icon; + TQString name; + TQString icon; }; -void kio_digikamalbums::addImage(int albumID, const QString& filePath) +void kio_digikamalbums::addImage(int albumID, const TQString& filePath) { // Code duplication: ScanLib::storeItemInDatabase, AlbumDB::addItem, // AlbumDB::setItemRating, AlbumDB::addItemTag, AlbumDB::addTag // from ScanLib::storeItemInDatabase - QString comment; - QDateTime datetime; + TQString comment; + TQDateTime datetime; int rating = 0; Digikam::DMetadata metadata(filePath); @@ -1506,49 +1506,49 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) if (!datetime.isValid()) { - QFileInfo info(filePath); + TQFileInfo info(filePath); datetime = info.lastModified(); } // Try to get image tags from IPTC keywords tags. - QStringList keywordsList = metadata.getImageKeywords(); + TQStringList keywordsList = metadata.getImageKeywords(); // from AlbumDB::addItem - m_sqlDB.execSql(QString("REPLACE INTO Images " + m_sqlDB.execSql(TQString("REPLACE INTO Images " "(dirid, name, datetime, caption) " "VALUES(%1, '%2', '%3', '%4')") - .arg(QString::number(albumID), - escapeString(QFileInfo(filePath).fileName()), + .tqarg(TQString::number(albumID), + escapeString(TQFileInfo(filePath).fileName()), datetime.toString(Qt::ISODate), escapeString(comment))); - Q_LLONG imageID = m_sqlDB.lastInsertedRow(); + TQ_LLONG imageID = m_sqlDB.lastInsertedRow(); // from AlbumDB::setItemRating if (imageID != -1 && rating != -1) { - m_sqlDB.execSql(QString("REPLACE INTO ImageProperties " + m_sqlDB.execSql(TQString("REPLACE INTO ImageProperties " "(imageid, property, value) " "VALUES(%1, '%2', '%3');") - .arg(imageID) - .arg("Rating") - .arg(rating) ); + .tqarg(imageID) + .tqarg("Rating") + .tqarg(rating) ); } // Set existing tags in database or create new tags if not exist. if ( imageID != -1 && !keywordsList.isEmpty() ) { - QStringList keywordsList2Create; + TQStringList keywordsList2Create; // Create a list of the tags currently in database TagInfo::List tagsList; - QStringList values; + TQStringList values; m_sqlDB.execSql( "SELECT id, pid, name FROM Tags;", &values ); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { TagInfo info; @@ -1563,17 +1563,17 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) // For every tag in keywordsList, scan taglist to check if tag already exists. - for (QStringList::iterator kwd = keywordsList.begin(); + for (TQStringList::iterator kwd = keywordsList.begin(); kwd != keywordsList.end(); ++kwd ) { // split full tag "url" into list of single tag names - QStringList tagHierarchy = QStringList::split('/', *kwd); + TQStringList tagHierarchy = TQStringList::split('/', *kwd); if (tagHierarchy.isEmpty()) continue; // last entry in list is the actual tag name bool foundTag = false; - QString tagName = tagHierarchy.back(); + TQString tagName = tagHierarchy.back(); tagHierarchy.pop_back(); for (TagInfo::List::iterator tag = tagsList.begin(); @@ -1583,27 +1583,27 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) // hierarchies. We must check them all until we find the correct hierarchy if ((*tag).name == tagName) { - int parentID = (*tag).pid; + int tqparentID = (*tag).pid; // Check hierarchy, from bottom to top bool foundParentTag = true; - QStringList::iterator parentTagName = tagHierarchy.end(); + TQStringList::iterator tqparentTagName = tagHierarchy.end(); - while (foundParentTag && parentTagName != tagHierarchy.begin()) + while (foundParentTag && tqparentTagName != tagHierarchy.begin()) { - --parentTagName; + --tqparentTagName; foundParentTag = false; - for (TagInfo::List::iterator parentTag = tagsList.begin(); - parentTag != tagsList.end(); ++parentTag ) + for (TagInfo::List::iterator tqparentTag = tagsList.begin(); + tqparentTag != tagsList.end(); ++tqparentTag ) { // check if name is the same, and if ID is identical - // to the parent ID we got from the child tag - if ( (*parentTag).id == parentID && - (*parentTag).name == (*parentTagName) ) + // to the tqparent ID we got from the child tag + if ( (*tqparentTag).id == tqparentID && + (*tqparentTag).name == (*tqparentTagName) ) { - parentID = (*parentTag).pid; + tqparentID = (*tqparentTag).pid; foundParentTag = true; break; } @@ -1618,10 +1618,10 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) if (foundParentTag) { // from AlbumDB::addItemTag - m_sqlDB.execSql( QString("REPLACE INTO ImageTags (imageid, tagid) " + m_sqlDB.execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .arg(imageID) - .arg((*tag).id) ); + .tqarg(imageID) + .tqarg((*tag).id) ); foundTag = true; break; } @@ -1636,35 +1636,35 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) if (!keywordsList2Create.isEmpty()) { - for (QStringList::iterator kwd = keywordsList2Create.begin(); + for (TQStringList::iterator kwd = keywordsList2Create.begin(); kwd != keywordsList2Create.end(); ++kwd ) { // split full tag "url" into list of single tag names - QStringList tagHierarchy = QStringList::split('/', *kwd); + TQStringList tagHierarchy = TQStringList::split('/', *kwd); if (tagHierarchy.isEmpty()) continue; - int parentTagID = 0; + int tqparentTagID = 0; int tagID = 0; - bool parentTagExisted = true; + bool tqparentTagExisted = true; // Traverse hierarchy from top to bottom - for (QStringList::iterator tagName = tagHierarchy.begin(); + for (TQStringList::iterator tagName = tagHierarchy.begin(); tagName != tagHierarchy.end(); ++tagName) { tagID = 0; - // if the parent tag did not exist, we need not check if the child exists - if (parentTagExisted) + // if the tqparent tag did not exist, we need not check if the child exists + if (tqparentTagExisted) { for (TagInfo::List::iterator tag = tagsList.begin(); tag != tagsList.end(); ++tag ) { // find the tag with tag name according to tagHierarchy, - // and parent ID identical to the ID of the tag we found in + // and tqparent ID identical to the ID of the tag we found in // the previous run. - if ((*tag).name == (*tagName) && (*tag).pid == parentTagID) + if ((*tag).name == (*tagName) && (*tag).pid == tqparentTagID) { tagID = (*tag).id; break; @@ -1675,16 +1675,16 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) if (tagID != 0) { // tag already found in DB - parentTagID = tagID; + tqparentTagID = tagID; continue; } // Tag does not yet exist in DB, add it // from AlbumDB::addTag - m_sqlDB.execSql( QString("INSERT INTO Tags (pid, name, icon) " + m_sqlDB.execSql( TQString("INSERT INTO Tags (pid, name, icon) " "VALUES( %1, '%2', 0)") - .arg(parentTagID) - .arg(escapeString(*tagName))); + .tqarg(tqparentTagID) + .tqarg(escapeString(*tagName))); tagID = m_sqlDB.lastInsertedRow(); if (tagID == -1) @@ -1696,54 +1696,54 @@ void kio_digikamalbums::addImage(int albumID, const QString& filePath) // append to our list of existing tags (for following keywords) TagInfo info; info.id = tagID; - info.pid = parentTagID; + info.pid = tqparentTagID; info.name = (*tagName); tagsList.append(info); - parentTagID = tagID; - parentTagExisted = false; + tqparentTagID = tagID; + tqparentTagExisted = false; } // from AlbumDB::addItemTag - m_sqlDB.execSql( QString("REPLACE INTO ImageTags (imageid, tagid) " + m_sqlDB.execSql( TQString("REPLACE INTO ImageTags (imageid, tagid) " "VALUES(%1, %2);") - .arg(imageID) - .arg(tagID) ); + .tqarg(imageID) + .tqarg(tagID) ); } } } } -void kio_digikamalbums::delImage(int albumID, const QString& name) +void kio_digikamalbums::delImage(int albumID, const TQString& name) { // code duplication from AlbumDB::deleteItem - m_sqlDB.execSql( QString("DELETE FROM Images " + m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(albumID) - .arg(escapeString(name)) ); + .tqarg(albumID) + .tqarg(escapeString(name)) ); } -void kio_digikamalbums::renameImage(int oldAlbumID, const QString& oldName, - int newAlbumID, const QString& newName) +void kio_digikamalbums::renameImage(int oldAlbumID, const TQString& oldName, + int newAlbumID, const TQString& newName) { // code duplication from AlbumDB::deleteItem, AlbumDB::moveItem // first delete any stale entries for the destination file - m_sqlDB.execSql( QString("DELETE FROM Images " + m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(newAlbumID) - .arg(escapeString(newName)) ); + .tqarg(newAlbumID) + .tqarg(escapeString(newName)) ); // now update the dirid and/or name of the file - m_sqlDB.execSql( QString("UPDATE Images SET dirid=%1, name='%2' " + m_sqlDB.execSql( TQString("UPDATE Images SET dirid=%1, name='%2' " "WHERE dirid=%3 AND name='%4';") - .arg(QString::number(newAlbumID), + .tqarg(TQString::number(newAlbumID), escapeString(newName), - QString::number(oldAlbumID), + TQString::number(oldAlbumID), escapeString(oldName)) ); } -void kio_digikamalbums::copyImage(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName) +void kio_digikamalbums::copyImage(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName) { // code duplication from AlbumDB::copyItem // check for src == dest @@ -1754,63 +1754,63 @@ void kio_digikamalbums::copyImage(int srcAlbumID, const QString& srcName, } // find id of src image - QStringList values; - m_sqlDB.execSql( QString("SELECT id FROM Images " + TQStringList values; + m_sqlDB.execSql( TQString("SELECT id FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(QString::number(srcAlbumID), escapeString(srcName)), + .tqarg(TQString::number(srcAlbumID), escapeString(srcName)), &values); if (values.isEmpty()) { error(KIO::ERR_UNKNOWN, i18n("Source image %1 not found in database") - .arg(srcName)); + .tqarg(srcName)); return; } int srcId = values[0].toInt(); // first delete any stale entries for the destination file - m_sqlDB.execSql( QString("DELETE FROM Images " + m_sqlDB.execSql( TQString("DELETE FROM Images " "WHERE dirid=%1 AND name='%2';") - .arg(QString::number(dstAlbumID), escapeString(dstName)) ); + .tqarg(TQString::number(dstAlbumID), escapeString(dstName)) ); // copy entry in Images table - m_sqlDB.execSql( QString("INSERT INTO Images (dirid, name, caption, datetime) " + m_sqlDB.execSql( TQString("INSERT INTO Images (dirid, name, caption, datetime) " "SELECT %1, '%2', caption, datetime FROM Images " "WHERE id=%3;") - .arg(QString::number(dstAlbumID), escapeString(dstName), - QString::number(srcId)) ); + .tqarg(TQString::number(dstAlbumID), escapeString(dstName), + TQString::number(srcId)) ); int dstId = m_sqlDB.lastInsertedRow(); // copy tags - m_sqlDB.execSql( QString("INSERT INTO ImageTags (imageid, tagid) " + m_sqlDB.execSql( TQString("INSERT INTO ImageTags (imageid, tagid) " "SELECT %1, tagid FROM ImageTags " "WHERE imageid=%2;") - .arg(QString::number(dstId), QString::number(srcId)) ); + .tqarg(TQString::number(dstId), TQString::number(srcId)) ); // copy properties (rating) - m_sqlDB.execSql( QString("INSERT INTO ImageProperties (imageid, property, value) " + m_sqlDB.execSql( TQString("INSERT INTO ImageProperties (imageid, property, value) " "SELECT %1, property, value FROM ImageProperties " "WHERE imageid=%2;") - .arg(QString::number(dstId), QString::number(srcId)) ); + .tqarg(TQString::number(dstId), TQString::number(srcId)) ); } -void kio_digikamalbums::scanAlbum(const QString& url) +void kio_digikamalbums::scanAlbum(const TQString& url) { scanOneAlbum(url); removeInvalidAlbums(); } -void kio_digikamalbums::scanOneAlbum(const QString& url) +void kio_digikamalbums::scanOneAlbum(const TQString& url) { - QDir dir(m_libraryPath + url); + TQDir dir(m_libraryPath + url); if (!dir.exists() || !dir.isReadable()) { return; } - QString subURL = url; + TQString subURL = url; if (!url.endsWith("/")) subURL += '/'; subURL = escapeString( subURL); @@ -1818,21 +1818,21 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) { // scan albums - QStringList currAlbumList; - m_sqlDB.execSql( QString("SELECT url FROM Albums WHERE ") + - QString("url LIKE '") + subURL + QString("%' ") + - QString("AND url NOT LIKE '") + subURL + QString("%/%' "), + TQStringList currAlbumList; + m_sqlDB.execSql( TQString("SELECT url FROM Albums WHERE ") + + TQString("url LIKE '") + subURL + TQString("%' ") + + TQString("AND url NOT LIKE '") + subURL + TQString("%/%' "), &currAlbumList ); - const QFileInfoList* infoList = dir.entryInfoList(QDir::Dirs); + const TQFileInfoList* infoList = dir.entryInfoList(TQDir::Dirs); if (!infoList) return; - QFileInfoListIterator it(*infoList); - QFileInfo* fi; + TQFileInfoListIterator it(*infoList); + TQFileInfo* fi; - QStringList newAlbumList; + TQStringList newAlbumList; while ((fi = it.current()) != 0) { ++it; @@ -1842,9 +1842,9 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) continue; } - QString u = QDir::cleanDirPath(url + '/' + fi->fileName()); + TQString u = TQDir::cleanDirPath(url + '/' + fi->fileName()); - if (currAlbumList.contains(u)) + if (currAlbumList.tqcontains(u)) { continue; } @@ -1852,15 +1852,15 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) newAlbumList.append(u); } - for (QStringList::iterator it = newAlbumList.begin(); + for (TQStringList::iterator it = newAlbumList.begin(); it != newAlbumList.end(); ++it) { kdDebug() << "New Album: " << *it << endl; - QFileInfo fi(m_libraryPath + *it); - m_sqlDB.execSql(QString("INSERT INTO Albums (url, date) " + TQFileInfo fi(m_libraryPath + *it); + m_sqlDB.execSql(TQString("INSERT INTO Albums (url, date) " "VALUES('%1', '%2')") - .arg(escapeString(*it), + .tqarg(escapeString(*it), fi.lastModified().date().toString(Qt::ISODate))); scanAlbum(*it); @@ -1871,25 +1871,25 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) { // scan files - QStringList values; + TQStringList values; - m_sqlDB.execSql( QString("SELECT id FROM Albums WHERE url='%1'") - .arg(escapeString(url)), &values ); + m_sqlDB.execSql( TQString("SELECT id FROM Albums WHERE url='%1'") + .tqarg(escapeString(url)), &values ); if (values.isEmpty()) return; int albumID = values.first().toInt(); - QStringList currItemList; - m_sqlDB.execSql( QString("SELECT name FROM Images WHERE dirid=%1") - .arg(albumID), &currItemList ); + TQStringList currItemList; + m_sqlDB.execSql( TQString("SELECT name FROM Images WHERE dirid=%1") + .tqarg(albumID), &currItemList ); - const QFileInfoList* infoList = dir.entryInfoList(QDir::Files); + const TQFileInfoList* infoList = dir.entryInfoList(TQDir::Files); if (!infoList) return; - QFileInfoListIterator it(*infoList); - QFileInfo* fi; + TQFileInfoListIterator it(*infoList); + TQFileInfo* fi; // add any new files we find to the db while ((fi = it.current()) != 0) @@ -1902,7 +1902,7 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) continue; } - if (currItemList.contains(fi->fileName())) + if (currItemList.tqcontains(fi->fileName())) { currItemList.remove(fi->fileName()); continue; @@ -1912,7 +1912,7 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) } // currItemList now contains deleted file list. remove them from db - for (QStringList::iterator it = currItemList.begin(); + for (TQStringList::iterator it = currItemList.begin(); it != currItemList.end(); ++it) { delImage(albumID, *it); @@ -1922,24 +1922,24 @@ void kio_digikamalbums::scanOneAlbum(const QString& url) void kio_digikamalbums::removeInvalidAlbums() { - QStringList urlList; + TQStringList urlList; - m_sqlDB.execSql(QString("SELECT url FROM Albums;"), + m_sqlDB.execSql(TQString("SELECT url FROM Albums;"), &urlList); m_sqlDB.execSql("BEGIN TRANSACTION"); struct stat stbuf; - for (QStringList::iterator it = urlList.begin(); + for (TQStringList::iterator it = urlList.begin(); it != urlList.end(); ++it) { - if (::stat(QFile::encodeName(m_libraryPath + *it), &stbuf) == 0) + if (::stat(TQFile::encodeName(m_libraryPath + *it), &stbuf) == 0) continue; kdDebug() << "Deleted Album: " << *it << endl; - m_sqlDB.execSql(QString("DELETE FROM Albums WHERE url='%1'") - .arg(escapeString(*it))); + m_sqlDB.execSql(TQString("DELETE FROM Albums WHERE url='%1'") + .tqarg(escapeString(*it))); } m_sqlDB.execSql("COMMIT TRANSACTION"); diff --git a/digikam/kioslave/digikamalbums.h b/digikam/kioslave/digikamalbums.h index 2e0a92b..0449790 100644 --- a/digikam/kioslave/digikamalbums.h +++ b/digikam/kioslave/digikamalbums.h @@ -30,28 +30,28 @@ #ifndef DIGIKAMALBUMS_H #define DIGIKAMALBUMS_H -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qdatetime.h> +#include <tqvaluelist.h> +#include <tqdatetime.h> #include <sqlitedb.h> // KDE includes. #include <kio/slavebase.h> -class QStringList; +class TQStringList; class AlbumInfo { public: int id; - Q_LLONG icon; - QString url; - QString caption; - QString collection; - QDate date; + TQ_LLONG icon; + TQString url; + TQString caption; + TQString collection; + TQDate date; }; class kio_digikamalbums : public KIO::SlaveBase @@ -59,11 +59,11 @@ class kio_digikamalbums : public KIO::SlaveBase public: - kio_digikamalbums(const QCString &pool_socket, - const QCString &app_socket); + kio_digikamalbums(const TQCString &pool_socket, + const TQCString &app_socket); ~kio_digikamalbums(); - void special(const QByteArray& data); + void special(const TQByteArray& data); void get( const KURL& url ); void put( const KURL& url, int _mode, bool _overwrite, bool _resume ); @@ -78,30 +78,30 @@ public: private: - bool createUDSEntry(const QString& path, KIO::UDSEntry& entry); + bool createUDSEntry(const TQString& path, KIO::UDSEntry& entry); void createDigikamPropsUDSEntry(KIO::UDSEntry& entry); void buildAlbumList(); - AlbumInfo findAlbum(const QString& url, bool addIfNotExists=true); + AlbumInfo findAlbum(const TQString& url, bool addIfNotExists=true); void delAlbum(int albumID); - void renameAlbum(const QString& oldURL, const QString& newURL); - bool findImage(int albumID, const QString& name) const; - void addImage(int albumID, const QString& filePath); - void delImage(int albumID, const QString& name); - void renameImage(int oldAlbumID, const QString& oldName, - int newAlbumID, const QString& newName); - void copyImage(int srcAlbumID, const QString& srcName, - int dstAlbumID, const QString& dstName); - - void scanAlbum(const QString& url); - void scanOneAlbum(const QString& url); + void renameAlbum(const TQString& oldURL, const TQString& newURL); + bool findImage(int albumID, const TQString& name) const; + void addImage(int albumID, const TQString& filePath); + void delImage(int albumID, const TQString& name); + void renameImage(int oldAlbumID, const TQString& oldName, + int newAlbumID, const TQString& newName); + void copyImage(int srcAlbumID, const TQString& srcName, + int dstAlbumID, const TQString& dstName); + + void scanAlbum(const TQString& url); + void scanOneAlbum(const TQString& url); void removeInvalidAlbums(); private: SqliteDB m_sqlDB; - QString m_libraryPath; - QValueList<AlbumInfo> m_albumList; + TQString m_libraryPath; + TQValueList<AlbumInfo> m_albumList; }; diff --git a/digikam/kioslave/digikamdates.cpp b/digikam/kioslave/digikamdates.cpp index 85cf672..67b1bdc 100644 --- a/digikam/kioslave/digikamdates.cpp +++ b/digikam/kioslave/digikamdates.cpp @@ -39,12 +39,12 @@ extern "C" #include <cstdio> #include <ctime> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qdatastream.h> -#include <qregexp.h> -#include <qbuffer.h> +#include <tqfile.h> +#include <tqdatastream.h> +#include <tqregexp.h> +#include <tqbuffer.h> // KDE includes. @@ -60,8 +60,8 @@ extern "C" #include "digikam_export.h" #include "digikamdates.h" -kio_digikamdates::kio_digikamdates(const QCString &pool_socket, - const QCString &app_socket) +kio_digikamdates::kio_digikamdates(const TQCString &pool_socket, + const TQCString &app_socket) : SlaveBase("kio_digikamdates", pool_socket, app_socket) { } @@ -70,30 +70,30 @@ kio_digikamdates::~kio_digikamdates() { } -static QValueList<QRegExp> makeFilterList( const QString &filter ) +static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) { - QValueList<QRegExp> regExps; + TQValueList<TQRegExp> regExps; if ( filter.isEmpty() ) return regExps; - QChar sep( ';' ); - int i = filter.find( sep, 0 ); - if ( i == -1 && filter.find( ' ', 0 ) != -1 ) - sep = QChar( ' ' ); + TQChar sep( ';' ); + int i = filter.tqfind( sep, 0 ); + if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + sep = TQChar( ' ' ); - QStringList list = QStringList::split( sep, filter ); - QStringList::Iterator it = list.begin(); + TQStringList list = TQStringList::split( sep, filter ); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - regExps << QRegExp( (*it).stripWhiteSpace(), false, true ); + regExps << TQRegExp( (*it).stripWhiteSpace(), false, true ); ++it; } return regExps; } -static bool matchFilterList( const QValueList<QRegExp>& filters, - const QString &fileName ) +static bool matchFilterList( const TQValueList<TQRegExp>& filters, + const TQString &fileName ) { - QValueList<QRegExp>::ConstIterator rit = filters.begin(); + TQValueList<TQRegExp>::ConstIterator rit = filters.begin(); while ( rit != filters.end() ) { if ( (*rit).exactMatch(fileName) ) return true; @@ -102,19 +102,19 @@ static bool matchFilterList( const QValueList<QRegExp>& filters, return false; } -void kio_digikamdates::special(const QByteArray& data) +void kio_digikamdates::special(const TQByteArray& data) { bool folders = (metaData("folders") == "yes"); - QString libraryPath; + TQString libraryPath; KURL kurl; - QString url; - QString filter; + TQString url; + TQString filter; int getDimensions; int recurseAlbums; int recurseTags; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); ds >> libraryPath; ds >> kurl; ds >> filter; @@ -124,7 +124,7 @@ void kio_digikamdates::special(const QByteArray& data) url = kurl.path(); - QValueList<QRegExp> regex = makeFilterList(filter); + TQValueList<TQRegExp> regex = makeFilterList(filter); if (m_libraryPath != libraryPath) { @@ -133,18 +133,18 @@ void kio_digikamdates::special(const QByteArray& data) m_db.openDB(libraryPath); } - QByteArray ba; + TQByteArray ba; if (folders) // Special mode to stats all dates from collection { - QMap<QDateTime, int> datesStatMap; - QStringList values; - QString name, dateStr; - QDateTime dateTime; + TQMap<TQDateTime, int> datesStatMap; + TQStringList values; + TQString name, dateStr; + TQDateTime dateTime; m_db.execSql( "SELECT name, datetime FROM Images;", &values ); - for ( QStringList::iterator it = values.begin(); it != values.end(); ) + for ( TQStringList::iterator it = values.begin(); it != values.end(); ) { name = *it; ++it; @@ -154,66 +154,66 @@ void kio_digikamdates::special(const QByteArray& data) if ( !matchFilterList( regex, name ) ) continue; - dateTime = QDateTime::fromString( dateStr, Qt::ISODate ); + dateTime = TQDateTime::fromString( dateStr, Qt::ISODate ); if ( !dateTime.isValid() ) continue; - QMap<QDateTime, int>::iterator it2 = datesStatMap.find(dateTime); + TQMap<TQDateTime, int>::iterator it2 = datesStatMap.tqfind(dateTime); if ( it2 == datesStatMap.end() ) { datesStatMap.insert( dateTime, 1 ); } else { - datesStatMap.replace( dateTime, it2.data() + 1 ); + datesStatMap.tqreplace( dateTime, it2.data() + 1 ); } } - QDataStream os(ba, IO_WriteOnly); + TQDataStream os(ba, IO_WriteOnly); os << datesStatMap; } else { - QStringList subpaths = QStringList::split("/", url, false); + TQStringList subpaths = TQStringList::split("/", url, false); if (subpaths.count() == 4) { - int yrStart = QString(subpaths[0]).toInt(); - int moStart = QString(subpaths[1]).toInt(); - int yrEnd = QString(subpaths[2]).toInt(); - int moEnd = QString(subpaths[3]).toInt(); + int yrStart = TQString(subpaths[0]).toInt(); + int moStart = TQString(subpaths[1]).toInt(); + int yrEnd = TQString(subpaths[2]).toInt(); + int moEnd = TQString(subpaths[3]).toInt(); - QString moStartStr, moEndStr; + TQString moStartStr, moEndStr; moStartStr.sprintf("%.2d", moStart); moEndStr.sprintf("%.2d", moEnd); - QStringList values; + TQStringList values; - m_db.execSql(QString("SELECT Images.id, Images.name, Images.dirid, \n " + m_db.execSql(TQString("SELECT Images.id, Images.name, Images.dirid, \n " " Images.datetime, Albums.url \n " "FROM Images, Albums \n " "WHERE Images.datetime < '%1-%2-01' \n " "AND Images.datetime >= '%3-%4-01' \n " "AND Albums.id=Images.dirid \n " "ORDER BY Albums.id;") - .arg(yrEnd, 4) - .arg(moEndStr, 2) - .arg(yrStart, 4) - .arg(moStartStr, 2), + .tqarg(yrEnd, 4) + .tqarg(moEndStr, 2) + .tqarg(yrStart, 4) + .tqarg(moStartStr, 2), &values, false); - Q_LLONG imageid; - QString name; - QString path; + TQ_LLONG imageid; + TQString name; + TQString path; int dirid; - QString date; - QString purl; - QSize dims; + TQString date; + TQString purl; + TQSize dims; struct stat stbuf; int count = 0; - QDataStream* os = new QDataStream(ba, IO_WriteOnly); + TQDataStream* os = new TQDataStream(ba, IO_WriteOnly); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { imageid = (*it).toLongLong(); ++it; @@ -230,10 +230,10 @@ void kio_digikamdates::special(const QByteArray& data) continue; path = m_libraryPath + purl + '/' + name; - if (::stat(QFile::encodeName(path), &stbuf) != 0) + if (::stat(TQFile::encodeName(path), &stbuf) != 0) continue; - dims = QSize(); + dims = TQSize(); if (getDimensions) { KFileMetaInfo metaInfo(path); @@ -275,7 +275,7 @@ void kio_digikamdates::special(const QByteArray& data) ba.resize(0); count = 0; - os = new QDataStream(ba, IO_WriteOnly); + os = new TQDataStream(ba, IO_WriteOnly); } } diff --git a/digikam/kioslave/digikamdates.h b/digikam/kioslave/digikamdates.h index 3196b0a..7cb147e 100644 --- a/digikam/kioslave/digikamdates.h +++ b/digikam/kioslave/digikamdates.h @@ -32,23 +32,23 @@ #include "sqlitedb.h" -class QStringList; +class TQStringList; class kio_digikamdates : public KIO::SlaveBase { public: - kio_digikamdates(const QCString &pool_socket, - const QCString &app_socket); + kio_digikamdates(const TQCString &pool_socket, + const TQCString &app_socket); ~kio_digikamdates(); - void special(const QByteArray& data); + void special(const TQByteArray& data); private: SqliteDB m_db; - QString m_libraryPath; + TQString m_libraryPath; }; #endif /* DIGIKAMDATES_H */ diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index b6eee9f..d45db62 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -40,15 +40,15 @@ extern "C" #include <cstdio> #include <ctime> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qdatastream.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qdir.h> -#include <qvariant.h> -#include <qmap.h> +#include <tqfile.h> +#include <tqdatastream.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqdir.h> +#include <tqvariant.h> +#include <tqmap.h> // KDE includes. @@ -68,8 +68,8 @@ extern "C" #include "digikam_export.h" #include "digikamsearch.h" -kio_digikamsearch::kio_digikamsearch(const QCString &pool_socket, - const QCString &app_socket) +kio_digikamsearch::kio_digikamsearch(const TQCString &pool_socket, + const TQCString &app_socket) : SlaveBase("kio_digikamsearch", pool_socket, app_socket) { // build a lookup table for month names @@ -85,31 +85,31 @@ kio_digikamsearch::~kio_digikamsearch() { } -static QValueList<QRegExp> makeFilterList( const QString &filter ) +static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) { - QValueList<QRegExp> regExps; + TQValueList<TQRegExp> regExps; if ( filter.isEmpty() ) return regExps; - QChar sep( ';' ); - int i = filter.find( sep, 0 ); - if ( i == -1 && filter.find( ' ', 0 ) != -1 ) - sep = QChar( ' ' ); + TQChar sep( ';' ); + int i = filter.tqfind( sep, 0 ); + if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + sep = TQChar( ' ' ); - QStringList list = QStringList::split( sep, filter ); - QStringList::Iterator it = list.begin(); + TQStringList list = TQStringList::split( sep, filter ); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - regExps << QRegExp( (*it).stripWhiteSpace(), false, true ); + regExps << TQRegExp( (*it).stripWhiteSpace(), false, true ); ++it; } return regExps; } -static bool matchFilterList( const QValueList<QRegExp>& filters, - const QString &fileName ) +static bool matchFilterList( const TQValueList<TQRegExp>& filters, + const TQString &fileName ) { - QValueList<QRegExp>::ConstIterator rit = filters.begin(); + TQValueList<TQRegExp>::ConstIterator rit = filters.begin(); while ( rit != filters.end() ) { if ( (*rit).exactMatch(fileName) ) @@ -119,17 +119,17 @@ static bool matchFilterList( const QValueList<QRegExp>& filters, return false; } -void kio_digikamsearch::special(const QByteArray& data) +void kio_digikamsearch::special(const TQByteArray& data) { - QString libraryPath; + TQString libraryPath; KURL url; - QString filter; + TQString filter; int getDimensions; int listingType = 0; int recurseAlbums; int recurseTags; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); ds >> libraryPath; ds >> url; ds >> filter; @@ -147,12 +147,12 @@ void kio_digikamsearch::special(const QByteArray& data) m_db.openDB(libraryPath); } - QValueList<QRegExp> regex = makeFilterList(filter); - QByteArray ba; + TQValueList<TQRegExp> regex = makeFilterList(filter); + TQByteArray ba; if (listingType == 0) { - QString sqlQuery; + TQString sqlQuery; // query head sqlQuery = "SELECT Images.id, Images.name, Images.dirid, Images.datetime, Albums.url " @@ -166,27 +166,27 @@ void kio_digikamsearch::special(const QByteArray& data) sqlQuery += " ) "; sqlQuery += " AND (Albums.id=Images.dirid); "; - QStringList values; - QString errMsg; + TQStringList values; + TQString errMsg; if (!m_db.execSql(sqlQuery, &values)) { error(KIO::ERR_INTERNAL, errMsg); return; } - Q_LLONG imageid; - QString name; - QString path; + TQ_LLONG imageid; + TQString name; + TQString path; int dirid; - QString date; - QString purl; - QSize dims; + TQString date; + TQString purl; + TQSize dims; struct stat stbuf; int count = 0; - QDataStream* os = new QDataStream(ba, IO_WriteOnly); + TQDataStream* os = new TQDataStream(ba, IO_WriteOnly); - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { imageid = (*it).toLongLong(); ++it; @@ -203,10 +203,10 @@ void kio_digikamsearch::special(const QByteArray& data) continue; path = m_libraryPath + purl + '/' + name; - if (::stat(QFile::encodeName(path), &stbuf) != 0) + if (::stat(TQFile::encodeName(path), &stbuf) != 0) continue; - dims = QSize(); + dims = TQSize(); if (getDimensions) { KFileMetaInfo metaInfo(path); @@ -248,7 +248,7 @@ void kio_digikamsearch::special(const QByteArray& data) ba.resize(0); count = 0; - os = new QDataStream(ba, IO_WriteOnly); + os = new TQDataStream(ba, IO_WriteOnly); } } @@ -256,7 +256,7 @@ void kio_digikamsearch::special(const QByteArray& data) } else { - QString sqlQuery; + TQString sqlQuery; // query head sqlQuery = "SELECT Albums.url||'/'||Images.name " @@ -271,16 +271,16 @@ void kio_digikamsearch::special(const QByteArray& data) sqlQuery += " AND (Albums.id=Images.dirid) "; sqlQuery += " LIMIT 500;"; - QStringList values; - QString errMsg; + TQStringList values; + TQString errMsg; if (!m_db.execSql(sqlQuery, &values, &errMsg)) { error(KIO::ERR_INTERNAL, errMsg); return; } - QDataStream ds(ba, IO_WriteOnly); - for (QStringList::iterator it = values.begin(); it != values.end(); ++it) + TQDataStream ds(ba, IO_WriteOnly); + for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { if (matchFilterList(regex, *it)) { @@ -294,20 +294,20 @@ void kio_digikamsearch::special(const QByteArray& data) finished(); } -QString kio_digikamsearch::buildQuery(const KURL& url) const +TQString kio_digikamsearch::buildQuery(const KURL& url) const { int count = url.queryItem("count").toInt(); if (count <= 0) - return QString(); + return TQString(); - QMap<int, RuleType> rulesMap; + TQMap<int, RuleType> rulesMap; for (int i=1; i<=count; i++) { RuleType rule; - QString key = url.queryItem(QString::number(i) + ".key").lower(); - QString op = url.queryItem(QString::number(i) + ".op").lower(); + TQString key = url.queryItem(TQString::number(i) + ".key").lower(); + TQString op = url.queryItem(TQString::number(i) + ".op").lower(); if (key == "album") { @@ -383,15 +383,15 @@ QString kio_digikamsearch::buildQuery(const KURL& url) const continue; } - rule.val = url.queryItem(QString::number(i) + ".val"); + rule.val = url.queryItem(TQString::number(i) + ".val"); rulesMap.insert(i, rule); } - QString sqlQuery; + TQString sqlQuery; - QStringList strList = QStringList::split(" ", url.path()); - for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) + TQStringList strList = TQStringList::split(" ", url.path()); + for ( TQStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { bool ok; int num = (*it).toInt(&ok); @@ -401,7 +401,7 @@ QString kio_digikamsearch::buildQuery(const KURL& url) const if (rule.key == KEYWORD) { bool exact; - QString possDate = possibleDate(rule.val, exact); + TQString possDate = possibleDate(rule.val, exact); if (!possDate.isEmpty()) { rule.key = IMAGEDATE; @@ -419,7 +419,7 @@ QString kio_digikamsearch::buildQuery(const KURL& url) const } else { - QValueList<SKey> todo; + TQValueList<SKey> todo; todo.append( ALBUMNAME ); todo.append( IMAGENAME ); todo.append( TAGNAME ); @@ -429,7 +429,7 @@ QString kio_digikamsearch::buildQuery(const KURL& url) const todo.append( RATING ); sqlQuery += '('; - QValueListIterator<SKey> it; + TQValueListIterator<SKey> it; it = todo.begin(); while ( it != todo.end() ) { @@ -455,11 +455,11 @@ QString kio_digikamsearch::buildQuery(const KURL& url) const return sqlQuery; } -QString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, +TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, enum kio_digikamsearch::SOperator op, - const QString& val) const + const TQString& val) const { - QString query; + TQString query; switch (key) { @@ -471,8 +471,8 @@ QString 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("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(ALBUMNAME): @@ -516,8 +516,8 @@ QString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // " (SELECT imageid FROM ImageTags " // " WHERE tagid $$##$$ $$@@$$)) "; - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } @@ -544,8 +544,8 @@ QString 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("$$@@$$", QString::fromLatin1("'") + escapeString(val) -// + QString::fromLatin1("'")); +// query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) +// + TQString::tqfromLatin1("'")); break; } @@ -595,58 +595,58 @@ QString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, { case(EQ): { - query.replace("$$##$$", "="); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", "="); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(NE): { - query.replace("$$##$$", "<>"); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", "<>"); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(LT): { - query.replace("$$##$$", "<"); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", "<"); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(GT): { - query.replace("$$##$$", ">"); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", ">"); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(LTE): { - query.replace("$$##$$", "<="); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", "<="); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(GTE): { - query.replace("$$##$$", ">="); - query.replace("$$@@$$", QString::fromLatin1("'") + escapeString(val) - + QString::fromLatin1("'")); + query.tqreplace("$$##$$", ">="); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + + TQString::tqfromLatin1("'")); break; } case(LIKE): { - query.replace("$$##$$", "LIKE"); - query.replace("$$@@$$", QString::fromLatin1("'%") + escapeString(val) - + QString::fromLatin1("%'")); + query.tqreplace("$$##$$", "LIKE"); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + + TQString::tqfromLatin1("%'")); break; } case(NLIKE): { - query.replace("$$##$$", "NOT LIKE"); - query.replace("$$@@$$", QString::fromLatin1("'%") + escapeString(val) - + QString::fromLatin1("%'")); + query.tqreplace("$$##$$", "NOT LIKE"); + query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + + TQString::tqfromLatin1("%'")); break; } } @@ -656,13 +656,13 @@ QString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // we need to split it into two rules if (key == IMAGEDATE && op == EQ) { - QDate date = QDate::fromString(val, Qt::ISODate); + TQDate date = TQDate::fromString(val, Qt::ISODate); if (!date.isValid()) return query; - query = QString(" (Images.datetime > '%1' AND Images.datetime < '%2') ") - .arg(date.addDays(-1).toString(Qt::ISODate)) - .arg(date.addDays( 1).toString(Qt::ISODate)); + query = TQString(" (Images.datetime > '%1' AND Images.datetime < '%2') ") + .tqarg(date.addDays(-1).toString(Qt::ISODate)) + .tqarg(date.addDays( 1).toString(Qt::ISODate)); } return query; @@ -692,9 +692,9 @@ extern "C" } } -QString kio_digikamsearch::possibleDate(const QString& str, bool& exact) const +TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const { - QDate date = QDate::fromString(str, Qt::ISODate); + TQDate date = TQDate::fromString(str, Qt::ISODate); if (date.isValid()) { exact = true; @@ -708,10 +708,10 @@ QString kio_digikamsearch::possibleDate(const QString& str, bool& exact) const if (ok) { // ok. its an int, does it look like a year? - if (1970 <= num && num <= QDate::currentDate().year()) + if (1970 <= num && num <= TQDate::tqcurrentDate().year()) { // very sure its a year - return QString("%1-%-%").arg(num); + return TQString("%1-%-%").tqarg(num); } } else @@ -722,7 +722,7 @@ QString kio_digikamsearch::possibleDate(const QString& str, bool& exact) const if (str.lower() == m_shortMonths[i-1] || str.lower() == m_longMonths[i-1]) { - QString monGlob; + TQString monGlob; monGlob.sprintf("%.2d", i); monGlob = "%-" + monGlob + "-%"; return monGlob; @@ -730,5 +730,5 @@ QString kio_digikamsearch::possibleDate(const QString& str, bool& exact) const } } - return QString(); + return TQString(); } diff --git a/digikam/kioslave/digikamsearch.h b/digikam/kioslave/digikamsearch.h index e5b0e6c..67939fc 100644 --- a/digikam/kioslave/digikamsearch.h +++ b/digikam/kioslave/digikamsearch.h @@ -31,7 +31,7 @@ #include "sqlitedb.h" -class QStringList; +class TQStringList; class kio_digikamsearch : public KIO::SlaveBase { @@ -67,18 +67,18 @@ public: public: - kio_digikamsearch(const QCString &pool_socket, const QCString &app_socket); + kio_digikamsearch(const TQCString &pool_socket, const TQCString &app_socket); ~kio_digikamsearch(); - void special(const QByteArray& data); + void special(const TQByteArray& data); private: - QString buildQuery(const KURL& url) const; + TQString buildQuery(const KURL& url) const; - QString subQuery(enum SKey key, enum SOperator op, const QString& val) const; + TQString subQuery(enum SKey key, enum SOperator op, const TQString& val) const; - QString possibleDate(const QString& str, bool& exact) const; + TQString possibleDate(const TQString& str, bool& exact) const; private: @@ -88,13 +88,13 @@ private: SKey key; SOperator op; - QString val; + TQString val; }; SqliteDB m_db; - QString m_libraryPath; - QString m_longMonths[12]; - QString m_shortMonths[12]; + TQString m_libraryPath; + TQString m_longMonths[12]; + TQString m_shortMonths[12]; }; #endif /* DIGIKAMSEARCH_H */ diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp index c67e3f3..4d530e0 100644 --- a/digikam/kioslave/digikamtags.cpp +++ b/digikam/kioslave/digikamtags.cpp @@ -38,13 +38,13 @@ extern "C" #include <cstdio> #include <ctime> -// Qt incudes. +// TQt incudes. -#include <qfile.h> -#include <qfileinfo.h> -#include <qstring.h> -#include <qdir.h> -#include <qregexp.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqregexp.h> // KDE includes. @@ -62,8 +62,8 @@ extern "C" #include "digikam_export.h" #include "digikamtags.h" -kio_digikamtagsProtocol::kio_digikamtagsProtocol(const QCString &pool_socket, - const QCString &app_socket) +kio_digikamtagsProtocol::kio_digikamtagsProtocol(const TQCString &pool_socket, + const TQCString &app_socket) : SlaveBase("kio_digikamtags", pool_socket, app_socket) { } @@ -72,30 +72,30 @@ kio_digikamtagsProtocol::~kio_digikamtagsProtocol() { } -static QValueList<QRegExp> makeFilterList( const QString &filter ) +static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) { - QValueList<QRegExp> regExps; + TQValueList<TQRegExp> regExps; if ( filter.isEmpty() ) return regExps; - QChar sep( ';' ); - int i = filter.find( sep, 0 ); - if ( i == -1 && filter.find( ' ', 0 ) != -1 ) - sep = QChar( ' ' ); + TQChar sep( ';' ); + int i = filter.tqfind( sep, 0 ); + if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + sep = TQChar( ' ' ); - QStringList list = QStringList::split( sep, filter ); - QStringList::Iterator it = list.begin(); + TQStringList list = TQStringList::split( sep, filter ); + TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - regExps << QRegExp( (*it).stripWhiteSpace(), false, true ); + regExps << TQRegExp( (*it).stripWhiteSpace(), false, true ); ++it; } return regExps; } -static bool matchFilterList( const QValueList<QRegExp>& filters, - const QString &fileName ) +static bool matchFilterList( const TQValueList<TQRegExp>& filters, + const TQString &fileName ) { - QValueList<QRegExp>::ConstIterator rit = filters.begin(); + TQValueList<TQRegExp>::ConstIterator rit = filters.begin(); while ( rit != filters.end() ) { if ( (*rit).exactMatch(fileName) ) return true; @@ -104,20 +104,20 @@ static bool matchFilterList( const QValueList<QRegExp>& filters, return false; } -void kio_digikamtagsProtocol::special(const QByteArray& data) +void kio_digikamtagsProtocol::special(const TQByteArray& data) { bool folders = (metaData("folders") == "yes"); - QString libraryPath; + TQString libraryPath; KURL kurl; - QString url; - QString filter; + TQString url; + TQString filter; int getDimensions; int tagID; int recurseAlbums; int recurseTags; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); ds >> libraryPath; ds >> kurl; ds >> filter; @@ -127,7 +127,7 @@ void kio_digikamtagsProtocol::special(const QByteArray& data) url = kurl.path(); - QValueList<QRegExp> regex = makeFilterList(filter); + TQValueList<TQRegExp> regex = makeFilterList(filter); if (m_libraryPath != libraryPath) { @@ -136,58 +136,58 @@ void kio_digikamtagsProtocol::special(const QByteArray& data) m_db.openDB(libraryPath); } - QByteArray ba; + TQByteArray ba; if (folders) // Special mode to stats all tag items { - QMap<int, int> tagsStatMap; + TQMap<int, int> tagsStatMap; int tagID, imageID; - QStringList values, allTagIDs; + TQStringList values, allTagIDs; // initialize allTagIDs with all existing tags from db to prevent // wrong tag counters - m_db.execSql(QString("SELECT id from Tags"), &allTagIDs); + m_db.execSql(TQString("SELECT id from Tags"), &allTagIDs); - for ( QStringList::iterator it = allTagIDs.begin(); it != allTagIDs.end(); ++it) + for ( TQStringList::iterator it = allTagIDs.begin(); it != allTagIDs.end(); ++it) { tagID = (*it).toInt(); tagsStatMap.insert(tagID, 0); } // now we can count the tags assigned to images - m_db.execSql(QString("SELECT ImageTags.tagid, Images.name FROM ImageTags, Images " + m_db.execSql(TQString("SELECT ImageTags.tagid, Images.name FROM ImageTags, Images " "WHERE ImageTags.imageid=Images.id"), &values); - for ( QStringList::iterator it = values.begin(); it != values.end(); ) + for ( TQStringList::iterator it = values.begin(); it != values.end(); ) { tagID = (*it).toInt(); ++it; if ( matchFilterList( regex, *it ) ) { - QMap<int, int>::iterator it2 = tagsStatMap.find(tagID); + TQMap<int, int>::iterator it2 = tagsStatMap.tqfind(tagID); if ( it2 == tagsStatMap.end() ) tagsStatMap.insert(tagID, 1); else - tagsStatMap.replace(tagID, it2.data() + 1); + tagsStatMap.tqreplace(tagID, it2.data() + 1); } ++it; } - QDataStream os(ba, IO_WriteOnly); + TQDataStream os(ba, IO_WriteOnly); os << tagsStatMap; } else { - tagID = QStringList::split('/',url).last().toInt(); + tagID = TQStringList::split('/',url).last().toInt(); - QStringList values; + TQStringList values; if (recurseTags) { - // Obtain all images with the given tag, or with this tag as a parent. - m_db.execSql( QString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n " + // Obtain all images with the given tag, or with this tag as a tqparent. + m_db.execSql( TQString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n " " Images.datetime, Albums.url \n " " FROM Images, Albums \n " " WHERE Images.id IN \n " @@ -195,35 +195,35 @@ void kio_digikamtagsProtocol::special(const QByteArray& data) " WHERE tagid=%1 \n " " OR tagid IN (SELECT id FROM TagsTree WHERE pid=%2)) \n " " AND Albums.id=Images.dirid \n " ) - .arg(tagID) - .arg(tagID), &values ); + .tqarg(tagID) + .tqarg(tagID), &values ); } else { // Obtain all images with the given tag - m_db.execSql( QString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n " + m_db.execSql( TQString( "SELECT DISTINCT Images.id, Images.name, Images.dirid, \n " " Images.datetime, Albums.url \n " " FROM Images, Albums \n " " WHERE Images.id IN \n " " (SELECT imageid FROM ImageTags \n " " WHERE tagid=%1) \n " " AND Albums.id=Images.dirid \n " ) - .arg(tagID), &values ); + .tqarg(tagID), &values ); } - Q_LLONG imageid; - QString name; - QString path; + TQ_LLONG imageid; + TQString name; + TQString path; int dirid; - QString date; - QString purl; - QSize dims; + TQString date; + TQString purl; + TQSize dims; int count = 0; - QDataStream* os = new QDataStream(ba, IO_WriteOnly); + TQDataStream* os = new TQDataStream(ba, IO_WriteOnly); struct stat stbuf; - for (QStringList::iterator it = values.begin(); it != values.end();) + for (TQStringList::iterator it = values.begin(); it != values.end();) { imageid = (*it).toLongLong(); ++it; @@ -240,10 +240,10 @@ void kio_digikamtagsProtocol::special(const QByteArray& data) continue; path = m_libraryPath + purl + '/' + name; - if (::stat(QFile::encodeName(path), &stbuf) != 0) + if (::stat(TQFile::encodeName(path), &stbuf) != 0) continue; - dims = QSize(); + dims = TQSize(); if (getDimensions) { KFileMetaInfo metaInfo(path); @@ -285,7 +285,7 @@ void kio_digikamtagsProtocol::special(const QByteArray& data) ba.resize(0); count = 0; - os = new QDataStream(ba, IO_WriteOnly); + os = new TQDataStream(ba, IO_WriteOnly); } } diff --git a/digikam/kioslave/digikamtags.h b/digikam/kioslave/digikamtags.h index 4ac6a89..b76035e 100644 --- a/digikam/kioslave/digikamtags.h +++ b/digikam/kioslave/digikamtags.h @@ -25,9 +25,9 @@ #ifndef DIGIKAMTAGS_H #define DIGIKAMTAGS_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -38,22 +38,22 @@ #include "sqlitedb.h" class KURL; -class QCString; +class TQCString; class kio_digikamtagsProtocol : public KIO::SlaveBase { public: - kio_digikamtagsProtocol(const QCString &pool_socket, - const QCString &app_socket); + kio_digikamtagsProtocol(const TQCString &pool_socket, + const TQCString &app_socket); virtual ~kio_digikamtagsProtocol(); - void special(const QByteArray& data); + void special(const TQByteArray& data); private: SqliteDB m_db; - QString m_libraryPath; + TQString m_libraryPath; }; diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index 805e64d..04f58dc 100644 --- a/digikam/kioslave/digikamthumbnail.cpp +++ b/digikam/kioslave/digikamthumbnail.cpp @@ -34,18 +34,18 @@ #include <cstdio> #include <cstring> -// Qt includes. - -#include <qcstring.h> -#include <qstring.h> -#include <qimage.h> -#include <qdatastream.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qwmatrix.h> -#include <qregexp.h> -#include <qapplication.h> +// TQt includes. + +#include <tqcstring.h> +#include <tqstring.h> +#include <tqimage.h> +#include <tqdatastream.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqwmatrix.h> +#include <tqregexp.h> +#include <tqapplication.h> // KDE includes. @@ -105,7 +105,7 @@ kio_digikamthumbnailProtocol::kio_digikamthumbnailProtocol(int argc, char** argv argc_ = argc; argv_ = argv; app_ = 0; - digiKamFingerPrint = QString("Digikam Thumbnail Generator"); + digiKamFingerPrint = TQString("Digikam Thumbnail Generator"); createThumbnailDirs(); } @@ -128,17 +128,17 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) } // generate the thumbnail path - QString uri = KURL(url.path()).url(); // "file://" uri - KMD5 md5( QFile::encodeName(uri) ); - QString thumbPath = (cachedSize_ == 128) ? smallThumbPath_ : bigThumbPath_; - thumbPath += QFile::encodeName( md5.hexDigest() ) + ".png"; + TQString uri = KURL(url.path()).url(); // "file://" uri + KMD5 md5( TQFile::encodeName(uri).data() ); + TQString thumbPath = (cachedSize_ == 128) ? smallThumbPath_ : bigThumbPath_; + thumbPath += TQFile::encodeName( md5.hexDigest() + ".png" ).data(); - QImage img; + TQImage img; bool regenerate = true; // stat the original file struct stat st; - if (::stat(QFile::encodeName(url.path(-1)), &st) != 0) + if (::stat(TQFile::encodeName(url.path(-1)), &st) != 0) { error(KIO::ERR_INTERNAL, i18n("File does not exist")); return; @@ -150,7 +150,7 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) img = loadPNG(thumbPath); if (!img.isNull()) { - if (img.text("Thumb::MTime") == QString::number(st.st_mtime) && + if (img.text("Thumb::MTime") == TQString::number(st.st_mtime) && img.text("Software") == digiKamFingerPrint) regenerate = false; } @@ -179,13 +179,13 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (img.isNull()) { error(KIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); kdWarning() << "Cannot create thumbnail for " << url.path() << endl; return; } - if (QMAX(img.width(),img.height()) != cachedSize_) - img = img.smoothScale(cachedSize_, cachedSize_, QImage::ScaleMin); + if (TQMAX(img.width(),img.height()) != cachedSize_) + img = img.smoothScale(cachedSize_, cachedSize_, TQ_ScaleMin); if (img.depth() != 32) img = img.convertDepth(32); @@ -193,20 +193,20 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) if (exif) exifRotate(url.path(), img); - img.setText(QString("Thumb::URI").latin1(), 0, uri); - img.setText(QString("Thumb::MTime").latin1(), 0, QString::number(st.st_mtime)); - img.setText(QString("Software").latin1(), 0, digiKamFingerPrint); + img.setText(TQString("Thumb::URI").latin1(), 0, uri); + img.setText(TQString("Thumb::MTime").latin1(), 0, TQString::number(st.st_mtime)); + img.setText(TQString("Software").latin1(), 0, digiKamFingerPrint); KTempFile temp(thumbPath + "-digikam-", ".png"); if (temp.status() == 0) { img.save(temp.name(), "PNG", 0); - ::rename(QFile::encodeName(temp.name()), - QFile::encodeName(thumbPath)); + ::rename(TQFile::encodeName(temp.name()), + TQFile::encodeName(thumbPath)); } } - img = img.smoothScale(size, size, QImage::ScaleMin); + img = img.smoothScale(size, size, TQ_ScaleMin); if (img.isNull()) { @@ -214,10 +214,10 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) return; } - QByteArray imgData; - QDataStream stream( imgData, IO_WriteOnly ); + TQByteArray imgData; + TQDataStream stream( imgData, IO_WriteOnly ); - const QString shmid = metaData("shmid"); + const TQString shmid = metaData("shmid"); if (shmid.isEmpty()) { stream << img; @@ -250,9 +250,9 @@ void kio_digikamthumbnailProtocol::get(const KURL& url) finished(); } -bool kio_digikamthumbnailProtocol::loadByExtension(QImage& image, const QString& path) +bool kio_digikamthumbnailProtocol::loadByExtension(TQImage& image, const TQString& path) { - QFileInfo fileInfo(path); + TQFileInfo fileInfo(path); if (!fileInfo.exists()) return false; @@ -266,34 +266,34 @@ bool kio_digikamthumbnailProtocol::loadByExtension(QImage& image, const QString& } // Else, use the right way depending of image file extension. - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif if (!ext.isEmpty()) { - if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE")) + if (ext == TQString("JPEG") || ext == TQString("JPG") || ext == TQString("JPE")) return (loadJPEG(image, path)); - else if (ext == QString("PNG")) + else if (ext == TQString("PNG")) return (loadDImg(image, path)); - else if (ext == QString("TIFF") || ext == QString("TIF")) + else if (ext == TQString("TIFF") || ext == TQString("TIF")) return (loadDImg(image, path)); - else if (rawFilesExt.upper().contains(ext)) + else if (rawFilesExt.upper().tqcontains(ext)) return (KDcrawIface::KDcraw::loadDcrawPreview(image, path)); } return false; } -bool kio_digikamthumbnailProtocol::loadJPEG(QImage& image, const QString& path) +bool kio_digikamthumbnailProtocol::loadJPEG(TQImage& image, const TQString& path) { return Digikam::loadJPEGScaled(image, path, cachedSize_); } -void kio_digikamthumbnailProtocol::exifRotate(const QString& filePath, QImage& thumb) +void kio_digikamthumbnailProtocol::exifRotate(const TQString& filePath, TQImage& thumb) { // Rotate thumbnail based on metadata orientation information @@ -304,7 +304,7 @@ void kio_digikamthumbnailProtocol::exifRotate(const QString& filePath, QImage& t orientation == DMetadata::ORIENTATION_UNSPECIFIED) return; - QWMatrix matrix; + TQWMatrix matrix; switch (orientation) { @@ -347,7 +347,7 @@ void kio_digikamthumbnailProtocol::exifRotate(const QString& filePath, QImage& t thumb = thumb.xForm(matrix); } -QImage kio_digikamthumbnailProtocol::loadPNG(const QString& path) +TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path) { png_uint_32 w32, h32; int w, h; @@ -361,7 +361,7 @@ QImage kio_digikamthumbnailProtocol::loadPNG(const QString& path) has_alpha = 0; has_grey = 0; - QImage qimage; + TQImage qimage; f = fopen(path.latin1(), "rb"); if (!f) @@ -431,7 +431,7 @@ QImage kio_digikamthumbnailProtocol::loadPNG(const QString& path) if (has_alpha) png_set_expand(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) + if (TQImage::systemByteOrder() == TQImage::LittleEndian) { png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); png_set_bgr(png_ptr); @@ -493,7 +493,7 @@ QImage kio_digikamthumbnailProtocol::loadPNG(const QString& path) // -- Load using DImg --------------------------------------------------------------------- -bool kio_digikamthumbnailProtocol::loadDImg(QImage& image, const QString& path) +bool kio_digikamthumbnailProtocol::loadDImg(TQImage& image, const TQString& path) { Digikam::DImg dimg_im; @@ -505,14 +505,14 @@ bool kio_digikamthumbnailProtocol::loadDImg(QImage& image, const QString& path) return false; } - image = dimg_im.copyQImage(); + image = dimg_im.copyTQImage(); org_width_ = image.width(); org_height_ = image.height(); - if ( QMAX(org_width_, org_height_) != cachedSize_ ) + if ( TQMAX(org_width_, org_height_) != cachedSize_ ) { - QSize sz(dimg_im.width(), dimg_im.height()); - sz.scale(cachedSize_, cachedSize_, QSize::ScaleMin); + TQSize sz(dimg_im.width(), dimg_im.height()); + sz.tqscale(cachedSize_, cachedSize_, TQSize::ScaleMin); image.scale(sz.width(), sz.height()); } @@ -526,30 +526,30 @@ bool kio_digikamthumbnailProtocol::loadDImg(QImage& image, const QString& path) // -- Load using KDE API --------------------------------------------------------------------- -bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(QImage& image, const QString& path) +bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const TQString& path) { // this sucks royally. some of the thumbcreators need an instance of // app running so that they can use pixmap. till they get their // code fixed, we will have to create a qapp instance. if (!app_) - app_ = new QApplication(argc_, argv_); + app_ = new TQApplication(argc_, argv_); - QString mimeType = KMimeType::findByURL(path)->name(); + TQString mimeType = KMimeType::findByURL(path)->name(); if (mimeType.isEmpty()) { kdDebug() << "Mimetype not found" << endl; return false; } - QString mimeTypeAlt = mimeType.replace(QRegExp("/.*"), "/*"); + TQString mimeTypeAlt = mimeType.tqreplace(TQRegExp("/.*"), "/*"); - QString plugin; + TQString plugin; KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { - QStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); - for (QStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) + TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); + for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) { if ((*mt) == mimeType || (*mt) == mimeTypeAlt) { @@ -568,7 +568,7 @@ bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(QImage& image, const QStr return false; } - KLibrary *library = KLibLoader::self()->library(QFile::encodeName(plugin)); + KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(plugin)); if (!library) { kdDebug() << "Plugin library not found " << plugin << endl; @@ -599,7 +599,7 @@ bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(QImage& image, const QStr void kio_digikamthumbnailProtocol::createThumbnailDirs() { - QString path = QDir::homeDirPath() + "/.thumbnails/"; + TQString path = TQDir::homeDirPath() + "/.thumbnails/"; smallThumbPath_ = path + "normal/"; bigThumbPath_ = path + "large/"; diff --git a/digikam/kioslave/digikamthumbnail.h b/digikam/kioslave/digikamthumbnail.h index c81f061..8e6ef5a 100644 --- a/digikam/kioslave/digikamthumbnail.h +++ b/digikam/kioslave/digikamthumbnail.h @@ -29,9 +29,9 @@ #include <kio/slavebase.h> -class QString; -class QImage; -class QApplication; +class TQString; +class TQImage; +class TQApplication; class KURL; @@ -46,12 +46,12 @@ public: private: - bool loadByExtension(QImage& image, const QString& path); - bool loadJPEG(QImage& image, const QString& path); - void exifRotate(const QString& filePath, QImage& thumb); - QImage loadPNG(const QString& path); - bool loadDImg(QImage& image, const QString& path); - bool loadKDEThumbCreator(QImage& image, const QString& path); + bool loadByExtension(TQImage& image, const TQString& path); + bool loadJPEG(TQImage& image, const TQString& path); + void exifRotate(const TQString& filePath, TQImage& thumb); + TQImage loadPNG(const TQString& path); + bool loadDImg(TQImage& image, const TQString& path); + bool loadKDEThumbCreator(TQImage& image, const TQString& path); void createThumbnailDirs(); private: @@ -66,11 +66,11 @@ private: int argc_; char **argv_; - QString digiKamFingerPrint; - QString smallThumbPath_; - QString bigThumbPath_; + TQString digiKamFingerPrint; + TQString smallThumbPath_; + TQString bigThumbPath_; - QApplication *app_; + TQApplication *app_; }; #endif // _digikamthumbnail_H_ diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp index 3493736..9a7826c 100644 --- a/digikam/kioslave/sqlitedb.cpp +++ b/digikam/kioslave/sqlitedb.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-06-05 - * Description : QSlite DB interface. + * Description : TQSlite DB interface. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * @@ -25,11 +25,11 @@ #include "config.h" // Needed for NFS_HACK #endif -// Qt includes. +// TQt includes. -#include <qstringlist.h> -#include <qdir.h> -#include <qfile.h> +#include <tqstringlist.h> +#include <tqdir.h> +#include <tqfile.h> // KDE includes. @@ -54,21 +54,21 @@ SqliteDB::~SqliteDB() closeDB(); } -void SqliteDB::openDB(const QString& directory) +void SqliteDB::openDB(const TQString& directory) { if (m_db) { closeDB(); } - QString dbPath = directory + "/digikam3.db"; + TQString dbPath = directory + "/digikam3.db"; #ifdef NFS_HACK - dbPath = QDir::homeDirPath() + "/.kde/share/apps/digikam/" + - KIO::encodeFileName(QDir::cleanDirPath(dbPath)); + dbPath = TQDir::homeDirPath() + "/.kde/share/apps/digikam/" + + KIO::encodeFileName(TQDir::cleanDirPath(dbPath)); #endif - sqlite3_open(QFile::encodeName(dbPath), &m_db); + sqlite3_open(TQFile::encodeName(dbPath), &m_db); if (m_db == 0) { kdWarning() << "Cannot open database: " @@ -86,19 +86,19 @@ void SqliteDB::closeDB() } } -bool SqliteDB::execSql(const QString& sql, QStringList* const values, - QString* errMsg, bool debug ) const +bool SqliteDB::execSql(const TQString& sql, TQStringList* const values, + TQString* errMsg, bool debug ) const { if ( debug ) kdDebug() << "SQL-query: " << sql << endl; if ( !m_db ) { - kdWarning() << k_funcinfo << "SQLite pointer == NULL" + kdWarning() << k_funcinfo << "STQLite pointer == NULL" << endl; if (errMsg) { - *errMsg = QString::fromLatin1("SQLite database not open"); + *errMsg = TQString::tqfromLatin1("STQLite database not open"); } return false; } @@ -118,9 +118,9 @@ bool SqliteDB::execSql(const QString& sql, QStringList* const values, << sql << endl; if (errMsg) { - *errMsg = QString::fromLatin1("sqlite_compile error: ") + - QString::fromLatin1(sqlite3_errmsg(m_db)) + - QString::fromLatin1(" on query: ") + + *errMsg = TQString::tqfromLatin1("sqlite_compile error: ") + + TQString::tqfromLatin1(sqlite3_errmsg(m_db)) + + TQString::tqfromLatin1(" on query: ") + sql; } return false; @@ -138,7 +138,7 @@ bool SqliteDB::execSql(const QString& sql, QStringList* const values, //iterate over columns for ( int i = 0; values && i < cols; i++ ) { - *values << QString::fromUtf8( (const char*)sqlite3_column_text( stmt, i ) ); + *values << TQString::fromUtf8( (const char*)sqlite3_column_text( stmt, i ) ); } } @@ -152,9 +152,9 @@ bool SqliteDB::execSql(const QString& sql, QStringList* const values, << sql << endl; if (errMsg) { - *errMsg = QString::fromLatin1("sqlite_step error: ") + - QString::fromLatin1(sqlite3_errmsg(m_db)) + - QString::fromLatin1(" on query: ") + + *errMsg = TQString::tqfromLatin1("sqlite_step error: ") + + TQString::tqfromLatin1(sqlite3_errmsg(m_db)) + + TQString::tqfromLatin1(" on query: ") + sql; } return false; @@ -163,35 +163,35 @@ bool SqliteDB::execSql(const QString& sql, QStringList* const values, return true; } -void SqliteDB::setSetting( const QString& keyword, const QString& value ) +void SqliteDB::setSetting( const TQString& keyword, const TQString& value ) { - execSql( QString("REPLACE into Settings VALUES ('%1','%2');") - .arg( escapeString(keyword) ) - .arg( escapeString(value) )); + execSql( TQString("REPLACE into Settings VALUES ('%1','%2');") + .tqarg( escapeString(keyword) ) + .tqarg( escapeString(value) )); } -QString SqliteDB::getSetting( const QString& keyword ) +TQString SqliteDB::getSetting( const TQString& keyword ) { - QStringList values; - execSql( QString("SELECT value FROM Settings " + TQStringList values; + execSql( TQString("SELECT value FROM Settings " "WHERE keyword='%1';") - .arg(escapeString(keyword)), + .tqarg(escapeString(keyword)), &values ); if (values.isEmpty()) - return QString(); + return TQString(); else return values[0]; } -extern QString escapeString(const QString& str) +extern TQString escapeString(const TQString& str) { - QString st(str); - st.replace( "'", "''" ); + TQString st(str); + st.tqreplace( "'", "''" ); return st; } -Q_LLONG SqliteDB::lastInsertedRow() const +TQ_LLONG SqliteDB::lastInsertedRow() const { return sqlite3_last_insert_rowid(m_db); } diff --git a/digikam/kioslave/sqlitedb.h b/digikam/kioslave/sqlitedb.h index 9363ed7..f41a7ed 100644 --- a/digikam/kioslave/sqlitedb.h +++ b/digikam/kioslave/sqlitedb.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-06-05 - * Description : QSlite DB interface. + * Description : TQSlite DB interface. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * @@ -20,14 +20,14 @@ * GNU General Public License for more details. * ============================================================ */ -#ifndef SQLITEDB_H -#define SQLITEDB_H +#ifndef STQLITEDB_H +#define STQLITEDB_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> -class QStringList; +class TQStringList; class SqliteDB { @@ -37,22 +37,22 @@ public: SqliteDB(); ~SqliteDB(); - void openDB(const QString& directory); + void openDB(const TQString& directory); void closeDB(); - bool execSql(const QString& sql, QStringList* const values = 0, - QString* const errMsg = 0, bool debug = false) const; + bool execSql(const TQString& sql, TQStringList* const values = 0, + TQString* const errMsg = 0, bool debug = false) const; - Q_LLONG lastInsertedRow() const; + TQ_LLONG lastInsertedRow() const; - void setSetting( const QString& keyword, const QString& value ); - QString getSetting( const QString& keyword ); + void setSetting( const TQString& keyword, const TQString& value ); + TQString getSetting( const TQString& keyword ); private: mutable struct sqlite3* m_db; }; -extern QString escapeString(const QString& str); +extern TQString escapeString(const TQString& str); -#endif /* SQLITEDB_H */ +#endif /* STQLITEDB_H */ diff --git a/digikam/libs/curves/imagecurves.cpp b/digikam/libs/curves/imagecurves.cpp index a41f55c..4611595 100644 --- a/digikam/libs/curves/imagecurves.cpp +++ b/digikam/libs/curves/imagecurves.cpp @@ -36,9 +36,9 @@ #include <cstdlib> #include <cerrno> -// Qt includes. +// TQt includes. -#include <qfile.h> +#include <tqfile.h> // Local includes. @@ -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 geometry; + CRMatrix tqgeometry; 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 geometry matrix from the segment. + // Construct the tqgeometry matrix from the segment. for (i = 0 ; i < 4 ; i++) { - geometry[i][2] = 0; - geometry[i][3] = 0; + tqgeometry[i][2] = 0; + tqgeometry[i][3] = 0; } for (i = 0 ; i < 2 ; 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]; + 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]; } // 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 geometry matrices. + // Compose the basis and tqgeometry matrices. - curvesCRCompose(CR_basis, geometry, tmp1); + curvesCRCompose(CR_basis, tqgeometry, tmp1); // Compose the above results to get the deltas matrix. @@ -530,20 +530,20 @@ int ImageCurves::getCurveValue(int channel, int bin) return 0; } -QPoint ImageCurves::getCurvePoint(int channel, int point) +TQPoint ImageCurves::getCurvePoint(int channel, int point) { if ( d->curves && channel>=0 && channel<5 && point>=0 && point<=17 ) - return(QPoint(d->curves->points[channel][point][0], + return(TQPoint(d->curves->points[channel][point][0], d->curves->points[channel][point][1]) ); - return QPoint(-1, -1); + return TQPoint(-1, -1); } -QPointArray ImageCurves::getCurvePoints(int channel) +TQPointArray ImageCurves::getCurvePoints(int channel) { - QPointArray array(18); + TQPointArray array(18); if ( d->curves && channel>=0 && channel<5) @@ -595,7 +595,7 @@ void ImageCurves::setCurveValue(int channel, int bin, int val) } } -void ImageCurves::setCurvePoint(int channel, int point, const QPoint& val) +void ImageCurves::setCurvePoint(int channel, int point, const TQPoint& val) { if ( d->curves && channel>=0 && channel<5 && @@ -609,7 +609,7 @@ void ImageCurves::setCurvePoint(int channel, int point, const QPoint& val) } } -void ImageCurves::setCurvePoints(int channel, const QPointArray& vals) +void ImageCurves::setCurvePoints(int channel, const TQPointArray& vals) { if ( d->curves && channel>=0 && channel<5 && @@ -666,7 +666,7 @@ bool ImageCurves::loadCurvesFromGimpCurvesFile(const KURL& fileUrl) int index[5][17]; int value[5][17]; - file = fopen(QFile::encodeName(fileUrl.path()), "r"); + file = fopen(TQFile::encodeName(fileUrl.path()), "r"); if (!file) return false; @@ -723,7 +723,7 @@ bool ImageCurves::saveCurvesToGimpCurvesFile(const KURL& fileUrl) int i, j; int index; - file = fopen(QFile::encodeName(fileUrl.path()), "w"); + file = fopen(TQFile::encodeName(fileUrl.path()), "w"); if (!file) return false; diff --git a/digikam/libs/curves/imagecurves.h b/digikam/libs/curves/imagecurves.h index 3cb05d8..69d33c0 100644 --- a/digikam/libs/curves/imagecurves.h +++ b/digikam/libs/curves/imagecurves.h @@ -26,10 +26,10 @@ #define ROUND(x) ((int) ((x) + 0.5)) -// Qt includes. +// TQt includes. -#include <qpoint.h> -#include <qpointarray.h> +#include <tqpoint.h> +#include <tqpointarray.h> // KDE includes. @@ -80,16 +80,16 @@ public: void setCurvePointY(int channel, int point, int y); void setCurveType(int channel, CurveType type); - void setCurvePoint(int channel, int point, const QPoint& val); - void setCurvePoints(int channel, const QPointArray& vals); + void setCurvePoint(int channel, int point, const TQPoint& val); + void setCurvePoints(int channel, const TQPointArray& vals); int getCurveValue(int channel, int bin); int getCurvePointX(int channel, int point); int getCurvePointY(int channel, int point); int getCurveType(int channel); - QPoint getCurvePoint(int channel, int point); - QPointArray getCurvePoints(int channel); + TQPoint getCurvePoint(int channel, int point); + TQPointArray getCurvePoints(int channel); // Methods for to save/load the curves values to/from a Gimp curves text file. diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp index 846666d..5452786 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.cpp +++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> // KDE includes. @@ -69,7 +69,7 @@ public: CtrlPanelDlgPriv() { - parent = 0; + tqparent = 0; timer = 0; aboutData = 0; progressBar = true; @@ -82,35 +82,35 @@ public: int currentRenderingMode; - QWidget *parent; + TQWidget *tqparent; - QTimer *timer; + TQTimer *timer; - QString name; + TQString name; KAboutData *aboutData; }; -CtrlPanelDlg::CtrlPanelDlg(QWidget* parent, QString title, QString name, +CtrlPanelDlg::CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name, bool loadFileSettings, bool tryAction, bool progressBar, - int separateViewMode, QFrame* bannerFrame) + int separateViewMode, TQFrame* bannerFrame) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - parent, 0, true, true, + tqparent, 0, true, true, i18n("&Abort"), i18n("&Save As..."), i18n("&Load...")) { kapp->setOverrideCursor( KCursor::waitCursor() ); - setCaption(DImgInterface::defaultInterface()->getImageFileName() + QString(" - ") + title); + setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new CtrlPanelDlgPriv; - d->parent = parent; + d->tqparent = tqparent; d->name = name; d->tryAction = tryAction; d->progressBar = progressBar; m_threadedFilter = 0; - QString whatsThis; + TQString whatsThis; setButtonWhatsThis ( Default, i18n("<p>Reset all filter parameters to their default values.") ); setButtonWhatsThis ( User1, i18n("<p>Abort the current image rendering.") ); @@ -123,26 +123,26 @@ CtrlPanelDlg::CtrlPanelDlg(QWidget* parent, QString title, QString name, // disable Abort button on startup enableButton(User1, false); - resize(configDialogSize(name + QString(" Tool Dialog"))); - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint()); + resize(configDialogSize(name + TQString(" Tool Dialog"))); + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint()); // ------------------------------------------------------------- if (bannerFrame) { - bannerFrame->reparent( plainPage(), QPoint(0, 0) ); + bannerFrame->reparent( plainPage(), TQPoint(0, 0) ); topLayout->addWidget(bannerFrame); } // ------------------------------------------------------------- - m_imagePreviewWidget = new ImagePannelWidget(470, 350, name + QString(" Tool Dialog"), + m_imagePreviewWidget = new ImagePannelWidget(470, 350, name + TQString(" Tool Dialog"), plainPage(), separateViewMode); topLayout->addWidget(m_imagePreviewWidget); // ------------------------------------------------------------- - QTimer::singleShot(0, this, SLOT(slotInit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -163,27 +163,27 @@ CtrlPanelDlg::~CtrlPanelDlg() void CtrlPanelDlg::slotInit() { // Reset values to defaults. - QTimer::singleShot(0, this, SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, SIGNAL(signalOriginalClipFocusChanged()), - this, SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQT_SIGNAL(signalOriginalClipFocusChanged()), + this, TQT_SLOT(slotFocusChanged())); } else { - connect(m_imagePreviewWidget, SIGNAL(signalResized()), - this, SLOT(slotFocusChanged())); + connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotFocusChanged())); } } void CtrlPanelDlg::setAboutData(KAboutData *about) { d->aboutData = about; - QPushButton *helpButton = actionButton( Help ); + TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -231,11 +231,11 @@ void CtrlPanelDlg::slotCancel() kapp->restoreOverrideCursor(); } - saveDialogSize(d->name + QString(" Tool Dialog")); + saveDialogSize(d->name + TQString(" Tool Dialog")); done(Cancel); } -void CtrlPanelDlg::closeEvent(QCloseEvent *e) +void CtrlPanelDlg::closeEvent(TQCloseEvent *e) { if (d->currentRenderingMode != CtrlPanelDlgPriv::NoneRendering) { @@ -245,7 +245,7 @@ void CtrlPanelDlg::closeEvent(QCloseEvent *e) kapp->restoreOverrideCursor(); } - saveDialogSize(d->name + QString(" Tool Dialog")); + saveDialogSize(d->name + TQString(" Tool Dialog")); e->accept(); } @@ -262,7 +262,7 @@ void CtrlPanelDlg::slotFocusChanged(void) m_threadedFilter->stopComputation(); } - QTimer::singleShot(0, this, SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); } void CtrlPanelDlg::slotHelp() @@ -284,9 +284,9 @@ void CtrlPanelDlg::slotTimer() delete d->timer; } - d->timer = new QTimer( this ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(slotEffect()) ); + d->timer = new TQTimer( this ); + connect( d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotEffect()) ); d->timer->start(500, true); } @@ -323,7 +323,7 @@ void CtrlPanelDlg::slotOk() { d->currentRenderingMode = CtrlPanelDlgPriv::FinalRendering; DDebug() << "Final " << d->name << " started..." << endl; - saveDialogSize(d->name + QString(" Tool Dialog")); + saveDialogSize(d->name + TQString(" Tool Dialog")); writeUserSettings(); m_imagePreviewWidget->setEnable(false); @@ -346,7 +346,7 @@ void CtrlPanelDlg::slotOk() prepareFinal(); } -void CtrlPanelDlg::customEvent(QCustomEvent *event) +void CtrlPanelDlg::customEvent(TQCustomEvent *event) { if (!event) return; @@ -406,7 +406,7 @@ void CtrlPanelDlg::customEvent(QCustomEvent *event) // Backport KDialog::keyPressEvent() implementation from KDELibs to ignore Enter/Return Key events // to prevent any conflicts between dialog keys events and SpinBox keys events. -void CtrlPanelDlg::keyPressEvent(QKeyEvent *e) +void CtrlPanelDlg::keyPressEvent(TQKeyEvent *e) { if ( e->state() == 0 ) { diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/digikam/libs/dialogs/ctrlpaneldlg.h index 801ae7a..d696b89 100644 --- a/digikam/libs/dialogs/ctrlpaneldlg.h +++ b/digikam/libs/dialogs/ctrlpaneldlg.h @@ -25,9 +25,9 @@ #ifndef CTRLPANELDLG_H #define CTRLPANELDLG_H -// Qt includes +// TQt includes -#include <qstring.h> +#include <tqstring.h> // KDE include. @@ -38,7 +38,7 @@ #include "imagepannelwidget.h" #include "digikam_export.h" -class QFrame; +class TQFrame; namespace Digikam { @@ -49,13 +49,14 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT CtrlPanelDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CtrlPanelDlg(QWidget* parent, QString title, QString name, + CtrlPanelDlg(TQWidget* tqparent, TQString title, TQString name, bool loadFileSettings=false, bool tryAction=false, bool progressBar=true, int separateViewMode=ImagePannelWidget::SeparateViewAll, - QFrame* bannerFrame=0); + TQFrame* bannerFrame=0); ~CtrlPanelDlg(); void setAboutData(KAboutData *about); @@ -86,10 +87,10 @@ private slots: protected: - void closeEvent(QCloseEvent *e); - void customEvent(QCustomEvent *event); + void closeEvent(TQCloseEvent *e); + void customEvent(TQCustomEvent *event); void abortPreview(void); - void keyPressEvent(QKeyEvent *e); + void keyPressEvent(TQKeyEvent *e); virtual void writeUserSettings(void){}; virtual void resetValues(void){}; diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp index 14aa2dd..6340994 100644 --- a/digikam/libs/dialogs/deletedialog.cpp +++ b/digikam/libs/dialogs/deletedialog.cpp @@ -23,16 +23,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstringlist.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qwidgetstack.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqwidgetstack.h> // KDE includes. @@ -58,12 +58,12 @@ namespace Digikam // DeleteWidget implementation ////////////////////////////////////////////////////////////////////////////// -DeleteWidget::DeleteWidget(QWidget *parent, const char *name) - : DeleteDialogBase(parent, name), +DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name) + : DeleteDialogBase(tqparent, name), m_listMode(DeleteDialogMode::Files), m_deleteMode(DeleteDialogMode::UseTrash) { - ddCheckBoxStack->raiseWidget(ddShouldDelete); + ddCheckBoxStack->raiseWidget(ddShouldDeletePage); bool deleteInstead = !AlbumSettings::instance()->getUseTrash(); slotShouldDelete(deleteInstead); @@ -179,8 +179,8 @@ void DeleteWidget::updateText() // DeleteDialog implementation ////////////////////////////////////////////////////////////////////////////// -DeleteDialog::DeleteDialog(QWidget *parent, const char *name) - : KDialogBase(Swallow, WStyle_DialogBorder, parent, name, +DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) + : KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name, true, // modal i18n("About to delete selected files"), // caption Ok | Cancel, // available buttons @@ -199,8 +199,8 @@ DeleteDialog::DeleteDialog(QWidget *parent, const char *name) adjustSize(); slotShouldDelete(shouldDelete()); - connect(m_widget->ddShouldDelete, SIGNAL(toggled(bool)), - this, SLOT(slotShouldDelete(bool))); + connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotShouldDelete(bool))); actionButton(Ok)->setFocus(); } @@ -218,7 +218,7 @@ bool DeleteDialog::confirmDeleteList(const KURL::List& condemnedFiles, if (!AlbumSettings::instance()->getShowTrashDeleteDialog()) return true; } - return exec() == QDialog::Accepted; + return exec() == TQDialog::Accepted; } void DeleteDialog::setURLs(const KURL::List &files) @@ -261,7 +261,7 @@ void DeleteDialog::presetDeleteMode(DeleteDialogMode::DeleteMode mode) { // access the widget directly, signals will be fired to DeleteDialog and DeleteWidget m_widget->ddShouldDelete->setChecked(false); - m_widget->ddCheckBoxStack->raiseWidget(m_widget->ddDoNotShowAgain); + m_widget->ddCheckBoxStack->raiseWidget(m_widget->ddDoNotShowAgainPage); m_saveDoNotShowAgain = true; break; } diff --git a/digikam/libs/dialogs/deletedialog.h b/digikam/libs/dialogs/deletedialog.h index 803546b..01b84f7 100644 --- a/digikam/libs/dialogs/deletedialog.h +++ b/digikam/libs/dialogs/deletedialog.h @@ -26,9 +26,9 @@ #ifndef _DELETEDIALOG_H #define _DELETEDIALOG_H -// Qt includes. +// TQt includes. -#include <qcheckbox.h> +#include <tqcheckbox.h> // KDE includes. @@ -40,11 +40,11 @@ #include "digikam_export.h" #include "deletedialogbase.h" -class QStringList; +class TQStringList; class KListBox; class KGuiItem; -class QLabel; -class QWidgetStack; +class TQLabel; +class TQWidgetStack; namespace Digikam { @@ -71,10 +71,11 @@ namespace DeleteDialogMode class DeleteWidget : public DeleteDialogBase { Q_OBJECT + TQ_OBJECT public: - DeleteWidget(QWidget *parent = 0, const char *name = 0); + DeleteWidget(TQWidget *tqparent = 0, const char *name = 0); void setFiles(const KURL::List &files); void setListMode(DeleteDialogMode::ListMode mode); @@ -94,6 +95,7 @@ protected: class DIGIKAM_EXPORT DeleteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -106,7 +108,7 @@ public: public: - DeleteDialog(QWidget *parent, const char *name = "delete_dialog"); + DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog"); bool confirmDeleteList(const KURL::List &condemnedURLs, DeleteDialogMode::ListMode listMode, diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui index 78fcfe4..06332c9 100644 --- a/digikam/libs/dialogs/deletedialogbase.ui +++ b/digikam/libs/dialogs/deletedialogbase.ui @@ -1,154 +1,188 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> -<class>DeleteDialogBase</class> -<widget class="QWidget"> - <property name="name"> - <cstring>DeleteDialogBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>542</width> - <height>374</height> - </rect> - </property> - <property name="minimumSize"> - <size> - <width>420</width> - <height>320</height> - </size> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout4</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLabel"> - <property name="name"> - <cstring>ddWarningIcon</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>4</hsizetype> - <vsizetype>4</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Icon Placeholder, not in GUI</string> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout3</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QLabel"> - <property name="name"> - <cstring>ddDeleteText</cstring> - </property> - <property name="text"> - <string>Deletion method placeholder, never shown to user.</string> - </property> - <property name="alignment"> - <set>WordBreak|AlignCenter</set> - </property> - </widget> - </vbox> - </widget> - </hbox> - </widget> - <widget class="KListBox"> - <property name="name"> - <cstring>ddFileList</cstring> - </property> - <property name="selectionMode"> - <enum>NoSelection</enum> - </property> - <property name="toolTip" stdset="0"> - <string>List of files that are about to be deleted.</string> - </property> - <property name="whatsThis" stdset="0"> - <string>This is the list of items that are about to be deleted.</string> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>ddNumFiles</cstring> - </property> - <property name="text"> - <string>Placeholder for number of files, not in GUI</string> - </property> - <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - </widget> - <widget class="QWidgetStack"> - <property name="name"> - <cstring>ddCheckBoxStack</cstring> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>ddShouldDelete</cstring> - </property> - <property name="text"> - <string>&Delete files instead of moving them to the trash</string> - </property> - <property name="toolTip" stdset="0"> - <string>If checked, files will be permanently removed instead of being placed in the Trash Bin</string> - </property> - <property name="whatsThis" stdset="0"> - <string><qt><p>If this box is checked, files will be <b>permanently removed</b> instead of being placed in the Trash Bin.</p> - - <p><em>Use this option with caution</em>: most filesystems are unable to undelete deleted files reliably.</p></qt></string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>ddDoNotShowAgain</cstring> - </property> - <property name="text"> - <string>Do not &ask again</string> - </property> - <property name="toolTip" stdset="0"> - <string>If checked, this dialog will no longer be shown, and files will be directly moved to the Trash Bin</string> - </property> - <property name="whatsThis" stdset="0"> - <string><qt><p>If this box is checked, this dialog will no longer be shown, and files will be directly moved to the Trash Bin</p></string> - </property> - </widget> - </widget> - </vbox> -</widget> -<customwidgets> -</customwidgets> -<connections> - <connection> - <sender>ddShouldDelete</sender> - <signal>toggled(bool)</signal> - <receiver>DeleteDialogBase</receiver> - <slot>slotShouldDelete(bool)</slot> - </connection> -</connections> -<slots> - <slot access="protected">slotShouldDelete(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klistbox.h</includehint> -</includehints> +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> + <class>DeleteDialogBase</class> + <widget class="TQWidget"> + <property name="name"> + <cstring>DeleteDialogBase</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>517</width> + <height>162</height> + </rect> + </property> + <property name="caption"> + <string>DeleteDialogBase</string> + </property> + <property name="tqgeometry" stdset="0"> + <rect> + <x>0</x> + <y>0</y> + <width>542</width> + <height>374</height> + </rect> + </property> + <property name="tqminimumSize" stdset="0"> + <size> + <width>420</width> + <height>320</height> + </size> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <widget class="TQLayoutWidget"> + <property name="name"> + <cstring>tqlayout4</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQLabel"> + <property name="name"> + <cstring>ddWarningIcon</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Icon Placeholder, not in GUI</string> + </property> + </widget> + <widget class="TQLayoutWidget"> + <property name="name"> + <cstring>tqlayout3</cstring> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQLabel"> + <property name="name"> + <cstring>ddDeleteText</cstring> + </property> + <property name="text"> + <string>Deletion method placeholder, never shown to user.</string> + </property> + <property name="tqalignment" stdset="0"> + <string>WordBreak|AlignCenter</string> + </property> + </widget> + </vbox> + </widget> + </hbox> + </widget> + <widget class="KListBox"> + <property name="name"> + <cstring>ddFileList</cstring> + </property> + <property name="selectionMode"> + <enum>NoSelection</enum> + </property> + <property name="toolTip" stdset="0"> + <string>List of files that are about to be deleted.</string> + </property> + <property name="whatsThis" stdset="0"> + <string>This is the list of items that are about to be deleted.</string> + </property> + </widget> + <widget class="TQLabel"> + <property name="name"> + <cstring>ddNumFiles</cstring> + </property> + <property name="text"> + <string>Placeholder for number of files, not in GUI</string> + </property> + <property name="tqalignment" stdset="0"> + <string>AlignVCenter|AlignRight</string> + </property> + </widget> + <widget class="TQWidgetStack"> + <property name="name"> + <cstring>ddCheckBoxStack</cstring> + </property> + <widget class="TQWidget"> + <property name="name"> + <cstring>ddShouldDeletePage</cstring> + </property> + <attribute name="id"> + <number>0</number> + </attribute> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>ddShouldDelete</cstring> + </property> + <property name="text"> + <string>&Delete files instead of moving them to the trash</string> + </property> + <property name="toolTip" stdset="0"> + <string>If checked, files will be permanently removed instead of being placed in the Trash Bin</string> + </property> + <property name="whatsThis" stdset="0"> + <string><qt><p>If this box is checked, files will be <b>permanently removed</b> instead of being placed in the Trash Bin.</p> + + <p><em>Use this option with caution</em>: most filesystems are unable to undelete deleted files reliably.</p></qt></string> + </property> + </widget> + </vbox> + </widget> + <widget class="TQWidget"> + <property name="name"> + <cstring>ddDoNotShowAgainPage</cstring> + </property> + <attribute name="id"> + <number>1</number> + </attribute> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>ddDoNotShowAgain</cstring> + </property> + <property name="text"> + <string>Do not &ask again</string> + </property> + <property name="toolTip" stdset="0"> + <string>If checked, this dialog will no longer be shown, and files will be directly moved to the Trash Bin</string> + </property> + <property name="whatsThis" stdset="0"> + <string><qt><p>If this box is checked, this dialog will no longer be shown, and files will be directly moved to the Trash Bin</p></string> + </property> + </widget> + </vbox> + </widget> + </widget> + </vbox> + </widget> + <customwidgets> + </customwidgets> + <connections> + </connections> + <layoutdefaults spacing="6" margin="11"/> + <includehints> + <includehint>klistbox.h</includehint> + </includehints> </UI> diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp index 30f8458..0fddc63 100644 --- a/digikam/libs/dialogs/dprogressdlg.cpp +++ b/digikam/libs/dialogs/dprogressdlg.cpp @@ -21,15 +21,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qheader.h> -#include <qlabel.h> -#include <qimage.h> -#include <qpushbutton.h> -#include <qlistview.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqimage.h> +#include <tqpushbutton.h> +#include <tqlistview.h> // KDE includes. @@ -67,27 +67,27 @@ public: bool allowCancel; bool cancelled; - QLabel *logo; - QLabel *title; - QLabel *label; + TQLabel *logo; + TQLabel *title; + TQLabel *label; - QListView *actionsList; + TQListView *actionsList; KProgress *progress; }; -DProgressDlg::DProgressDlg(QWidget *parent, const QString &caption) - : KDialogBase(parent, 0, true, caption, Cancel) +DProgressDlg::DProgressDlg(TQWidget *tqparent, const TQString &caption) + : KDialogBase(tqparent, 0, true, caption, Cancel) { d = new DProgressDlgPriv; - QFrame *page = makeMainWidget(); - QGridLayout* grid = new QGridLayout(page, 1, 1, 0, spacingHint()); - QVBoxLayout *vlay = new QVBoxLayout(); - d->actionsList = new QListView(page); - d->label = new QLabel(page); - d->title = new QLabel(page); - d->logo = new QLabel(page); + TQFrame *page = makeMainWidget(); + TQGridLayout* grid = new TQGridLayout(page, 1, 1, 0, spacingHint()); + TQVBoxLayout *vlay = new TQVBoxLayout(); + d->actionsList = new TQListView(page); + d->label = new TQLabel(page); + d->title = new TQLabel(page); + d->logo = new TQLabel(page); d->progress = new KProgress(page); vlay->addWidget(d->logo); vlay->addWidget(d->progress); @@ -98,12 +98,12 @@ DProgressDlg::DProgressDlg(QWidget *parent, const QString &caption) d->logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); d->actionsList->addColumn("Thumb"); // no i18n here: hiden column - d->actionsList->addColumn("Status"); // no i18n here: hiden column + d->actionsList->addColumn("tqStatus"); // no i18n here: hiden column d->actionsList->setSorting(-1); d->actionsList->setItemMargin(1); - d->actionsList->setSelectionMode(QListView::NoSelection); + d->actionsList->setSelectionMode(TQListView::NoSelection); d->actionsList->header()->hide(); - d->actionsList->setResizeMode(QListView::LastColumn); + d->actionsList->setResizeMode(TQListView::LastColumn); grid->addMultiCellLayout(vlay, 0, 1, 0, 0); grid->addMultiCellWidget(d->label, 0, 0, 1, 1); @@ -127,31 +127,31 @@ void DProgressDlg::slotCancel() } } -void DProgressDlg::setButtonText(const QString &text) +void DProgressDlg::setButtonText(const TQString &text) { KDialogBase::setButtonText(Cancel, text); } -void DProgressDlg::addedAction(const QPixmap& pix, const QString &text) +void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text) { - QImage img; - QListViewItem *item = new QListViewItem(d->actionsList, - d->actionsList->lastItem(), QString(), text); + TQImage img; + TQListViewItem *item = new TQListViewItem(d->actionsList, + d->actionsList->lastItem(), TQString(), text); if (pix.isNull()) { - QString dir = KGlobal::dirs()->findResourceDir("digikam_imagebroken", + TQString dir = KGlobal::dirs()->findResourceDir("digikam_imagebroken", "image-broken.png"); dir = dir + "/image-broken.png"; - QPixmap pixbi(dir); - img = pixbi.convertToImage().scale(32, 32, QImage::ScaleMin); + TQPixmap pixbi(dir); + img = pixbi.convertToImage().scale(32, 32, TQ_ScaleMin); } else { - img = pix.convertToImage().scale(32, 32, QImage::ScaleMin); + img = pix.convertToImage().scale(32, 32, TQ_ScaleMin); } - QPixmap pixmap(img); + TQPixmap pixmap(img); item->setPixmap(0, pixmap); d->actionsList->ensureItemVisible(item); } @@ -177,12 +177,12 @@ void DProgressDlg::advance(int value) d->progress->advance(value); } -void DProgressDlg::setLabel(const QString &text) +void DProgressDlg::setLabel(const TQString &text) { d->label->setText(text); } -void DProgressDlg::setTitle(const QString &text) +void DProgressDlg::setTitle(const TQString &text) { d->title->setText(text); } @@ -216,9 +216,9 @@ KProgress *DProgressDlg::progressBar() const void DProgressDlg::setActionListVSBarVisible(bool visible) { if (!visible) - d->actionsList->setVScrollBarMode(QScrollView::AlwaysOff); + d->actionsList->setVScrollBarMode(TQScrollView::AlwaysOff); else - d->actionsList->setVScrollBarMode(QScrollView::Auto); + d->actionsList->setVScrollBarMode(TQScrollView::Auto); } } // NameSpace Digikam diff --git a/digikam/libs/dialogs/dprogressdlg.h b/digikam/libs/dialogs/dprogressdlg.h index 901da1f..3aa090d 100644 --- a/digikam/libs/dialogs/dprogressdlg.h +++ b/digikam/libs/dialogs/dprogressdlg.h @@ -42,20 +42,21 @@ class DProgressDlgPriv; class DIGIKAM_EXPORT DProgressDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DProgressDlg(QWidget *parent=0, const QString &caption=QString()); + DProgressDlg(TQWidget *tqparent=0, const TQString &caption=TQString()); ~DProgressDlg(); - void setButtonText(const QString &text); - void addedAction(const QPixmap& pix, const QString &text); + void setButtonText(const TQString &text); + void addedAction(const TQPixmap& pix, const TQString &text); void reset(); void setTotalSteps(int total); void setValue(int value); void advance(int value); - void setLabel(const QString &text); - void setTitle(const QString &text); + void setLabel(const TQString &text); + void setTitle(const TQString &text); void setActionListVSBarVisible(bool visible); void showCancelButton(bool show); void setAllowCancel(bool allowCancel); diff --git a/digikam/libs/dialogs/iccprofileinfodlg.cpp b/digikam/libs/dialogs/iccprofileinfodlg.cpp index 7269efb..14ab6df 100644 --- a/digikam/libs/dialogs/iccprofileinfodlg.cpp +++ b/digikam/libs/dialogs/iccprofileinfodlg.cpp @@ -34,9 +34,9 @@ namespace Digikam { -ICCProfileInfoDlg::ICCProfileInfoDlg(QWidget* parent, const QString& profilePath, - const QByteArray& profileData) - : KDialogBase(parent, 0, true, i18n("Color Profile Info"), +ICCProfileInfoDlg::ICCProfileInfoDlg(TQWidget* tqparent, const TQString& profilePath, + const TQByteArray& profileData) + : KDialogBase(tqparent, 0, true, i18n("Color Profile Info"), Help|Ok, Ok, true) { setHelp("iccprofile.anchor", "digikam"); diff --git a/digikam/libs/dialogs/iccprofileinfodlg.h b/digikam/libs/dialogs/iccprofileinfodlg.h index 462e729..6ee8e8f 100644 --- a/digikam/libs/dialogs/iccprofileinfodlg.h +++ b/digikam/libs/dialogs/iccprofileinfodlg.h @@ -24,9 +24,9 @@ #ifndef ICCPROFILEINFODLG_H #define ICCPROFILEINFODLG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -36,7 +36,7 @@ #include "digikam_export.h" -class QWidget; +class TQWidget; namespace Digikam { @@ -48,7 +48,7 @@ class DIGIKAM_EXPORT ICCProfileInfoDlg : public KDialogBase public: - ICCProfileInfoDlg(QWidget *parent, const QString& profilePath, const QByteArray& profileData=QByteArray()); + ICCProfileInfoDlg(TQWidget *tqparent, const TQString& profilePath, const TQByteArray& profileData=TQByteArray()); ~ICCProfileInfoDlg(); }; diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 3378166..19684ac 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qlayout.h> -#include <qguardedptr.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqguardedptr.h> +#include <tqtimer.h> // KDE includes. @@ -71,29 +71,29 @@ public: timer = 0; } - QTimer *timer; + TQTimer *timer; - QLabel *imageLabel; - QLabel *infoLabel; + TQLabel *imageLabel; + TQLabel *infoLabel; KURL currentURL; DMetadata metaIface; - QGuardedPtr<ThumbnailJob> thumbJob; + TQGuardedPtr<ThumbnailJob> thumbJob; }; -ImageDialogPreview::ImageDialogPreview(QWidget *parent) - : KPreviewWidgetBase(parent) +ImageDialogPreview::ImageDialogPreview(TQWidget *tqparent) + : KPreviewWidgetBase(tqparent) { d = new ImageDialogPreviewPrivate; - QVBoxLayout *vlay = new QVBoxLayout(this); - d->imageLabel = new QLabel(this); - d->imageLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - d->imageLabel->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + 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->infoLabel = new QLabel(this); + d->infoLabel = new TQLabel(this); vlay->setMargin(0); vlay->setSpacing(KDialog::spacingHint()); @@ -102,10 +102,10 @@ ImageDialogPreview::ImageDialogPreview(QWidget *parent) setSupportedMimeTypes(KImageIO::mimeTypes()); - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(showPreview()) ); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(showPreview()) ); } ImageDialogPreview::~ImageDialogPreview() @@ -118,12 +118,12 @@ ImageDialogPreview::~ImageDialogPreview() delete d; } -QSize ImageDialogPreview::sizeHint() const +TQSize ImageDialogPreview::tqsizeHint() const { - return QSize(256, 256); + return TQSize(256, 256); } -void ImageDialogPreview::resizeEvent(QResizeEvent *) +void ImageDialogPreview::resizeEvent(TQResizeEvent *) { d->timer->start(100, true); } @@ -156,22 +156,22 @@ void ImageDialogPreview::showPreview(const KURL& url) d->thumbJob = new ThumbnailJob(url, ThumbnailSize::Huge, true, true); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotGotThumbnail(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotFailedThumbnail(const KURL&))); d->metaIface.load(d->currentURL.path()); PhotoInfoContainer info = d->metaIface.getPhotographInformations(); if (!info.isEmpty()) { - QString identify; - QString make, model, dateTime, aperture, focalLength, exposureTime, sensitivity; - QString unavailable(i18n("<i>unavailable</i>")); - QString cellBeg("<tr><td><nobr><font size=-1>"); - QString cellMid("</font></nobr></td><td><nobr><font size=-1>"); - QString cellEnd("</font></nobr></td></tr>"); + TQString identify; + TQString make, model, dateTime, aperture, focalLength, exposureTime, sensitivity; + TQString unavailable(i18n("<i>unavailable</i>")); + TQString cellBeg("<tr><td><nobr><font size=-1>"); + TQString cellMid("</font></nobr></td><td><nobr><font size=-1>"); + TQString cellEnd("</font></nobr></td></tr>"); if (info.make.isEmpty()) make = unavailable; else make = info.make; @@ -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").arg(info.sensitivity); + else sensitivity = i18n("%1 ISO").tqarg(info.sensitivity); identify = "<table cellspacing=0 cellpadding=0>"; identify += cellBeg + i18n("Make:") + cellMid + make + cellEnd; @@ -211,15 +211,15 @@ void ImageDialogPreview::showPreview(const KURL& url) } } -void ImageDialogPreview::slotGotThumbnail(const KURL& url, const QPixmap& pix) +void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { if (url == d->currentURL) { - QPixmap pixmap; - QSize s = d->imageLabel->contentsRect().size(); + TQPixmap pixmap; + TQSize s = d->imageLabel->contentsRect().size(); if (s.width() < pix.width() || s.height() < pix.height()) - pixmap = pix.convertToImage().smoothScale(s, QImage::ScaleMin); + pixmap = pix.convertToImage().smoothScale(s, TQ_ScaleMin); else pixmap = pix; @@ -255,49 +255,49 @@ public: bool singleSelect; - QString fileformats; + TQString fileformats; KURL url; KURL::List urls; }; -ImageDialog::ImageDialog(QWidget* parent, const KURL &url, bool singleSelect, const QString& caption) +ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, const TQString& caption) { d = new ImageDialogPrivate; d->singleSelect = singleSelect; - QStringList patternList = QStringList::split('\n', KImageIO::pattern(KImageIO::Reading)); + TQStringList patternList = TQStringList::split('\n', KImageIO::pattern(KImageIO::Reading)); // All Images from list must been always the first entry given by KDE API - QString allPictures = patternList[0]; + TQString allPictures = patternList[0]; #if KDCRAW_VERSION < 0x000106 // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current. if (KDcrawIface::DcrawBinary::instance()->versionIsRight()) { - allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + QString(" *.JPE *.TIF")); + allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + TQString(" *.JPE *.TIF")); patternList.remove(patternList[0]); patternList.prepend(allPictures); // 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").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); + patternList.append(i18n("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); } #else - allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF")); + allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" *.JPE *.TIF")); patternList.remove(patternList[0]); patternList.prepend(allPictures); // 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").arg(QString(KDcrawIface::KDcraw::rawFiles()))); + patternList.append(i18n("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::KDcraw::rawFiles()))); #endif d->fileformats = patternList.join("\n"); DDebug() << "fileformats=" << d->fileformats << endl; - KFileDialog dlg(url.path(), d->fileformats, parent, "imageFileOpenDialog", false); + KFileDialog dlg(url.path(), d->fileformats, tqparent, "imageFileOpenDialog", false); ImageDialogPreview *preview = new ImageDialogPreview(&dlg); dlg.setPreviewWidget(preview); dlg.setOperationMode(KFileDialog::Opening); @@ -330,7 +330,7 @@ bool ImageDialog::singleSelect() const return d->singleSelect; } -QString ImageDialog::fileformats() const +TQString ImageDialog::fileformats() const { return d->fileformats; } @@ -345,18 +345,18 @@ KURL::List ImageDialog::urls() const return d->urls; } -KURL::List ImageDialog::getImageURLs(QWidget* parent, const KURL& url, const QString& caption) +KURL::List ImageDialog::getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption) { - ImageDialog dlg(parent, url, false, caption); + ImageDialog dlg(tqparent, url, false, caption); if (!dlg.urls().isEmpty()) return dlg.urls(); else return KURL::List(); } -KURL ImageDialog::getImageURL(QWidget* parent, const KURL& url, const QString& caption) +KURL ImageDialog::getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption) { - ImageDialog dlg(parent, url, true, caption); + ImageDialog dlg(tqparent, url, true, caption); if (dlg.url() != KURL()) return dlg.url(); else diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h index 159e50a..c213f5d 100644 --- a/digikam/libs/dialogs/imagedialog.h +++ b/digikam/libs/dialogs/imagedialog.h @@ -42,13 +42,14 @@ class ImageDialogPreviewPrivate; class DIGIKAM_EXPORT ImageDialogPreview : public KPreviewWidgetBase { Q_OBJECT + TQ_OBJECT public: - ImageDialogPreview(QWidget *parent=0); + ImageDialogPreview(TQWidget *tqparent=0); ~ImageDialogPreview(); - QSize sizeHint() const; + TQSize tqsizeHint() const; public slots: @@ -57,13 +58,13 @@ public slots: private slots: void showPreview(); - void slotGotThumbnail(const KURL& url, const QPixmap& pix); + void slotGotThumbnail(const KURL& url, const TQPixmap& pix); void slotFailedThumbnail(const KURL& url); void clearPreview(); private: - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); private: @@ -77,17 +78,17 @@ class DIGIKAM_EXPORT ImageDialog public: - ImageDialog(QWidget* parent, const KURL &url, bool singleSelect=false, const QString& caption=QString()); + ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect=false, const TQString& caption=TQString()); ~ImageDialog(); KURL url() const; KURL::List urls() const; bool singleSelect() const; - QString fileformats() const; + TQString fileformats() const; - static KURL::List getImageURLs(QWidget* parent, const KURL& url, const QString& caption=QString()); - static KURL getImageURL(QWidget* parent, const KURL& url, const QString& caption=QString()); + static KURL::List getImageURLs(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString()); + static KURL getImageURL(TQWidget* tqparent, const KURL& url, const TQString& caption=TQString()); private: diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp index 6d70c47..f9a33c1 100644 --- a/digikam/libs/dialogs/imagedlgbase.cpp +++ b/digikam/libs/dialogs/imagedlgbase.cpp @@ -5,7 +5,7 @@ * * Date : 2005-07-23 * Description : simple plugins dialog without threadable - * filter interface. The dialog layout is + * filter interface. The dialog tqlayout is * designed to accept custom widgets in * preview and settings area. * @@ -24,18 +24,18 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qsplitter.h> -#include <qhbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqsplitter.h> +#include <tqhbox.h> // KDE includes. @@ -69,7 +69,7 @@ public: { aboutData = 0; timer = 0; - parent = 0; + tqparent = 0; mainLayout = 0; hbox = 0; settingsSideBar = 0; @@ -78,37 +78,37 @@ public: bool tryAction; - QGridLayout *mainLayout; + TQGridLayout *mainLayout; - QWidget *parent; + TQWidget *tqparent; - QString name; + TQString name; - QTimer *timer; + TQTimer *timer; - QHBox *hbox; + TQHBox *hbox; - QSplitter *splitter; + TQSplitter *splitter; KAboutData *aboutData; Sidebar *settingsSideBar; }; -ImageDlgBase::ImageDlgBase(QWidget* parent, QString title, QString name, - bool loadFileSettings, bool tryAction, QFrame* bannerFrame) +ImageDlgBase::ImageDlgBase(TQWidget* tqparent, TQString title, TQString name, + bool loadFileSettings, bool tryAction, TQFrame* bannerFrame) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - parent, 0, true, true, - QString(), + tqparent, 0, true, true, + TQString(), i18n("&Save As..."), i18n("&Load...")) { kapp->setOverrideCursor( KCursor::waitCursor() ); - setCaption(DImgInterface::defaultInterface()->getImageFileName() + QString(" - ") + title); + setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); showButton(User1, false); d = new ImageDlgBasePriv; - d->parent = parent; + d->tqparent = tqparent; d->name = name; d->tryAction = tryAction; @@ -119,24 +119,24 @@ ImageDlgBase::ImageDlgBase(QWidget* parent, QString title, QString name, showButton(User3, loadFileSettings); showButton(Try, tryAction); - resize(configDialogSize(name + QString(" Tool Dialog"))); + resize(configDialogSize(name + TQString(" Tool Dialog"))); // ------------------------------------------------------------- - d->mainLayout = new QGridLayout( plainPage(), 2, 1); + d->mainLayout = new TQGridLayout( plainPage(), 2, 1); if (bannerFrame) { - bannerFrame->reparent( plainPage(), QPoint(0, 0) ); + bannerFrame->reparent( plainPage(), TQPoint(0, 0) ); d->mainLayout->addMultiCellWidget(bannerFrame, 0, 0, 0, 1); } // ------------------------------------------------------------- - d->hbox = new QHBox(plainPage()); - d->splitter = new QSplitter(d->hbox); - d->splitter->setFrameStyle( QFrame::NoFrame ); - d->splitter->setFrameShadow( QFrame::Plain ); - d->splitter->setFrameShape( QFrame::NoFrame ); + d->hbox = new TQHBox(plainPage()); + d->splitter = new TQSplitter(d->hbox); + d->splitter->setFrameStyle( TQFrame::NoFrame ); + d->splitter->setFrameShadow( TQFrame::Plain ); + d->splitter->setFrameShape( TQFrame::NoFrame ); d->splitter->setOpaqueResize(false); d->mainLayout->addMultiCellWidget(d->hbox, 1, 2, 0, 1); @@ -161,7 +161,7 @@ ImageDlgBase::~ImageDlgBase() void ImageDlgBase::readSettings(void) { KConfig *config = kapp->config(); - config->setGroup(d->name + QString(" Tool Dialog")); + config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); @@ -171,13 +171,13 @@ void ImageDlgBase::readSettings(void) void ImageDlgBase::writeSettings() { KConfig *config = kapp->config(); - config->setGroup(d->name + QString(" Tool Dialog")); + config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry("SplitterSizes", d->splitter->sizes()); config->sync(); - saveDialogSize(d->name + QString(" Tool Dialog")); + saveDialogSize(d->name + TQString(" Tool Dialog")); } -void ImageDlgBase::closeEvent(QCloseEvent *e) +void ImageDlgBase::closeEvent(TQCloseEvent *e) { writeSettings(); e->accept(); @@ -216,25 +216,25 @@ void ImageDlgBase::slotHelp() void ImageDlgBase::setAboutData(KAboutData *about) { d->aboutData = about; - QPushButton *helpButton = actionButton( Help ); + TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } -void ImageDlgBase::setPreviewAreaWidget(QWidget *w) +void ImageDlgBase::setPreviewAreaWidget(TQWidget *w) { - w->reparent( d->splitter, QPoint(0, 0) ); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, - QSizePolicy::Expanding, + w->reparent( d->splitter, TQPoint(0, 0) ); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, + TQSizePolicy::Expanding, 2, 1); - w->setSizePolicy(rightSzPolicy); + w->tqsetSizePolicy(rightSzPolicy); } -void ImageDlgBase::setUserAreaWidget(QWidget *w) +void ImageDlgBase::setUserAreaWidget(TQWidget *w) { - QString sbName(d->name + QString(" Image Plugin Sidebar")); + TQString sbName(d->name + TQString(" Image Plugin Sidebar")); d->settingsSideBar = new Sidebar(d->hbox, sbName.ascii(), Sidebar::Right); d->settingsSideBar->setSplitter(d->splitter); d->settingsSideBar->appendTab(w, SmallIcon("configure"), i18n("Settings")); @@ -251,9 +251,9 @@ void ImageDlgBase::slotTimer() delete d->timer; } - d->timer = new QTimer( this ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(slotEffect()) ); + d->timer = new TQTimer( this ); + connect( d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotEffect()) ); d->timer->start(500, true); } diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h index a79545c..0c49d44 100644 --- a/digikam/libs/dialogs/imagedlgbase.h +++ b/digikam/libs/dialogs/imagedlgbase.h @@ -5,7 +5,7 @@ * * Date : 2005-07-23 * Description : simple plugins dialog without threadable - * filter interface. The dialog layout is + * filter interface. The dialog tqlayout is * designed to accept custom widgets in * preview and settings area. * @@ -27,9 +27,9 @@ #ifndef IMAGEDLGBASE_H #define IMAGEDLGBASE_H -// Qt includes +// TQt includes -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -39,7 +39,7 @@ #include "digikam_export.h" -class QWidget; +class TQWidget; class KAboutData; @@ -51,16 +51,17 @@ class ImageDlgBasePriv; class DIGIKAM_EXPORT ImageDlgBase : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImageDlgBase(QWidget *parent, QString title, QString name, - bool loadFileSettings=true, bool tryAction=false, QFrame* bannerFrame=0); + ImageDlgBase(TQWidget *tqparent, TQString title, TQString name, + bool loadFileSettings=true, bool tryAction=false, TQFrame* bannerFrame=0); ~ImageDlgBase(); void setAboutData(KAboutData *about); - void setPreviewAreaWidget(QWidget *w); - void setUserAreaWidget(QWidget *w); + void setPreviewAreaWidget(TQWidget *w); + void setUserAreaWidget(TQWidget *w); protected slots: @@ -69,7 +70,7 @@ protected slots: protected: - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); virtual void finalRendering(){}; virtual void writeUserSettings(void){}; virtual void readUserSettings(void){ slotDefault(); }; diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp index 2ab7db1..c4a09c6 100644 --- a/digikam/libs/dialogs/imageguidedlg.cpp +++ b/digikam/libs/dialogs/imageguidedlg.cpp @@ -22,19 +22,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qlayout.h> -#include <qframe.h> -#include <qtimer.h> -#include <qspinbox.h> -#include <qsplitter.h> -#include <qhbox.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtimer.h> +#include <tqspinbox.h> +#include <tqsplitter.h> +#include <tqhbox.h> // KDE includes. @@ -80,7 +80,7 @@ public: tryAction = false; progress = true; currentRenderingMode = NoneRendering; - parent = 0; + tqparent = 0; settings = 0; timer = 0; aboutData = 0; @@ -99,21 +99,21 @@ public: int currentRenderingMode; - QWidget *parent; - QWidget *settings; + TQWidget *tqparent; + TQWidget *settings; - QTimer *timer; + TQTimer *timer; - QString name; + TQString name; - QGridLayout *mainLayout; - QGridLayout *settingsLayout; + TQGridLayout *mainLayout; + TQGridLayout *settingsLayout; - QSpinBox *guideSize; + TQSpinBox *guideSize; - QHBox *hbox; + TQHBox *hbox; - QSplitter *splitter; + TQSplitter *splitter; KProgress *progressBar; @@ -124,28 +124,28 @@ public: Sidebar *settingsSideBar; }; -ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, +ImageGuideDlg::ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name, bool loadFileSettings, bool progress, - bool guideVisible, int guideMode, QFrame* bannerFrame, + bool guideVisible, int guideMode, TQFrame* bannerFrame, bool prevModeOptions, bool useImageSelection, bool tryAction) : KDialogBase(Plain, 0, Help|Default|User1|User2|User3|Try|Ok|Cancel, Ok, - parent, 0, true, true, + tqparent, 0, true, true, i18n("&Abort"), i18n("&Save As..."), i18n("&Load...")) { kapp->setOverrideCursor( KCursor::waitCursor() ); - setCaption(DImgInterface::defaultInterface()->getImageFileName() + QString(" - ") + title); + setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title); d = new ImageGuideDlgPriv; - d->parent = parent; + d->tqparent = tqparent; d->name = name; d->progress = progress; d->tryAction = tryAction; m_threadedFilter = 0; - QString whatsThis; + TQString whatsThis; setButtonWhatsThis ( Default, i18n("<p>Reset all filter parameters to their default values.") ); setButtonWhatsThis ( User1, i18n("<p>Abort the current image rendering.") ); @@ -155,21 +155,21 @@ ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, showButton(User3, loadFileSettings); showButton(Try, tryAction); - resize(configDialogSize(name + QString(" Tool Dialog"))); + resize(configDialogSize(name + TQString(" Tool Dialog"))); // ------------------------------------------------------------- - d->mainLayout = new QGridLayout( plainPage(), 2, 1); + d->mainLayout = new TQGridLayout( plainPage(), 2, 1); if (bannerFrame) { - bannerFrame->reparent( plainPage(), QPoint(0, 0) ); + bannerFrame->reparent( plainPage(), TQPoint(0, 0) ); d->mainLayout->addMultiCellWidget(bannerFrame, 0, 0, 0, 1); } // ------------------------------------------------------------- - QString desc; + TQString desc; if (guideVisible) desc = i18n("<p>This is the the image filter effect preview. " @@ -181,20 +181,20 @@ ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, else desc = i18n("<p>This is the image filter effect preview."); - d->hbox = new QHBox(plainPage()); - d->splitter = new QSplitter(d->hbox); + d->hbox = new TQHBox(plainPage()); + d->splitter = new TQSplitter(d->hbox); m_imagePreviewWidget = new ImageWidget(d->name, d->splitter, desc, prevModeOptions, guideMode, guideVisible, useImageSelection); - d->splitter->setFrameStyle( QFrame::NoFrame ); - d->splitter->setFrameShadow( QFrame::Plain ); - d->splitter->setFrameShape( QFrame::NoFrame ); + d->splitter->setFrameStyle( TQFrame::NoFrame ); + d->splitter->setFrameShadow( TQFrame::Plain ); + d->splitter->setFrameShape( TQFrame::NoFrame ); d->splitter->setOpaqueResize(false); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); - m_imagePreviewWidget->setSizePolicy(rightSzPolicy); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); + m_imagePreviewWidget->tqsetSizePolicy(rightSzPolicy); - QString sbName(d->name + QString(" Image Plugin Sidebar")); + TQString sbName(d->name + TQString(" Image Plugin Sidebar")); d->settingsSideBar = new Sidebar(d->hbox, sbName.ascii(), Sidebar::Right); d->settingsSideBar->setSplitter(d->splitter); @@ -204,26 +204,26 @@ ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, // ------------------------------------------------------------- - d->settings = new QWidget(plainPage()); - d->settingsLayout = new QGridLayout( d->settings, 1, 0); - QVBoxLayout *vLayout = new QVBoxLayout( spacingHint() ); + d->settings = new TQWidget(plainPage()); + d->settingsLayout = new TQGridLayout( d->settings, 1, 0); + TQVBoxLayout *vLayout = new TQVBoxLayout( spacingHint() ); // ------------------------------------------------------------- - QWidget *gboxGuideSettings = new QWidget(d->settings); - QGridLayout* grid = new QGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint()); - KSeparator *line = new KSeparator (Horizontal, gboxGuideSettings); + TQWidget *gboxGuideSettings = new TQWidget(d->settings); + TQGridLayout* grid = new TQGridLayout( gboxGuideSettings, 2, 2, marginHint(), spacingHint()); + KSeparator *line = new KSeparator(Qt::Horizontal, gboxGuideSettings); grid->addMultiCellWidget(line, 0, 0, 0, 2); - QLabel *label5 = new QLabel(i18n("Guide color:"), gboxGuideSettings); - d->guideColorBt = new KColorButton( QColor( Qt::red ), gboxGuideSettings ); - QWhatsThis::add( d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); + TQLabel *label5 = new TQLabel(i18n("Guide color:"), gboxGuideSettings); + d->guideColorBt = new KColorButton( TQColor( TQt::red ), gboxGuideSettings ); + TQWhatsThis::add( d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); grid->addMultiCellWidget(label5, 1, 1, 0, 0); grid->addMultiCellWidget(d->guideColorBt, 1, 1, 2, 2); - QLabel *label6 = new QLabel(i18n("Guide width:"), gboxGuideSettings); - d->guideSize = new QSpinBox( 1, 5, 1, gboxGuideSettings); - QWhatsThis::add( d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); + TQLabel *label6 = new TQLabel(i18n("Guide width:"), gboxGuideSettings); + d->guideSize = new TQSpinBox( 1, 5, 1, gboxGuideSettings); + TQWhatsThis::add( d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); grid->addMultiCellWidget(label6, 2, 2, 0, 0); grid->addMultiCellWidget(d->guideSize, 2, 2, 2, 2); grid->setColStretch(1, 10); @@ -233,15 +233,15 @@ ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, vLayout->addWidget(gboxGuideSettings); - QHBox *hbox = new QHBox(d->settings); - QLabel *space1 = new QLabel(hbox); + TQHBox *hbox = new TQHBox(d->settings); + TQLabel *space1 = new TQLabel(hbox); space1->setFixedWidth(spacingHint()); d->progressBar = new KProgress(100, hbox); d->progressBar->setMaximumHeight( fontMetrics().height() ); - QWhatsThis::add(d->progressBar ,i18n("<p>This is the percentage of the task which has been completed up to this point.")); + TQWhatsThis::add(d->progressBar ,i18n("<p>This is the percentage of the task which has been completed up to this point.")); d->progressBar->setValue(0); setProgressVisible(false); - QLabel *space2 = new QLabel(hbox); + TQLabel *space2 = new TQLabel(hbox); space2->setFixedWidth(spacingHint()); vLayout->addWidget(hbox); @@ -254,13 +254,13 @@ ImageGuideDlg::ImageGuideDlg(QWidget* parent, QString title, QString name, // Reading splitter sizes here prevent flicker effect in dialog. KConfig *config = kapp->config(); - config->setGroup(d->name + QString(" Tool Dialog")); + config->setGroup(d->name + TQString(" Tool Dialog")); if(config->hasKey("SplitterSizes")) d->splitter->setSizes(config->readIntListEntry("SplitterSizes")); // ------------------------------------------------------------- - QTimer::singleShot(0, this, SLOT(slotInit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); kapp->restoreOverrideCursor(); } @@ -281,9 +281,9 @@ ImageGuideDlg::~ImageGuideDlg() void ImageGuideDlg::readSettings(void) { - QColor defaultGuideColor(Qt::red); + TQColor defaultGuideColor(TQt::red); KConfig *config = kapp->config(); - config->setGroup(d->name + QString(" Tool Dialog")); + config->setGroup(d->name + TQString(" Tool Dialog")); d->guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor)); d->guideSize->setValue(config->readNumEntry("Guide Width", 1)); m_imagePreviewWidget->slotChangeGuideSize(d->guideSize->value()); @@ -293,37 +293,37 @@ void ImageGuideDlg::readSettings(void) void ImageGuideDlg::writeSettings(void) { KConfig *config = kapp->config(); - config->setGroup(d->name + QString(" Tool Dialog")); + config->setGroup(d->name + TQString(" Tool Dialog")); config->writeEntry( "Guide Color", d->guideColorBt->color() ); config->writeEntry( "Guide Width", d->guideSize->value() ); config->writeEntry( "SplitterSizes", d->splitter->sizes() ); config->sync(); - saveDialogSize(d->name + QString(" Tool Dialog")); + saveDialogSize(d->name + TQString(" Tool Dialog")); } void ImageGuideDlg::slotInit() { readSettings(); // Reset values to defaults. - QTimer::singleShot(0, this, SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); if (!d->tryAction) { - connect(m_imagePreviewWidget, SIGNAL(signalResized()), - this, SLOT(slotResized())); + connect(m_imagePreviewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotResized())); } - connect(d->guideColorBt, SIGNAL(changed(const QColor &)), - m_imagePreviewWidget, SLOT(slotChangeGuideColor(const QColor &))); + connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor &)), + m_imagePreviewWidget, TQT_SLOT(slotChangeGuideColor(const TQColor &))); - connect(d->guideSize, SIGNAL(valueChanged(int)), - m_imagePreviewWidget, SLOT(slotChangeGuideSize(int))); + connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), + m_imagePreviewWidget, TQT_SLOT(slotChangeGuideSize(int))); } -void ImageGuideDlg::setUserAreaWidget(QWidget *w) +void ImageGuideDlg::setUserAreaWidget(TQWidget *w) { - w->reparent( d->settings, QPoint(0, 0) ); - QVBoxLayout *vLayout = new QVBoxLayout( spacingHint() ); + w->reparent( d->settings, TQPoint(0, 0) ); + TQVBoxLayout *vLayout = new TQVBoxLayout( spacingHint() ); vLayout->addWidget(w); d->settingsLayout->addMultiCellLayout(vLayout, 0, 0, 0, 0); } @@ -331,10 +331,10 @@ void ImageGuideDlg::setUserAreaWidget(QWidget *w) void ImageGuideDlg::setAboutData(KAboutData *about) { d->aboutData = about; - QPushButton *helpButton = actionButton( Help ); + TQPushButton *helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, d->aboutData, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("digiKam Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); helpButton->setPopup( helpMenu->menu() ); } @@ -378,7 +378,7 @@ void ImageGuideDlg::slotResized(void) m_threadedFilter->stopComputation(); } - QTimer::singleShot(0, this, SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); } void ImageGuideDlg::slotUser1() @@ -408,7 +408,7 @@ void ImageGuideDlg::slotCancel() done(Cancel); } -void ImageGuideDlg::closeEvent(QCloseEvent *e) +void ImageGuideDlg::closeEvent(TQCloseEvent *e) { if (d->currentRenderingMode != ImageGuideDlgPriv::NoneRendering) { @@ -441,9 +441,9 @@ void ImageGuideDlg::slotTimer() delete d->timer; } - d->timer = new QTimer( this ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(slotEffect()) ); + d->timer = new TQTimer( this ); + connect( d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotEffect()) ); d->timer->start(500, true); } @@ -499,7 +499,7 @@ void ImageGuideDlg::slotOk() prepareFinal(); } -void ImageGuideDlg::customEvent(QCustomEvent *event) +void ImageGuideDlg::customEvent(TQCustomEvent *event) { if (!event) return; @@ -559,7 +559,7 @@ void ImageGuideDlg::customEvent(QCustomEvent *event) // Backport KDialog::keyPressEvent() implementation from KDELibs to ignore Enter/Return Key events // to prevent any conflicts between dialog keys events and SpinBox keys events. -void ImageGuideDlg::keyPressEvent(QKeyEvent *e) +void ImageGuideDlg::keyPressEvent(TQKeyEvent *e) { if ( e->state() == 0 ) { diff --git a/digikam/libs/dialogs/imageguidedlg.h b/digikam/libs/dialogs/imageguidedlg.h index eed3a04..1a19fd2 100644 --- a/digikam/libs/dialogs/imageguidedlg.h +++ b/digikam/libs/dialogs/imageguidedlg.h @@ -25,9 +25,9 @@ #ifndef IMAGEGUIDEDLG_H #define IMAGEGUIDEDLG_H -// Qt includes +// TQt includes -#include <qstring.h> +#include <tqstring.h> // KDE include. @@ -39,7 +39,7 @@ #include "imageguidewidget.h" #include "digikam_export.h" -class QFrame; +class TQFrame; class KAboutData; @@ -52,21 +52,22 @@ class DImgThreadedFilter; class DIGIKAM_EXPORT ImageGuideDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImageGuideDlg(QWidget* parent, QString title, QString name, + ImageGuideDlg(TQWidget* tqparent, TQString title, TQString name, bool loadFileSettings=false, bool progress=true, bool guideVisible=true, int guideMode=ImageGuideWidget::HVGuideMode, - QFrame* bannerFrame=0, + TQFrame* bannerFrame=0, bool prevModeOptions=false, bool useImageSelection=false, bool tryAction=false); ~ImageGuideDlg(); void setAboutData(KAboutData *about); - void setUserAreaWidget(QWidget *w); + void setUserAreaWidget(TQWidget *w); void setProgressVisible(bool v); public: @@ -97,12 +98,12 @@ private slots: protected: - void closeEvent(QCloseEvent *e); - void customEvent(QCustomEvent *event); + void closeEvent(TQCloseEvent *e); + void customEvent(TQCustomEvent *event); void abortPreview(void); void readSettings(void); void writeSettings(void); - void keyPressEvent(QKeyEvent *e); + void keyPressEvent(TQKeyEvent *e); virtual void writeUserSettings(void){}; virtual void resetValues(void){}; diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index ee1203a..e93be78 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -21,14 +21,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qlabel.h> -#include <qlistview.h> -#include <qheader.h> +#include <tqlayout.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqlistview.h> +#include <tqheader.h> // KDE includes. @@ -65,67 +65,67 @@ public: searchBar = 0; } - QListView *listView; + TQListView *listView; SearchTextBar *searchBar; }; -RawCameraDlg::RawCameraDlg(QWidget *parent) - : KDialogBase(parent, 0, true, QString(), Help|Ok, Ok, true) +RawCameraDlg::RawCameraDlg(TQWidget *tqparent) + : KDialogBase(tqparent, 0, true, TQString(), Help|Ok, Ok, true) { setHelp("digitalstillcamera.anchor", "digikam"); setCaption(i18n("List of supported RAW cameras")); d = new RawCameraDlgPriv; - QWidget *page = makeMainWidget(); - QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint()); + TQWidget *page = makeMainWidget(); + TQGridLayout* grid = new TQGridLayout(page, 2, 2, 0, spacingHint()); #if KDCRAW_VERSION < 0x000106 - QStringList list = KDcrawIface::DcrawBinary::instance()->supportedCamera(); - QString dcrawVer = KDcrawIface::DcrawBinary::instance()->internalVersion(); + TQStringList list = KDcrawIface::DcrawBinary::instance()->supportedCamera(); + TQString dcrawVer = KDcrawIface::DcrawBinary::instance()->internalVersion(); #else - QStringList list = KDcrawIface::KDcraw::supportedCamera(); - QString librawVer = KDcrawIface::KDcraw::librawVersion(); + TQStringList list = KDcrawIface::KDcraw::supportedCamera(); + TQString librawVer = KDcrawIface::KDcraw::librawVersion(); #endif - QString KDcrawVer = KDcrawIface::KDcraw::version(); + TQString KDcrawVer = KDcrawIface::KDcraw::version(); // -------------------------------------------------------- - QLabel *logo = new QLabel(page); + TQLabel *logo = new TQLabel(page); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); - if (KApplication::kApplication()->aboutData()->appName() == QString("digikam")) + if (KApplication::kApplication()->aboutData()->appName() == TQString("digikam")) logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); else logo->setPixmap(iconLoader->loadIcon("showfoto", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true)); // -------------------------------------------------------- - QLabel *header = new QLabel(page); + TQLabel *header = new TQLabel(page); #if KDCRAW_VERSION < 0x000106 header->setText(i18n("<p>Using KDcraw library version %1" "<p>Using Dcraw program version %2" "<p>%3 models in the list") - .arg(KDcrawVer).arg(dcrawVer).arg(list.count())); + .tqarg(KDcrawVer).tqarg(dcrawVer).tqarg(list.count())); #else header->setText(i18n("<p>Using KDcraw library version %1" "<p>Using LibRaw version %2" "<p>%3 models in the list") - .arg(KDcrawVer).arg(librawVer).arg(list.count())); + .tqarg(KDcrawVer).tqarg(librawVer).tqarg(list.count())); #endif // -------------------------------------------------------- d->searchBar = new SearchTextBar(page, "RawCameraDlgSearchBar"); - d->listView = new QListView(page); + d->listView = new TQListView(page); d->listView->addColumn("Camera Model"); // Header is hiden. No i18n here. d->listView->setSorting(1); d->listView->header()->hide(); - d->listView->setResizeMode(QListView::LastColumn); + d->listView->setResizeMode(TQListView::LastColumn); - for (QStringList::Iterator it = list.begin() ; it != list.end() ; ++it) - new QListViewItem(d->listView, *it); + for (TQStringList::Iterator it = list.begin() ; it != list.end() ; ++it) + new TQListViewItem(d->listView, *it); // -------------------------------------------------------- @@ -139,8 +139,8 @@ RawCameraDlg::RawCameraDlg(QWidget *parent) // -------------------------------------------------------- - connect(d->searchBar, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotSearchTextChanged(const QString&))); + connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotSearchTextChanged(const TQString&))); resize(500, 500); } @@ -150,18 +150,18 @@ RawCameraDlg::~RawCameraDlg() delete d; } -void RawCameraDlg::slotSearchTextChanged(const QString& filter) +void RawCameraDlg::slotSearchTextChanged(const TQString& filter) { bool query = false; - QString search = filter.lower(); + TQString search = filter.lower(); - QListViewItemIterator it(d->listView); + TQListViewItemIterator it(d->listView); for ( ; it.current(); ++it ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); - if (item->text(0).lower().contains(search)) + if (item->text(0).lower().tqcontains(search)) { query = true; item->setVisible(true); diff --git a/digikam/libs/dialogs/rawcameradlg.h b/digikam/libs/dialogs/rawcameradlg.h index 2cdfccd..a205f2a 100644 --- a/digikam/libs/dialogs/rawcameradlg.h +++ b/digikam/libs/dialogs/rawcameradlg.h @@ -40,15 +40,16 @@ class RawCameraDlgPriv; class DIGIKAM_EXPORT RawCameraDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RawCameraDlg(QWidget* parent); + RawCameraDlg(TQWidget* tqparent); ~RawCameraDlg(); private slots: - void slotSearchTextChanged(const QString&); + void slotSearchTextChanged(const TQString&); private: diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README index ff58786..eca9100 100644 --- a/digikam/libs/dimg/README +++ b/digikam/libs/dimg/README @@ -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 layout is B,G,R,A (blue, green, red, alpha) +the color tqlayout is B,G,R,A (blue, green, red, alpha) for 8bit images: you can access individual color components like this: diff --git a/digikam/libs/dimg/dcolor.cpp b/digikam/libs/dimg/dcolor.cpp index 4a4ced7..910748a 100644 --- a/digikam/libs/dimg/dcolor.cpp +++ b/digikam/libs/dimg/dcolor.cpp @@ -48,7 +48,7 @@ DColor::DColor(const DColor& color) } */ -DColor::DColor(const QColor& color, bool sixteenBit) +DColor::DColor(const TQColor& color, bool sixteenBit) { // initialize as eight bit m_red = color.red(); @@ -74,16 +74,16 @@ DColor& DColor::operator=(const DColor& color) } */ -QColor DColor::getQColor() const +TQColor DColor::getTQColor() const { if (m_sixteenBit) { DColor eightBit(*this); eightBit.convertToEightBit(); - return eightBit.getQColor(); + return eightBit.getTQColor(); } - return (QColor::QColor(m_red, m_green, m_blue)); + return (TQColor::TQColor(m_red, m_green, m_blue)); } void DColor::convertToSixteenBit() diff --git a/digikam/libs/dimg/dcolor.h b/digikam/libs/dimg/dcolor.h index eacd324..16a34f5 100644 --- a/digikam/libs/dimg/dcolor.h +++ b/digikam/libs/dimg/dcolor.h @@ -24,9 +24,9 @@ #ifndef DCOLOR_H #define DCOLOR_H -// Qt includes. +// TQt includes. -#include <qcolor.h> +#include <tqcolor.h> // Local includes. @@ -53,8 +53,8 @@ public: : m_red(red), m_green(green), m_blue(blue), m_alpha(alpha), m_sixteenBit(sixteenBit) {}; - /** Read values from QColor, convert to sixteenBit of sixteenBit is true */ - DColor(const QColor& color, bool sixteenBit=false); + /** Read values from TQColor, convert to sixteenBit of sixteenBit is true */ + DColor(const TQColor& color, bool sixteenBit=false); // Use default copy constructor, assignment operator and destructor @@ -84,7 +84,7 @@ public: void setAlpha(int alpha) { m_alpha = alpha; } void setSixteenBit(bool sixteenBit) { m_sixteenBit = sixteenBit; } - QColor getQColor() const; + TQColor getTQColor() const; /** Convert the color values of this color to and from sixteen bit and set the sixteenBit value accordingly diff --git a/digikam/libs/dimg/ddebug.cpp b/digikam/libs/dimg/ddebug.cpp index 2e5d41e..6f9d6da 100644 --- a/digikam/libs/dimg/ddebug.cpp +++ b/digikam/libs/dimg/ddebug.cpp @@ -25,9 +25,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qmutex.h> +#include <tqmutex.h> // Local includes. @@ -39,8 +39,8 @@ namespace Digikam { -//static KStaticDeleter<QMutex> deleter; -static QMutex *_ddebug_mutex_ = 0; +//static KStaticDeleter<TQMutex> deleter; +static TQMutex *_ddebug_mutex_ = 0; Ddbgstream::Ddbgstream(kdbgstream stream) : kdbgstream(stream) @@ -50,8 +50,8 @@ Ddbgstream::Ddbgstream(kdbgstream stream) if (!_ddebug_mutex_) { // leak the mutex object for simplicity - _ddebug_mutex_ = new QMutex; - //deleter.setObject(mutex, new QMutex); + _ddebug_mutex_ = new TQMutex; + //deleter.setObject(mutex, new TQMutex); //KGlobal::unregisterStaticDeleter(&deleter); } _ddebug_mutex_->lock(); @@ -70,8 +70,8 @@ Dndbgstream::Dndbgstream(kndbgstream stream) if (!_ddebug_mutex_) { // leak the mutex object for simplicity - _ddebug_mutex_ = new QMutex; - //deleter.setObject(mutex, new QMutex); + _ddebug_mutex_ = new TQMutex; + //deleter.setObject(mutex, new TQMutex); //KGlobal::unregisterStaticDeleter(&deleter); } _ddebug_mutex_->lock(); diff --git a/digikam/libs/dimg/dimg.cpp b/digikam/libs/dimg/dimg.cpp index 45f5013..e863895 100644 --- a/digikam/libs/dimg/dimg.cpp +++ b/digikam/libs/dimg/dimg.cpp @@ -34,11 +34,11 @@ extern "C" #include <cstdio> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qfileinfo.h> -#include <qmap.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqmap.h> // LibKDcraw includes. @@ -76,14 +76,14 @@ DImg::DImg() { } -DImg::DImg(const QCString& filePath, DImgLoaderObserver *observer, +DImg::DImg(const TQCString& filePath, DImgLoaderObserver *observer, DRawDecoding rawDecodingSettings) : m_priv(new DImgPrivate) { load(filePath, observer, rawDecodingSettings); } -DImg::DImg(const QString& filePath, DImgLoaderObserver *observer, +DImg::DImg(const TQString& filePath, DImgLoaderObserver *observer, DRawDecoding rawDecodingSettings) : m_priv(new DImgPrivate) { @@ -114,12 +114,12 @@ DImg::DImg(const DImg &image, int w, int h) allocateData(); } -DImg::DImg(const QImage& image) +DImg::DImg(const TQImage& image) : m_priv(new DImgPrivate) { if (!image.isNull()) { - QImage target = image.convertDepth(32); + TQImage target = image.convertDepth(32); uint w = target.width(); uint h = target.height(); @@ -129,10 +129,10 @@ DImg::DImg(const QImage& image) for (uint i = 0 ; i < w*h ; i++) { - dptr[0] = qBlue(*sptr); - dptr[1] = qGreen(*sptr); - dptr[2] = qRed(*sptr); - dptr[3] = qAlpha(*sptr); + dptr[0] = tqBlue(*sptr); + dptr[1] = tqGreen(*sptr); + dptr[2] = tqRed(*sptr); + dptr[3] = tqAlpha(*sptr); dptr += 4; sptr++; @@ -281,7 +281,7 @@ void DImg::copyMetaData(const DImgPrivate *src) // since qbytearrays are explicitly shared, we need to make sure that they are // detached from any shared references - for (QMap<int, QByteArray>::const_iterator it = src->metaData.begin(); + for (TQMap<int, TQByteArray>::const_iterator it = src->metaData.begin(); it != src->metaData.end(); ++it) { m_priv->metaData.insert(it.key(), it.data().copy()); @@ -321,7 +321,7 @@ void DImg::setImageData(bool null, uint width, uint height, bool sixteenBit, boo // load and save -bool DImg::load(const QString& filePath, DImgLoaderObserver *observer, +bool DImg::load(const TQString& filePath, DImgLoaderObserver *observer, DRawDecoding rawDecodingSettings) { FORMAT format = fileFormat(filePath); @@ -420,8 +420,8 @@ bool DImg::load(const QString& filePath, DImgLoaderObserver *observer, } default: { - DDebug() << filePath << " : QIMAGE file identified" << endl; - QImageLoader loader(this); + DDebug() << filePath << " : TQIMAGE file identified" << endl; + TQImageLoader loader(this); if (loader.load(filePath, observer)) { m_priv->null = false; @@ -437,7 +437,7 @@ bool DImg::load(const QString& filePath, DImgLoaderObserver *observer, return false; } -bool DImg::save(const QString& filePath, const QString& format, DImgLoaderObserver *observer) +bool DImg::save(const TQString& filePath, const TQString& format, DImgLoaderObserver *observer) { if (isNull()) return false; @@ -445,7 +445,7 @@ bool DImg::save(const QString& filePath, const QString& format, DImgLoaderObserv if (format.isEmpty()) return false; - QString frm = format.upper(); + TQString frm = format.upper(); if (frm == "JPEG" || frm == "JPG" || frm == "JPE") { @@ -475,14 +475,14 @@ bool DImg::save(const QString& filePath, const QString& format, DImgLoaderObserv else { setAttribute("format", format); - QImageLoader loader(this); + TQImageLoader loader(this); return loader.save(filePath, observer); } return false; } -DImg::FORMAT DImg::fileFormat(const QString& filePath) +DImg::FORMAT DImg::fileFormat(const TQString& filePath) { if ( filePath.isNull() ) return NONE; @@ -490,7 +490,7 @@ DImg::FORMAT DImg::fileFormat(const QString& filePath) // In first we trying to check the file extension. This is mandatory because // some tiff files are detected like RAW files by dcraw::identify method. - QFileInfo fileInfo(filePath); + TQFileInfo fileInfo(filePath); if (!fileInfo.exists()) { DDebug() << k_funcinfo << "File \"" << filePath << "\" does not exist" << endl; @@ -498,31 +498,31 @@ DImg::FORMAT DImg::fileFormat(const QString& filePath) } #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); if (!ext.isEmpty()) { - if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE")) + if (ext == TQString("JPEG") || ext == TQString("JPG") || ext == TQString("JPE")) return JPEG; - else if (ext == QString("PNG")) + else if (ext == TQString("PNG")) return PNG; - else if (ext == QString("TIFF") || ext == QString("TIF")) + else if (ext == TQString("TIFF") || ext == TQString("TIF")) return TIFF; - else if (rawFilesExt.upper().contains(ext)) + else if (rawFilesExt.upper().tqcontains(ext)) return RAW; - if (ext == QString("JP2") || ext == QString("JPX") || // JPEG2000 file format - ext == QString("JPC") || // JPEG2000 code stream - ext == QString("PGX")) // JPEG2000 WM format + if (ext == TQString("JP2") || ext == TQString("JPX") || // JPEG2000 file format + ext == TQString("JPC") || // JPEG2000 code stream + ext == TQString("PGX")) // JPEG2000 WM format return JP2K; } // In second, we trying to parse file header. - FILE* f = fopen(QFile::encodeName(filePath), "rb"); + FILE* f = fopen(TQFile::encodeName(filePath), "rb"); if (!f) { @@ -564,7 +564,7 @@ DImg::FORMAT DImg::fileFormat(const QString& filePath) { int width, height, rgbmax; char nl; - FILE *file = fopen(QFile::encodeName(filePath), "rb"); + FILE *file = fopen(TQFile::encodeName(filePath), "rb"); if (fscanf (file, "P6 %d %d %d%c", &width, &height, &rgbmax, &nl) == 4) { @@ -595,8 +595,8 @@ DImg::FORMAT DImg::fileFormat(const QString& filePath) return JP2K; } - // In others cases, QImage will be used to try to open file. - return QIMAGE; + // In others cases, TQImage will be used to try to open file. + return TQIMAGE; } @@ -619,9 +619,9 @@ uint DImg::height() const return m_priv->height; } -QSize DImg::size() const +TQSize DImg::size() const { - return QSize(m_priv->width, m_priv->height); + return TQSize(m_priv->width, m_priv->height); } uchar* DImg::bits() const @@ -653,76 +653,76 @@ bool DImg::isReadOnly() const return m_priv->isReadOnly; } -bool DImg::getICCProfilFromFile(const QString& filePath) +bool DImg::getICCProfilFromFile(const TQString& filePath) { - QFile file(filePath); + TQFile file(filePath); if ( !file.open(IO_ReadOnly) ) return false; - QByteArray data(file.size()); - QDataStream stream( &file ); + TQByteArray data(file.size()); + TQDataStream stream( &file ); stream.readRawBytes(data.data(), data.size()); setICCProfil(data); file.close(); return true; } -bool DImg::setICCProfilToFile(const QString& filePath) +bool DImg::setICCProfilToFile(const TQString& filePath) { - QFile file(filePath); + TQFile file(filePath); if ( !file.open(IO_WriteOnly) ) return false; - QByteArray data(getICCProfil()); - QDataStream stream( &file ); + TQByteArray data(getICCProfil()); + TQDataStream stream( &file ); stream.writeRawBytes(data.data(), data.size()); file.close(); return true; } -QByteArray DImg::getComments() const +TQByteArray DImg::getComments() const { return metadata(COM); } -QByteArray DImg::getExif() const +TQByteArray DImg::getExif() const { return metadata(EXIF); } -QByteArray DImg::getIptc() const +TQByteArray DImg::getIptc() const { return metadata(IPTC); } -QByteArray DImg::getICCProfil() const +TQByteArray DImg::getICCProfil() const { return metadata(ICC); } -void DImg::setComments(const QByteArray& commentsData) +void DImg::setComments(const TQByteArray& commentsData) { - m_priv->metaData.replace(COM, commentsData); + m_priv->metaData.tqreplace(COM, commentsData); } -void DImg::setExif(const QByteArray& exifData) +void DImg::setExif(const TQByteArray& exifData) { - m_priv->metaData.replace(EXIF, exifData); + m_priv->metaData.tqreplace(EXIF, exifData); } -void DImg::setIptc(const QByteArray& iptcData) +void DImg::setIptc(const TQByteArray& iptcData) { - m_priv->metaData.replace(IPTC, iptcData); + m_priv->metaData.tqreplace(IPTC, iptcData); } -void DImg::setICCProfil(const QByteArray& profile) +void DImg::setICCProfil(const TQByteArray& profile) { - m_priv->metaData.replace(ICC, profile); + m_priv->metaData.tqreplace(ICC, profile); } -QByteArray DImg::metadata(DImg::METADATA key) const +TQByteArray DImg::metadata(DImg::METADATA key) const { - typedef QMap<int, QByteArray> MetaDataMap; + typedef TQMap<int, TQByteArray> MetaDataMap; for (MetaDataMap::iterator it = m_priv->metaData.begin(); it != m_priv->metaData.end(); ++it) { @@ -730,7 +730,7 @@ QByteArray DImg::metadata(DImg::METADATA key) const return it.data(); } - return QByteArray(); + return TQByteArray(); } uint DImg::numBytes() const @@ -759,30 +759,30 @@ int DImg::bitsDepth() const return 8; } -void DImg::setAttribute(const QString& key, const QVariant& value) +void DImg::setAttribute(const TQString& key, const TQVariant& value) { m_priv->attributes.insert(key, value); } -QVariant DImg::attribute(const QString& key) const +TQVariant DImg::attribute(const TQString& key) const { - if (m_priv->attributes.contains(key)) + if (m_priv->attributes.tqcontains(key)) return m_priv->attributes[key]; - return QVariant(); + return TQVariant(); } -void DImg::setEmbeddedText(const QString& key, const QString& text) +void DImg::setEmbeddedText(const TQString& key, const TQString& text) { m_priv->embeddedText.insert(key, text); } -QString DImg::embeddedText(const QString& key) const +TQString DImg::embeddedText(const TQString& key) const { - if (m_priv->embeddedText.contains(key)) + if (m_priv->embeddedText.tqcontains(key)) return m_priv->embeddedText[key]; - return QString(); + return TQString(); } DColor DImg::getPixelColor(uint x, uint y) const @@ -846,7 +846,7 @@ DImg DImg::copyMetaData() return img; } -DImg DImg::copy(QRect rect) +DImg DImg::copy(TQRect rect) { return copy(rect.x(), rect.y(), rect.width(), rect.height()); } @@ -1070,30 +1070,30 @@ void DImg::bitBlend (DColorComposer *composer, const uchar *src, uchar *dest, //--------------------------------------------------------------------------------------------------- -// QImage / QPixmap access +// TQImage / TQPixmap access -QImage DImg::copyQImage() +TQImage DImg::copyTQImage() { if (isNull()) - return QImage(); + return TQImage(); if (sixteenBit()) { DImg img(*this); img.detach(); img.convertDepth(32); - return img.copyQImage(); + return img.copyTQImage(); } - QImage img(width(), height(), 32); + TQImage img(width(), height(), 32); uchar* sptr = bits(); uint* dptr = (uint*)img.bits(); for (uint i=0; i < width()*height(); i++) { - *dptr++ = qRgba(sptr[2], sptr[1], sptr[0], sptr[3]); + *dptr++ = tqRgba(sptr[2], sptr[1], sptr[0], sptr[3]); sptr += 4; } @@ -1105,45 +1105,45 @@ QImage DImg::copyQImage() return img; } -QImage DImg::copyQImage(QRect rect) +TQImage DImg::copyTQImage(TQRect rect) { - return (copyQImage(rect.x(), rect.y(), rect.width(), rect.height())); + return (copyTQImage(rect.x(), rect.y(), rect.width(), rect.height())); } -QImage DImg::copyQImage(int x, int y, int w, int h) +TQImage DImg::copyTQImage(int x, int y, int w, int h) { if (isNull()) - return QImage(); + return TQImage(); DImg img = copy(x, y, w, h); if (img.sixteenBit()) img.convertDepth(32); - return img.copyQImage(); + return img.copyTQImage(); } -QPixmap DImg::convertToPixmap() +TQPixmap DImg::convertToPixmap() { if (isNull()) - return QPixmap(); + return TQPixmap(); if (sixteenBit()) { // make fastaaaa.. - return QPixmap(copyQImage(0, 0, width(), height())); + return TQPixmap(copyTQImage(0, 0, width(), height())); } - if (QImage::systemByteOrder() == QImage::BigEndian) + if (TQImage::systemByteOrder() == TQImage::BigEndian) { - QImage img(width(), height(), 32); + TQImage img(width(), height(), 32); uchar* sptr = bits(); uint* dptr = (uint*)img.bits(); for (uint i=0; i<width()*height(); i++) { - *dptr++ = qRgba(sptr[2], sptr[1], sptr[0], sptr[3]); + *dptr++ = tqRgba(sptr[2], sptr[1], sptr[0], sptr[3]); sptr += 4; } @@ -1152,25 +1152,25 @@ QPixmap DImg::convertToPixmap() img.setAlphaBuffer(true); } - return QPixmap(img); + return TQPixmap(img); } else { - QImage img(bits(), width(), height(), 32, 0, 0, QImage::IgnoreEndian); + TQImage img(bits(), width(), height(), 32, 0, 0, TQImage::IgnoreEndian); if (hasAlpha()) { img.setAlphaBuffer(true); } - return QPixmap(img); + return TQPixmap(img); } } -QPixmap DImg::convertToPixmap(IccTransform *monitorICCtrans) +TQPixmap DImg::convertToPixmap(IccTransform *monitorICCtrans) { if (isNull()) - return QPixmap(); + return TQPixmap(); if (!monitorICCtrans->hasOutputProfile()) { @@ -1183,7 +1183,7 @@ QPixmap DImg::convertToPixmap(IccTransform *monitorICCtrans) // Without embedded profile if (img.getICCProfil().isNull()) { - QByteArray fakeProfile; + TQByteArray fakeProfile; monitorICCtrans->apply(img, fakeProfile, monitorICCtrans->getRenderingIntent(), monitorICCtrans->getUseBPC(), false, monitorICCtrans->inputProfile().isNull()); @@ -1198,12 +1198,12 @@ QPixmap DImg::convertToPixmap(IccTransform *monitorICCtrans) return (img.convertToPixmap()); } -QImage DImg::pureColorMask(ExposureSettingsContainer *expoSettings) +TQImage DImg::pureColorMask(ExposureSettingsContainer *expoSettings) { if (isNull() || (!expoSettings->underExposureIndicator && !expoSettings->overExposureIndicator)) - return QImage(); + return TQImage(); - QImage img(size(), 32); + TQImage img(size(), 32); img.fill(0x00000000); // Full transparent. img.setAlphaBuffer(true); @@ -1247,7 +1247,7 @@ QImage DImg::pureColorMask(ExposureSettingsContainer *expoSettings) // basic imaging operations -void DImg::crop(QRect rect) +void DImg::crop(TQRect rect) { crop(rect.x(), rect.y(), rect.width(), rect.height()); } diff --git a/digikam/libs/dimg/dimg.h b/digikam/libs/dimg/dimg.h index a417e51..e0e5952 100644 --- a/digikam/libs/dimg/dimg.h +++ b/digikam/libs/dimg/dimg.h @@ -26,14 +26,14 @@ #ifndef DIMG_H #define DIMG_H -// Qt includes. +// TQt includes. -#include <qcstring.h> -#include <qsize.h> -#include <qrect.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qvariant.h> +#include <tqcstring.h> +#include <tqsize.h> +#include <tqrect.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqvariant.h> // Local includes. @@ -42,7 +42,7 @@ #include "dcolor.h" #include "dcolorcomposer.h" -class QString; +class TQString; namespace Digikam { @@ -65,7 +65,7 @@ public: RAW, PPM, JP2K, - QIMAGE + TQIMAGE }; enum METADATA @@ -90,17 +90,17 @@ public: }; /** Identify file format */ - static FORMAT fileFormat(const QString& filePath); + static FORMAT fileFormat(const TQString& filePath); /** Create null image */ DImg(); - /** Load image using QCString as file path */ - DImg(const QCString& filePath, DImgLoaderObserver *observer = 0, + /** Load image using TQCString as file path */ + DImg(const TQCString& filePath, DImgLoaderObserver *observer = 0, DRawDecoding rawDecodingSettings=DRawDecoding()); - /** Load image using QString as file path */ - DImg(const QString& filePath, DImgLoaderObserver *observer = 0, + /** Load image using TQString as file path */ + DImg(const TQString& filePath, DImgLoaderObserver *observer = 0, DRawDecoding rawDecodingSettings=DRawDecoding()); /** Copy image: Creates a shallow copy that refers to the same shared data. @@ -108,10 +108,10 @@ public: */ DImg(const DImg& image); - /** Copy image: Creates a copy of a QImage object. If the QImage is null, a + /** Copy image: Creates a copy of a TQImage object. If the TQImage is null, a null DImg will be created. */ - DImg(const QImage& image); + DImg(const TQImage& image); /** Create image from data. If data is 0, a new buffer will be allocated, otherwise the given data will be used: @@ -171,15 +171,15 @@ public: - bool load(const QString& filePath, DImgLoaderObserver *observer = 0, + bool load(const TQString& filePath, DImgLoaderObserver *observer = 0, DRawDecoding rawDecodingSettings=DRawDecoding()); - bool save(const QString& filePath, const QString& format, DImgLoaderObserver *observer = 0); + bool save(const TQString& filePath, const TQString& format, DImgLoaderObserver *observer = 0); bool isNull() const; uint width() const; uint height() const; - QSize size() const; + TQSize size() const; uchar* bits() const; uchar* scanLine(uint i) const; bool hasAlpha() const; @@ -210,25 +210,25 @@ public: bool isReadOnly() const; /** Metadata manipulation methods */ - QByteArray getComments() const; - QByteArray getExif() const; - QByteArray getIptc() const; - QByteArray getICCProfil() const; - void setComments(const QByteArray& commentsData); - void setExif(const QByteArray& exifData); - void setIptc(const QByteArray& iptcData); - void setICCProfil(const QByteArray& profile); + TQByteArray getComments() const; + TQByteArray getExif() const; + TQByteArray getIptc() const; + TQByteArray getICCProfil() const; + void setComments(const TQByteArray& commentsData); + void setExif(const TQByteArray& exifData); + void setIptc(const TQByteArray& iptcData); + void setICCProfil(const TQByteArray& profile); - QByteArray metadata(METADATA key) const; + TQByteArray metadata(METADATA key) const; - bool getICCProfilFromFile(const QString& filePath); - bool setICCProfilToFile(const QString& filePath); + bool getICCProfilFromFile(const TQString& filePath); + bool setICCProfilToFile(const TQString& filePath); - void setAttribute(const QString& key, const QVariant& value); - QVariant attribute(const QString& key) const; + void setAttribute(const TQString& key, const TQVariant& value); + TQVariant attribute(const TQString& key) const; - void setEmbeddedText(const QString& key, const QString& text); - QString embeddedText(const QString& key) const; + void setEmbeddedText(const TQString& key, const TQString& text); + TQString embeddedText(const TQString& key) const; /** Return a deep copy of full image */ @@ -245,7 +245,7 @@ public: DImg copyMetaData(); /** Return a region of image */ - DImg copy(QRect rect); + DImg copy(TQRect rect); DImg copy(int x, int y, int w, int h); /** Copy a region of pixels from a source image to this image. @@ -271,22 +271,22 @@ public: DColorComposer::MultiplicationFlags multiplicationFlags = DColorComposer::NoMultiplication); - /** QImage wrapper methods */ - QImage copyQImage(); - QImage copyQImage(QRect rect); - QImage copyQImage(int x, int y, int w, int h); + /** TQImage wrapper methods */ + TQImage copyTQImage(); + TQImage copyTQImage(TQRect rect); + TQImage copyTQImage(int x, int y, int w, int h); /** Crop image to the specified region */ - void crop(QRect rect); + void crop(TQRect rect); void crop(int x, int y, int w, int h); /** Set width and height of this image, smoothScale it to the given size */ void resize(int w, int h); /** Return a version of this image scaled to the specified size with the specified mode. - See QSize documentation for information on available modes + See TQSize documentation for information on available modes */ - DImg smoothScale(int width, int height, QSize::ScaleMode scaleMode=QSize::ScaleFree); + DImg smoothScale(int width, int height, TQSize::ScaleMode scaleMode=TQSize::ScaleFree); /** Take the region specified by the rectangle sx|sy, width and height sw * sh, and scale it to an image with size dw * dh @@ -297,13 +297,13 @@ public: void rotate(ANGLE angle); void flip(FLIP direction); - QPixmap convertToPixmap(); - QPixmap convertToPixmap(IccTransform* monitorICCtrans); + TQPixmap convertToPixmap(); + TQPixmap convertToPixmap(IccTransform* monitorICCtrans); - /** Return a mask image where pure white and pure black pixels are over-colored. + /** Return a tqmask image where pure white and pure black pixels are over-colored. This way is used to identify over and under exposed pixels. */ - QImage pureColorMask(ExposureSettingsContainer *expoSettings); + TQImage pureColorMask(ExposureSettingsContainer *expoSettings); /** Convert depth of image. Depth is bytesDepth * bitsDepth. If depth is 32, converts to 8 bits, diff --git a/digikam/libs/dimg/dimgprivate.h b/digikam/libs/dimg/dimgprivate.h index 62aac17..021e98f 100644 --- a/digikam/libs/dimg/dimgprivate.h +++ b/digikam/libs/dimg/dimgprivate.h @@ -25,13 +25,13 @@ #ifndef DIMGPRIVATE_H #define DIMGPRIVATE_H -// Qt includes. +// TQt includes. -#include <qshared.h> -#include <qstring.h> -#include <qcstring.h> -#include <qvariant.h> -#include <qmap.h> +#include <tqshared.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqvariant.h> +#include <tqmap.h> // Local includes. @@ -40,7 +40,7 @@ namespace Digikam { -class DIGIKAM_EXPORT DImgPrivate : public QShared +class DIGIKAM_EXPORT DImgPrivate : public TQShared { public: @@ -70,9 +70,9 @@ public: unsigned char *data; - QMap<int, QByteArray> metaData; - QMap<QString, QVariant> attributes; - QMap<QString, QString> embeddedText; + TQMap<int, TQByteArray> metaData; + TQMap<TQString, TQVariant> attributes; + TQMap<TQString, TQString> embeddedText; }; diff --git a/digikam/libs/dimg/dimgscale.cpp b/digikam/libs/dimg/dimgscale.cpp index 9c6448a..696554f 100644 --- a/digikam/libs/dimg/dimgscale.cpp +++ b/digikam/libs/dimg/dimgscale.cpp @@ -13,7 +13,7 @@ * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> * - * Ported to C++/QImage by Daniel M. Duley + * Ported to C++/TQImage by Daniel M. Duley * Following modification are (C) Daniel M. Duley * Changes include formatting, namespaces and other C++'ings, removal of old * #ifdef'ed code, and removal of unneeded border calculation code. @@ -101,7 +101,7 @@ namespace DImgScale using namespace DImgScale; -DImg DImg::smoothScale(int dw, int dh, QSize::ScaleMode scaleMode) +DImg DImg::smoothScale(int dw, int dh, TQSize::ScaleMode scaleMode) { if (dw < 0 || dh < 0 || isNull()) return DImg(); @@ -112,8 +112,8 @@ DImg DImg::smoothScale(int dw, int dh, QSize::ScaleMode scaleMode) if (w <= 0 || h <= 0) return DImg(); - QSize newSize(w, h); - newSize.scale( QSize(dw, dh), scaleMode ); + TQSize newSize(w, h); + newSize.tqscale( TQSize(dw, dh), scaleMode ); if (!newSize.isValid()) return DImg(); diff --git a/digikam/libs/dimg/drawdecoding.h b/digikam/libs/dimg/drawdecoding.h index 6dfa2d3..e2d82fd 100644 --- a/digikam/libs/dimg/drawdecoding.h +++ b/digikam/libs/dimg/drawdecoding.h @@ -26,10 +26,10 @@ #ifndef DRAW_DECODING_H #define DRAW_DECODING_H -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qpointarray.h> +#include <tqvaluelist.h> +#include <tqpointarray.h> // LibKDcraw includes. @@ -75,8 +75,8 @@ public: gamma = 1.0; saturation = 1.0; exposureComp = 0.0; - curveAdjust = QPointArray(); - levelsAdjust = QValueList<int>(); + curveAdjust = TQPointArray(); + levelsAdjust = TQValueList<int>(); }; /** Method to check is a post-processing setting have been changed @@ -116,11 +116,11 @@ public: /** Luminosity curve adjustements. */ - QPointArray curveAdjust; + TQPointArray curveAdjust; /** Levels adjustements: 4 channels (L, R, G, B * 2 values). */ - QValueList<int> levelsAdjust; + TQValueList<int> levelsAdjust; }; } // namespace Digikam diff --git a/digikam/libs/dimg/exposurecontainer.h b/digikam/libs/dimg/exposurecontainer.h index 95eea39..6246925 100644 --- a/digikam/libs/dimg/exposurecontainer.h +++ b/digikam/libs/dimg/exposurecontainer.h @@ -24,9 +24,9 @@ #ifndef EXPOSURESETTINGSCONTAINER_H #define EXPOSURESETTINGSCONTAINER_H -// Qt includes. +// TQt includes. -#include <qcolor.h> +#include <tqcolor.h> // Local includes. @@ -45,8 +45,8 @@ public: underExposureIndicator = false; overExposureIndicator = false; - underExposureColor = Qt::white; - overExposureColor = Qt::black; + underExposureColor = TQt::white; + overExposureColor = TQt::black; }; ~ExposureSettingsContainer(){}; @@ -56,8 +56,8 @@ public: bool underExposureIndicator; bool overExposureIndicator; - QColor underExposureColor; - QColor overExposureColor; + TQColor underExposureColor; + TQColor overExposureColor; }; } // namespace Digikam diff --git a/digikam/libs/dimg/filters/bcgmodifier.cpp b/digikam/libs/dimg/filters/bcgmodifier.cpp index ad3c840..b3899c2 100644 --- a/digikam/libs/dimg/filters/bcgmodifier.cpp +++ b/digikam/libs/dimg/filters/bcgmodifier.cpp @@ -22,8 +22,8 @@ * * ============================================================ */ -#define CLAMP_0_255(x) QMAX(QMIN(x, 255), 0) -#define CLAMP_0_65535(x) QMAX(QMIN(x, 65535), 0) +#define CLAMP_0_255(x) TQMAX(TQMIN(x, 255), 0) +#define CLAMP_0_65535(x) TQMAX(TQMIN(x, 65535), 0) // C++ includes. diff --git a/digikam/libs/dimg/filters/colormodifier.cpp b/digikam/libs/dimg/filters/colormodifier.cpp index 382fc00..74ddf24 100644 --- a/digikam/libs/dimg/filters/colormodifier.cpp +++ b/digikam/libs/dimg/filters/colormodifier.cpp @@ -21,8 +21,8 @@ * * ============================================================ */ -#define CLAMP_0_255(x) QMAX(QMIN(x, 255), 0) -#define CLAMP_0_65535(x) QMAX(QMIN(x, 65535), 0) +#define CLAMP_0_255(x) TQMAX(TQMIN(x, 255), 0) +#define CLAMP_0_65535(x) TQMAX(TQMIN(x, 65535), 0) // C++ includes. diff --git a/digikam/libs/dimg/filters/dimggaussianblur.cpp b/digikam/libs/dimg/filters/dimggaussianblur.cpp index 87ada87..543bc69 100644 --- a/digikam/libs/dimg/filters/dimggaussianblur.cpp +++ b/digikam/libs/dimg/filters/dimggaussianblur.cpp @@ -38,18 +38,18 @@ namespace Digikam { -DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, QObject *parent, int radius) - : DImgThreadedFilter(orgImage, parent, "GaussianBlur") +DImgGaussianBlur::DImgGaussianBlur(DImg *orgImage, TQObject *tqparent, int radius) + : DImgThreadedFilter(orgImage, tqparent, "GaussianBlur") { m_radius = radius; initFilter(); } -DImgGaussianBlur::DImgGaussianBlur(DImgThreadedFilter *parentFilter, +DImgGaussianBlur::DImgGaussianBlur(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin, int progressEnd, int radius) - : DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd, - parentFilter->filterName() + ": GaussianBlur") + : DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd, + tqparentFilter->filterName() + ": GaussianBlur") { m_radius = radius; filterImage(); diff --git a/digikam/libs/dimg/filters/dimggaussianblur.h b/digikam/libs/dimg/filters/dimggaussianblur.h index bbb0a6c..1a7d01d 100644 --- a/digikam/libs/dimg/filters/dimggaussianblur.h +++ b/digikam/libs/dimg/filters/dimggaussianblur.h @@ -40,10 +40,10 @@ class DIGIKAM_EXPORT DImgGaussianBlur : public DImgThreadedFilter public: - DImgGaussianBlur(DImg *orgImage, QObject *parent=0, int radius=3); + DImgGaussianBlur(DImg *orgImage, TQObject *tqparent=0, int radius=3); // Constructor for slave mode: execute immediately in current thread with specified master filter - DImgGaussianBlur(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, + DImgGaussianBlur(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin=0, int progressEnd=100, int radius=3); ~DImgGaussianBlur(){}; diff --git a/digikam/libs/dimg/filters/dimgimagefilters.cpp b/digikam/libs/dimg/filters/dimgimagefilters.cpp index ed41704..523e62c 100644 --- a/digikam/libs/dimg/filters/dimgimagefilters.cpp +++ b/digikam/libs/dimg/filters/dimgimagefilters.cpp @@ -785,7 +785,7 @@ void DImgImageFilters::channelMixerImage(uchar *data, int Width, int Height, boo } } -/** Change color tonality of an image to appling a RGB color mask.*/ +/** Change color tonality of an image to appling a RGB color tqmask.*/ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool sixteenBit, int redMask, int greenMask, int blueMask) { @@ -798,8 +798,8 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s int hue, sat, lig; - DColor mask(redMask, greenMask, blueMask, 0, sixteenBit); - mask.getHSL(&hue, &sat, &lig); + DColor tqmask(redMask, greenMask, blueMask, 0, sixteenBit); + tqmask.getHSL(&hue, &sat, &lig); if (!sixteenBit) // 8 bits image. { @@ -807,15 +807,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s for (int i = 0 ; i < width*height ; i++) { - // Convert to grayscale using tonal mask + // Convert to grayscale using tonal tqmask lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]); - mask.setRGB(hue, sat, lig, sixteenBit); + tqmask.setRGB(hue, sat, lig, sixteenBit); - ptr[0] = (uchar)mask.blue(); - ptr[1] = (uchar)mask.green(); - ptr[2] = (uchar)mask.red(); + ptr[0] = (uchar)tqmask.blue(); + ptr[1] = (uchar)tqmask.green(); + ptr[2] = (uchar)tqmask.red(); ptr += 4; } } @@ -825,15 +825,15 @@ void DImgImageFilters::changeTonality(uchar *data, int width, int height, bool s for (int i = 0 ; i < width*height ; i++) { - // Convert to grayscale using tonal mask + // Convert to grayscale using tonal tqmask lig = ROUND (0.3 * ptr[2] + 0.59 * ptr[1] + 0.11 * ptr[0]); - mask.setRGB(hue, sat, lig, sixteenBit); + tqmask.setRGB(hue, sat, lig, sixteenBit); - ptr[0] = (unsigned short)mask.blue(); - ptr[1] = (unsigned short)mask.green(); - ptr[2] = (unsigned short)mask.red(); + ptr[0] = (unsigned short)tqmask.blue(); + ptr[1] = (unsigned short)tqmask.green(); + ptr[2] = (unsigned short)tqmask.red(); ptr += 4; } } diff --git a/digikam/libs/dimg/filters/dimgimagefilters.h b/digikam/libs/dimg/filters/dimgimagefilters.h index 71a83dd..009c3ef 100644 --- a/digikam/libs/dimg/filters/dimgimagefilters.h +++ b/digikam/libs/dimg/filters/dimgimagefilters.h @@ -24,8 +24,8 @@ #ifndef DIMGIMAGE_FILTERS_H #define DIMGIMAGE_FILTERS_H -#define CLAMP0255(a) QMIN(QMAX(a,0), 255) -#define CLAMP065535(a) QMIN(QMAX(a,0), 65535) +#define CLAMP0255(a) TQMIN(TQMAX(a,0), 255) +#define CLAMP065535(a) TQMIN(TQMAX(a,0), 65535) #define CLAMP(x,l,u) ((x)<(l)?(l):((x)>(u)?(u):(x))) #define ROUND(x) ((int) ((x) + 0.5)) diff --git a/digikam/libs/dimg/filters/dimgsharpen.cpp b/digikam/libs/dimg/filters/dimgsharpen.cpp index b22bc7c..83553f8 100644 --- a/digikam/libs/dimg/filters/dimgsharpen.cpp +++ b/digikam/libs/dimg/filters/dimgsharpen.cpp @@ -41,19 +41,19 @@ namespace Digikam { -DImgSharpen::DImgSharpen(DImg *orgImage, QObject *parent, double radius, double sigma) - : DImgThreadedFilter(orgImage, parent, "Sharpen") +DImgSharpen::DImgSharpen(DImg *orgImage, TQObject *tqparent, double radius, double sigma) + : DImgThreadedFilter(orgImage, tqparent, "Sharpen") { m_radius = radius; m_sigma = sigma; initFilter(); } -DImgSharpen::DImgSharpen(DImgThreadedFilter *parentFilter, +DImgSharpen::DImgSharpen(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin, int progressEnd, double radius, double sigma) - : DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd, - parentFilter->filterName() + ": Sharpen") + : DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd, + tqparentFilter->filterName() + ": Sharpen") { m_radius = radius; m_sigma = sigma; diff --git a/digikam/libs/dimg/filters/dimgsharpen.h b/digikam/libs/dimg/filters/dimgsharpen.h index a8efeba..76e5c13 100644 --- a/digikam/libs/dimg/filters/dimgsharpen.h +++ b/digikam/libs/dimg/filters/dimgsharpen.h @@ -40,10 +40,10 @@ class DIGIKAM_EXPORT DImgSharpen : public DImgThreadedFilter public: - DImgSharpen(DImg *orgImage, QObject *parent=0, double radius=0.0, double sigma=1.0); + DImgSharpen(DImg *orgImage, TQObject *tqparent=0, double radius=0.0, double sigma=1.0); // Constructor for slave mode: execute immediately in current thread with specified master filter - DImgSharpen(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, + DImgSharpen(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin=0, int progressEnd=100, double radius=0.0, double sigma=1.0); ~DImgSharpen(){}; diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp b/digikam/libs/dimg/filters/dimgthreadedfilter.cpp index 85210c9..15086bd 100644 --- a/digikam/libs/dimg/filters/dimgthreadedfilter.cpp +++ b/digikam/libs/dimg/filters/dimgthreadedfilter.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qevent.h> -#include <qdeepcopy.h> +#include <tqobject.h> +#include <tqevent.h> +#include <tqdeepcopy.h> // Local includes. @@ -35,18 +35,18 @@ namespace Digikam { -DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, QObject *parent, - const QString& name) - : QThread() +DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, TQObject *tqparent, + const TQString& name) + : TQThread() { // remove meta data m_orgImage = orgImage->copyImageData(); - m_parent = parent; + m_parent = tqparent; m_cancel = false; // See B.K.O #133026: make a deep copy of Qstring to prevent crash // on Hyperthreading computer. - m_name = QDeepCopy<QString>(name); + m_name = TQDeepCopy<TQString>(name); m_master = 0; m_slave = 0; @@ -56,7 +56,7 @@ DImgThreadedFilter::DImgThreadedFilter(DImg *orgImage, QObject *parent, DImgThreadedFilter::DImgThreadedFilter(DImgThreadedFilter *master, const DImg &orgImage, const DImg &destImage, int progressBegin, int progressEnd, - const QString& name) + const TQString& name) { m_orgImage = orgImage; m_destImage = destImage; @@ -65,7 +65,7 @@ DImgThreadedFilter::DImgThreadedFilter(DImgThreadedFilter *master, const DImg &o // See B.K.O #133026: make a deep copy of Qstring to prevent crash // on Hyperthreading computer. - m_name = QDeepCopy<QString>(name); + m_name = TQDeepCopy<TQString>(name); m_master = master; m_slave = 0; @@ -93,11 +93,11 @@ void DImgThreadedFilter::initFilter(void) if (m_parent) start(); // m_parent is valide, start thread ==> run() else - startComputation(); // no parent : no using thread. + startComputation(); // no tqparent : no using thread. } else // No image data { - if (m_parent) // If parent then send event about a problem. + if (m_parent) // If tqparent then send event about a problem. { postProgress(0, false, false); DDebug() << m_name << "::No valid image data !!! ..." << endl; @@ -131,7 +131,7 @@ void DImgThreadedFilter::postProgress(int progress, bool starting, bool success) eventData->progress = progress; eventData->starting = starting; eventData->success = success; - QApplication::postEvent(m_parent, new QCustomEvent(QEvent::User, eventData)); + TQApplication::postEvent(m_parent, new TQCustomEvent(TQEvent::User, eventData)); } } diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.h b/digikam/libs/dimg/filters/dimgthreadedfilter.h index 20eede3..30e27ce 100644 --- a/digikam/libs/dimg/filters/dimgthreadedfilter.h +++ b/digikam/libs/dimg/filters/dimgthreadedfilter.h @@ -24,10 +24,10 @@ #ifndef DIMGTHREADEDFILTER_H #define DIMGTHREADEDFILTER_H -// Qt includes. +// TQt includes. -#include <qthread.h> -#include <qstring.h> +#include <tqthread.h> +#include <tqstring.h> // KDE includes. @@ -38,17 +38,17 @@ #include "dimg.h" #include "digikam_export.h" -class QObject; +class TQObject; namespace Digikam { -class DIGIKAM_EXPORT DImgThreadedFilter : public QThread +class DIGIKAM_EXPORT DImgThreadedFilter : public TQThread { public: -/** Class used to post status of computation to parent. */ +/** Class used to post status of computation to tqparent. */ class EventData { public: @@ -66,8 +66,8 @@ class EventData public: - DImgThreadedFilter(DImg *orgImage, QObject *parent=0, - const QString& name=QString()); + DImgThreadedFilter(DImg *orgImage, TQObject *tqparent=0, + const TQString& name=TQString()); ~DImgThreadedFilter(); @@ -76,7 +76,7 @@ public: virtual void startComputation(void); virtual void stopComputation(void); - const QString &filterName() { return m_name; }; + const TQString &filterName() { return m_name; }; protected: @@ -92,8 +92,8 @@ protected: /** Clean up filter data if necessary. Call by stopComputation() method. */ virtual void cleanupFilter(void){}; - /** Post Event to parent about progress. Warning: you need to delete - 'EventData' instance to 'customEvent' parent implementation. */ + /** Post Event to tqparent about progress. Warning: you need to delete + 'EventData' instance to 'customEvent' tqparent implementation. */ void postProgress(int progress=0, bool starting=true, bool success=false); protected: @@ -106,12 +106,12 @@ protected: The filter will be executed in the current thread. orgImage and destImage will not be copied. progressBegin and progressEnd can indicate the progress span - that the slave filter uses in the parent filter's progress. + that the slave filter uses in the tqparent filter's progress. Any derived filter class that is publicly available to other filters should implement an additional constructor using this constructor. */ DImgThreadedFilter(DImgThreadedFilter *master, const DImg &orgImage, const DImg &destImage, - int progressBegin=0, int progressEnd=100, const QString& name=QString()); + int progressBegin=0, int progressEnd=100, const TQString& name=TQString()); /** Inform the master that there is currently a slave. At destruction of the slave, call with slave=0. */ void setSlave(DImgThreadedFilter *slave); @@ -125,15 +125,15 @@ protected: /** Used to stop compution loop. */ bool m_cancel; - /** The progress span that a slave filter uses in the parent filter's progress. */ + /** The progress span that a slave filter uses in the tqparent filter's progress. */ int m_progressBegin; int m_progressSpan; - /** To post event from thread to parent. */ - QObject *m_parent; + /** To post event from thread to tqparent. */ + TQObject *m_parent; /** Filter name.*/ - QString m_name; + TQString m_name; /** Copy of original Image data. */ DImg m_orgImage; diff --git a/digikam/libs/dimg/filters/hslmodifier.cpp b/digikam/libs/dimg/filters/hslmodifier.cpp index 42a7d26..4f924d7 100644 --- a/digikam/libs/dimg/filters/hslmodifier.cpp +++ b/digikam/libs/dimg/filters/hslmodifier.cpp @@ -22,8 +22,8 @@ * ============================================================ */ #define CLAMP(x,l,u) ((x)<(l)?(l):((x)>(u)?(u):(x))) -#define CLAMP_0_255(x) QMAX(QMIN(x, 255), 0) -#define CLAMP_0_65535(x) QMAX(QMIN(x, 65535), 0) +#define CLAMP_0_255(x) TQMAX(TQMIN(x, 255), 0) +#define CLAMP_0_65535(x) TQMAX(TQMIN(x, 65535), 0) // C++ includes. diff --git a/digikam/libs/dimg/filters/icctransform.cpp b/digikam/libs/dimg/filters/icctransform.cpp index e6009c3..baefc2b 100644 --- a/digikam/libs/dimg/filters/icctransform.cpp +++ b/digikam/libs/dimg/filters/icctransform.cpp @@ -24,11 +24,11 @@ #include <config.h> -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qcstring.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqfile.h> // KDE includes. @@ -63,10 +63,10 @@ public: bool do_proof_profile; bool has_embedded_profile; - QByteArray embedded_profile; - QByteArray input_profile; - QByteArray output_profile; - QByteArray proof_profile; + TQByteArray embedded_profile; + TQByteArray input_profile; + TQByteArray output_profile; + TQByteArray proof_profile; }; IccTransform::IccTransform() @@ -90,22 +90,22 @@ bool IccTransform::hasOutputProfile() return !(d->output_profile.isEmpty()); } -QByteArray IccTransform::embeddedProfile() const +TQByteArray IccTransform::embeddedProfile() const { return d->embedded_profile; } -QByteArray IccTransform::inputProfile() const +TQByteArray IccTransform::inputProfile() const { return d->input_profile; } -QByteArray IccTransform::outputProfile() const +TQByteArray IccTransform::outputProfile() const { return d->output_profile; } -QByteArray IccTransform::proofProfile() const +TQByteArray IccTransform::proofProfile() const { return d->proof_profile; } @@ -131,10 +131,10 @@ void IccTransform::getEmbeddedProfile(const DImg& image) } } -QString IccTransform::getProfileDescription(const QString& profile) +TQString IccTransform::getProfileDescription(const TQString& profile) { - cmsHPROFILE _profile = cmsOpenProfileFromFile(QFile::encodeName(profile), "r"); - QString _description = cmsTakeProductDesc(_profile); + cmsHPROFILE _profile = cmsOpenProfileFromFile(TQFile::encodeName(profile), "r"); + TQString _description = cmsTakeProductDesc(_profile); cmsCloseProfile(_profile); return _description; } @@ -153,39 +153,39 @@ bool IccTransform::getUseBPC() return config->readBoolEntry("BPCAlgorithm", false); } -QByteArray IccTransform::loadICCProfilFile(const QString& filePath) +TQByteArray IccTransform::loadICCProfilFile(const TQString& filePath) { - QFile file(filePath); + TQFile file(filePath); if ( !file.open(IO_ReadOnly) ) - return QByteArray(); + return TQByteArray(); - QByteArray data(file.size()); - QDataStream stream( &file ); + TQByteArray data(file.size()); + TQDataStream stream( &file ); stream.readRawBytes(data.data(), data.size()); file.close(); return data; } -void IccTransform::setProfiles(const QString& input_profile, const QString& output_profile) +void IccTransform::setProfiles(const TQString& input_profile, const TQString& output_profile) { d->input_profile = loadICCProfilFile(input_profile); d->output_profile = loadICCProfilFile(output_profile); } -void IccTransform::setProfiles(const QString& input_profile, const QString& output_profile, - const QString& proof_profile) +void IccTransform::setProfiles(const TQString& input_profile, const TQString& output_profile, + const TQString& proof_profile) { d->input_profile = loadICCProfilFile(input_profile); d->output_profile = loadICCProfilFile(output_profile); d->proof_profile = loadICCProfilFile(proof_profile); } -void IccTransform::setProfiles(const QString& output_profile) +void IccTransform::setProfiles(const TQString& output_profile) { d->output_profile = loadICCProfilFile(output_profile); } -void IccTransform::setProfiles(const QString& output_profile, const QString& proof_profile, bool forProof) +void IccTransform::setProfiles(const TQString& output_profile, const TQString& proof_profile, bool forProof) { if (forProof) { @@ -194,41 +194,41 @@ void IccTransform::setProfiles(const QString& output_profile, const QString& pro } } -QString IccTransform::getEmbeddedProfileDescriptor() +TQString IccTransform::getEmbeddedProfileDescriptor() { if (d->embedded_profile.isEmpty()) - return QString(); + return TQString(); cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(d->embedded_profile.data(), (DWORD)d->embedded_profile.size()); - QString embeddedProfileDescriptor = QString(cmsTakeProductDesc(tmpProfile)); + TQString embeddedProfileDescriptor = TQString(cmsTakeProductDesc(tmpProfile)); cmsCloseProfile(tmpProfile); return embeddedProfileDescriptor; } -QString IccTransform::getInputProfileDescriptor() +TQString IccTransform::getInputProfileDescriptor() { - if (d->input_profile.isEmpty()) return QString(); + if (d->input_profile.isEmpty()) return TQString(); cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(d->input_profile.data(), (DWORD)d->input_profile.size()); - QString embeddedProfileDescriptor = QString(cmsTakeProductDesc(tmpProfile)); + TQString embeddedProfileDescriptor = TQString(cmsTakeProductDesc(tmpProfile)); cmsCloseProfile(tmpProfile); return embeddedProfileDescriptor; } -QString IccTransform::getOutpoutProfileDescriptor() +TQString IccTransform::getOutpoutProfileDescriptor() { - if (d->output_profile.isEmpty()) return QString(); + if (d->output_profile.isEmpty()) return TQString(); cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(d->output_profile.data(), (DWORD)d->output_profile.size()); - QString embeddedProfileDescriptor = QString(cmsTakeProductDesc(tmpProfile)); + TQString embeddedProfileDescriptor = TQString(cmsTakeProductDesc(tmpProfile)); cmsCloseProfile(tmpProfile); return embeddedProfileDescriptor; } -QString IccTransform::getProofProfileDescriptor() +TQString IccTransform::getProofProfileDescriptor() { - if (d->proof_profile.isEmpty()) return QString(); + if (d->proof_profile.isEmpty()) return TQString(); cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(d->proof_profile.data(), (DWORD)d->proof_profile.size()); - QString embeddedProfileDescriptor = QString(cmsTakeProductDesc(tmpProfile)); + TQString embeddedProfileDescriptor = TQString(cmsTakeProductDesc(tmpProfile)); cmsCloseProfile(tmpProfile); return embeddedProfileDescriptor; } @@ -525,7 +525,7 @@ bool IccTransform::apply(DImg& image) return true; } -bool IccTransform::apply( DImg& image, QByteArray& profile, int intent, bool useBPC, +bool IccTransform::apply( DImg& image, TQByteArray& profile, int intent, bool useBPC, bool checkGamut, bool useBuiltin ) { cmsHPROFILE inprofile=0, outprofile=0, proofprofile=0; diff --git a/digikam/libs/dimg/filters/icctransform.h b/digikam/libs/dimg/filters/icctransform.h index 543d284..0590c44 100644 --- a/digikam/libs/dimg/filters/icctransform.h +++ b/digikam/libs/dimg/filters/icctransform.h @@ -25,9 +25,9 @@ #ifndef ICCTRANSFORM_H #define ICCTRANSFORM_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. @@ -47,7 +47,7 @@ public: ~IccTransform(); bool apply(DImg& image); - bool apply(DImg& image, QByteArray& profile, int intent, + bool apply(DImg& image, TQByteArray& profile, int intent, bool useBPC=false, bool checkGamut=false, bool useBuiltin=false); void getTransformType(bool do_proof_profile); @@ -58,30 +58,30 @@ public: bool hasInputProfile(); bool hasOutputProfile(); - QByteArray embeddedProfile() const; - QByteArray inputProfile() const; - QByteArray outputProfile() const; - QByteArray proofProfile() const; + TQByteArray embeddedProfile() const; + TQByteArray inputProfile() const; + TQByteArray outputProfile() const; + TQByteArray proofProfile() const; /** Input profile from file methods */ - void setProfiles(const QString& input_profile, const QString& output_profile); - void setProfiles(const QString& input_profile, const QString& output_profile, const QString& proof_profile); + void setProfiles(const TQString& input_profile, const TQString& output_profile); + void setProfiles(const TQString& input_profile, const TQString& output_profile, const TQString& proof_profile); /** Embedded input profile methods */ - void setProfiles(const QString& output_profile); - void setProfiles(const QString& output_profile, const QString& proof_profile, bool forProof); + void setProfiles(const TQString& output_profile); + void setProfiles(const TQString& output_profile, const TQString& proof_profile, bool forProof); /** Profile info methods */ - QString getProfileDescription(const QString& profile); + TQString getProfileDescription(const TQString& profile); - QString getEmbeddedProfileDescriptor(); - QString getInputProfileDescriptor(); - QString getOutpoutProfileDescriptor(); - QString getProofProfileDescriptor(); + TQString getEmbeddedProfileDescriptor(); + TQString getInputProfileDescriptor(); + TQString getOutpoutProfileDescriptor(); + TQString getProofProfileDescriptor(); private: - QByteArray loadICCProfilFile(const QString& filePath); + TQByteArray loadICCProfilFile(const TQString& filePath); private: diff --git a/digikam/libs/dimg/loaders/dimgloader.cpp b/digikam/libs/dimg/loaders/dimgloader.cpp index 9c3107e..85efce3 100644 --- a/digikam/libs/dimg/loaders/dimgloader.cpp +++ b/digikam/libs/dimg/loaders/dimgloader.cpp @@ -92,39 +92,39 @@ int DImgLoader::imageBytesDepth() return m_image->bytesDepth(); } -QMap<int, QByteArray>& DImgLoader::imageMetaData() +TQMap<int, TQByteArray>& DImgLoader::imageMetaData() { return m_image->m_priv->metaData; } -QVariant DImgLoader::imageGetAttribute(const QString& key) +TQVariant DImgLoader::imageGetAttribute(const TQString& key) { return m_image->attribute(key); } -QString DImgLoader::imageGetEmbbededText(const QString& key) +TQString DImgLoader::imageGetEmbbededText(const TQString& key) { return m_image->embeddedText(key); } -void DImgLoader::imageSetAttribute(const QString& key, const QVariant& value) +void DImgLoader::imageSetAttribute(const TQString& key, const TQVariant& value) { m_image->setAttribute(key, value); } -QMap<QString, QString>& DImgLoader::imageEmbeddedText() +TQMap<TQString, TQString>& DImgLoader::imageEmbeddedText() { return m_image->m_priv->embeddedText; } -void DImgLoader::imageSetEmbbededText(const QString& key, const QString& text) +void DImgLoader::imageSetEmbbededText(const TQString& key, const TQString& text) { m_image->setEmbeddedText(key, text); } -bool DImgLoader::readMetadata(const QString& filePath, DImg::FORMAT /*ff*/) +bool DImgLoader::readMetadata(const TQString& filePath, DImg::FORMAT /*ff*/) { - QMap<int, QByteArray>& imageMetadata = imageMetaData(); + TQMap<int, TQByteArray>& imageMetadata = imageMetaData(); imageMetadata.clear(); DMetadata metaDataFromFile(filePath); @@ -144,7 +144,7 @@ bool DImgLoader::readMetadata(const QString& filePath, DImg::FORMAT /*ff*/) return true; } -bool DImgLoader::saveMetadata(const QString& filePath) +bool DImgLoader::saveMetadata(const TQString& filePath) { DMetadata metaDataToFile(filePath); metaDataToFile.setComments(m_image->getComments()); @@ -159,7 +159,7 @@ bool DImgLoader::checkExifWorkingColorSpace() metaData.setExif(m_image->getExif()); // Check if Exif data contains an ICC color profile. - QByteArray profile = metaData.getExifTagData("Exif.Image.InterColorProfile"); + TQByteArray profile = metaData.getExifTagData("Exif.Image.InterColorProfile"); if (!profile.isNull()) { DDebug() << "Found an ICC profile in Exif metadata" << endl; @@ -174,7 +174,7 @@ bool DImgLoader::checkExifWorkingColorSpace() { case DMetadata::WORKSPACE_SRGB: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb-d65.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb-d65.icm"); m_image->getICCProfilFromFile(directory + "srgb-d65.icm"); DDebug() << "Exif color-space tag is sRGB. Using default sRGB ICC profile." << endl; return true; @@ -183,7 +183,7 @@ bool DImgLoader::checkExifWorkingColorSpace() case DMetadata::WORKSPACE_ADOBERGB: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); m_image->getICCProfilFromFile(directory + "adobergb.icm"); DDebug() << "Exif color-space tag is AdobeRGB. Using default AdobeRGB ICC profile." << endl; return true; diff --git a/digikam/libs/dimg/loaders/dimgloader.h b/digikam/libs/dimg/loaders/dimgloader.h index 090bc0f..3902588 100644 --- a/digikam/libs/dimg/loaders/dimgloader.h +++ b/digikam/libs/dimg/loaders/dimgloader.h @@ -25,12 +25,12 @@ #ifndef DIMGLOADER_H #define DIMGLOADER_H -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qstring.h> -#include <qcstring.h> -#include <qvariant.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqvariant.h> // Local includes. @@ -48,8 +48,8 @@ public: virtual ~DImgLoader() {}; - virtual bool load(const QString& filePath, DImgLoaderObserver *observer) = 0; - virtual bool save(const QString& filePath, DImgLoaderObserver *observer) = 0; + virtual bool load(const TQString& filePath, DImgLoaderObserver *observer) = 0; + virtual bool save(const TQString& filePath, DImgLoaderObserver *observer) = 0; virtual bool hasAlpha() const = 0; virtual bool sixteenBit() const = 0; @@ -69,16 +69,16 @@ protected: int imageBitsDepth(); int imageBytesDepth(); - QMap<int, QByteArray>& imageMetaData(); - QVariant imageGetAttribute(const QString& key); - void imageSetAttribute(const QString& key, const QVariant& value); + TQMap<int, TQByteArray>& imageMetaData(); + TQVariant imageGetAttribute(const TQString& key); + void imageSetAttribute(const TQString& key, const TQVariant& value); - QMap<QString, QString>& imageEmbeddedText(); - QString imageGetEmbbededText(const QString& key); - void imageSetEmbbededText(const QString& key, const QString& text); + TQMap<TQString, TQString>& imageEmbeddedText(); + TQString imageGetEmbbededText(const TQString& key); + void imageSetEmbbededText(const TQString& key, const TQString& text); - virtual bool readMetadata(const QString& filePath, DImg::FORMAT ff); - virtual bool saveMetadata(const QString& filePath); + virtual bool readMetadata(const TQString& filePath, DImg::FORMAT ff); + virtual bool saveMetadata(const TQString& filePath); virtual int granularity(DImgLoaderObserver *observer, int total, float progressSlice = 1.0); bool checkExifWorkingColorSpace(); diff --git a/digikam/libs/dimg/loaders/dimgloaderobserver.h b/digikam/libs/dimg/loaders/dimgloaderobserver.h index a7fac8f..ceeea2c 100644 --- a/digikam/libs/dimg/loaders/dimgloaderobserver.h +++ b/digikam/libs/dimg/loaders/dimgloaderobserver.h @@ -55,7 +55,7 @@ public: // This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting // for the thread to finish and no KProcess events are delivered. - // Remove when porting to Qt4. + // Remove when porting to TQt4. virtual bool isShuttingDown() { return false; } diff --git a/digikam/libs/dimg/loaders/iccjpeg.c b/digikam/libs/dimg/loaders/iccjpeg.c index fefa950..dc57124 100644 --- a/digikam/libs/dimg/loaders/iccjpeg.c +++ b/digikam/libs/dimg/loaders/iccjpeg.c @@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo, void setup_read_icc_profile (j_decompress_ptr cinfo) { - /* Tell the library to keep any APP2 data it may find */ + /* Tell the library to keep any APP2 data it may tqfind */ jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF); } @@ -193,10 +193,10 @@ read_icc_profile (j_decompress_ptr cinfo, int seq_no; JOCTET *icc_data; unsigned int total_length; -#define MAX_SEQ_NO 255 /* sufficient since marker numbers are bytes */ - char marker_present[MAX_SEQ_NO+1]; /* 1 if marker found */ - unsigned int data_length[MAX_SEQ_NO+1]; /* size of profile data in marker */ - unsigned int data_offset[MAX_SEQ_NO+1]; /* offset for data in marker */ +#define MAX_SETQ_NO 255 /* sufficient since marker numbers are bytes */ + char marker_present[MAX_SETQ_NO+1]; /* 1 if marker found */ + unsigned int data_length[MAX_SETQ_NO+1]; /* size of profile data in marker */ + unsigned int data_offset[MAX_SETQ_NO+1]; /* offset for data in marker */ *icc_data_ptr = NULL; /* avoid confusion if FALSE return */ *icc_data_len = 0; @@ -205,7 +205,7 @@ read_icc_profile (j_decompress_ptr cinfo, * any ICC markers and verifies the consistency of the marker numbering. */ - for (seq_no = 1; seq_no <= MAX_SEQ_NO; seq_no++) + for (seq_no = 1; seq_no <= MAX_SETQ_NO; seq_no++) marker_present[seq_no] = 0; for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { diff --git a/digikam/libs/dimg/loaders/jp2kloader.cpp b/digikam/libs/dimg/loaders/jp2kloader.cpp index 23d7e9e..08f5aff 100644 --- a/digikam/libs/dimg/loaders/jp2kloader.cpp +++ b/digikam/libs/dimg/loaders/jp2kloader.cpp @@ -36,10 +36,10 @@ // files io. Uncomment this line only for debugging. //#define ENABLE_DEBUG_MESSAGES -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qcstring.h> +#include <tqfile.h> +#include <tqcstring.h> // Local includes. @@ -58,11 +58,11 @@ JP2KLoader::JP2KLoader(DImg* image) m_sixteenBit = false; } -bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { readMetadata(filePath, DImg::JPEG); - FILE *file = fopen(QFile::encodeName(filePath), "rb"); + FILE *file = fopen(TQFile::encodeName(filePath), "rb"); if (!file) return false; @@ -106,7 +106,7 @@ bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) return false; } - jp2_stream = jas_stream_fopen(QFile::encodeName(filePath), "rb"); + jp2_stream = jas_stream_fopen(TQFile::encodeName(filePath), "rb"); if (jp2_stream == 0) { DDebug() << "Unable to open JPEG2000 stream" << endl; @@ -195,7 +195,7 @@ bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) } // ------------------------------------------------------------------- - // Check image geometry. + // Check image tqgeometry. imageWidth() = jas_image_width(jp2_image); imageHeight() = jas_image_height(jp2_image); @@ -226,7 +226,7 @@ bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) for (i = 0; i < (long)number_components; i++) { - maximum_component_depth = QMAX(jas_image_cmptprec(jp2_image,components[i]), + maximum_component_depth = TQMAX(jas_image_cmptprec(jp2_image,components[i]), (long)maximum_component_depth); pixels[i] = jas_matrix_create(1, ((unsigned int)imageWidth())/x_step[i]); if (!pixels[i]) @@ -421,9 +421,9 @@ bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) { if (jas_stream_flush(icc_stream) == 0) { - QMap<int, QByteArray>& metaData = imageMetaData(); + TQMap<int, TQByteArray>& metaData = imageMetaData(); jas_stream_memobj_t *blob = (jas_stream_memobj_t *) icc_stream->obj_; - QByteArray profile_rawdata(blob->len_); + TQByteArray profile_rawdata(blob->len_); memcpy(profile_rawdata.data(), blob->buf_, blob->len_); metaData.insert(DImg::ICC, profile_rawdata); jas_stream_close(icc_stream); @@ -447,9 +447,9 @@ bool JP2KLoader::load(const QString& filePath, DImgLoaderObserver *observer) return true; } -bool JP2KLoader::save(const QString& filePath, DImgLoaderObserver *observer) +bool JP2KLoader::save(const TQString& filePath, DImgLoaderObserver *observer) { - FILE *file = fopen(QFile::encodeName(filePath), "wb"); + FILE *file = fopen(TQFile::encodeName(filePath), "wb"); if (!file) return false; @@ -473,7 +473,7 @@ bool JP2KLoader::save(const QString& filePath, DImgLoaderObserver *observer) return false; } - jp2_stream = jas_stream_fopen(QFile::encodeName(filePath), "wb"); + jp2_stream = jas_stream_fopen(TQFile::encodeName(filePath), "wb"); if (jp2_stream == 0) { DDebug() << "Unable to open JPEG2000 stream" << endl; @@ -528,7 +528,7 @@ bool JP2KLoader::save(const QString& filePath, DImgLoaderObserver *observer) jas_cmprof_t *cm_profile = 0; jas_iccprof_t *icc_profile = 0; - QByteArray profile_rawdata = m_image->getICCProfil(); + TQByteArray profile_rawdata = m_image->getICCProfil(); icc_profile = jas_iccprof_createfrombuf((uchar*)profile_rawdata.data(), profile_rawdata.size()); if (icc_profile != 0) @@ -629,7 +629,7 @@ bool JP2KLoader::save(const QString& filePath, DImgLoaderObserver *observer) } } - QVariant qualityAttr = imageGetAttribute("quality"); + TQVariant qualityAttr = imageGetAttribute("quality"); int quality = qualityAttr.isValid() ? qualityAttr.toInt() : 90; if (quality < 0) @@ -637,8 +637,8 @@ bool JP2KLoader::save(const QString& filePath, DImgLoaderObserver *observer) if (quality > 100) quality = 100; - QString rate; - QTextStream ts( &rate, IO_WriteOnly ); + TQString rate; + TQTextStream ts( &rate, IO_WriteOnly ); // NOTE: to have a lossless compression use quality=100. // jp2_encode()::optstr: diff --git a/digikam/libs/dimg/loaders/jp2kloader.h b/digikam/libs/dimg/loaders/jp2kloader.h index 28e853f..04ec214 100644 --- a/digikam/libs/dimg/loaders/jp2kloader.h +++ b/digikam/libs/dimg/loaders/jp2kloader.h @@ -31,9 +31,9 @@ extern "C" #include <jasper/jasper.h> } -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. @@ -51,8 +51,8 @@ public: JP2KLoader(DImg* image); - bool load(const QString& filePath, DImgLoaderObserver *observer); - bool save(const QString& filePath, DImgLoaderObserver *observer); + bool load(const TQString& filePath, DImgLoaderObserver *observer); + bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const; virtual bool sixteenBit() const; diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp index f2bbfa0..d15fe31 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.cpp +++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -56,32 +56,32 @@ public: JPEG2000LossLess = 0; } - QGridLayout *JPEG2000Grid; + TQGridLayout *JPEG2000Grid; - QLabel *labelJPEG2000compression; + TQLabel *labelJPEG2000compression; - QCheckBox *JPEG2000LossLess; + TQCheckBox *JPEG2000LossLess; KIntNumInput *JPEG2000compression; }; -JP2KSettings::JP2KSettings(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +JP2KSettings::JP2KSettings(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new JP2KSettingsPriv; - d->JPEG2000Grid = new QGridLayout(this, 1, 1, KDialog::spacingHint()); - d->JPEG2000LossLess = new QCheckBox(i18n("Lossless JPEG 2000 files"), this); + d->JPEG2000Grid = new TQGridLayout(this, 1, 1, KDialog::spacingHint()); + d->JPEG2000LossLess = new TQCheckBox(i18n("Lossless JPEG 2000 files"), this); - QWhatsThis::add(d->JPEG2000LossLess, i18n("<p>Toggle lossless compression for JPEG 2000 images.<p>" + TQWhatsThis::add(d->JPEG2000LossLess, i18n("<p>Toggle lossless compression for JPEG 2000 images.<p>" "If you enable this option, you will use a lossless method " "to compress JPEG 2000 pictures.<p>")); d->JPEG2000compression = new KIntNumInput(75, this); d->JPEG2000compression->setRange(1, 100, 1, true ); - d->labelJPEG2000compression = new QLabel(i18n("JPEG 2000 quality:"), this); + d->labelJPEG2000compression = new TQLabel(i18n("JPEG 2000 quality:"), this); - QWhatsThis::add( d->JPEG2000compression, i18n("<p>The quality value for JPEG 2000 images:<p>" + TQWhatsThis::add( d->JPEG2000compression, i18n("<p>The quality value for JPEG 2000 images:<p>" "<b>1</b>: low quality (high compression and small " "file size)<p>" "<b>50</b>: medium quality<p>" @@ -96,11 +96,11 @@ JP2KSettings::JP2KSettings(QWidget *parent) d->JPEG2000Grid->addMultiCellWidget(d->JPEG2000compression, 1, 1, 1, 1); d->JPEG2000Grid->setColStretch(1, 10); - connect(d->JPEG2000LossLess, SIGNAL(toggled(bool)), - this, SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); - connect(d->JPEG2000LossLess, SIGNAL(toggled(bool)), - this, SLOT(slotToggleJPEG2000LossLess(bool))); + connect(d->JPEG2000LossLess, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggleJPEG2000LossLess(bool))); } JP2KSettings::~JP2KSettings() diff --git a/digikam/libs/dimg/loaders/jp2ksettings.h b/digikam/libs/dimg/loaders/jp2ksettings.h index 455226e..365afa3 100644 --- a/digikam/libs/dimg/loaders/jp2ksettings.h +++ b/digikam/libs/dimg/loaders/jp2ksettings.h @@ -26,7 +26,7 @@ // KDE includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class JP2KSettingsPriv; -class DIGIKAM_EXPORT JP2KSettings : public QWidget +class DIGIKAM_EXPORT JP2KSettings : public TQWidget { Q_OBJECT + TQ_OBJECT public: - JP2KSettings(QWidget *parent=0); + JP2KSettings(TQWidget *tqparent=0); ~JP2KSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/jpegloader.cpp b/digikam/libs/dimg/loaders/jpegloader.cpp index 16ee1b3..58f6e20 100644 --- a/digikam/libs/dimg/loaders/jpegloader.cpp +++ b/digikam/libs/dimg/loaders/jpegloader.cpp @@ -41,10 +41,10 @@ extern "C" #include <cstdio> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qcstring.h> +#include <tqfile.h> +#include <tqcstring.h> // Local includes. @@ -99,11 +99,11 @@ JPEGLoader::JPEGLoader(DImg* image) { } -bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool JPEGLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { readMetadata(filePath, DImg::JPEG); - FILE *file = fopen(QFile::encodeName(filePath), "rb"); + FILE *file = fopen(TQFile::encodeName(filePath), "rb"); if (!file) return false; @@ -149,7 +149,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Find out if we do the fast-track loading with reduced size. Jpeg specific. int scaledLoadingSize = 0; - QVariant attribute = imageGetAttribute("jpegScaledLoadingSize"); + TQVariant attribute = imageGetAttribute("jpegScaledLoadingSize"); if (attribute.isValid()) scaledLoadingSize = attribute.toInt(); @@ -171,7 +171,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) if (scaledLoadingSize) { - int imgSize = QMAX(cinfo.image_width, cinfo.image_height); + int imgSize = TQMAX(cinfo.image_width, cinfo.image_height); // libjpeg supports 1/1, 1/2, 1/4, 1/8 int scale=1; @@ -398,7 +398,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) { for (x = 0; x < w; x++) { - // Inspired by Qt's JPEG loader + // Inspired by TQt's JPEG loader int k = ptr[3]; @@ -419,7 +419,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Read image ICC profile - QMap<int, QByteArray>& metaData = imageMetaData(); + TQMap<int, TQByteArray>& metaData = imageMetaData(); JOCTET *profile_data=NULL; uint profile_size; @@ -428,7 +428,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) if (profile_data != NULL) { - QByteArray profile_rawdata(profile_size); + TQByteArray profile_rawdata(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); metaData.insert(DImg::ICC, profile_rawdata); free (profile_data); @@ -459,9 +459,9 @@ bool JPEGLoader::load(const QString& filePath, DImgLoaderObserver *observer) return true; } -bool JPEGLoader::save(const QString& filePath, DImgLoaderObserver *observer) +bool JPEGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) { - FILE *file = fopen(QFile::encodeName(filePath), "wb"); + FILE *file = fopen(TQFile::encodeName(filePath), "wb"); if (!file) return false; @@ -503,7 +503,7 @@ bool JPEGLoader::save(const QString& filePath, DImgLoaderObserver *observer) cinfo.input_components = 3; cinfo.in_color_space = JCS_RGB; - QVariant qualityAttr = imageGetAttribute("quality"); + TQVariant qualityAttr = imageGetAttribute("quality"); int quality = qualityAttr.isValid() ? qualityAttr.toInt() : 90; if (quality < 0) @@ -511,7 +511,7 @@ bool JPEGLoader::save(const QString& filePath, DImgLoaderObserver *observer) if (quality > 100) quality = 100; - QVariant subSamplingAttr = imageGetAttribute("subsampling"); + TQVariant subSamplingAttr = imageGetAttribute("subsampling"); int subsampling = subSamplingAttr.isValid() ? subSamplingAttr.toInt() : 1; // Medium jpeg_set_defaults(&cinfo); @@ -567,7 +567,7 @@ bool JPEGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Write ICC profil. - QByteArray profile_rawdata = m_image->getICCProfil(); + TQByteArray profile_rawdata = m_image->getICCProfil(); if (!profile_rawdata.isEmpty()) { diff --git a/digikam/libs/dimg/loaders/jpegloader.h b/digikam/libs/dimg/loaders/jpegloader.h index 2d8543b..b5d64f1 100644 --- a/digikam/libs/dimg/loaders/jpegloader.h +++ b/digikam/libs/dimg/loaders/jpegloader.h @@ -33,9 +33,9 @@ extern "C" #include <jpeglib.h> } -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. @@ -53,8 +53,8 @@ public: JPEGLoader(DImg* image); - bool load(const QString& filePath, DImgLoaderObserver *observer); - bool save(const QString& filePath, DImgLoaderObserver *observer); + bool load(const TQString& filePath, DImgLoaderObserver *observer); + bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const { return false; } virtual bool sixteenBit() const { return false; } diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/digikam/libs/dimg/loaders/jpegsettings.cpp index 0352d95..86347a0 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.cpp +++ b/digikam/libs/dimg/loaders/jpegsettings.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcombobox.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcombobox.h> // KDE includes. @@ -59,29 +59,29 @@ public: subSamplingCB = 0; } - QGridLayout *JPEGGrid; + TQGridLayout *JPEGGrid; - QLabel *labelJPEGcompression; - QLabel *labelSubSampling; + TQLabel *labelJPEGcompression; + TQLabel *labelSubSampling; - QComboBox *subSamplingCB; + TQComboBox *subSamplingCB; KActiveLabel *labelWarning; KIntNumInput *JPEGcompression; }; -JPEGSettings::JPEGSettings(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +JPEGSettings::JPEGSettings(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new JPEGSettingsPriv; - d->JPEGGrid = new QGridLayout(this, 1, 2, KDialog::spacingHint()); + d->JPEGGrid = new TQGridLayout(this, 1, 2, KDialog::spacingHint()); d->JPEGcompression = new KIntNumInput(75, this); d->JPEGcompression->setRange(1, 100, 1, true ); - d->labelJPEGcompression = new QLabel(i18n("JPEG quality:"), this); + d->labelJPEGcompression = new TQLabel(i18n("JPEG quality:"), this); - QWhatsThis::add(d->JPEGcompression, i18n("<p>The JPEG image quality:<p>" + TQWhatsThis::add(d->JPEGcompression, i18n("<p>The JPEG image quality:<p>" "<b>1</b>: low quality (high compression and small " "file size)<p>" "<b>50</b>: medium quality<p>" @@ -96,17 +96,17 @@ JPEGSettings::JPEGSettings(QWidget *parent) "image format!</p>" "</i></qt>"), this); - d->labelWarning->setFrameStyle(QFrame::Box | QFrame::Plain); + d->labelWarning->setFrameStyle(TQFrame::Box | TQFrame::Plain); d->labelWarning->setLineWidth(1); - d->labelWarning->setFrameShape(QFrame::Box); + d->labelWarning->setFrameShape(TQFrame::Box); - d->labelSubSampling = new QLabel(i18n("Chroma subsampling:"), this); + d->labelSubSampling = new TQLabel(i18n("Chroma subsampling:"), this); - d->subSamplingCB = new QComboBox(false, this); + d->subSamplingCB = new TQComboBox(false, this); d->subSamplingCB->insertItem(i18n("None")); // 1x1, 1x1, 1x1 (4:4:4) d->subSamplingCB->insertItem(i18n("Medium")); // 2x1, 1x1, 1x1 (4:2:2) d->subSamplingCB->insertItem(i18n("High")); // 2x2, 1x1, 1x1 (4:1:1) - QWhatsThis::add(d->subSamplingCB, i18n("<p>JPEG Chroma subsampling level \n(color is saved with less resolution " "than luminance):<p>" + TQWhatsThis::add(d->subSamplingCB, i18n("<p>JPEG Chroma subsampling level \n(color is saved with less resolution " "than luminance):<p>" "<b>None</b>=best: uses 4:4:4 ratio. Does not employ chroma " "subsampling at all. This preserves edges and contrasting " "colors, whilst adding no additional compression<p>" diff --git a/digikam/libs/dimg/loaders/jpegsettings.h b/digikam/libs/dimg/loaders/jpegsettings.h index a48c634..d5c1a2b 100644 --- a/digikam/libs/dimg/loaders/jpegsettings.h +++ b/digikam/libs/dimg/loaders/jpegsettings.h @@ -26,7 +26,7 @@ // KDE includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class JPEGSettingsPriv; -class DIGIKAM_EXPORT JPEGSettings : public QWidget +class DIGIKAM_EXPORT JPEGSettings : public TQWidget { Q_OBJECT + TQ_OBJECT public: - JPEGSettings(QWidget *parent=0); + JPEGSettings(TQWidget *tqparent=0); ~JPEGSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp index 7d2d411..ae43e6f 100644 --- a/digikam/libs/dimg/loaders/pngloader.cpp +++ b/digikam/libs/dimg/loaders/pngloader.cpp @@ -41,10 +41,10 @@ extern "C" #include <cstdlib> #include <cstdio> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qcstring.h> +#include <tqfile.h> +#include <tqcstring.h> // Local includes. @@ -64,7 +64,7 @@ PNGLoader::PNGLoader(DImg* image) m_sixteenBit = false; } -bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { png_uint_32 w32, h32; int width, height; @@ -78,7 +78,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Open the file - f = fopen(QFile::encodeName(filePath), "rb"); + f = fopen(TQFile::encodeName(filePath), "rb"); if ( !f ) { DDebug() << k_funcinfo << "Cannot open image file." << endl; @@ -162,7 +162,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) #endif m_hasAlpha = false; - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); @@ -182,7 +182,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) #endif png_set_gray_to_rgb(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); @@ -204,7 +204,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) #endif png_set_palette_to_rgb(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFFFF, PNG_FILLER_AFTER); @@ -233,7 +233,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) #ifdef ENABLE_DEBUG_MESSAGES DDebug() << "PNG in PNG_COLOR_TYPE_RGB" << endl; #endif - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); @@ -255,7 +255,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) png_set_gray_1_2_4_to_8(png_ptr); png_set_gray_to_rgb(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); @@ -278,7 +278,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) png_set_packing(png_ptr); png_set_palette_to_rgb(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); else // PPC png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER); @@ -297,7 +297,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_bgr(png_ptr); else // PPC png_set_bgr(png_ptr); @@ -401,7 +401,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Read image ICC profile - QMap<int, QByteArray>& metaData = imageMetaData(); + TQMap<int, TQByteArray>& metaData = imageMetaData(); png_charp profile_name, profile_data=NULL; png_uint_32 profile_size; @@ -411,7 +411,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) if (profile_data != NULL) { - QByteArray profile_rawdata(profile_size); + TQByteArray profile_rawdata(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); metaData.insert(DImg::ICC, profile_rawdata); } @@ -479,7 +479,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoaderObserver *observer) return true; } -bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) +bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) { FILE *f; png_structp png_ptr; @@ -494,7 +494,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Open the file - f = fopen(QFile::encodeName(filePath), "wb"); + f = fopen(TQFile::encodeName(filePath), "wb"); if ( !f ) { DDebug() << k_funcinfo << "Cannot open target image file." << endl; @@ -537,7 +537,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) png_init_io(png_ptr, f); - if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel + if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel png_set_bgr(png_ptr); else // PPC png_set_swap_alpha(png_ptr); @@ -574,7 +574,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Quality to convert to compression - QVariant qualityAttr = imageGetAttribute("quality"); + TQVariant qualityAttr = imageGetAttribute("quality"); quality = qualityAttr.isValid() ? qualityAttr.toInt() : 90; if (quality < 1) @@ -595,7 +595,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Write ICC profil. - QByteArray profile_rawdata = m_image->getICCProfil(); + TQByteArray profile_rawdata = m_image->getICCProfil(); if (!profile_rawdata.isEmpty()) { @@ -605,12 +605,12 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Write embbeded Text - typedef QMap<QString, QString> EmbeddedTextMap; + typedef TQMap<TQString, TQString> EmbeddedTextMap; EmbeddedTextMap map = imageEmbeddedText(); for (EmbeddedTextMap::iterator it = map.begin(); it != map.end(); ++it) { - if (it.key() != QString("Software") && it.key() != QString("Comment")) + if (it.key() != TQString("Software") && it.key() != TQString("Comment")) { png_text text; text.key = (char*)it.key().ascii(); @@ -624,11 +624,11 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) } // Update 'Software' text tag. - QString software("digiKam "); + TQString software("digiKam "); software.append(digikam_version); - QString libpngver(PNG_HEADER_VERSION_STRING); - libpngver.replace('\n', ' '); - software.append(QString(" (%1)").arg(libpngver)); + TQString libpngver(PNG_HEADER_VERSION_STRING); + libpngver.tqreplace('\n', ' '); + software.append(TQString(" (%1)").tqarg(libpngver)); png_text text; text.key = (png_charp)("Software"); text.text = (char *)software.ascii(); @@ -642,12 +642,12 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) // Write digiKam comment like an iTXt chunk using UTF8 encoding. // NOTE: iTXt will be enable by default with libpng >= 1.3.0. - typedef QMap<int, QByteArray> MetaDataMap; + typedef TQMap<int, TQByteArray> MetaDataMap; MetaDataMap metaDataMap = imageMetaData(); for (MetaDataMap::iterator it = metaDataMap.begin(); it != metaDataMap.end(); ++it) { - QByteArray ba = it.data(); + TQByteArray ba = it.data(); switch (it.key()) { @@ -673,7 +673,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) case(DImg::EXIF): { const uchar ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; - QByteArray profile; + TQByteArray profile; // If bytes array do not start with ImageMagick header, Exif metadata have been created from // scratch using Exiv2. In this case, we need to add Exif header from start. @@ -681,7 +681,7 @@ bool PNGLoader::save(const QString& filePath, DImgLoaderObserver *observer) memcmp(ba.data(), "iptc", 4) != 0 && memcmp(ba.data(), "profile", 7) != 0) { - profile = QByteArray(ba.size() + sizeof(ExifHeader)); + profile = TQByteArray(ba.size() + sizeof(ExifHeader)); memcpy(profile.data(), ExifHeader, sizeof(ExifHeader)); memcpy(profile.data()+sizeof(ExifHeader), ba.data(), ba.size()); } diff --git a/digikam/libs/dimg/loaders/pngloader.h b/digikam/libs/dimg/loaders/pngloader.h index 8fbf7e8..202a278 100644 --- a/digikam/libs/dimg/loaders/pngloader.h +++ b/digikam/libs/dimg/loaders/pngloader.h @@ -45,8 +45,8 @@ public: PNGLoader(DImg* image); - bool load(const QString& filePath, DImgLoaderObserver *observer); - bool save(const QString& filePath, DImgLoaderObserver *observer); + bool load(const TQString& filePath, DImgLoaderObserver *observer); + bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const; virtual bool sixteenBit() const; diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/digikam/libs/dimg/loaders/pngsettings.cpp index 998d7af..fcfcc81 100644 --- a/digikam/libs/dimg/loaders/pngsettings.cpp +++ b/digikam/libs/dimg/loaders/pngsettings.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -54,24 +54,24 @@ public: PNGcompression = 0; } - QGridLayout *PNGGrid; + TQGridLayout *PNGGrid; - QLabel *labelPNGcompression; + TQLabel *labelPNGcompression; KIntNumInput *PNGcompression; }; -PNGSettings::PNGSettings(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +PNGSettings::PNGSettings(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new PNGSettingsPriv; - d->PNGGrid = new QGridLayout(this, 1, 1, KDialog::spacingHint()); + d->PNGGrid = new TQGridLayout(this, 1, 1, KDialog::spacingHint()); d->PNGcompression = new KIntNumInput(9, this); d->PNGcompression->setRange(1, 9, 1, true ); - d->labelPNGcompression = new QLabel(i18n("PNG compression:"), this); + d->labelPNGcompression = new TQLabel(i18n("PNG compression:"), this); - QWhatsThis::add(d->PNGcompression, i18n("<p>The compression value for PNG images:<p>" + TQWhatsThis::add(d->PNGcompression, i18n("<p>The compression value for PNG images:<p>" "<b>1</b>: low compression (large file size but " "short compression duration - default)<p>" "<b>5</b>: medium compression<p>" diff --git a/digikam/libs/dimg/loaders/pngsettings.h b/digikam/libs/dimg/loaders/pngsettings.h index 6f4702c..ab61c52 100644 --- a/digikam/libs/dimg/loaders/pngsettings.h +++ b/digikam/libs/dimg/loaders/pngsettings.h @@ -26,7 +26,7 @@ // KDE includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class PNGSettingsPriv; -class DIGIKAM_EXPORT PNGSettings : public QWidget +class DIGIKAM_EXPORT PNGSettings : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PNGSettings(QWidget *parent=0); + PNGSettings(TQWidget *tqparent=0); ~PNGSettings(); void setCompressionValue(int val); diff --git a/digikam/libs/dimg/loaders/ppmloader.cpp b/digikam/libs/dimg/loaders/ppmloader.cpp index 5e5b321..15c1942 100644 --- a/digikam/libs/dimg/loaders/ppmloader.cpp +++ b/digikam/libs/dimg/loaders/ppmloader.cpp @@ -40,10 +40,10 @@ extern "C" #include <cstdio> #include <cmath> -// Qt includes. +// TQt includes. -#include <qfile.h> -#include <qimage.h> +#include <tqfile.h> +#include <tqimage.h> // Local includes. @@ -60,13 +60,13 @@ PPMLoader::PPMLoader(DImg* image) { } -bool PPMLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool PPMLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { //TODO: progress information int width, height, rgbmax; char nl; - FILE *file = fopen(QFile::encodeName(filePath), "rb"); + FILE *file = fopen(TQFile::encodeName(filePath), "rb"); if (!file) { DDebug() << k_funcinfo << "Cannot open image file." << endl; @@ -170,7 +170,7 @@ bool PPMLoader::load(const QString& filePath, DImgLoaderObserver *observer) return true; } -bool PPMLoader::save(const QString& /*filePath*/, DImgLoaderObserver */*observer*/) +bool PPMLoader::save(const TQString& /*filePath*/, DImgLoaderObserver */*observer*/) { return false; } diff --git a/digikam/libs/dimg/loaders/ppmloader.h b/digikam/libs/dimg/loaders/ppmloader.h index 8cdefc7..283fdd2 100644 --- a/digikam/libs/dimg/loaders/ppmloader.h +++ b/digikam/libs/dimg/loaders/ppmloader.h @@ -41,8 +41,8 @@ public: PPMLoader(DImg* image); - bool load(const QString& filePath, DImgLoaderObserver *observer); - bool save(const QString& filePath, DImgLoaderObserver *observer); + bool load(const TQString& filePath, DImgLoaderObserver *observer); + bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const { return false; }; virtual bool sixteenBit() const { return true; }; diff --git a/digikam/libs/dimg/loaders/qimageloader.cpp b/digikam/libs/dimg/loaders/qimageloader.cpp index 3bd6434..f35335c 100644 --- a/digikam/libs/dimg/loaders/qimageloader.cpp +++ b/digikam/libs/dimg/loaders/qimageloader.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-06-14 - * Description : A QImage loader for DImg framework. + * Description : A TQImage loader for DImg framework. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * Copyright (C) 2006-2007 by Caulier Gilles <caulier dot gilles at gmail dot com> @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> +#include <tqimage.h> // Local includes. @@ -36,28 +36,28 @@ namespace Digikam { -QImageLoader::QImageLoader(DImg* image) +TQImageLoader::TQImageLoader(DImg* image) : DImgLoader(image) { } -bool QImageLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool TQImageLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { // Loading is opaque to us. No support for stopping from observer, // progress info are only pseudo values - QImage image(filePath); + TQImage image(filePath); if (observer) observer->progressInfo(m_image, 0.9); if (image.isNull()) { - DDebug() << "Cannot loading \"" << filePath << "\" using DImg::QImageLoader!" << endl; + DDebug() << "Cannot loading \"" << filePath << "\" using DImg::TQImageLoader!" << endl; return false; } m_hasAlpha = image.hasAlphaBuffer(); - QImage target = image.convertDepth(32); + TQImage target = image.convertDepth(32); uint w = target.width(); uint h = target.height(); @@ -67,10 +67,10 @@ bool QImageLoader::load(const QString& filePath, DImgLoaderObserver *observer) for (uint i = 0 ; i < w*h ; i++) { - dptr[0] = qBlue(*sptr); - dptr[1] = qGreen(*sptr); - dptr[2] = qRed(*sptr); - dptr[3] = qAlpha(*sptr); + dptr[0] = tqBlue(*sptr); + dptr[1] = tqGreen(*sptr); + dptr[2] = tqRed(*sptr); + dptr[3] = tqAlpha(*sptr); dptr += 4; sptr++; @@ -83,15 +83,15 @@ bool QImageLoader::load(const QString& filePath, DImgLoaderObserver *observer) imageHeight() = h; imageData() = data; - // We considering that PNG is the most representative format of an image loaded by Qt + // We considering that PNG is the most representative format of an image loaded by TQt imageSetAttribute("format", "PNG"); return true; } -bool QImageLoader::save(const QString& filePath, DImgLoaderObserver *observer) +bool TQImageLoader::save(const TQString& filePath, DImgLoaderObserver *observer) { - QVariant qualityAttr = imageGetAttribute("quality"); + TQVariant qualityAttr = imageGetAttribute("quality"); int quality = qualityAttr.isValid() ? qualityAttr.toInt() : 90; if (quality < 0) @@ -99,10 +99,10 @@ bool QImageLoader::save(const QString& filePath, DImgLoaderObserver *observer) if (quality > 100) quality = 100; - QVariant formatAttr = imageGetAttribute("format"); - QCString format = formatAttr.toCString(); + TQVariant formatAttr = imageGetAttribute("format"); + TQCString format = formatAttr.toCString(); - QImage image = m_image->copyQImage(); + TQImage image = m_image->copyTQImage(); if (observer) observer->progressInfo(m_image, 0.1); @@ -118,7 +118,7 @@ bool QImageLoader::save(const QString& filePath, DImgLoaderObserver *observer) return success; } -bool QImageLoader::hasAlpha() const +bool TQImageLoader::hasAlpha() const { return m_hasAlpha; } diff --git a/digikam/libs/dimg/loaders/qimageloader.h b/digikam/libs/dimg/loaders/qimageloader.h index 3fbae18..f81cf7e 100644 --- a/digikam/libs/dimg/loaders/qimageloader.h +++ b/digikam/libs/dimg/loaders/qimageloader.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2005-06-14 - * Description : A QImage loader for DImg framework. + * Description : A TQImage loader for DImg framework. * * Copyright (C) 2005 by Renchi Raju <renchi@pooh.tam.uiuc.edu> * Copyright (C) 2006-2007 by Caulier Gilles <caulier dot gilles at gmail dot com> @@ -22,8 +22,8 @@ * * ============================================================ */ -#ifndef QIMAGELOADER_H -#define QIMAGELOADER_H +#ifndef TQIMAGELOADER_H +#define TQIMAGELOADER_H // Local includes. @@ -34,14 +34,14 @@ namespace Digikam { class DImg; -class DIGIKAM_EXPORT QImageLoader : public DImgLoader +class DIGIKAM_EXPORT TQImageLoader : public DImgLoader { public: - QImageLoader(DImg* image); + TQImageLoader(DImg* image); - virtual bool load(const QString& filePath, DImgLoaderObserver *observer); - virtual bool save(const QString& filePath, DImgLoaderObserver *observer); + virtual bool load(const TQString& filePath, DImgLoaderObserver *observer); + virtual bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const; virtual bool sixteenBit() const { return false; }; @@ -54,4 +54,4 @@ private: } // NameSpace Digikam -#endif /* QIMAGELOADER_H */ +#endif /* TQIMAGELOADER_H */ diff --git a/digikam/libs/dimg/loaders/rawloader.cpp b/digikam/libs/dimg/loaders/rawloader.cpp index fec16d0..ff92aed 100644 --- a/digikam/libs/dimg/loaders/rawloader.cpp +++ b/digikam/libs/dimg/loaders/rawloader.cpp @@ -27,9 +27,9 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qcstring.h> +#include <tqcstring.h> // KDE includes. @@ -59,7 +59,7 @@ RAWLoader::RAWLoader(DImg* image, DRawDecoding rawDecodingSettings) m_observer = 0; } -bool RAWLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool RAWLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { m_observer = observer; @@ -68,7 +68,7 @@ bool RAWLoader::load(const QString& filePath, DImgLoaderObserver *observer) // - we are not called from the event loop thread // These assumptions are currently true for all use cases in digikam, // except the thumbnails iosalve, which will set this attribute. - // I hope when porting to Qt4, all the event loop stuff (and this problem) can be removed. + // I hope when porting to TQt4, all the event loop stuff (and this problem) can be removed. if (imageGetAttribute("noeventloop").isValid()) return false; @@ -79,7 +79,7 @@ bool RAWLoader::load(const QString& filePath, DImgLoaderObserver *observer) // because RAW file are always in linear mode. int width, height, rgbmax; - QByteArray data; + TQByteArray data; if (!KDcrawIface::KDcraw::decodeRAWImage(filePath, m_rawDecodingSettings, data, width, height, rgbmax)) return false; @@ -111,7 +111,7 @@ void RAWLoader::setRecievingDataProgress(double value) } #endif -bool RAWLoader::loadedFromDcraw(QByteArray data, int width, int height, int rgbmax, +bool RAWLoader::loadedFromDcraw(TQByteArray data, int width, int height, int rgbmax, DImgLoaderObserver *observer) { int checkpoint = 0; @@ -266,25 +266,25 @@ bool RAWLoader::loadedFromDcraw(QByteArray data, int width, int height, int rgbm { case DRawDecoding::SRGB: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); m_image->getICCProfilFromFile(directory + "srgb.icm"); break; } case DRawDecoding::ADOBERGB: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); m_image->getICCProfilFromFile(directory + "adobergb.icm"); break; } case DRawDecoding::WIDEGAMMUT: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); m_image->getICCProfilFromFile(directory + "widegamut.icm"); break; } case DRawDecoding::PROPHOTO: { - QString directory = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); + TQString directory = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); m_image->getICCProfilFromFile(directory + "prophoto.icm"); break; } diff --git a/digikam/libs/dimg/loaders/rawloader.h b/digikam/libs/dimg/loaders/rawloader.h index 20148ba..31b4078 100644 --- a/digikam/libs/dimg/loaders/rawloader.h +++ b/digikam/libs/dimg/loaders/rawloader.h @@ -44,15 +44,16 @@ class DImg; class DIGIKAM_EXPORT RAWLoader : public KDcrawIface::KDcraw, public DImgLoader { Q_OBJECT + TQ_OBJECT public: RAWLoader(DImg* image, DRawDecoding rawDecodingSettings=DRawDecoding()); - bool load(const QString& filePath, DImgLoaderObserver *observer=0); + bool load(const TQString& filePath, DImgLoaderObserver *observer=0); // NOTE: RAW files are always Read only. - bool save(const QString& /*filePath*/, DImgLoaderObserver */*observer=0*/) { return false; }; + bool save(const TQString& /*filePath*/, DImgLoaderObserver */*observer=0*/) { return false; }; bool hasAlpha() const { return false; }; bool isReadOnly() const { return true; }; @@ -62,7 +63,7 @@ private: // Methods to load RAW image using external dcraw instance. - bool loadedFromDcraw(QByteArray data, int width, int height, int rgbmax, + bool loadedFromDcraw(TQByteArray data, int width, int height, int rgbmax, DImgLoaderObserver *observer); bool checkToCancelWaitingData(); diff --git a/digikam/libs/dimg/loaders/tiffloader.cpp b/digikam/libs/dimg/loaders/tiffloader.cpp index 3628d46..472be42 100644 --- a/digikam/libs/dimg/loaders/tiffloader.cpp +++ b/digikam/libs/dimg/loaders/tiffloader.cpp @@ -55,9 +55,9 @@ extern "C" #include <cstdio> -// Qt includes. +// TQt includes. -#include <qfile.h> +#include <tqfile.h> // Local includes. @@ -105,7 +105,7 @@ TIFFLoader::TIFFLoader(DImg* image) m_sixteenBit = false; } -bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) +bool TIFFLoader::load(const TQString& filePath, DImgLoaderObserver *observer) { readMetadata(filePath, DImg::TIFF); @@ -119,7 +119,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Open the file - TIFF* tif = TIFFOpen(QFile::encodeName(filePath), "r"); + TIFF* tif = TIFFOpen(TQFile::encodeName(filePath), "r"); if (!tif) { DDebug() << k_funcinfo << "Cannot open image file." << endl; @@ -195,14 +195,14 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Read image ICC profile - QMap<int, QByteArray>& metaData = imageMetaData(); + TQMap<int, TQByteArray>& metaData = imageMetaData(); uchar *profile_data=0; uint32 profile_size; if (TIFFGetField (tif, TIFFTAG_ICCPROFILE, &profile_size, &profile_data)) { - QByteArray profile_rawdata(profile_size); + TQByteArray profile_rawdata(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); metaData.insert(DImg::ICC, profile_rawdata); } @@ -270,7 +270,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) p = dataPtr; // See B.K.O #148037 : take a care about byte order with Motorola computers. - if (QImage::systemByteOrder() == QImage::BigEndian) // PPC + if (TQImage::systemByteOrder() == TQImage::BigEndian) // PPC { p[3] = *stripPtr++; p[0] = *stripPtr++; @@ -298,7 +298,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) p = dataPtr; // See B.K.O #148037 : take a care about byte order with Motorola computers. - if (QImage::systemByteOrder() == QImage::BigEndian) // PPC + if (TQImage::systemByteOrder() == TQImage::BigEndian) // PPC { p[3] = 0xFFFF; p[0] = *stripPtr; @@ -324,7 +324,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) p = dataPtr; // See B.K.O #148037 : take a care about byte order with Motorola computers. - if (QImage::systemByteOrder() == QImage::BigEndian) // PPC + if (TQImage::systemByteOrder() == TQImage::BigEndian) // PPC { p[3] = *stripPtr++; p[0] = *stripPtr++; @@ -424,7 +424,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) p = dataPtr; // See B.K.O #148037 : take a care about byte order with Motorola computers. - if (QImage::systemByteOrder() == QImage::BigEndian) // PPC + if (TQImage::systemByteOrder() == TQImage::BigEndian) // PPC { p[3] = *stripPtr++; p[0] = *stripPtr++; @@ -464,7 +464,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoaderObserver *observer) return true; } -bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) +bool TIFFLoader::save(const TQString& filePath, DImgLoaderObserver *observer) { TIFF *tif; uchar *data; @@ -484,7 +484,7 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Open the file - tif = TIFFOpen(QFile::encodeName(filePath), "w"); + tif = TIFFOpen(TQFile::encodeName(filePath), "w"); if (!tif) { @@ -503,7 +503,7 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_NONE); // Image must be compressed using deflate algorithm ? - QVariant compressAttr = imageGetAttribute("compress"); + TQVariant compressAttr = imageGetAttribute("compress"); bool compress = compressAttr.isValid() ? compressAttr.toBool() : false; if (compress) @@ -545,7 +545,7 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) // Standard IPTC tag (available with libtiff 3.6.1) - QByteArray ba = metaData.getIptc(true); + TQByteArray ba = metaData.getIptc(true); if (!ba.isEmpty()) { #if defined(TIFFTAG_PHOTOSHOP) @@ -569,10 +569,10 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) tiffSetExifAsciiTag(tif, TIFFTAG_ARTIST, &metaData, "Exif.Image.Artist"); tiffSetExifAsciiTag(tif, TIFFTAG_COPYRIGHT, &metaData, "Exif.Image.Copyright"); - QString soft = metaData.getExifTagString("Exif.Image.Software"); - QString libtiffver(TIFFLIB_VERSION_STR); - libtiffver.replace('\n', ' '); - soft.append(QString(" ( %1 )").arg(libtiffver)); + TQString soft = metaData.getExifTagString("Exif.Image.Software"); + TQString libtiffver(TIFFLIB_VERSION_STR); + libtiffver.tqreplace('\n', ' '); + soft.append(TQString(" ( %1 )").tqarg(libtiffver)); TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii()); // NOTE: All others Exif tags will be written by Exiv2 (<= 0.18) @@ -580,7 +580,7 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Write ICC profil. - QByteArray profile_rawdata = m_image->getICCProfil(); + TQByteArray profile_rawdata = m_image->getICCProfil(); if (!profile_rawdata.isEmpty()) { @@ -710,7 +710,7 @@ bool TIFFLoader::save(const QString& filePath, DImgLoaderObserver *observer) // ------------------------------------------------------------------- // Write thumbnail in tiff directory IFD1 - QImage thumb = m_image->smoothScale(160, 120, QSize::ScaleMin).copyQImage(); + TQImage thumb = m_image->smoothScale(160, 120, TQSize::ScaleMin).copyTQImage(); TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32)thumb.width()); TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)thumb.height()); @@ -785,10 +785,10 @@ bool TIFFLoader::sixteenBit() const void TIFFLoader::tiffSetExifAsciiTag(TIFF* tif, ttag_t tiffTag, const DMetadata *metaData, const char* exifTagName) { - QByteArray tag = metaData->getExifTagData(exifTagName); + TQByteArray tag = metaData->getExifTagData(exifTagName); if (!tag.isEmpty()) { - QCString str(tag.data(), tag.size()); + TQCString str(tag.data(), tag.size()); TIFFSetField(tif, tiffTag, (const char*)str); } } @@ -796,7 +796,7 @@ void TIFFLoader::tiffSetExifAsciiTag(TIFF* tif, ttag_t tiffTag, void TIFFLoader::tiffSetExifDataTag(TIFF* tif, ttag_t tiffTag, const DMetadata *metaData, const char* exifTagName) { - QByteArray tag = metaData->getExifTagData(exifTagName); + TQByteArray tag = metaData->getExifTagData(exifTagName); if (!tag.isEmpty()) { TIFFSetField (tif, tiffTag, (uint32)tag.size(), (char *)tag.data()); diff --git a/digikam/libs/dimg/loaders/tiffloader.h b/digikam/libs/dimg/loaders/tiffloader.h index 962ff48..484afd0 100644 --- a/digikam/libs/dimg/loaders/tiffloader.h +++ b/digikam/libs/dimg/loaders/tiffloader.h @@ -50,8 +50,8 @@ public: TIFFLoader(DImg* image); - bool load(const QString& filePath, DImgLoaderObserver *observer); - bool save(const QString& filePath, DImgLoaderObserver *observer); + bool load(const TQString& filePath, DImgLoaderObserver *observer); + bool save(const TQString& filePath, DImgLoaderObserver *observer); virtual bool hasAlpha() const; virtual bool sixteenBit() const; diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/digikam/libs/dimg/loaders/tiffsettings.cpp index e996d93..027b9af 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.cpp +++ b/digikam/libs/dimg/loaders/tiffsettings.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qwhatsthis.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -53,20 +53,20 @@ public: TIFFcompression = 0; } - QGridLayout *TIFFGrid; + TQGridLayout *TIFFGrid; - QCheckBox *TIFFcompression; + TQCheckBox *TIFFcompression; }; -TIFFSettings::TIFFSettings(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +TIFFSettings::TIFFSettings(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new TIFFSettingsPriv; - d->TIFFGrid = new QGridLayout(this, 1, 1, KDialog::spacingHint()); - d->TIFFcompression = new QCheckBox(i18n("Compress TIFF files"), this); + d->TIFFGrid = new TQGridLayout(this, 1, 1, KDialog::spacingHint()); + d->TIFFcompression = new TQCheckBox(i18n("Compress TIFF files"), this); - QWhatsThis::add( d->TIFFcompression, i18n("<p>Toggle compression for TIFF images.<p>" + TQWhatsThis::add( d->TIFFcompression, i18n("<p>Toggle compression for TIFF images.<p>" "If you enable this option, you can reduce " "the final file size of the TIFF image.</p>" "<p>A lossless compression format (Deflate) " diff --git a/digikam/libs/dimg/loaders/tiffsettings.h b/digikam/libs/dimg/loaders/tiffsettings.h index d1b742e..7ee2b93 100644 --- a/digikam/libs/dimg/loaders/tiffsettings.h +++ b/digikam/libs/dimg/loaders/tiffsettings.h @@ -26,7 +26,7 @@ // KDE includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class TIFFSettingsPriv; -class DIGIKAM_EXPORT TIFFSettings : public QWidget +class DIGIKAM_EXPORT TIFFSettings : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TIFFSettings(QWidget *parent=0); + TIFFSettings(TQWidget *tqparent=0); ~TIFFSettings(); void setCompression(bool b); diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp index 13b530a..2398157 100644 --- a/digikam/libs/dmetadata/dmetadata.cpp +++ b/digikam/libs/dmetadata/dmetadata.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdom.h> -#include <qfile.h> +#include <tqdom.h> +#include <tqfile.h> // LibKDcraw includes. @@ -47,7 +47,7 @@ DMetadata::DMetadata() { } -DMetadata::DMetadata(const QString& filePath) +DMetadata::DMetadata(const TQString& filePath) : KExiv2Iface::KExiv2() { load(filePath); @@ -57,7 +57,7 @@ DMetadata::~DMetadata() { } -bool DMetadata::load(const QString& filePath) +bool DMetadata::load(const TQString& filePath) { // In first, we trying to get metadata using Exiv2, // else we will use dcraw to extract minimal information. @@ -71,7 +71,7 @@ bool DMetadata::load(const QString& filePath) return true; } -bool DMetadata::loadUsingDcraw(const QString& filePath) +bool DMetadata::loadUsingDcraw(const TQString& filePath) { KDcrawIface::DcrawInfoContainer identify; if (KDcrawIface::KDcraw::rawFileIdentify(identify, filePath)) @@ -123,14 +123,14 @@ bool DMetadata::loadUsingDcraw(const QString& filePath) return false; } -QString DMetadata::getImageComment() const +TQString DMetadata::getImageComment() const { if (getFilePath().isEmpty()) - return QString(); + return TQString(); // In first we trying to get image comments, outside of Exif and IPTC. - QString comment = getCommentsDecoded(); + TQString comment = getCommentsDecoded(); if (!comment.isEmpty()) return comment; @@ -138,7 +138,7 @@ QString DMetadata::getImageComment() const if (!getExif().isEmpty()) { - QString exifComment = getExifComment(); + TQString exifComment = getExifComment(); if (!exifComment.isEmpty()) return exifComment; } @@ -147,15 +147,15 @@ QString DMetadata::getImageComment() const if (!getIptc().isEmpty()) { - QString iptcComment = getIptcTagString("Iptc.Application2.Caption", false); + TQString iptcComment = getIptcTagString("Iptc.Application2.Caption", false); if (!iptcComment.isEmpty() && !iptcComment.stripWhiteSpace().isEmpty()) return iptcComment; } - return QString(); + return TQString(); } -bool DMetadata::setImageComment(const QString& comment) +bool DMetadata::setImageComment(const TQString& comment) { //See bug #139313: An empty string is also a valid value //if (comment.isEmpty()) @@ -179,7 +179,7 @@ bool DMetadata::setImageComment(const QString& comment) // In Third we write comments into Iptc. // Note that Caption IPTC tag is limited to 2000 char and ASCII charset. - QString commentIptc = comment; + TQString commentIptc = comment; commentIptc.truncate(2000); if (!setIptcTagString("Iptc.Application2.Caption", commentIptc)) @@ -227,25 +227,25 @@ int DMetadata::getImageRating() const if (!getIptc().isEmpty()) { - QString IptcUrgency(getIptcTagData("Iptc.Application2.Urgency")); + TQString IptcUrgency(getIptcTagData("Iptc.Application2.Urgency")); if (!IptcUrgency.isEmpty()) { - if (IptcUrgency == QString("1")) + if (IptcUrgency == TQString("1")) return 5; - else if (IptcUrgency == QString("2")) + else if (IptcUrgency == TQString("2")) return 4; - else if (IptcUrgency == QString("3")) + else if (IptcUrgency == TQString("3")) return 4; - else if (IptcUrgency == QString("4")) + else if (IptcUrgency == TQString("4")) return 3; - else if (IptcUrgency == QString("5")) + else if (IptcUrgency == TQString("5")) return 2; - else if (IptcUrgency == QString("6")) + else if (IptcUrgency == TQString("6")) return 1; - else if (IptcUrgency == QString("7")) + else if (IptcUrgency == TQString("7")) return 1; - else if (IptcUrgency == QString("8")) + else if (IptcUrgency == TQString("8")) return 0; } } @@ -300,27 +300,27 @@ bool DMetadata::setImageRating(int rating) // Set Iptc Urgency tag value. - QString urgencyTag; + TQString urgencyTag; switch(rating) { case 0: - urgencyTag = QString("8"); + urgencyTag = TQString("8"); break; case 1: - urgencyTag = QString("7"); + urgencyTag = TQString("7"); break; case 2: - urgencyTag = QString("5"); + urgencyTag = TQString("5"); break; case 3: - urgencyTag = QString("4"); + urgencyTag = TQString("4"); break; case 4: - urgencyTag = QString("3"); + urgencyTag = TQString("3"); break; case 5: - urgencyTag = QString("1"); + urgencyTag = TQString("1"); break; } @@ -330,15 +330,15 @@ bool DMetadata::setImageRating(int rating) return true; } -bool DMetadata::setIptcTag(const QString& text, int maxLength, const char* debugLabel, const char* tagKey) +bool DMetadata::setIptcTag(const TQString& text, int maxLength, const char* debugLabel, const char* tagKey) { - QString truncatedText = text; + TQString truncatedText = text; truncatedText.truncate(maxLength); DDebug() << getFilePath() << " ==> " << debugLabel << ": " << truncatedText << endl; return setIptcTagString(tagKey, truncatedText); // returns false if failed } -bool DMetadata::setImagePhotographerId(const QString& author, const QString& authorTitle) +bool DMetadata::setImagePhotographerId(const TQString& author, const TQString& authorTitle) { if (!setProgramId()) return false; @@ -350,7 +350,7 @@ bool DMetadata::setImagePhotographerId(const QString& author, const QString& aut return true; } -bool DMetadata::setImageCredits(const QString& credit, const QString& source, const QString& copyright) +bool DMetadata::setImageCredits(const TQString& credit, const TQString& source, const TQString& copyright) { if (!setProgramId()) return false; @@ -367,8 +367,8 @@ bool DMetadata::setProgramId(bool on) { if (on) { - QString version(digikam_version); - QString software("digiKam"); + TQString version(digikam_version); + TQString software("digiKam"); return setImageProgramId(software, version); } @@ -429,21 +429,21 @@ like a byte array. The XML text data format are like below: */ -bool DMetadata::getXMLImageProperties(QString& comments, QDateTime& date, - int& rating, QStringList& tagsPath) +bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date, + int& rating, TQStringList& tagsPath) { rating = 0; - QByteArray data = getIptcTagData("Iptc.Application2.0x00ff"); + TQByteArray data = getIptcTagData("Iptc.Application2.0x00ff"); if (data.isEmpty()) return false; - QByteArray decompressedData = qUncompress(data); - QString doc; - QDataStream ds(decompressedData, IO_ReadOnly); + TQByteArray decompressedData = tqUncompress(data); + TQString doc; + TQDataStream ds(decompressedData, IO_ReadOnly); ds >> doc; - QDomDocument xmlDoc; - QString error; + TQDomDocument xmlDoc; + TQString error; int row, col; if (!xmlDoc.setContent(doc, true, &error, &row, &col)) { @@ -452,43 +452,43 @@ bool DMetadata::getXMLImageProperties(QString& comments, QDateTime& date, return false; } - QDomElement rootElem = xmlDoc.documentElement(); - if (rootElem.tagName() != QString::fromLatin1("digikamproperties")) + TQDomElement rootElem = xmlDoc.documentElement(); + if (rootElem.tagName() != TQString::tqfromLatin1("digikamproperties")) return false; - for (QDomNode node = rootElem.firstChild(); + for (TQDomNode node = rootElem.firstChild(); !node.isNull(); node = node.nextSibling()) { - QDomElement e = node.toElement(); - QString name = e.tagName(); - QString val = e.attribute(QString::fromLatin1("value")); + TQDomElement e = node.toElement(); + TQString name = e.tagName(); + TQString val = e.attribute(TQString::tqfromLatin1("value")); - if (name == QString::fromLatin1("comments")) + if (name == TQString::tqfromLatin1("comments")) { comments = val; } - else if (name == QString::fromLatin1("date")) + else if (name == TQString::tqfromLatin1("date")) { if (val.isEmpty()) continue; - date = QDateTime::fromString(val, Qt::ISODate); + date = TQDateTime::fromString(val, Qt::ISODate); } - else if (name == QString::fromLatin1("rating")) + else if (name == TQString::tqfromLatin1("rating")) { if (val.isEmpty()) continue; bool ok=false; rating = val.toInt(&ok); if (!ok) rating = 0; } - else if (name == QString::fromLatin1("tagslist")) + else if (name == TQString::tqfromLatin1("tagslist")) { - for (QDomNode node2 = e.firstChild(); + for (TQDomNode node2 = e.firstChild(); !node2.isNull(); node2 = node2.nextSibling()) { - QDomElement e2 = node2.toElement(); - QString name2 = e2.tagName(); - QString val2 = e2.attribute(QString::fromLatin1("path")); + TQDomElement e2 = node2.toElement(); + TQString name2 = e2.tagName(); + TQString val2 = e2.attribute(TQString::tqfromLatin1("path")); - if (name2 == QString::fromLatin1("tag")) + if (name2 == TQString::tqfromLatin1("tag")) { if (val2.isEmpty()) continue; tagsPath.append(val2); @@ -500,44 +500,44 @@ bool DMetadata::getXMLImageProperties(QString& comments, QDateTime& date, return true; } -bool DMetadata::setXMLImageProperties(const QString& comments, const QDateTime& date, - int rating, const QStringList& tagsPath) +bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime& date, + int rating, const TQStringList& tagsPath) { - QDomDocument xmlDoc; + TQDomDocument xmlDoc; - xmlDoc.appendChild(xmlDoc.createProcessingInstruction( QString::fromLatin1("xml"), - QString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); + xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"), + TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) ); - QDomElement propertiesElem = xmlDoc.createElement(QString::fromLatin1("digikamproperties")); + TQDomElement propertiesElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamproperties")); xmlDoc.appendChild( propertiesElem ); - QDomElement c = xmlDoc.createElement(QString::fromLatin1("comments")); - c.setAttribute(QString::fromLatin1("value"), comments); + TQDomElement c = xmlDoc.createElement(TQString::tqfromLatin1("comments")); + c.setAttribute(TQString::tqfromLatin1("value"), comments); propertiesElem.appendChild(c); - QDomElement d = xmlDoc.createElement(QString::fromLatin1("date")); - d.setAttribute(QString::fromLatin1("value"), date.toString(Qt::ISODate)); + TQDomElement d = xmlDoc.createElement(TQString::tqfromLatin1("date")); + d.setAttribute(TQString::tqfromLatin1("value"), date.toString(Qt::ISODate)); propertiesElem.appendChild(d); - QDomElement r = xmlDoc.createElement(QString::fromLatin1("rating")); - r.setAttribute(QString::fromLatin1("value"), rating); + TQDomElement r = xmlDoc.createElement(TQString::tqfromLatin1("rating")); + r.setAttribute(TQString::tqfromLatin1("value"), rating); propertiesElem.appendChild(r); - QDomElement tagsElem = xmlDoc.createElement(QString::fromLatin1("tagslist")); + TQDomElement tagsElem = xmlDoc.createElement(TQString::tqfromLatin1("tagslist")); propertiesElem.appendChild(tagsElem); - QStringList path = tagsPath; - for ( QStringList::Iterator it = path.begin(); it != path.end(); ++it ) + TQStringList path = tagsPath; + for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it ) { - QDomElement e = xmlDoc.createElement(QString::fromLatin1("tag")); - e.setAttribute(QString::fromLatin1("path"), *it); + TQDomElement e = xmlDoc.createElement(TQString::tqfromLatin1("tag")); + e.setAttribute(TQString::tqfromLatin1("path"), *it); tagsElem.appendChild(e); } - QByteArray data, compressedData; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data, compressedData; + TQDataStream ds(data, IO_WriteOnly); ds << xmlDoc.toString(); - compressedData = qCompress(data); + compressedData = tqCompress(data); return (setIptcTagData("Iptc.Application2.0x00ff", compressedData)); } diff --git a/digikam/libs/dmetadata/dmetadata.h b/digikam/libs/dmetadata/dmetadata.h index 6447f35..a33bc61 100644 --- a/digikam/libs/dmetadata/dmetadata.h +++ b/digikam/libs/dmetadata/dmetadata.h @@ -25,9 +25,9 @@ #ifndef DMETADATA_H #define DMETADATA_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // LibKExiv2 includes. @@ -48,37 +48,37 @@ class DIGIKAM_EXPORT DMetadata : public KExiv2Iface::KExiv2 public: DMetadata(); - DMetadata(const QString& filePath); + DMetadata(const TQString& filePath); ~DMetadata(); /** Re-implemented from libKexiv2 to use dcraw identify method if Exiv2 failed. */ - bool load(const QString& filePath); + bool load(const TQString& filePath); /** Try to extract metadata using dcraw identify method */ - bool loadUsingDcraw(const QString& filePath); + bool loadUsingDcraw(const TQString& filePath); /** Metadata manipulation methods */ - QString getImageComment() const; - bool setImageComment(const QString& comment); + TQString getImageComment() const; + bool setImageComment(const TQString& comment); int getImageRating() const; bool setImageRating(int rating); - bool setImagePhotographerId(const QString& author, const QString& authorTitle); - bool setImageCredits(const QString& credit, const QString& source, const QString& copyright); + bool setImagePhotographerId(const TQString& author, const TQString& authorTitle); + bool setImageCredits(const TQString& credit, const TQString& source, const TQString& copyright); PhotoInfoContainer getPhotographInformations() const; - bool getXMLImageProperties(QString& comments, QDateTime& date, - int& rating, QStringList& tagsPath); - bool setXMLImageProperties(const QString& comments, const QDateTime& date, - int rating, const QStringList& tagsPath); + bool getXMLImageProperties(TQString& comments, TQDateTime& date, + int& rating, TQStringList& tagsPath); + bool setXMLImageProperties(const TQString& comments, const TQDateTime& date, + int rating, const TQStringList& tagsPath); private: bool setProgramId(bool on=true); - bool setIptcTag(const QString& text, int maxLength, const char* debugLabel, const char* tagKey); + bool setIptcTag(const TQString& text, int maxLength, const char* debugLabel, const char* tagKey); }; } // NameSpace Digikam diff --git a/digikam/libs/dmetadata/photoinfocontainer.h b/digikam/libs/dmetadata/photoinfocontainer.h index 5f4ea68..b008b6b 100644 --- a/digikam/libs/dmetadata/photoinfocontainer.h +++ b/digikam/libs/dmetadata/photoinfocontainer.h @@ -24,10 +24,10 @@ #ifndef PHOTOINFOCONTAINER_H #define PHOTOINFOCONTAINER_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqdatetime.h> // Local includes. @@ -62,19 +62,19 @@ public: return false; }; - QString make; - QString model; - QString exposureTime; - QString exposureMode; - QString exposureProgram; - QString aperture; - QString focalLength; - QString focalLength35mm; - QString sensitivity; - QString flash; - QString whiteBalance; + TQString make; + TQString model; + TQString exposureTime; + TQString exposureMode; + TQString exposureProgram; + TQString aperture; + TQString focalLength; + TQString focalLength35mm; + TQString sensitivity; + TQString flash; + TQString whiteBalance; - QDateTime dateTime; + TQDateTime dateTime; }; } // namespace Digikam diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h index a5bbba9..5a36940 100644 --- a/digikam/libs/greycstoration/CImg.h +++ b/digikam/libs/greycstoration/CImg.h @@ -2000,7 +2000,7 @@ namespace cimg_library { - \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window. This exception is thrown when image display request cannot be satisfied. - The parent class CImgException may be thrown itself when errors that cannot be classified in one of + The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally reserved to %CImg Library functions. \b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple @@ -4989,7 +4989,7 @@ namespace cimg_library { } //! Find a character in a C-string. - inline int strfind(const char *const s, const char c) { + inline int strtqfind(const char *const s, const char c) { if (!s) return -1; int l; for (l = cimg::strlen(s); l>=0 && s[l]!=c; --l) {} return l; @@ -5047,7 +5047,7 @@ namespace cimg_library { //! Compute the basename of a filename. inline const char* basename(const char *const s) { - return (cimg_OS!=2)?(s?s+1+cimg::strfind(s,'/'):0):(s?s+1+cimg::strfind(s,'\\'):0); + return (cimg_OS!=2)?(s?s+1+cimg::strtqfind(s,'/'):0):(s?s+1+cimg::strtqfind(s,'\\'):0); } // Generate a random filename. @@ -5527,7 +5527,7 @@ namespace cimg_library { //! Split a filename into two strings 'body' and 'extension'. inline const char *split_filename(const char *const filename, char *const body=0) { if (!filename) { if (body) body[0]='\0'; return 0; } - int l = cimg::strfind(filename,'.'); + int l = cimg::strtqfind(filename,'.'); if (l>=0) { if (body) { cimg_std::strncpy(body,filename,l); body[l]='\0'; }} else { if (body) cimg_std::strcpy(body,filename); l = (int)cimg::strlen(filename)-1; } return filename+l+1; @@ -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 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). + \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). **/ template<typename T> CImgDisplay& display(const CImgList<T>& list, const char axis='x', const char align='p') { @@ -7624,7 +7624,7 @@ namespace cimg_library { vtemplate.visualid = XVisualIDFromVisual(visual); int nb_visuals; XVisualInfo *vinfo = XGetVisualInfo(cimg::X11attr().display,VisualIDMask,&vtemplate,&nb_visuals); - if (vinfo && vinfo->red_mask<vinfo->blue_mask) cimg::X11attr().blue_first = true; + if (vinfo && vinfo->red_tqmask<vinfo->blue_tqmask) cimg::X11attr().blue_first = true; cimg::X11attr().byte_order = ImageByteOrder(cimg::X11attr().display); XFree(vinfo); XLockDisplay(cimg::X11attr().display); @@ -9304,12 +9304,12 @@ namespace cimg_library { MPEnterCriticalRegion(paintCriticalRegion,kDurationForever); CGrafPtr portPtr = GetWindowPort(carbonWindow); CGContextRef currentContext = 0; - QDBeginCGContext(portPtr,¤tContext); + TQDBeginCGContext(portPtr,¤tContext); CGContextSetRGBFillColor(currentContext,255,255,255,255); CGContextFillRect(currentContext,CGRectMake(0,0,window_width,window_height)); CGContextDrawImage(currentContext,CGRectMake(0,int(window_height-height)<0?0:window_height-height,width,height),imageRef); CGContextFlush(currentContext); - QDEndCGContext(portPtr, ¤tContext); + TQDEndCGContext(portPtr, ¤tContext); MPExitCriticalRegion(paintCriticalRegion); } return *this; @@ -9393,8 +9393,8 @@ namespace cimg_library { return assign(width,height,title,normalization,!is_fullscreen,false); } - static OSStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) { - OSStatus result = eventNotHandledErr; + static OStqStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) { + OStqStatus 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; - OSStatus err; + OStqStatus 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 - OSStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond); + OStqStatus 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) { @@ -9875,7 +9875,7 @@ namespace cimg_library { \par Image structure - The \ref CImg<\c T> structure contains \a six fields : + The \ref CImg<\c T> structure tqcontains \a six fields : - \ref width defines the number of \a columns of the image (size along the X-axis). - \ref height defines the number of \a rows of the image (size along the Y-axis). - \ref depth defines the number of \a slices of the image (size along the Z-axis). @@ -11076,7 +11076,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y,z,v). template<typename t> - bool contains(const T& pixel, t& x, t& y, t& z, t& v) const { + bool tqcontains(const T& pixel, t& x, t& y, t& z, t& v) const { const unsigned long wh = width*height, whz = wh*depth, siz = whz*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11092,7 +11092,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y,z). template<typename t> - bool contains(const T& pixel, t& x, t& y, t& z) const { + bool tqcontains(const T& pixel, t& x, t& y, t& z) const { const unsigned long wh = width*height, whz = wh*depth, siz = whz*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11106,7 +11106,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y). template<typename t> - bool contains(const T& pixel, t& x, t& y) const { + bool tqcontains(const T& pixel, t& x, t& y) const { const unsigned long wh = width*height, siz = wh*depth*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11118,7 +11118,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x). template<typename t> - bool contains(const T& pixel, t& x) const { + bool tqcontains(const T& pixel, t& x) const { const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+size()) return false; x = (t)(((unsigned long)(ppixel - data))%width); @@ -11126,7 +11126,7 @@ namespace cimg_library { } //! Return \c true if specified referenced value is inside the image boundaries. - bool contains(const T& pixel) const { + bool tqcontains(const T& pixel) const { const T *const ppixel = &pixel; return !is_empty() && ppixel>=data && ppixel<data+size(); } @@ -12049,8 +12049,8 @@ namespace cimg_library { int xm = 0, ym = 0, zm = 0, vm = 0, xM = 0, yM = 0, zM = 0, vM = 0; - contains(*pm,xm,ym,zm,vm); - contains(*pM,xM,yM,zM,vM); + tqcontains(*pm,xm,ym,zm,vm); + tqcontains(*pM,xM,yM,zM,vM); return CImg<Tfloat>(1,12).fill((Tfloat)m,(Tfloat)M,mean_value,variance_value, (Tfloat)xm,(Tfloat)ym,(Tfloat)zm,(Tfloat)vm, (Tfloat)xM,(Tfloat)yM,(Tfloat)zM,(Tfloat)vM); @@ -14041,7 +14041,7 @@ namespace cimg_library { //! Resize an image. /** - \param src Image giving the geometry of the resize. + \param src Image giving the tqgeometry 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 geometry of the resize. + \param disp = Display giving the tqgeometry of the resize. \param interpolation_type = Resizing type : - 0 = no interpolation : additional space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -14096,16 +14096,16 @@ namespace cimg_library { CImg<T> get_resize_halfXY() const { if (is_empty()) return *this; - const Tfloat mask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f, + const Tfloat tqmask[9] = { 0.07842776544f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.1935127547f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.07842776544f }; T I[9] = { 0 }; CImg<T> dest(width/2,height/2,depth,dim); cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) if (x%2 && y%2) dest(x/2,y/2,z,k) = (T) - (I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] + - I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] + - I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]); + (I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] + + I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] + + I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]); return dest; } @@ -15746,8 +15746,8 @@ namespace cimg_library { - -1 = Backward finite differences - 0 = Centered finite differences - 1 = Forward finite differences - - 2 = Using Sobel masks - - 3 = Using rotation invariant masks + - 2 = Using Sobel tqmasks + - 3 = Using rotation invariant tqmasks - 4 = Using Deriche recusrsive filter. **/ CImgList<Tfloat> get_gradient(const char *const axes=0, const int scheme=3) const { @@ -15813,7 +15813,7 @@ namespace cimg_library { grad[1](x,y,z,k) = (Tfloat)Icn - Icc; } } break; - case 2 : { // using Sobel mask + case 2 : { // using Sobel tqmask CImg_3x3(I,T); const Tfloat a = 1, b = 2; cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) { @@ -15821,7 +15821,7 @@ namespace cimg_library { grad[1](x,y,z,k) = -a*Ipp - b*Icp - a*Inp + a*Ipn + b*Icn + a*Inn; } } break; - case 3 : { // using rotation invariant mask + case 3 : { // using rotation invariant tqmask CImg_3x3(I,T); const Tfloat a = (Tfloat)(0.25f*(2-cimg_std::sqrt(2.0f))), b = (Tfloat)(0.5f*(cimg_std::sqrt(2.0f)-1)); cimg_forZV(*this,z,k) cimg_for3x3(*this,x,y,z,k,I) { @@ -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 shape of specified isovalue. + //! Compute the Euclidean distance map to a tqshape 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) { @@ -19666,37 +19666,37 @@ namespace cimg_library { return draw_image(0,sprite,opacity); } - //! Draw a sprite image in the instance image (masked version). + //! Draw a sprite image in the instance image (tqmasked version). /** \param sprite Sprite image. - \param mask Mask image. + \param tqmask Mask image. \param x0 X-coordinate of the sprite position in the instance image. \param y0 Y-coordinate of the sprite position in the instance image. \param z0 Z-coordinate of the sprite position in the instance image. \param v0 V-coordinate of the sprite position in the instance image. - \param mask_valmax Maximum pixel value of the mask image \c mask (optional). + \param tqmask_valmax Maximum pixel value of the tqmask image \c tqmask (optional). \param opacity Drawing opacity. \note - - Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite. + - Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite. - Clipping is supported. - - Dimensions along x,y and z of \p sprite and \p mask must be the same. + - Dimensions along x,y and z of \p sprite and \p tqmask must be the same. **/ template<typename ti, typename tm> CImg<T>& draw_image(const int x0, const int y0, const int z0, const int v0, - const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1, - const float mask_valmax=1) { + const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1, + const float tqmask_valmax=1) { if (is_empty()) return *this; if (!sprite) throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.", pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data); - if (!mask) - throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); - if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,mask,opacity,mask_valmax); - if (is_overlapped(mask)) return draw_image(x0,y0,z0,v0,sprite,+mask,opacity,mask_valmax); - if (mask.width!=sprite.width || mask.height!=sprite.height || mask.depth!=sprite.depth) + if (!tqmask) + throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.", + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (is_overlapped(sprite)) return draw_image(x0,y0,z0,v0,+sprite,tqmask,opacity,tqmask_valmax); + if (is_overlapped(tqmask)) return draw_image(x0,y0,z0,v0,sprite,+tqmask,opacity,tqmask_valmax); + if (tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth) throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); const bool bx = (x0<0), by = (y0<0), bz = (z0<0), bv = (v0<0); const int lX = sprite.dimx() - (x0 + sprite.dimx()>dimx()?x0 + sprite.dimx() - dimx():0) + (bx?x0:0), @@ -19704,10 +19704,10 @@ namespace cimg_library { lZ = sprite.dimz() - (z0 + sprite.dimz()>dimz()?z0 + sprite.dimz() - dimz():0) + (bz?z0:0), lV = sprite.dimv() - (v0 + sprite.dimv()>dimv()?v0 + sprite.dimv() - dimv():0) + (bv?v0:0); const int - coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)-(bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0), - ssize = mask.dimx()*mask.dimy()*mask.dimz(); + coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)-(bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0), + ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz(); const ti *ptrs = sprite.data + coff; - const tm *ptrm = mask.data + coff; + const tm *ptrm = tqmask.data + coff; const unsigned int offX = width - lX, soffX = sprite.width - lX, offY = width*(height - lY), soffY = sprite.width*(sprite.height - lY), @@ -19715,13 +19715,13 @@ namespace cimg_library { if (lX>0 && lY>0 && lZ>0 && lV>0) { T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0); for (int v = 0; v<lV; ++v) { - ptrm = mask.data + (ptrm - mask.data)%ssize; + ptrm = tqmask.data + (ptrm - tqmask.data)%ssize; for (int z = 0; z<lZ; ++z) { for (int y = 0; y<lY; ++y) { for (int x=0; x<lX; ++x) { const float mopacity = (float)(*(ptrm++)*opacity), - nopacity = cimg::abs(mopacity), copacity = mask_valmax - cimg::max(mopacity,0); - *ptrd = (T)((nopacity*(*(ptrs++)) + *ptrd*copacity)/mask_valmax); + nopacity = cimg::abs(mopacity), copacity = tqmask_valmax - cimg::max(mopacity,0); + *ptrd = (T)((nopacity*(*(ptrs++)) + *ptrd*copacity)/tqmask_valmax); ++ptrd; } ptrd+=offX; ptrs+=soffX; ptrm+=soffX; @@ -19737,32 +19737,32 @@ namespace cimg_library { //! Draw an image. template<typename ti, typename tm> CImg<T>& draw_image(const int x0, const int y0, const int z0, - const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1, - const float mask_valmax=1) { - return draw_image(x0,y0,z0,0,sprite,mask,opacity,mask_valmax); + const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1, + const float tqmask_valmax=1) { + return draw_image(x0,y0,z0,0,sprite,tqmask,opacity,tqmask_valmax); } //! Draw an image. template<typename ti, typename tm> CImg<T>& draw_image(const int x0, const int y0, - const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1, - const float mask_valmax=1) { - return draw_image(x0,y0,0,sprite,mask,opacity,mask_valmax); + const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1, + const float tqmask_valmax=1) { + return draw_image(x0,y0,0,sprite,tqmask,opacity,tqmask_valmax); } //! Draw an image. template<typename ti, typename tm> CImg<T>& draw_image(const int x0, - const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1, - const float mask_valmax=1) { - return draw_image(x0,0,sprite,mask,opacity,mask_valmax); + const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1, + const float tqmask_valmax=1) { + return draw_image(x0,0,sprite,tqmask,opacity,tqmask_valmax); } //! Draw an image. template<typename ti, typename tm> - CImg<T>& draw_image(const CImg<ti>& sprite, const CImg<tm>& mask, const float opacity=1, - const float mask_valmax=1) { - return draw_image(0,sprite,mask,opacity,mask_valmax); + CImg<T>& draw_image(const CImg<ti>& sprite, const CImg<tm>& tqmask, const float opacity=1, + const float tqmask_valmax=1) { + return draw_image(0,sprite,tqmask,opacity,tqmask_valmax); } //! Draw a 4D filled rectangle in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0)-(\c x1,\c y1,\c z1,\c v1). @@ -22229,12 +22229,12 @@ namespace cimg_library { case '\t' : x+=4*font[' '].width; break; default : if (c<font.size) { letter = font[c]; - const CImg<T>& mask = (c+256)<(int)font.size?font[c+256]:font[c]; + const CImg<T>& tqmask = (c+256)<(int)font.size?font[c+256]:font[c]; if (foreground_color) for (unsigned int p = 0; p<letter.width*letter.height; ++p) - if (mask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)(letter(p,0,0,k)*foreground_color[k]); + if (tqmask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)(letter(p,0,0,k)*foreground_color[k]); if (background_color) for (unsigned int p = 0; p<letter.width*letter.height; ++p) - if (!mask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)background_color[k]; - if (!background_color && font.size>=512) draw_image(x,y,letter,mask,opacity,(T)1); + if (!tqmask(p)) cimg_forV(*this,k) letter(p,0,0,k) = (T)background_color[k]; + if (!background_color && font.size>=512) draw_image(x,y,letter,tqmask,opacity,(T)1); else draw_image(x,y,letter,opacity); x+=letter.width; } @@ -22777,11 +22777,11 @@ namespace cimg_library { \param y Y-coordinate of the starting point of the region to fill. \param z Z-coordinate of the starting point of the region to fill. \param color An array of dimv() values of type \c T, defining the drawing color. - \param region Image that will contain the mask of the filled region mask, as an output. + \param region Image that will contain the tqmask of the filled region tqmask, as an output. \param sigma Tolerance concerning neighborhood values. \param opacity Opacity of the drawing. \param high_connexity Tells if 8-connexity must be used (only for 2D images). - \return \p region is initialized with the binary mask of the filled region. + \return \p region is initialized with the binary tqmask of the filled region. **/ template<typename tc, typename t> CImg<T>& draw_fill(const int x, const int y, const int z, @@ -24508,45 +24508,45 @@ namespace cimg_library { //@{ //---------------------------- - //! Compute the correlation of the instance image by a mask. + //! Compute the correlation of the instance image by a tqmask. /** - The correlation of the instance image \p *this by the mask \p mask is defined to be : + The correlation of the instance image \p *this by the tqmask \p tqmask is defined to be : - res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*mask(i,j,k) + res(x,y,z) = sum_{i,j,k} (*this)(x+i,y+j,z+k)*tqmask(i,j,k) - \param mask = the correlation kernel. + \param tqmask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_correl = enable local normalization. **/ template<typename t> - CImg<T>& correlate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_correl=false) { - return get_correlate(mask,cond,weighted_correl).transfer_to(*this); + CImg<T>& correlate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_correl=false) { + return get_correlate(tqmask,cond,weighted_correl).transfer_to(*this); } template<typename t> - CImg<typename cimg::superset2<T,t,float>::type> get_correlate(const CImg<t>& mask, const unsigned int cond=1, + CImg<typename cimg::superset2<T,t,float>::type> get_correlate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_correl=false) const { typedef typename cimg::superset2<T,t,float>::type Ttfloat; if (is_empty()) return *this; - if (!mask || mask.dim!=1) - throw CImgArgumentException("CImg<%s>::correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if (!tqmask || tqmask.dim!=1) + throw CImgArgumentException("CImg<%s>::correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); CImg<Ttfloat> dest(width,height,depth,dim); - if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { - // A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 mask (with cond=1) - switch (mask.depth) { + if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { + // A special optimization is done for 2x2, 3x3, 4x4, 5x5, 2x2x2 and 3x3x3 tqmask (with cond=1) + switch (tqmask.depth) { case 3 : { T I[27] = { 0 }; cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + - I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + - I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + - I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + - I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + - I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + - I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] + - I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + - I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26]); + (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + + I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + + I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] + + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + + I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3x3(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + @@ -24563,10 +24563,10 @@ namespace cimg_library { case 2 : { T I[8] = { 0 }; cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*mask[0] + I[1]*mask[1] + - I[2]*mask[2] + I[3]*mask[3] + - I[4]*mask[4] + I[5]*mask[5] + - I[6]*mask[6] + I[7]*mask[7]); + (I[0]*tqmask[0] + I[1]*tqmask[1] + + I[2]*tqmask[2] + I[3]*tqmask[3] + + I[4]*tqmask[4] + I[5]*tqmask[5] + + I[6]*tqmask[6] + I[7]*tqmask[7]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2x2(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3] + @@ -24577,16 +24577,16 @@ namespace cimg_library { } break; default : case 1 : - switch (mask.width) { + switch (tqmask.width) { case 6 : { T I[36] = { 0 }; cimg_forZV(*this,z,v) cimg_for6x6(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + - I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + - I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + - I[18]*mask[18] + I[19]*mask[19] + I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + - I[24]*mask[24] + I[25]*mask[25] + I[26]*mask[26] + I[27]*mask[27] + I[28]*mask[28] + I[29]*mask[29] + - I[30]*mask[30] + I[31]*mask[31] + I[32]*mask[32] + I[33]*mask[33] + I[34]*mask[34] + I[35]*mask[35]); + (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + + I[18]*tqmask[18] + I[19]*tqmask[19] + I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + + I[24]*tqmask[24] + I[25]*tqmask[25] + I[26]*tqmask[26] + I[27]*tqmask[27] + I[28]*tqmask[28] + I[29]*tqmask[29] + + I[30]*tqmask[30] + I[31]*tqmask[31] + I[32]*tqmask[32] + I[33]*tqmask[33] + I[34]*tqmask[34] + I[35]*tqmask[35]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] + I[10]*I[10] + I[11]*I[11] + @@ -24600,11 +24600,11 @@ namespace cimg_library { case 5 : { T I[25] = { 0 }; cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + I[ 4]*mask[ 4] + - I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + - I[10]*mask[10] + I[11]*mask[11] + I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + - I[15]*mask[15] + I[16]*mask[16] + I[17]*mask[17] + I[18]*mask[18] + I[19]*mask[19] + - I[20]*mask[20] + I[21]*mask[21] + I[22]*mask[22] + I[23]*mask[23] + I[24]*mask[24]); + (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + I[ 4]*tqmask[ 4] + + I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + + I[10]*tqmask[10] + I[11]*tqmask[11] + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + + I[15]*tqmask[15] + I[16]*tqmask[16] + I[17]*tqmask[17] + I[18]*tqmask[18] + I[19]*tqmask[19] + + I[20]*tqmask[20] + I[21]*tqmask[21] + I[22]*tqmask[22] + I[23]*tqmask[23] + I[24]*tqmask[24]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for5x5(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + I[ 8]*I[ 8] + I[ 9]*I[ 9] + @@ -24617,10 +24617,10 @@ namespace cimg_library { case 4 : { T I[16] = { 0 }; cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[ 0]*mask[ 0] + I[ 1]*mask[ 1] + I[ 2]*mask[ 2] + I[ 3]*mask[ 3] + - I[ 4]*mask[ 4] + I[ 5]*mask[ 5] + I[ 6]*mask[ 6] + I[ 7]*mask[ 7] + - I[ 8]*mask[ 8] + I[ 9]*mask[ 9] + I[10]*mask[10] + I[11]*mask[11] + - I[12]*mask[12] + I[13]*mask[13] + I[14]*mask[14] + I[15]*mask[15]); + (I[ 0]*tqmask[ 0] + I[ 1]*tqmask[ 1] + I[ 2]*tqmask[ 2] + I[ 3]*tqmask[ 3] + + I[ 4]*tqmask[ 4] + I[ 5]*tqmask[ 5] + I[ 6]*tqmask[ 6] + I[ 7]*tqmask[ 7] + + I[ 8]*tqmask[ 8] + I[ 9]*tqmask[ 9] + I[10]*tqmask[10] + I[11]*tqmask[11] + + I[12]*tqmask[12] + I[13]*tqmask[13] + I[14]*tqmask[14] + I[15]*tqmask[15]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for4x4(*this,x,y,z,v,I) { const double weight = (double)(I[ 0]*I[ 0] + I[ 1]*I[ 1] + I[ 2]*I[ 2] + I[ 3]*I[ 3] + I[ 4]*I[ 4] + I[ 5]*I[ 5] + I[ 6]*I[ 6] + I[ 7]*I[ 7] + @@ -24632,9 +24632,9 @@ namespace cimg_library { case 3 : { T I[9] = { 0 }; cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*mask[0] + I[1]*mask[1] + I[2]*mask[2] + - I[3]*mask[3] + I[4]*mask[4] + I[5]*mask[5] + - I[6]*mask[6] + I[7]*mask[7] + I[8]*mask[8]); + (I[0]*tqmask[0] + I[1]*tqmask[1] + I[2]*tqmask[2] + + I[3]*tqmask[3] + I[4]*tqmask[4] + I[5]*tqmask[5] + + I[6]*tqmask[6] + I[7]*tqmask[7] + I[8]*tqmask[8]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for3x3(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3] + I[4]*I[4] + I[5]*I[5] + @@ -24645,28 +24645,28 @@ namespace cimg_library { case 2 : { T I[4] = { 0 }; cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) dest(x,y,z,v) = (Ttfloat) - (I[0]*mask[0] + I[1]*mask[1] + - I[2]*mask[2] + I[3]*mask[3]); + (I[0]*tqmask[0] + I[1]*tqmask[1] + + I[2]*tqmask[2] + I[3]*tqmask[3]); if (weighted_correl) cimg_forZV(*this,z,v) cimg_for2x2(*this,x,y,z,v,I) { const double weight = (double)(I[0]*I[0] + I[1]*I[1] + I[2]*I[2] + I[3]*I[3]); if (weight>0) dest(x,y,z,v)/=(Ttfloat)cimg_std::sqrt(weight); } } break; - case 1 : (dest.assign(*this))*=mask(0); break; + case 1 : (dest.assign(*this))*=tqmask(0); break; } } - } else { // Generic version for other masks + } else { // Generic version for other tqmasks const int - mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, - mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), + mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, + mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_correl) { // Classical correlation for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) { Ttfloat val = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) - val+=(*this)(x+xm,y+ym,z+zm,v)*mask(mx1+xm,my1+ym,mz1+zm); + val+=(*this)(x+xm,y+ym,z+zm,v)*tqmask(mx1+xm,my1+ym,mz1+zm); dest(x,y,z,v) = (Ttfloat)val; } if (cond) @@ -24674,7 +24674,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Ttfloat val = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) - val+=_atXYZ(x+xm,y+ym,z+zm,v)*mask(mx1+xm,my1+ym,mz1+zm); + val+=_atXYZ(x+xm,y+ym,z+zm,v)*tqmask(mx1+xm,my1+ym,mz1+zm); dest(x,y,z,v) = (Ttfloat)val; } else @@ -24682,7 +24682,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Ttfloat val = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) - val+=atXYZ(x+xm,y+ym,z+zm,v,0)*mask(mx1+xm,my1+ym,mz1+zm); + val+=atXYZ(x+xm,y+ym,z+zm,v,0)*tqmask(mx1+xm,my1+ym,mz1+zm); dest(x,y,z,v) = (Ttfloat)val; } } else { // Weighted correlation @@ -24690,7 +24690,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)(*this)(x+xm,y+ym,z+zm,v); - val+=cval*mask(mx1+xm,my1+ym,mz1+zm); + val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24701,7 +24701,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)_atXYZ(x+xm,y+ym,z+zm,v); - val+=cval*mask(mx1+xm,my1+ym,mz1+zm); + val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24712,7 +24712,7 @@ namespace cimg_library { Ttfloat val = 0, weight = 0; for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Ttfloat cval = (Ttfloat)atXYZ(x+xm,y+ym,z+zm,v,0); - val+=cval*mask(mx1+xm,my1+ym,mz1+zm); + val+=cval*tqmask(mx1+xm,my1+ym,mz1+zm); weight+=cval*cval; } dest(x,y,z,v) = (weight>(Ttfloat)0)?(Ttfloat)(val/cimg_std::sqrt((double)weight)):(Ttfloat)0; @@ -24722,50 +24722,50 @@ namespace cimg_library { return dest; } - //! Compute the convolution of the image by a mask. + //! Compute the convolution of the image by a tqmask. /** - The result \p res of the convolution of an image \p img by a mask \p mask is defined to be : + The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k) - \param mask = the correlation kernel. + \param tqmask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_convol = enable local normalization. **/ template<typename t> - CImg<T>& convolve(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_convol=false) { - return get_convolve(mask,cond,weighted_convol).transfer_to(*this); + CImg<T>& convolve(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_convol=false) { + return get_convolve(tqmask,cond,weighted_convol).transfer_to(*this); } template<typename t> - CImg<typename cimg::superset2<T,t,float>::type> get_convolve(const CImg<t>& mask, const unsigned int cond=1, + CImg<typename cimg::superset2<T,t,float>::type> get_convolve(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_convol=false) const { typedef typename cimg::superset2<T,t,float>::type Ttfloat; if (is_empty()) return *this; - if (!mask || mask.dim!=1) - throw CImgArgumentException("CImg<%s>::convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); - return get_correlate(CImg<t>(mask.ptr(),mask.size(),1,1,1,true).get_mirror('x').resize(mask,-1),cond,weighted_convol); + if (!tqmask || tqmask.dim!=1) + throw CImgArgumentException("CImg<%s>::convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + return get_correlate(CImg<t>(tqmask.ptr(),tqmask.size(),1,1,1,true).get_mirror('x').resize(tqmask,-1),cond,weighted_convol); } //! Return the erosion of the image by a structuring element. template<typename t> - CImg<T>& erode(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_erosion=false) { - return get_erode(mask,cond,weighted_erosion).transfer_to(*this); + CImg<T>& erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) { + return get_erode(tqmask,cond,weighted_erosion).transfer_to(*this); } template<typename t> - CImg<typename cimg::superset<T,t>::type> get_erode(const CImg<t>& mask, const unsigned int cond=1, + CImg<typename cimg::superset<T,t>::type> get_erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) const { typedef typename cimg::superset<T,t>::type Tt; if (is_empty()) return *this; - if (!mask || mask.dim!=1) - throw CImgArgumentException("CImg<%s>::erode() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if (!tqmask || tqmask.dim!=1) + throw CImgArgumentException("CImg<%s>::erode() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); CImg<Tt> dest(width,height,depth,dim); const int - mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, - mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), + mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, + mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_erosion) { // Classical erosion @@ -24773,7 +24773,7 @@ namespace cimg_library { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; } dest(x,y,z,v) = min_val; } @@ -24783,7 +24783,7 @@ namespace cimg_library { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; } dest(x,y,z,v) = min_val; } @@ -24793,7 +24793,7 @@ namespace cimg_library { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval<min_val) min_val = cval; } dest(x,y,z,v) = min_val; } @@ -24801,7 +24801,7 @@ namespace cimg_library { for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) + mval); if (mval && cval<min_val) min_val = cval; } @@ -24812,7 +24812,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) + mval); if (mval && cval<min_val) min_val = cval; } @@ -24823,7 +24823,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Tt min_val = cimg::type<Tt>::max(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) + mval); if (mval && cval<min_val) min_val = cval; } @@ -24840,32 +24840,32 @@ namespace cimg_library { } CImg<T> get_erode(const unsigned int n, const unsigned int cond=1) const { - static CImg<T> mask; + static CImg<T> tqmask; if (n<2) return *this; - if (mask.width!=n) mask.assign(n,n,1,1,1); - const CImg<T> res = get_erode(mask,cond,false); - if (n>20) mask.assign(); + if (tqmask.width!=n) tqmask.assign(n,n,1,1,1); + const CImg<T> res = get_erode(tqmask,cond,false); + if (n>20) tqmask.assign(); return res; } //! Dilate the image by a structuring element. template<typename t> - CImg<T>& dilate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) { - return get_dilate(mask,cond,weighted_dilatation).transfer_to(*this); + CImg<T>& dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) { + return get_dilate(tqmask,cond,weighted_dilatation).transfer_to(*this); } template<typename t> - CImg<typename cimg::superset<T,t>::type> get_dilate(const CImg<t>& mask, const unsigned int cond=1, + CImg<typename cimg::superset<T,t>::type> get_dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) const { typedef typename cimg::superset<T,t>::type Tt; if (is_empty()) return *this; - if (!mask || mask.dim!=1) - throw CImgArgumentException("CImg<%s>::dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if (!tqmask || tqmask.dim!=1) + throw CImgArgumentException("CImg<%s>::dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); CImg<Tt> dest(width,height,depth,dim); const int - mx2 = mask.dimx()/2, my2 = mask.dimy()/2, mz2 = mask.dimz()/2, - mx1 = mx2 - 1 + (mask.dimx()%2), my1 = my2 - 1 + (mask.dimy()%2), mz1 = mz2 - 1 + (mask.dimz()%2), + mx2 = tqmask.dimx()/2, my2 = tqmask.dimy()/2, mz2 = tqmask.dimz()/2, + mx1 = mx2 - 1 + (tqmask.dimx()%2), my1 = my2 - 1 + (tqmask.dimy()%2), mz1 = mz2 - 1 + (tqmask.dimz()%2), mxe = dimx() - mx2, mye = dimy() - my2, mze = dimz() - mz2; cimg_forV(*this,v) if (!weighted_dilatation) { // Classical dilatation @@ -24873,7 +24873,7 @@ namespace cimg_library { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const Tt cval = (Tt)(*this)(x+xm,y+ym,z+zm,v); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24883,7 +24883,7 @@ namespace cimg_library { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)_atXYZ(x+xm,y+ym,z+zm,v); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24893,7 +24893,7 @@ namespace cimg_library { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { const T cval = (Tt)atXYZ(x+xm,y+ym,z+zm,v,0); - if (mask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; + if (tqmask(mx1+xm,my1+ym,mz1+zm) && cval>max_val) max_val = cval; } dest(x,y,z,v) = max_val; } @@ -24901,7 +24901,7 @@ namespace cimg_library { for (int z = mz1; z<mze; ++z) for (int y = my1; y<mye; ++y) for (int x = mx1; x<mxe; ++x) { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)((*this)(x+xm,y+ym,z+zm,v) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24912,7 +24912,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(_atXYZ(x+xm,y+ym,z+zm,v) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24923,7 +24923,7 @@ namespace cimg_library { for (int x = 0; x<dimx(); (y<my1 || y>=mye || z<mz1 || z>=mze)?++x:((x<mx1-1 || x>=mxe)?++x:(x=mxe))) { Tt max_val = cimg::type<Tt>::min(); for (int zm = -mz1; zm<=mz2; ++zm) for (int ym = -my1; ym<=my2; ++ym) for (int xm = -mx1; xm<=mx2; ++xm) { - const t mval = mask(mx1+xm,my1+ym,mz1+zm); + const t mval = tqmask(mx1+xm,my1+ym,mz1+zm); const Tt cval = (Tt)(atXYZ(x+xm,y+ym,z+zm,v,0) - mval); if (mval && cval>max_val) max_val = cval; } @@ -24940,11 +24940,11 @@ namespace cimg_library { } CImg<T> get_dilate(const unsigned int n, const unsigned int cond=1) const { - static CImg<T> mask; + static CImg<T> tqmask; if (n<2) return *this; - if (mask.width!=n) mask.assign(n,n,1,1,1); - const CImg<T> res = get_dilate(mask,cond,false); - if (n>20) mask.assign(); + if (tqmask.width!=n) tqmask.assign(n,n,1,1,1); + const CImg<T> res = get_dilate(tqmask,cond,false); + if (n>20) tqmask.assign(); return res; } @@ -25476,12 +25476,12 @@ namespace cimg_library { //! Blur an image in an anisotropic way. /** - \param mask Binary mask. + \param tqmask Binary tqmask. \param amplitude Amplitude of the anisotropic blur. \param sharpness Contour preservation. \param anisotropy Smoothing anisotropy. \param alpha Image pre-blurring (gaussian). - \param sigma Regularity of the tensor-valued geometry. + \param sigma Regularity of the tensor-valued tqgeometry. \param dl Spatial discretization. \param da Angular discretization. \param gauss_prec Precision of the gaussian function. @@ -25490,7 +25490,7 @@ namespace cimg_library { \param geom_factor Geometry factor. **/ template<typename tm> - CImg<T>& blur_anisotropic(const CImg<tm>& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, + CImg<T>& blur_anisotropic(const CImg<tm>& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f, const float da=30, const float gauss_prec=2, const unsigned int interpolation_type=0, const bool fast_approx=true, const float geom_factor=1) { @@ -25502,7 +25502,7 @@ namespace cimg_library { "Admissible parameters are in the range : amplitude>0, sharpness>0, anisotropy in [0,1], " "alpha>0, sigma>0, dl>0, da>0, gauss_prec>0.", pixel_type(),amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec); - const bool threed = (depth>1), no_mask = mask.is_empty(); + const bool threed = (depth>1), no_tqmask = tqmask.is_empty(); const float nsharpness = cimg::max(sharpness,1e-5f), power1 = 0.5f*nsharpness, power2 = power1/(1e-7f+1-anisotropy); CImg<floatT> blurred = CImg<floatT>(*this,false).blur(alpha); if (geom_factor>0) blurred*=geom_factor; @@ -25513,7 +25513,7 @@ namespace cimg_library { CImg<floatT> val(3), vec(3,3), G(blurred.get_structure_tensor()); if (sigma>0) G.blur(sigma); cimg_forXYZ(*this,x,y,z) { - if (no_mask || mask(x,y,z)) { + if (no_tqmask || tqmask(x,y,z)) { G.get_tensor_at(x,y,z).symmetric_eigen(val,vec); const float l1 = val[2], l2 = val[1], l3 = val[0], ux = vec(0,0), uy = vec(0,1), uz = vec(0,2), @@ -25537,7 +25537,7 @@ namespace cimg_library { CImg<floatT> val(2), vec(2,2), G(blurred.get_structure_tensor()); if (sigma>0) G.blur(sigma); cimg_forXY(*this,x,y) { - if (no_mask || mask(x,y)) { + if (no_tqmask || tqmask(x,y)) { G.get_tensor_at(x,y).symmetric_eigen(val,vec); const float l1 = val[1], l2 = val[0], ux = vec(1,0), uy = vec(1,1), @@ -25558,11 +25558,11 @@ namespace cimg_library { } template<typename tm> - CImg<T> get_blur_anisotropic(const CImg<tm>& mask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, + CImg<T> get_blur_anisotropic(const CImg<tm>& tqmask, const float amplitude, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float dl=0.8f, const float da=30, const float gauss_prec=2, const unsigned int interpolation_type=0, const bool fast_approx=true, const float geom_factor=1) const { - return (+*this).blur_anisotropic(mask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor); + return (+*this).blur_anisotropic(tqmask,amplitude,sharpness,anisotropy,alpha,sigma,dl,da,gauss_prec,interpolation_type,fast_approx,geom_factor); } //! Blur an image following in an anisotropic way. @@ -27671,13 +27671,13 @@ namespace cimg_library { return *this; } - //! Simple interface to select a shape from an image. + //! Simple interface to select a tqshape from an image. /** \param selection Array of 6 values containing the selection result - \param coords_type Determine shape type to select (0=point, 1=vector, 2=rectangle, 3=circle) + \param coords_type Determine tqshape 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 shape selector. + \param color Color of the tqshape 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 shape from an image. + //! Simple interface to select a tqshape 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 shape from an image. + //! Simple interface to select a tqshape 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 shape from an image. + //! Simple interface to select a tqshape 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 shape_selected = false, text_down = false; + bool tqshape_selected = false, text_down = false; CImg<ucharT> visu, visu0; char text[1024] = { 0 }; - while (!key && !disp.is_closed && !shape_selected) { + while (!key && !disp.is_closed && !tqshape_selected) { // Handle mouse motion and selection oX = X; oY = Y; oZ = Z; @@ -27837,10 +27837,10 @@ namespace cimg_library { } if (phase) { - if (!coords_type) shape_selected = phase?true:false; + if (!coords_type) tqshape_selected = phase?true:false; else { - if (depth>1) shape_selected = (phase==3)?true:false; - else shape_selected = (phase==2)?true:false; + if (depth>1) tqshape_selected = (phase==3)?true:false; + else tqshape_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 (!shape_selected) disp.wait(); + } else if (!tqshape_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 (shape_selected) { + if (tqshape_selected) { if (coords_type==2) { if (X0>X1) cimg::swap(X0,X1); if (Y0>Y1) cimg::swap(Y0,Y1); @@ -29139,27 +29139,27 @@ namespace cimg_library { switch (bpp) { case 1 : { // Monochrome for (int y=height-1; y>=0; --y) { - unsigned char mask = 0x80, val = 0; + unsigned char tqmask = 0x80, val = 0; cimg_forX(*this,x) { - if (mask==0x80) val = *(ptrs++); - const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0)); + if (tqmask==0x80) val = *(ptrs++); + const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0)); (*this)(x,y,2) = (T)*(col++); (*this)(x,y,1) = (T)*(col++); (*this)(x,y,0) = (T)*(col++); - mask = cimg::ror(mask); + tqmask = cimg::ror(tqmask); } ptrs+=align; } } break; case 4 : { // 16 colors for (int y=height-1; y>=0; --y) { - unsigned char mask = 0xF0, val = 0; + unsigned char tqmask = 0xF0, val = 0; cimg_forX(*this,x) { - if (mask==0xF0) val = *(ptrs++); - const unsigned char color = (unsigned char)((mask<16)?(val&mask):((val&mask)>>4)); + if (tqmask==0xF0) val = *(ptrs++); + const unsigned char color = (unsigned char)((tqmask<16)?(val&tqmask):((val&tqmask)>>4)); unsigned char *col = (unsigned char*)(palette+color); (*this)(x,y,2) = (T)*(col++); (*this)(x,y,1) = (T)*(col++); (*this)(x,y,0) = (T)*(col++); - mask = cimg::ror(mask,4); + tqmask = cimg::ror(tqmask,4); } ptrs+=align; } } break; case 8 : { // 256 colors @@ -29775,7 +29775,7 @@ namespace cimg_library { unsigned int nb_images = 0; do ++nb_images; while (TIFFReadDirectory(tif)); if (nfirst_frame>=nb_images || (nlast_frame!=~0U && nlast_frame>=nb_images)) - cimg::warn("CImg<%s>::load_tiff() : File '%s' contains %u image(s), specified frame range is [%u,%u] (step %u).", + cimg::warn("CImg<%s>::load_tiff() : File '%s' tqcontains %u image(s), specified frame range is [%u,%u] (step %u).", pixel_type(),filename,nb_images,nfirst_frame,nlast_frame,nstep_frame); if (nfirst_frame>=nb_images) return assign(); if (nlast_frame>=nb_images) nlast_frame = nb_images-1; @@ -33391,49 +33391,49 @@ namespace cimg_library { //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y,z,v). template<typename t> - bool contains(const T& pixel, t& n, t& x, t&y, t& z, t& v) const { + bool tqcontains(const T& pixel, t& n, t& x, t&y, t& z, t& v) const { if (is_empty()) return false; - cimglist_for(*this,l) if (data[l].contains(pixel,x,y,z,v)) { n = (t)l; return true; } + cimglist_for(*this,l) if (data[l].tqcontains(pixel,x,y,z,v)) { n = (t)l; return true; } return false; } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y,z). template<typename t> - bool contains(const T& pixel, t& n, t& x, t&y, t& z) const { + bool tqcontains(const T& pixel, t& n, t& x, t&y, t& z) const { t v; - return contains(pixel,n,x,y,z,v); + return tqcontains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y). template<typename t> - bool contains(const T& pixel, t& n, t& x, t&y) const { + bool tqcontains(const T& pixel, t& n, t& x, t&y) const { t z,v; - return contains(pixel,n,x,y,z,v); + return tqcontains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x). template<typename t> - bool contains(const T& pixel, t& n, t& x) const { + bool tqcontains(const T& pixel, t& n, t& x) const { t y,z,v; - return contains(pixel,n,x,y,z,v); + return tqcontains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n). template<typename t> - bool contains(const T& pixel, t& n) const { + bool tqcontains(const T& pixel, t& n) const { t x,y,z,v; - return contains(pixel,n,x,y,z,v); + return tqcontains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. - bool contains(const T& pixel) const { + bool tqcontains(const T& pixel) const { unsigned int n,x,y,z,v; - return contains(pixel,n,x,y,z,v); + return tqcontains(pixel,n,x,y,z,v); } //! Return \c true if the list contains the image 'img'. If true, returns the position (n) of the image in the list. template<typename t> - bool contains(const CImg<T>& img, t& n) const { + bool tqcontains(const CImg<T>& img, t& n) const { if (is_empty()) return false; const CImg<T> *const ptr = &img; cimglist_for(*this,i) if (data+i==ptr) { n = (t)i; return true; } @@ -33441,9 +33441,9 @@ namespace cimg_library { } //! Return \c true if the list contains the image img. - bool contains(const CImg<T>& img) const { + bool tqcontains(const CImg<T>& img) const { unsigned int n; - return contains(img,n); + return tqcontains(img,n); } //@} @@ -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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment 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 { @@ -35025,9 +35025,9 @@ namespace cimg_library { for (unsigned int y=0; y<h; ++y) for (unsigned int x=0; x<256*w; ++x) { m>>=1; if (!m) { m = 0x80000000; val = *(ptr++); } - CImg<T>& img = res[x/w], &mask = res[x/w+256]; + CImg<T>& img = res[x/w], &tqmask = res[x/w+256]; unsigned int xm = x%w; - img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0); + img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0); } if (variable_size) res.crop_font(); if (paddingx || paddingy) cimglist_for(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0); @@ -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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment 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, @@ -35922,7 +35922,7 @@ namespace cimg_library { unsigned int nb_images = 0; do ++nb_images; while (TIFFReadDirectory(tif)); if (nfirst_frame>=nb_images || (nlast_frame!=~0U && nlast_frame>=nb_images)) - cimg::warn("CImgList<%s>::load_tiff() : File '%s' contains %u image(s), specified frame range is [%u,%u] (step %u).", + cimg::warn("CImgList<%s>::load_tiff() : File '%s' tqcontains %u image(s), specified frame range is [%u,%u] (step %u).", pixel_type(),filename,nb_images,nfirst_frame,nlast_frame,nstep_frame); if (nfirst_frame>=nb_images) return assign(); if (nlast_frame>=nb_images) nlast_frame = nb_images-1; diff --git a/digikam/libs/greycstoration/greycstoration.h b/digikam/libs/greycstoration/greycstoration.h index a80e2e0..9d44be6 100644 --- a/digikam/libs/greycstoration/greycstoration.h +++ b/digikam/libs/greycstoration/greycstoration.h @@ -82,7 +82,7 @@ struct _greycstoration_params { // Non-specific parameters of the algorithms. CImg<T> *source; - const CImg<unsigned char> *mask; + const CImg<unsigned char> *tqmask; CImg<T> *temporary; unsigned long *counter; unsigned int tile; @@ -104,7 +104,7 @@ struct _greycstoration_params { // Default constructor _greycstoration_params():patch_based(false),amplitude(0),sharpness(0),anisotropy(0),alpha(0),sigma(0),gfact(1), dl(0),da(0),gauss_prec(0),interpolation(0),patch_size(0), - sigma_s(0),sigma_p(0),lookup_size(0),source(0),mask(0),temporary(0),counter(0),tile(0), + sigma_s(0),sigma_p(0),lookup_size(0),source(0),tqmask(0),temporary(0),counter(0),tile(0), tile_border(0),thread(0),nb_threads(0),fast_approx(false),is_running(false), stop_request(0), mutex(0) {} }; @@ -149,8 +149,8 @@ float greycstoration_progress() const { return cimg::min(counter*99.9f/maxcounter,99.9f); } -//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a mask. -CImg& greycstoration_run(const CImg<unsigned char>& mask, +//! Run the non-patch version of the GREYCstoration algorithm on the instance image, using a tqmask. +CImg& greycstoration_run(const CImg<unsigned char>& tqmask, const float amplitude=60, const float sharpness=0.7f, const float anisotropy=0.3f, const float alpha=0.6f, const float sigma=1.1f, const float gfact=1.0f, const float dl=0.8f, const float da=30.0f, @@ -162,10 +162,10 @@ CImg& greycstoration_run(const CImg<unsigned char>& mask, " the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data); else { - if (!mask.is_empty() && !mask.is_sameXY(*this)) - throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given mask (%u,%u,%u,%u,%p) and instance image " + if (!tqmask.is_empty() && !tqmask.is_sameXY(*this)) + throw CImgArgumentException("CImg<%s>::greycstoration_run() : Given tqmask (%u,%u,%u,%u,%p) and instance image " "(%u,%u,%u,%u,%p) have different dimensions.", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data,width,height,depth,dim,data); + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data,width,height,depth,dim,data); if (nb_threads>16) cimg::warn("CImg<%s>::greycstoration_run() : Multi-threading mode limited to 16 threads max."); const unsigned int ntile = (tile && (tile<width || tile<height || (depth>1 && tile<depth)))?tile:0, @@ -195,7 +195,7 @@ CImg& greycstoration_run(const CImg<unsigned char>& mask, greycstoration_params[k].interpolation = interpolation; greycstoration_params[k].fast_approx = fast_approx; greycstoration_params[k].source = this; - greycstoration_params[k].mask = &mask; + greycstoration_params[k].tqmask = &tqmask; greycstoration_params[k].temporary = temporary; greycstoration_params[k].counter = counter; greycstoration_params[k].tile = ntile; @@ -239,8 +239,8 @@ CImg& greycstoration_run(const float amplitude=50, const float sharpness=0.7f, c const float dl=0.8f, const float da=30.0f, const float gauss_prec=2.0f, const unsigned int interpolation=0, const bool fast_approx=true, const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) { - static const CImg<unsigned char> empty_mask; - return greycstoration_run(empty_mask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec, + static const CImg<unsigned char> empty_tqmask; + return greycstoration_run(empty_tqmask,amplitude,sharpness,anisotropy,alpha,sigma,gfact,dl,da,gauss_prec, interpolation,fast_approx,tile,tile_border,nb_threads); } @@ -249,7 +249,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm const unsigned int lookup_size=20, const bool fast_approx=true, const unsigned int tile=0, const unsigned int tile_border=0, const unsigned int nb_threads=1) { - static const CImg<unsigned char> empty_mask; + static const CImg<unsigned char> empty_tqmask; if (greycstoration_is_running()) throw CImgInstanceException("CImg<T>::greycstoration_run() : A GREYCstoration thread is already running on" " the instance image (%u,%u,%u,%u,%p).",width,height,depth,dim,data); @@ -277,7 +277,7 @@ CImg& greycstoration_patch_run(const unsigned int patch_size=5, const float sigm greycstoration_params[k].sigma_p = sigma_p; greycstoration_params[k].lookup_size = lookup_size; greycstoration_params[k].source = this; - greycstoration_params[k].mask = &empty_mask; + greycstoration_params[k].tqmask = &empty_tqmask; greycstoration_params[k].temporary = temporary; greycstoration_params[k].counter = counter; greycstoration_params[k].tile = ntile; @@ -370,7 +370,7 @@ static void* greycstoration_thread(void *arg) { #endif _greycstoration_params &p = *(_greycstoration_params*)arg; greycstoration_mutex_lock(p); - const CImg<unsigned char> &mask = *(p.mask); + const CImg<unsigned char> &tqmask = *(p.tqmask); CImg<T> &source = *(p.source); if (!p.tile) { @@ -378,7 +378,7 @@ static void* greycstoration_thread(void *arg) { // Non-tiled version //------------------ if (p.patch_based) source.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); - else source.blur_anisotropic(mask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec, + else source.blur_anisotropic(tqmask,p.amplitude,p.sharpness,p.anisotropy,p.alpha,p.sigma,p.dl,p.da,p.gauss_prec, p.interpolation,p.fast_approx,p.gfact); } else { @@ -402,11 +402,11 @@ static void* greycstoration_thread(void *arg) { ye = y1<source.height?y1:source.height-1, ze = z1<source.depth?z1:source.depth-1; CImg<T> img = source.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); - CImg<unsigned char> mask_tile = mask.is_empty()?mask:mask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); + CImg<unsigned char> tqmask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,z-b,xe+b,ye+b,ze+b,true); img.greycstoration_params[0] = p; greycstoration_mutex_unlock(p); if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); - else img.blur_anisotropic(mask_tile,p.amplitude,p.sharpness,p.anisotropy, + else img.blur_anisotropic(tqmask_tile,p.amplitude,p.sharpness,p.anisotropy, p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,p.interpolation,p.fast_approx,p.gfact); greycstoration_mutex_lock(p); temporary.draw_image(x,y,z,img.crop(b,b,b,img.width-b,img.height-b,img.depth-b)); @@ -421,11 +421,11 @@ static void* greycstoration_thread(void *arg) { xe = x1<source.width?x1:source.width-1, ye = y1<source.height?y1:source.height-1; CImg<T> img = source.get_crop(x-b,y-b,xe+b,ye+b,true); - CImg<unsigned char> mask_tile = mask.is_empty()?mask:mask.get_crop(x-b,y-b,xe+b,ye+b,true); + CImg<unsigned char> tqmask_tile = tqmask.is_empty()?tqmask:tqmask.get_crop(x-b,y-b,xe+b,ye+b,true); img.greycstoration_params[0] = p; greycstoration_mutex_unlock(p); if (p.patch_based) img.blur_patch(p.patch_size,p.sigma_p,p.sigma_s,p.lookup_size,p.fast_approx); - else img.blur_anisotropic(mask_tile,p.amplitude,p.sharpness,p.anisotropy, + else img.blur_anisotropic(tqmask_tile,p.amplitude,p.sharpness,p.anisotropy, p.alpha,p.sigma,p.dl,p.da,p.gauss_prec,p.interpolation,p.fast_approx,p.gfact); temporary.draw_image(x,y,img.crop(b,b,img.width-b,img.height-b)); greycstoration_mutex_lock(p); @@ -446,7 +446,7 @@ static void* greycstoration_thread(void *arg) { if (p.counter) delete p.counter; if (p.temporary) { source = *(p.temporary); delete p.temporary; } if (p.stop_request) delete p.stop_request; - p.mask = 0; + p.tqmask = 0; p.amplitude = p.sharpness = p.anisotropy = p.alpha = p.sigma = p.gfact = p.dl = p.da = p.gauss_prec = p.sigma_s = p.sigma_p = 0; p.patch_size = p.interpolation = p.lookup_size = 0; p.fast_approx = false; diff --git a/digikam/libs/greycstoration/greycstorationiface.cpp b/digikam/libs/greycstoration/greycstorationiface.cpp index b19e00e..98d311f 100644 --- a/digikam/libs/greycstoration/greycstorationiface.cpp +++ b/digikam/libs/greycstoration/greycstorationiface.cpp @@ -48,7 +48,7 @@ #include <pthread.h> #endif -/** Number of children threads used to run Greystoration algorithm +/** Number of tqchildren 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. */ @@ -88,21 +88,21 @@ public: int mode; // The interface running mode. - QImage inPaintingMask; // Mask for inpainting. + TQImage inPaintingMask; // Mask for inpainting. GreycstorationSettings settings; // Current Greycstoraion algorithm settings. CImg<> img; // Main image. - CImg<uchar> mask; // The mask used with inpaint or resize mode + CImg<uchar> tqmask; // The tqmask used with inpaint or resize mode }; GreycstorationIface::GreycstorationIface(DImg *orgImage, GreycstorationSettings settings, int mode, int newWidth, int newHeight, - const QImage& inPaintingMask, - QObject *parent) - : DImgThreadedFilter(orgImage, parent) + const TQImage& inPaintingMask, + TQObject *tqparent) + : DImgThreadedFilter(orgImage, tqparent) { d = new GreycstorationIfacePriv; d->settings = settings; @@ -143,11 +143,11 @@ void GreycstorationIface::initFilter() if (m_parent) start(); // m_parent is valide, start thread ==> run() else - startComputation(); // no parent : no using thread. + startComputation(); // no tqparent : no using thread. } else // No image data { - if (m_parent) // If parent then send event about a problem. + if (m_parent) // If tqparent then send event about a problem. { postProgress(0, false, false); DDebug() << m_name << "::No valid image data !!! ..." << endl; @@ -332,23 +332,23 @@ void GreycstorationIface::inpainting() register int x, y; - d->mask = CImg<uchar>(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3); + d->tqmask = CImg<uchar>(d->inPaintingMask.width(), d->inPaintingMask.height(), 1, 3); uchar *ptr = d->inPaintingMask.bits(); for (y = 0; y < d->inPaintingMask.height(); y++) { for (x = 0; x < d->inPaintingMask.width(); x++) { - d->mask(x, y, 0) = ptr[2]; // blue. - d->mask(x, y, 1) = ptr[1]; // green. - d->mask(x, y, 2) = ptr[0]; // red. + d->tqmask(x, y, 0) = ptr[2]; // blue. + d->tqmask(x, y, 1) = ptr[1]; // green. + d->tqmask(x, y, 2) = ptr[0]; // red. ptr += 4; } } } else { - DDebug() << "Inpainting image: mask is null!" << endl; + DDebug() << "Inpainting image: tqmask is null!" << endl; m_cancel = true; return; } @@ -358,7 +358,7 @@ void GreycstorationIface::inpainting() // This function will start a thread running one iteration of the GREYCstoration filter. // It returns immediately, so you can do what you want after (update a progress bar for // instance). - d->img.greycstoration_run(d->mask, + d->img.greycstoration_run(d->tqmask, d->settings.amplitude, d->settings.sharpness, d->settings.anisotropy, @@ -388,12 +388,12 @@ void GreycstorationIface::resize() int w = m_destImage.width(); int h = m_destImage.height(); - d->mask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255); + d->tqmask.assign(d->img.dimx(), d->img.dimy(), 1, 1, 255); if (!anchor) - d->mask.resize(w, h, 1, 1, 1); + d->tqmask.resize(w, h, 1, 1, 1); else - d->mask = !d->mask.resize(w, h, 1, 1, 4); + d->tqmask = !d->tqmask.resize(w, h, 1, 1, 4); d->img.resize(w, h, 1, -100, init); @@ -402,7 +402,7 @@ void GreycstorationIface::resize() // This function will start a thread running one iteration of the GREYCstoration filter. // It returns immediately, so you can do what you want after (update a progress bar for // instance). - d->img.greycstoration_run(d->mask, + d->img.greycstoration_run(d->tqmask, d->settings.amplitude, d->settings.sharpness, d->settings.anisotropy, diff --git a/digikam/libs/greycstoration/greycstorationiface.h b/digikam/libs/greycstoration/greycstorationiface.h index 82519f3..8f3c57a 100644 --- a/digikam/libs/greycstoration/greycstorationiface.h +++ b/digikam/libs/greycstoration/greycstorationiface.h @@ -24,9 +24,9 @@ #ifndef GREYCSTORATIONIFACE_H #define GREYCSTORATIONIFACE_H -// Qt includes. +// TQt includes. -#include <qimage.h> +#include <tqimage.h> // Local includes. @@ -35,7 +35,7 @@ #include "greycstorationsettings.h" #include "digikam_export.h" -class QObject; +class TQObject; namespace Digikam { @@ -61,8 +61,8 @@ public: GreycstorationSettings settings, int mode=Restore, int newWidth=0, int newHeight=0, - const QImage& inPaintingMask=QImage(), - QObject *parent=0); + const TQImage& inPaintingMask=TQImage(), + TQObject *tqparent=0); ~GreycstorationIface(); diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp index 5c36a17..66cecb9 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.cpp +++ b/digikam/libs/greycstoration/greycstorationwidget.cpp @@ -20,16 +20,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <qtextstream.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqtextstream.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -58,7 +58,7 @@ public: GreycstorationWidgetPriv() { - parent = 0; + tqparent = 0; advancedPage = 0; alphaInput = 0; @@ -89,25 +89,25 @@ public: tileLabel = 0; } - QLabel *alphaLabel; - QLabel *amplitudeLabel; - QLabel *anisotropyLabel; - QLabel *btileLabel; - QLabel *daLabel; - QLabel *dlLabel; - QLabel *gaussianPrecLabel; - QLabel *interpolationLabel; - QLabel *iterationLabel; - QLabel *sharpnessLabel; - QLabel *sigmaLabel; - QLabel *tileLabel; + TQLabel *alphaLabel; + TQLabel *amplitudeLabel; + TQLabel *anisotropyLabel; + TQLabel *btileLabel; + TQLabel *daLabel; + TQLabel *dlLabel; + TQLabel *gaussianPrecLabel; + TQLabel *interpolationLabel; + TQLabel *iterationLabel; + TQLabel *sharpnessLabel; + TQLabel *sigmaLabel; + TQLabel *tileLabel; - QWidget *advancedPage; - QWidget *generalPage; + TQWidget *advancedPage; + TQWidget *generalPage; - QCheckBox *fastApproxCBox; + TQCheckBox *fastApproxCBox; - QTabWidget *parent; + TQTabWidget *tqparent; RComboBox *interpolationBox; @@ -125,131 +125,131 @@ public: RIntNumInput *tileInput; }; -GreycstorationWidget::GreycstorationWidget(QTabWidget *parent) - : QObject(static_cast<QObject*>(parent)) +GreycstorationWidget::GreycstorationWidget(TQTabWidget *tqparent) + : TQObject(TQT_TQOBJECT(tqparent)) { d = new GreycstorationWidgetPriv; - d->parent = parent; + d->tqparent = tqparent; // ------------------------------------------------------------- - d->generalPage = new QWidget( parent ); - QGridLayout* grid1 = new QGridLayout(d->generalPage, 6, 2, KDialog::spacingHint()); - parent->addTab( d->generalPage, i18n("General") ); + d->generalPage = new TQWidget( tqparent ); + TQGridLayout* grid1 = new TQGridLayout(d->generalPage, 6, 2, KDialog::spacingHint()); + tqparent->addTab( d->generalPage, i18n("General") ); - d->sharpnessLabel = new QLabel(i18n("Detail preservation:"), d->generalPage); + d->sharpnessLabel = new TQLabel(i18n("Detail preservation:"), d->generalPage); d->sharpnessInput = new RDoubleNumInput(d->generalPage); d->sharpnessInput->setPrecision(2); d->sharpnessInput->setRange(0.01, 1.0, 0.1); - QWhatsThis::add( d->sharpnessInput, i18n("<p>Preservation of details to set the sharpening level " + TQWhatsThis::add( d->sharpnessInput, i18n("<p>Preservation of details to set the sharpening level " "of the small features in the target image. " "Higher values leave details sharp.")); grid1->addMultiCellWidget(d->sharpnessLabel, 0, 0, 0, 0); grid1->addMultiCellWidget(d->sharpnessInput, 0, 0, 1, 1); - d->anisotropyLabel = new QLabel(i18n("Anisotropy:"), d->generalPage); + d->anisotropyLabel = new TQLabel(i18n("Anisotropy:"), d->generalPage); d->anisotropyInput = new RDoubleNumInput(d->generalPage); d->anisotropyInput->setPrecision(2); d->anisotropyInput->setRange(0.0, 1.0, 0.1); - QWhatsThis::add( d->anisotropyInput, i18n("<p>Anisotropic (directional) modifier of the details. " + TQWhatsThis::add( d->anisotropyInput, i18n("<p>Anisotropic (directional) modifier of the details. " "Keep it small for Gaussian noise.")); grid1->addMultiCellWidget(d->anisotropyLabel, 1, 1, 0, 0); grid1->addMultiCellWidget(d->anisotropyInput, 1, 1, 1, 1); - d->amplitudeLabel = new QLabel(i18n("Smoothing:"), d->generalPage); + d->amplitudeLabel = new TQLabel(i18n("Smoothing:"), d->generalPage); d->amplitudeInput = new RDoubleNumInput(d->generalPage); d->amplitudeInput->setPrecision(2); d->amplitudeInput->setRange(0.01, 500.0, 0.1); - QWhatsThis::add( d->amplitudeInput, i18n("<p>Total smoothing power: if the Detail Factor sets the relative " + TQWhatsThis::add( d->amplitudeInput, i18n("<p>Total smoothing power: if the Detail Factor sets the relative " "smoothing and the Anisotropy Factor the direction, " "the Smoothing Factor sets the overall effect.")); grid1->addMultiCellWidget(d->amplitudeLabel, 2, 2, 0, 0); grid1->addMultiCellWidget(d->amplitudeInput, 2, 2, 1, 1); - d->sigmaLabel = new QLabel(i18n("Regularity:"), d->generalPage); + d->sigmaLabel = new TQLabel(i18n("Regularity:"), d->generalPage); d->sigmaInput = new RDoubleNumInput(d->generalPage); d->sigmaInput->setPrecision(2); d->sigmaInput->setRange(0.0, 10.0, 0.1); - QWhatsThis::add( d->sigmaInput, i18n("<p>This value controls the evenness of smoothing to the image. " + TQWhatsThis::add( d->sigmaInput, i18n("<p>This value controls the evenness of smoothing to the image. " "Do not use a high value here, or the " "target image will be completely blurred.")); grid1->addMultiCellWidget(d->sigmaLabel, 3, 3, 0, 0); grid1->addMultiCellWidget(d->sigmaInput, 3, 3, 1, 1); - d->iterationLabel = new QLabel(i18n("Iterations:"), d->generalPage); + d->iterationLabel = new TQLabel(i18n("Iterations:"), d->generalPage); d->iterationInput = new RIntNumInput(d->generalPage); d->iterationInput->setRange(1, 5000, 1); - QWhatsThis::add( d->iterationInput, i18n("<p>Sets the number of times the filter is applied to " + TQWhatsThis::add( d->iterationInput, i18n("<p>Sets the number of times the filter is applied to " "the image.")); grid1->addMultiCellWidget(d->iterationLabel, 4, 4, 0, 0); grid1->addMultiCellWidget(d->iterationInput, 4, 4, 1, 1); - d->alphaLabel = new QLabel(i18n("Noise:"), d->generalPage); + d->alphaLabel = new TQLabel(i18n("Noise:"), d->generalPage); d->alphaInput = new RDoubleNumInput(d->generalPage); d->alphaInput->setPrecision(2); d->alphaInput->setRange(0.01, 1.0, 0.1); - QWhatsThis::add( d->alphaInput, i18n("<p>Sets the noise scale.")); + TQWhatsThis::add( d->alphaInput, i18n("<p>Sets the noise scale.")); grid1->addMultiCellWidget(d->alphaLabel, 5, 5, 0, 0); grid1->addMultiCellWidget(d->alphaInput, 5, 5, 1, 1); grid1->setRowStretch(6, 10); // ------------------------------------------------------------- - d->advancedPage = new QWidget( parent ); - QGridLayout* grid2 = new QGridLayout(d->advancedPage, 6, 2, KDialog::spacingHint()); - parent->addTab( d->advancedPage, i18n("Advanced Settings") ); + d->advancedPage = new TQWidget( tqparent ); + TQGridLayout* grid2 = new TQGridLayout(d->advancedPage, 6, 2, KDialog::spacingHint()); + tqparent->addTab( d->advancedPage, i18n("Advanced Settings") ); - d->daLabel = new QLabel(i18n("Angular step:"), d->advancedPage); + d->daLabel = new TQLabel(i18n("Angular step:"), d->advancedPage); d->daInput = new RDoubleNumInput(d->advancedPage); d->daInput->setPrecision(2); d->daInput->setRange(0.0, 90.0, 1.0); - QWhatsThis::add( d->daInput, i18n("<p>Set here the angular integration step (in degrees) " + TQWhatsThis::add( d->daInput, i18n("<p>Set here the angular integration step (in degrees) " "analogous to anisotropy.")); grid2->addMultiCellWidget(d->daLabel, 0, 0, 0, 0); grid2->addMultiCellWidget(d->daInput, 0, 0, 1, 1); - d->dlLabel = new QLabel(i18n("Integral step:"), d->advancedPage); + d->dlLabel = new TQLabel(i18n("Integral step:"), d->advancedPage); d->dlInput = new RDoubleNumInput(d->advancedPage); d->dlInput->setPrecision(2); d->dlInput->setRange(0.0, 1.0, 0.1); - QWhatsThis::add( d->dlInput, i18n("<p>Set here the spatial integral step.")); + TQWhatsThis::add( d->dlInput, i18n("<p>Set here the spatial integral step.")); grid2->addMultiCellWidget(d->dlLabel, 1, 1, 0, 0); grid2->addMultiCellWidget(d->dlInput, 1, 1, 1, 1); - d->gaussianPrecLabel = new QLabel(i18n("Gaussian:"), d->advancedPage); + d->gaussianPrecLabel = new TQLabel(i18n("Gaussian:"), d->advancedPage); d->gaussianPrecInput = new RDoubleNumInput(d->advancedPage); d->gaussianPrecInput->setPrecision(2); d->gaussianPrecInput->setRange(0.01, 20.0, 0.01); - QWhatsThis::add( d->gaussianPrecInput, i18n("<p>Set here the precision of the Gaussian function.")); + TQWhatsThis::add( d->gaussianPrecInput, i18n("<p>Set here the precision of the Gaussian function.")); grid2->addMultiCellWidget(d->gaussianPrecLabel, 2, 2, 0, 0); grid2->addMultiCellWidget(d->gaussianPrecInput, 2, 2, 1, 1); - d->tileLabel = new QLabel(i18n("Tile size:"), d->advancedPage); + d->tileLabel = new TQLabel(i18n("Tile size:"), d->advancedPage); d->tileInput = new RIntNumInput(d->advancedPage); d->tileInput->setRange(0, 2000, 1); - QWhatsThis::add( d->tileInput, i18n("<p>Sets the tile size.")); + TQWhatsThis::add( d->tileInput, i18n("<p>Sets the tile size.")); grid2->addMultiCellWidget(d->tileLabel, 3, 3, 0, 0); grid2->addMultiCellWidget(d->tileInput, 3, 3, 1, 1); - d->btileLabel = new QLabel(i18n("Tile border:"), d->advancedPage); + d->btileLabel = new TQLabel(i18n("Tile border:"), d->advancedPage); d->btileInput = new RIntNumInput(d->advancedPage); d->btileInput->setRange(1, 20, 1); - QWhatsThis::add( d->btileInput, i18n("<p>Sets the size of each tile border.")); + TQWhatsThis::add( d->btileInput, i18n("<p>Sets the size of each tile border.")); grid2->addMultiCellWidget(d->btileLabel, 4, 4, 0, 0); grid2->addMultiCellWidget(d->btileInput, 4, 4, 1, 1); - d->interpolationLabel = new QLabel(i18n("Interpolation:"), d->advancedPage); + d->interpolationLabel = new TQLabel(i18n("Interpolation:"), d->advancedPage); d->interpolationBox = new RComboBox(d->advancedPage); d->interpolationBox->insertItem( i18n("Nearest Neighbor"), GreycstorationSettings::NearestNeighbor ); d->interpolationBox->insertItem( i18n("Linear"), GreycstorationSettings::Linear ); d->interpolationBox->insertItem( i18n("Runge-Kutta"), GreycstorationSettings::RungeKutta); - QWhatsThis::add( d->interpolationBox, i18n("<p>Select the right interpolation method for the " + TQWhatsThis::add( d->interpolationBox, i18n("<p>Select the right interpolation method for the " "desired image quality.")); grid2->addMultiCellWidget(d->interpolationLabel, 5, 5, 0, 0); grid2->addMultiCellWidget(d->interpolationBox, 5, 5, 1, 1); - d->fastApproxCBox = new QCheckBox(i18n("Fast approximation"), d->advancedPage); - QWhatsThis::add( d->fastApproxCBox, i18n("<p>Enable fast approximation when rendering images.")); + d->fastApproxCBox = new TQCheckBox(i18n("Fast approximation"), d->advancedPage); + TQWhatsThis::add( d->fastApproxCBox, i18n("<p>Enable fast approximation when rendering images.")); grid2->addMultiCellWidget(d->fastApproxCBox, 6, 6, 0, 1); } @@ -262,8 +262,8 @@ void GreycstorationWidget::setEnabled(bool b) { d->generalPage->setEnabled(b); d->advancedPage->setEnabled(b); - d->parent->setTabEnabled(d->generalPage, b); - d->parent->setTabEnabled(d->advancedPage, b); + d->tqparent->setTabEnabled(d->generalPage, b); + d->tqparent->setTabEnabled(d->advancedPage, b); } void GreycstorationWidget::setSettings(GreycstorationSettings settings) @@ -325,9 +325,9 @@ GreycstorationSettings GreycstorationWidget::getSettings() return settings; } -bool GreycstorationWidget::loadSettings(QFile& file, const QString& header) +bool GreycstorationWidget::loadSettings(TQFile& file, const TQString& header) { - QTextStream stream( &file ); + TQTextStream stream( &file ); if (stream.readLine() != header) return false; @@ -354,10 +354,10 @@ bool GreycstorationWidget::loadSettings(QFile& file, const QString& header) return true; } -void GreycstorationWidget::saveSettings(QFile& file, const QString& header) +void GreycstorationWidget::saveSettings(TQFile& file, const TQString& header) { GreycstorationSettings settings = getSettings(); - QTextStream stream( &file ); + TQTextStream stream( &file ); stream << header << "\n"; stream << settings.fastApprox << "\n"; stream << settings.interp << "\n"; diff --git a/digikam/libs/greycstoration/greycstorationwidget.h b/digikam/libs/greycstoration/greycstorationwidget.h index c5c320b..b8f56e8 100644 --- a/digikam/libs/greycstoration/greycstorationwidget.h +++ b/digikam/libs/greycstoration/greycstorationwidget.h @@ -23,39 +23,40 @@ #ifndef GREYCSTORATION_WIDGET_H #define GREYCSTORATION_WIDGET_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qfile.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqfile.h> +#include <tqstring.h> // Local includes. #include "digikam_export.h" #include "greycstorationsettings.h" -class QTabWidget; +class TQTabWidget; namespace Digikam { class GreycstorationWidgetPriv; -class DIGIKAM_EXPORT GreycstorationWidget : public QObject +class DIGIKAM_EXPORT GreycstorationWidget : public TQObject { Q_OBJECT + TQ_OBJECT public: - GreycstorationWidget(QTabWidget *parent); + GreycstorationWidget(TQTabWidget *tqparent); ~GreycstorationWidget(); void setSettings(GreycstorationSettings settings); void setDefaultSettings(GreycstorationSettings settings); GreycstorationSettings getSettings(); - bool loadSettings(QFile& file, const QString& header); - void saveSettings(QFile& file, const QString& header); + bool loadSettings(TQFile& file, const TQString& header); + void saveSettings(TQFile& file, const TQString& header); void setEnabled(bool); diff --git a/digikam/libs/histogram/imagehistogram.cpp b/digikam/libs/histogram/imagehistogram.cpp index 77c2aac..ff68501 100644 --- a/digikam/libs/histogram/imagehistogram.cpp +++ b/digikam/libs/histogram/imagehistogram.cpp @@ -30,10 +30,10 @@ #include <cmath> #include <cstring> -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqevent.h> // KDE includes. @@ -69,7 +69,7 @@ public: ImageHistogramPriv() { - parent = 0; + tqparent = 0; imageData = 0; histogram = 0; runningFlag = true; @@ -86,44 +86,44 @@ public: /** Numbers of histogram segments dependaing of image bytes depth*/ int histoSegments; - /** To post event from thread to parent.*/ - QObject *parent; + /** To post event from thread to tqparent.*/ + TQObject *tqparent; /** Used to stop thread during calculations.*/ bool runningFlag; }; -ImageHistogram::ImageHistogram(const DImg& image, QObject *parent) - : QThread() +ImageHistogram::ImageHistogram(const DImg& image, TQObject *tqparent) + : TQThread() { - setup(image.bits(), image.width(), image.height(), image.sixteenBit(), parent); + setup(image.bits(), image.width(), image.height(), image.sixteenBit(), tqparent); } -ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, QObject *parent) - : QThread() +ImageHistogram::ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent) + : TQThread() { - setup(i_data, i_w, i_h, i_sixteenBits, parent); + setup(i_data, i_w, i_h, i_sixteenBits, tqparent); } -void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, QObject *parent) +void ImageHistogram::setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent) { d = new ImageHistogramPriv; d->imageData = i_data; d->imageWidth = i_w; d->imageHeight = i_h; - d->parent = parent; + d->tqparent = tqparent; d->histoSegments = i_sixteenBits ? 65536 : 256; if (d->imageData && d->imageWidth && d->imageHeight) { - if (d->parent) + if (d->tqparent) start(); else calcHistogramValues(); } else { - if (d->parent) + if (d->tqparent) postProgress(false, false); } } @@ -149,7 +149,7 @@ void ImageHistogram::postProgress(bool starting, bool success) eventData->starting = starting; eventData->success = success; eventData->histogram = this; - QApplication::postEvent(d->parent, new QCustomEvent(QEvent::User, eventData)); + TQApplication::postEvent(d->tqparent, new TQCustomEvent(TQEvent::User, eventData)); } void ImageHistogram::stopCalcHistogramValues(void) @@ -170,7 +170,7 @@ void ImageHistogram::calcHistogramValues() register uint i; int max; - if (d->parent) + if (d->tqparent) postProgress(true, false); d->histogram = new ImageHistogramPriv::double_packet[d->histoSegments]; @@ -180,7 +180,7 @@ void ImageHistogram::calcHistogramValues() { DWarning() << ("HistogramWidget::calcHistogramValues: Unable to allocate memory!") << endl; - if (d->parent) + if (d->tqparent) postProgress(false, false); return; @@ -239,7 +239,7 @@ void ImageHistogram::calcHistogramValues() } } - if (d->parent && d->runningFlag) + if (d->tqparent && d->runningFlag) postProgress(false, true); } diff --git a/digikam/libs/histogram/imagehistogram.h b/digikam/libs/histogram/imagehistogram.h index 7c03410..ad1b530 100644 --- a/digikam/libs/histogram/imagehistogram.h +++ b/digikam/libs/histogram/imagehistogram.h @@ -25,15 +25,15 @@ #ifndef IMAGEHISTOGRAM_H #define IMAGEHISTOGRAM_H -// Qt includes. +// TQt includes. -#include <qthread.h> +#include <tqthread.h> // Local includes. #include "digikam_export.h" -class QObject; +class TQObject; namespace Digikam { @@ -41,7 +41,7 @@ namespace Digikam class ImageHistogramPriv; class DImg; -class DIGIKAM_EXPORT ImageHistogram : public QThread +class DIGIKAM_EXPORT ImageHistogram : public TQThread { public: @@ -73,12 +73,12 @@ public: public: - ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, QObject *parent=0); + ImageHistogram(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent=0); - ImageHistogram(const DImg& image, QObject *parent=0); + ImageHistogram(const DImg& image, TQObject *tqparent=0); ~ImageHistogram(); - void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, QObject *parent); + void setup(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, TQObject *tqparent); /** Method to stop threaded computations.*/ void stopCalcHistogramValues(void); diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp index 9eea429..14847d9 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp +++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qstyle.h> -#include <qfile.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qframe.h> -#include <qscrollview.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqstyle.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqframe.h> +#include <tqscrollview.h> // KDE includes. @@ -107,31 +107,31 @@ public: labelPhotoWhiteBalance = 0; } - QLabel *title; - QLabel *file; - QLabel *folder; - QLabel *date; - QLabel *size; - QLabel *isReadable; - QLabel *isWritable; - QLabel *mime; - QLabel *dimensions; - QLabel *newFileName; - QLabel *downloaded; - - QLabel *title2; - QLabel *make; - QLabel *model; - QLabel *photoDate; - QLabel *aperture; - QLabel *focalLength; - QLabel *exposureTime; - QLabel *sensitivity; - QLabel *exposureMode; - QLabel *flash; - QLabel *whiteBalance; - - QFrame *settingsArea; + TQLabel *title; + TQLabel *file; + TQLabel *folder; + TQLabel *date; + TQLabel *size; + TQLabel *isReadable; + TQLabel *isWritable; + TQLabel *mime; + TQLabel *dimensions; + TQLabel *newFileName; + TQLabel *downloaded; + + TQLabel *title2; + TQLabel *make; + TQLabel *model; + TQLabel *photoDate; + TQLabel *aperture; + TQLabel *focalLength; + TQLabel *exposureTime; + TQLabel *sensitivity; + TQLabel *exposureMode; + TQLabel *flash; + TQLabel *whiteBalance; + + TQFrame *settingsArea; KSqueezedTextLabel *labelFile; KSqueezedTextLabel *labelFolder; @@ -156,53 +156,53 @@ public: KSqueezedTextLabel *labelPhotoWhiteBalance; }; -CameraItemPropertiesTab::CameraItemPropertiesTab(QWidget* parent, bool navBar) - : NavigateBarTab(parent) +CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* tqparent, bool navBar) + : NavigateBarTab(tqparent) { d = new CameraItemPropertiesTabPriv; setupNavigateBar(navBar); - QScrollView *sv = new QScrollView(this); - sv->viewport()->setBackgroundMode(Qt::PaletteBackground); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setFrameStyle(QFrame::NoFrame); + TQScrollView *sv = new TQScrollView(this); + sv->viewport()->setBackgroundMode(TQt::PaletteBackground); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setFrameStyle(TQFrame::NoFrame); - d->settingsArea = new QFrame(sv->viewport()); - d->settingsArea->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - d->settingsArea->setLineWidth( style().pixelMetric(QStyle::PM_DefaultFrameWidth, this) ); + d->settingsArea = new TQFrame(sv->viewport()); + d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); + d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); sv->addChild(d->settingsArea); m_navigateBarLayout->addWidget(sv); // -------------------------------------------------- - QGridLayout *settingsLayout = new QGridLayout(d->settingsArea, 27, 1, KDialog::spacingHint(), 0); - - d->title = new QLabel(i18n("<big><b>Camera File Properties</b></big>"), d->settingsArea); - d->file = new QLabel(i18n("<b>File</b>:"), d->settingsArea); - d->folder = new QLabel(i18n("<b>Folder</b>:"), d->settingsArea); - d->date = new QLabel(i18n("<b>Date</b>:"), d->settingsArea); - d->size = new QLabel(i18n("<b>Size</b>:"), d->settingsArea); - d->isReadable = new QLabel(i18n("<b>Readable</b>:"), d->settingsArea); - d->isWritable = new QLabel(i18n("<b>Writable</b>:"), d->settingsArea); - d->mime = new QLabel(i18n("<b>Type</b>:"), d->settingsArea); - d->dimensions = new QLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); - d->newFileName = new QLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea); - d->downloaded = new QLabel(i18n("<b>Downloaded</b>:"), d->settingsArea); - - KSeparator *line = new KSeparator (Horizontal, d->settingsArea); - d->title2 = new QLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); - d->make = new QLabel(i18n("<b>Make</b>:"), d->settingsArea); - d->model = new QLabel(i18n("<b>Model</b>:"), d->settingsArea); - d->photoDate = new QLabel(i18n("<b>Created</b>:"), d->settingsArea); - d->aperture = new QLabel(i18n("<b>Aperture</b>:"), d->settingsArea); - d->focalLength = new QLabel(i18n("<b>Focal</b>:"), d->settingsArea); - d->exposureTime = new QLabel(i18n("<b>Exposure</b>:"), d->settingsArea); - d->sensitivity = new QLabel(i18n("<b>Sensitivity</b>:"), d->settingsArea); - d->exposureMode = new QLabel(i18n("<nobr><b>Mode/Program</b></nobr>:"), d->settingsArea); - d->flash = new QLabel(i18n("<b>Flash</b>:"), d->settingsArea); - d->whiteBalance = new QLabel(i18n("<nobr><b>White balance</b></nobr>:"), d->settingsArea); + TQGridLayout *settingsLayout = new TQGridLayout(d->settingsArea, 27, 1, KDialog::spacingHint(), 0); + + d->title = new TQLabel(i18n("<big><b>Camera File Properties</b></big>"), d->settingsArea); + d->file = new TQLabel(i18n("<b>File</b>:"), d->settingsArea); + d->folder = new TQLabel(i18n("<b>Folder</b>:"), d->settingsArea); + d->date = new TQLabel(i18n("<b>Date</b>:"), d->settingsArea); + d->size = new TQLabel(i18n("<b>Size</b>:"), d->settingsArea); + d->isReadable = new TQLabel(i18n("<b>Readable</b>:"), d->settingsArea); + d->isWritable = new TQLabel(i18n("<b>Writable</b>:"), d->settingsArea); + d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea); + d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); + d->newFileName = new TQLabel(i18n("<nobr><b>New Name</b></nobr>:"), d->settingsArea); + d->downloaded = new TQLabel(i18n("<b>Downloaded</b>:"), d->settingsArea); + + KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + d->title2 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); + d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); + d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); + d->photoDate = new TQLabel(i18n("<b>Created</b>:"), d->settingsArea); + d->aperture = new TQLabel(i18n("<b>Aperture</b>:"), d->settingsArea); + d->focalLength = new TQLabel(i18n("<b>Focal</b>:"), d->settingsArea); + d->exposureTime = new TQLabel(i18n("<b>Exposure</b>:"), d->settingsArea); + d->sensitivity = new TQLabel(i18n("<b>Sensitivity</b>:"), d->settingsArea); + d->exposureMode = new TQLabel(i18n("<nobr><b>Mode/Program</b></nobr>:"), d->settingsArea); + d->flash = new TQLabel(i18n("<b>Flash</b>:"), d->settingsArea); + d->whiteBalance = new TQLabel(i18n("<nobr><b>White balance</b></nobr>:"), d->settingsArea); d->labelFile = new KSqueezedTextLabel(0, d->settingsArea); d->labelFolder = new KSqueezedTextLabel(0, d->settingsArea); @@ -227,7 +227,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(QWidget* parent, bool navBar) d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea); int hgt = fontMetrics().height()-2; - d->title->setAlignment(Qt::AlignCenter); + d->title->tqsetAlignment(TQt::AlignCenter); d->file->setMaximumHeight(hgt); d->folder->setMaximumHeight(hgt); d->date->setMaximumHeight(hgt); @@ -249,7 +249,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(QWidget* parent, bool navBar) d->labelNewFileName->setMaximumHeight(hgt); d->labelAlreadyDownloaded->setMaximumHeight(hgt); - d->title2->setAlignment(Qt::AlignCenter); + d->title2->tqsetAlignment(TQt::AlignCenter); d->make->setMaximumHeight(hgt); d->model->setMaximumHeight(hgt); d->photoDate->setMaximumHeight(hgt); @@ -274,8 +274,8 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(QWidget* parent, bool navBar) // -------------------------------------------------- settingsLayout->addMultiCellWidget(d->title, 0, 0, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 1, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 1, 1, 0, 1); settingsLayout->addMultiCellWidget(d->file, 2, 2, 0, 0); settingsLayout->addMultiCellWidget(d->labelFile, 2, 2, 1, 1); settingsLayout->addMultiCellWidget(d->folder, 3, 3, 0, 0); @@ -297,15 +297,15 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(QWidget* parent, bool navBar) settingsLayout->addMultiCellWidget(d->downloaded, 11, 11, 0, 0); settingsLayout->addMultiCellWidget(d->labelAlreadyDownloaded, 11, 11, 1, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 12, 12, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 12, 12, 0, 1); settingsLayout->addMultiCellWidget(line, 13, 13, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 14, 14, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 14, 14, 0, 1); settingsLayout->addMultiCellWidget(d->title2, 15, 15, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 16, 16, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 16, 16, 0, 1); settingsLayout->addMultiCellWidget(d->make, 17, 17, 0, 0); settingsLayout->addMultiCellWidget(d->labelPhotoMake, 17, 17, 1, 1); settingsLayout->addMultiCellWidget(d->model, 18, 18, 0, 0); @@ -336,32 +336,32 @@ CameraItemPropertiesTab::~CameraItemPropertiesTab() } void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, - const QString &newFileName, const QByteArray& exifData, + const TQString &newFileName, const TQByteArray& exifData, const KURL ¤tURL) { if (!itemInfo) { - d->labelFile->setText(QString()); - d->labelFolder->setText(QString()); - d->labelFileIsReadable->setText(QString()); - d->labelFileIsWritable->setText(QString()); - d->labelFileDate->setText(QString()); - d->labelFileSize->setText(QString()); - d->labelImageMime->setText(QString()); - d->labelImageDimensions->setText(QString()); - d->labelNewFileName->setText(QString()); - d->labelAlreadyDownloaded->setText(QString()); - - d->labelPhotoMake->setText(QString()); - d->labelPhotoModel->setText(QString()); - d->labelPhotoDateTime->setText(QString()); - d->labelPhotoAperture->setText(QString()); - d->labelPhotoFocalLenght->setText(QString()); - d->labelPhotoExposureTime->setText(QString()); - d->labelPhotoSensitivity->setText(QString()); - d->labelPhotoExposureMode->setText(QString()); - d->labelPhotoFlash->setText(QString()); - d->labelPhotoWhiteBalance->setText(QString()); + d->labelFile->setText(TQString()); + d->labelFolder->setText(TQString()); + d->labelFileIsReadable->setText(TQString()); + d->labelFileIsWritable->setText(TQString()); + d->labelFileDate->setText(TQString()); + d->labelFileSize->setText(TQString()); + d->labelImageMime->setText(TQString()); + d->labelImageDimensions->setText(TQString()); + d->labelNewFileName->setText(TQString()); + d->labelAlreadyDownloaded->setText(TQString()); + + d->labelPhotoMake->setText(TQString()); + d->labelPhotoModel->setText(TQString()); + d->labelPhotoDateTime->setText(TQString()); + d->labelPhotoAperture->setText(TQString()); + d->labelPhotoFocalLenght->setText(TQString()); + d->labelPhotoExposureTime->setText(TQString()); + d->labelPhotoSensitivity->setText(TQString()); + d->labelPhotoExposureMode->setText(TQString()); + d->labelPhotoFlash->setText(TQString()); + d->labelPhotoWhiteBalance->setText(TQString()); setEnabled(false); return; @@ -369,8 +369,8 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, setEnabled(true); - QString str; - QString unknown(i18n("<i>unknown</i>")); + TQString str; + TQString unknown(i18n("<i>unknown</i>")); // -- Camera file system information ------------------------------------------ @@ -395,25 +395,25 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, d->labelFileIsWritable->setText(str); - QDateTime date; + TQDateTime date; date.setTime_t(itemInfo->mtime); d->labelFileDate->setText(KGlobal::locale()->formatDateTime(date, true, true)); - str = i18n("%1 (%2)").arg(KIO::convertSize(itemInfo->size)) - .arg(KGlobal::locale()->formatNumber(itemInfo->size, 0)); + str = i18n("%1 (%2)").tqarg(KIO::convertSize(itemInfo->size)) + .tqarg(KGlobal::locale()->formatNumber(itemInfo->size, 0)); d->labelFileSize->setText(str); // -- Image Properties -------------------------------------------------- - d->labelImageMime->setText( (itemInfo->mime == QString("image/x-raw")) ? + d->labelImageMime->setText( (itemInfo->mime == TQString("image/x-raw")) ? i18n("RAW Image") : KMimeType::mimeType(itemInfo->mime)->comment() ); - QString mpixels; - QSize dims; + TQString mpixels; + TQSize dims; if (itemInfo->width == -1 && itemInfo->height == -1 && !currentURL.isEmpty()) { // delayed loading to list faster from UMSCamera - if (itemInfo->mime == QString("image/x-raw")) + if (itemInfo->mime == TQString("image/x-raw")) { DMetadata metaData(currentURL.path()); dims = metaData.getImageDimensions(); @@ -435,11 +435,11 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, else { // if available (GPCamera), take dimensions directly from itemInfo - dims = QSize(itemInfo->width, itemInfo->height); + dims = TQSize(itemInfo->width, itemInfo->height); } mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? unknown : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); d->labelImageDimensions->setText(str); // -- Download information ------------------------------------------ @@ -458,7 +458,7 @@ void CameraItemPropertiesTab::setCurrentItem(const GPItemInfo* itemInfo, // -- Photograph information ------------------------------------------ // NOTA: If something is changed here, please updated albumfiletip section too. - QString unavailable(i18n("<i>unavailable</i>")); + TQString unavailable(i18n("<i>unavailable</i>")); DMetadata metaData; metaData.setExif(exifData); PhotoInfoContainer photoInfo = metaData.getPhotographInformations(); @@ -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)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); + str = i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(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").arg(photoInfo.sensitivity)); + d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(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 = QString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); + str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); d->labelPhotoExposureMode->setText(str); } diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.h b/digikam/libs/imageproperties/cameraitempropertiestab.h index 13f3a16..241f652 100644 --- a/digikam/libs/imageproperties/cameraitempropertiestab.h +++ b/digikam/libs/imageproperties/cameraitempropertiestab.h @@ -24,10 +24,10 @@ #ifndef CAMERAITEMPROPERTIESTAB_H #define CAMERAITEMPROPERTIESTAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -47,15 +47,16 @@ class CameraItemPropertiesTabPriv; class DIGIKAM_EXPORT CameraItemPropertiesTab : public NavigateBarTab { Q_OBJECT + TQ_OBJECT public: - CameraItemPropertiesTab(QWidget* parent, bool navBar=true); + CameraItemPropertiesTab(TQWidget* tqparent, bool navBar=true); ~CameraItemPropertiesTab(); void setCurrentItem(const GPItemInfo* itemInfo=0, - const QString &newFileName=QString(), - const QByteArray& exifData=QByteArray(), + const TQString &newFileName=TQString(), + const TQByteArray& exifData=TQByteArray(), const KURL ¤tURL = KURL()); private: diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index bb9b815..362c8cd 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -24,18 +24,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qhbox.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> -#include <qiconset.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qscrollview.h> +// TQt includes. + +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> +#include <tqiconset.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqscrollview.h> // KDE includes. @@ -105,16 +105,16 @@ public: bool modified; bool ignoreImageAttributesWatch; - QToolButton *recentTagsBtn; - QToolButton *assignedTagsBtn; - QToolButton *revertBtn; + TQToolButton *recentTagsBtn; + TQToolButton *assignedTagsBtn; + TQToolButton *revertBtn; - QPopupMenu *ABCMenu; + TQPopupMenu *ABCMenu; - QPushButton *applyBtn; + TQPushButton *applyBtn; - QPushButton *moreButton; - QPopupMenu *moreMenu; + TQPushButton *moreButton; + TQPopupMenu *moreMenu; KTextEdit *commentsEdit; @@ -123,7 +123,7 @@ public: SearchTextBar *tagsSearchBar; SearchTextBar *newTagEdit; - QPtrList<ImageInfo> currInfos; + TQPtrList<ImageInfo> currInfos; TAlbumListView *tagsView; @@ -134,66 +134,66 @@ public: MetadataHub hub; }; -ImageDescEditTab::ImageDescEditTab(QWidget *parent, bool navBar) - : NavigateBarTab(parent) +ImageDescEditTab::ImageDescEditTab(TQWidget *tqparent, bool navBar) + : NavigateBarTab(tqparent) { d = new ImageDescEditTabPriv; setupNavigateBar(navBar); - QScrollView *sv = new QScrollView(this); - sv->viewport()->setBackgroundMode(Qt::PaletteBackground); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setFrameStyle(QFrame::NoFrame); + TQScrollView *sv = new TQScrollView(this); + sv->viewport()->setBackgroundMode(TQt::PaletteBackground); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setFrameStyle(TQFrame::NoFrame); - QWidget *settingsArea = new QWidget(sv->viewport()); + TQWidget *settingsArea = new TQWidget(sv->viewport()); sv->addChild(settingsArea); m_navigateBarLayout->addWidget(sv); - QGridLayout *settingsLayout = new QGridLayout(settingsArea, 6, 1, + TQGridLayout *settingsLayout = new TQGridLayout(settingsArea, 6, 1, KDialog::spacingHint(), KDialog::spacingHint()); // Captions/Date/Rating view ----------------------------------- - QVBox *commentsBox = new QVBox(settingsArea); - new QLabel(i18n("Caption:"), commentsBox); + TQVBox *commentsBox = new TQVBox(settingsArea); + new TQLabel(i18n("Caption:"), commentsBox); d->commentsEdit = new KTextEdit(commentsBox); - d->commentsEdit->setTextFormat(QTextEdit::PlainText); + d->commentsEdit->setTextFormat(TQTextEdit::PlainText); d->commentsEdit->setCheckSpellingEnabled(true); d->commentsEdit->setFixedHeight(100); - QHBox *dateBox = new QHBox(settingsArea); - new QLabel(i18n("Date:"), dateBox); + TQHBox *dateBox = new TQHBox(settingsArea); + new TQLabel(i18n("Date:"), dateBox); d->dateTimeEdit = new KDateTimeEdit(dateBox, "datepicker"); - QHBox *ratingBox = new QHBox(settingsArea); - new QLabel(i18n("Rating:"), ratingBox); + TQHBox *ratingBox = new TQHBox(settingsArea); + new TQLabel(i18n("Rating:"), ratingBox); d->ratingWidget = new RatingWidget(ratingBox); // Tags view --------------------------------------------------- d->newTagEdit = new SearchTextBar(settingsArea, "ImageDescEditTabNewTagEdit", i18n("Enter new tag here...")); - QWhatsThis::add(d->newTagEdit, i18n("Enter here the text used to create new tags. " + TQWhatsThis::add(d->newTagEdit, i18n("Enter here the text used to create new tags. " "'/' can be used here to create a hierarchy of tags. " "',' can be used here to create more than one hierarchy at the same time.")); d->tagsView = new TAlbumListView(settingsArea); - QHBox *tagsSearch = new QHBox(settingsArea); + TQHBox *tagsSearch = new TQHBox(settingsArea); tagsSearch->setSpacing(KDialog::spacingHint()); d->tagsSearchBar = new SearchTextBar(tagsSearch, "ImageDescEditTabTagsSearchBar"); - d->assignedTagsBtn = new QToolButton(tagsSearch); - QToolTip::add(d->assignedTagsBtn, i18n("Tags already assigned")); + d->assignedTagsBtn = new TQToolButton(tagsSearch); + TQToolTip::add(d->assignedTagsBtn, i18n("Tags already assigned")); d->assignedTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-assigned", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true)); d->assignedTagsBtn->setToggleButton(true); - d->recentTagsBtn = new QToolButton(tagsSearch); - QPopupMenu *popupMenu = new QPopupMenu(d->recentTagsBtn); - QToolTip::add(d->recentTagsBtn, i18n("Recent Tags")); + d->recentTagsBtn = new TQToolButton(tagsSearch); + TQPopupMenu *popupMenu = new TQPopupMenu(d->recentTagsBtn); + TQToolTip::add(d->recentTagsBtn, i18n("Recent Tags")); d->recentTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-recents", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true)); @@ -203,22 +203,22 @@ ImageDescEditTab::ImageDescEditTab(QWidget *parent, bool navBar) // Buttons ----------------------------------------- - QHBox *buttonsBox = new QHBox(settingsArea); + TQHBox *buttonsBox = new TQHBox(settingsArea); buttonsBox->setSpacing(KDialog::spacingHint()); - d->revertBtn = new QToolButton(buttonsBox); + d->revertBtn = new TQToolButton(buttonsBox); d->revertBtn->setIconSet(SmallIcon("reload_page")); - QToolTip::add(d->revertBtn, i18n("Revert all changes")); + TQToolTip::add(d->revertBtn, i18n("Revert all changes")); d->revertBtn->setEnabled(false); - d->applyBtn = new QPushButton(i18n("Apply"), buttonsBox); + d->applyBtn = new TQPushButton(i18n("Apply"), buttonsBox); d->applyBtn->setIconSet(SmallIcon("button_ok")); d->applyBtn->setEnabled(false); - QToolTip::add(d->applyBtn, i18n("Apply all changes to images")); + TQToolTip::add(d->applyBtn, i18n("Apply all changes to images")); buttonsBox->setStretchFactor(d->applyBtn, 10); - d->moreButton = new QPushButton(i18n("More"), buttonsBox); - d->moreMenu = new QPopupMenu(this); + d->moreButton = new TQPushButton(i18n("More"), buttonsBox); + d->moreMenu = new TQPopupMenu(this); d->moreButton->setPopup(d->moreMenu); // -------------------------------------------------- @@ -234,50 +234,50 @@ ImageDescEditTab::ImageDescEditTab(QWidget *parent, bool navBar) // -------------------------------------------------- - connect(d->tagsView, SIGNAL(signalProgressBarMode(int, const QString&)), - this, SIGNAL(signalProgressBarMode(int, const QString&))); + connect(d->tagsView, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->tagsView, SIGNAL(signalProgressValue(int)), - this, SIGNAL(signalProgressValue(int))); + connect(d->tagsView, TQT_SIGNAL(signalProgressValue(int)), + this, TQT_SIGNAL(signalProgressValue(int))); - connect(popupMenu, SIGNAL(activated(int)), - this, SLOT(slotRecentTagsMenuActivated(int))); + connect(popupMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotRecentTagsMenuActivated(int))); - connect(d->tagsView, SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), - this, SLOT(slotItemStateChanged(TAlbumCheckListItem *))); + connect(d->tagsView, TQT_SIGNAL(signalItemStateChanged(TAlbumCheckListItem *)), + this, TQT_SLOT(slotItemStateChanged(TAlbumCheckListItem *))); - connect(d->commentsEdit, SIGNAL(textChanged()), - this, SLOT(slotCommentChanged())); + connect(d->commentsEdit, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(slotCommentChanged())); - connect(d->dateTimeEdit, SIGNAL(dateTimeChanged(const QDateTime& )), - this, SLOT(slotDateTimeChanged(const QDateTime&))); + connect(d->dateTimeEdit, TQT_SIGNAL(dateTimeChanged(const TQDateTime& )), + this, TQT_SLOT(slotDateTimeChanged(const TQDateTime&))); - connect(d->ratingWidget, SIGNAL(signalRatingChanged(int)), - this, SLOT(slotRatingChanged(int))); + connect(d->ratingWidget, TQT_SIGNAL(signalRatingChanged(int)), + this, TQT_SLOT(slotRatingChanged(int))); - connect(d->tagsView, SIGNAL(rightButtonClicked(QListViewItem*, const QPoint &, int)), - this, SLOT(slotRightButtonClicked(QListViewItem*, const QPoint&, int))); + connect(d->tagsView, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint &, int)), + this, TQT_SLOT(slotRightButtonClicked(TQListViewItem*, const TQPoint&, int))); - connect(d->tagsSearchBar, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotTagsSearchChanged(const QString&))); + connect(d->tagsSearchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotTagsSearchChanged(const TQString&))); - connect(this, SIGNAL(signalTagFilterMatch(bool)), - d->tagsSearchBar, SLOT(slotSearchResult(bool))); + connect(this, TQT_SIGNAL(signalTagFilterMatch(bool)), + d->tagsSearchBar, TQT_SLOT(slotSearchResult(bool))); - connect(d->assignedTagsBtn, SIGNAL(toggled(bool)), - this, SLOT(slotAssignedTagsToggled(bool))); + connect(d->assignedTagsBtn, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAssignedTagsToggled(bool))); - connect(d->newTagEdit->lineEdit(), SIGNAL(returnPressed(const QString&)), - this, SLOT(slotCreateNewTag())); + connect(d->newTagEdit->lineEdit(), TQT_SIGNAL(returnPressed(const TQString&)), + this, TQT_SLOT(slotCreateNewTag())); - connect(d->applyBtn, SIGNAL(clicked()), - this, SLOT(slotApplyAllChanges())); + connect(d->applyBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotApplyAllChanges())); - connect(d->revertBtn, SIGNAL(clicked()), - this, SLOT(slotRevertAllChanges())); + connect(d->revertBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRevertAllChanges())); - connect(d->moreMenu, SIGNAL(aboutToShow()), - this, SLOT(slotMoreMenu())); + connect(d->moreMenu, TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotMoreMenu())); // Initialize --------------------------------------------- @@ -291,55 +291,55 @@ ImageDescEditTab::ImageDescEditTab(QWidget *parent, bool navBar) AlbumManager* man = AlbumManager::instance(); - connect(man, SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(man, TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(man, SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(man, TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(man, SIGNAL(signalAlbumRenamed(Album*)), - this, SLOT(slotAlbumRenamed(Album*))); + connect(man, TQT_SIGNAL(signalAlbumRenamed(Album*)), + this, TQT_SLOT(slotAlbumRenamed(Album*))); - connect(man, SIGNAL(signalAlbumsCleared()), - this, SLOT(slotAlbumsCleared())); + connect(man, TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotAlbumsCleared())); - connect(man, SIGNAL(signalAlbumIconChanged(Album*)), - this, SLOT(slotAlbumIconChanged(Album*))); + connect(man, TQT_SIGNAL(signalAlbumIconChanged(Album*)), + this, TQT_SLOT(slotAlbumIconChanged(Album*))); - connect(man, SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), - this, SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); + connect(man, TQT_SIGNAL(signalTAlbumMoved(TAlbum*, TAlbum*)), + this, TQT_SLOT(slotAlbumMoved(TAlbum*, TAlbum*))); // Connect to thumbnail loader ----------------------------- AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - connect(loader, SIGNAL(signalThumbnail(Album *, const QPixmap&)), - this, SLOT(slotGotThumbnailFromIcon(Album *, const QPixmap&))); + connect(loader, TQT_SIGNAL(signalThumbnail(Album *, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnailFromIcon(Album *, const TQPixmap&))); - connect(loader, SIGNAL(signalFailed(Album *)), - this, SLOT(slotThumbnailLost(Album *))); + connect(loader, TQT_SIGNAL(signalFailed(Album *)), + this, TQT_SLOT(slotThumbnailLost(Album *))); - connect(loader, SIGNAL(signalReloadThumbnails()), - this, SLOT(slotReloadThumbnails())); + connect(loader, TQT_SIGNAL(signalReloadThumbnails()), + this, TQT_SLOT(slotReloadThumbnails())); // Connect to attribute watch ------------------------------ ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, SIGNAL(signalImageTagsChanged(Q_LLONG)), - this, SLOT(slotImageTagsChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageTagsChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageTagsChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImagesChanged(int)), - this, SLOT(slotImagesChanged(int))); + connect(watch, TQT_SIGNAL(signalImagesChanged(int)), + this, TQT_SLOT(slotImagesChanged(int))); - connect(watch, SIGNAL(signalImageRatingChanged(Q_LLONG)), - this, SLOT(slotImageRatingChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImageDateChanged(Q_LLONG)), - this, SLOT(slotImageDateChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageDateChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageDateChanged(TQ_LLONG))); - connect(watch, SIGNAL(signalImageCaptionChanged(Q_LLONG)), - this, SLOT(slotImageCaptionChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageCaptionChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageCaptionChanged(TQ_LLONG))); // -- read config --------------------------------------------------------- @@ -401,7 +401,7 @@ void ImageDescEditTab::slotChangingItems() if (d->hub.tagsChanged()) changedFields++; - QString text; + TQString text; if (changedFields == 1) { if (d->hub.commentChanged()) @@ -445,8 +445,8 @@ void ImageDescEditTab::slotChangingItems() bool alwaysApply = false; int returnCode = KMessageBox::createKMessageBox - (dialog, QMessageBox::Information, - text, QStringList(), + (dialog, TQMessageBox::Information, + text, TQStringList(), i18n("Always apply changes without confirmation"), &alwaysApply, KMessageBox::Notify); @@ -502,7 +502,7 @@ void ImageDescEditTab::slotApplyAllChanges() d->ignoreImageAttributesWatch = false; - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); d->modified = false; d->hub.resetChanged(); @@ -527,19 +527,19 @@ void ImageDescEditTab::slotRevertAllChanges() void ImageDescEditTab::setItem(ImageInfo *info) { slotChangingItems(); - QPtrList<ImageInfo> list; + TQPtrList<ImageInfo> list; if (info) list.append(info); setInfos(list); } -void ImageDescEditTab::setItems(QPtrList<ImageInfo> infos) +void ImageDescEditTab::setItems(TQPtrList<ImageInfo> infos) { slotChangingItems(); setInfos(infos); } -void ImageDescEditTab::setInfos(QPtrList<ImageInfo> infos) +void ImageDescEditTab::setInfos(TQPtrList<ImageInfo> infos) { if (infos.isEmpty()) { @@ -593,7 +593,7 @@ void ImageDescEditTab::slotReadFromFileMetadataToDatabase() AlbumManager::instance()->albumDB()->commitTransaction(); d->ignoreImageAttributesWatch = false; - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); // reload everything setInfos(d->currInfos); @@ -618,22 +618,22 @@ void ImageDescEditTab::slotWriteToFileMetadataFromDatabase() kapp->processEvents(); } - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } -bool ImageDescEditTab::eventFilter(QObject *, QEvent *e) +bool ImageDescEditTab::eventFilter(TQObject *, TQEvent *e) { - if ( e->type() == QEvent::KeyPress ) + if ( e->type() == TQEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; - if (k->state() == Qt::ControlButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + TQKeyEvent *k = (TQKeyEvent *)e; + if (k->state() == TQt::ControlButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { emit signalNextItem(); return true; } - else if (k->state() == Qt::ShiftButton && - (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return)) + else if (k->state() == TQt::ShiftButton && + (k->key() == TQt::Key_Enter || k->key() == TQt::Key_Return)) { emit signalPrevItem(); return true; @@ -688,7 +688,7 @@ void ImageDescEditTab::slotItemStateChanged(TAlbumCheckListItem *item) d->hub.setTag(item->album(), item->isOn()); d->tagsView->blockSignals(true); - item->setStatus(d->hub.tagStatus(item->album())); + item->settqStatus(d->hub.tagtqStatus(item->album())); d->tagsView->blockSignals(false); slotModified(); @@ -703,14 +703,14 @@ void ImageDescEditTab::slotCommentChanged() return; d->hub.setComment(d->commentsEdit->text()); - setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit); + setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit); slotModified(); } -void ImageDescEditTab::slotDateTimeChanged(const QDateTime& dateTime) +void ImageDescEditTab::slotDateTimeChanged(const TQDateTime& dateTime) { d->hub.setDateTime(dateTime); - setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit); + setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit); slotModified(); } @@ -738,12 +738,12 @@ void ImageDescEditTab::updateTagsView() { d->tagsView->blockSignals(true); - QListViewItemIterator it( d->tagsView); + TQListViewItemIterator it( d->tagsView); while (it.current()) { TAlbumCheckListItem* tItem = dynamic_cast<TAlbumCheckListItem*>(it.current()); if (tItem) - tItem->setStatus(d->hub.tagStatus(tItem->album())); + tItem->settqStatus(d->hub.tagtqStatus(tItem->album())); ++it; } @@ -759,14 +759,14 @@ void ImageDescEditTab::updateComments() { d->commentsEdit->blockSignals(true); d->commentsEdit->setText(d->hub.comment()); - setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit); + setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit); d->commentsEdit->blockSignals(false); } void ImageDescEditTab::updateRating() { d->ratingWidget->blockSignals(true); - if (d->hub.ratingStatus() == MetadataHub::MetadataDisjoint) + if (d->hub.ratingtqStatus() == MetadataHub::MetadataDisjoint) d->ratingWidget->setRating(0); else d->ratingWidget->setRating(d->hub.rating()); @@ -777,17 +777,17 @@ void ImageDescEditTab::updateDate() { d->dateTimeEdit->blockSignals(true); d->dateTimeEdit->setDateTime(d->hub.dateTime()); - setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit); + setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit); d->dateTimeEdit->blockSignals(false); } -void ImageDescEditTab::setMetadataWidgetStatus(int status, QWidget *widget) +void ImageDescEditTab::setMetadataWidgettqStatus(int status, TQWidget *widget) { if (status == MetadataHub::MetadataDisjoint) { // For text widgets: Set text color to color of disabled text - QPalette palette = widget->palette(); - palette.setColor(QColorGroup::Text, palette.color(QPalette::Disabled, QColorGroup::Text)); + TQPalette palette = widget->palette(); + palette.setColor(TQColorGroup::Text, palette.color(TQPalette::Disabled, TQColorGroup::Text)); widget->setPalette(palette); } else @@ -796,7 +796,7 @@ void ImageDescEditTab::setMetadataWidgetStatus(int status, QWidget *widget) } } -void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint &, int ) +void ImageDescEditTab::slotRightButtonClicked(TQListViewItem *item, const TQPoint &, int ) { TAlbum *album; @@ -817,10 +817,10 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint if(!album) return; - d->ABCMenu = new QPopupMenu; + d->ABCMenu = new TQPopupMenu; - connect(d->ABCMenu, SIGNAL( aboutToShow() ), - this, SLOT( slotABCContextMenu() )); + connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotABCContextMenu() )); KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("Tags")); @@ -837,7 +837,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint popmenu.insertSeparator(-1); - QPopupMenu selectTagsMenu; + TQPopupMenu selectTagsMenu; selectTagsMenu.insertItem(i18n("All Tags"), 14); if (!album->isRoot()) { @@ -847,7 +847,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint } popmenu.insertItem(i18n("Select"), &selectTagsMenu); - QPopupMenu deselectTagsMenu; + TQPopupMenu deselectTagsMenu; deselectTagsMenu.insertItem(i18n("All Tags"), 15); if (!album->isRoot()) { @@ -860,7 +860,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint popmenu.insertItem(i18n("Invert Selection"), 16); popmenu.insertSeparator(-1); - QPopupMenu toggleAutoMenu; + TQPopupMenu toggleAutoMenu; toggleAutoMenu.setCheckable(true); toggleAutoMenu.insertItem(i18n("None"), 21); toggleAutoMenu.insertSeparator(-1); @@ -872,7 +872,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint TagFilterView::ToggleAutoTags oldAutoTags = d->toggleAutoTags; - int choice = popmenu.exec((QCursor::pos())); + int choice = popmenu.exec((TQCursor::pos())); switch( choice ) { case 10: // New Tag. @@ -894,14 +894,14 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint } case 13: // Reset Tag Icon. { - QString errMsg; - AlbumManager::instance()->updateTAlbumIcon(album, QString("tag"), 0, errMsg); + TQString errMsg; + AlbumManager::instance()->updateTAlbumIcon(album, TQString("tag"), 0, errMsg); break; } case 14: // Select All Tags. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(d->tagsView, QListViewItemIterator::NotChecked); + TQListViewItemIterator it(d->tagsView, TQListViewItemIterator::NotChecked); while (it.current()) { TAlbumCheckListItem* item = dynamic_cast<TAlbumCheckListItem*>(it.current()); @@ -915,7 +915,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint case 15: // Deselect All Tags. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(d->tagsView, QListViewItemIterator::Checked); + TQListViewItemIterator it(d->tagsView, TQListViewItemIterator::Checked); while (it.current()) { TAlbumCheckListItem* item = dynamic_cast<TAlbumCheckListItem*>(it.current()); @@ -929,7 +929,7 @@ void ImageDescEditTab::slotRightButtonClicked(QListViewItem *item, const QPoint case 16: // Invert All Tags Selection. { d->toggleAutoTags = TagFilterView::NoToggleAuto; - QListViewItemIterator it(d->tagsView); + TQListViewItemIterator it(d->tagsView); while (it.current()) { TAlbumCheckListItem* item = dynamic_cast<TAlbumCheckListItem*>(it.current()); @@ -1015,7 +1015,7 @@ void ImageDescEditTab::slotABCContextMenu() int counter = 100; KABC::AddressBook* ab = KABC::StdAddressBook::self(); - QStringList names; + TQStringList names; for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); @@ -1023,9 +1023,9 @@ void ImageDescEditTab::slotABCContextMenu() qHeapSort(names); - for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) + for ( TQStringList::Iterator it = names.begin(); it != names.end(); ++it ) { - QString name = *it; + TQString name = *it; if ( !name.isNull() ) d->ABCMenu->insertItem( name, ++counter ); } @@ -1043,8 +1043,8 @@ void ImageDescEditTab::slotMoreMenu() if (singleSelection()) { - d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, SLOT(slotReadFromFileMetadataToDatabase())); - int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); + int writeActionId = d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); // we do not need a "Write to file" action here because the apply button will do just that // if selection is a single file. // Adding the option will confuse users: Does the apply button not write to file? @@ -1056,28 +1056,28 @@ void ImageDescEditTab::slotMoreMenu() { // We need to make clear that this action is different from the Apply button, // which saves the same changes to all files. These batch operations operate on each single file. - d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, SLOT(slotReadFromFileMetadataToDatabase())); - d->moreMenu->insertItem(i18n("Write metadata to each file"), this, SLOT(slotWriteToFileMetadataFromDatabase())); + d->moreMenu->insertItem(i18n("Read metadata from each file to database"), this, TQT_SLOT(slotReadFromFileMetadataToDatabase())); + d->moreMenu->insertItem(i18n("Write metadata to each file"), this, TQT_SLOT(slotWriteToFileMetadataFromDatabase())); } } -void ImageDescEditTab::tagNew(TAlbum* parAlbum, const QString& _title, const QString& _icon) const +void ImageDescEditTab::tagNew(TAlbum* parAlbum, const TQString& _title, const TQString& _icon) const { if (!parAlbum) return; - QString title = _title; - QString icon = _icon; + TQString title = _title; + TQString icon = _icon; if (title.isNull()) { - if (!TagEditDlg::tagCreate(kapp->activeWindow(), parAlbum, title, icon)) + if (!TagEditDlg::tagCreate(TQT_TQWIDGET(TQT_TQWIDGET(kapp->activeWindow())), parAlbum, title, icon)) return; } - QMap<QString, QString> errMap; + TQMap<TQString, TQString> errMap; AlbumList tList = TagEditDlg::createTAlbum(parAlbum, title, icon, errMap); - TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap); + TagEditDlg::showtagsListCreationError(TQT_TQWIDGET(kapp->activeWindow()), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { @@ -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." ) - .arg(album->title())); + .tqarg(album->title())); return; } // find number of subtags - int children = 0; + int tqchildren = 0; AlbumIterator iter(album); while(iter.current()) { - children++; + tqchildren++; ++iter; } - if(children) + if(tqchildren) { int result = KMessageBox::warningContinueCancel(this, i18n("Tag '%1' has one subtag. " @@ -1129,13 +1129,13 @@ void ImageDescEditTab::tagDelete(TAlbum *album) "Deleting this will also delete " "the subtags. " "Do you want to continue?", - children).arg(album->title())); + tqchildren).tqarg(album->title())); if(result != KMessageBox::Continue) return; } - QString message; + TQString message; LLongList assignedItems = albumMan->albumDB()->getItemIDsInTag(album->id()); if (!assignedItems.isEmpty()) { @@ -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()).arg(album->title()); + assignedItems.count()).tqarg(album->title()); } else { - message = i18n("Delete '%1' tag?").arg(album->title()); + message = i18n("Delete '%1' tag?").tqarg(album->title()); } int result = KMessageBox::warningContinueCancel(this, message, @@ -1157,7 +1157,7 @@ void ImageDescEditTab::tagDelete(TAlbum *album) if (result == KMessageBox::Continue) { - QString errMsg; + TQString errMsg; if (!albumMan->deleteTAlbum(album, errMsg)) KMessageBox::error(this, errMsg); } @@ -1168,16 +1168,16 @@ void ImageDescEditTab::tagEdit(TAlbum* album) if (!album || album->isRoot()) return; - QString title; - QString icon; + TQString title; + TQString icon; - if (!TagEditDlg::tagEdit(kapp->activeWindow(), album, title, icon)) + if (!TagEditDlg::tagEdit(TQT_TQWIDGET(kapp->activeWindow()), album, title, icon)) return; AlbumManager *albumMan = AlbumManager::instance(); if (album->title() != title) { - QString errMsg; + TQString errMsg; if (!albumMan->renameTAlbum(album, title, errMsg)) { KMessageBox::error(this, errMsg); @@ -1187,7 +1187,7 @@ void ImageDescEditTab::tagEdit(TAlbum* album) if (album->icon() != icon) { - QString errMsg; + TQString errMsg; if (!albumMan->updateTAlbumIcon(album, icon, 0, errMsg)) { KMessageBox::error(this, errMsg); @@ -1212,15 +1212,15 @@ void ImageDescEditTab::slotAlbumAdded(Album* a) } else { - TAlbumCheckListItem* parent = (TAlbumCheckListItem*)(tag->parent()->extraData(d->tagsView)); - if (!parent) + TAlbumCheckListItem* tqparent = (TAlbumCheckListItem*)(tag->tqparent()->extraData(d->tagsView)); + if (!tqparent) { - DWarning() << k_funcinfo << "Failed to find parent for Tag " << tag->title() + DWarning() << k_funcinfo << "Failed to find tqparent for Tag " << tag->title() << endl; return; } - viewItem = new TAlbumCheckListItem(parent, tag); + viewItem = new TAlbumCheckListItem(tqparent, tag); d->tagsSearchBar->lineEdit()->completionObject()->addItem(tag->title()); d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath()); d->newTagEdit->lineEdit()->completionObject()->addItem(tag->tagPath().remove(0, 1)); // without root "/" @@ -1274,9 +1274,9 @@ void ImageDescEditTab::slotAlbumMoved(TAlbum* tag, TAlbum* newParent) if (!item) return; - if (item->parent()) + if (item->tqparent()) { - QListViewItem* oldPItem = item->parent(); + TQListViewItem* oldPItem = item->tqparent(); oldPItem->takeItem(item); } else @@ -1328,7 +1328,7 @@ void ImageDescEditTab::toggleParentTags(TAlbum *album, bool b) if (!album) return; - QListViewItemIterator it(d->tagsView); + TQListViewItemIterator it(d->tagsView); while (it.current()) { TAlbumCheckListItem* item = dynamic_cast<TAlbumCheckListItem*>(it.current()); @@ -1336,7 +1336,7 @@ void ImageDescEditTab::toggleParentTags(TAlbum *album, bool b) { if (!item->album()) continue; - if (item->album() == album->parent()) + if (item->album() == album->tqparent()) { item->setOn(b); toggleParentTags(item->album() , b); @@ -1357,7 +1357,7 @@ void ImageDescEditTab::setTagThumbnail(TAlbum *album) return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap icon; + TQPixmap icon; if (!loader->getTagThumbnail(album, icon)) { if (icon.isNull()) @@ -1366,13 +1366,13 @@ void ImageDescEditTab::setTagThumbnail(TAlbum *album) } else { - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), icon); item->setPixmap(0, blendedIcon); } } } -void ImageDescEditTab::slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail) +void ImageDescEditTab::slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail) { if(!album || album->type() != Album::TAG) return; @@ -1383,11 +1383,11 @@ void ImageDescEditTab::slotGotThumbnailFromIcon(Album *album, const QPixmap& thu return; AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); + TQPixmap blendedIcon = loader->blendIcons(loader->getStandardTagIcon(), thumbnail); item->setPixmap(0, blendedIcon); // update item in recent tags popup menu, if found there in - QPopupMenu *menu = d->recentTagsBtn->popup(); + TQPopupMenu *menu = d->recentTagsBtn->popup(); if (menu->indexOf(album->id()) != -1) { menu->changeItem(album->id(), thumbnail, menu->text(album->id())); @@ -1409,7 +1409,7 @@ void ImageDescEditTab::slotReloadThumbnails() } } -void ImageDescEditTab::slotImageTagsChanged(Q_LLONG imageId) +void ImageDescEditTab::slotImageTagsChanged(TQ_LLONG imageId) { // don't lose modifications if (d->ignoreImageAttributesWatch || d->modified) @@ -1430,7 +1430,7 @@ void ImageDescEditTab::slotImagesChanged(int albumId) setInfos(d->currInfos); } -void ImageDescEditTab::slotImageRatingChanged(Q_LLONG imageId) +void ImageDescEditTab::slotImageRatingChanged(TQ_LLONG imageId) { if (d->ignoreImageAttributesWatch || d->modified) return; @@ -1438,7 +1438,7 @@ void ImageDescEditTab::slotImageRatingChanged(Q_LLONG imageId) reloadForMetadataChange(imageId); } -void ImageDescEditTab::slotImageCaptionChanged(Q_LLONG imageId) +void ImageDescEditTab::slotImageCaptionChanged(TQ_LLONG imageId) { if (d->ignoreImageAttributesWatch || d->modified) return; @@ -1446,7 +1446,7 @@ void ImageDescEditTab::slotImageCaptionChanged(Q_LLONG imageId) reloadForMetadataChange(imageId); } -void ImageDescEditTab::slotImageDateChanged(Q_LLONG imageId) +void ImageDescEditTab::slotImageDateChanged(TQ_LLONG imageId) { if (d->ignoreImageAttributesWatch || d->modified) return; @@ -1455,7 +1455,7 @@ void ImageDescEditTab::slotImageDateChanged(Q_LLONG imageId) } // private common code for above methods -void ImageDescEditTab::reloadForMetadataChange(Q_LLONG imageId) +void ImageDescEditTab::reloadForMetadataChange(TQ_LLONG imageId) { if (d->currInfos.isEmpty()) return; @@ -1481,7 +1481,7 @@ void ImageDescEditTab::reloadForMetadataChange(Q_LLONG imageId) void ImageDescEditTab::updateRecentTags() { - QPopupMenu *menu = d->recentTagsBtn->popup(); + TQPopupMenu *menu = d->recentTagsBtn->popup(); menu->clear(); AlbumManager* albumMan = AlbumManager::instance(); @@ -1501,7 +1501,7 @@ void ImageDescEditTab::updateRecentTags() if (album) { AlbumThumbnailLoader *loader = AlbumThumbnailLoader::instance(); - QPixmap icon; + TQPixmap icon; if (!loader->getTagThumbnail(album, icon)) { if (icon.isNull()) @@ -1509,7 +1509,7 @@ void ImageDescEditTab::updateRecentTags() icon = loader->getStandardTagIcon(album, AlbumThumbnailLoader::SmallerSize); } } - QString text = album->title() + " (" + ((TAlbum*)album->parent())->prettyURL() + ')'; + TQString text = album->title() + " (" + ((TAlbum*)album->tqparent())->prettyURL() + ')'; menu->insertItem(icon, text, album->id()); } } @@ -1536,7 +1536,7 @@ void ImageDescEditTab::slotRecentTagsMenuActivated(int id) } } -void ImageDescEditTab::slotTagsSearchChanged(const QString& filter) +void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter) { if (filter.isEmpty()) { @@ -1545,7 +1545,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const QString& filter) } //TODO: this will destroy assigned-tags filtering. Unify in one method. - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -1558,31 +1558,31 @@ void ImageDescEditTab::slotTagsSearchChanged(const QString& filter) if (tag->isRoot()) continue; - bool match = tag->title().lower().contains(search); + bool match = tag->title().lower().tqcontains(search); bool doesExpand = false; if (!match) { - // check if any of the parents match the search - Album* parent = tag->parent(); - while (parent && !parent->isRoot()) + // check if any of the tqparents match the search + Album* tqparent = tag->tqparent(); + while (tqparent && !tqparent->isRoot()) { - if (parent->title().lower().contains(search)) + if (tqparent->title().lower().tqcontains(search)) { match = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } if (!match) { - // check if any of the children match the search + // check if any of the tqchildren match the search AlbumIterator it(tag); while (it.current()) { - if ((*it)->title().lower().contains(search)) + if ((*it)->title().lower().tqcontains(search)) { match = true; doesExpand = true; @@ -1635,7 +1635,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const QString& filter) void ImageDescEditTab::slotAssignedTagsToggled(bool t) { //TODO: this will destroy name filtering. Unify in one method. - QListViewItemIterator it(d->tagsView); + TQListViewItemIterator it(d->tagsView); while (it.current()) { TAlbumCheckListItem* item = dynamic_cast<TAlbumCheckListItem*>(it.current()); @@ -1646,19 +1646,19 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) { if (t) { - MetadataHub::TagStatus status = d->hub.tagStatus(item->album()); + MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album()); bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag) || status == MetadataHub::MetadataDisjoint; item->setVisible(tagAssigned); if (tagAssigned) { - Album* parent = tag->parent(); - while (parent && !parent->isRoot()) + Album* tqparent = tag->tqparent(); + while (tqparent && !tqparent->isRoot()) { - TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)parent->extraData(d->tagsView); + TAlbumCheckListItem *pitem = (TAlbumCheckListItem*)tqparent->extraData(d->tagsView); pitem->setVisible(true); - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } } @@ -1672,7 +1672,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) } // correct visibilities afterwards: - // As QListViewItem::setVisible works recursively on all it's children + // As TQListViewItem::setVisible works recursively on all it's tqchildren // we have to correct this if (t) { @@ -1685,22 +1685,22 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t) { if (!tag->isRoot()) { - // only if the current item is not marked as tagged, check all children - MetadataHub::TagStatus status = d->hub.tagStatus(item->album()); + // only if the current item is not marked as tagged, check all tqchildren + MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album()); bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag) || status == MetadataHub::MetadataDisjoint; if (!tagAssigned) { bool somethingIsSet = false; - QListViewItem* nextSibling = (*it)->nextSibling(); - QListViewItemIterator tmpIt = it; + TQListViewItem* nextSibling = (*it)->nextSibling(); + TQListViewItemIterator tmpIt = it; ++tmpIt; while (*tmpIt != nextSibling ) { TAlbumCheckListItem* tmpItem = dynamic_cast<TAlbumCheckListItem*>(tmpIt.current()); - MetadataHub::TagStatus tmpStatus = d->hub.tagStatus(tmpItem->album()); - bool tmpTagAssigned = (tmpStatus == MetadataHub::MetadataAvailable && tmpStatus.hasTag) - || tmpStatus == MetadataHub::MetadataDisjoint; + MetadataHub::TagtqStatus tmptqStatus = d->hub.tagtqStatus(tmpItem->album()); + bool tmpTagAssigned = (tmptqStatus == MetadataHub::MetadataAvailable && tmptqStatus.hasTag) + || tmptqStatus == MetadataHub::MetadataDisjoint; if(tmpTagAssigned) { somethingIsSet = true; @@ -1736,7 +1736,7 @@ void ImageDescEditTab::refreshTagsView() void ImageDescEditTab::slotCreateNewTag() { - QString tagStr = d->newTagEdit->text(); + TQString tagStr = d->newTagEdit->text(); if (tagStr.isEmpty()) return; TAlbum *mainRootAlbum = 0; @@ -1744,8 +1744,8 @@ void ImageDescEditTab::slotCreateNewTag() if (item) mainRootAlbum = item->album(); - QMap<QString, QString> errMap; - AlbumList tList = TagEditDlg::createTAlbum(mainRootAlbum, tagStr, QString("tag"), errMap); + TQMap<TQString, TQString> errMap; + AlbumList tList = TagEditDlg::createTAlbum(mainRootAlbum, tagStr, TQString("tag"), errMap); for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it) { diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h index 7a25738..6c7a2f7 100644 --- a/digikam/libs/imageproperties/imagedescedittab.h +++ b/digikam/libs/imageproperties/imagedescedittab.h @@ -27,11 +27,11 @@ #ifndef IMAGEDESCEDITTAB_H #define IMAGEDESCEDITTAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qpixmap.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqptrlist.h> // Local includes. @@ -39,7 +39,7 @@ #include "navigatebartab.h" #include "albummanager.h" -class QListViewItem; +class TQListViewItem; namespace Digikam { @@ -50,31 +50,32 @@ class ImageDescEditTabPriv; class DIGIKAM_EXPORT ImageDescEditTab : public NavigateBarTab { Q_OBJECT + TQ_OBJECT public: - ImageDescEditTab(QWidget *parent, bool navBar=true); + ImageDescEditTab(TQWidget *tqparent, bool navBar=true); ~ImageDescEditTab(); void assignRating(int rating); void setItem(ImageInfo *info=0); - void setItems(QPtrList<ImageInfo> infos); + void setItems(TQPtrList<ImageInfo> infos); void populateTags(); void refreshTagsView(); signals: - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalTagFilterMatch(bool); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); private: - void setInfos(QPtrList<ImageInfo> infos); + void setInfos(TQPtrList<ImageInfo> infos); void updateTagsView(); void updateComments(); @@ -82,7 +83,7 @@ private: void updateDate(); void updateRecentTags(); - void tagNew(TAlbum* parAlbum, const QString& _title=QString(), const QString& _icon=QString()) const; + void tagNew(TAlbum* parAlbum, const TQString& _title=TQString(), const TQString& _icon=TQString()) const; void tagEdit(TAlbum* album); void tagDelete(TAlbum *album); @@ -92,8 +93,8 @@ private: void setTagThumbnail(TAlbum *album); bool singleSelection() const; - void setMetadataWidgetStatus(int status, QWidget *widget); - void reloadForMetadataChange(Q_LLONG imageId); + void setMetadataWidgettqStatus(int status, TQWidget *widget); + void reloadForMetadataChange(TQ_LLONG imageId); private slots: @@ -103,11 +104,11 @@ private slots: void slotChangingItems(); void slotItemStateChanged(TAlbumCheckListItem *); void slotCommentChanged(); - void slotDateTimeChanged(const QDateTime& dateTime); + void slotDateTimeChanged(const TQDateTime& dateTime); void slotRatingChanged(int rating); void slotModified(); - void slotRightButtonClicked(QListViewItem *, const QPoint &, int); - void slotTagsSearchChanged(const QString&); + void slotRightButtonClicked(TQListViewItem *, const TQPoint &, int); + void slotTagsSearchChanged(const TQString&); void slotAlbumAdded(Album* a); void slotAlbumDeleted(Album* a); @@ -117,15 +118,15 @@ private slots: void slotAlbumMoved(TAlbum* tag, TAlbum* newParent); void slotABCContextMenu(); - void slotGotThumbnailFromIcon(Album *album, const QPixmap& thumbnail); + void slotGotThumbnailFromIcon(Album *album, const TQPixmap& thumbnail); void slotThumbnailLost(Album *album); void slotReloadThumbnails(); - void slotImageTagsChanged(Q_LLONG imageId); + void slotImageTagsChanged(TQ_LLONG imageId); void slotImagesChanged(int albumId); - void slotImageRatingChanged(Q_LLONG imageId); - void slotImageDateChanged(Q_LLONG imageId); - void slotImageCaptionChanged(Q_LLONG imageId); + void slotImageRatingChanged(TQ_LLONG imageId); + void slotImageDateChanged(TQ_LLONG imageId); + void slotImageCaptionChanged(TQ_LLONG imageId); void slotRecentTagsMenuActivated(int); void slotAssignedTagsToggled(bool); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp index 5201c55..ea63fd1 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp @@ -25,19 +25,19 @@ #include <cmath> -// Qt includes. - -#include <qlayout.h> -#include <qspinbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qgroupbox.h> -#include <qhbuttongroup.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qscrollview.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqgroupbox.h> +#include <tqhbuttongroup.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqvbox.h> +#include <tqscrollview.h> // KDE includes. @@ -106,31 +106,31 @@ public: bool inLoadingProcess; - QComboBox *channelCB; - QComboBox *colorsCB; - QComboBox *renderingCB; + TQComboBox *channelCB; + TQComboBox *colorsCB; + TQComboBox *renderingCB; - QHButtonGroup *scaleBG; - QHButtonGroup *regionBG; + TQHButtonGroup *scaleBG; + TQHButtonGroup *regionBG; - QSpinBox *minInterv; - QSpinBox *maxInterv; + TQSpinBox *minInterv; + TQSpinBox *maxInterv; - QLabel *labelMeanValue; - QLabel *labelPixelsValue; - QLabel *labelStdDevValue; - QLabel *labelCountValue; - QLabel *labelMedianValue; - QLabel *labelPercentileValue; - QLabel *labelColorDepth; - QLabel *labelAlphaChannel; + TQLabel *labelMeanValue; + TQLabel *labelPixelsValue; + TQLabel *labelStdDevValue; + TQLabel *labelCountValue; + TQLabel *labelMedianValue; + TQLabel *labelPercentileValue; + TQLabel *labelColorDepth; + TQLabel *labelAlphaChannel; - QString currentFilePath; + TQString currentFilePath; LoadingDescription currentLoadingDescription; - QRect selectionArea; + TQRect selectionArea; - QByteArray embedded_profile; + TQByteArray embedded_profile; KTabWidget *tab; @@ -143,8 +143,8 @@ public: SharedLoadSaveThread *imageLoaderThread; }; -ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) - : NavigateBarTab(parent) +ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar) + : NavigateBarTab(tqparent) { d = new ImagePropertiesColorsTabPriv; @@ -154,26 +154,26 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) // Histogram tab area ----------------------------------------------------- - QScrollView *sv = new QScrollView(d->tab); - sv->viewport()->setBackgroundMode(Qt::PaletteBackground); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setFrameStyle(QFrame::NoFrame); + TQScrollView *sv = new TQScrollView(d->tab); + sv->viewport()->setBackgroundMode(TQt::PaletteBackground); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setFrameStyle(TQFrame::NoFrame); - QWidget* histogramPage = new QWidget(sv->viewport()); - QGridLayout *topLayout = new QGridLayout(histogramPage, 8, 3, + TQWidget* histogramPage = new TQWidget(sv->viewport()); + TQGridLayout *topLayout = new TQGridLayout(histogramPage, 8, 3, KDialog::spacingHint(), KDialog::spacingHint()); sv->addChild(histogramPage); - QLabel *label1 = new QLabel(i18n("Channel:"), histogramPage); - label1->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - d->channelCB = new QComboBox( false, histogramPage ); + TQLabel *label1 = new TQLabel(i18n("Channel:"), histogramPage); + label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + d->channelCB = new TQComboBox( false, histogramPage ); d->channelCB->insertItem( i18n("Luminosity") ); d->channelCB->insertItem( i18n("Red") ); d->channelCB->insertItem( i18n("Green") ); d->channelCB->insertItem( i18n("Blue") ); d->channelCB->insertItem( i18n("Alpha") ); d->channelCB->insertItem( i18n("Colors") ); - QWhatsThis::add( d->channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add( d->channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: Display luminosity (perceived brightness) values.<p>" "<b>Red</b>: Display the red image channel.<p>" "<b>Green</b>: Display the green image channel.<p>" @@ -183,93 +183,93 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) "is supported by some image formats such as PNG or TIFF.<p>" "<b>Colors</b>: Display all color channel values at the same time.")); - d->scaleBG = new QHButtonGroup(histogramPage); + d->scaleBG = new TQHButtonGroup(histogramPage); d->scaleBG->setExclusive(true); - d->scaleBG->setFrameShape(QFrame::NoFrame); + d->scaleBG->setFrameShape(TQFrame::NoFrame); d->scaleBG->setInsideMargin( 0 ); - QWhatsThis::add( d->scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add( d->scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal values are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal values are big; " "if it is used, all values (small and large) will be visible on the " "graph.")); - QPushButton *linHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QLabel *label10 = new QLabel(i18n("Colors:"), histogramPage); - label10->setAlignment ( Qt::AlignRight | Qt::AlignVCenter ); - d->colorsCB = new QComboBox( false, histogramPage ); + TQLabel *label10 = new TQLabel(i18n("Colors:"), histogramPage); + label10->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter ); + d->colorsCB = new TQComboBox( false, histogramPage ); d->colorsCB->insertItem( i18n("Red") ); d->colorsCB->insertItem( i18n("Green") ); d->colorsCB->insertItem( i18n("Blue") ); d->colorsCB->setEnabled( false ); - QWhatsThis::add( d->colorsCB, i18n("<p>Select the main color displayed with Colors Channel mode here:<p>" + TQWhatsThis::add( d->colorsCB, i18n("<p>Select the main color displayed with Colors Channel mode here:<p>" "<b>Red</b>: Draw the red image channel in the foreground.<p>" "<b>Green</b>: Draw the green image channel in the foreground.<p>" "<b>Blue</b>: Draw the blue image channel in the foreground.<p>")); - d->regionBG = new QHButtonGroup(histogramPage); + d->regionBG = new TQHButtonGroup(histogramPage); d->regionBG->setExclusive(true); - d->regionBG->setFrameShape(QFrame::NoFrame); + d->regionBG->setFrameShape(TQFrame::NoFrame); d->regionBG->setInsideMargin( 0 ); d->regionBG->hide(); - QWhatsThis::add( d->regionBG, i18n("<p>Select from which region the histogram will be computed here:<p>" + TQWhatsThis::add( d->regionBG, i18n("<p>Select from which region the histogram will be computed here:<p>" "<b>Full Image</b>: Compute histogram using the full image.<p>" "<b>Selection</b>: Compute histogram using the current image " "selection.")); - QPushButton *fullImageButton = new QPushButton( d->regionBG ); - QToolTip::add( fullImageButton, i18n( "<p>Full Image" ) ); + TQPushButton *fullImageButton = new TQPushButton( d->regionBG ); + TQToolTip::add( fullImageButton, i18n( "<p>Full Image" ) ); d->regionBG->insert(fullImageButton, HistogramWidget::FullImageHistogram); KGlobal::dirs()->addResourceType("image-full", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("image-full", "image-full.png"); - fullImageButton->setPixmap( QPixmap( directory + "image-full.png" ) ); + fullImageButton->setPixmap( TQPixmap( directory + "image-full.png" ) ); fullImageButton->setToggleButton(true); - QPushButton *SelectionImageButton = new QPushButton( d->regionBG ); - QToolTip::add( SelectionImageButton, i18n( "<p>Selection" ) ); + TQPushButton *SelectionImageButton = new TQPushButton( d->regionBG ); + TQToolTip::add( SelectionImageButton, i18n( "<p>Selection" ) ); d->regionBG->insert(SelectionImageButton, HistogramWidget::ImageSelectionHistogram); KGlobal::dirs()->addResourceType("image-selection", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("image-selection", "image-selection.png"); - SelectionImageButton->setPixmap( QPixmap( directory + "image-selection.png" ) ); + SelectionImageButton->setPixmap( TQPixmap( directory + "image-selection.png" ) ); SelectionImageButton->setToggleButton(true); // ------------------------------------------------------------- - QVBox *histoBox = new QVBox(histogramPage); + TQVBox *histoBox = new TQVBox(histogramPage); d->histogramWidget = new HistogramWidget(256, 140, histoBox); - QWhatsThis::add( d->histogramWidget, i18n("<p>This is the histogram drawing of the " + TQWhatsThis::add( d->histogramWidget, i18n("<p>This is the histogram drawing of the " "selected image channel")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); d->hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, histoBox); - d->hGradient->setColors(QColor("black"), QColor("white")); + d->hGradient->setColors(TQColor("black"), TQColor("white")); // ------------------------------------------------------------- - QHBoxLayout *hlay2 = new QHBoxLayout(KDialog::spacingHint()); - QLabel *label3 = new QLabel(i18n("Range:"), histogramPage); - label3->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->minInterv = new QSpinBox(0, 255, 1, histogramPage); + TQHBoxLayout *hlay2 = new TQHBoxLayout(KDialog::spacingHint()); + TQLabel *label3 = new TQLabel(i18n("Range:"), histogramPage); + label3->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->minInterv = new TQSpinBox(0, 255, 1, histogramPage); d->minInterv->setValue(0); - QWhatsThis::add(d->minInterv, i18n("<p>Select the minimal intensity " + TQWhatsThis::add(d->minInterv, i18n("<p>Select the minimal intensity " "value of the histogram selection here.")); - d->maxInterv = new QSpinBox(0, 255, 1, histogramPage); + d->maxInterv = new TQSpinBox(0, 255, 1, histogramPage); d->maxInterv->setValue(255); - QWhatsThis::add(d->minInterv, i18n("<p>Select the maximal intensity value " + TQWhatsThis::add(d->minInterv, i18n("<p>Select the maximal intensity value " "of the histogram selection here.")); hlay2->addWidget(label3); hlay2->addWidget(d->minInterv); @@ -277,50 +277,50 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) // ------------------------------------------------------------- - QGroupBox *gbox = new QGroupBox(2, Qt::Horizontal, i18n("Statistics"), histogramPage); - QWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the " + TQGroupBox *gbox = new TQGroupBox(2, Qt::Horizontal, i18n("Statistics"), histogramPage); + TQWhatsThis::add( gbox, i18n("<p>Here you can see the statistical results calculated from the " "selected histogram part. These values are available for all " "channels.")); - QLabel *label5 = new QLabel(i18n("Pixels:"), gbox); - label5->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelPixelsValue = new QLabel(gbox); - d->labelPixelsValue->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label7 = new QLabel(i18n("Count:"), gbox); - label7->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelCountValue = new QLabel(gbox); - d->labelCountValue->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label4 = new QLabel(i18n("Mean:"), gbox); - label4->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelMeanValue = new QLabel(gbox); - d->labelMeanValue->setAlignment (Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label6 = new QLabel(i18n("Std. deviation:"), gbox); - label6->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelStdDevValue = new QLabel(gbox); - d->labelStdDevValue->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label8 = new QLabel(i18n("Median:"), gbox); - label8->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelMedianValue = new QLabel(gbox); - d->labelMedianValue->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label9 = new QLabel(i18n("Percentile:"), gbox); - label9->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelPercentileValue = new QLabel(gbox); - d->labelPercentileValue->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label11 = new QLabel(i18n("Color depth:"), gbox); - label11->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelColorDepth = new QLabel(gbox); - d->labelColorDepth->setAlignment(Qt::AlignRight | Qt::AlignVCenter); - - QLabel *label12 = new QLabel(i18n("Alpha Channel:"), gbox); - label12->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - d->labelAlphaChannel = new QLabel(gbox); - d->labelAlphaChannel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + TQLabel *label5 = new TQLabel(i18n("Pixels:"), gbox); + label5->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelPixelsValue = new TQLabel(gbox); + d->labelPixelsValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label7 = new TQLabel(i18n("Count:"), gbox); + label7->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelCountValue = new TQLabel(gbox); + d->labelCountValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label4 = new TQLabel(i18n("Mean:"), gbox); + label4->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelMeanValue = new TQLabel(gbox); + d->labelMeanValue->tqsetAlignment (TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label6 = new TQLabel(i18n("Std. deviation:"), gbox); + label6->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelStdDevValue = new TQLabel(gbox); + d->labelStdDevValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label8 = new TQLabel(i18n("Median:"), gbox); + label8->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelMedianValue = new TQLabel(gbox); + d->labelMedianValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label9 = new TQLabel(i18n("Percentile:"), gbox); + label9->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelPercentileValue = new TQLabel(gbox); + d->labelPercentileValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label11 = new TQLabel(i18n("Color depth:"), gbox); + label11->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelColorDepth = new TQLabel(gbox); + d->labelColorDepth->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + + TQLabel *label12 = new TQLabel(i18n("Alpha Channel:"), gbox); + label12->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + d->labelAlphaChannel = new TQLabel(gbox); + d->labelAlphaChannel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); topLayout->addMultiCellWidget(label1, 1, 1, 0, 0); topLayout->addMultiCellWidget(d->channelCB, 1, 1, 1, 1); @@ -338,10 +338,10 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) // ICC Profiles tab area --------------------------------------- - QScrollView *sv2 = new QScrollView(d->tab); - sv2->viewport()->setBackgroundMode(Qt::PaletteBackground); - sv2->setResizePolicy(QScrollView::AutoOneFit); - sv2->setFrameStyle(QFrame::NoFrame); + TQScrollView *sv2 = new TQScrollView(d->tab); + sv2->viewport()->setBackgroundMode(TQt::PaletteBackground); + sv2->setResizePolicy(TQScrollView::AutoOneFit); + sv2->setFrameStyle(TQFrame::NoFrame); d->iccProfileWidget = new ICCProfileWidget(sv2->viewport()); sv2->addChild(d->iccProfileWidget); @@ -349,35 +349,35 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) // ------------------------------------------------------------- - connect(d->channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, SIGNAL(activated(int)), - this, SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotColorsChanged(int))); - connect(d->regionBG, SIGNAL(released(int)), - this, SLOT(slotRenderingChanged(int))); + connect(d->regionBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotRenderingChanged(int))); - connect(d->histogramWidget, SIGNAL(signalIntervalChanged( int, int )), - this, SLOT(slotUpdateInterval(int, int))); + connect(d->histogramWidget, TQT_SIGNAL(signalIntervalChanged( int, int )), + this, TQT_SLOT(slotUpdateInterval(int, int))); - connect(d->histogramWidget, SIGNAL(signalMaximumValueChanged( int )), - this, SLOT(slotUpdateIntervRange(int))); + connect(d->histogramWidget, TQT_SIGNAL(signalMaximumValueChanged( int )), + this, TQT_SLOT(slotUpdateIntervRange(int))); - connect(d->histogramWidget, SIGNAL(signalHistogramComputationDone(bool)), - this, SLOT(slotRefreshOptions(bool))); + connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationDone(bool)), + this, TQT_SLOT(slotRefreshOptions(bool))); - connect(d->histogramWidget, SIGNAL(signalHistogramComputationFailed(void)), - this, SLOT(slotHistogramComputationFailed(void))); + connect(d->histogramWidget, TQT_SIGNAL(signalHistogramComputationFailed(void)), + this, TQT_SLOT(slotHistogramComputationFailed(void))); - connect(d->minInterv, SIGNAL(valueChanged (int)), - this, SLOT(slotMinValueChanged(int))); + connect(d->minInterv, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotMinValueChanged(int))); - connect(d->maxInterv, SIGNAL(valueChanged (int)), - this, SLOT(slotMaxValueChanged(int))); + connect(d->maxInterv, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotMaxValueChanged(int))); // -- read config --------------------------------------------------------- @@ -386,7 +386,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(QWidget* parent, bool navBar) d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesColors Tab", ImagePropertiesColorsTabPriv::HISTOGRAM)); d->iccProfileWidget->setMode(config->readNumEntry("ICC Level", ICCProfileWidget::SIMPLE)); - d->iccProfileWidget->setCurrentItemByKey(config->readEntry("Current ICC Item", QString())); + d->iccProfileWidget->setCurrentItemByKey(config->readEntry("Current ICC Item", TQString())); d->channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity. d->scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram)); @@ -423,7 +423,7 @@ ImagePropertiesColorsTab::~ImagePropertiesColorsTab() delete d; } -void ImagePropertiesColorsTab::setData(const KURL& url, const QRect &selectionArea, +void ImagePropertiesColorsTab::setData(const KURL& url, const TQRect &selectionArea, DImg *img) { // We might be getting duplicate events from AlbumIconView, @@ -438,7 +438,7 @@ void ImagePropertiesColorsTab::setData(const KURL& url, const QRect &selectionAr // threaded histogram algorithm. d->histogramWidget->stopHistogramComputation(); - d->currentFilePath = QString(); + d->currentFilePath = TQString(); d->currentLoadingDescription = LoadingDescription(); d->iccProfileWidget->loadFromURL(KURL()); @@ -509,11 +509,11 @@ void ImagePropertiesColorsTab::loadImageFromUrl(const KURL& url) { d->imageLoaderThread = new SharedLoadSaveThread(); - connect(d->imageLoaderThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); + connect(d->imageLoaderThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQT_SLOT(slotLoadImageFromUrlComplete(const LoadingDescription &, const DImg&))); - connect(d->imageLoaderThread, SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), - this, SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); + connect(d->imageLoaderThread, TQT_SIGNAL(signalMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &)), + this, TQT_SLOT(slotMoreCompleteLoadingAvailable(const LoadingDescription &, const LoadingDescription &))); } LoadingDescription desc = LoadingDescription(url.path()); @@ -585,7 +585,7 @@ void ImagePropertiesColorsTab::slotMoreCompleteLoadingAvailable(const LoadingDes } } -void ImagePropertiesColorsTab::setSelection(const QRect &selectionArea) +void ImagePropertiesColorsTab::setSelection(const TQRect &selectionArea) { // This is necessary to stop computation because d->image.bits() is currently used by // threaded histogram algorithm. @@ -629,49 +629,49 @@ void ImagePropertiesColorsTab::slotChannelChanged(int channel) { case RedChannel: d->histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); d->colorsCB->setEnabled(false); break; case GreenChannel: d->histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); d->colorsCB->setEnabled(false); break; case BlueChannel: d->histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); d->colorsCB->setEnabled(false); break; case AlphaChannel: d->histogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); d->colorsCB->setEnabled(false); break; case ColorChannels: d->histogramWidget->m_channelType = HistogramWidget::ColorChannelsHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); d->colorsCB->setEnabled(true); break; default: // Luminosity. d->histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); d->colorsCB->setEnabled(false); break; } - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); updateStatistiques(); } void ImagePropertiesColorsTab::slotScaleChanged(int scale) { d->histogramWidget->m_scaleType = scale; - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); } void ImagePropertiesColorsTab::slotColorsChanged(int color) @@ -691,14 +691,14 @@ void ImagePropertiesColorsTab::slotColorsChanged(int color) break; } - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); updateStatistiques(); } void ImagePropertiesColorsTab::slotRenderingChanged(int rendering) { d->histogramWidget->m_renderingType = rendering; - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); updateStatistiques(); } @@ -755,7 +755,7 @@ void ImagePropertiesColorsTab::updateInformations() void ImagePropertiesColorsTab::updateStatistiques() { - QString value; + TQString value; int min = d->minInterv->value(); int max = d->maxInterv->value(); int channel = d->channelCB->currentItem(); diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.h b/digikam/libs/imageproperties/imagepropertiescolorstab.h index 314c925..260dc10 100644 --- a/digikam/libs/imageproperties/imagepropertiescolorstab.h +++ b/digikam/libs/imageproperties/imagepropertiescolorstab.h @@ -23,10 +23,10 @@ #ifndef IMAGEPROPERTIESCOLORSTAB_H #define IMAGEPROPERTIESCOLORSTAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> // KDE includes. @@ -38,7 +38,7 @@ #include "digikam_export.h" #include "navigatebartab.h" -class QRect; +class TQRect; namespace Digikam { @@ -50,16 +50,17 @@ class ImagePropertiesColorsTabPriv; class DIGIKAM_EXPORT ImagePropertiesColorsTab : public NavigateBarTab { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesColorsTab(QWidget* parent, bool navBar=true); + ImagePropertiesColorsTab(TQWidget* tqparent, bool navBar=true); ~ImagePropertiesColorsTab(); - void setData(const KURL& url=KURL(), const QRect &selectionArea = QRect(), + void setData(const KURL& url=KURL(), const TQRect &selectionArea = TQRect(), DImg *img=0); - void setSelection(const QRect &selectionArea); + void setSelection(const TQRect &selectionArea); private: diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp index f7fe828..5ab9b9f 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp @@ -21,14 +21,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qfile.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qfileinfo.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqfileinfo.h> +#include <tqwhatsthis.h> // KDE includes. @@ -86,8 +86,8 @@ public: GPSWidget *gpsWidget; }; -ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(QWidget* parent, bool navBar) - : NavigateBarTab(parent) +ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar) + : NavigateBarTab(tqparent) { d = new ImagePropertiesMetadataTabPriv; @@ -125,10 +125,10 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(QWidget* parent, bool nav d->makernoteWidget->setMode(config->readNumEntry("MAKERNOTE Level", MakerNoteWidget::SIMPLE)); d->iptcWidget->setMode(config->readNumEntry("IPTC Level", IptcWidget::SIMPLE)); d->gpsWidget->setMode(config->readNumEntry("GPS Level", GPSWidget::SIMPLE)); - d->exifWidget->setCurrentItemByKey(config->readEntry("Current EXIF Item", QString())); - d->makernoteWidget->setCurrentItemByKey(config->readEntry("Current MAKERNOTE Item", QString())); - d->iptcWidget->setCurrentItemByKey(config->readEntry("Current IPTC Item", QString())); - d->gpsWidget->setCurrentItemByKey(config->readEntry("Current GPS Item", QString())); + d->exifWidget->setCurrentItemByKey(config->readEntry("Current EXIF Item", TQString())); + d->makernoteWidget->setCurrentItemByKey(config->readEntry("Current MAKERNOTE Item", TQString())); + d->iptcWidget->setCurrentItemByKey(config->readEntry("Current IPTC Item", TQString())); + d->gpsWidget->setCurrentItemByKey(config->readEntry("Current GPS Item", TQString())); d->gpsWidget->setWebGPSLocator(config->readNumEntry("Current Web GPS Locator", GPSWidget::MapQuest)); } @@ -166,8 +166,8 @@ void ImagePropertiesMetaDataTab::setCurrentURL(const KURL& url) setEnabled(true); DMetadata metadata(url.path()); - QByteArray exifData = metadata.getExif(); - QByteArray iptcData = metadata.getIptc(); + TQByteArray exifData = metadata.getExif(); + TQByteArray iptcData = metadata.getIptc(); d->exifWidget->loadFromData(url.filename(), exifData); d->makernoteWidget->loadFromData(url.filename(), exifData); @@ -175,9 +175,9 @@ void ImagePropertiesMetaDataTab::setCurrentURL(const KURL& url) d->gpsWidget->loadFromData(url.filename(), exifData); } -void ImagePropertiesMetaDataTab::setCurrentData(const QByteArray& exifData, - const QByteArray& iptcData, - const QString& filename) +void ImagePropertiesMetaDataTab::setCurrentData(const TQByteArray& exifData, + const TQByteArray& iptcData, + const TQString& filename) { if (exifData.isEmpty() && iptcData.isEmpty()) { diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h index 709e9c0..65314e7 100644 --- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.h +++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.h @@ -24,10 +24,10 @@ #ifndef IMAGEPROPERTIESMETADATATAB_H #define IMAGEPROPERTIESMETADATATAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcstring.h> +#include <tqwidget.h> +#include <tqcstring.h> // KDE includes. @@ -46,16 +46,17 @@ class ImagePropertiesMetadataTabPriv; class DIGIKAM_EXPORT ImagePropertiesMetaDataTab : public NavigateBarTab { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesMetaDataTab(QWidget* parent, bool navBar=true); + ImagePropertiesMetaDataTab(TQWidget* tqparent, bool navBar=true); ~ImagePropertiesMetaDataTab(); void setCurrentURL(const KURL& url=KURL()); - void setCurrentData(const QByteArray& exifData=QByteArray(), - const QByteArray& iptcData=QByteArray(), - const QString& filename=QString()); + void setCurrentData(const TQByteArray& exifData=TQByteArray(), + const TQByteArray& iptcData=TQByteArray(), + const TQString& filename=TQString()); private: diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp index e42df5c..826615a 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qrect.h> -#include <qsplitter.h> +#include <tqrect.h> +#include <tqsplitter.h> // KDE includes. @@ -49,20 +49,20 @@ namespace Digikam { -ImagePropertiesSideBar::ImagePropertiesSideBar(QWidget *parent, const char *name, - QSplitter *splitter, Side side, +ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *tqparent, const char *name, + TQSplitter *splitter, Side side, bool mimimizedDefault, bool navBar) - : Sidebar(parent, name, side, mimimizedDefault) + : Sidebar(tqparent, name, side, mimimizedDefault) { m_image = 0; - m_currentRect = QRect(); + m_currentRect = TQRect(); m_dirtyPropertiesTab = false; m_dirtyMetadataTab = false; m_dirtyColorTab = false; - m_propertiesTab = new ImagePropertiesTab(parent, navBar); - m_metadataTab = new ImagePropertiesMetaDataTab(parent, navBar); - m_colorTab = new ImagePropertiesColorsTab(parent, navBar); + m_propertiesTab = new ImagePropertiesTab(tqparent, navBar); + m_metadataTab = new ImagePropertiesMetaDataTab(tqparent, navBar); + m_colorTab = new ImagePropertiesColorsTab(tqparent, navBar); setSplitter(splitter); @@ -70,15 +70,15 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(QWidget *parent, const char *name appendTab(m_metadataTab, SmallIcon("exifinfo"), i18n("Metadata")); appendTab(m_colorTab, SmallIcon("blend"), i18n("Colors")); - connect(this, SIGNAL(signalChangedTab(QWidget*)), - this, SLOT(slotChangedTab(QWidget*))); + connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), + this, TQT_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBar::~ImagePropertiesSideBar() { } -void ImagePropertiesSideBar::itemChanged(const KURL& url, const QRect &rect, DImg *img) +void ImagePropertiesSideBar::itemChanged(const KURL& url, const TQRect &rect, DImg *img) { if (!url.isValid()) return; @@ -111,7 +111,7 @@ void ImagePropertiesSideBar::slotNoCurrentItem(void) m_dirtyColorTab = false; } -void ImagePropertiesSideBar::slotImageSelectionChanged(const QRect &rect) +void ImagePropertiesSideBar::slotImageSelectionChanged(const TQRect &rect) { m_currentRect = rect; @@ -121,7 +121,7 @@ void ImagePropertiesSideBar::slotImageSelectionChanged(const QRect &rect) slotChangedTab(m_colorTab); } -void ImagePropertiesSideBar::slotChangedTab(QWidget* tab) +void ImagePropertiesSideBar::slotChangedTab(TQWidget* tab) { if (!m_currentURL.isValid()) return; diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.h b/digikam/libs/imageproperties/imagepropertiessidebar.h index 02643c5..2210331 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebar.h +++ b/digikam/libs/imageproperties/imagepropertiessidebar.h @@ -34,9 +34,9 @@ #include "sidebar.h" #include "digikam_export.h" -class QSplitter; -class QWidget; -class QRect; +class TQSplitter; +class TQWidget; +class TQRect; namespace Digikam { @@ -49,25 +49,26 @@ class ImagePropertiesColorsTab; class DIGIKAM_EXPORT ImagePropertiesSideBar : public Sidebar { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesSideBar(QWidget* parent, const char *name, QSplitter *splitter, + ImagePropertiesSideBar(TQWidget* tqparent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false, bool navBar=false); ~ImagePropertiesSideBar(); - virtual void itemChanged(const KURL& url, const QRect &rect = QRect(), DImg *img = 0); + virtual void itemChanged(const KURL& url, const TQRect &rect = TQRect(), DImg *img = 0); public slots: - void slotImageSelectionChanged(const QRect &rect); + void slotImageSelectionChanged(const TQRect &rect); virtual void slotNoCurrentItem(void); protected slots: - virtual void slotChangedTab(QWidget* tab); + virtual void slotChangedTab(TQWidget* tab); protected: @@ -75,7 +76,7 @@ protected: bool m_dirtyMetadataTab; bool m_dirtyColorTab; - QRect m_currentRect; + TQRect m_currentRect; KURL m_currentURL; diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp index e388f1d..59dcdec 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qsplitter.h> +#include <tqsplitter.h> // KDE includes. @@ -65,14 +65,14 @@ public: itemInfo = 0; cameraView = 0; cameraItem = 0; - exifData = QByteArray(); + exifData = TQByteArray(); currentURL = KURL(); } bool dirtyMetadataTab; bool dirtyCameraItemTab; - QByteArray exifData; + TQByteArray exifData; KURL currentURL; @@ -87,14 +87,14 @@ public: CameraItemPropertiesTab *cameraItemTab; }; -ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(QWidget *parent, const char *name, - QSplitter *splitter, Side side, +ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *tqparent, const char *name, + TQSplitter *splitter, Side side, bool mimimizedDefault) - : Sidebar(parent, name, side, mimimizedDefault) + : Sidebar(tqparent, name, side, mimimizedDefault) { d = new ImagePropertiesSideBarCamGuiPriv; - d->cameraItemTab = new CameraItemPropertiesTab(parent, true); - d->metadataTab = new ImagePropertiesMetaDataTab(parent, true); + d->cameraItemTab = new CameraItemPropertiesTab(tqparent, true); + d->metadataTab = new ImagePropertiesMetaDataTab(tqparent, true); setSplitter(splitter); @@ -106,8 +106,8 @@ ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(QWidget *parent, cons connectNavigateSignals(d->cameraItemTab); connectNavigateSignals(d->metadataTab); - connect(this, SIGNAL(signalChangedTab(QWidget*)), - this, SLOT(slotChangedTab(QWidget*))); + connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), + this, TQT_SLOT(slotChangedTab(TQWidget*))); } ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() @@ -117,21 +117,21 @@ ImagePropertiesSideBarCamGui::~ImagePropertiesSideBarCamGui() void ImagePropertiesSideBarCamGui::connectNavigateSignals(NavigateBarTab *tab) { - connect(tab, SIGNAL(signalFirstItem()), - this, SIGNAL(signalFirstItem())); + connect(tab, TQT_SIGNAL(signalFirstItem()), + this, TQT_SIGNAL(signalFirstItem())); - connect(tab, SIGNAL(signalPrevItem()), - this, SIGNAL(signalPrevItem())); + connect(tab, TQT_SIGNAL(signalPrevItem()), + this, TQT_SIGNAL(signalPrevItem())); - connect(tab, SIGNAL(signalNextItem()), - this, SIGNAL(signalNextItem())); + connect(tab, TQT_SIGNAL(signalNextItem()), + this, TQT_SIGNAL(signalNextItem())); - connect(tab, SIGNAL(signalLastItem()), - this, SIGNAL(signalLastItem())); + connect(tab, TQT_SIGNAL(signalLastItem()), + this, TQT_SIGNAL(signalLastItem())); } void ImagePropertiesSideBarCamGui::itemChanged(GPItemInfo* itemInfo, const KURL& url, - const QByteArray& exifData, + const TQByteArray& exifData, CameraIconView* view, CameraIconViewItem* item) { if (!itemInfo) @@ -158,7 +158,7 @@ void ImagePropertiesSideBarCamGui::slotNoCurrentItem(void) { d->itemInfo = 0; d->cameraItem = 0; - d->exifData = QByteArray(); + d->exifData = TQByteArray(); d->currentURL = KURL(); d->dirtyMetadataTab = false; d->dirtyCameraItemTab = false; @@ -167,7 +167,7 @@ void ImagePropertiesSideBarCamGui::slotNoCurrentItem(void) d->metadataTab->setCurrentURL(); } -void ImagePropertiesSideBarCamGui::slotChangedTab(QWidget* tab) +void ImagePropertiesSideBarCamGui::slotChangedTab(TQWidget* tab) { if (!d->itemInfo) return; @@ -184,7 +184,7 @@ void ImagePropertiesSideBarCamGui::slotChangedTab(QWidget* tab) } else if (tab == d->metadataTab && !d->dirtyMetadataTab) { - d->metadataTab->setCurrentData(d->exifData, QByteArray(), + d->metadataTab->setCurrentData(d->exifData, TQByteArray(), d->itemInfo->name); d->dirtyMetadataTab = true; diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h index f9042b9..0cda10e 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h +++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.h @@ -34,8 +34,8 @@ #include "sidebar.h" #include "digikam_export.h" -class QSplitter; -class QWidget; +class TQSplitter; +class TQWidget; namespace Digikam { @@ -49,15 +49,16 @@ class ImagePropertiesSideBarCamGuiPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarCamGui : public Sidebar { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesSideBarCamGui(QWidget* parent, const char *name, QSplitter *splitter, + ImagePropertiesSideBarCamGui(TQWidget* tqparent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false); ~ImagePropertiesSideBarCamGui(); - void itemChanged(GPItemInfo* itemInfo, const KURL& url, const QByteArray& exifData=QByteArray(), + void itemChanged(GPItemInfo* itemInfo, const KURL& url, const TQByteArray& exifData=TQByteArray(), CameraIconView* view=0, CameraIconViewItem* item=0); public slots: @@ -73,7 +74,7 @@ signals: private slots: - virtual void slotChangedTab(QWidget* tab); + virtual void slotChangedTab(TQWidget* tab); private: diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp index 94d627e..5cbf55a 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp @@ -23,11 +23,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qrect.h> -#include <qcolor.h> -#include <qsplitter.h> +#include <tqrect.h> +#include <tqcolor.h> +#include <tqsplitter.h> // KDE includes. @@ -69,7 +69,7 @@ public: bool dirtyDesceditTab; - QPtrList<ImageInfo> currentInfos; + TQPtrList<ImageInfo> currentInfos; ImageDescEditTab *desceditTab; @@ -79,32 +79,32 @@ public: bool hasImageInfoOwnership; }; -ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(QWidget *parent, const char *name, QSplitter *splitter, +ImagePropertiesSideBarDB::ImagePropertiesSideBarDB(TQWidget *tqparent, const char *name, TQSplitter *splitter, Side side, bool mimimizedDefault) - : ImagePropertiesSideBar(parent, name, splitter, side, mimimizedDefault, false) + : ImagePropertiesSideBar(tqparent, name, splitter, side, mimimizedDefault, false) { - // Navigate bar is disabled by passing false to parent class constructor, and tab constructors + // Navigate bar is disabled by passing false to tqparent class constructor, and tab constructors d = new ImagePropertiesSideBarDBPriv; - d->desceditTab = new ImageDescEditTab(parent, false); + d->desceditTab = new ImageDescEditTab(tqparent, false); appendTab(d->desceditTab, SmallIcon("imagecomment"), i18n("Captions/Tags")); // ---------------------------------------------------------- - connect(this, SIGNAL(signalChangedTab(QWidget*)), - this, SLOT(slotChangedTab(QWidget*))); + connect(this, TQT_SIGNAL(signalChangedTab(TQWidget*)), + this, TQT_SLOT(slotChangedTab(TQWidget*))); - connect(d->desceditTab, SIGNAL(signalProgressBarMode(int, const QString&)), - this, SIGNAL(signalProgressBarMode(int, const QString&))); + connect(d->desceditTab, TQT_SIGNAL(signalProgressBarMode(int, const TQString&)), + this, TQT_SIGNAL(signalProgressBarMode(int, const TQString&))); - connect(d->desceditTab, SIGNAL(signalProgressValue(int)), - this, SIGNAL(signalProgressValue(int))); + connect(d->desceditTab, TQT_SIGNAL(signalProgressValue(int)), + this, TQT_SIGNAL(signalProgressValue(int))); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, SIGNAL(signalFileMetadataChanged(const KURL &)), - this, SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), + this, TQT_SLOT(slotFileMetadataChanged(const KURL &))); } ImagePropertiesSideBarDB::~ImagePropertiesSideBarDB() @@ -113,43 +113,43 @@ ImagePropertiesSideBarDB::~ImagePropertiesSideBarDB() } void ImagePropertiesSideBarDB::itemChanged(ImageInfo *info, - const QRect &rect, DImg *img) + const TQRect &rect, DImg *img) { itemChanged(info->kurl(), info, rect, img); } -void ImagePropertiesSideBarDB::itemChanged(const KURL& url, const QRect &rect, DImg *img) +void ImagePropertiesSideBarDB::itemChanged(const KURL& url, const TQRect &rect, DImg *img) { itemChanged(url, 0, rect, img); } void ImagePropertiesSideBarDB::itemChanged(const KURL& url, ImageInfo *info, - const QRect &rect, DImg *img) + const TQRect &rect, DImg *img) { if ( !url.isValid() ) return; m_currentURL = url; - QPtrList<ImageInfo> list; + TQPtrList<ImageInfo> list; if (info) list.append(info); itemChanged(list, rect, img); } -void ImagePropertiesSideBarDB::itemChanged(QPtrList<ImageInfo> infos) +void ImagePropertiesSideBarDB::itemChanged(TQPtrList<ImageInfo> infos) { if (infos.isEmpty()) return; m_currentURL = infos.first()->kurl(); - itemChanged(infos, QRect(), 0); + itemChanged(infos, TQRect(), 0); } -void ImagePropertiesSideBarDB::itemChanged(QPtrList<ImageInfo> infos, - const QRect &rect, DImg *img) +void ImagePropertiesSideBarDB::itemChanged(TQPtrList<ImageInfo> infos, + const TQRect &rect, DImg *img) { m_currentRect = rect; m_image = img; @@ -157,7 +157,7 @@ void ImagePropertiesSideBarDB::itemChanged(QPtrList<ImageInfo> infos, // The list _may_ have autoDelete set to true. // Keep old ImageInfo objects from being deleted // until the tab has had the chance to save changes and clear lists. - QPtrList<ImageInfo> temporaryList; + TQPtrList<ImageInfo> temporaryList; if (d->hasImageInfoOwnership) { temporaryList = d->currentInfos; @@ -217,7 +217,7 @@ void ImagePropertiesSideBarDB::populateTags(void) d->desceditTab->populateTags(); } -void ImagePropertiesSideBarDB::slotChangedTab(QWidget* tab) +void ImagePropertiesSideBarDB::slotChangedTab(TQWidget* tab) { setCursor(KCursor::waitCursor()); diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.h b/digikam/libs/imageproperties/imagepropertiessidebardb.h index 7f2d7c2..48a5b90 100644 --- a/digikam/libs/imageproperties/imagepropertiessidebardb.h +++ b/digikam/libs/imageproperties/imagepropertiessidebardb.h @@ -26,9 +26,9 @@ #ifndef IMAGEPROPERTIESSIDEBARDB_H #define IMAGEPROPERTIESSIDEBARDB_H -// Qt includes. +// TQt includes. -#include <qptrlist.h> +#include <tqptrlist.h> // KDE includes. @@ -39,9 +39,9 @@ #include "imagepropertiessidebar.h" #include "digikam_export.h" -class QSplitter; -class QWidget; -class QRect; +class TQSplitter; +class TQWidget; +class TQRect; namespace Digikam { @@ -56,18 +56,19 @@ class ImagePropertiesSideBarDBPriv; class DIGIKAM_EXPORT ImagePropertiesSideBarDB : public ImagePropertiesSideBar { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesSideBarDB(QWidget* parent, const char *name, QSplitter *splitter, Side side=Left, + ImagePropertiesSideBarDB(TQWidget* tqparent, const char *name, TQSplitter *splitter, Side side=Left, bool mimimizedDefault=false); ~ImagePropertiesSideBarDB(); - virtual void itemChanged(const KURL& url, const QRect &rect = QRect(), DImg *img = 0); + virtual void itemChanged(const KURL& url, const TQRect &rect = TQRect(), DImg *img = 0); - virtual void itemChanged(ImageInfo *info, const QRect &rect = QRect(), DImg *img = 0); - virtual void itemChanged(QPtrList<ImageInfo> infos); + virtual void itemChanged(ImageInfo *info, const TQRect &rect = TQRect(), DImg *img = 0); + virtual void itemChanged(TQPtrList<ImageInfo> infos); void takeImageInfoOwnership(bool takeOwnership); @@ -80,7 +81,7 @@ signals: void signalPrevItem(void); void signalNextItem(void); void signalLastItem(void); - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); public slots: @@ -97,14 +98,14 @@ public slots: private slots: - void slotChangedTab(QWidget* tab); + void slotChangedTab(TQWidget* tab); void slotFileMetadataChanged(const KURL &url); private: void itemChanged(const KURL& url, ImageInfo *info, - const QRect &rect, DImg *img); - void itemChanged(QPtrList<ImageInfo> infos, const QRect &rect, DImg *img); + const TQRect &rect, DImg *img); + void itemChanged(TQPtrList<ImageInfo> infos, const TQRect &rect, DImg *img); private: diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index 3abf3d2..dc686d3 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qstyle.h> -#include <qfile.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qfileinfo.h> -#include <qwhatsthis.h> -#include <qframe.h> -#include <qscrollview.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqstyle.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqfileinfo.h> +#include <tqwhatsthis.h> +#include <tqframe.h> +#include <tqscrollview.h> // KDE includes. @@ -115,34 +115,34 @@ public: labelPhotoWhiteBalance = 0; } - QLabel *title; - QLabel *file; - QLabel *folder; - QLabel *modifiedDate; - QLabel *size; - QLabel *owner; - QLabel *permissions; - - QLabel *title2; - QLabel *mime; - QLabel *dimensions; - QLabel *compression; - QLabel *bitDepth; - QLabel *colorMode; - - QLabel *title3; - QLabel *make; - QLabel *model; - QLabel *photoDate; - QLabel *aperture; - QLabel *focalLength; - QLabel *exposureTime; - QLabel *sensitivity; - QLabel *exposureMode; - QLabel *flash; - QLabel *whiteBalance; - - QFrame *settingsArea; + TQLabel *title; + TQLabel *file; + TQLabel *folder; + TQLabel *modifiedDate; + TQLabel *size; + TQLabel *owner; + TQLabel *permissions; + + TQLabel *title2; + TQLabel *mime; + TQLabel *dimensions; + TQLabel *compression; + TQLabel *bitDepth; + TQLabel *colorMode; + + TQLabel *title3; + TQLabel *make; + TQLabel *model; + TQLabel *photoDate; + TQLabel *aperture; + TQLabel *focalLength; + TQLabel *exposureTime; + TQLabel *sensitivity; + TQLabel *exposureMode; + TQLabel *flash; + TQLabel *whiteBalance; + + TQFrame *settingsArea; KSqueezedTextLabel *labelFile; KSqueezedTextLabel *labelFolder; @@ -169,59 +169,59 @@ public: KSqueezedTextLabel *labelPhotoWhiteBalance; }; -ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) - : NavigateBarTab(parent) +ImagePropertiesTab::ImagePropertiesTab(TQWidget* tqparent, bool navBar) + : NavigateBarTab(tqparent) { d = new ImagePropertiesTabPriv; setupNavigateBar(navBar); - QScrollView *sv = new QScrollView(this); - sv->viewport()->setBackgroundMode(Qt::PaletteBackground); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setFrameStyle(QFrame::NoFrame); + TQScrollView *sv = new TQScrollView(this); + sv->viewport()->setBackgroundMode(TQt::PaletteBackground); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setFrameStyle(TQFrame::NoFrame); - d->settingsArea = new QFrame(sv->viewport()); - d->settingsArea->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - d->settingsArea->setLineWidth( style().pixelMetric(QStyle::PM_DefaultFrameWidth, this) ); + d->settingsArea = new TQFrame(sv->viewport()); + d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); + d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); sv->addChild(d->settingsArea); m_navigateBarLayout->addWidget(sv); // -------------------------------------------------- - QGridLayout *settingsLayout = new QGridLayout(d->settingsArea, 33, 1, KDialog::spacingHint(), 0); + TQGridLayout *settingsLayout = new TQGridLayout(d->settingsArea, 33, 1, KDialog::spacingHint(), 0); // -------------------------------------------------- - d->title = new QLabel(i18n("<big><b>File Properties</b></big>"), d->settingsArea); - d->file = new QLabel(i18n("<b>File</b>:"), d->settingsArea); - d->folder = new QLabel(i18n("<b>Folder</b>:"), d->settingsArea); - d->modifiedDate = new QLabel(i18n("<b>Modified</b>:"), d->settingsArea); - d->size = new QLabel(i18n("<b>Size</b>:"), d->settingsArea); - d->owner = new QLabel(i18n("<b>Owner</b>:"), d->settingsArea); - d->permissions = new QLabel(i18n("<b>Permissions</b>:"), d->settingsArea); - - KSeparator *line = new KSeparator (Horizontal, d->settingsArea); - d->title2 = new QLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea); - d->mime = new QLabel(i18n("<b>Type</b>:"), d->settingsArea); - d->dimensions = new QLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); - d->compression = new QLabel(i18n("<b>Compression</b>:"), d->settingsArea); - d->bitDepth = new QLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea); - d->colorMode = new QLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea); - - KSeparator *line2 = new KSeparator (Horizontal, d->settingsArea); - d->title3 = new QLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); - d->make = new QLabel(i18n("<b>Make</b>:"), d->settingsArea); - d->model = new QLabel(i18n("<b>Model</b>:"), d->settingsArea); - d->photoDate = new QLabel(i18n("<b>Created</b>:"), d->settingsArea); - d->aperture = new QLabel(i18n("<b>Aperture</b>:"), d->settingsArea); - d->focalLength = new QLabel(i18n("<b>Focal</b>:"), d->settingsArea); - d->exposureTime = new QLabel(i18n("<b>Exposure</b>:"), d->settingsArea); - d->sensitivity = new QLabel(i18n("<b>Sensitivity</b>:"), d->settingsArea); - d->exposureMode = new QLabel(i18n("<nobr><b>Mode/Program</b></nobr>:"), d->settingsArea); - d->flash = new QLabel(i18n("<b>Flash</b>:"), d->settingsArea); - d->whiteBalance = new QLabel(i18n("<nobr><b>White balance</b></nobr>:"), d->settingsArea); + d->title = new TQLabel(i18n("<big><b>File Properties</b></big>"), d->settingsArea); + d->file = new TQLabel(i18n("<b>File</b>:"), d->settingsArea); + d->folder = new TQLabel(i18n("<b>Folder</b>:"), d->settingsArea); + d->modifiedDate = new TQLabel(i18n("<b>Modified</b>:"), d->settingsArea); + d->size = new TQLabel(i18n("<b>Size</b>:"), d->settingsArea); + d->owner = new TQLabel(i18n("<b>Owner</b>:"), d->settingsArea); + d->permissions = new TQLabel(i18n("<b>Permissions</b>:"), d->settingsArea); + + KSeparator *line = new KSeparator(Qt::Horizontal, d->settingsArea); + d->title2 = new TQLabel(i18n("<big><b>Image Properties</b></big>"), d->settingsArea); + d->mime = new TQLabel(i18n("<b>Type</b>:"), d->settingsArea); + d->dimensions = new TQLabel(i18n("<b>Dimensions</b>:"), d->settingsArea); + d->compression = new TQLabel(i18n("<b>Compression</b>:"), d->settingsArea); + d->bitDepth = new TQLabel(i18n("<nobr><b>Bit depth</b></nobr>:"), d->settingsArea); + d->colorMode = new TQLabel(i18n("<nobr><b>Color mode</b></nobr>:"), d->settingsArea); + + KSeparator *line2 = new KSeparator(Qt::Horizontal, d->settingsArea); + d->title3 = new TQLabel(i18n("<big><b>Photograph Properties</b></big>"), d->settingsArea); + d->make = new TQLabel(i18n("<b>Make</b>:"), d->settingsArea); + d->model = new TQLabel(i18n("<b>Model</b>:"), d->settingsArea); + d->photoDate = new TQLabel(i18n("<b>Created</b>:"), d->settingsArea); + d->aperture = new TQLabel(i18n("<b>Aperture</b>:"), d->settingsArea); + d->focalLength = new TQLabel(i18n("<b>Focal</b>:"), d->settingsArea); + d->exposureTime = new TQLabel(i18n("<b>Exposure</b>:"), d->settingsArea); + d->sensitivity = new TQLabel(i18n("<b>Sensitivity</b>:"), d->settingsArea); + d->exposureMode = new TQLabel(i18n("<nobr><b>Mode/Program</b></nobr>:"), d->settingsArea); + d->flash = new TQLabel(i18n("<b>Flash</b>:"), d->settingsArea); + d->whiteBalance = new TQLabel(i18n("<nobr><b>White balance</b></nobr>:"), d->settingsArea); d->labelFile = new KSqueezedTextLabel(0, d->settingsArea); d->labelFolder = new KSqueezedTextLabel(0, d->settingsArea); @@ -248,7 +248,7 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea); int hgt = fontMetrics().height()-2; - d->title->setAlignment(Qt::AlignCenter); + d->title->tqsetAlignment(TQt::AlignCenter); d->file->setMaximumHeight(hgt); d->folder->setMaximumHeight(hgt); d->modifiedDate->setMaximumHeight(hgt); @@ -262,7 +262,7 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) d->labelFileOwner->setMaximumHeight(hgt); d->labelFilePermissions->setMaximumHeight(hgt); - d->title2->setAlignment(Qt::AlignCenter); + d->title2->tqsetAlignment(TQt::AlignCenter); d->mime->setMaximumHeight(hgt); d->dimensions->setMaximumHeight(hgt); d->compression->setMaximumHeight(hgt); @@ -274,7 +274,7 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) d->labelImageBitDepth->setMaximumHeight(hgt); d->labelImageColorMode->setMaximumHeight(hgt); - d->title3->setAlignment(Qt::AlignCenter); + d->title3->tqsetAlignment(TQt::AlignCenter); d->make->setMaximumHeight(hgt); d->model->setMaximumHeight(hgt); d->photoDate->setMaximumHeight(hgt); @@ -299,8 +299,8 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) // -------------------------------------------------- settingsLayout->addMultiCellWidget(d->title, 0, 0, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 1, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 1, 1, 0, 1); settingsLayout->addMultiCellWidget(d->file, 2, 2, 0, 0); settingsLayout->addMultiCellWidget(d->labelFile, 2, 2, 1, 1); settingsLayout->addMultiCellWidget(d->folder, 3, 3, 0, 0); @@ -314,15 +314,15 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) settingsLayout->addMultiCellWidget(d->permissions, 7, 7, 0, 0); settingsLayout->addMultiCellWidget(d->labelFilePermissions, 7, 7, 1, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 8, 8, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 8, 8, 0, 1); settingsLayout->addMultiCellWidget(line, 9, 9, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 10, 10, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 10, 10, 0, 1); settingsLayout->addMultiCellWidget(d->title2, 11, 11, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 12, 12, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 12, 12, 0, 1); settingsLayout->addMultiCellWidget(d->mime, 13, 13, 0, 0); settingsLayout->addMultiCellWidget(d->labelImageMime, 13, 13, 1, 1); settingsLayout->addMultiCellWidget(d->dimensions, 14, 14, 0, 0); @@ -334,15 +334,15 @@ ImagePropertiesTab::ImagePropertiesTab(QWidget* parent, bool navBar) settingsLayout->addMultiCellWidget(d->colorMode, 17, 17, 0, 0); settingsLayout->addMultiCellWidget(d->labelImageColorMode, 17, 17, 1, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 18, 18, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 18, 18, 0, 1); settingsLayout->addMultiCellWidget(line2, 19, 19, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 20, 20, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 20, 20, 0, 1); settingsLayout->addMultiCellWidget(d->title3, 21, 21, 0, 1); - settingsLayout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 22, 22, 0, 1); + settingsLayout->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding), 22, 22, 0, 1); settingsLayout->addMultiCellWidget(d->make, 23, 23, 0, 0); settingsLayout->addMultiCellWidget(d->labelPhotoMake, 23, 23, 1, 1); settingsLayout->addMultiCellWidget(d->model, 24, 24, 0, 0); @@ -379,29 +379,29 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) { setNavigateBarFileName(); - d->labelFile->setText(QString()); - d->labelFolder->setText(QString()); - d->labelFileModifiedDate->setText(QString()); - d->labelFileSize->setText(QString()); - d->labelFileOwner->setText(QString()); - d->labelFilePermissions->setText(QString()); - - d->labelImageMime->setText(QString()); - d->labelImageDimensions->setText(QString()); - d->labelImageCompression->setText(QString()); - d->labelImageBitDepth->setText(QString()); - d->labelImageColorMode->setText(QString()); - - d->labelPhotoMake->setText(QString()); - d->labelPhotoModel->setText(QString()); - d->labelPhotoDateTime->setText(QString()); - d->labelPhotoAperture->setText(QString()); - d->labelPhotoFocalLenght->setText(QString()); - d->labelPhotoExposureTime->setText(QString()); - d->labelPhotoSensitivity->setText(QString()); - d->labelPhotoExposureMode->setText(QString()); - d->labelPhotoFlash->setText(QString()); - d->labelPhotoWhiteBalance->setText(QString()); + d->labelFile->setText(TQString()); + d->labelFolder->setText(TQString()); + d->labelFileModifiedDate->setText(TQString()); + d->labelFileSize->setText(TQString()); + d->labelFileOwner->setText(TQString()); + d->labelFilePermissions->setText(TQString()); + + d->labelImageMime->setText(TQString()); + d->labelImageDimensions->setText(TQString()); + d->labelImageCompression->setText(TQString()); + d->labelImageBitDepth->setText(TQString()); + d->labelImageColorMode->setText(TQString()); + + d->labelPhotoMake->setText(TQString()); + d->labelPhotoModel->setText(TQString()); + d->labelPhotoDateTime->setText(TQString()); + d->labelPhotoAperture->setText(TQString()); + d->labelPhotoFocalLenght->setText(TQString()); + d->labelPhotoExposureTime->setText(TQString()); + d->labelPhotoSensitivity->setText(TQString()); + d->labelPhotoExposureMode->setText(TQString()); + d->labelPhotoFlash->setText(TQString()); + d->labelPhotoWhiteBalance->setText(TQString()); setEnabled(false); return; @@ -409,11 +409,11 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) setEnabled(true); - QString str; - QString unavailable(i18n("<i>unavailable</i>")); + TQString str; + TQString unavailable(i18n("<i>unavailable</i>")); KFileItem fi(KFileItem::Unknown, KFileItem::Unknown, url); - QFileInfo fileInfo(url.path()); + TQFileInfo fileInfo(url.path()); DMetadata metaData(url.path()); // -- File system information ------------------------------------------ @@ -421,29 +421,29 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) d->labelFile->setText(url.fileName()); d->labelFolder->setText(url.directory()); - QDateTime modifiedDate = fileInfo.lastModified(); + TQDateTime modifiedDate = fileInfo.lastModified(); str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); d->labelFileModifiedDate->setText(str); - str = QString("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + str = TQString("%1 (%2)").tqarg(KIO::convertSize(fi.size())) + .tqarg(KGlobal::locale()->formatNumber(fi.size(), 0)); d->labelFileSize->setText(str); - d->labelFileOwner->setText( QString("%1 - %2").arg(fi.user()).arg(fi.group()) ); + d->labelFileOwner->setText( TQString("%1 - %2").tqarg(fi.user()).tqarg(fi.group()) ); d->labelFilePermissions->setText( fi.permissionsString() ); // -- Image Properties -------------------------------------------------- - QSize dims; - QString compression, bitDepth, colorMode; + TQSize dims; + TQString compression, bitDepth, colorMode; #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) { d->labelImageMime->setText(i18n("RAW Image")); compression = i18n("None"); @@ -462,9 +462,9 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) { dims = meta.group("Jpeg EXIF Data").item("Dimensions").value().toSize(); - QString quality = meta.group("Jpeg EXIF Data").item("JPEG quality").value().toString(); + TQString quality = meta.group("Jpeg EXIF Data").item("JPEG quality").value().toString(); quality.isEmpty() ? compression = unavailable : - compression = i18n("JPEG quality %1").arg(quality); + compression = i18n("JPEG quality %1").tqarg(quality); bitDepth = meta.group("Jpeg EXIF Data").item("BitDepth").value().toString(); colorMode = meta.group("Jpeg EXIF Data").item("ColorMode").value().toString(); } @@ -495,13 +495,13 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) } } - QString mpixels; + TQString mpixels; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); d->labelImageDimensions->setText(str); d->labelImageCompression->setText(compression.isEmpty() ? unavailable : compression); - d->labelImageBitDepth->setText(bitDepth.isEmpty() ? unavailable : i18n("%1 bpp").arg(bitDepth)); + d->labelImageBitDepth->setText(bitDepth.isEmpty() ? unavailable : i18n("%1 bpp").tqarg(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)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); + str = i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(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").arg(photoInfo.sensitivity)); + d->labelPhotoSensitivity->setText(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(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 = QString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); + str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); d->labelPhotoExposureMode->setText(str); } diff --git a/digikam/libs/imageproperties/imagepropertiestab.h b/digikam/libs/imageproperties/imagepropertiestab.h index be54f93..1e8155d 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.h +++ b/digikam/libs/imageproperties/imagepropertiestab.h @@ -24,11 +24,11 @@ #ifndef IMAGEPROPERTIESTAB_H #define IMAGEPROPERTIESTAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqcolor.h> // KDE includes. @@ -47,10 +47,11 @@ class ImagePropertiesTabPriv; class DIGIKAM_EXPORT ImagePropertiesTab : public NavigateBarTab { Q_OBJECT + TQ_OBJECT public: - ImagePropertiesTab(QWidget* parent, bool navBar=true); + ImagePropertiesTab(TQWidget* tqparent, bool navBar=true); ~ImagePropertiesTab(); void setCurrentURL(const KURL& url=KURL()); diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp index dd3ae3f..a6fd787 100644 --- a/digikam/libs/imageproperties/navigatebartab.cpp +++ b/digikam/libs/imageproperties/navigatebartab.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2007-01-04 - * Description : A parent tab class with a navigation bar + * Description : A tqparent tab class with a navigation bar * * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qwidgetstack.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqwidgetstack.h> +#include <tqlabel.h> // Local includes. @@ -49,15 +49,15 @@ public: label = 0; } - QWidgetStack *stack; + TQWidgetStack *stack; - QLabel *label; + TQLabel *label; NavigateBarWidget *navigateBar; }; -NavigateBarTab::NavigateBarTab(QWidget* parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +NavigateBarTab::NavigateBarTab(TQWidget* tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new NavigateBarTabPriv; m_navigateBarLayout = 0; @@ -70,30 +70,30 @@ NavigateBarTab::~NavigateBarTab() void NavigateBarTab::setupNavigateBar(bool withBar) { - m_navigateBarLayout = new QVBoxLayout(this); + m_navigateBarLayout = new TQVBoxLayout(this); if (withBar) { - d->stack = new QWidgetStack(this); + d->stack = new TQWidgetStack(this); m_navigateBarLayout->addWidget(d->stack); d->navigateBar = new NavigateBarWidget(d->stack, withBar); d->stack->addWidget(d->navigateBar); - connect(d->navigateBar, SIGNAL(signalFirstItem()), - this, SIGNAL(signalFirstItem())); + connect(d->navigateBar, TQT_SIGNAL(signalFirstItem()), + this, TQT_SIGNAL(signalFirstItem())); - connect(d->navigateBar, SIGNAL(signalPrevItem()), - this, SIGNAL(signalPrevItem())); + connect(d->navigateBar, TQT_SIGNAL(signalPrevItem()), + this, TQT_SIGNAL(signalPrevItem())); - connect(d->navigateBar, SIGNAL(signalNextItem()), - this, SIGNAL(signalNextItem())); + connect(d->navigateBar, TQT_SIGNAL(signalNextItem()), + this, TQT_SIGNAL(signalNextItem())); - connect(d->navigateBar, SIGNAL(signalLastItem()), - this, SIGNAL(signalLastItem())); + connect(d->navigateBar, TQT_SIGNAL(signalLastItem()), + this, TQT_SIGNAL(signalLastItem())); - d->label = new QLabel(d->stack); - d->label->setAlignment(Qt::AlignCenter); + d->label = new TQLabel(d->stack); + d->label->tqsetAlignment(TQt::AlignCenter); d->stack->addWidget(d->label); } } @@ -124,7 +124,7 @@ void NavigateBarTab::setNavigateBarState(int itemType) d->navigateBar->setButtonsState(itemType); } -void NavigateBarTab::setNavigateBarFileName(const QString &name) +void NavigateBarTab::setNavigateBarFileName(const TQString &name) { if (!d->navigateBar) return; @@ -133,7 +133,7 @@ void NavigateBarTab::setNavigateBarFileName(const QString &name) d->navigateBar->setFileName(name); } -void NavigateBarTab::setLabelText(const QString &text) +void NavigateBarTab::setLabelText(const TQString &text) { if (!d->label) return; diff --git a/digikam/libs/imageproperties/navigatebartab.h b/digikam/libs/imageproperties/navigatebartab.h index 27a34c9..5f8b3d5 100644 --- a/digikam/libs/imageproperties/navigatebartab.h +++ b/digikam/libs/imageproperties/navigatebartab.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2007-01-04 - * Description : A parent tab class with a navigation bar + * Description : A tqparent tab class with a navigation bar * * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com> * Copyright (C) 2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> @@ -25,10 +25,10 @@ #ifndef NAVIGATEBARTAB_H #define NAVIGATEBARTAB_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -39,7 +39,7 @@ #include "digikam_export.h" #include "imagepropertiessidebar.h" -class QVBoxLayout; +class TQVBoxLayout; namespace Digikam { @@ -47,19 +47,20 @@ namespace Digikam class NavigateBarWidget; class NavigateBarTabPriv; -class DIGIKAM_EXPORT NavigateBarTab : public QWidget +class DIGIKAM_EXPORT NavigateBarTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - NavigateBarTab(QWidget* parent); + NavigateBarTab(TQWidget* tqparent); ~NavigateBarTab(); void setNavigateBarState(bool hasPrevious, bool hasNext); void setNavigateBarState(int itemType); - void setNavigateBarFileName(const QString &name = QString()); - void setLabelText(const QString &text); + void setNavigateBarFileName(const TQString &name = TQString()); + void setLabelText(const TQString &text); signals: @@ -74,7 +75,7 @@ protected: protected: - QVBoxLayout *m_navigateBarLayout; + TQVBoxLayout *m_navigateBarLayout; NavigateBarTabPriv *d; }; diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp index 79745bc..28c04b0 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.cpp +++ b/digikam/libs/imageproperties/navigatebarwidget.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> +#include <tqlayout.h> // KDE includes. @@ -55,12 +55,12 @@ public: StatusNavigateBar *navBar; }; -NavigateBarWidget::NavigateBarWidget(QWidget *parent, bool show) - : QWidget(parent, 0, Qt::WDestructiveClose) +NavigateBarWidget::NavigateBarWidget(TQWidget *tqparent, bool show) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new NavigateBarWidgetPriv; - QHBoxLayout *lay = new QHBoxLayout(this); + TQHBoxLayout *lay = new TQHBoxLayout(this); d->navBar = new StatusNavigateBar(this); d->filename = new KSqueezedTextLabel(this); @@ -70,17 +70,17 @@ NavigateBarWidget::NavigateBarWidget(QWidget *parent, bool show) if (!show) hide(); - connect(d->navBar, SIGNAL(signalFirstItem()), - this, SIGNAL(signalFirstItem())); + connect(d->navBar, TQT_SIGNAL(signalFirstItem()), + this, TQT_SIGNAL(signalFirstItem())); - connect(d->navBar, SIGNAL(signalPrevItem()), - this, SIGNAL(signalPrevItem())); + connect(d->navBar, TQT_SIGNAL(signalPrevItem()), + this, TQT_SIGNAL(signalPrevItem())); - connect(d->navBar, SIGNAL(signalNextItem()), - this, SIGNAL(signalNextItem())); + connect(d->navBar, TQT_SIGNAL(signalNextItem()), + this, TQT_SIGNAL(signalNextItem())); - connect(d->navBar, SIGNAL(signalLastItem()), - this, SIGNAL(signalLastItem())); + connect(d->navBar, TQT_SIGNAL(signalLastItem()), + this, TQT_SIGNAL(signalLastItem())); } NavigateBarWidget::~NavigateBarWidget() @@ -88,12 +88,12 @@ NavigateBarWidget::~NavigateBarWidget() delete d; } -void NavigateBarWidget::setFileName(QString filename) +void NavigateBarWidget::setFileName(TQString filename) { d->filename->setText(filename); } -QString NavigateBarWidget::getFileName() +TQString NavigateBarWidget::getFileName() { return (d->filename->text()); } diff --git a/digikam/libs/imageproperties/navigatebarwidget.h b/digikam/libs/imageproperties/navigatebarwidget.h index ba3f87c..2e96b36 100644 --- a/digikam/libs/imageproperties/navigatebarwidget.h +++ b/digikam/libs/imageproperties/navigatebarwidget.h @@ -24,10 +24,10 @@ #ifndef NAVIGATEBARWIDGET_H #define NAVIGATEBARWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // Local includes. @@ -38,17 +38,18 @@ namespace Digikam class NavigateBarWidgetPriv; -class DIGIKAM_EXPORT NavigateBarWidget : public QWidget +class DIGIKAM_EXPORT NavigateBarWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - NavigateBarWidget(QWidget *parent=0, bool show=true); + NavigateBarWidget(TQWidget *tqparent=0, bool show=true); ~NavigateBarWidget(); - void setFileName(QString filename=QString()); - QString getFileName(); + void setFileName(TQString filename=TQString()); + TQString getFileName(); void setButtonsState(int itemType); int getButtonsState(); diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index 4c85aad..a7e9d30 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qheader.h> +#include <tqheader.h> // KDE includes. @@ -67,8 +67,8 @@ extern "C" namespace Digikam { -TAlbumCheckListItem::TAlbumCheckListItem(QListView* parent, TAlbum* album) - : FolderCheckListItem(parent, album->title(), QCheckListItem::RadioButtonController) +TAlbumCheckListItem::TAlbumCheckListItem(TQListView* tqparent, TAlbum* album) + : FolderCheckListItem(tqparent, album->title(), TQCheckListItem::RadioButtonController) { setDragEnabled(true); m_album = album; @@ -78,8 +78,8 @@ TAlbumCheckListItem::TAlbumCheckListItem(QListView* parent, TAlbum* album) m_album->setExtraData(listView(), this); } -TAlbumCheckListItem::TAlbumCheckListItem(QCheckListItem* parent, TAlbum* album) - : FolderCheckListItem(parent, album->title(), QCheckListItem::CheckBox) +TAlbumCheckListItem::TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album) + : FolderCheckListItem(tqparent, album->title(), TQCheckListItem::CheckBox) { setDragEnabled(true); m_album = album; @@ -94,10 +94,10 @@ void TAlbumCheckListItem::refresh() if (!m_album) return; if (AlbumSettings::instance()->getShowFolderTreeViewItemsCount() && - dynamic_cast<TAlbumCheckListItem*>(parent())) + dynamic_cast<TAlbumCheckListItem*>(tqparent())) { if (isOpen()) - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(m_count)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(m_count)); else { int countRecursive = m_count; @@ -109,7 +109,7 @@ void TAlbumCheckListItem::refresh() countRecursive += item->count(); ++it; } - setText(0, QString("%1 (%2)").arg(m_album->title()).arg(countRecursive)); + setText(0, TQString("%1 (%2)").tqarg(m_album->title()).tqarg(countRecursive)); } } else @@ -120,13 +120,13 @@ void TAlbumCheckListItem::refresh() void TAlbumCheckListItem::stateChange(bool val) { - QCheckListItem::stateChange(val); + TQCheckListItem::stateChange(val); ((TAlbumListView*)listView())->stateChanged(this); } void TAlbumCheckListItem::setOpen(bool o) { - QListViewItem::setOpen(o); + TQListViewItem::setOpen(o); refresh(); } @@ -151,35 +151,35 @@ int TAlbumCheckListItem::count() return m_count; } -void TAlbumCheckListItem::setStatus(MetadataHub::TagStatus status) +void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status) { if (status == MetadataHub::MetadataDisjoint) { - if (type() != QCheckListItem::RadioButtonController) setTristate(true); - setState(QCheckListItem::NoChange); + if (type() != TQCheckListItem::RadioButtonController) setTristate(true); + setState(TQCheckListItem::NoChange); } else { - if (type() != QCheckListItem::RadioButtonController) setTristate(false); + if (type() != TQCheckListItem::RadioButtonController) setTristate(false); setOn(status.hasTag); } } // ------------------------------------------------------------------------ -TAlbumListView::TAlbumListView(QWidget* parent) - : FolderView(parent, "TAlbumListView") +TAlbumListView::TAlbumListView(TQWidget* tqparent) + : FolderView(tqparent, "TAlbumListView") { addColumn(i18n("Tags")); header()->hide(); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setRootIsDecorated(true); setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(AlbumManager::instance(), SIGNAL(signalTAlbumsDirty(const QMap<int, int>&)), - this, SLOT(slotRefresh(const QMap<int, int>&))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalTAlbumsDirty(const TQMap<int, int>&)), + this, TQT_SLOT(slotRefresh(const TQMap<int, int>&))); } TAlbumListView::~TAlbumListView() @@ -192,13 +192,13 @@ void TAlbumListView::stateChanged(TAlbumCheckListItem *item) emit signalItemStateChanged(item); } -QDragObject* TAlbumListView::dragObject() +TQDragObject* TAlbumListView::dragObject() { TAlbumCheckListItem *item = dynamic_cast<TAlbumCheckListItem*>(dragItem()); if(!item) return 0; - if(!item->parent()) + if(!item->tqparent()) return 0; TagDrag *t = new TagDrag(item->id(), this); @@ -207,9 +207,9 @@ QDragObject* TAlbumListView::dragObject() return t; } -bool TAlbumListView::acceptDrop(const QDropEvent *e) const +bool TAlbumListView::acceptDrop(const TQDropEvent *e) const { - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TAlbumCheckListItem *itemDrop = dynamic_cast<TAlbumCheckListItem*>(itemAt(vp)); TAlbumCheckListItem *itemDrag = dynamic_cast<TAlbumCheckListItem*>(dragItem()); @@ -223,14 +223,14 @@ bool TAlbumListView::acceptDrop(const QDropEvent *e) const if(itemDrag == itemDrop) return false; - // Dragging a parent on its child makes no sense + // Dragging a tqparent on its child makes no sense if(itemDrag && itemDrag->album()->isAncestorOf(itemDrop->album())) return false; return true; } - if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->parent()) + if (ItemDrag::canDecode(e) && itemDrop && itemDrop->album()->tqparent()) { // Only other possibility is image items being dropped // And allow this only if there is a Tag to be dropped @@ -241,20 +241,20 @@ bool TAlbumListView::acceptDrop(const QDropEvent *e) const return false; } -void TAlbumListView::contentsDropEvent(QDropEvent *e) +void TAlbumListView::contentsDropEvent(TQDropEvent *e) { - QListView::contentsDropEvent(e); + TQListView::contentsDropEvent(e); if(!acceptDrop(e)) return; - QPoint vp = contentsToViewport(e->pos()); + TQPoint vp = contentsToViewport(e->pos()); TAlbumCheckListItem *itemDrop = dynamic_cast<TAlbumCheckListItem*>(itemAt(vp)); if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; @@ -273,7 +273,7 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) popMenu.insertSeparator(-1); popMenu.insertItem(SmallIcon("cancel"), i18n("C&ancel"), 20); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); if(id == 10) { @@ -290,7 +290,7 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) newParentTag = itemDrop->album(); } - QString errMsg; + TQString errMsg; if (!AlbumManager::instance()->moveTAlbum(talbum, newParentTag, errMsg)) { KMessageBox::error(this, errMsg); @@ -310,8 +310,8 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; if (!ItemDrag::decode(e, urls, kioURLs, albumIDs, imageIDs)) return; @@ -354,13 +354,13 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if(id == 12) { - QString errMsg; - AlbumManager::instance()->updateTAlbumIcon(destAlbum, QString(), + TQString errMsg; + AlbumManager::instance()->updateTAlbumIcon(destAlbum, TQString(), imageIDs.first(), errMsg); } return; @@ -379,12 +379,12 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) KPopupMenu popMenu(this); popMenu.insertTitle(SmallIcon("digikam"), i18n("Tags")); popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items") - .arg(destAlbum->prettyURL()), 10) ; + .tqarg(destAlbum->prettyURL()), 10) ; popMenu.insertSeparator(-1); popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - id = popMenu.exec(QCursor::pos()); + id = popMenu.exec(TQCursor::pos()); } if (id == 10) @@ -395,7 +395,7 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) AlbumLister::instance()->blockSignals(true); AlbumManager::instance()->albumDB()->beginTransaction(); int i=0; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { // create temporary ImageInfo object @@ -415,14 +415,14 @@ void TAlbumListView::contentsDropEvent(QDropEvent *e) ImageAttributesWatch::instance()->imagesChanged(destAlbum->id()); - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); } } } void TAlbumListView::refresh() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -433,9 +433,9 @@ void TAlbumListView::refresh() } } -void TAlbumListView::slotRefresh(const QMap<int, int>& tagsStatMap) +void TAlbumListView::slotRefresh(const TQMap<int, int>& tagsStatMap) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current()) { @@ -445,7 +445,7 @@ void TAlbumListView::slotRefresh(const QMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - QMap<int, int>::const_iterator it2 = tagsStatMap.find(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } @@ -463,7 +463,7 @@ void TAlbumListView::loadViewState() int selectedItem = config->readNumEntry("LastSelectedItem", 0); - QValueList<int> openFolders; + TQValueList<int> openFolders; if(config->hasKey("OpenFolders")) { openFolders = config->readIntListEntry("OpenFolders"); @@ -471,7 +471,7 @@ void TAlbumListView::loadViewState() TAlbumCheckListItem *item = 0; TAlbumCheckListItem *foundItem = 0; - QListViewItemIterator it(this->lastItem()); + TQListViewItemIterator it(this->lastItem()); for( ; it.current(); --it) { @@ -480,7 +480,7 @@ void TAlbumListView::loadViewState() continue; // Start the album root always open - if(openFolders.contains(item->id()) || item->id() == 0) + if(openFolders.tqcontains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); @@ -495,7 +495,7 @@ void TAlbumListView::loadViewState() // Important note: this cannot be done inside the previous loop // because opening folders prevents the visibility. // Fixes bug #144815. - // (Looks a bit like a bug in Qt to me ...) + // (Looks a bit like a bug in TQt to me ...) if (foundItem) { setSelected(foundItem, true); @@ -514,8 +514,8 @@ void TAlbumListView::saveViewState() else config->writeEntry("LastSelectedItem", 0); - QValueList<int> openFolders; - QListViewItemIterator it(this); + TQValueList<int> openFolders; + TQListViewItemIterator it(this); for( ; it.current(); ++it) { item = dynamic_cast<TAlbumCheckListItem*>(it.current()); diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h index c5eac53..4b379fe 100644 --- a/digikam/libs/imageproperties/talbumlistview.h +++ b/digikam/libs/imageproperties/talbumlistview.h @@ -32,8 +32,8 @@ #include "folderitem.h" #include "folderview.h" -class QDropEvent; -class QMouseEvent; +class TQDropEvent; +class TQMouseEvent; namespace Digikam { @@ -43,11 +43,11 @@ class DIGIKAM_EXPORT TAlbumCheckListItem : public FolderCheckListItem { public: - TAlbumCheckListItem(QListView* parent, TAlbum* album); + TAlbumCheckListItem(TQListView* tqparent, TAlbum* album); - TAlbumCheckListItem(QCheckListItem* parent, TAlbum* album); + TAlbumCheckListItem(TQCheckListItem* tqparent, TAlbum* album); - void setStatus(MetadataHub::TagStatus status); + void settqStatus(MetadataHub::TagtqStatus status); void refresh(); void setOpen(bool o); TAlbum* album() const; @@ -71,10 +71,11 @@ private : class DIGIKAM_EXPORT TAlbumListView : public FolderView { Q_OBJECT + TQ_OBJECT public: - TAlbumListView(QWidget* parent); + TAlbumListView(TQWidget* tqparent); ~TAlbumListView(); void stateChanged(TAlbumCheckListItem *item); @@ -83,20 +84,20 @@ public: signals: - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); void signalProgressValue(int); void signalItemStateChanged(TAlbumCheckListItem *item); protected: - bool acceptDrop(const QDropEvent *e) const; - void contentsDropEvent(QDropEvent *e); + bool acceptDrop(const TQDropEvent *e) const; + void contentsDropEvent(TQDropEvent *e); - QDragObject* dragObject(); + TQDragObject* dragObject(); private slots: - void slotRefresh(const QMap<int, int>&); + void slotRefresh(const TQMap<int, int>&); private: diff --git a/digikam/libs/jpegutils/jpegint.h b/digikam/libs/jpegutils/jpegint.h index 27546f3..1fa82f8 100644 --- a/digikam/libs/jpegutils/jpegint.h +++ b/digikam/libs/jpegutils/jpegint.h @@ -42,9 +42,9 @@ typedef enum { /* Operating modes for buffer controllers */ /* Master control module */ struct jpeg_comp_master { - JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); - JMETHOD(void, pass_startup, (j_compress_ptr cinfo)); - JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, pass_startup, (j_compress_ptr cinfo)); + JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); /* State variables made visible to other modules */ boolean call_pass_startup; /* True if pass_startup must be called */ @@ -53,16 +53,16 @@ struct jpeg_comp_master { /* Main buffer control (downsampled-data buffer) */ struct jpeg_c_main_controller { - JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); - JMETHOD(void, process_data, (j_compress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); + JTQT_METHOD(void, process_data, (j_compress_ptr cinfo, JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail)); }; /* Compression preprocessing (downsampling input buffer control) */ struct jpeg_c_prep_controller { - JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); - JMETHOD(void, pre_process_data, (j_compress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); + JTQT_METHOD(void, pre_process_data, (j_compress_ptr cinfo, JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail, @@ -73,23 +73,23 @@ struct jpeg_c_prep_controller { /* Coefficient buffer control */ struct jpeg_c_coef_controller { - JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); - JMETHOD(boolean, compress_data, (j_compress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); + JTQT_METHOD(boolean, compress_data, (j_compress_ptr cinfo, JSAMPIMAGE input_buf)); }; /* Colorspace conversion */ struct jpeg_color_converter { - JMETHOD(void, start_pass, (j_compress_ptr cinfo)); - JMETHOD(void, color_convert, (j_compress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, color_convert, (j_compress_ptr cinfo, JSAMPARRAY input_buf, JSAMPIMAGE output_buf, JDIMENSION output_row, int num_rows)); }; /* Downsampling */ struct jpeg_downsampler { - JMETHOD(void, start_pass, (j_compress_ptr cinfo)); - JMETHOD(void, downsample, (j_compress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, downsample, (j_compress_ptr cinfo, JSAMPIMAGE input_buf, JDIMENSION in_row_index, JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)); @@ -99,9 +99,9 @@ struct jpeg_downsampler { /* Forward DCT (also controls coefficient quantization) */ struct jpeg_forward_dct { - JMETHOD(void, start_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo)); /* perhaps this should be an array??? */ - JMETHOD(void, forward_DCT, (j_compress_ptr cinfo, + JTQT_METHOD(void, forward_DCT, (j_compress_ptr cinfo, jpeg_component_info * compptr, JSAMPARRAY sample_data, JBLOCKROW coef_blocks, JDIMENSION start_row, JDIMENSION start_col, @@ -110,23 +110,23 @@ struct jpeg_forward_dct { /* Entropy encoding */ struct jpeg_entropy_encoder { - JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); - JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); - JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); + JTQT_METHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); + JTQT_METHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); + JTQT_METHOD(void, finish_pass, (j_compress_ptr cinfo)); }; /* Marker writing */ struct jpeg_marker_writer { - JMETHOD(void, write_file_header, (j_compress_ptr cinfo)); - JMETHOD(void, write_frame_header, (j_compress_ptr cinfo)); - JMETHOD(void, write_scan_header, (j_compress_ptr cinfo)); - JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo)); - JMETHOD(void, write_tables_only, (j_compress_ptr cinfo)); + JTQT_METHOD(void, write_file_header, (j_compress_ptr cinfo)); + JTQT_METHOD(void, write_frame_header, (j_compress_ptr cinfo)); + JTQT_METHOD(void, write_scan_header, (j_compress_ptr cinfo)); + JTQT_METHOD(void, write_file_trailer, (j_compress_ptr cinfo)); + JTQT_METHOD(void, write_tables_only, (j_compress_ptr cinfo)); /* These routines are exported to allow insertion of extra markers */ /* Probably only COM and APPn markers should be written this way */ - JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, + JTQT_METHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, unsigned int datalen)); - JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); + JTQT_METHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); }; @@ -134,8 +134,8 @@ struct jpeg_marker_writer { /* Master control module */ struct jpeg_decomp_master { - JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); /* State variables made visible to other modules */ boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */ @@ -143,10 +143,10 @@ struct jpeg_decomp_master { /* Input control module */ struct jpeg_input_controller { - JMETHOD(int, consume_input, (j_decompress_ptr cinfo)); - JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); - JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(int, consume_input, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); /* State variables made visible to other modules */ boolean has_multiple_scans; /* True if file has multiple scans */ @@ -155,18 +155,18 @@ struct jpeg_input_controller { /* Main buffer control (downsampled-data buffer) */ struct jpeg_d_main_controller { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); - JMETHOD(void, process_data, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); + JTQT_METHOD(void, process_data, (j_decompress_ptr cinfo, JSAMPARRAY output_buf, JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)); }; /* Coefficient buffer control */ struct jpeg_d_coef_controller { - JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); - JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); - JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); - JMETHOD(int, decompress_data, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_input_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(int, consume_data, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, start_output_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(int, decompress_data, (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)); /* Pointer to array of coefficient virtual arrays, or NULL if none */ jvirt_barray_ptr *coef_arrays; @@ -174,8 +174,8 @@ struct jpeg_d_coef_controller { /* Decompression postprocessing (color quantization buffer control) */ struct jpeg_d_post_controller { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); - JMETHOD(void, post_process_data, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); + JTQT_METHOD(void, post_process_data, (j_decompress_ptr cinfo, JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr, JDIMENSION in_row_groups_avail, @@ -186,12 +186,12 @@ struct jpeg_d_post_controller { /* Marker reading & parsing */ struct jpeg_marker_reader { - JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); /* Read markers until SOS or EOI. * Returns same codes as are defined for jpeg_consume_input: * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI. */ - JMETHOD(int, read_markers, (j_decompress_ptr cinfo)); + JTQT_METHOD(int, read_markers, (j_decompress_ptr cinfo)); /* Read a restart marker --- exported for use by entropy decoder only */ jpeg_marker_parser_method read_restart_marker; @@ -206,8 +206,8 @@ struct jpeg_marker_reader { /* Entropy decoding */ struct jpeg_entropy_decoder { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); - JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)); /* This is here to share code between baseline and progressive decoders; */ @@ -216,21 +216,21 @@ struct jpeg_entropy_decoder { }; /* Inverse DCT (also performs dequantization) */ -typedef JMETHOD(void, inverse_DCT_method_ptr, +typedef JTQT_METHOD(void, inverse_DCT_method_ptr, (j_decompress_ptr cinfo, jpeg_component_info * compptr, JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col)); struct jpeg_inverse_dct { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); /* It is useful to allow each component to have a separate IDCT method. */ inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS]; }; /* Upsampling (note that upsampler must also call color converter) */ struct jpeg_upsampler { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, upsample, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, upsample, (j_decompress_ptr cinfo, JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr, JDIMENSION in_row_groups_avail, @@ -243,20 +243,20 @@ struct jpeg_upsampler { /* Colorspace conversion */ struct jpeg_color_deconverter { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, color_convert, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, color_convert, (j_decompress_ptr cinfo, JSAMPIMAGE input_buf, JDIMENSION input_row, JSAMPARRAY output_buf, int num_rows)); }; /* Color quantization or color precision reduction */ struct jpeg_color_quantizer { - JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); - JMETHOD(void, color_quantize, (j_decompress_ptr cinfo, + JTQT_METHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); + JTQT_METHOD(void, color_quantize, (j_decompress_ptr cinfo, JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)); - JMETHOD(void, finish_pass, (j_decompress_ptr cinfo)); - JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, finish_pass, (j_decompress_ptr cinfo)); + JTQT_METHOD(void, new_color_map, (j_decompress_ptr cinfo)); }; diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp index 458d680..5d2f78d 100644 --- a/digikam/libs/jpegutils/jpegutils.cpp +++ b/digikam/libs/jpegutils/jpegutils.cpp @@ -41,11 +41,11 @@ extern "C" #include <jpeglib.h> } -// Qt includes. +// TQt includes. -#include <qcstring.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqfileinfo.h> // Local includes. @@ -105,12 +105,12 @@ static void jpegutils_jpeg_output_message(j_common_ptr cinfo) #endif } -bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) +bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize) { - QString format = QImageIO::imageFormat(path); + TQString format = TQImageIO::imageFormat(path); if (format !="JPEG") return false; - FILE* inputFile=fopen(QFile::encodeName(path), "rb"); + FILE* inputFile=fopen(TQFile::encodeName(path), "rb"); if(!inputFile) return false; @@ -134,11 +134,11 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) jpeg_stdio_src(&cinfo, inputFile); jpeg_read_header(&cinfo, true); - int imgSize = QMAX(cinfo.image_width, cinfo.image_height); + int imgSize = TQMAX(cinfo.image_width, cinfo.image_height); // libjpeg supports 1/1, 1/2, 1/4, 1/8 int scale=1; - while(maximumSize*scale*2<=imgSize) + while(tqmaximumSize*scale*2<=imgSize) { scale*=2; } @@ -164,7 +164,7 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) jpeg_start_decompress(&cinfo); - QImage img; + TQImage img; // We only take RGB with 1 or 3 components, or CMYK with 4 components if (!( @@ -186,7 +186,7 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) case 1: // B&W image img.create( cinfo.output_width, cinfo.output_height, 8, 256 ); for (int i = 0 ; i < 256 ; i++) - img.setColor(i, qRgb(i, i, i)); + img.setColor(i, tqRgb(i, i, i)); break; } @@ -202,12 +202,12 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) for (uint j=0; j<cinfo.output_height; j++) { uchar *in = img.scanLine(j) + cinfo.output_width*3; - QRgb *out = (QRgb*)( img.scanLine(j) ); + TQRgb *out = (TQRgb*)( img.scanLine(j) ); for (uint i=cinfo.output_width; i--; ) { in -= 3; - out[i] = qRgb(in[0], in[1], in[2]); + out[i] = tqRgb(in[0], in[1], in[2]); } } } @@ -217,20 +217,20 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) for (uint j=0; j<cinfo.output_height; j++) { uchar *in = img.scanLine(j) + cinfo.output_width*4; - QRgb *out = (QRgb*)( img.scanLine(j) ); + TQRgb *out = (TQRgb*)( img.scanLine(j) ); for (uint i=cinfo.output_width; i--; ) { in -= 4; int k = in[3]; - out[i] = qRgb(k * in[0] / 255, k * in[1] / 255, k * in[2] / 255); + out[i] = tqRgb(k * in[0] / 255, k * in[1] / 255, k * in[2] / 255); } } } - int newMax = QMAX(cinfo.output_width, cinfo.output_height); - int newx = maximumSize*cinfo.output_width / newMax; - int newy = maximumSize*cinfo.output_height / newMax; + int newMax = TQMAX(cinfo.output_width, cinfo.output_height); + int newx = tqmaximumSize*cinfo.output_width / newMax; + int newy = tqmaximumSize*cinfo.output_height / newMax; jpeg_destroy_decompress(&cinfo); fclose(inputFile); @@ -240,9 +240,9 @@ bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize) return true; } -bool exifRotate(const QString& file, const QString& documentName) +bool exifRotate(const TQString& file, const TQString& documentName) { - QFileInfo fi(file); + TQFileInfo fi(file); if (!fi.exists()) { DDebug() << "ExifRotate: file do not exist: " << file << endl; @@ -258,12 +258,12 @@ bool exifRotate(const QString& file, const QString& documentName) return true; } - QString temp(fi.dirPath(true) + "/.digikam-exifrotate-"); - temp.append(QString::number(getpid())); - temp.append(QString(".jpg")); + TQString temp(fi.dirPath(true) + "/.digikam-exifrotate-"); + temp.append(TQString::number(getpid())); + temp.append(TQString(".jpg")); - QCString in = QFile::encodeName(file); - QCString out = QFile::encodeName(temp); + TQCString in = TQFile::encodeName(file); + TQCString out = TQFile::encodeName(temp); JCOPY_OPTION copyoption = JCOPYOPT_ALL; jpeg_transform_info transformoption; @@ -410,19 +410,19 @@ bool exifRotate(const QString& file, const QString& documentName) // -- Metadata operations ------------------------------------------------------ // Reset the Exif orientation tag of the temp image to normal - DDebug() << "ExifRotate: set Orientation tag to normal: " << file << endl; + DDebug() << "ExifRotate: set Qt::Orientation tag to normal: " << file << endl; metaData.load(temp); metaData.setImageOrientation(DMetadata::ORIENTATION_NORMAL); - QImage img(temp); + TQImage img(temp); - // Get the new image dimension of the temp image. Using a dummy QImage objet here + // Get the new image dimension of the temp image. Using a dummy TQImage objet here // has a sense because the Exif dimension information can be missing from original image. - // Get new dimensions with QImage will always work... + // Get new dimensions with TQImage will always work... metaData.setImageDimensions(img.size()); // Update the image thumbnail. - QImage thumb = img.scale(160, 120, QImage::ScaleMin); + TQImage thumb = img.scale(160, 120, TQ_ScaleMin); metaData.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). @@ -461,9 +461,9 @@ bool exifRotate(const QString& file, const QString& documentName) return false; } -bool jpegConvert(const QString& src, const QString& dest, const QString& documentName, const QString& format) +bool jpegConvert(const TQString& src, const TQString& dest, const TQString& documentName, const TQString& format) { - QFileInfo fi(src); + TQFileInfo fi(src); if (!fi.exists()) { DDebug() << "JpegConvert: file do not exist: " << src << endl; @@ -480,7 +480,7 @@ bool jpegConvert(const QString& src, const QString& dest, const QString& documen meta.setIptc(image.getIptc()); // Update Iptc preview. - QImage preview = image.smoothScale(1280, 1024, QSize::ScaleMin).copyQImage(); + TQImage preview = image.smoothScale(1280, 1024, TQSize::ScaleMin).copyTQImage(); // TODO: see B.K.O #130525. a JPEG segment is limited to 64K. If the IPTC byte array is // bigger than 64K duing of image preview tag size, the target JPEG image will be @@ -489,12 +489,12 @@ bool jpegConvert(const QString& src, const QString& dest, const QString& documen // will be found into Exiv2. // Note : There is no limitation with TIFF and PNG about IPTC byte array size. - if (format.upper() != QString("JPG") && format.upper() != QString("JPEG") && - format.upper() != QString("JPE")) + if (format.upper() != TQString("JPG") && format.upper() != TQString("JPEG") && + format.upper() != TQString("JPE")) meta.setImagePreview(preview); // Update Exif thumbnail. - QImage thumb = preview.smoothScale(160, 120, QImage::ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Document Name tag (the orinal file name from camera for example). @@ -506,10 +506,10 @@ bool jpegConvert(const QString& src, const QString& dest, const QString& documen // And now save the image to a new file format. - if ( format.upper() == QString("PNG") ) + if ( format.upper() == TQString("PNG") ) image.setAttribute("quality", 9); - if ( format.upper() == QString("TIFF") || format.upper() == QString("TIF") ) + if ( format.upper() == TQString("TIFF") || format.upper() == TQString("TIF") ) image.setAttribute("compress", true); return (image.save(dest, format)); @@ -518,10 +518,10 @@ bool jpegConvert(const QString& src, const QString& dest, const QString& documen return false; } -bool isJpegImage(const QString& file) +bool isJpegImage(const TQString& file) { // Check if the file is an JPEG image - QString format = QString(QImage::imageFormat(file)).upper(); + TQString format = TQString(TQImage::imageFormat(file)).upper(); DDebug() << "mimetype = " << format << endl; if (format !="JPEG") return false; diff --git a/digikam/libs/jpegutils/jpegutils.h b/digikam/libs/jpegutils/jpegutils.h index 0d3fec0..db6b50b 100644 --- a/digikam/libs/jpegutils/jpegutils.h +++ b/digikam/libs/jpegutils/jpegutils.h @@ -25,19 +25,19 @@ #ifndef JPEGUTILS_H #define JPEGUTILS_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qimage.h> +#include <tqstring.h> +#include <tqimage.h> namespace Digikam { -bool loadJPEGScaled(QImage& image, const QString& path, int maximumSize); -bool exifRotate(const QString& file, const QString& documentName); -bool jpegConvert(const QString& src, const QString& dest, const QString& documentName, - const QString& format=QString("PNG")); -bool isJpegImage(const QString& file); +bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize); +bool exifRotate(const TQString& file, const TQString& documentName); +bool jpegConvert(const TQString& src, const TQString& dest, const TQString& documentName, + const TQString& format=TQString("PNG")); +bool isJpegImage(const TQString& file); } diff --git a/digikam/libs/jpegutils/transupp.cpp b/digikam/libs/jpegutils/transupp.cpp index 053c6ac..1b58642 100644 --- a/digikam/libs/jpegutils/transupp.cpp +++ b/digikam/libs/jpegutils/transupp.cpp @@ -40,7 +40,7 @@ namespace Digikam * or recompression of the image. * Thanks to Guido Vollbeding for the initial design and code of this feature. * - * Horizontal flipping is done in-place, using a single top-to-bottom + *Qt::Horizontal flipping is done in-place, using a single top-to-bottom * pass through the virtual source array. It will thus be much the * fastest option for images larger than main memory. * @@ -75,7 +75,7 @@ namespace Digikam LOCAL(void) do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays) -/* Horizontal flip; done in-place, so no separate dest array is required */ +/*Qt::Horizontal flip; done in-place, so no separate dest array is required */ { JDIMENSION MCU_cols, comp_width, blk_x, blk_y; int ci, k, offset_y; @@ -84,7 +84,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOEF temp1, temp2; jpeg_component_info *compptr; - /* Horizontal mirroring of DCT blocks is accomplished by swapping + /*Qt::Horizontal mirroring of DCT blocks is accomplished by swapping * pairs of blocks in-place. Within a DCT block, we perform horizontal * mirroring by changing the signs of odd-numbered columns. * Partial iMCUs at the right edge are left untouched. @@ -125,7 +125,7 @@ LOCAL(void) do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) -/* Vertical flip */ +/*Qt::Vertical flip */ { JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; int ci, i, j, offset_y; @@ -242,7 +242,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *dst_coef_arrays) /* 90 degree rotation is equivalent to * 1. Transposing the image; - * 2. Horizontal mirroring. + * 2.Qt::Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -305,7 +305,7 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 270 degree rotation is equivalent to - * 1. Horizontal mirroring; + * 1.Qt::Horizontal mirroring; * 2. Transposing the image. * These two steps are merged into a single processing routine. */ @@ -369,8 +369,8 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, jvirt_barray_ptr *dst_coef_arrays) /* 180 degree rotation is equivalent to - * 1. Vertical mirroring; - * 2. Horizontal mirroring. + * 1.Qt::Vertical mirroring; + * 2.Qt::Horizontal mirroring. * These two steps are merged into a single processing routine. */ { @@ -473,9 +473,9 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, * 1. 180 degree rotation; * 2. Transposition; * or - * 1. Horizontal mirroring; + * 1.Qt::Horizontal mirroring; * 2. Transposition; - * 3. Horizontal mirroring. + * 3.Qt::Horizontal mirroring. * These steps are merged into a single processing routine. */ { diff --git a/digikam/libs/levels/imagelevels.cpp b/digikam/libs/levels/imagelevels.cpp index cd0b43b..ac99592 100644 --- a/digikam/libs/levels/imagelevels.cpp +++ b/digikam/libs/levels/imagelevels.cpp @@ -26,9 +26,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfile.h> +#include <tqfile.h> // C++ includes. @@ -236,7 +236,7 @@ int ImageLevels::levelsInputFromColor(int channel, const DColor& color) switch (channel) { case ImageHistogram::ValueChannel: - return QMAX (QMAX (color.red(), color.green()), color.blue()); + return TQMAX (TQMAX (color.red(), color.green()), color.blue()); case ImageHistogram::RedChannel: return color.red(); @@ -617,7 +617,7 @@ bool ImageLevels::loadLevelsFromGimpLevelsFile(const KURL& fileUrl) char buf[50]; char *nptr; - file = fopen(QFile::encodeName(fileUrl.path()), "r"); + file = fopen(TQFile::encodeName(fileUrl.path()), "r"); if (!file) return false; @@ -686,7 +686,7 @@ bool ImageLevels::saveLevelsToGimpLevelsFile(const KURL& fileUrl) FILE *file; int i; - file = fopen(QFile::encodeName(fileUrl.path()), "w"); + file = fopen(TQFile::encodeName(fileUrl.path()), "w"); if (!file) return false; diff --git a/digikam/libs/lprof/Makefile.am b/digikam/libs/lprof/Makefile.am index d1043b5..e7251d2 100644 --- a/digikam/libs/lprof/Makefile.am +++ b/digikam/libs/lprof/Makefile.am @@ -2,6 +2,8 @@ # support 'nofinal' compilation option. KDE_OPTIONS = nofinal +INCLUDES = $(all_includes) + noinst_LTLIBRARIES = liblprof.la noinst_HEADERS = lcmsprf.h diff --git a/digikam/libs/lprof/cmshull.cpp b/digikam/libs/lprof/cmshull.cpp index 05b8dfa..8815c26 100644 --- a/digikam/libs/lprof/cmshull.cpp +++ b/digikam/libs/lprof/cmshull.cpp @@ -1362,9 +1362,9 @@ BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) /* set the viewing orientation and distance */ fprintf (fp, "DEF CamTest Group {\n"); - fprintf (fp, "\tchildren [\n"); + fprintf (fp, "\ttqchildren [\n"); fprintf (fp, "\t\tDEF Cameras Group {\n"); - fprintf (fp, "\t\t\tchildren [\n"); + fprintf (fp, "\t\t\ttqchildren [\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 shape stuff */ + /* Output the tqshape stuff */ fprintf (fp, "Transform {\n"); fprintf (fp, "\tscale 8 8 8\n"); - fprintf (fp, "\tchildren [\n"); + fprintf (fp, "\ttqchildren [\n"); - /* Draw the axes as a shape: */ + /* Draw the axes as a tqshape: */ 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\tgeometry IndexedLineSet {\n"); + fprintf (fp, "\t\t\ttqgeometry 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 shape: */ + /* Draw the triangles as a tqshape: */ 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\tgeometry IndexedFaceSet {\n"); + fprintf (fp, "\t\t\ttqgeometry IndexedFaceSet {\n"); fprintf (fp, "\t\t\t\tsolid false\n"); /* fill in the points here */ diff --git a/digikam/libs/lprof/cmslm.cpp b/digikam/libs/lprof/cmslm.cpp index 25fabcc..81d86ba 100644 --- a/digikam/libs/lprof/cmslm.cpp +++ b/digikam/libs/lprof/cmslm.cpp @@ -98,13 +98,13 @@ typedef struct { double alamda; double chisq; -} LMRQMIN, FAR* LPLMRQMIN; +} LMRTQMIN, FAR* LPLMRTQMIN; static -void mrqcof(LPLMRQMIN pLM, double *a, LPMATN alpha, LPMATN beta, double *chisq) +void mrqcof(LPLMRTQMIN pLM, double *a, LPMATN alpha, LPMATN beta, double *chisq) { int i, j, k; double ymod, wt, sig2i, dy; @@ -147,7 +147,7 @@ void mrqcof(LPLMRQMIN pLM, double *a, LPMATN alpha, LPMATN beta, double *chisq) static -void FreeStruct(LPLMRQMIN pLM) +void FreeStruct(LPLMRTQMIN pLM) { if(pLM == NULL) return; @@ -169,15 +169,15 @@ LCMSHANDLE cmsxLevenbergMarquardtInit(LPSAMPLEDCURVE x, LPSAMPLEDCURVE y, double { int i; - LPLMRQMIN pLM; + LPLMRTQMIN pLM; if (x ->nItems != y ->nItems) return NULL; - pLM = (LPLMRQMIN) malloc(sizeof(LMRQMIN)); + pLM = (LPLMRTQMIN) malloc(sizeof(LMRTQMIN)); if(!pLM) return NULL; - ZeroMemory(pLM, sizeof(LMRQMIN)); + ZeroMemory(pLM, sizeof(LMRTQMIN)); if((pLM->atry = (double*)malloc(ma * sizeof(double))) == NULL) goto failed; if((pLM->beta = MATNalloc (ma, 1)) == NULL) goto failed; @@ -214,7 +214,7 @@ failed: BOOL cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ) { - LPLMRQMIN pLM = (LPLMRQMIN)hMRQ; + LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; if(!pLM) return false; @@ -227,7 +227,7 @@ BOOL cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ) { int j, k; BOOL sts; - LPLMRQMIN pLM = (LPLMRQMIN)hMRQ; + LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; if(!pLM) return false; @@ -275,14 +275,14 @@ BOOL cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ) double cmsxLevenbergMarquardtAlamda(LCMSHANDLE hMRQ) { - LPLMRQMIN pLM = (LPLMRQMIN)hMRQ; + LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; return pLM ->alamda; } double cmsxLevenbergMarquardtChiSq(LCMSHANDLE hMRQ) { - LPLMRQMIN pLM = (LPLMRQMIN)hMRQ; + LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; return pLM ->chisq; } diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp index f151f68..8e3b277 100644 --- a/digikam/libs/lprof/cmslnr.cpp +++ b/digikam/libs/lprof/cmslnr.cpp @@ -60,13 +60,13 @@ void cdecl cmsxApplyLinearizationGamma(WORD In[3], LPGAMMATABLE Gamma[3], WORD O #define EPSILON 0.00005 -#define LEVENBERG_MARQUARDT_ITERATE_MAX 150 +#define LEVENBERG_MARTQUARDT_ITERATE_MAX 150 /* In order to track linearization tables, we use following procedure */ /* */ /* 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 shaper step */ +/* This is the tqshaper 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 Status = true; + BOOL tqStatus = true; /* initial guesses */ @@ -210,10 +210,10 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) OldChiSq = cmsxLevenbergMarquardtChiSq(h); - for(i = 0; i < LEVENBERG_MARQUARDT_ITERATE_MAX; i++) { + for(i = 0; i < LEVENBERG_MARTQUARDT_ITERATE_MAX; i++) { if (!cmsxLevenbergMarquardtIterate(h)) { - Status = false; + tqStatus = false; break; } @@ -227,7 +227,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) cmsxLevenbergMarquardtFree(h); - return Status; + return tqStatus; } /* Tries to fit gamma as per IEC 61966-2.1 using Levenberg-Marquardt method */ diff --git a/digikam/libs/lprof/cmsmkmsh.cpp b/digikam/libs/lprof/cmsmkmsh.cpp index c0e3d4c..07f8487 100644 --- a/digikam/libs/lprof/cmsmkmsh.cpp +++ b/digikam/libs/lprof/cmsmkmsh.cpp @@ -148,7 +148,7 @@ BOOL ComputePrimary(LPMEASUREMENT Linearized, -/* Does compute a matrix-shaper based on patches. */ +/* Does compute a matrix-tqshaper based on patches. */ static double Clip(double d) diff --git a/digikam/libs/lprof/cmspcoll.cpp b/digikam/libs/lprof/cmspcoll.cpp index 0b03fd5..2acd92b 100644 --- a/digikam/libs/lprof/cmspcoll.cpp +++ b/digikam/libs/lprof/cmspcoll.cpp @@ -101,7 +101,7 @@ BOOL EqualsTo(const char* a, const char *b) } -/* Does return a bitwise mask holding the measurements contained in a Sheet */ +/* Does return a bitwise tqmask holding the measurements contained in a Sheet */ static DWORD MaskOfDataSet(LCMSHANDLE hSheet) @@ -243,7 +243,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) } - /* Build mask according to data format */ + /* Build tqmask according to data format */ dwMask = MaskOfDataSet(hSheet); @@ -253,7 +253,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) LPPATCH Patch = m -> Patches + i; - /* Fill in data according to mask */ + /* Fill in data according to tqmask */ if (dwMask & PATCH_HAS_Lab) { @@ -307,7 +307,7 @@ BOOL cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8) DWORD dwMask = 0; int i; - /* Find mask of fields */ + /* Find tqmask of fields */ for (i=0; i < m ->nPatches; i++) { if (m ->Allowed[i]) { @@ -416,7 +416,7 @@ void FixLabOnly(LPMEASUREMENT m) /* Higher level function. Does merge reference and measurement sheet into */ /* a MEASUREMENT struct. Data to keep is described in dwNeededSamplesType */ -/* mask as follows: */ +/* tqmask as follows: */ /* */ /* PATCH_HAS_Lab 0x00000001 */ /* PATCH_HAS_XYZ 0x00000002 */ diff --git a/digikam/libs/lprof/cmsprf.cpp b/digikam/libs/lprof/cmsprf.cpp index 527fc8e..4b7e93b 100644 --- a/digikam/libs/lprof/cmsprf.cpp +++ b/digikam/libs/lprof/cmsprf.cpp @@ -375,7 +375,7 @@ BOOL cmsxChoosePCS(LPPROFILERCOMMONDATA hdr) double gamma_r, gamma_g, gamma_b; cmsCIExyY SourceWhite; - /* At first, compute aproximation on matrix-shaper */ + /* At first, compute aproximation on matrix-tqshaper */ if (!cmsxComputeMatrixShaper(hdr ->ReferenceSheet, hdr ->MeasurementSheet, hdr -> Medium, diff --git a/digikam/libs/lprof/cmssheet.cpp b/digikam/libs/lprof/cmssheet.cpp index f9c82cf..9c53dc7 100644 --- a/digikam/libs/lprof/cmssheet.cpp +++ b/digikam/libs/lprof/cmssheet.cpp @@ -205,7 +205,7 @@ static char* PredefinedProperties[] = { "ORIGINATOR", /* Required - Identifies the specific system, organization or individual that created the data file. */ "CREATED", /* Required - Indicates date of creation of the data file. */ "DESCRIPTOR", /* Required - Describes the purpose or contents of the data file. */ - "DIFFUSE_GEOMETRY", /* The diffuse geometry used. Allowed values are "sphere" or "opal". */ + "DIFFUSE_GEOMETRY", /* The diffuse tqgeometry 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. */ @@ -232,7 +232,7 @@ static char* PredefinedProperties[] = { "SAMPLE_BACKING", /* Identifies the backing material used behind the sample during */ /* measurement. Allowed values are black, white, or "na". */ - "CHISQ_DOF" /* Degrees of freedom associated with the Chi squared statistic */ + "CHISTQ_DOF" /* Degrees of freedom associated with the Chi squared statistic */ }; #define NUMPREDEFINEDPROPS (sizeof(PredefinedProperties)/sizeof(char *)) @@ -280,7 +280,7 @@ static char* PredefinedSampleID[] = { "STDEV_A" /* Standard deviation of a* */ "STDEV_B", /* Standard deviation of b* */ "STDEV_DE", /* Standard deviation of CIE dE */ - "CHI_SQD_PAR"}; /* The average of the standard deviations of L*, a* and b*. It is */ + "CHI_STQD_PAR"}; /* The average of the standard deviations of L*, a* and b*. It is */ /* used to derive an estimate of the chi-squared parameter which is */ /* recommended as the predictor of the variability of dE */ diff --git a/digikam/libs/lprof/lcmsprf.h b/digikam/libs/lprof/lcmsprf.h index 00c7ac4..4d93bc4 100644 --- a/digikam/libs/lprof/lcmsprf.h +++ b/digikam/libs/lprof/lcmsprf.h @@ -340,7 +340,7 @@ double cdecl _cmsxSaturate65535To255(double d); double cdecl _cmsxSaturate255To65535(double d); void cdecl _cmsxClampXYZ100(LPcmsCIEXYZ xyz); -/* Matrix shaper profiler API ------------------------------------------------------------- */ +/* Matrix tqshaper profiler API ------------------------------------------------------------- */ BOOL cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, diff --git a/digikam/libs/themeengine/texture.cpp b/digikam/libs/themeengine/texture.cpp index 8362f53..c8c64bc 100644 --- a/digikam/libs/themeengine/texture.cpp +++ b/digikam/libs/themeengine/texture.cpp @@ -39,11 +39,11 @@ #include <cstring> #include <cstdio> -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qimage.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqpixmap.h> // Local includes. @@ -73,19 +73,19 @@ public: int width; int height; - QPixmap pixmap; + TQPixmap pixmap; - QColor color0; - QColor color1; - QColor borderColor; + TQColor color0; + TQColor color1; + TQColor borderColor; Theme::Bevel bevel; Theme::Gradient gradient; }; -Texture::Texture(int w, int h, const QColor& from, const QColor& to, +Texture::Texture(int w, int h, const TQColor& from, const TQColor& to, Theme::Bevel bevel, Theme::Gradient gradient, - bool border, const QColor& borderColor) + bool border, const TQColor& borderColor) { d = new TexturePriv; @@ -155,17 +155,17 @@ Texture::~Texture() delete d; } -QPixmap Texture::renderPixmap() const +TQPixmap Texture::renderPixmap() const { if (d->width <= 0 || d->height <= 0) - return QPixmap(); + return TQPixmap(); if (!d->border) return d->pixmap; - QPixmap pix(d->width+2, d->height+2); + TQPixmap pix(d->width+2, d->height+2); bitBlt(&pix, 1, 1, &d->pixmap, 0, 0); - QPainter p(&pix); + TQPainter p(&pix); p.setPen(d->borderColor); p.drawRect(0, 0, d->width+2, d->height+2); p.end(); @@ -176,7 +176,7 @@ QPixmap Texture::renderPixmap() const void Texture::doSolid() { d->pixmap.resize(d->width, d->height); - QPainter p(&d->pixmap); + TQPainter p(&d->pixmap); p.fillRect(0, 0, d->width, d->height, d->color0); if (d->bevel == Theme::RAISED) { @@ -475,7 +475,7 @@ void Texture::buildImage() { unsigned char *pr = d->red, *pg = d->green, *pb = d->blue; - QImage image(d->width, d->height, 32); + TQImage image(d->width, d->height, 32); unsigned int* bits = (unsigned int*) image.bits(); @@ -489,7 +489,7 @@ void Texture::buildImage() pb++; } - d->pixmap = QPixmap(image); + d->pixmap = TQPixmap(image); } } // NameSpace Digikam diff --git a/digikam/libs/themeengine/texture.h b/digikam/libs/themeengine/texture.h index fae69c1..27ba73e 100644 --- a/digikam/libs/themeengine/texture.h +++ b/digikam/libs/themeengine/texture.h @@ -36,9 +36,9 @@ #ifndef TEXTURE_H #define TEXTURE_H -// Qt includes. +// TQt includes. -#include <qcolor.h> +#include <tqcolor.h> // Local includes. @@ -54,12 +54,12 @@ class DIGIKAM_EXPORT Texture public: - Texture(int w, int h, const QColor& from, const QColor& to, + Texture(int w, int h, const TQColor& from, const TQColor& to, Theme::Bevel bevel, Theme::Gradient gradient, - bool border, const QColor& borderColor); + bool border, const TQColor& borderColor); ~Texture(); - QPixmap renderPixmap() const; + TQPixmap renderPixmap() const; private: diff --git a/digikam/libs/themeengine/theme.cpp b/digikam/libs/themeengine/theme.cpp index 63a980f..8e4b514 100644 --- a/digikam/libs/themeengine/theme.cpp +++ b/digikam/libs/themeengine/theme.cpp @@ -29,7 +29,7 @@ namespace Digikam { -Theme::Theme(const QString& _name, const QString& _path) +Theme::Theme(const TQString& _name, const TQString& _path) { name = _name; filePath = _path; diff --git a/digikam/libs/themeengine/theme.h b/digikam/libs/themeengine/theme.h index 030a0e2..fd80def 100644 --- a/digikam/libs/themeengine/theme.h +++ b/digikam/libs/themeengine/theme.h @@ -25,10 +25,10 @@ #ifndef THEME_H #define THEME_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqcolor.h> // Digikam includes. @@ -56,55 +56,55 @@ public: DIAGONAL = 0x00040 }; - Theme(const QString& _name, const QString& _path); + Theme(const TQString& _name, const TQString& _path); Theme(const Theme& theme); Theme& operator=(const Theme& theme); void print(); - QString name; - QString filePath; + TQString name; + TQString filePath; - QColor baseColor; - QColor textRegColor; - QColor textSelColor; - QColor textSpecialRegColor; - QColor textSpecialSelColor; + TQColor baseColor; + TQColor textRegColor; + TQColor textSelColor; + TQColor textSpecialRegColor; + TQColor textSpecialSelColor; - QColor bannerColor; - QColor bannerColorTo; + TQColor bannerColor; + TQColor bannerColorTo; Bevel bannerBevel; Gradient bannerGrad; bool bannerBorder; - QColor bannerBorderColor; + TQColor bannerBorderColor; - QColor thumbRegColor; - QColor thumbRegColorTo; + TQColor thumbRegColor; + TQColor thumbRegColorTo; Bevel thumbRegBevel; Gradient thumbRegGrad; bool thumbRegBorder; - QColor thumbRegBorderColor; + TQColor thumbRegBorderColor; - QColor thumbSelColor; - QColor thumbSelColorTo; + TQColor thumbSelColor; + TQColor thumbSelColorTo; Bevel thumbSelBevel; Gradient thumbSelGrad; bool thumbSelBorder; - QColor thumbSelBorderColor; + TQColor thumbSelBorderColor; - QColor listRegColor; - QColor listRegColorTo; + TQColor listRegColor; + TQColor listRegColorTo; Bevel listRegBevel; Gradient listRegGrad; bool listRegBorder; - QColor listRegBorderColor; + TQColor listRegBorderColor; - QColor listSelColor; - QColor listSelColorTo; + TQColor listSelColor; + TQColor listSelColorTo; Bevel listSelBevel; Gradient listSelGrad; bool listSelBorder; - QColor listSelBorderColor; + TQColor listSelBorderColor; }; } // NameSpace Digikam diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index 14c1dd2..f89b62c 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdict.h> -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qapplication.h> -#include <qpalette.h> -#include <qtimer.h> -#include <qtextstream.h> +#include <tqdict.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqapplication.h> +#include <tqpalette.h> +#include <tqtimer.h> +#include <tqtextstream.h> // KDE includes. @@ -64,10 +64,10 @@ public: themeInitiallySet = false; } - QPalette defaultPalette; + TQPalette defaultPalette; - QPtrList<Theme> themeList; - QDict<Theme> themeDict; + TQPtrList<Theme> themeList; + TQDict<Theme> themeDict; Theme *currTheme; Theme *defaultTheme; @@ -96,7 +96,7 @@ ThemeEngine::ThemeEngine() d->themeList.setAutoDelete(false); d->themeDict.setAutoDelete(false); - d->defaultTheme = new Theme(i18n("Default"), QString()); + d->defaultTheme = new Theme(i18n("Default"), TQString()); d->themeList.append(d->defaultTheme); d->themeDict.insert(i18n("Default"), d->defaultTheme); d->currTheme = d->defaultTheme; @@ -112,42 +112,42 @@ ThemeEngine::~ThemeEngine() m_instance = 0; } -QColor ThemeEngine::baseColor() const +TQColor ThemeEngine::baseColor() const { return d->currTheme->baseColor; } -QColor ThemeEngine::thumbSelColor() const +TQColor ThemeEngine::thumbSelColor() const { return d->currTheme->thumbSelColor; } -QColor ThemeEngine::thumbRegColor() const +TQColor ThemeEngine::thumbRegColor() const { return d->currTheme->thumbRegColor; } -QColor ThemeEngine::textRegColor() const +TQColor ThemeEngine::textRegColor() const { return d->currTheme->textRegColor; } -QColor ThemeEngine::textSelColor() const +TQColor ThemeEngine::textSelColor() const { return d->currTheme->textSelColor; } -QColor ThemeEngine::textSpecialRegColor() const +TQColor ThemeEngine::textSpecialRegColor() const { return d->currTheme->textSpecialRegColor; } -QColor ThemeEngine::textSpecialSelColor() const +TQColor ThemeEngine::textSpecialSelColor() const { return d->currTheme->textSpecialSelColor; } -QPixmap ThemeEngine::bannerPixmap(int w, int h) +TQPixmap ThemeEngine::bannerPixmap(int w, int h) { Texture tex(w, h, d->currTheme->bannerColor, d->currTheme->bannerColorTo, d->currTheme->bannerBevel, d->currTheme->bannerGrad, @@ -155,7 +155,7 @@ QPixmap ThemeEngine::bannerPixmap(int w, int h) return tex.renderPixmap(); } -QPixmap ThemeEngine::thumbRegPixmap(int w, int h) +TQPixmap ThemeEngine::thumbRegPixmap(int w, int h) { Texture tex(w, h, d->currTheme->thumbRegColor, d->currTheme->thumbRegColorTo, d->currTheme->thumbRegBevel, d->currTheme->thumbRegGrad, @@ -163,7 +163,7 @@ QPixmap ThemeEngine::thumbRegPixmap(int w, int h) return tex.renderPixmap(); } -QPixmap ThemeEngine::thumbSelPixmap(int w, int h) +TQPixmap ThemeEngine::thumbSelPixmap(int w, int h) { Texture tex(w, h, d->currTheme->thumbSelColor, d->currTheme->thumbSelColorTo, d->currTheme->thumbSelBevel, d->currTheme->thumbSelGrad, @@ -171,7 +171,7 @@ QPixmap ThemeEngine::thumbSelPixmap(int w, int h) return tex.renderPixmap(); } -QPixmap ThemeEngine::listRegPixmap(int w, int h) +TQPixmap ThemeEngine::listRegPixmap(int w, int h) { Texture tex(w, h, d->currTheme->listRegColor, d->currTheme->listRegColorTo, d->currTheme->listRegBevel, d->currTheme->listRegGrad, @@ -179,7 +179,7 @@ QPixmap ThemeEngine::listRegPixmap(int w, int h) return tex.renderPixmap(); } -QPixmap ThemeEngine::listSelPixmap(int w, int h) +TQPixmap ThemeEngine::listSelPixmap(int w, int h) { Texture tex(w, h, d->currTheme->listSelColor, d->currTheme->listSelColorTo, d->currTheme->listSelBevel, d->currTheme->listSelGrad, @@ -195,12 +195,12 @@ void ThemeEngine::scanThemes() d->themeDict.clear(); d->currTheme = 0; - QStringList themes = KGlobal::dirs()->findAllResources( "themes", QString(), false, true ); + TQStringList themes = KGlobal::dirs()->findAllResources( "themes", TQString(), false, true ); - for (QStringList::iterator it=themes.begin(); it != themes.end(); + for (TQStringList::iterator it=themes.begin(); it != themes.end(); ++it) { - QFileInfo fi(*it); + TQFileInfo fi(*it); Theme* theme = new Theme(fi.fileName(), *it); d->themeList.append(theme); d->themeDict.insert(fi.fileName(), theme); @@ -211,9 +211,9 @@ void ThemeEngine::scanThemes() d->currTheme = d->defaultTheme; } -QStringList ThemeEngine::themeNames() const +TQStringList ThemeEngine::themeNames() const { - QStringList names; + TQStringList names; for (Theme *t = d->themeList.first(); t; t = d->themeList.next()) { names << t->name; @@ -222,14 +222,14 @@ QStringList ThemeEngine::themeNames() const return names; } -void ThemeEngine::slotChangeTheme(const QString& name) +void ThemeEngine::slotChangeTheme(const TQString& name) { setCurrentTheme(name); } -void ThemeEngine::setCurrentTheme(const QString& name) +void ThemeEngine::setCurrentTheme(const TQString& name) { - Theme* theme = d->themeDict.find(name); + Theme* theme = d->themeDict.tqfind(name); if (!theme) { d->currTheme = d->defaultTheme; @@ -248,12 +248,12 @@ void ThemeEngine::setCurrentTheme(const QString& name) changePalette(); - QTimer::singleShot(0, this, SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); } -void ThemeEngine::setCurrentTheme(const Theme& theme, const QString& name, bool loadFromDisk) +void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool loadFromDisk) { - Theme* t = d->themeDict.find(name); + Theme* t = d->themeDict.tqfind(name); if (t) { d->themeDict.remove(name); @@ -271,13 +271,13 @@ void ThemeEngine::setCurrentTheme(const Theme& theme, const QString& name, bool changePalette(); - QTimer::singleShot(0, this, SIGNAL(signalThemeChanged())); + TQTimer::singleShot(0, this, TQT_SIGNAL(signalThemeChanged())); } void ThemeEngine::changePalette() { // Make palette for all widgets. - QPalette plt; + TQPalette plt; if (d->currTheme == d->defaultTheme) plt = d->defaultPalette; @@ -285,39 +285,39 @@ void ThemeEngine::changePalette() { plt = kapp->palette(); int h, s, v; - const QColor fg(ThemeEngine::instance()->textRegColor()); - const QColor bg(ThemeEngine::instance()->baseColor()); - QColorGroup cg(plt.active()); + const TQColor fg(ThemeEngine::instance()->textRegColor()); + const TQColor bg(ThemeEngine::instance()->baseColor()); + TQColorGroup cg(plt.active()); /* bg.hsv(&h, &s, &v); v += (v < 128) ? +50 : -50; v &= 255; //ensures 0 <= v < 256 - d->currTheme->altBase = QColor(h, s, v, QColor::Hsv); + d->currTheme->altBase = TQColor(h, s, v, TQColor::Hsv); */ fg.hsv(&h, &s, &v); v += (v < 128) ? +150 : -150; v &= 255; //ensures 0 <= v < 256 - const QColor highlight(h, s, v, QColor::Hsv); + const TQColor highlight(h, s, v, TQColor::Hsv); - cg.setColor(QColorGroup::Base, bg); - cg.setColor(QColorGroup::Background, bg.dark(115)); - cg.setColor(QColorGroup::Foreground, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Highlight, highlight); - cg.setColor(QColorGroup::HighlightedText, ThemeEngine::instance()->textSelColor()); - cg.setColor(QColorGroup::Dark, Qt::darkGray); + cg.setColor(TQColorGroup::Base, bg); + cg.setColor(TQColorGroup::Background, bg.dark(115)); + cg.setColor(TQColorGroup::Foreground, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Highlight, highlight); + cg.setColor(TQColorGroup::HighlightedText, ThemeEngine::instance()->textSelColor()); + cg.setColor(TQColorGroup::Dark, TQt::darkGray); - cg.setColor(QColorGroup::Button, bg); - cg.setColor(QColorGroup::ButtonText, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Button, bg); + cg.setColor(TQColorGroup::ButtonText, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Text, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Link, ThemeEngine::instance()->textSpecialRegColor()); - cg.setColor(QColorGroup::LinkVisited, ThemeEngine::instance()->textSpecialSelColor()); + cg.setColor(TQColorGroup::Text, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Link, ThemeEngine::instance()->textSpecialRegColor()); + cg.setColor(TQColorGroup::LinkVisited, ThemeEngine::instance()->textSpecialSelColor()); /* - cg.setColor(QColorGroup::Light, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Midlight, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Mid, ThemeEngine::instance()->textRegColor()); - cg.setColor(QColorGroup::Shadow, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Light, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Midlight, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Mid, ThemeEngine::instance()->textRegColor()); + cg.setColor(TQColorGroup::Shadow, ThemeEngine::instance()->textRegColor()); */ plt.setActive(cg); @@ -325,7 +325,7 @@ void ThemeEngine::changePalette() plt.setDisabled(cg); } - kapp->setPalette(plt, true); + kapp->tqsetPalette(plt, true); } Theme* ThemeEngine::getCurrentTheme() const @@ -333,7 +333,7 @@ Theme* ThemeEngine::getCurrentTheme() const return d->currTheme; } -QString ThemeEngine::getCurrentThemeName() const +TQString ThemeEngine::getCurrentThemeName() const { return d->currTheme->name; } @@ -343,12 +343,12 @@ void ThemeEngine::buildDefaultTheme() Theme* t = d->defaultTheme; d->defaultPalette = kapp->palette(); - QColorGroup cg = d->defaultPalette.active(); + TQColorGroup cg = d->defaultPalette.active(); t->baseColor = cg.base(); t->textRegColor = cg.text(); t->textSelColor = cg.highlightedText(); - t->textSpecialRegColor = QColor("#0000EF"); + t->textSpecialRegColor = TQColor("#0000EF"); t->textSpecialSelColor = cg.highlightedText(); t->bannerColor = cg.highlight(); @@ -356,35 +356,35 @@ void ThemeEngine::buildDefaultTheme() t->bannerBevel = Theme::FLAT; t->bannerGrad = Theme::SOLID; t->bannerBorder = false; - t->bannerBorderColor = Qt::black; + t->bannerBorderColor = TQt::black; t->thumbRegColor = cg.base(); t->thumbRegColorTo = cg.base(); t->thumbRegBevel = Theme::FLAT; t->thumbRegGrad = Theme::SOLID; t->thumbRegBorder = true; - t->thumbRegBorderColor = QColor("#E0E0EF"); + t->thumbRegBorderColor = TQColor("#E0E0EF"); t->thumbSelColor = cg.highlight(); t->thumbSelColorTo = cg.highlight(); t->thumbSelBevel = Theme::FLAT; t->thumbSelGrad = Theme::SOLID; t->thumbSelBorder = true; - t->thumbSelBorderColor = QColor("#E0E0EF"); + t->thumbSelBorderColor = TQColor("#E0E0EF"); t->listRegColor = cg.base(); t->listRegColorTo = cg.base(); t->listRegBevel = Theme::FLAT; t->listRegGrad = Theme::SOLID; t->listRegBorder = false; - t->listRegBorderColor = Qt::black; + t->listRegBorderColor = TQt::black; t->listSelColor = cg.highlight(); t->listSelColorTo = cg.highlight(); t->listSelBevel = Theme::FLAT; t->listSelGrad = Theme::SOLID; t->listSelBorder = true; - t->listSelBorderColor = Qt::black; + t->listSelBorderColor = TQt::black; } bool ThemeEngine::loadTheme() @@ -398,13 +398,13 @@ bool ThemeEngine::loadTheme() // use the default theme as base template to build the themes *(t) = *(d->defaultTheme); - QFile themeFile(t->filePath); + TQFile themeFile(t->filePath); if (!themeFile.open(IO_ReadOnly)) return false; - QDomDocument xmlDoc; - QString error; + TQDomDocument xmlDoc; + TQString error; int row, col; if (!xmlDoc.setContent(&themeFile, true, &error, &row, &col)) { @@ -413,11 +413,11 @@ bool ThemeEngine::loadTheme() return false; } - QDomElement rootElem = xmlDoc.documentElement(); - if (rootElem.tagName() != QString::fromLatin1("digikamtheme")) + TQDomElement rootElem = xmlDoc.documentElement(); + if (rootElem.tagName() != TQString::tqfromLatin1("digikamtheme")) return false; - QString resource; + TQString resource; // -- base ------------------------------------------------------------------------ @@ -454,31 +454,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "BannerBevel"); if (!resource.isEmpty()) { - if (resource.contains("flat", false)) + if (resource.tqcontains("flat", false)) t->bannerBevel = Theme::FLAT; - else if (resource.contains("sunken", false)) + else if (resource.tqcontains("sunken", false)) t->bannerBevel = Theme::SUNKEN; - else if (resource.contains("raised", false)) + else if (resource.tqcontains("raised", false)) t->bannerBevel = Theme::RAISED; } resource = resourceValue(rootElem, "BannerGradient"); if (!resource.isEmpty()) { - if (resource.contains("solid", false)) + if (resource.tqcontains("solid", false)) t->bannerGrad = Theme::SOLID; - else if (resource.contains("horizontal", false)) + else if (resource.tqcontains("horizontal", false)) t->bannerGrad = Theme::HORIZONTAL; - else if (resource.contains("vertical", false)) + else if (resource.tqcontains("vertical", false)) t->bannerGrad = Theme::VERTICAL; - else if (resource.contains("diagonal", false)) + else if (resource.tqcontains("diagonal", false)) t->bannerGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "BannerBorder"); if (!resource.isEmpty()) { - t->bannerBorder = resource.contains("true", false); + t->bannerBorder = resource.tqcontains("true", false); } resource = resourceValue(rootElem, "BannerBorderColor"); @@ -500,31 +500,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ThumbnailRegularBevel"); if (!resource.isEmpty()) { - if (resource.contains("flat", false)) + if (resource.tqcontains("flat", false)) t->thumbRegBevel = Theme::FLAT; - else if (resource.contains("sunken", false)) + else if (resource.tqcontains("sunken", false)) t->thumbRegBevel = Theme::SUNKEN; - else if (resource.contains("raised", false)) + else if (resource.tqcontains("raised", false)) t->thumbRegBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ThumbnailRegularGradient"); if (!resource.isEmpty()) { - if (resource.contains("solid", false)) + if (resource.tqcontains("solid", false)) t->thumbRegGrad = Theme::SOLID; - else if (resource.contains("horizontal", false)) + else if (resource.tqcontains("horizontal", false)) t->thumbRegGrad = Theme::HORIZONTAL; - else if (resource.contains("vertical", false)) + else if (resource.tqcontains("vertical", false)) t->thumbRegGrad = Theme::VERTICAL; - else if (resource.contains("diagonal", false)) + else if (resource.tqcontains("diagonal", false)) t->thumbRegGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ThumbnailRegularBorder"); if (!resource.isEmpty()) { - t->thumbRegBorder = resource.contains("true", false); + t->thumbRegBorder = resource.tqcontains("true", false); } resource = resourceValue(rootElem, "ThumbnailRegularBorderColor"); @@ -544,31 +544,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ThumbnailSelectedBevel"); if (!resource.isEmpty()) { - if (resource.contains("flat", false)) + if (resource.tqcontains("flat", false)) t->thumbSelBevel = Theme::FLAT; - else if (resource.contains("sunken", false)) + else if (resource.tqcontains("sunken", false)) t->thumbSelBevel = Theme::SUNKEN; - else if (resource.contains("raised", false)) + else if (resource.tqcontains("raised", false)) t->thumbSelBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ThumbnailSelectedGradient"); if (!resource.isEmpty()) { - if (resource.contains("solid", false)) + if (resource.tqcontains("solid", false)) t->thumbSelGrad = Theme::SOLID; - else if (resource.contains("horizontal", false)) + else if (resource.tqcontains("horizontal", false)) t->thumbSelGrad = Theme::HORIZONTAL; - else if (resource.contains("vertical", false)) + else if (resource.tqcontains("vertical", false)) t->thumbSelGrad = Theme::VERTICAL; - else if (resource.contains("diagonal", false)) + else if (resource.tqcontains("diagonal", false)) t->thumbSelGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ThumbnailSelectedBorder"); if (!resource.isEmpty()) { - t->thumbSelBorder = resource.contains("true", false); + t->thumbSelBorder = resource.tqcontains("true", false); } resource = resourceValue(rootElem, "ThumbnailSelectedBorderColor"); @@ -590,31 +590,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ListviewRegularBevel"); if (!resource.isEmpty()) { - if (resource.contains("flat", false)) + if (resource.tqcontains("flat", false)) t->listRegBevel = Theme::FLAT; - else if (resource.contains("sunken", false)) + else if (resource.tqcontains("sunken", false)) t->listRegBevel = Theme::SUNKEN; - else if (resource.contains("raised", false)) + else if (resource.tqcontains("raised", false)) t->listRegBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ListviewRegularGradient"); if (!resource.isEmpty()) { - if (resource.contains("solid", false)) + if (resource.tqcontains("solid", false)) t->listRegGrad = Theme::SOLID; - else if (resource.contains("horizontal", false)) + else if (resource.tqcontains("horizontal", false)) t->listRegGrad = Theme::HORIZONTAL; - else if (resource.contains("vertical", false)) + else if (resource.tqcontains("vertical", false)) t->listRegGrad = Theme::VERTICAL; - else if (resource.contains("diagonal", false)) + else if (resource.tqcontains("diagonal", false)) t->listRegGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ListviewRegularBorder"); if (!resource.isEmpty()) { - t->listRegBorder = resource.contains("true", false); + t->listRegBorder = resource.tqcontains("true", false); } resource = resourceValue(rootElem, "ListviewRegularBorderColor"); @@ -634,31 +634,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ListviewSelectedBevel"); if (!resource.isEmpty()) { - if (resource.contains("flat", false)) + if (resource.tqcontains("flat", false)) t->listSelBevel = Theme::FLAT; - else if (resource.contains("sunken", false)) + else if (resource.tqcontains("sunken", false)) t->listSelBevel = Theme::SUNKEN; - else if (resource.contains("raised", false)) + else if (resource.tqcontains("raised", false)) t->listSelBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ListviewSelectedGradient"); if (!resource.isEmpty()) { - if (resource.contains("solid", false)) + if (resource.tqcontains("solid", false)) t->listSelGrad = Theme::SOLID; - else if (resource.contains("horizontal", false)) + else if (resource.tqcontains("horizontal", false)) t->listSelGrad = Theme::HORIZONTAL; - else if (resource.contains("vertical", false)) + else if (resource.tqcontains("vertical", false)) t->listSelGrad = Theme::VERTICAL; - else if (resource.contains("diagonal", false)) + else if (resource.tqcontains("diagonal", false)) t->listSelGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ListviewSelectedBorder"); if (!resource.isEmpty()) { - t->listSelBorder = resource.contains("true", false); + t->listSelBorder = resource.tqcontains("true", false); } resource = resourceValue(rootElem, "ListviewSelectedBorderColor"); @@ -671,14 +671,14 @@ bool ThemeEngine::loadTheme() return true; } -QString ThemeEngine::resourceValue(const QDomElement &rootElem, const QString& key) +TQString ThemeEngine::resourceValue(const TQDomElement &rootElem, const TQString& key) { - for (QDomNode node = rootElem.firstChild(); + for (TQDomNode node = rootElem.firstChild(); !node.isNull(); node = node.nextSibling()) { - QDomElement e = node.toElement(); - QString name = e.tagName(); - QString val = e.attribute(QString::fromLatin1("value")); + TQDomElement e = node.toElement(); + TQString name = e.tagName(); + TQString val = e.attribute(TQString::tqfromLatin1("value")); if (key == name) { @@ -686,7 +686,7 @@ QString ThemeEngine::resourceValue(const QDomElement &rootElem, const QString& k } } - return QString(""); + return TQString(""); } bool ThemeEngine::saveTheme() @@ -697,24 +697,24 @@ bool ThemeEngine::saveTheme() Theme *t = d->currTheme; - QFileInfo fi(t->filePath); + TQFileInfo fi(t->filePath); - QFile themeFile(fi.filePath()); + TQFile themeFile(fi.filePath()); if (!themeFile.open(IO_WriteOnly)) return false; KUser user; - QDomDocument xmlDoc; - QDomElement e; - QString val; + TQDomDocument xmlDoc; + TQDomElement e; + TQString val; // header ------------------------------------------------------------------ - xmlDoc.appendChild(xmlDoc.createProcessingInstruction(QString::fromLatin1("xml"), - QString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\""))); + xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::tqfromLatin1("xml"), + TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\""))); - QString banner = QString("\n/* ============================================================" + TQString banner = TQString("\n/* ============================================================" "\n *" "\n * This file is a part of digiKam project" "\n * http://www.digikam.org" @@ -736,393 +736,393 @@ bool ThemeEngine::saveTheme() "\n * GNU General Public License for more details." "\n *" "\n * ============================================================ */\n") - .arg(QDate::currentDate().year()) - .arg(QDate::currentDate().month()) - .arg(QDate::currentDate().day()) - .arg(fi.fileName()) - .arg(QDate::currentDate().year()) - .arg(user.fullName()); + .tqarg(TQDate::tqcurrentDate().year()) + .tqarg(TQDate::tqcurrentDate().month()) + .tqarg(TQDate::tqcurrentDate().day()) + .tqarg(fi.fileName()) + .tqarg(TQDate::tqcurrentDate().year()) + .tqarg(user.fullName()); xmlDoc.appendChild(xmlDoc.createComment(banner)); - QDomElement themeElem = xmlDoc.createElement(QString::fromLatin1("digikamtheme")); + TQDomElement themeElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamtheme")); xmlDoc.appendChild(themeElem); // base props -------------------------------------------------------------- - e = xmlDoc.createElement(QString::fromLatin1("name")); - e.setAttribute(QString::fromLatin1("value"), fi.fileName()); + e = xmlDoc.createElement(TQString::tqfromLatin1("name")); + e.setAttribute(TQString::tqfromLatin1("value"), fi.fileName()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("BaseColor")); - e.setAttribute(QString::fromLatin1("value"), t->baseColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("BaseColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->baseColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("TextRegularColor")); - e.setAttribute(QString::fromLatin1("value"), t->textRegColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("TextRegularColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("TextSelectedColor")); - e.setAttribute(QString::fromLatin1("value"), t->textSelColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("TextSelectedColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("TextSpecialRegularColor")); - e.setAttribute(QString::fromLatin1("value"), t->textSpecialRegColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialRegularColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("TextSpecialSelectedColor")); - e.setAttribute(QString::fromLatin1("value"), t->textSpecialSelColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialSelectedColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper()); themeElem.appendChild(e); // banner props ------------------------------------------------------------ - e = xmlDoc.createElement(QString::fromLatin1("BannerColor")); - e.setAttribute(QString::fromLatin1("value"), t->bannerColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("BannerColorTo")); - e.setAttribute(QString::fromLatin1("value"), t->bannerColorTo.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColorTo")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColorTo.name()).upper()); themeElem.appendChild(e); switch(t->bannerBevel) { case(Theme::FLAT): { - val = QString("FLAT"); + val = TQString("FLAT"); break; } case(Theme::RAISED): { - val = QString("RAISED"); + val = TQString("RAISED"); break; } case(Theme::SUNKEN): { - val = QString("SUNKEN"); + val = TQString("SUNKEN"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("BannerBevel")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBevel")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); switch(t->bannerGrad) { case(Theme::SOLID): { - val = QString("SOLID"); + val = TQString("SOLID"); break; } case(Theme::HORIZONTAL): { - val = QString("HORIZONTAL"); + val = TQString("HORIZONTAL"); break; } case(Theme::VERTICAL): { - val = QString("VERTICAL"); + val = TQString("VERTICAL"); break; } case(Theme::DIAGONAL): { - val = QString("DIAGONAL"); + val = TQString("DIAGONAL"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("BannerGradient")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerGradient")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("BannerBorder")); - e.setAttribute(QString::fromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorder")); + e.setAttribute(TQString::tqfromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("BannerBorderColor")); - e.setAttribute(QString::fromLatin1("value"), t->bannerBorderColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorderColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerBorderColor.name()).upper()); themeElem.appendChild(e); // thumbnail.regular props ------------------------------------------------- - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularColor")); - e.setAttribute(QString::fromLatin1("value"), t->thumbRegColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularColorTo")); - e.setAttribute(QString::fromLatin1("value"), t->thumbRegColorTo.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColorTo")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper()); themeElem.appendChild(e); switch(t->thumbRegBevel) { case(Theme::FLAT): { - val = QString("FLAT"); + val = TQString("FLAT"); break; } case(Theme::RAISED): { - val = QString("RAISED"); + val = TQString("RAISED"); break; } case(Theme::SUNKEN): { - val = QString("SUNKEN"); + val = TQString("SUNKEN"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularBevel")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBevel")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); switch(t->thumbRegGrad) { case(Theme::SOLID): { - val = QString("SOLID"); + val = TQString("SOLID"); break; } case(Theme::HORIZONTAL): { - val = QString("HORIZONTAL"); + val = TQString("HORIZONTAL"); break; } case(Theme::VERTICAL): { - val = QString("VERTICAL"); + val = TQString("VERTICAL"); break; } case(Theme::DIAGONAL): { - val = QString("DIAGONAL"); + val = TQString("DIAGONAL"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularGradient")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularGradient")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularBorder")); - e.setAttribute(QString::fromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorder")); + e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailRegularBorderColor")); - e.setAttribute(QString::fromLatin1("value"), t->thumbRegBorderColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorderColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper()); themeElem.appendChild(e); // thumbnail.selected props ------------------------------------------------- - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedColor")); - e.setAttribute(QString::fromLatin1("value"), t->thumbSelColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedColorTo")); - e.setAttribute(QString::fromLatin1("value"), t->thumbSelColorTo.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColorTo")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper()); themeElem.appendChild(e); switch(t->thumbSelBevel) { case(Theme::FLAT): { - val = QString("FLAT"); + val = TQString("FLAT"); break; } case(Theme::RAISED): { - val = QString("RAISED"); + val = TQString("RAISED"); break; } case(Theme::SUNKEN): { - val = QString("SUNKEN"); + val = TQString("SUNKEN"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedBevel")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBevel")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); switch(t->thumbSelGrad) { case(Theme::SOLID): { - val = QString("SOLID"); + val = TQString("SOLID"); break; } case(Theme::HORIZONTAL): { - val = QString("HORIZONTAL"); + val = TQString("HORIZONTAL"); break; } case(Theme::VERTICAL): { - val = QString("VERTICAL"); + val = TQString("VERTICAL"); break; } case(Theme::DIAGONAL): { - val = QString("DIAGONAL"); + val = TQString("DIAGONAL"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedGradient")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedGradient")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedBorder")); - e.setAttribute(QString::fromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorder")); + e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ThumbnailSelectedBorderColor")); - e.setAttribute(QString::fromLatin1("value"), t->thumbSelBorderColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorderColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper()); themeElem.appendChild(e); // listview.regular props ------------------------------------------------- - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularColor")); - e.setAttribute(QString::fromLatin1("value"), t->listRegColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularColorTo")); - e.setAttribute(QString::fromLatin1("value"), t->listRegColorTo.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColorTo")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColorTo.name()).upper()); themeElem.appendChild(e); switch(t->listRegBevel) { case(Theme::FLAT): { - val = QString("FLAT"); + val = TQString("FLAT"); break; } case(Theme::RAISED): { - val = QString("RAISED"); + val = TQString("RAISED"); break; } case(Theme::SUNKEN): { - val = QString("SUNKEN"); + val = TQString("SUNKEN"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularBevel")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBevel")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); switch(t->listRegGrad) { case(Theme::SOLID): { - val = QString("SOLID"); + val = TQString("SOLID"); break; } case(Theme::HORIZONTAL): { - val = QString("HORIZONTAL"); + val = TQString("HORIZONTAL"); break; } case(Theme::VERTICAL): { - val = QString("VERTICAL"); + val = TQString("VERTICAL"); break; } case(Theme::DIAGONAL): { - val = QString("DIAGONAL"); + val = TQString("DIAGONAL"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularGradient")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularGradient")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularBorder")); - e.setAttribute(QString::fromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorder")); + e.setAttribute(TQString::tqfromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewRegularBorderColor")); - e.setAttribute(QString::fromLatin1("value"), t->listRegBorderColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorderColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegBorderColor.name()).upper()); themeElem.appendChild(e); // listview.selected props ------------------------------------------------- - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedColor")); - e.setAttribute(QString::fromLatin1("value"), t->listSelColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColor.name()).upper()); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedColorTo")); - e.setAttribute(QString::fromLatin1("value"), t->listSelColorTo.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColorTo")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColorTo.name()).upper()); themeElem.appendChild(e); switch(t->listSelBevel) { case(Theme::FLAT): { - val = QString("FLAT"); + val = TQString("FLAT"); break; } case(Theme::RAISED): { - val = QString("RAISED"); + val = TQString("RAISED"); break; } case(Theme::SUNKEN): { - val = QString("SUNKEN"); + val = TQString("SUNKEN"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedBevel")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBevel")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); switch(t->listSelGrad) { case(Theme::SOLID): { - val = QString("SOLID"); + val = TQString("SOLID"); break; } case(Theme::HORIZONTAL): { - val = QString("HORIZONTAL"); + val = TQString("HORIZONTAL"); break; } case(Theme::VERTICAL): { - val = QString("VERTICAL"); + val = TQString("VERTICAL"); break; } case(Theme::DIAGONAL): { - val = QString("DIAGONAL"); + val = TQString("DIAGONAL"); break; } }; - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedGradient")); - e.setAttribute(QString::fromLatin1("value"), val); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedGradient")); + e.setAttribute(TQString::tqfromLatin1("value"), val); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedBorder")); - e.setAttribute(QString::fromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE")); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorder")); + e.setAttribute(TQString::tqfromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE")); themeElem.appendChild(e); - e = xmlDoc.createElement(QString::fromLatin1("ListviewSelectedBorderColor")); - e.setAttribute(QString::fromLatin1("value"), t->listSelBorderColor.name().upper()); + e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorderColor")); + e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelBorderColor.name()).upper()); themeElem.appendChild(e); // ------------------------------------------------------------------------- - QTextStream stream(&themeFile); - stream.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream stream(&themeFile); + stream.setEncoding(TQTextStream::UnicodeUTF8); stream << xmlDoc.toString(); themeFile.close(); diff --git a/digikam/libs/themeengine/themeengine.h b/digikam/libs/themeengine/themeengine.h index 45c78e7..e60f8cb 100644 --- a/digikam/libs/themeengine/themeengine.h +++ b/digikam/libs/themeengine/themeengine.h @@ -25,13 +25,13 @@ #ifndef THEMEENGINE_H #define THEMEENGINE_H -// Qt includes. +// TQt includes. -#include <qstringlist.h> -#include <qobject.h> -#include <qcolor.h> -#include <qpixmap.h> -#include <qdom.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqcolor.h> +#include <tqpixmap.h> +#include <tqdom.h> // Digikam includes. @@ -43,9 +43,10 @@ namespace Digikam class Theme; class ThemeEnginePriv; -class DIGIKAM_EXPORT ThemeEngine : public QObject +class DIGIKAM_EXPORT ThemeEngine : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -53,30 +54,30 @@ public: static ThemeEngine* instance(); void scanThemes(); - QStringList themeNames() const; + TQStringList themeNames() const; bool saveTheme(); - void setCurrentTheme(const QString& name); - void setCurrentTheme(const Theme& theme, const QString& name, + void setCurrentTheme(const TQString& name); + void setCurrentTheme(const Theme& theme, const TQString& name, bool loadFromDisk=false); Theme* getCurrentTheme() const; - QString getCurrentThemeName() const; + TQString getCurrentThemeName() const; - QColor baseColor() const; - QColor thumbSelColor() const; - QColor thumbRegColor() const; + TQColor baseColor() const; + TQColor thumbSelColor() const; + TQColor thumbRegColor() const; - QColor textRegColor() const; - QColor textSelColor() const; - QColor textSpecialRegColor() const; - QColor textSpecialSelColor() const; + TQColor textRegColor() const; + TQColor textSelColor() const; + TQColor textSpecialRegColor() const; + TQColor textSpecialSelColor() const; - QPixmap bannerPixmap(int w, int h); - QPixmap thumbRegPixmap(int w, int h); - QPixmap thumbSelPixmap(int w, int h); - QPixmap listRegPixmap(int w, int h); - QPixmap listSelPixmap(int w, int h); + TQPixmap bannerPixmap(int w, int h); + TQPixmap thumbRegPixmap(int w, int h); + TQPixmap thumbSelPixmap(int w, int h); + TQPixmap listRegPixmap(int w, int h); + TQPixmap listSelPixmap(int w, int h); private: @@ -86,7 +87,7 @@ private: void buildDefaultTheme(); bool loadTheme(); void changePalette(); - QString resourceValue(const QDomElement &rootElem, const QString& key); + TQString resourceValue(const TQDomElement &rootElem, const TQString& key); signals: @@ -94,7 +95,7 @@ signals: public slots: - void slotChangeTheme(const QString& name); + void slotChangeTheme(const TQString& name); private: diff --git a/digikam/libs/threadimageio/loadingcache.cpp b/digikam/libs/threadimageio/loadingcache.cpp index 368d58c..66e2848 100644 --- a/digikam/libs/threadimageio/loadingcache.cpp +++ b/digikam/libs/threadimageio/loadingcache.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qapplication.h> -#include <qvariant.h> +#include <tqapplication.h> +#include <tqvariant.h> // KDE includes. @@ -43,12 +43,12 @@ class LoadingCachePriv { public: - QCache<DImg> imageCache; - QDict<LoadingProcess> loadingDict; - QMutex mutex; - QWaitCondition condVar; + TQCache<DImg> imageCache; + TQDict<LoadingProcess> loadingDict; + TQMutex mutex; + TQWaitCondition condVar; KDirWatch *watch; - QStringList watchedFiles; + TQStringList watchedFiles; }; @@ -78,8 +78,8 @@ LoadingCache::LoadingCache() d->watch = new KDirWatch; - connect(d->watch, SIGNAL(dirty(const QString &)), - this, SLOT(slotFileDirty(const QString &))); + connect(d->watch, TQT_SIGNAL(dirty(const TQString &)), + this, TQT_SLOT(slotFileDirty(const TQString &))); } LoadingCache::~LoadingCache() @@ -89,18 +89,18 @@ LoadingCache::~LoadingCache() m_instance = 0; } -DImg *LoadingCache::retrieveImage(const QString &cacheKey) +DImg *LoadingCache::retrieveImage(const TQString &cacheKey) { - return d->imageCache.find(cacheKey); + return d->imageCache.tqfind(cacheKey); } -bool LoadingCache::putImage(const QString &cacheKey, DImg *img, const QString &filePath) +bool LoadingCache::putImage(const TQString &cacheKey, DImg *img, const TQString &filePath) { bool successfulyInserted; - // use size of image as cache cost, take care for wrapped preview QImages + // use size of image as cache cost, take care for wrapped preview TQImages int cost = img->numBytes(); - QVariant attribute(img->attribute("previewQImage")); + TQVariant attribute(img->attribute("previewTQImage")); if (attribute.isValid()) { cost = attribute.toImage().numBytes(); @@ -111,7 +111,7 @@ bool LoadingCache::putImage(const QString &cacheKey, DImg *img, const QString &f if (!filePath.isEmpty()) { // store file path as attribute for our own use - img->setAttribute("loadingCacheFilePath", QVariant(filePath)); + img->setAttribute("loadingCacheFilePath", TQVariant(filePath)); } successfulyInserted = true; } @@ -126,12 +126,12 @@ bool LoadingCache::putImage(const QString &cacheKey, DImg *img, const QString &f { // schedule update of file watch // KDirWatch can only be accessed from main thread! - QApplication::postEvent(this, new QCustomEvent(QEvent::User)); + TQApplication::postEvent(this, new TQCustomEvent(TQEvent::User)); } return successfulyInserted; } -void LoadingCache::removeImage(const QString &cacheKey) +void LoadingCache::removeImage(const TQString &cacheKey) { d->imageCache.remove(cacheKey); } @@ -141,12 +141,12 @@ void LoadingCache::removeImages() d->imageCache.clear(); } -void LoadingCache::slotFileDirty(const QString &path) +void LoadingCache::slotFileDirty(const TQString &path) { // Signal comes from main thread, we need to lock ourselves. CacheLock lock(this); //DDebug() << "LoadingCache slotFileDirty " << path << endl; - for (QCacheIterator<DImg> it(d->imageCache); it.current(); ++it) + for (TQCacheIterator<DImg> it(d->imageCache); it.current(); ++it) { if (it.current()->attribute("loadingCacheFilePath").toString() == path) { @@ -158,33 +158,33 @@ void LoadingCache::slotFileDirty(const QString &path) } } -void LoadingCache::customEvent(QCustomEvent *) +void LoadingCache::customEvent(TQCustomEvent *) { // Event comes from main thread, we need to lock ourselves. CacheLock lock(this); // get a list of files in cache that need watch - QStringList toBeAdded; - QStringList toBeRemoved = d->watchedFiles; - for (QCacheIterator<DImg> it(d->imageCache); it.current(); ++it) + TQStringList toBeAdded; + TQStringList toBeRemoved = d->watchedFiles; + for (TQCacheIterator<DImg> it(d->imageCache); it.current(); ++it) { - QString watchPath = it.current()->attribute("loadingCacheFilePath").toString(); + TQString watchPath = it.current()->attribute("loadingCacheFilePath").toString(); if (!watchPath.isEmpty()) { - if (!d->watchedFiles.contains(watchPath)) + if (!d->watchedFiles.tqcontains(watchPath)) toBeAdded.append(watchPath); toBeRemoved.remove(watchPath); } } - for (QStringList::iterator it = toBeRemoved.begin(); it != toBeRemoved.end(); ++it) + for (TQStringList::iterator it = toBeRemoved.begin(); it != toBeRemoved.end(); ++it) { //DDebug() << "removing watch for " << *it << endl; d->watch->removeFile(*it); d->watchedFiles.remove(*it); } - for (QStringList::iterator it = toBeAdded.begin(); it != toBeAdded.end(); ++it) + for (TQStringList::iterator it = toBeAdded.begin(); it != toBeAdded.end(); ++it) { //DDebug() << "adding watch for " << *it << endl; d->watch->addFile(*it); @@ -204,9 +204,9 @@ void LoadingCache::addLoadingProcess(LoadingProcess *process) d->loadingDict.insert(process->cacheKey(), process); } -LoadingProcess *LoadingCache::retrieveLoadingProcess(const QString &cacheKey) +LoadingProcess *LoadingCache::retrieveLoadingProcess(const TQString &cacheKey) { - return d->loadingDict.find(cacheKey); + return d->loadingDict.tqfind(cacheKey); } void LoadingCache::removeLoadingProcess(LoadingProcess *process) @@ -216,7 +216,7 @@ void LoadingCache::removeLoadingProcess(LoadingProcess *process) void LoadingCache::notifyNewLoadingProcess(LoadingProcess *process, LoadingDescription description) { - for (QDictIterator<LoadingProcess> it(d->loadingDict); it.current(); ++it) + for (TQDictIterator<LoadingProcess> it(d->loadingDict); it.current(); ++it) { it.current()->notifyNewLoadingProcess(process, description); } diff --git a/digikam/libs/threadimageio/loadingcache.h b/digikam/libs/threadimageio/loadingcache.h index 26f89c8..372a5ff 100644 --- a/digikam/libs/threadimageio/loadingcache.h +++ b/digikam/libs/threadimageio/loadingcache.h @@ -24,10 +24,10 @@ #ifndef LOADING_CACHE_H #define LOADING_CACHE_H -#include <qptrlist.h> -#include <qcache.h> -#include <qdict.h> -#include <qmutex.h> +#include <tqptrlist.h> +#include <tqcache.h> +#include <tqdict.h> +#include <tqmutex.h> #include "dimg.h" #include "loadsavethread.h" @@ -40,7 +40,7 @@ class LoadingProcessListener public: virtual bool querySendNotifyEvent() = 0; - virtual QObject *eventReceiver() = 0; + virtual TQObject *eventReceiver() = 0; virtual LoadSaveThread::AccessMode accessMode() = 0; }; @@ -50,8 +50,8 @@ class LoadingProcess public: virtual bool completed() = 0; - virtual QString filePath() = 0; - virtual QString cacheKey() = 0; + virtual TQString filePath() = 0; + virtual TQString cacheKey() = 0; virtual void addListener(LoadingProcessListener *listener) = 0; virtual void removeListener(LoadingProcessListener *listener) = 0; virtual void notifyNewLoadingProcess(LoadingProcess *process, LoadingDescription description) = 0; @@ -60,10 +60,11 @@ public: class LoadingCachePriv; -class LoadingCache : public QObject +class LoadingCache : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -85,7 +86,7 @@ public: // Retrieves an image for the given string from the cache, // or 0 if no image is found. - DImg *retrieveImage(const QString &cacheKey); + DImg *retrieveImage(const TQString &cacheKey); // Returns whether the given DImg fits in the cache. bool isCacheable(const DImg *img); // Put image into for given string into the cache. @@ -94,12 +95,12 @@ public: // When it cannot be put in the cache it is deleted. // The third parameter specifies a file path that will be watched. // If this file changes, the object will be removed from the cache. - bool putImage(const QString &cacheKey, DImg *img, const QString &filePath); - void removeImage(const QString &cacheKey); + bool putImage(const TQString &cacheKey, DImg *img, const TQString &filePath); + void removeImage(const TQString &cacheKey); void removeImages(); // Find the loading process for given cacheKey, or 0 if not found - LoadingProcess *retrieveLoadingProcess(const QString &cacheKey); + LoadingProcess *retrieveLoadingProcess(const TQString &cacheKey); // Add a loading process to the list. Only one loading process // for the same cache key is registered at a time. void addLoadingProcess(LoadingProcess *process); @@ -112,11 +113,11 @@ public: protected: - virtual void customEvent (QCustomEvent *event); + virtual void customEvent (TQCustomEvent *event); private slots: - void slotFileDirty(const QString &path); + void slotFileDirty(const TQString &path); private: diff --git a/digikam/libs/threadimageio/loadingcacheinterface.cpp b/digikam/libs/threadimageio/loadingcacheinterface.cpp index d9b43ab..8cfa5ab 100644 --- a/digikam/libs/threadimageio/loadingcacheinterface.cpp +++ b/digikam/libs/threadimageio/loadingcacheinterface.cpp @@ -33,12 +33,12 @@ void LoadingCacheInterface::cleanUp() LoadingCache::cleanUp(); } -void LoadingCacheInterface::cleanFromCache(const QString &filePath) +void LoadingCacheInterface::cleanFromCache(const TQString &filePath) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); - QStringList possibleCacheKeys = LoadingDescription::possibleCacheKeys(filePath); - for (QStringList::iterator it = possibleCacheKeys.begin(); it != possibleCacheKeys.end(); ++it) + TQStringList possibleCacheKeys = LoadingDescription::possibleCacheKeys(filePath); + for (TQStringList::iterator it = possibleCacheKeys.begin(); it != possibleCacheKeys.end(); ++it) { cache->removeImage(*it); } @@ -51,7 +51,7 @@ void LoadingCacheInterface::cleanCache() cache->removeImages(); } -void LoadingCacheInterface::putImage(const QString &filePath, const DImg &img) +void LoadingCacheInterface::putImage(const TQString &filePath, const DImg &img) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); diff --git a/digikam/libs/threadimageio/loadingcacheinterface.h b/digikam/libs/threadimageio/loadingcacheinterface.h index 9d2571a..ab3f4ec 100644 --- a/digikam/libs/threadimageio/loadingcacheinterface.h +++ b/digikam/libs/threadimageio/loadingcacheinterface.h @@ -24,7 +24,7 @@ #ifndef LOADING_CACHE_INTERFACE_H #define LOADING_CACHE_INTERFACE_H -#include <qstring.h> +#include <tqstring.h> #include "digikam_export.h" #include "dimg.h" @@ -39,12 +39,12 @@ public: static void cleanUp(); // remove an image from the cache // (e.g. when image has changed on disk) - static void cleanFromCache(const QString &filePath); + static void cleanFromCache(const TQString &filePath); // remove all images from the cache // (e.g. when loading settings changed) static void cleanCache(); // add a copy of the image to cache - static void putImage(const QString &filePath, const DImg &img); + static void putImage(const TQString &filePath, const DImg &img); // Set cache size in Megabytes. // Set to 0 to disable caching. static void setCacheOptions(int cacheSize); diff --git a/digikam/libs/threadimageio/loadingdescription.cpp b/digikam/libs/threadimageio/loadingdescription.cpp index a4f47f4..423ee99 100644 --- a/digikam/libs/threadimageio/loadingdescription.cpp +++ b/digikam/libs/threadimageio/loadingdescription.cpp @@ -35,18 +35,18 @@ bool LoadingDescription::PreviewParameters::operator==(const PreviewParameters & && exifRotate == other.exifRotate; } -LoadingDescription::LoadingDescription(const QString &filePath) +LoadingDescription::LoadingDescription(const TQString &filePath) : filePath(filePath) { rawDecodingSettings = DRawDecoding(); } -LoadingDescription::LoadingDescription(const QString &filePath, DRawDecoding settings) +LoadingDescription::LoadingDescription(const TQString &filePath, DRawDecoding settings) : filePath(filePath), rawDecodingSettings(settings) { } -LoadingDescription::LoadingDescription(const QString &filePath, int size, bool exifRotate) +LoadingDescription::LoadingDescription(const TQString &filePath, int size, bool exifRotate) : filePath(filePath) { rawDecodingSettings = DRawDecoding(); @@ -55,7 +55,7 @@ LoadingDescription::LoadingDescription(const QString &filePath, int size, bool e previewParameters.exifRotate = exifRotate; } -QString LoadingDescription::cacheKey() const +TQString LoadingDescription::cacheKey() const { // Here we have the knowledge which LoadingDescriptions / RawFileDecodingSettings // must be cached separately. @@ -65,7 +65,7 @@ QString LoadingDescription::cacheKey() const // and 16-bit full size images for the image editor. // Use previewParameters.size, not isPreview - if it is 0, full loading is used. - QString suffix = rawDecodingSettings.sixteenBitsImage ? "-16" : "-8"; + TQString suffix = rawDecodingSettings.sixteenBitsImage ? "-16" : "-8"; if (rawDecodingSettings.halfSizeColorImage) return filePath + suffix + "-halfSizeColorImage"; @@ -75,7 +75,7 @@ QString LoadingDescription::cacheKey() const return filePath + suffix; } -QStringList LoadingDescription::lookupCacheKeys() const +TQStringList LoadingDescription::lookupCacheKeys() const { // Build a hierarchy which cache entries may be used for this LoadingDescription. // Typically, the first is the best, but an actual loading operation may use a @@ -84,9 +84,9 @@ QStringList LoadingDescription::lookupCacheKeys() const // Sixteen-bit images cannot be used used instead of eight-bit ones because // color management is needed to display them. - QString suffix = rawDecodingSettings.sixteenBitsImage ? "-16" : "-8"; + TQString suffix = rawDecodingSettings.sixteenBitsImage ? "-16" : "-8"; - QStringList keys; + TQStringList keys; keys.append(filePath + suffix); if (rawDecodingSettings.halfSizeColorImage) keys.append(filePath + suffix + "-halfSizeColorImage"); @@ -135,9 +135,9 @@ bool LoadingDescription::equalsOrBetterThan(const LoadingDescription &other) con ); } -QStringList LoadingDescription::possibleCacheKeys(const QString &filePath) +TQStringList LoadingDescription::possibleCacheKeys(const TQString &filePath) { - QStringList keys; + TQStringList keys; keys.append(filePath + "-16"); keys.append(filePath + "-16-halfSizeColorImage"); keys.append(filePath + "-16-previewImage"); diff --git a/digikam/libs/threadimageio/loadingdescription.h b/digikam/libs/threadimageio/loadingdescription.h index 54ab997..848f2b1 100644 --- a/digikam/libs/threadimageio/loadingdescription.h +++ b/digikam/libs/threadimageio/loadingdescription.h @@ -64,13 +64,13 @@ public: * Use this for files that are not raw files. * Stores only the filePath. */ - LoadingDescription(const QString &filePath); + LoadingDescription(const TQString &filePath); /** * For raw files: * Stores filePath and RawDecodingSettings */ - LoadingDescription(const QString &filePath, DRawDecoding settings); + LoadingDescription(const TQString &filePath, DRawDecoding settings); /** * For preview jobs: @@ -83,22 +83,22 @@ public: * If size is not 0, the embedded preview will be loaded if available. * If size is 0, DImg based loading will be used with default raw decoding settings. */ - LoadingDescription(const QString &filePath, int size, bool exifRotate); + LoadingDescription(const TQString &filePath, int size, bool exifRotate); - QString filePath; + TQString filePath; DRawDecoding rawDecodingSettings; PreviewParameters previewParameters; /** * Return the cache key this description shall be stored as */ - QString cacheKey() const; + TQString cacheKey() const; /** * Return all possible cache keys, starting with the best choice, * for which a result may be found in the cache for this description. * Included in the list are better quality versions, if this description is reduced. */ - QStringList lookupCacheKeys() const; + TQStringList lookupCacheKeys() const; /** * Returns whether this description describes a loading operation which * loads the image in a reduced version (quality, size etc.) @@ -127,7 +127,7 @@ public: * Returns all possible cacheKeys for the given file path * (all cache keys under which the given file could be stored in the cache). */ - static QStringList possibleCacheKeys(const QString &filePath); + static TQStringList possibleCacheKeys(const TQString &filePath); }; } // namespace Digikam diff --git a/digikam/libs/threadimageio/loadsavetask.cpp b/digikam/libs/threadimageio/loadsavetask.cpp index 4ab56e1..698f75b 100644 --- a/digikam/libs/threadimageio/loadsavetask.cpp +++ b/digikam/libs/threadimageio/loadsavetask.cpp @@ -24,9 +24,9 @@ #include "loadsavetask.h" -// Qt includes. +// TQt includes. -#include <qapplication.h> +#include <tqapplication.h> // Local includes. @@ -78,11 +78,11 @@ void SavedEvent::notify(LoadSaveThread *thread) void LoadingTask::execute() { - if (m_loadingTaskStatus == LoadingTaskStatusStopping) + if (m_loadingTasktqStatus == LoadingTaskStatusStopping) return; DImg img(m_loadingDescription.filePath, this, m_loadingDescription.rawDecodingSettings); m_thread->taskHasFinished(); - QApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); + TQApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); } LoadingTask::TaskType LoadingTask::type() @@ -92,28 +92,28 @@ LoadingTask::TaskType LoadingTask::type() void LoadingTask::progressInfo(const DImg *, float progress) { - if (m_loadingTaskStatus == LoadingTaskStatusLoading) + if (m_loadingTasktqStatus == LoadingTaskStatusLoading) { if (m_thread->querySendNotifyEvent()) - QApplication::postEvent(m_thread, new LoadingProgressEvent(m_loadingDescription.filePath, progress)); + TQApplication::postEvent(m_thread, new LoadingProgressEvent(m_loadingDescription.filePath, progress)); } } bool LoadingTask::continueQuery(const DImg *) { - return m_loadingTaskStatus != LoadingTaskStatusStopping; + return m_loadingTasktqStatus != LoadingTaskStatusStopping; } -void LoadingTask::setStatus(LoadingTaskStatus status) +void LoadingTask::settqStatus(LoadingTasktqStatus status) { - m_loadingTaskStatus = status; + m_loadingTasktqStatus = status; } // This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting // for the thread to finish and no KProcess events are delivered. -// Remove when porting to Qt4. +// Remove when porting to TQt4. bool LoadingTask::isShuttingDown() { return m_thread->isShuttingDown(); @@ -123,10 +123,10 @@ bool LoadingTask::isShuttingDown() void SharedLoadingTask::execute() { - if (m_loadingTaskStatus == LoadingTaskStatusStopping) + if (m_loadingTasktqStatus == LoadingTaskStatusStopping) return; // send StartedLoadingEvent from each single Task, not via LoadingProcess list - QApplication::postEvent(m_thread, new StartedLoadingEvent(m_loadingDescription.filePath)); + TQApplication::postEvent(m_thread, new StartedLoadingEvent(m_loadingDescription.filePath)); LoadingCache *cache = LoadingCache::cache(); { @@ -134,8 +134,8 @@ void SharedLoadingTask::execute() // find possible cached images DImg *cachedImg = 0; - QStringList lookupKeys = m_loadingDescription.lookupCacheKeys(); - for ( QStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { + TQStringList lookupKeys = m_loadingDescription.lookupCacheKeys(); + for ( TQStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { if ( (cachedImg = cache->retrieveImage(*it)) ) break; } @@ -146,14 +146,14 @@ void SharedLoadingTask::execute() DImg img(*cachedImg); if (accessMode() == LoadSaveThread::AccessModeReadWrite) img = img.copy(); - QApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); + TQApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); return; } else { // find possible running loading process m_usedProcess = 0; - for ( QStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { + for ( TQStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { if ( (m_usedProcess = cache->retrieveLoadingProcess(*it)) ) { break; @@ -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_loadingTaskStatus != LoadingTaskStatusStopping ) + while ( !m_usedProcess->completed() && m_loadingTasktqStatus != 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 setStatus + // set to 0, as checked in settqStatus 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 setStatus + // for use in settqStatus m_usedProcess = this; // Notify other processes that we are now loading this image. // They might be interested - see notifyNewLoadingProcess below @@ -228,19 +228,19 @@ void SharedLoadingTask::execute() // Otherwise, the image from the cache is sent. // As the image in the cache will be deleted from any thread, the explicit sharing // needs to be thread-safe to avoid the risk of memory leaks. - // This is the case only for Qt4, so uncomment this code when porting. + // This is the case only for TQt4, so uncomment this code when porting. /* if (l->accessMode() == LoadSaveThread::AccessModeReadWrite) { // If a listener requested ReadWrite access, it gets a deep copy. // DImg is explicitly shared. DImg copy = img.copy(); - QApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription.filePath, copy)); + TQApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription.filePath, copy)); } else - QApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription.filePath, img)); + TQApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription.filePath, img)); */ - // Qt3: The same copy for all Read listeners (it is assumed that they will delete it only in the main thread), + // TQt3: The same copy for all Read listeners (it is assumed that they will delete it only in the main thread), // an extra copy for each ReadWrite listener DImg readerCopy; if (l->accessMode() == LoadSaveThread::AccessModeReadWrite) @@ -257,7 +257,7 @@ void SharedLoadingTask::execute() copy = img; usedInitialCopy = true; } - QApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, copy)); + TQApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, copy)); } else { @@ -273,7 +273,7 @@ void SharedLoadingTask::execute() usedInitialCopy = true; } } - QApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, readerCopy)); + TQApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, readerCopy)); } } @@ -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 setStatus + // set to 0, as checked in settqStatus m_usedProcess = 0; } } void SharedLoadingTask::progressInfo(const DImg *, float progress) { - if (m_loadingTaskStatus == LoadingTaskStatusLoading) + if (m_loadingTasktqStatus == LoadingTaskStatusLoading) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); @@ -299,7 +299,7 @@ void SharedLoadingTask::progressInfo(const DImg *, float progress) for (LoadingProcessListener *l = m_listeners.first(); l; l = m_listeners.next()) { if (l->querySendNotifyEvent()) - QApplication::postEvent(l->eventReceiver(), new LoadingProgressEvent(m_loadingDescription, progress)); + TQApplication::postEvent(l->eventReceiver(), new LoadingProgressEvent(m_loadingDescription, progress)); } } } @@ -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_loadingTaskStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0); + return (m_loadingTasktqStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0); } -void SharedLoadingTask::setStatus(LoadingTaskStatus status) +void SharedLoadingTask::settqStatus(LoadingTasktqStatus status) { - m_loadingTaskStatus = status; - if (m_loadingTaskStatus == LoadingTaskStatusStopping) + m_loadingTasktqStatus = status; + if (m_loadingTasktqStatus == LoadingTaskStatusStopping) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); @@ -335,12 +335,12 @@ bool SharedLoadingTask::completed() return m_completed; } -QString SharedLoadingTask::filePath() +TQString SharedLoadingTask::filePath() { return m_loadingDescription.filePath; } -QString SharedLoadingTask::cacheKey() +TQString SharedLoadingTask::cacheKey() { return m_loadingDescription.cacheKey(); } @@ -371,7 +371,7 @@ void SharedLoadingTask::notifyNewLoadingProcess(LoadingProcess *process, Loading { for (LoadingProcessListener *l = m_listeners.first(); l; l = m_listeners.next()) { - QApplication::postEvent(l->eventReceiver(), new MoreCompleteLoadingAvailableEvent(m_loadingDescription, description)); + TQApplication::postEvent(l->eventReceiver(), new MoreCompleteLoadingAvailableEvent(m_loadingDescription, description)); } } } @@ -381,7 +381,7 @@ bool SharedLoadingTask::querySendNotifyEvent() return m_thread->querySendNotifyEvent(); } -QObject *SharedLoadingTask::eventReceiver() +TQObject *SharedLoadingTask::eventReceiver() { return m_thread; } @@ -397,7 +397,7 @@ void SavingTask::execute() { bool success = m_img.save(m_filePath, m_format, this); m_thread->taskHasFinished(); - QApplication::postEvent(m_thread, new SavedEvent(m_filePath, success)); + TQApplication::postEvent(m_thread, new SavedEvent(m_filePath, success)); }; LoadingTask::TaskType SavingTask::type() @@ -408,17 +408,17 @@ LoadingTask::TaskType SavingTask::type() void SavingTask::progressInfo(const DImg *, float progress) { if (m_thread->querySendNotifyEvent()) - QApplication::postEvent(m_thread, new SavingProgressEvent(m_filePath, progress)); + TQApplication::postEvent(m_thread, new SavingProgressEvent(m_filePath, progress)); } bool SavingTask::continueQuery(const DImg *) { - return m_savingTaskStatus != SavingTaskStatusStopping; + return m_savingTasktqStatus != SavingTaskStatusStopping; } -void SavingTask::setStatus(SavingTaskStatus status) +void SavingTask::settqStatus(SavingTasktqStatus status) { - m_savingTaskStatus = status; + m_savingTasktqStatus = status; } } //namespace Digikam diff --git a/digikam/libs/threadimageio/loadsavetask.h b/digikam/libs/threadimageio/loadsavetask.h index 005a5f6..13b2df2 100644 --- a/digikam/libs/threadimageio/loadsavetask.h +++ b/digikam/libs/threadimageio/loadsavetask.h @@ -26,9 +26,9 @@ #ifndef LOAD_SAVE_TASK_H #define LOAD_SAVE_TASK_H -// Qt includes. +// TQt includes. -#include <qevent.h> +#include <tqevent.h> // Local includes. @@ -68,14 +68,14 @@ protected: //--------------------------------------------------------------------------------------------------- -class NotifyEvent : public QCustomEvent +class NotifyEvent : public TQCustomEvent { public: - static QEvent::Type notifyEventId() - { return QEvent::User; }; + static TQEvent::Type notifyEventId() + { return TQEvent::User; }; - NotifyEvent() : QCustomEvent(notifyEventId()) {}; + NotifyEvent() : TQCustomEvent(notifyEventId()) {}; virtual void notify(LoadSaveThread *thread) = 0; }; @@ -119,7 +119,7 @@ class SavingProgressEvent : public ProgressEvent { public: - SavingProgressEvent(const QString& filePath, float progress) + SavingProgressEvent(const TQString& filePath, float progress) : ProgressEvent(progress), m_filePath(filePath) {}; @@ -128,7 +128,7 @@ public: private: - QString m_filePath; + TQString m_filePath; }; //--------------------------------------------------------------------------------------------------- @@ -154,7 +154,7 @@ class StartedSavingEvent : public NotifyEvent { public: - StartedSavingEvent(const QString& filePath) + StartedSavingEvent(const TQString& filePath) : m_filePath(filePath) {}; @@ -162,7 +162,7 @@ public: private: - QString m_filePath; + TQString m_filePath; }; //--------------------------------------------------------------------------------------------------- @@ -208,7 +208,7 @@ class LoadingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum LoadingTaskStatus + enum LoadingTasktqStatus { LoadingTaskStatusLoading, LoadingTaskStatusPreloading, @@ -216,8 +216,8 @@ public: }; LoadingTask(LoadSaveThread* thread, LoadingDescription description, - LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) - : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTaskStatus(loadingTaskStatus) + LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) + : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTasktqStatus(loadingTasktqStatus) {} // LoadSaveTask @@ -231,14 +231,14 @@ public: virtual bool continueQuery(const DImg *); virtual bool isShuttingDown(); - virtual void setStatus(LoadingTaskStatus status); + virtual void settqStatus(LoadingTasktqStatus status); - LoadingTaskStatus status() const + LoadingTasktqStatus status() const { - return m_loadingTaskStatus; + return m_loadingTasktqStatus; } - QString filePath() const + TQString filePath() const { return m_loadingDescription.filePath; } @@ -251,7 +251,7 @@ public: protected: LoadingDescription m_loadingDescription; - LoadingTaskStatus m_loadingTaskStatus; + LoadingTasktqStatus m_loadingTasktqStatus; }; //--------------------------------------------------------------------------------------------------- @@ -262,21 +262,21 @@ public: SharedLoadingTask(LoadSaveThread* thread, LoadingDescription description, LoadSaveThread::AccessMode mode = LoadSaveThread::AccessModeReadWrite, - LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading) - : LoadingTask(thread, description, loadingTaskStatus), + LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading) + : LoadingTask(thread, description, loadingTasktqStatus), 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 setStatus(LoadingTaskStatus status); + virtual void settqStatus(LoadingTasktqStatus status); // LoadingProcess virtual bool completed(); - virtual QString filePath(); - virtual QString cacheKey(); + virtual TQString filePath(); + virtual TQString cacheKey(); virtual void addListener(LoadingProcessListener *listener); virtual void removeListener(LoadingProcessListener *listener); virtual void notifyNewLoadingProcess(LoadingProcess *process, LoadingDescription description); @@ -284,7 +284,7 @@ public: // LoadingProcessListener virtual bool querySendNotifyEvent(); - virtual QObject *eventReceiver(); + virtual TQObject *eventReceiver(); virtual LoadSaveThread::AccessMode accessMode(); protected: @@ -292,7 +292,7 @@ protected: LoadSaveThread::AccessMode m_accessMode; bool m_completed; LoadingProcess *m_usedProcess; - QPtrList<LoadingProcessListener> m_listeners; + TQPtrList<LoadingProcessListener> m_listeners; }; //--------------------------------------------------------------------------------------------------- @@ -301,7 +301,7 @@ class SavedEvent : public NotifyEvent { public: - SavedEvent(const QString &filePath, bool success) + SavedEvent(const TQString &filePath, bool success) : m_filePath(filePath), m_success(success) {}; @@ -309,7 +309,7 @@ public: private: - QString m_filePath; + TQString m_filePath; bool m_success; }; @@ -319,13 +319,13 @@ class SavingTask : public LoadSaveTask, public DImgLoaderObserver { public: - enum SavingTaskStatus + enum SavingTasktqStatus { SavingTaskStatusSaving, SavingTaskStatusStopping }; - SavingTask(LoadSaveThread* thread, DImg &img, const QString &filePath, const QString &format) + SavingTask(LoadSaveThread* thread, DImg &img, const TQString &filePath, const TQString &format) : LoadSaveTask(thread), m_img(img), m_filePath(filePath), m_format(format) {}; @@ -335,14 +335,14 @@ public: virtual void progressInfo(const DImg *, float progress); virtual bool continueQuery(const DImg *); - virtual void setStatus(SavingTaskStatus status); + virtual void settqStatus(SavingTasktqStatus status); - SavingTaskStatus status() const + SavingTasktqStatus status() const { - return m_savingTaskStatus; + return m_savingTasktqStatus; } - QString filePath() const + TQString filePath() const { return m_filePath; } @@ -350,9 +350,9 @@ public: private: DImg m_img; - QString m_filePath; - QString m_format; - SavingTaskStatus m_savingTaskStatus; + TQString m_filePath; + TQString m_format; + SavingTasktqStatus m_savingTasktqStatus; }; } // namespace Digikam diff --git a/digikam/libs/threadimageio/loadsavethread.cpp b/digikam/libs/threadimageio/loadsavethread.cpp index cd8b983..3d2daea 100644 --- a/digikam/libs/threadimageio/loadsavethread.cpp +++ b/digikam/libs/threadimageio/loadsavethread.cpp @@ -49,7 +49,7 @@ public: bool blockNotification; LoadSaveTask *lastTask; - QTime notificationTime; + TQTime notificationTime; }; //--------------------------------------------------------------------------------------------------- @@ -67,7 +67,7 @@ LoadSaveThread::~LoadSaveThread() { d->running = false; { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); m_condVar.wakeAll(); } @@ -80,14 +80,14 @@ LoadSaveThread::~LoadSaveThread() void LoadSaveThread::load(LoadingDescription description) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); m_todo.append(new LoadingTask(this, description)); m_condVar.wakeAll(); } -void LoadSaveThread::save(DImg &image, const QString& filePath, const QString &format) +void LoadSaveThread::save(DImg &image, const TQString& filePath, const TQString &format) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); m_todo.append(new SavingTask(this, image, filePath, format)); m_condVar.wakeAll(); } @@ -97,7 +97,7 @@ void LoadSaveThread::run() while (d->running) { { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); if (d->lastTask) { delete d->lastTask; @@ -111,7 +111,7 @@ void LoadSaveThread::run() { // set timing values so that first event is sent only // after an initial time span. - d->notificationTime = QTime::currentTime(); + d->notificationTime = TQTime::currentTime(); d->blockNotification = true; } } @@ -130,12 +130,12 @@ void LoadSaveThread::taskHasFinished() // is sent after load() has been called. This might not been the case // if m_currentTask is currently loading the same image and a race condition // between the return from execute and the next run of the loop above occurs. - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); d->lastTask = m_currentTask; m_currentTask = 0; } -void LoadSaveThread::customEvent(QCustomEvent *event) +void LoadSaveThread::customEvent(TQCustomEvent *event) { if (event->type() == NotifyEvent::notifyEventId()) { @@ -176,13 +176,13 @@ bool LoadSaveThread::querySendNotifyEvent() case NotificationPolicyTimeLimited: // Current default time value: 100 millisecs. if (d->blockNotification) - d->blockNotification = d->notificationTime.msecsTo(QTime::currentTime()) < 100; + d->blockNotification = d->notificationTime.msecsTo(TQTime::currentTime()) < 100; if (d->blockNotification) return false; else { - d->notificationTime = QTime::currentTime(); + d->notificationTime = TQTime::currentTime(); d->blockNotification = true; return true; } @@ -195,16 +195,16 @@ bool LoadSaveThread::querySendNotifyEvent() // This is a hack needed to prevent hanging when a KProcess-based loader (raw loader) // is waiting for the process to finish, but the main thread is waiting // for the thread to finish and no KProcess events are delivered. -// Remove when porting to Qt4. +// Remove when porting to TQt4. bool LoadSaveThread::isShuttingDown() { // the condition is met after d->running is set to false in the destructor return running() && !d->running; } -bool LoadSaveThread::exifRotate(DImg &image, const QString& filePath) +bool LoadSaveThread::exifRotate(DImg &image, const TQString& filePath) { - QVariant attribute(image.attribute("exifRotated")); + TQVariant attribute(image.attribute("exifRotated")); if (attribute.isValid() && attribute.toBool()) return false; @@ -279,7 +279,7 @@ bool LoadSaveThread::exifRotate(DImg &image, const QString& filePath) orientation == DMetadata::ORIENTATION_UNSPECIFIED) return; - QWMatrix matrix; + TQWMatrix matrix; switch (orientation) { diff --git a/digikam/libs/threadimageio/loadsavethread.h b/digikam/libs/threadimageio/loadsavethread.h index 640b438..264727f 100644 --- a/digikam/libs/threadimageio/loadsavethread.h +++ b/digikam/libs/threadimageio/loadsavethread.h @@ -25,14 +25,14 @@ #ifndef LOAD_SAVE_THREAD_H #define LOAD_SAVE_THREAD_H -// Qt includes. +// TQt includes. -#include <qthread.h> -#include <qobject.h> -#include <qmutex.h> -#include <qptrlist.h> -#include <qdatetime.h> -#include <qwaitcondition.h> +#include <tqthread.h> +#include <tqobject.h> +#include <tqmutex.h> +#include <tqptrlist.h> +#include <tqdatetime.h> +#include <tqwaitcondition.h> // Digikam includes. @@ -46,10 +46,11 @@ namespace Digikam class LoadSaveThreadPriv; class LoadSaveTask; -class DIGIKAM_EXPORT LoadSaveThread : public QObject, public QThread +class DIGIKAM_EXPORT LoadSaveThread : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: @@ -85,7 +86,7 @@ public: /** Append a task to load the given file to the task list */ void load(LoadingDescription description); /** Append a task to save the image to the task list */ - void save(DImg &image, const QString& filePath, const QString &format); + void save(DImg &image, const TQString& filePath, const TQString &format); void setNotificationPolicy(NotificationPolicy notificationPolicy); @@ -98,7 +99,7 @@ public: * Returns true if the image has actually been rotated or flipped. * Returns false if a rotation was not needed. */ - static bool exifRotate(DImg &image, const QString& filePath); + static bool exifRotate(DImg &image, const TQString& filePath); signals: @@ -126,9 +127,9 @@ signals: void signalMoreCompleteLoadingAvailable(const LoadingDescription &oldLoadingDescription, const LoadingDescription &newLoadingDescription); - void signalImageStartedSaving(const QString& filePath); - void signalSavingProgress(const QString& filePath, float progress); - void signalImageSaved(const QString& filePath, bool success); + void signalImageStartedSaving(const TQString& filePath); + void signalSavingProgress(const TQString& filePath, float progress); + void signalImageSaved(const TQString& filePath, bool success); public: @@ -145,13 +146,13 @@ public: const LoadingDescription &newLoadingDescription) { emit signalMoreCompleteLoadingAvailable(oldLoadingDescription, newLoadingDescription); } - void imageStartedSaving(const QString& filePath) + void imageStartedSaving(const TQString& filePath) { emit signalImageStartedSaving(filePath); }; - void savingProgress(const QString& filePath, float progress) + void savingProgress(const TQString& filePath, float progress) { emit signalSavingProgress(filePath, progress); }; - void imageSaved(const QString& filePath, bool success) + void imageSaved(const TQString& filePath, bool success) { emit signalImageSaved(filePath, success); }; virtual bool querySendNotifyEvent(); @@ -160,13 +161,13 @@ public: protected: virtual void run(); - virtual void customEvent(QCustomEvent *event); + virtual void customEvent(TQCustomEvent *event); - QMutex m_mutex; + TQMutex m_mutex; - QWaitCondition m_condVar; + TQWaitCondition m_condVar; - QPtrList<LoadSaveTask> m_todo; + TQPtrList<LoadSaveTask> m_todo; LoadSaveTask *m_currentTask; diff --git a/digikam/libs/threadimageio/managedloadsavethread.cpp b/digikam/libs/threadimageio/managedloadsavethread.cpp index 2676a7e..0f6768b 100644 --- a/digikam/libs/threadimageio/managedloadsavethread.cpp +++ b/digikam/libs/threadimageio/managedloadsavethread.cpp @@ -44,18 +44,18 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread() { case TerminationPolicyTerminateLoading: { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); - removeLoadingTasks(LoadingDescription(QString()), LoadingTaskFilterAll); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterAll); break; } case TerminationPolicyTerminatePreloading: { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); - removeLoadingTasks(LoadingDescription(QString()), LoadingTaskFilterPreloading); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); + removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterPreloading); break; } case TerminationPolicyWait: @@ -114,7 +114,7 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingPolicy p void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loadingMode, LoadingPolicy policy, AccessMode accessMode) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); LoadingTask *loadingTask = 0; LoadingTask *existingTask = findExistingTask(description); @@ -125,13 +125,13 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa // reuse task if it exists if (existingTask) { - existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); } // stop current task if (m_currentTask && m_currentTask != existingTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(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->setStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); } // stop and postpone current task if it is a preloading task if (m_currentTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) { - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } } @@ -173,14 +173,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa case LoadingPolicyAppend: if (existingTask) { - existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); } // stop and postpone current task if it is a preloading task if (m_currentTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) ) { - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } } @@ -215,20 +215,20 @@ void ManagedLoadSaveThread::loadPreview(LoadingDescription description) // Preview threads typically only support preview tasks, // so no need to differentiate with normal loading tasks. - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); LoadingTask *loadingTask = 0; LoadingTask *existingTask = findExistingTask(description); // reuse task if it exists if (existingTask) { - existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading); + existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading); } // stop current task if (m_currentTask && m_currentTask != existingTask) { if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) ) - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); } // remove all loading tasks for (LoadSaveTask *task = m_todo.first(); task; task = m_todo.next()) @@ -267,21 +267,21 @@ LoadingTask *ManagedLoadSaveThread::createLoadingTask(const LoadingDescription & } } -void ManagedLoadSaveThread::stopLoading(const QString& filePath, LoadingTaskFilter filter) +void ManagedLoadSaveThread::stopLoading(const TQString& filePath, LoadingTaskFilter filter) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); removeLoadingTasks(LoadingDescription(filePath), filter); } void ManagedLoadSaveThread::stopLoading(const LoadingDescription& desc, LoadingTaskFilter filter) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); removeLoadingTasks(desc, filter); } -void ManagedLoadSaveThread::stopSaving(const QString& filePath) +void ManagedLoadSaveThread::stopSaving(const TQString& filePath) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); // stop current task if it is matching the criteria if (m_currentTask && m_currentTask->type() == LoadSaveTask::TaskTypeSaving) @@ -289,7 +289,7 @@ void ManagedLoadSaveThread::stopSaving(const QString& filePath) SavingTask *savingTask = (SavingTask *)m_currentTask; if (filePath.isNull() || savingTask->filePath() == filePath) { - savingTask->setStatus(SavingTask::SavingTaskStatusStopping); + savingTask->settqStatus(SavingTask::SavingTaskStatusStopping); } } @@ -318,7 +318,7 @@ void ManagedLoadSaveThread::removeLoadingTasks(const LoadingDescription &descrip { if (description.filePath.isNull() || loadingTask->loadingDescription() == description) { - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); } } @@ -336,15 +336,15 @@ void ManagedLoadSaveThread::removeLoadingTasks(const LoadingDescription &descrip } } -void ManagedLoadSaveThread::save(DImg &image, const QString& filePath, const QString &format) +void ManagedLoadSaveThread::save(DImg &image, const TQString& filePath, const TQString &format) { - QMutexLocker lock(&m_mutex); + TQMutexLocker lock(&m_mutex); LoadingTask *loadingTask; // stop and postpone current task if it is a preloading task if (m_currentTask && (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading))) { - loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping); + loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping); load(loadingTask->filePath(), LoadingPolicyPreload); } // append new loading task, put it in front of preloading tasks diff --git a/digikam/libs/threadimageio/managedloadsavethread.h b/digikam/libs/threadimageio/managedloadsavethread.h index ab471b6..ec6a563 100644 --- a/digikam/libs/threadimageio/managedloadsavethread.h +++ b/digikam/libs/threadimageio/managedloadsavethread.h @@ -98,17 +98,17 @@ public: // Stop and remove tasks filtered by filePath and policy. // If filePath isNull, applies to all file paths. - void stopLoading(const QString& filePath = QString(), LoadingTaskFilter filter = LoadingTaskFilterAll); + void stopLoading(const TQString& filePath = TQString(), LoadingTaskFilter filter = LoadingTaskFilterAll); // Same than previous method, but Stop and remove tasks filtered by LoadingDescription. void stopLoading(const LoadingDescription& desc, LoadingTaskFilter filter = LoadingTaskFilterAll); // Stop and remove saving tasks filtered by filePath. // If filePath isNull, applies to all file paths. - void stopSaving(const QString& filePath = QString()); + void stopSaving(const TQString& filePath = TQString()); // Append a task to save the image to the task list - void save(DImg &image, const QString& filePath, const QString &format); + void save(DImg &image, const TQString& filePath, const TQString &format); void setTerminationPolicy(TerminationPolicy terminationPolicy); diff --git a/digikam/libs/threadimageio/previewloadthread.h b/digikam/libs/threadimageio/previewloadthread.h index 3ac5326..dc2a471 100644 --- a/digikam/libs/threadimageio/previewloadthread.h +++ b/digikam/libs/threadimageio/previewloadthread.h @@ -32,6 +32,7 @@ namespace Digikam class DIGIKAM_EXPORT PreviewLoadThread : public ManagedLoadSaveThread { Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/threadimageio/previewtask.cpp b/digikam/libs/threadimageio/previewtask.cpp index abc799c..5c1d394 100644 --- a/digikam/libs/threadimageio/previewtask.cpp +++ b/digikam/libs/threadimageio/previewtask.cpp @@ -26,12 +26,12 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qapplication.h> -#include <qimage.h> -#include <qvariant.h> -#include <qwmatrix.h> +#include <tqapplication.h> +#include <tqimage.h> +#include <tqvariant.h> +#include <tqwmatrix.h> // LibKDcraw includes. @@ -50,7 +50,7 @@ namespace Digikam void PreviewLoadingTask::execute() { - if (m_loadingTaskStatus == LoadingTaskStatusStopping) + if (m_loadingTasktqStatus == LoadingTaskStatusStopping) return; LoadingCache *cache = LoadingCache::cache(); @@ -59,11 +59,11 @@ void PreviewLoadingTask::execute() // find possible cached images DImg *cachedImg = 0; - QStringList lookupKeys = m_loadingDescription.lookupCacheKeys(); + TQStringList lookupKeys = m_loadingDescription.lookupCacheKeys(); // lookupCacheKeys returns "best first". Prepend the cache key to make the list "fastest first": // Scaling a full version takes longer! lookupKeys.push_front(m_loadingDescription.cacheKey()); - for ( QStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { + for ( TQStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { if ( (cachedImg = cache->retrieveImage(*it)) ) break; } @@ -82,14 +82,14 @@ void PreviewLoadingTask::execute() LoadSaveThread::exifRotate(img, m_loadingDescription.filePath); } - QApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); + TQApplication::postEvent(m_thread, new LoadedEvent(m_loadingDescription.filePath, img)); return; } else { // find possible running loading process m_usedProcess = 0; - for ( QStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { + for ( TQStringList::Iterator it = lookupKeys.begin(); it != lookupKeys.end(); ++it ) { if ( (m_usedProcess = cache->retrieveLoadingProcess(*it)) ) { break; @@ -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_loadingTaskStatus != LoadingTaskStatusStopping ) + while ( !m_usedProcess->completed() && m_loadingTasktqStatus != 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 setStatus + // set to 0, as checked in settqStatus 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 setStatus + // for use in settqStatus m_usedProcess = this; // Notify other processes that we are now loading this image. // They might be interested - see notifyNewLoadingProcess below @@ -136,12 +136,12 @@ void PreviewLoadingTask::execute() int size = m_loadingDescription.previewParameters.size; DImg img; - QImage qimage; + TQImage qimage; bool fromEmbeddedPreview = false; // -- Get the image preview -------------------------------- - // First the QImage-dependent loading methods + // First the TQImage-dependent loading methods // Trying to load with dcraw: RAW files. if (KDcrawIface::KDcraw::loadEmbeddedPreview(qimage, m_loadingDescription.filePath)) fromEmbeddedPreview = true; @@ -160,13 +160,13 @@ void PreviewLoadingTask::execute() if (!qimage.isNull()) { - // convert from QImage + // convert from TQImage img = DImg(qimage); // mark as embedded preview (for exif rotation) if (fromEmbeddedPreview) img.setAttribute("fromRawEmbeddedPreview", true); // free memory - qimage = QImage(); + qimage = TQImage(); } // DImg-dependent loading methods @@ -187,10 +187,10 @@ void PreviewLoadingTask::execute() // Reduce size of image: // - only scale down if size is considerably larger // - only scale down, do not scale up - QSize scaledSize = img.size(); + TQSize scaledSize = img.size(); if (needToScale(scaledSize, size)) { - scaledSize.scale(size, size, QSize::ScaleMin); + scaledSize.tqscale(size, size, TQSize::ScaleMin); img = img.smoothScale(scaledSize.width(), scaledSize.height()); } @@ -218,7 +218,7 @@ void PreviewLoadingTask::execute() // dispatch image to all listeners, including this for (LoadingProcessListener *l = m_listeners.first(); l; l = m_listeners.next()) { - QApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, img)); + TQApplication::postEvent(l->eventReceiver(), new LoadedEvent(m_loadingDescription, img)); } // remove myself from list of listeners @@ -228,12 +228,12 @@ void PreviewLoadingTask::execute() // wait until all listeners have removed themselves while (m_listeners.count() != 0) lock.timedWait(); - // set to 0, as checked in setStatus + // set to 0, as checked in settqStatus m_usedProcess = 0; } } -bool PreviewLoadingTask::needToScale(const QSize &imageSize, int previewSize) +bool PreviewLoadingTask::needToScale(const TQSize &imageSize, int previewSize) { int maxSize = imageSize.width() > imageSize.height() ? imageSize.width() : imageSize.height(); int acceptableUpperSize = lround(1.25 * (double)previewSize); @@ -242,7 +242,7 @@ bool PreviewLoadingTask::needToScale(const QSize &imageSize, int previewSize) // -- Exif/IPTC preview extraction using Exiv2 -------------------------------------------------------- -bool PreviewLoadingTask::loadImagePreview(QImage& image, const QString& path) +bool PreviewLoadingTask::loadImagePreview(TQImage& image, const TQString& path) { DMetadata metadata(path); if (metadata.getImagePreview(image)) diff --git a/digikam/libs/threadimageio/previewtask.h b/digikam/libs/threadimageio/previewtask.h index aca2160..f571549 100644 --- a/digikam/libs/threadimageio/previewtask.h +++ b/digikam/libs/threadimageio/previewtask.h @@ -25,9 +25,9 @@ #ifndef PREVIEW_TASK_H #define PREVIEW_TASK_H -// Qt includes. +// TQt includes. -#include <qimage.h> +#include <tqimage.h> // Local includes. @@ -48,8 +48,8 @@ public: private: - bool needToScale(const QSize &imageSize, int previewSize); - bool loadImagePreview(QImage& image, const QString& path); + bool needToScale(const TQSize &imageSize, int previewSize); + bool loadImagePreview(TQImage& image, const TQString& path); }; } // namespace Digikam diff --git a/digikam/libs/threadimageio/sharedloadsavethread.cpp b/digikam/libs/threadimageio/sharedloadsavethread.cpp index 7d8b893..6a9cccb 100644 --- a/digikam/libs/threadimageio/sharedloadsavethread.cpp +++ b/digikam/libs/threadimageio/sharedloadsavethread.cpp @@ -37,12 +37,12 @@ void SharedLoadSaveThread::load(LoadingDescription description, AccessMode mode, ManagedLoadSaveThread::load(description, LoadingModeShared, policy, mode); } -DImg SharedLoadSaveThread::cacheLookup(const QString& filePath, AccessMode /*accessMode*/) +DImg SharedLoadSaveThread::cacheLookup(const TQString& filePath, AccessMode /*accessMode*/) { LoadingCache *cache = LoadingCache::cache(); LoadingCache::CacheLock lock(cache); DImg *cachedImg = cache->retrieveImage(filePath); - // Qt4: uncomment this code. + // TQt4: uncomment this code. // See comments in SharedLoadingTask::execute for explanation. /* if (cachedImg) diff --git a/digikam/libs/threadimageio/sharedloadsavethread.h b/digikam/libs/threadimageio/sharedloadsavethread.h index 9928dad..aa03a70 100644 --- a/digikam/libs/threadimageio/sharedloadsavethread.h +++ b/digikam/libs/threadimageio/sharedloadsavethread.h @@ -34,7 +34,7 @@ class DIGIKAM_EXPORT SharedLoadSaveThread : public ManagedLoadSaveThread public: void load(LoadingDescription description, AccessMode mode, LoadingPolicy policy = LoadingPolicyAppend); - DImg cacheLookup(const QString& filePath, AccessMode mode); + DImg cacheLookup(const TQString& filePath, AccessMode mode); }; } // namespace Digikam diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 10575ad..65bac0f 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -33,18 +33,18 @@ extern "C" #include <cmath> -// Qt includes. - -#include <qdir.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qdict.h> -#include <qpoint.h> -#include <qstylesheet.h> -#include <qdatetime.h> -#include <qguardedptr.h> +// TQt includes. + +#include <tqdir.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqdict.h> +#include <tqpoint.h> +#include <tqstylesheet.h> +#include <tqdatetime.h> +#include <tqguardedptr.h> // KDE includes. @@ -107,16 +107,16 @@ public: int tileSize; int orientation; - QTimer *timer; + TQTimer *timer; - QPoint dragStartPos; + TQPoint dragStartPos; ThumbBarItem *firstItem; ThumbBarItem *lastItem; ThumbBarItem *currItem; - QDict<ThumbBarItem> itemDict; - QGuardedPtr<ThumbnailJob> thumbJob; + TQDict<ThumbBarItem> itemDict; + TQGuardedPtr<ThumbnailJob> thumbJob; ThumbBarToolTipSettings toolTipSettings; @@ -140,7 +140,7 @@ public: int pos; - QPixmap *pixmap; + TQPixmap *pixmap; KURL url; @@ -152,34 +152,34 @@ public: // ------------------------------------------------------------------------- -ThumbBarView::ThumbBarView(QWidget* parent, int orientation, bool exifRotate, +ThumbBarView::ThumbBarView(TQWidget* tqparent, int orientation, bool exifRotate, ThumbBarToolTipSettings settings) - : QScrollView(parent) + : TQScrollView(tqparent) { d = new ThumbBarViewPriv; d->orientation = orientation; d->exifRotate = exifRotate; d->toolTipSettings = settings; d->toolTip = new ThumbBarToolTip(this); - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotUpdate())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdate())); - viewport()->setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setMouseTracking(true); viewport()->setAcceptDrops(true); - setFrameStyle(QFrame::NoFrame); + setFrameStyle(TQFrame::NoFrame); setAcceptDrops(true); - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) { - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); } else { - setVScrollBarMode(QScrollView::AlwaysOff); + setVScrollBarMode(TQScrollView::AlwaysOff); } } @@ -198,21 +198,21 @@ ThumbBarView::~ThumbBarView() delete d; } -void ThumbBarView::resizeEvent(QResizeEvent* e) +void ThumbBarView::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) { - d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width(); + d->tileSize = width() - 2*d->margin - verticalScrollBar()->tqsizeHint().width(); verticalScrollBar()->setLineStep(d->tileSize); verticalScrollBar()->setPageStep(2*d->tileSize); } else { - d->tileSize = height() - 2*d->margin - horizontalScrollBar()->sizeHint().height(); + d->tileSize = height() - 2*d->margin - horizontalScrollBar()->tqsizeHint().height(); horizontalScrollBar()->setLineStep(d->tileSize); horizontalScrollBar()->setPageStep(2*d->tileSize); } @@ -227,23 +227,23 @@ void ThumbBarView::setExifRotate(bool exifRotate) return; d->exifRotate = exifRotate; - QString thumbCacheDir = QDir::homeDirPath() + "/.thumbnails/"; + TQString thumbCacheDir = TQDir::homeDirPath() + "/.thumbnails/"; for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) { // Remove all current album item thumbs from disk cache. - QString uri = "file://" + QDir::cleanDirPath(item->url().path(-1)); - KMD5 md5(QFile::encodeName(uri)); + TQString uri = "file://" + TQDir::cleanDirPath(item->url().path(-1)); + KMD5 md5(TQFile::encodeName(uri).data()); uri = md5.hexDigest(); - QString smallThumbPath = thumbCacheDir + "normal/" + uri + ".png"; - QString bigThumbPath = thumbCacheDir + "large/" + uri + ".png"; + TQString smallThumbPath = thumbCacheDir + "normal/" + uri + ".png"; + TQString bigThumbPath = thumbCacheDir + "large/" + uri + ".png"; - ::unlink(QFile::encodeName(smallThumbPath)); - ::unlink(QFile::encodeName(bigThumbPath)); + ::unlink(TQFile::encodeName(smallThumbPath)); + ::unlink(TQFile::encodeName(bigThumbPath)); - invalidateThumb(item); + tqinvalidateThumb(item); } triggerUpdate(); @@ -341,11 +341,11 @@ ThumbBarItem* ThumbBarView::lastItem() const return d->lastItem; } -ThumbBarItem* ThumbBarView::findItem(const QPoint& pos) const +ThumbBarItem* ThumbBarView::findItem(const TQPoint& pos) const { int itemPos; - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) itemPos = pos.y(); else itemPos = pos.x(); @@ -388,12 +388,12 @@ void ThumbBarView::setSelected(ThumbBarItem* item) { ThumbBarItem* item = d->currItem; d->currItem = 0; - item->repaint(); + item->tqrepaint(); } d->currItem = item; if (d->currItem) - item->repaint(); + item->tqrepaint(); } void ThumbBarView::ensureItemVisible(ThumbBarItem* item) @@ -403,7 +403,7 @@ void ThumbBarView::ensureItemVisible(ThumbBarItem* item) // We want the complete thumb visible and the next one. // find the middle of the image and give a margin of 1,5 image // When changed, watch regression for bug 104031 - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) ensureVisible(0, (int)(item->d->pos + d->margin + d->tileSize*.5), 0, (int)(d->tileSize*1.5 + 3*d->margin)); else @@ -419,12 +419,12 @@ void ThumbBarView::refreshThumbs(const KURL::List& urls) ThumbBarItem *item = findItemByURL(*it); if (item) { - invalidateThumb(item); + tqinvalidateThumb(item); } } } -void ThumbBarView::invalidateThumb(ThumbBarItem* item) +void ThumbBarView::tqinvalidateThumb(ThumbBarItem* item) { if (!item) return; @@ -442,20 +442,20 @@ void ThumbBarView::invalidateThumb(ThumbBarItem* item) d->thumbJob = new ThumbnailJob(item->url(), ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotGotThumbnail(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotFailedThumbnail(const KURL&))); } -void ThumbBarView::viewportPaintEvent(QPaintEvent* e) +void ThumbBarView::viewportPaintEvent(TQPaintEvent* e) { int cy, cx, ts, y1, y2, x1, x2; - QPixmap bgPix, tile; - QRect er(e->rect()); + TQPixmap bgPix, tile; + TQRect er(e->rect()); - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -480,29 +480,29 @@ void ThumbBarView::viewportPaintEvent(QPaintEvent* e) x2 = ((x1 + er.width())/ts +1)*ts; } - bgPix.fill(colorGroup().background()); + bgPix.fill(tqcolorGroup().background()); for (ThumbBarItem *item = d->firstItem; item; item = item->d->next) { - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) { if (y1 <= item->d->pos && item->d->pos <= y2) { if (item == d->currItem) - tile.fill(colorGroup().highlight()); + tile.fill(tqcolorGroup().highlight()); else - tile.fill(colorGroup().background()); + tile.fill(tqcolorGroup().background()); - QPainter p(&tile); - p.setPen(Qt::white); + TQPainter p(&tile); + p.setPen(TQt::white); p.drawRect(0, 0, tile.width(), tile.height()); p.end(); if (item->d->pixmap) { - QPixmap pix; - pix.convertFromImage(QImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, QImage::ScaleMin)); + TQPixmap pix; + pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). + smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -516,20 +516,20 @@ void ThumbBarView::viewportPaintEvent(QPaintEvent* e) if (x1 <= item->d->pos && item->d->pos <= x2) { if (item == d->currItem) - tile.fill(colorGroup().highlight()); + tile.fill(tqcolorGroup().highlight()); else - tile.fill(colorGroup().background()); + tile.fill(tqcolorGroup().background()); - QPainter p(&tile); - p.setPen(Qt::white); + TQPainter p(&tile); + p.setPen(TQt::white); p.drawRect(0, 0, tile.width(), tile.height()); p.end(); if (item->d->pixmap) { - QPixmap pix; - pix.convertFromImage(QImage(item->d->pixmap->convertToImage()). - smoothScale(d->tileSize, d->tileSize, QImage::ScaleMin)); + TQPixmap pix; + pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()). + smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -540,13 +540,13 @@ void ThumbBarView::viewportPaintEvent(QPaintEvent* e) } } - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); } -void ThumbBarView::contentsMousePressEvent(QMouseEvent* e) +void ThumbBarView::contentsMousePressEvent(TQMouseEvent* e) { ThumbBarItem* barItem = findItem(e->pos()); d->dragging = true; @@ -559,21 +559,21 @@ void ThumbBarView::contentsMousePressEvent(QMouseEvent* e) { ThumbBarItem* item = d->currItem; d->currItem = 0; - item->repaint(); + item->tqrepaint(); } d->currItem = barItem; - barItem->repaint(); + barItem->tqrepaint(); } -void ThumbBarView::contentsMouseMoveEvent(QMouseEvent *e) +void ThumbBarView::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; if (d->dragging && (e->state() & Qt::LeftButton)) { if ( findItem(d->dragStartPos) && - (d->dragStartPos - e->pos()).manhattanLength() > QApplication::startDragDistance() ) + (d->dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance() ) { startDrag(); } @@ -581,7 +581,7 @@ void ThumbBarView::contentsMouseMoveEvent(QMouseEvent *e) } } -void ThumbBarView::contentsMouseReleaseEvent(QMouseEvent *e) +void ThumbBarView::contentsMouseReleaseEvent(TQMouseEvent *e) { d->dragging = false; ThumbBarItem *item = findItem(e->pos()); @@ -592,22 +592,22 @@ void ThumbBarView::contentsMouseReleaseEvent(QMouseEvent *e) } } -void ThumbBarView::contentsWheelEvent(QWheelEvent *e) +void ThumbBarView::contentsWheelEvent(TQWheelEvent *e) { e->accept(); if (e->delta() < 0) { - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) { - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) scrollBy(0, verticalScrollBar()->pageStep()); else scrollBy(horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) scrollBy(0, verticalScrollBar()->lineStep()); else scrollBy(horizontalScrollBar()->lineStep(), 0); @@ -616,16 +616,16 @@ void ThumbBarView::contentsWheelEvent(QWheelEvent *e) if (e->delta() > 0) { - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) { - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->pageStep()); else scrollBy((-1)*horizontalScrollBar()->pageStep(), 0); } else { - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) scrollBy(0, (-1)*verticalScrollBar()->lineStep()); else scrollBy((-1)*horizontalScrollBar()->lineStep(), 0); @@ -736,7 +736,7 @@ void ThumbBarView::rearrangeItems() item = item->d->next; } - if (d->orientation == Vertical) + if (d->orientation ==Qt::Vertical) resizeContents(visibleWidth(), d->count*(d->tileSize+2*d->margin)); else resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight()); @@ -751,22 +751,22 @@ void ThumbBarView::rearrangeItems() d->thumbJob = new ThumbnailJob(urlList, ThumbnailSize::Huge, true, d->exifRotate); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotGotThumbnail(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotGotThumbnail(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotFailedThumbnail(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotFailedThumbnail(const KURL&))); } } -void ThumbBarView::repaintItem(ThumbBarItem* item) +void ThumbBarView::tqrepaintItem(ThumbBarItem* item) { if (item) { - if (d->orientation == Vertical) - repaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin); + if (d->orientation ==Qt::Vertical) + tqrepaintContents(0, item->d->pos, visibleWidth(), d->tileSize+2*d->margin); else - repaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight()); + tqrepaintContents(item->d->pos, 0, d->tileSize+2*d->margin, visibleHeight()); } } @@ -776,11 +776,11 @@ void ThumbBarView::slotUpdate() viewport()->update(); } -void ThumbBarView::slotGotThumbnail(const KURL& url, const QPixmap& pix) +void ThumbBarView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { if (!pix.isNull()) { - ThumbBarItem* item = d->itemDict.find(url.url()); + ThumbBarItem* item = d->itemDict.tqfind(url.url()); if (!item) return; @@ -790,19 +790,19 @@ void ThumbBarView::slotGotThumbnail(const KURL& url, const QPixmap& pix) item->d->pixmap = 0; } - item->d->pixmap = new QPixmap(pix); - item->repaint(); + item->d->pixmap = new TQPixmap(pix); + item->tqrepaint(); } } void ThumbBarView::slotFailedThumbnail(const KURL& url) { - ThumbBarItem* item = d->itemDict.find(url.url()); + ThumbBarItem* item = d->itemDict.tqfind(url.url()); if (!item) return; KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); - QPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, ThumbnailSize::Huge); + TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, ThumbnailSize::Huge); if (item->d->pixmap) { @@ -810,8 +810,8 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url) item->d->pixmap = 0; } - item->d->pixmap = new QPixmap(pix); - item->repaint(); + item->d->pixmap = new TQPixmap(pix); + item->tqrepaint(); } // ------------------------------------------------------------------------- @@ -849,17 +849,17 @@ ThumbBarItem* ThumbBarItem::prev() const return d->prev; } -QRect ThumbBarItem::rect() const +TQRect ThumbBarItem::rect() const { if (d->view->d->orientation == ThumbBarView::Vertical) { - return QRect(0, d->pos, + return TQRect(0, d->pos, d->view->visibleWidth(), d->view->d->tileSize + 2*d->view->d->margin); } else { - return QRect(d->pos, 0, + return TQRect(d->pos, 0, d->view->d->tileSize + 2*d->view->d->margin, d->view->visibleHeight()); } @@ -870,65 +870,65 @@ int ThumbBarItem::position() const return d->pos; } -QPixmap* ThumbBarItem::pixmap() const +TQPixmap* ThumbBarItem::pixmap() const { return d->pixmap; } -void ThumbBarItem::repaint() +void ThumbBarItem::tqrepaint() { - d->view->repaintItem(this); + d->view->tqrepaintItem(this); } // ------------------------------------------------------------------------- -ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* parent) - : QToolTip(parent->viewport()), m_maxStringLen(30), m_view(parent) +ThumbBarToolTip::ThumbBarToolTip(ThumbBarView* tqparent) + : TQToolTip(tqparent->viewport()), m_maxStringLen(30), m_view(tqparent) { - m_headBeg = QString("<tr bgcolor=\"orange\"><td colspan=\"2\">" + m_headBeg = TQString("<tr bgcolor=\"orange\"><td colspan=\"2\">" "<nobr><font size=\"-1\" color=\"black\"><b>"); - m_headEnd = QString("</b></font></nobr></td></tr>"); + m_headEnd = TQString("</b></font></nobr></td></tr>"); - m_cellBeg = QString("<tr><td><nobr><font size=\"-1\" color=\"black\">"); - m_cellMid = QString("</font></nobr></td>" + m_cellBeg = TQString("<tr><td><nobr><font size=\"-1\" color=\"black\">"); + m_cellMid = TQString("</font></nobr></td>" "<td><nobr><font size=\"-1\" color=\"black\">"); - m_cellEnd = QString("</font></nobr></td></tr>"); + m_cellEnd = TQString("</font></nobr></td></tr>"); - m_cellSpecBeg = QString("<tr><td><nobr><font size=\"-1\" color=\"black\">"); - m_cellSpecMid = QString("</font></nobr></td>" + m_cellSpecBeg = TQString("<tr><td><nobr><font size=\"-1\" color=\"black\">"); + m_cellSpecMid = TQString("</font></nobr></td>" "<td><nobr><font size=\"-1\" color=\"steelblue\"><i>"); - m_cellSpecEnd = QString("</i></font></nobr></td></tr>"); + m_cellSpecEnd = TQString("</i></font></nobr></td></tr>"); } -void ThumbBarToolTip::maybeTip(const QPoint& pos) +void ThumbBarToolTip::maybeTip(const TQPoint& pos) { - if ( !parentWidget() || !m_view) return; + if ( !tqparentWidget() || !m_view) return; ThumbBarItem* item = m_view->findItem( m_view->viewportToContents(pos) ); if (!item) return; if (!m_view->getToolTipSettings().showToolTips) return; - QString tipText = tipContent(item); + TQString tipText = tipContent(item); tipText.append(tipContentExtraData(item)); tipText.append("</table>"); - QRect r(item->rect()); - r = QRect( m_view->contentsToViewport(r.topLeft()), r.size() ); + TQRect r(item->rect()); + r = TQRect( m_view->contentsToViewport(r.topLeft()), r.size() ); tip(r, tipText); } -QString ThumbBarToolTip::tipContent(ThumbBarItem* item) +TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) { ThumbBarToolTipSettings settings = m_view->getToolTipSettings(); - QString tipText, str; - QString unavailable(i18n("unavailable")); + TQString tipText, str; + TQString unavailable(i18n("unavailable")); tipText = "<table cellspacing=\"0\" cellpadding=\"0\" width=\"250\" border=\"0\">"; - QFileInfo fileInfo(item->url().path()); + TQFileInfo fileInfo(item->url().path()); KFileItem fi(KFileItem::Unknown, KFileItem::Unknown, item->url()); DMetadata metaData(item->url().path()); @@ -951,7 +951,7 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showFileDate) { - QDateTime modifiedDate = fileInfo.lastModified(); + TQDateTime modifiedDate = fileInfo.lastModified(); str = KGlobal::locale()->formatDateTime(modifiedDate, true, true); tipText += m_cellBeg + i18n("Modified:") + m_cellMid + str + m_cellEnd; } @@ -959,20 +959,20 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showFileSize) { tipText += m_cellBeg + i18n("Size:") + m_cellMid; - str = i18n("%1 (%2)").arg(KIO::convertSize(fi.size())) - .arg(KGlobal::locale()->formatNumber(fi.size(), 0)); + str = i18n("%1 (%2)").tqarg(KIO::convertSize(fi.size())) + .tqarg(KGlobal::locale()->formatNumber(fi.size(), 0)); tipText += str + m_cellEnd; } - QSize dims; + TQSize dims; #if KDCRAW_VERSION < 0x000106 - QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); + TQString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles()); #else - QString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); + TQString rawFilesExt(KDcrawIface::KDcraw::rawFiles()); #endif - QString ext = fileInfo.extension(false).upper(); + TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) { str = i18n("RAW Image"); dims = metaData.getImageDimensions(); @@ -1000,10 +1000,10 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (settings.showImageDim) { - QString mpixels; + TQString mpixels; mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); tipText += m_cellBeg + i18n("Dimensions:") + m_cellMid + str + m_cellEnd; } } @@ -1022,15 +1022,15 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) if (!photoInfo.isEmpty()) { - QString metaStr; + TQString metaStr; tipText += m_headBeg + i18n("Photograph Properties") + m_headEnd; if (settings.showPhotoMake) { - str = QString("%1 / %2").arg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) - .arg(photoInfo.model.isEmpty() ? unavailable : photoInfo.model); + str = TQString("%1 / %2").tqarg(photoInfo.make.isEmpty() ? unavailable : photoInfo.make) + .tqarg(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 + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Make/Model:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } if (settings.showPhotoDate) @@ -1039,10 +1039,10 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) { str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("Created:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Created:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } else - metaStr += m_cellBeg + i18n("Created:") + m_cellMid + QStyleSheet::escape( unavailable ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Created:") + m_cellMid + TQStyleSheet::escape( unavailable ) + m_cellEnd; } if (settings.showPhotoFocal) @@ -1050,20 +1050,20 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) str = photoInfo.aperture.isEmpty() ? unavailable : photoInfo.aperture; if (photoInfo.focalLength35mm.isEmpty()) - str += QString(" / %1").arg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); + str += TQString(" / %1").tqarg(photoInfo.focalLength.isEmpty() ? unavailable : photoInfo.focalLength); else - str += QString(" / %1").arg(i18n("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm)); + str += TQString(" / %1").tqarg(i18n("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm)); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("Aperture/Focal:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Aperture/Focal:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } if (settings.showPhotoExpo) { - str = QString("%1 / %2").arg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) - .arg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").arg(photoInfo.sensitivity)); + str = TQString("%1 / %2").tqarg(photoInfo.exposureTime.isEmpty() ? unavailable : photoInfo.exposureTime) + .tqarg(photoInfo.sensitivity.isEmpty() ? unavailable : i18n("%1 ISO").tqarg(photoInfo.sensitivity)); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("Exposure/Sensitivity:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Exposure/Sensitivity:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } if (settings.showPhotoMode) @@ -1076,23 +1076,23 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) else if (photoInfo.exposureMode.isEmpty() && !photoInfo.exposureProgram.isEmpty()) str = photoInfo.exposureProgram; else - str = QString("%1 / %2").arg(photoInfo.exposureMode).arg(photoInfo.exposureProgram); + str = TQString("%1 / %2").tqarg(photoInfo.exposureMode).tqarg(photoInfo.exposureProgram); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("Mode/Program:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Mode/Program:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } if (settings.showPhotoFlash) { str = photoInfo.flash.isEmpty() ? unavailable : photoInfo.flash; if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("Flash:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("Flash:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } if (settings.showPhotoWB) { str = photoInfo.whiteBalance.isEmpty() ? unavailable : photoInfo.whiteBalance; if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; - metaStr += m_cellBeg + i18n("White Balance:") + m_cellMid + QStyleSheet::escape( str ) + m_cellEnd; + metaStr += m_cellBeg + i18n("White Balance:") + m_cellMid + TQStyleSheet::escape( str ) + m_cellEnd; } tipText += metaStr; @@ -1102,16 +1102,16 @@ QString ThumbBarToolTip::tipContent(ThumbBarItem* item) return tipText; } -QString ThumbBarToolTip::breakString(const QString& input) +TQString ThumbBarToolTip::breakString(const TQString& input) { - QString str = input.simplifyWhiteSpace(); - str = QStyleSheet::escape(str); + TQString str = input.simplifyWhiteSpace(); + str = TQStyleSheet::escape(str); const uint maxLen = m_maxStringLen; if (str.length() <= maxLen) return str; - QString br; + TQString br; uint i = 0; uint count = 0; diff --git a/digikam/libs/thumbbar/thumbbar.h b/digikam/libs/thumbbar/thumbbar.h index 8cccfe5..4c136aa 100644 --- a/digikam/libs/thumbbar/thumbbar.h +++ b/digikam/libs/thumbbar/thumbbar.h @@ -25,11 +25,11 @@ #ifndef THUMBBAR_H #define THUMBBAR_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qscrollview.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqscrollview.h> +#include <tqtooltip.h> // KDE includes. @@ -85,21 +85,22 @@ public: // ------------------------------------------------------------------------- -class DIGIKAM_EXPORT ThumbBarView : public QScrollView +class DIGIKAM_EXPORT ThumbBarView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: enum Orientation { - Horizontal=0, - Vertical + Horizontal=0, + Vertical }; public: - ThumbBarView(QWidget* parent, int orientation=Vertical, bool exifRotate=true, + ThumbBarView(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true, ThumbBarToolTipSettings settings=ThumbBarToolTipSettings()); virtual ~ThumbBarView(); @@ -123,11 +124,11 @@ public: ThumbBarItem* currentItem() const; ThumbBarItem* firstItem() const; ThumbBarItem* lastItem() const; - ThumbBarItem* findItem(const QPoint& pos) const; + ThumbBarItem* findItem(const TQPoint& pos) const; ThumbBarItem* findItemByURL(const KURL& url) const; void refreshThumbs(const KURL::List& urls); - void invalidateThumb(ThumbBarItem* item); + void tqinvalidateThumb(ThumbBarItem* item); signals: @@ -141,17 +142,17 @@ protected: int getTileSize(); int getMargin(); - void resizeEvent(QResizeEvent*); - void contentsMousePressEvent(QMouseEvent*); - void contentsMouseMoveEvent(QMouseEvent*); - void contentsMouseReleaseEvent(QMouseEvent*); - void contentsWheelEvent(QWheelEvent*); + void resizeEvent(TQResizeEvent*); + void contentsMousePressEvent(TQMouseEvent*); + void contentsMouseMoveEvent(TQMouseEvent*); + void contentsMouseReleaseEvent(TQMouseEvent*); + void contentsWheelEvent(TQWheelEvent*); void insertItem(ThumbBarItem* item); void rearrangeItems(); - void repaintItem(ThumbBarItem* item); + void tqrepaintItem(ThumbBarItem* item); - virtual void viewportPaintEvent(QPaintEvent*); + virtual void viewportPaintEvent(TQPaintEvent*); virtual void startDrag(); protected slots: @@ -160,7 +161,7 @@ protected slots: private slots: - void slotGotThumbnail(const KURL&, const QPixmap&); + void slotGotThumbnail(const KURL&, const TQPixmap&); void slotFailedThumbnail(const KURL&); private: @@ -184,10 +185,10 @@ public: ThumbBarItem* next() const; ThumbBarItem* prev() const; int position() const; - QRect rect() const; - QPixmap* pixmap() const; + TQRect rect() const; + TQPixmap* pixmap() const; - void repaint(); + void tqrepaint(); private: @@ -198,39 +199,39 @@ private: // ------------------------------------------------------------------------- -class DIGIKAM_EXPORT ThumbBarToolTip : public QToolTip +class DIGIKAM_EXPORT ThumbBarToolTip : public TQToolTip { public: - ThumbBarToolTip(ThumbBarView *parent); + ThumbBarToolTip(ThumbBarView *tqparent); virtual ~ThumbBarToolTip(){}; protected: const uint m_maxStringLen; - QString m_headBeg; - QString m_headEnd; - QString m_cellBeg; - QString m_cellMid; - QString m_cellEnd; - QString m_cellSpecBeg; - QString m_cellSpecMid; - QString m_cellSpecEnd; + TQString m_headBeg; + TQString m_headEnd; + TQString m_cellBeg; + TQString m_cellMid; + TQString m_cellEnd; + TQString m_cellSpecBeg; + TQString m_cellSpecMid; + TQString m_cellSpecEnd; ThumbBarView *m_view; protected: - QString breakString(const QString& input); + TQString breakString(const TQString& input); - virtual QString tipContentExtraData(ThumbBarItem*){ return QString(); }; + virtual TQString tipContentExtraData(ThumbBarItem*){ return TQString(); }; private: - void maybeTip(const QPoint& pos); - QString tipContent(ThumbBarItem* item); + void maybeTip(const TQPoint& pos); + TQString tipContent(ThumbBarItem* item); }; } // NameSpace Digikam diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 4b0ffa2..73c198c 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -33,16 +33,16 @@ extern "C" #include <unistd.h> } -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qcolor.h> -#include <qdatastream.h> +#include <tqstring.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqcolor.h> +#include <tqdatastream.h> // KDE includes. @@ -151,7 +151,7 @@ void ThumbnailJob::addItems(const KURL::List& urlList) bool ThumbnailJob::setNextItemToLoad(const KURL& url) { - KURL::List::const_iterator it = d->urlList.find(url); + KURL::List::const_iterator it = d->urlList.tqfind(url); if (it != d->urlList.end()) { d->next_url = *it; @@ -175,7 +175,7 @@ void ThumbnailJob::processNext() return; } - KURL::List::iterator it = d->urlList.find(d->next_url); + KURL::List::iterator it = d->urlList.tqfind(d->next_url); if (it == d->urlList.end()) { it = d->urlList.begin(); @@ -196,18 +196,18 @@ void ThumbnailJob::processNext() url.setProtocol("digikamthumbnail"); KIO::TransferJob *job = KIO::get(url, false, false); - job->addMetaData("size", QString::number(d->size)); + job->addMetaData("size", TQString::number(d->size)); createShmSeg(); if (d->shmid != -1) - job->addMetaData("shmid", QString::number(d->shmid)); + job->addMetaData("shmid", TQString::number(d->shmid)); // Rotate thumbnail accordindly with Exif rotation tag if necessary. if (d->exifRotate) job->addMetaData("exif", "yes"); - connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), - this, SLOT(slotThumbData(KIO::Job *, const QByteArray &))); + connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotThumbData(KIO::Job *, const TQByteArray &))); addSubjob(job); d->running = true; @@ -253,21 +253,21 @@ void ThumbnailJob::createShmSeg() } } -void ThumbnailJob::slotThumbData(KIO::Job*, const QByteArray &data) +void ThumbnailJob::slotThumbData(KIO::Job*, const TQByteArray &data) { if (data.isEmpty()) return; - QImage thumb; - QDataStream stream(data, IO_ReadOnly); + TQImage thumb; + TQDataStream stream(data, IO_ReadOnly); if (d->shmaddr) { int width, height, depth; stream >> width >> height >> depth; - thumb = QImage(d->shmaddr, width, height, depth, - 0, 0, QImage::IgnoreEndian); + thumb = TQImage(d->shmaddr, width, height, depth, + 0, 0, TQImage::IgnoreEndian); - // The buffer supplied to the QImage constructor above must remain valid + // The buffer supplied to the TQImage constructor above must remain valid // throughout the lifetime of the object. // This is not true, the shared memory will be freed or reused. // If we pass the object around, we must do a deep copy. @@ -288,14 +288,14 @@ void ThumbnailJob::slotThumbData(KIO::Job*, const QByteArray &data) emitThumbnail(thumb); } -void ThumbnailJob::emitThumbnail(QImage& thumb) +void ThumbnailJob::emitThumbnail(TQImage& thumb) { if (thumb.isNull()) { return; } - QPixmap pix(thumb); + TQPixmap pix(thumb); int w = pix.width(); int h = pix.height(); @@ -304,8 +304,8 @@ void ThumbnailJob::emitThumbnail(QImage& thumb) // width and height are greater than 10 if (d->highlight && (w >= 10 && h >= 10)) { - QPainter p(&pix); - p.setPen(QPen(QColor(0,0,0),1)); + TQPainter p(&pix); + p.setPen(TQPen(TQColor(0,0,0),1)); p.drawRect(0,0,w,h); p.end(); } diff --git a/digikam/libs/thumbbar/thumbnailjob.h b/digikam/libs/thumbbar/thumbnailjob.h index 750bf99..b17ec3b 100644 --- a/digikam/libs/thumbbar/thumbnailjob.h +++ b/digikam/libs/thumbbar/thumbnailjob.h @@ -25,17 +25,17 @@ #ifndef THUMBNAILJOB_H #define THUMBNAILJOB_H -// Qt includes. +// TQt includes. -#include <qcstring.h> +#include <tqcstring.h> // KDE includes. #include <kio/job.h> #include <kurl.h> -class QPixmap; -class QImage; +class TQPixmap; +class TQImage; namespace Digikam { @@ -45,6 +45,7 @@ class ThumbnailJobPriv; class ThumbnailJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: @@ -62,20 +63,20 @@ public: signals: - void signalThumbnail(const KURL& url, const QPixmap& pix); + void signalThumbnail(const KURL& url, const TQPixmap& pix); void signalCompleted(); void signalFailed(const KURL& url); private: void processNext(); - void emitThumbnail(QImage& thumb); + void emitThumbnail(TQImage& thumb); void createShmSeg(); protected slots: void slotResult(KIO::Job *job); - void slotThumbData(KIO::Job *job, const QByteArray &data); + void slotThumbData(KIO::Job *job, const TQByteArray &data); private: diff --git a/digikam/libs/whitebalance/whitebalance.cpp b/digikam/libs/whitebalance/whitebalance.cpp index 0cd7a1d..9e74708 100644 --- a/digikam/libs/whitebalance/whitebalance.cpp +++ b/digikam/libs/whitebalance/whitebalance.cpp @@ -31,9 +31,9 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qcolor.h> +#include <tqcolor.h> // Local includes. @@ -131,7 +131,7 @@ void WhiteBalance::whiteBalance(uchar *data, int width, int height, bool sixteen adjustWhiteBalance(data, width, height, sixteenBit); } -void WhiteBalance::autoWBAdjustementFromColor(const QColor &tc, double &temperature, double &green) +void WhiteBalance::autoWBAdjustementFromColor(const TQColor &tc, double &temperature, double &green) { // Calculate Temperature and Green component from color picked. @@ -256,7 +256,7 @@ void WhiteBalance::setRGBmult(double &temperature, double &green, float &mr, flo mb = 1.0 / mb; // Normalize to at least 1.0, so we are not dimming colors only bumping. - mi = QMIN(mr, QMIN(mg, mb)); + mi = TQMIN(mr, TQMIN(mg, mb)); mr /= mi; mg /= mi; mb /= mi; @@ -321,10 +321,10 @@ void WhiteBalance::adjustWhiteBalance(uchar *data, int width, int height, bool s rv[0] = (int)(blue * d->mb); rv[1] = (int)(green * d->mg); rv[2] = (int)(red * d->mr); - v = QMAX(rv[0], rv[1]); - v = QMAX(v, rv[2]); + v = TQMAX(rv[0], rv[1]); + v = TQMAX(v, rv[2]); - if (d->clipSat) v = QMIN(v, (int)d->rgbMax-1); + if (d->clipSat) v = TQMIN(v, (int)d->rgbMax-1); i = v; ptr[0] = (uchar)pixelColor(rv[0], i, v); @@ -349,10 +349,10 @@ void WhiteBalance::adjustWhiteBalance(uchar *data, int width, int height, bool s rv[0] = (int)(blue * d->mb); rv[1] = (int)(green * d->mg); rv[2] = (int)(red * d->mr); - v = QMAX(rv[0], rv[1]); - v = QMAX(v, rv[2]); + v = TQMAX(rv[0], rv[1]); + v = TQMAX(v, rv[2]); - if (d->clipSat) v = QMIN(v, (int)d->rgbMax-1); + if (d->clipSat) v = TQMIN(v, (int)d->rgbMax-1); i = v; ptr[0] = pixelColor(rv[0], i, v); diff --git a/digikam/libs/whitebalance/whitebalance.h b/digikam/libs/whitebalance/whitebalance.h index b5c61e7..466fdc6 100644 --- a/digikam/libs/whitebalance/whitebalance.h +++ b/digikam/libs/whitebalance/whitebalance.h @@ -29,7 +29,7 @@ #include "digikam_export.h" -class QColor; +class TQColor; namespace Digikam { @@ -52,7 +52,7 @@ public: static void autoExposureAdjustement(uchar* data, int width, int height, bool sb, double &black, double &expo); - static void autoWBAdjustementFromColor(const QColor &tc, double &temperature, double &green); + static void autoWBAdjustementFromColor(const TQColor &tc, double &temperature, double &green); private: diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp index 37908da..13fdbc6 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.cpp +++ b/digikam/libs/widgets/common/colorgradientwidget.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qpainter.h> -#include <qdrawutil.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqdrawutil.h> // KDE includes. @@ -48,20 +48,20 @@ public: int orientation; - QColor color1; - QColor color2; + TQColor color1; + TQColor color2; }; -ColorGradientWidget::ColorGradientWidget(int o, int size, QWidget *parent) - : QFrame(parent, 0, Qt::WDestructiveClose) +ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *tqparent) + : TQFrame(tqparent, 0, TQt::WDestructiveClose) { d = new ColorGradientWidgetPriv; d->orientation = o; - setFrameStyle(QFrame::Box|QFrame::Plain); + setFrameStyle(TQFrame::Box|TQFrame::Plain); setLineWidth(1); - if ( d->orientation == Horizontal ) + if ( d->orientation ==Qt::Horizontal ) setFixedHeight( size ); else setFixedWidth( size ); @@ -75,25 +75,25 @@ ColorGradientWidget::~ColorGradientWidget() delete d; } -void ColorGradientWidget::setColors( const QColor &col1, const QColor &col2 ) +void ColorGradientWidget::setColors( const TQColor &col1, const TQColor &col2 ) { d->color1 = col1; d->color2 = col2; update(); } -void ColorGradientWidget::drawContents(QPainter *p) +void ColorGradientWidget::drawContents(TQPainter *p) { - QImage image(contentsRect().width(), contentsRect().height(), 32); + TQImage image(contentsRect().width(), contentsRect().height(), 32); - QColor col, color1, color2; + TQColor col, color1, color2; float scale; // Widget is disable : drawing grayed frame. if ( !isEnabled() ) { - color1 = palette().disabled().foreground(); - color2 = palette().disabled().background(); + color1 = tqpalette().disabled().foreground(); + color2 = tqpalette().disabled().background(); } else { @@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(QPainter *p) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( d->orientation == Vertical ) + if ( d->orientation ==Qt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { @@ -141,7 +141,7 @@ void ColorGradientWidget::drawContents(QPainter *p) } const int psize = 256; - QColor ditherPalette[psize]; + TQColor ditherPalette[psize]; for ( int s = 0; s < psize; s++ ) { @@ -152,7 +152,7 @@ void ColorGradientWidget::drawContents(QPainter *p) KImageEffect::dither(image, ditherPalette, psize); - QPixmap pm; + TQPixmap pm; pm.convertFromImage(image); p->drawPixmap(contentsRect(), pm); } diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/digikam/libs/widgets/common/colorgradientwidget.h index 3a7a336..d9aef44 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.h +++ b/digikam/libs/widgets/common/colorgradientwidget.h @@ -26,8 +26,8 @@ // KDE includes. -#include <qframe.h> -#include <qcolor.h> +#include <tqframe.h> +#include <tqcolor.h> // Local includes. @@ -38,29 +38,30 @@ namespace Digikam class ColorGradientWidgetPriv; -class DIGIKAM_EXPORT ColorGradientWidget : public QFrame +class DIGIKAM_EXPORT ColorGradientWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum Orientation { - Horizontal=0, - Vertical + Horizontal=0, + Vertical }; public: - ColorGradientWidget( int o, int size, QWidget *parent=0 ); + ColorGradientWidget( int o, int size, TQWidget *tqparent=0 ); ~ColorGradientWidget(); - void setColors( const QColor &col1, const QColor &col2 ); + void setColors( const TQColor &col1, const TQColor &col2 ); protected: - void drawContents(QPainter *); + void drawContents(TQPainter *); private: diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index bd8737a..41ab220 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -28,18 +28,18 @@ #include <cmath> #include <cstdlib> -// Qt includes. - -#include <qpixmap.h> -#include <qpainter.h> -#include <qpoint.h> -#include <qpen.h> -#include <qevent.h> -#include <qtimer.h> -#include <qrect.h> -#include <qcolor.h> -#include <qfont.h> -#include <qfontmetrics.h> +// TQt includes. + +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpoint.h> +#include <tqpen.h> +#include <tqevent.h> +#include <tqtimer.h> +#include <tqrect.h> +#include <tqcolor.h> +#include <tqfont.h> +#include <tqfontmetrics.h> // KDE includes. @@ -101,14 +101,14 @@ public: DColor colorGuide; - QTimer *blinkTimer; + TQTimer *blinkTimer; ImageCurves *curves; // Curves data instance. }; -CurvesWidget::CurvesWidget(int w, int h, QWidget *parent, bool readOnly) - : QWidget(parent, 0, Qt::WDestructiveClose) +CurvesWidget::CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new CurvesWidgetPriv; @@ -117,8 +117,8 @@ CurvesWidget::CurvesWidget(int w, int h, QWidget *parent, bool readOnly) CurvesWidget::CurvesWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, - QWidget *parent, bool readOnly) - : QWidget(parent, 0, Qt::WDestructiveClose) + TQWidget *tqparent, bool readOnly) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new CurvesWidgetPriv; @@ -148,13 +148,13 @@ void CurvesWidget::setup(int w, int h, bool readOnly) m_imageHistogram = 0; setMouseTracking(true); - setPaletteBackgroundColor(colorGroup().background()); + setPaletteBackgroundColor(tqcolorGroup().background()); setMinimumSize(w, h); - d->blinkTimer = new QTimer( this ); + d->blinkTimer = new TQTimer( this ); - connect(d->blinkTimer, SIGNAL(timeout()), - this, SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotBlinkTimerDone())); } void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits) @@ -168,7 +168,7 @@ void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenB delete m_imageHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); if (d->curves) delete d->curves; @@ -184,7 +184,7 @@ void CurvesWidget::reset() d->grabPoint = -1; d->guideVisible = false; - repaint(false); + tqrepaint(false); } ImageCurves* CurvesWidget::curves() const @@ -208,7 +208,7 @@ void CurvesWidget::setLoadingFailed() d->clearFlag = CurvesWidgetPriv::HistogramFailed; d->pos = 0; d->blinkTimer->stop(); - repaint(false); + tqrepaint(false); setCursor(KCursor::arrowCursor()); } @@ -216,7 +216,7 @@ void CurvesWidget::setCurveGuide(const DColor& color) { d->guideVisible = true; d->colorGuide = color; - repaint(false); + tqrepaint(false); } void CurvesWidget::curveTypeChanged() @@ -233,7 +233,7 @@ void CurvesWidget::curveTypeChanged() 0, m_imageHistogram->getHistogramSegment()-1); d->curves->setCurvePoint( m_channelType, - i * 2, QPoint(index, + i * 2, TQPoint(index, d->curves->getCurveValue(m_channelType, index)) ); } @@ -245,11 +245,11 @@ void CurvesWidget::curveTypeChanged() break; } - repaint(false); + tqrepaint(false); emit signalCurvesChanged(); } -void CurvesWidget::customEvent(QCustomEvent *event) +void CurvesWidget::customEvent(TQCustomEvent *event) { if (!event) return; @@ -262,7 +262,7 @@ void CurvesWidget::customEvent(QCustomEvent *event) setCursor(KCursor::waitCursor()); d->clearFlag = CurvesWidgetPriv::HistogramStarted; d->blinkTimer->start(200); - repaint(false); + tqrepaint(false); } else { @@ -271,14 +271,14 @@ void CurvesWidget::customEvent(QCustomEvent *event) // Repaint histogram d->clearFlag = CurvesWidgetPriv::HistogramCompleted; d->blinkTimer->stop(); - repaint(false); + tqrepaint(false); setCursor(KCursor::arrowCursor()); } else { d->clearFlag = CurvesWidgetPriv::HistogramFailed; d->blinkTimer->stop(); - repaint(false); + tqrepaint(false); setCursor(KCursor::arrowCursor()); emit signalHistogramComputationFailed(); } @@ -298,11 +298,11 @@ void CurvesWidget::stopHistogramComputation() void CurvesWidget::slotBlinkTimerDone() { - repaint(false); + tqrepaint(false); d->blinkTimer->start(200); } -void CurvesWidget::paintEvent(QPaintEvent*) +void CurvesWidget::paintEvent(TQPaintEvent*) { if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading || d->clearFlag == CurvesWidgetPriv::HistogramStarted) @@ -310,14 +310,14 @@ void CurvesWidget::paintEvent(QPaintEvent*) // In first, we draw an animation. int asize = 24; - QPixmap anim(asize, asize); - QPainter p2; - p2.begin(&anim, this); - p2.fillRect(0, 0, asize, asize, palette().active().background()); + TQPixmap anim(asize, asize); + TQPainter p2; + p2.tqbegin(TQT_TQPAINTDEVICE(&anim), this); + p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); d->pos = (d->pos + 10) % 360; - p2.setPen(QPen(palette().active().text())); + p2.setPen(TQPen(tqpalette().active().text())); p2.rotate(d->pos); for ( int i=0 ; i<12 ; i++ ) { @@ -328,20 +328,20 @@ void CurvesWidget::paintEvent(QPaintEvent*) // ... and we render busy text. - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, width(), height(), palette().active().background()); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + 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.drawRect(0, 0, width(), height()); p1.drawPixmap(width()/2 - asize /2, asize, anim); - p1.setPen(QPen(palette().active().text())); + p1.setPen(TQPen(tqpalette().active().text())); if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading) - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Loading image...")); else - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Histogram calculation...")); p1.end(); @@ -351,14 +351,14 @@ void CurvesWidget::paintEvent(QPaintEvent*) if (d->clearFlag == CurvesWidgetPriv::HistogramFailed) { - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, width(), height(), palette().active().background()); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + 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.drawRect(0, 0, width(), height()); - p1.setPen(QPen(palette().active().text())); - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.setPen(TQPen(tqpalette().active().text())); + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Histogram\ncalculation\nfailed.")); p1.end(); bitBlt(this, 0, 0, &pm); @@ -414,11 +414,11 @@ void CurvesWidget::paintEvent(QPaintEvent*) } // Drawing selection or all histogram values. - // A QPixmap is used for enable the double buffering. + // A TQPixmap is used for enable the double buffering. - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); + TQPixmap pm(size()); + TQPainter p1; + p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this); int curvePrevVal = 0; @@ -483,14 +483,14 @@ void CurvesWidget::paintEvent(QPaintEvent*) // Drawing histogram - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - y); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight - y, x, 0); // Drawing curves. - p1.setPen(QPen(palette().active().link(), 2, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().link(), 2, TQt::SolidLine)); p1.drawLine(x - 1, wHeight - ((curvePrevVal * wHeight) / histogram->getHistogramSegment()), x, wHeight - ((curveVal * wHeight) / histogram->getHistogramSegment())); @@ -501,11 +501,11 @@ void CurvesWidget::paintEvent(QPaintEvent*) if (!d->readOnlyMode && d->curves->getCurveType(m_channelType) == ImageCurves::CURVE_SMOOTH) { - p1.setPen(QPen(Qt::red, 3, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 3, TQt::SolidLine)); for (int p = 0 ; p < 17 ; p++) { - QPoint curvePoint = d->curves->getCurvePoint(m_channelType, p); + TQPoint curvePoint = d->curves->getCurvePoint(m_channelType, p); if (curvePoint.x() >= 0) { @@ -518,7 +518,7 @@ void CurvesWidget::paintEvent(QPaintEvent*) // Drawing black/middle/highlight tone grid separators. - p1.setPen(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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); @@ -528,16 +528,16 @@ void CurvesWidget::paintEvent(QPaintEvent*) // Drawing X,Y point position dragged by mouse over widget. - p1.setPen(QPen(Qt::red, 1, Qt::DotLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::DotLine)); if (d->xMouseOver != -1 && d->yMouseOver != -1) { - QString string = i18n("x:%1\ny:%2").arg(d->xMouseOver).arg(d->yMouseOver); - QFontMetrics fontMt(string); - QRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); + TQString string = i18n("x:%1\ny:%2").tqarg(d->xMouseOver).tqarg(d->yMouseOver); + TQFontMetrics fontMt(string); + TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); rect.moveRight(wWidth); rect.moveBottom(wHeight); - p1.drawText(rect, Qt::AlignLeft||Qt::AlignTop, string); + p1.drawText(rect, TQt::AlignLeft||TQt::AlignTop, string); } // Drawing color guide. @@ -561,7 +561,7 @@ void CurvesWidget::paintEvent(QPaintEvent*) break; case CurvesWidget::ValueHistogram: - guidePos = QMAX(QMAX(d->colorGuide.red(), d->colorGuide.green()), d->colorGuide.blue()); + guidePos = TQMAX(TQMAX(d->colorGuide.red(), d->colorGuide.green()), d->colorGuide.blue()); break; default: // Alpha. @@ -574,41 +574,41 @@ void CurvesWidget::paintEvent(QPaintEvent*) int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment(); p1.drawLine(xGuide, 0, xGuide, wHeight); - QString string = i18n("x:%1").arg(guidePos); - QFontMetrics fontMt( string ); - QRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + TQString string = i18n("x:%1").tqarg(guidePos); + TQFontMetrics fontMt( string ); + TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); rect.moveTop(1); if (xGuide < wWidth/2) { rect.moveLeft(xGuide); - p1.fillRect(rect, QBrush(QColor(250, 250, 255))); + p1.fillRect(rect, TQBrush(TQColor(250, 250, 255))); p1.drawRect(rect); rect.moveLeft(xGuide+3); - p1.drawText(rect, Qt::AlignLeft, string); + p1.drawText(rect, TQt::AlignLeft, string); } else { rect.moveRight(xGuide); - p1.fillRect(rect, QBrush(QColor(250, 250, 255))); + p1.fillRect(rect, TQBrush(TQColor(250, 250, 255))); p1.drawRect(rect); rect.moveRight(xGuide-3); - p1.drawText(rect, Qt::AlignRight, string); + p1.drawText(rect, TQt::AlignRight, string); } } } // Drawing frame. - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); p1.end(); bitBlt(this, 0, 0, &pm); } -void CurvesWidget::mousePressEvent(QMouseEvent *e) +void CurvesWidget::mousePressEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; @@ -678,7 +678,7 @@ void CurvesWidget::mousePressEvent(QMouseEvent *e) d->grabPoint = closest_point; d->curves->setCurvePoint(m_channelType, d->grabPoint, - QPoint(x, m_imageHistogram->getHistogramSegment() - y)); + TQPoint(x, m_imageHistogram->getHistogramSegment() - y)); break; } @@ -694,10 +694,10 @@ void CurvesWidget::mousePressEvent(QMouseEvent *e) } d->curves->curvesCalculateCurve(m_channelType); - repaint(false); + tqrepaint(false); } -void CurvesWidget::mouseReleaseEvent(QMouseEvent *e) +void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; @@ -707,11 +707,11 @@ void CurvesWidget::mouseReleaseEvent(QMouseEvent *e) setCursor(KCursor::arrowCursor()); d->grabPoint = -1; d->curves->curvesCalculateCurve(m_channelType); - repaint(false); + tqrepaint(false); emit signalCurvesChanged(); } -void CurvesWidget::mouseMoveEvent(QMouseEvent *e) +void CurvesWidget::mouseMoveEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; @@ -771,7 +771,7 @@ void CurvesWidget::mouseMoveEvent(QMouseEvent *e) d->grabPoint = closest_point; d->curves->setCurvePoint(m_channelType, d->grabPoint, - QPoint(x, m_imageHistogram->getHistogramSegment()-1 - y)); + TQPoint(x, m_imageHistogram->getHistogramSegment()-1 - y)); } d->curves->curvesCalculateCurve(m_channelType); @@ -824,15 +824,15 @@ void CurvesWidget::mouseMoveEvent(QMouseEvent *e) d->xMouseOver = x; d->yMouseOver = m_imageHistogram->getHistogramSegment()-1 - y; emit signalMouseMoved(d->xMouseOver, d->yMouseOver); - repaint(false); + tqrepaint(false); } -void CurvesWidget::leaveEvent(QEvent*) +void CurvesWidget::leaveEvent(TQEvent*) { d->xMouseOver = -1; d->yMouseOver = -1; emit signalMouseMoved(d->xMouseOver, d->yMouseOver); - repaint(false); + tqrepaint(false); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/common/curveswidget.h b/digikam/libs/widgets/common/curveswidget.h index f1b250c..a3c397b 100644 --- a/digikam/libs/widgets/common/curveswidget.h +++ b/digikam/libs/widgets/common/curveswidget.h @@ -24,16 +24,16 @@ #ifndef CURVESWIDGET_H #define CURVESWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. #include "dcolor.h" #include "digikam_export.h" -class QCustomEvent; +class TQCustomEvent; namespace Digikam { @@ -42,9 +42,10 @@ class ImageHistogram; class ImageCurves; class CurvesWidgetPriv; -class DIGIKAM_EXPORT CurvesWidget : public QWidget +class DIGIKAM_EXPORT CurvesWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -65,12 +66,12 @@ public: public: - CurvesWidget(int w, int h, QWidget *parent, bool readOnly=false); + CurvesWidget(int w, int h, TQWidget *tqparent, bool readOnly=false); CurvesWidget(int w, int h, // Widget size. uchar *i_data, uint i_w, uint i_h, // Full image info. bool i_sixteenBits, // 8 or 16 bits image. - QWidget *parent=0, // Parent widget instance. + TQWidget *tqparent=0, // Parent widget instance. bool readOnly=false); // If true : widget with full edition mode capabilities. // If false : display curve data only without edition. @@ -111,15 +112,15 @@ protected slots: protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void leaveEvent(QEvent*); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void leaveEvent(TQEvent*); private: - void customEvent(QCustomEvent *event); + void customEvent(TQCustomEvent *event); private: diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index f144aec..c2fe358 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qevent.h> -#include <qtooltip.h> +#include <tqevent.h> +#include <tqtooltip.h> // Local includes. @@ -34,20 +34,20 @@ namespace Digikam { -DCursorTracker::DCursorTracker(const QString& txt, QWidget *parent) - : QLabel(txt, 0, "", WX11BypassWM) +DCursorTracker::DCursorTracker(const TQString& txt, TQWidget *tqparent) + : TQLabel(txt, 0, "", WX11BypassWM) { - parent->setMouseTracking(true); - parent->installEventFilter(this); + tqparent->setMouseTracking(true); + tqparent->installEventFilter(this); setEnable(true); } /** * Overload to make sure the widget size is correct */ -void DCursorTracker::setText(const QString& txt) +void DCursorTracker::setText(const TQString& txt) { - QLabel::setText(txt); + TQLabel::setText(txt); adjustSize(); } @@ -56,20 +56,20 @@ void DCursorTracker::setEnable(bool b) m_enable = b; } -bool DCursorTracker::eventFilter(QObject *object, QEvent *e) +bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) { - QWidget *widget = static_cast<QWidget*>(object); + TQWidget *widget = TQT_TQWIDGET(object); switch (e->type()) { - case QEvent::MouseMove: + case TQEvent::MouseMove: { - QMouseEvent *event = static_cast<QMouseEvent*>(e); - if (m_enable && (widget->rect().contains(event->pos()) || - (event->stateAfter() & LeftButton))) + TQMouseEvent *event = TQT_TQMOUSEEVENT(e); + if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) || + (event->stateAfter() & Qt::LeftButton))) { show(); - QPoint p = widget->mapToGlobal(QPoint(widget->width()/2, 0)); + TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); move(p.x()-width()/2, p.y()-height()); } else @@ -79,10 +79,10 @@ bool DCursorTracker::eventFilter(QObject *object, QEvent *e) break; } - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: { - QMouseEvent* event = static_cast<QMouseEvent*>(e); - if ( !widget->rect().contains(event->pos()) ) + TQMouseEvent* event = TQT_TQMOUSEEVENT(e); + if ( !TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) ) { hide(); } @@ -97,13 +97,13 @@ bool DCursorTracker::eventFilter(QObject *object, QEvent *e) } -DTipTracker::DTipTracker(const QString& txt, QWidget *parent) - : DCursorTracker(txt, parent) +DTipTracker::DTipTracker(const TQString& txt, TQWidget *tqparent) + : DCursorTracker(txt, tqparent) { - setPalette(QToolTip::palette()); - setFrameStyle(QFrame::Plain | QFrame::Box); + setPalette(TQToolTip::palette()); + setFrameStyle(TQFrame::Plain | TQFrame::Box); setLineWidth(1); - setAlignment(AlignAuto | AlignTop); + tqsetAlignment(AlignAuto | AlignTop); } } // namespace Digikam diff --git a/digikam/libs/widgets/common/dcursortracker.h b/digikam/libs/widgets/common/dcursortracker.h index c6a30c1..8866584 100644 --- a/digikam/libs/widgets/common/dcursortracker.h +++ b/digikam/libs/widgets/common/dcursortracker.h @@ -25,9 +25,9 @@ #ifndef DCURSOR_TRACKER_H #define DCURSOR_TRACKER_H -// Qt includes. +// TQt includes. -#include <qlabel.h> +#include <tqlabel.h> // Local includes. @@ -40,19 +40,19 @@ namespace Digikam * This class implements a decoration-less window which will follow the cursor * when it's over a specified widget. */ -class DIGIKAM_EXPORT DCursorTracker : public QLabel +class DIGIKAM_EXPORT DCursorTracker : public TQLabel { public: - DCursorTracker(const QString& txt, QWidget *parent); + DCursorTracker(const TQString& txt, TQWidget *tqparent); - void setText(const QString& txt); + void setText(const TQString& txt); void setEnable(bool b); protected: - bool eventFilter(QObject*, QEvent*); + bool eventFilter(TQObject*, TQEvent*); private: @@ -68,7 +68,7 @@ class DTipTracker : public DCursorTracker public: - DTipTracker(const QString& txt, QWidget *parent); + DTipTracker(const TQString& txt, TQWidget *tqparent); }; } // namespace Digikam diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index e86bebf..d4b81ab 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtooltip.h> -#include <qpixmap.h> +#include <tqtooltip.h> +#include <tqpixmap.h> // KDE includes. @@ -43,14 +43,14 @@ namespace Digikam { -DLogoAction::DLogoAction(QObject* parent, const char* name) - : KAction(parent, name) +DLogoAction::DLogoAction(TQObject* tqparent, const char* name) + : KAction(tqparent, name) { setText("digikam.org"); setIcon("digikam"); } -int DLogoAction::plug(QWidget *widget, int index) +int DLogoAction::plug(TQWidget *widget, int index) { if (kapp && !kapp->authorizeKAction(name())) return -1; @@ -59,26 +59,26 @@ int DLogoAction::plug(QWidget *widget, int index) { KToolBar *bar = (KToolBar *)widget; int id = getToolButtonID(); - KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), QString(), bar); + KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar); pixmapLogo->setMargin(0); pixmapLogo->setScaledContents(false); - pixmapLogo->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); - QToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); + pixmapLogo->tqsetSizePolicy(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"); - QString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); - pixmapLogo->setPixmap(QPixmap( directory + "banner-digikam.png" )); - pixmapLogo->setFocusPolicy(QWidget::NoFocus); + TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png"); + pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" )); + pixmapLogo->setFocusPolicy(TQ_NoFocus); bar->insertWidget(id, pixmapLogo->width(), pixmapLogo); bar->alignItemRight(id); addContainer(bar, id); - connect(bar, SIGNAL(destroyed()), - this, SLOT(slotDestroyed())); + connect(bar, TQT_SIGNAL(destroyed()), + this, TQT_SLOT(slotDestroyed())); - connect(pixmapLogo, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(slotProcessURL(const QString&))); + connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(slotProcessURL(const TQString&))); return containerCount() - 1; } @@ -88,7 +88,7 @@ int DLogoAction::plug(QWidget *widget, int index) return containerId; } -void DLogoAction::slotProcessURL(const QString& url) +void DLogoAction::slotProcessURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h index 2b6d581..8c05667 100644 --- a/digikam/libs/widgets/common/dlogoaction.h +++ b/digikam/libs/widgets/common/dlogoaction.h @@ -38,16 +38,17 @@ namespace Digikam class DIGIKAM_EXPORT DLogoAction : public KAction { Q_OBJECT + TQ_OBJECT public: - DLogoAction(QObject* parent, const char* name=0); + DLogoAction(TQObject* tqparent, const char* name=0); - virtual int plug(QWidget *widget, int index=-1); + virtual int plug(TQWidget *widget, int index=-1); private slots: - void slotProcessURL(const QString&); + void slotProcessURL(const TQString&); }; } // namespace Digikam diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index d7f9388..d68b995 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -24,11 +24,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> // KDE includes. @@ -45,11 +45,11 @@ namespace Digikam { -static QImage s_dpopupmenu_sidePixmap; -static QColor s_dpopupmenu_sidePixmapColor; +static TQImage s_dpopupmenu_sidePixmap; +static TQColor s_dpopupmenu_sidePixmapColor; -DPopupMenu::DPopupMenu(QWidget* parent, const char* name) - : KPopupMenu(parent, name) +DPopupMenu::DPopupMenu(TQWidget* tqparent, const char* name) + : KPopupMenu(tqparent, name) { // Must be initialized so that we know the size on first invocation if ( s_dpopupmenu_sidePixmap.isNull() ) @@ -62,13 +62,13 @@ DPopupMenu::~DPopupMenu() void DPopupMenu::generateSidePixmap() { - const QColor newColor = calcPixmapColor(); + const TQColor newColor = calcPixmapColor(); if ( newColor != s_dpopupmenu_sidePixmapColor ) { s_dpopupmenu_sidePixmapColor = newColor; - if (KApplication::kApplication()->aboutData()->appName() == QString("digikam")) + if (KApplication::kApplication()->aboutData()->appName() == TQString("digikam")) s_dpopupmenu_sidePixmap.load( locate( "data","digikam/data/menusidepixmap.png" ) ); else s_dpopupmenu_sidePixmap.load( locate( "data","showfoto/menusidepixmap.png" ) ); @@ -82,25 +82,25 @@ int DPopupMenu::sidePixmapWidth() const return s_dpopupmenu_sidePixmap.width(); } -QRect DPopupMenu::sideImageRect() const +TQRect DPopupMenu::sideImageRect() const { - return QStyle::visualRect(QRect(frameWidth(), frameWidth(), + return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(), s_dpopupmenu_sidePixmap.width(), height() - 2*frameWidth()), this); } -QColor DPopupMenu::calcPixmapColor() +TQColor DPopupMenu::calcPixmapColor() { - QColor color; - QColor activeTitle = QApplication::palette().active().background(); - QColor inactiveTitle = QApplication::palette().inactive().background(); + TQColor color; + TQColor activeTitle = TQApplication::tqpalette().active().background(); + TQColor inactiveTitle = TQApplication::tqpalette().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); - QApplication::palette().active().background().hsv(&h3, &s3, &v3); + TQApplication::tqpalette().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)) @@ -111,7 +111,7 @@ QColor DPopupMenu::calcPixmapColor() // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = qGray(r, g, b); + int gray = tqGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); @@ -129,12 +129,12 @@ QColor DPopupMenu::calcPixmapColor() return color; } -void DPopupMenu::setMinimumSize(const QSize & s) +void DPopupMenu::setMinimumSize(const TQSize & s) { KPopupMenu::setMinimumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height()); } -void DPopupMenu::setMaximumSize(const QSize & s) +void DPopupMenu::setMaximumSize(const TQSize & s) { KPopupMenu::setMaximumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height()); } @@ -149,34 +149,34 @@ void DPopupMenu::setMaximumSize(int w, int h) KPopupMenu::setMaximumSize(w + s_dpopupmenu_sidePixmap.width(), h); } -void DPopupMenu::resizeEvent(QResizeEvent * e) +void DPopupMenu::resizeEvent(TQResizeEvent * e) { KPopupMenu::resizeEvent(e); - setFrameRect(QStyle::visualRect(QRect(s_dpopupmenu_sidePixmap.width(), 0, + setFrameRect(TQStyle::tqvisualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0, width() - s_dpopupmenu_sidePixmap.width(), height()), this ) ); } -//Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. +//Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough. void DPopupMenu::resize(int width, int height) { - width = kMax(width, maximumSize().width()); + width = kMax(width, tqmaximumSize().width()); KPopupMenu::resize(width, height); } -void DPopupMenu::paintEvent(QPaintEvent* e) +void DPopupMenu::paintEvent(TQPaintEvent* e) { generateSidePixmap(); - QPainter p( this ); + TQPainter p( this ); - QRect r = sideImageRect(); + TQRect r = sideImageRect(); r.setTop(r.bottom()-s_dpopupmenu_sidePixmap.height()+1); if ( r.intersects( e->rect() ) ) { - QRect drawRect = r.intersect(e->rect()).intersect(sideImageRect()); - QRect pixRect = drawRect; + TQRect drawRect = r.intersect(e->rect()).intersect(sideImageRect()); + TQRect pixRect = drawRect; pixRect.moveBy(-r.left(), -r.top()); p.drawImage(drawRect.topLeft(), s_dpopupmenu_sidePixmap, pixRect); } @@ -188,10 +188,10 @@ void DPopupMenu::paintEvent(QPaintEvent* e) drawContents(&p); - style().drawPrimitive(QStyle::PE_PanelPopup, &p, - QRect(0, 0, width(), height()), - colorGroup(), QStyle::Style_Default, - QStyleOption( frameWidth(), 0)); + tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p, + TQRect(0, 0, width(), height()), + tqcolorGroup(), TQStyle::Style_Default, + TQStyleOption( frameWidth(), 0)); } } // namespace Digikam diff --git a/digikam/libs/widgets/common/dpopupmenu.h b/digikam/libs/widgets/common/dpopupmenu.h index a65f8e8..96f6a8a 100644 --- a/digikam/libs/widgets/common/dpopupmenu.h +++ b/digikam/libs/widgets/common/dpopupmenu.h @@ -27,11 +27,11 @@ #ifndef DPOPUPMENU_H #define DPOPUPMENU_H -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qimage.h> -#include <qrect.h> +#include <tqcolor.h> +#include <tqimage.h> +#include <tqrect.h> // KDE includes. @@ -41,7 +41,7 @@ #include "digikam_export.h" -class QSize; +class TQSize; namespace Digikam { @@ -51,7 +51,7 @@ class DIGIKAM_EXPORT DPopupMenu : public KPopupMenu public: - DPopupMenu(QWidget *parent=0, const char *name=0); + DPopupMenu(TQWidget *tqparent=0, const char *name=0); ~DPopupMenu(); int sidePixmapWidth() const; @@ -62,20 +62,20 @@ private: void generateSidePixmap(); /** Returns the available size for the image */ - QRect sideImageRect() const; + TQRect sideImageRect() const; /** Calculates a color that matches the current colorscheme */ - QColor calcPixmapColor(); + TQColor calcPixmapColor(); - void setMinimumSize(const QSize& s); - void setMaximumSize(const QSize& s); + void setMinimumSize(const TQSize& s); + void setMaximumSize(const TQSize& s); void setMinimumSize(int w, int h); void setMaximumSize(int w, int h); - void resizeEvent(QResizeEvent* e); + void resizeEvent(TQResizeEvent* e); void resize(int width, int height); - void paintEvent(QPaintEvent* e); + void paintEvent(TQPaintEvent* e); }; } // namespace Digikam diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp index 72c99e2..eb4d4f8 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp +++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp @@ -22,14 +22,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwidget.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> // KDE includes. @@ -67,11 +67,11 @@ public: JPEG2000Options = 0; } - QWidget *noneOptions; + TQWidget *noneOptions; - QGridLayout *noneGrid; + TQGridLayout *noneGrid; - QLabel *labelNone; + TQLabel *labelNone; JPEGSettings *JPEGOptions; @@ -82,16 +82,16 @@ public: JP2KSettings *JPEG2000Options; }; -FileSaveOptionsBox::FileSaveOptionsBox(QWidget *parent) - : QWidgetStack(parent, 0, Qt::WDestructiveClose) +FileSaveOptionsBox::FileSaveOptionsBox(TQWidget *tqparent) + : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) { d = new FileSaveOptionsBoxPriv; //-- NONE Settings ------------------------------------------------------ - d->noneOptions = new QWidget(this); - d->noneGrid = new QGridLayout(d->noneOptions, 1, 1, KDialog::spacingHint()); - d->labelNone = new QLabel(i18n("No options available"), d->noneOptions); + d->noneOptions = new TQWidget(this); + d->noneGrid = new TQGridLayout(d->noneOptions, 1, 1, KDialog::spacingHint()); + d->labelNone = new TQLabel(i18n("No options available"), d->noneOptions); d->noneGrid->addMultiCellWidget(d->labelNone, 0, 0, 0, 1); //-- JPEG Settings ------------------------------------------------------ @@ -128,27 +128,27 @@ FileSaveOptionsBox::~FileSaveOptionsBox() delete d; } -void FileSaveOptionsBox::slotImageFileSelected(const QString& file) +void FileSaveOptionsBox::slotImageFileSelected(const TQString& file) { - QString format = QImageIO::imageFormat(file); + TQString format = TQImageIO::imageFormat(file); toggleFormatOptions(format); } -void FileSaveOptionsBox::slotImageFileFormatChanged(const QString& filter) +void FileSaveOptionsBox::slotImageFileFormatChanged(const TQString& filter) { - QString format = KImageIO::typeForMime(filter).upper(); + TQString format = KImageIO::typeForMime(filter).upper(); toggleFormatOptions(format); } -void FileSaveOptionsBox::toggleFormatOptions(const QString& format) +void FileSaveOptionsBox::toggleFormatOptions(const TQString& format) { - if (format == QString("JPEG")) + if (format == TQString("JPEG")) raiseWidget(DImg::JPEG); - else if (format == QString("PNG")) + else if (format == TQString("PNG")) raiseWidget(DImg::PNG); - else if (format == QString("TIFF")) + else if (format == TQString("TIFF")) raiseWidget(DImg::TIFF); - else if (format == QString("JP2")) + else if (format == TQString("JP2")) raiseWidget(DImg::JP2K); else raiseWidget(DImg::NONE); diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/digikam/libs/widgets/common/filesaveoptionsbox.h index c9076da..ea81927 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.h +++ b/digikam/libs/widgets/common/filesaveoptionsbox.h @@ -27,8 +27,8 @@ // KDE includes. -#include <qwidgetstack.h> -#include <qstring.h> +#include <tqwidgetstack.h> +#include <tqstring.h> // Local includes. @@ -40,25 +40,26 @@ namespace Digikam class FileSaveOptionsBoxPriv; -class DIGIKAM_EXPORT FileSaveOptionsBox : public QWidgetStack +class DIGIKAM_EXPORT FileSaveOptionsBox : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - FileSaveOptionsBox(QWidget *parent=0); + FileSaveOptionsBox(TQWidget *tqparent=0); ~FileSaveOptionsBox(); void applySettings(); public slots: - void slotImageFileFormatChanged(const QString&); - void slotImageFileSelected(const QString&); + void slotImageFileFormatChanged(const TQString&); + void slotImageFileSelected(const TQString&); private: - void toggleFormatOptions(const QString& format); + void toggleFormatOptions(const TQString& format); void readSettings(); private: diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 4e9b537..4e8f242 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -28,19 +28,19 @@ #include <cmath> -// Qt includes. - -#include <qpixmap.h> -#include <qpainter.h> -#include <qpen.h> -#include <qevent.h> -#include <qtimer.h> -#include <qcolor.h> -#include <qbrush.h> -#include <qrect.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqevent.h> +#include <tqtimer.h> +#include <tqcolor.h> +#include <tqbrush.h> +#include <tqrect.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqtooltip.h> // KDE includes. @@ -102,7 +102,7 @@ public: // image/computation time). bool inInitialRepaintWait; - QTimer *blinkTimer; + TQTimer *blinkTimer; DColor colorGuide; }; @@ -110,9 +110,9 @@ public: // Constructor without image data (needed to use updateData() method after instance created). HistogramWidget::HistogramWidget(int w, int h, - QWidget *parent, bool selectMode, + TQWidget *tqparent, bool selectMode, bool showProgress, bool statisticsVisible) - : QWidget(parent, 0, Qt::WDestructiveClose) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; setup(w, h, selectMode, showProgress, statisticsVisible); @@ -126,15 +126,15 @@ HistogramWidget::HistogramWidget(int w, int h, HistogramWidget::HistogramWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits, - QWidget *parent, bool selectMode, + TQWidget *tqparent, bool selectMode, bool showProgress, bool statisticsVisible) - : QWidget(parent, 0, Qt::WDestructiveClose) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); m_selectionHistogram = 0L; } @@ -144,16 +144,16 @@ HistogramWidget::HistogramWidget(int w, int h, uchar *i_data, uint i_w, uint i_h, uchar *s_data, uint s_w, uint s_h, bool i_sixteenBits, - QWidget *parent, bool selectMode, + TQWidget *tqparent, bool selectMode, bool showProgress, bool statisticsVisible) - : QWidget(parent, 0, Qt::WDestructiveClose) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new HistogramWidgetPriv; d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); } HistogramWidget::~HistogramWidget() @@ -182,26 +182,26 @@ void HistogramWidget::setup(int w, int h, bool selectMode, bool showProgress, bo setMouseTracking(true); setMinimumSize(w, h); - d->blinkTimer = new QTimer( this ); + d->blinkTimer = new TQTimer( this ); - connect( d->blinkTimer, SIGNAL(timeout()), - this, SLOT(slotBlinkTimerDone()) ); + connect( d->blinkTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotBlinkTimerDone()) ); } void HistogramWidget::setHistogramGuideByColor(const DColor& color) { d->guideVisible = true; d->colorGuide = color; - repaint(false); + tqrepaint(false); } void HistogramWidget::reset() { d->guideVisible = false; - repaint(false); + tqrepaint(false); } -void HistogramWidget::customEvent(QCustomEvent *event) +void HistogramWidget::customEvent(TQCustomEvent *event) { if (!event) return; @@ -220,15 +220,15 @@ void HistogramWidget::customEvent(QCustomEvent *event) { if (d->clearFlag != HistogramWidgetPriv::HistogramDataLoading) { - // enter initial repaint wait, repaint only after waiting + // enter initial tqrepaint wait, tqrepaint 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 repaint, we can repaint immediately - repaint(false); + // after the initial tqrepaint, we can tqrepaint immediately + tqrepaint(false); d->blinkTimer->start( 200 ); } } @@ -244,22 +244,22 @@ void HistogramWidget::customEvent(QCustomEvent *event) setCursor( KCursor::arrowCursor() ); // Send signals to refresh information if necessary. - // The signals may trigger multiple repaints, avoid this, - // we repaint once afterwards. + // The signals may trigger multiple tqrepaints, avoid this, + // we tqrepaint once afterwards. setUpdatesEnabled(false); notifyValuesChanged(); emit signalHistogramComputationDone(d->sixteenBits); setUpdatesEnabled(true); - repaint(false); + tqrepaint(false); } else { d->clearFlag = HistogramWidgetPriv::HistogramFailed; d->blinkTimer->stop(); d->inInitialRepaintWait = false; - repaint(false); + tqrepaint(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 repaint wait, repaint only after waiting + // enter initial tqrepaint wait, tqrepaint 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; - repaint(false); + tqrepaint(false); setCursor( KCursor::arrowCursor() ); } @@ -340,10 +340,10 @@ void HistogramWidget::updateData(uchar *i_data, uint i_w, uint i_h, delete m_selectionHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); if (s_data && s_w && s_h) - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); else m_selectionHistogram = 0L; } @@ -360,17 +360,17 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h, delete m_selectionHistogram; // Calc new histogram data - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); } void HistogramWidget::slotBlinkTimerDone() { d->inInitialRepaintWait = false; - repaint(false); + tqrepaint(false); d->blinkTimer->start( 200 ); } -void HistogramWidget::paintEvent(QPaintEvent*) +void HistogramWidget::paintEvent(TQPaintEvent*) { // Widget is disabled, not initialized, // or loading, but no message shall be drawn: @@ -381,13 +381,13 @@ void HistogramWidget::paintEvent(QPaintEvent*) d->clearFlag == HistogramWidgetPriv::HistogramDataLoading)) ) { - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + 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.drawRect(0, 0, width(), height()); - p1.setPen(QPen(palette().disabled().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); p1.end(); bitBlt(this, 0, 0, &pm); @@ -403,14 +403,14 @@ void HistogramWidget::paintEvent(QPaintEvent*) // In first, we draw an animation. int asize = 24; - QPixmap anim(asize, asize); - QPainter p2; - p2.begin(&anim, this); - p2.fillRect(0, 0, asize, asize, palette().active().background()); + TQPixmap anim(asize, asize); + TQPainter p2; + p2.tqbegin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this)); + p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); d->pos = (d->pos + 10) % 360; - p2.setPen(QPen(palette().active().text())); + p2.setPen(TQPen(tqpalette().active().text())); p2.rotate(d->pos); for ( int i=0 ; i<12 ; i++ ) { @@ -421,20 +421,20 @@ void HistogramWidget::paintEvent(QPaintEvent*) // ... and we render busy text. - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, width(), height(), palette().active().background()); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + 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.drawRect(0, 0, width(), height()); p1.drawPixmap(width()/2 - asize /2, asize, anim); - p1.setPen(QPen(palette().active().text())); + p1.setPen(TQPen(tqpalette().active().text())); if (d->clearFlag == HistogramWidgetPriv::HistogramDataLoading) - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Loading image...")); else - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Histogram calculation...")); p1.end(); @@ -445,14 +445,14 @@ void HistogramWidget::paintEvent(QPaintEvent*) // Draw message. else if (d->clearFlag == HistogramWidgetPriv::HistogramFailed) { - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, width(), height(), palette().active().background()); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + 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.drawRect(0, 0, width(), height()); - p1.setPen(QPen(palette().active().text())); - p1.drawText(0, 0, width(), height(), Qt::AlignCenter, + p1.setPen(TQPen(tqpalette().active().text())); + p1.drawText(0, 0, width(), height(), TQt::AlignCenter, i18n("Histogram\ncalculation\nfailed.")); p1.end(); bitBlt(this, 0, 0, &pm); @@ -497,7 +497,7 @@ void HistogramWidget::paintEvent(QPaintEvent*) break; case HistogramWidget::ColorChannelsHistogram: // All color channels. - max = QMAX (QMAX (histogram->getMaximum(ImageHistogram::RedChannel), + max = TQMAX (TQMAX (histogram->getMaximum(ImageHistogram::RedChannel), histogram->getMaximum(ImageHistogram::GreenChannel)), histogram->getMaximum(ImageHistogram::BlueChannel)); break; @@ -520,12 +520,12 @@ void HistogramWidget::paintEvent(QPaintEvent*) break; } - // A QPixmap is used to enable the double buffering. + // A TQPixmap is used to enable the double buffering. - QPixmap pm(size()); - QPainter p1; - p1.begin(&pm, this); - p1.fillRect(0, 0, width(), height(), palette().active().background()); + TQPixmap pm(size()); + TQPainter p1; + p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.fillRect(0, 0, width(), height(), tqpalette().active().background()); // Drawing selection or all histogram values. @@ -645,35 +645,35 @@ void HistogramWidget::paintEvent(QPaintEvent*) { if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) ) { - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - y); } else { - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - y); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } } } else { - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - y); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } } @@ -684,9 +684,9 @@ void HistogramWidget::paintEvent(QPaintEvent*) { if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) ) { - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine)); // Witch color must be used on the foreground with all colors channel mode? switch (m_colorType) @@ -710,69 +710,69 @@ void HistogramWidget::paintEvent(QPaintEvent*) switch (m_colorType) { case HistogramWidget::RedColor: - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } break; case HistogramWidget::GreenColor: - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } break; default: - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } @@ -786,69 +786,69 @@ void HistogramWidget::paintEvent(QPaintEvent*) switch (m_colorType) { case HistogramWidget::RedColor: - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } break; case HistogramWidget::GreenColor: - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } break; default: - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yr); - p1.setPen(QPen(Qt::green, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yg); - p1.setPen(QPen(Qt::blue, 1, Qt::SolidLine)); + p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, wHeight - yb); - p1.setPen(QPen(palette().active().background(), 1, Qt::SolidLine)); - p1.drawLine(x, wHeight - QMAX(QMAX(yr, yg), yb), x, 0); - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().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.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(QPen(palette().active().base(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine)); p1.drawLine(x, wHeight, x, 0); } @@ -860,7 +860,7 @@ void HistogramWidget::paintEvent(QPaintEvent*) // Drawing color guide. - p1.setPen(QPen(Qt::red, 1, Qt::DotLine)); + p1.setPen(TQPen(TQt::red, 1, TQt::DotLine)); int guidePos; if (d->guideVisible) @@ -880,7 +880,7 @@ void HistogramWidget::paintEvent(QPaintEvent*) break; case HistogramWidget::ValueHistogram: - guidePos = QMAX(QMAX(d->colorGuide.red(), d->colorGuide.green()), d->colorGuide.blue()); + guidePos = TQMAX(TQMAX(d->colorGuide.red(), d->colorGuide.green()), d->colorGuide.blue()); break; case HistogramWidget::ColorChannelsHistogram: @@ -911,37 +911,37 @@ void HistogramWidget::paintEvent(QPaintEvent*) int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment(); p1.drawLine(xGuide, 0, xGuide, wHeight); - QString string = i18n("x:%1").arg(guidePos); - QFontMetrics fontMt( string ); - QRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); - p1.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + TQString string = i18n("x:%1").tqarg(guidePos); + TQFontMetrics fontMt( string ); + TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string); + p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); rect.moveTop(1); if (xGuide < wWidth/2) { rect.moveLeft(xGuide); - p1.fillRect(rect, QBrush(QColor(250, 250, 255)) ); + p1.fillRect(rect, TQBrush(TQColor(250, 250, 255)) ); p1.drawRect(rect); rect.moveLeft(xGuide+3); - p1.drawText(rect, Qt::AlignLeft, string); + p1.drawText(rect, TQt::AlignLeft, string); } else { rect.moveRight(xGuide); - p1.fillRect(rect, QBrush(QColor(250, 250, 255)) ); + p1.fillRect(rect, TQBrush(TQColor(250, 250, 255)) ); p1.drawRect(rect); rect.moveRight(xGuide-3); - p1.drawText(rect, Qt::AlignRight, string); + p1.drawText(rect, TQt::AlignRight, string); } } } if (d->statisticsVisible) { - QString tipText, value; - QString cellBeg("<tr><td><nobr><font size=-1>"); - QString cellMid("</font></nobr></td><td><nobr><font size=-1>"); - QString cellEnd("</font></nobr></td></tr>"); + TQString tipText, value; + TQString cellBeg("<tr><td><nobr><font size=-1>"); + TQString cellMid("</font></nobr></td><td><nobr><font size=-1>"); + TQString cellEnd("</font></nobr></td></tr>"); tipText = "<table cellspacing=0 cellpadding=0>"; tipText += cellBeg + i18n("Mean:") + cellMid; @@ -970,23 +970,23 @@ void HistogramWidget::paintEvent(QPaintEvent*) tipText += "</table>"; - QToolTip::add( this, tipText); + TQToolTip::add( this, tipText); } - p1.setPen(QPen(palette().active().foreground(), 1, Qt::SolidLine)); + p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); p1.end(); bitBlt(this, 0, 0, &pm); } -void HistogramWidget::mousePressEvent(QMouseEvent* e) +void HistogramWidget::mousePressEvent(TQMouseEvent* e) { if ( d->selectMode == true && d->clearFlag == HistogramWidgetPriv::HistogramCompleted ) { if (!d->inSelected) { d->inSelected = true; - repaint(false); + tqrepaint(false); } d->xmin = ((double)e->pos().x()) / ((double)width()); @@ -997,7 +997,7 @@ void HistogramWidget::mousePressEvent(QMouseEvent* e) } } -void HistogramWidget::mouseReleaseEvent(QMouseEvent*) +void HistogramWidget::mouseReleaseEvent(TQMouseEvent*) { if ( d->selectMode == true && d->clearFlag == HistogramWidgetPriv::HistogramCompleted ) { @@ -1009,12 +1009,12 @@ void HistogramWidget::mouseReleaseEvent(QMouseEvent*) //emit signalMinValueChanged( 0 ); //emit signalMaxValueChanged( d->range ); notifyValuesChanged(); - repaint(false); + tqrepaint(false); } } } -void HistogramWidget::mouseMoveEvent(QMouseEvent *e) +void HistogramWidget::mouseMoveEvent(TQMouseEvent *e) { if ( d->selectMode == true && d->clearFlag == HistogramWidgetPriv::HistogramCompleted ) { @@ -1040,7 +1040,7 @@ void HistogramWidget::mouseMoveEvent(QMouseEvent *e) notifyValuesChanged(); //emit signalMaxValueChanged( d->xmax == 0.0 ? d->range : (int)(d->xmax * d->range) ); - repaint(false); + tqrepaint(false); } } } @@ -1064,7 +1064,7 @@ void HistogramWidget::slotMinValueChanged( int min ) { d->xmin = ((double)min)/d->range; } - repaint(false); + tqrepaint(false); } } @@ -1082,7 +1082,7 @@ void HistogramWidget::slotMaxValueChanged(int max) { d->xmax = ((double)max)/d->range; } - repaint(false); + tqrepaint(false); } } diff --git a/digikam/libs/widgets/common/histogramwidget.h b/digikam/libs/widgets/common/histogramwidget.h index 76b4801..01d0abe 100644 --- a/digikam/libs/widgets/common/histogramwidget.h +++ b/digikam/libs/widgets/common/histogramwidget.h @@ -24,16 +24,16 @@ #ifndef HISTOGRAMWIDGET_H #define HISTOGRAMWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. #include "dcolor.h" #include "digikam_export.h" -class QCustomEvent; +class TQCustomEvent; namespace Digikam { @@ -41,9 +41,10 @@ namespace Digikam class ImageHistogram; class HistogramWidgetPriv; -class DIGIKAM_EXPORT HistogramWidget : public QWidget +class DIGIKAM_EXPORT HistogramWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -80,7 +81,7 @@ public: /** Constructor without image data. Needed to use updateData() method after to create instance.*/ HistogramWidget(int w, int h, // Widget size. - QWidget *parent=0, bool selectMode=true, + TQWidget *tqparent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); @@ -88,7 +89,7 @@ public: HistogramWidget(int w, int h, // Widget size. uchar *i_data, uint i_w, uint i_h, // Full image info. bool i_sixteenBits, // 8 or 16 bits image. - QWidget *parent=0, bool selectMode=true, + TQWidget *tqparent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); @@ -97,7 +98,7 @@ public: uchar *i_data, uint i_w, uint i_h, // Full image info. uchar *s_data, uint s_w, uint s_h, // Image selection info. bool i_sixteenBits, // 8 or 16 bits image. - QWidget *parent=0, bool selectMode=true, + TQWidget *tqparent=0, bool selectMode=true, bool showProgress=true, bool statisticsVisible=false); @@ -156,14 +157,14 @@ protected slots: protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); private : - void customEvent(QCustomEvent*); + void customEvent(TQCustomEvent*); void notifyValuesChanged(); private: diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index 2d72765..984d173 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -26,12 +26,12 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qpen.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpen.h> +#include <tqtimer.h> // KDE includes. @@ -61,13 +61,13 @@ public: int xpos; int ypos; - QRect regionSelection; // Original size image selection. + TQRect regionSelection; // Original size image selection. - QImage image; + TQImage image; }; -PanIconWidget::PanIconWidget(QWidget *parent, WFlags flags) - : QWidget(parent, 0, flags) +PanIconWidget::PanIconWidget(TQWidget *tqparent, WFlags flags) + : TQWidget(tqparent, 0, flags) { d = new PanIconWidgetPriv; m_flicker = false; @@ -75,7 +75,7 @@ PanIconWidget::PanIconWidget(QWidget *parent, WFlags flags) m_pixmap = 0; m_zoomFactor = 1.0; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMouseTracking(true); } @@ -88,11 +88,11 @@ PanIconWidget::~PanIconWidget() delete d; } -void PanIconWidget::setImage(int previewWidth, int previewHeight, const QImage& image) +void PanIconWidget::setImage(int previewWidth, int previewHeight, const TQImage& image) { - QSize sz(image.width(), image.height()); - sz.scale(previewWidth, previewHeight, QSize::ScaleMin); - m_pixmap = new QPixmap(previewWidth, previewHeight); + TQSize sz(image.width(), image.height()); + sz.tqscale(previewWidth, previewHeight, TQSize::ScaleMin); + m_pixmap = new TQPixmap(previewWidth, previewHeight); m_width = sz.width(); m_height = sz.height(); d->image = image.smoothScale(sz.width(), sz.height()); @@ -102,7 +102,7 @@ void PanIconWidget::setImage(int previewWidth, int previewHeight, const QImage& m_zoomedOrgHeight = image.height(); setFixedSize(m_width, m_height); - m_rect = QRect(width()/2-m_width/2, height()/2-m_height/2, m_width, m_height); + m_rect = TQRect(width()/2-m_width/2, height()/2-m_height/2, m_width, m_height); updatePixmap(); m_timerID = startTimer(800); } @@ -110,7 +110,7 @@ void PanIconWidget::setImage(int previewWidth, int previewHeight, const QImage& void PanIconWidget::setImage(int previewWidth, int previewHeight, const DImg& image) { DImg img(image); - setImage(previewWidth, previewHeight, img.copyQImage()); + setImage(previewWidth, previewHeight, img.copyTQImage()); } void PanIconWidget::slotZoomFactorChanged(double factor) @@ -120,10 +120,10 @@ void PanIconWidget::slotZoomFactorChanged(double factor) m_zoomedOrgWidth = (int)(m_orgWidth * factor); m_zoomedOrgHeight = (int)(m_orgHeight * factor); updatePixmap(); - repaint(false); + tqrepaint(false); } -void PanIconWidget::setRegionSelection(const QRect& regionSelection) +void PanIconWidget::setRegionSelection(const TQRect& regionSelection) { d->regionSelection = regionSelection; m_localRegionSelection.setX( m_rect.x() + (int)((float)d->regionSelection.x() * @@ -139,22 +139,22 @@ void PanIconWidget::setRegionSelection(const QRect& regionSelection) ((float)m_height / (float)m_zoomedOrgHeight)) ); updatePixmap(); - repaint(false); + tqrepaint(false); } -QRect PanIconWidget::getRegionSelection() +TQRect PanIconWidget::getRegionSelection() { return (d->regionSelection); } void PanIconWidget::setCursorToLocalRegionSelectionCenter() { - QCursor::setPos(mapToGlobal(m_localRegionSelection.center())); + TQCursor::setPos(mapToGlobal(m_localRegionSelection.center())); } void PanIconWidget::setCenterSelection() { - setRegionSelection(QRect( + setRegionSelection(TQRect( (int)(((float)m_zoomedOrgWidth / 2.0) - ((float)d->regionSelection.width() / 2.0)), (int)(((float)m_zoomedOrgHeight / 2.0) - ((float)d->regionSelection.height() / 2.0)), d->regionSelection.width(), @@ -166,7 +166,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone) if (targetDone) { updatePixmap(); - repaint(false); + tqrepaint(false); } int x = (int)lround( ((float)m_localRegionSelection.x() - (float)m_rect.x() ) * @@ -192,23 +192,23 @@ void PanIconWidget::regionSelectionMoved(bool targetDone) void PanIconWidget::updatePixmap() { // Drawing background and image. - m_pixmap->fill(colorGroup().background()); + m_pixmap->fill(tqcolorGroup().background()); bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0); - QPainter p(m_pixmap); + TQPainter p(m_pixmap); // Drawing selection border - if (m_flicker) p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); - else p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + if (m_flicker) p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); + else p.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p.drawRect(m_localRegionSelection.x(), m_localRegionSelection.y(), m_localRegionSelection.width(), m_localRegionSelection.height()); - if (m_flicker) p.setPen(QPen(Qt::red, 1, Qt::DotLine)); - else p.setPen(QPen(Qt::white, 1, Qt::DotLine)); + if (m_flicker) p.setPen(TQPen(TQt::red, 1, TQt::DotLine)); + else p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); p.drawRect(m_localRegionSelection.x(), m_localRegionSelection.y(), @@ -218,7 +218,7 @@ void PanIconWidget::updatePixmap() p.end(); } -void PanIconWidget::paintEvent(QPaintEvent*) +void PanIconWidget::paintEvent(TQPaintEvent*) { bitBlt(this, 0, 0, m_pixmap); } @@ -233,9 +233,9 @@ void PanIconWidget::setMouseFocus() emit signalSelectionTakeFocus(); } -void PanIconWidget::hideEvent(QHideEvent *e) +void PanIconWidget::hideEvent(TQHideEvent *e) { - QWidget::hideEvent(e); + TQWidget::hideEvent(e); if ( d->moveSelection ) { @@ -245,10 +245,10 @@ void PanIconWidget::hideEvent(QHideEvent *e) } } -void PanIconWidget::mousePressEvent ( QMouseEvent * e ) +void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) { if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && - m_localRegionSelection.contains( e->x(), e->y() ) ) + m_localRegionSelection.tqcontains( e->x(), e->y() ) ) { d->xpos = e->x(); d->ypos = e->y(); @@ -258,7 +258,7 @@ void PanIconWidget::mousePressEvent ( QMouseEvent * e ) } } -void PanIconWidget::mouseMoveEvent ( QMouseEvent * e ) +void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( d->moveSelection && (e->state() == Qt::LeftButton || e->state() == Qt::MidButton) ) @@ -286,20 +286,20 @@ void PanIconWidget::mouseMoveEvent ( QMouseEvent * e ) m_localRegionSelection.moveBottom(m_rect.bottom()); updatePixmap(); - repaint(false); + tqrepaint(false); regionSelectionMoved(false); return; } else { - if ( m_localRegionSelection.contains( e->x(), e->y() ) ) + if ( m_localRegionSelection.tqcontains( e->x(), e->y() ) ) setCursor( KCursor::handCursor() ); else setCursor( KCursor::arrowCursor() ); } } -void PanIconWidget::mouseReleaseEvent ( QMouseEvent * ) +void PanIconWidget::mouseReleaseEvent ( TQMouseEvent * ) { if ( d->moveSelection ) { @@ -309,16 +309,16 @@ void PanIconWidget::mouseReleaseEvent ( QMouseEvent * ) } } -void PanIconWidget::timerEvent(QTimerEvent * e) +void PanIconWidget::timerEvent(TQTimerEvent * e) { if (e->timerId() == m_timerID) { m_flicker = !m_flicker; updatePixmap(); - repaint(false); + tqrepaint(false); } else - QWidget::timerEvent(e); + TQWidget::timerEvent(e); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/common/paniconwidget.h b/digikam/libs/widgets/common/paniconwidget.h index 45d480d..807f964 100644 --- a/digikam/libs/widgets/common/paniconwidget.h +++ b/digikam/libs/widgets/common/paniconwidget.h @@ -25,11 +25,11 @@ #ifndef PANICONWIDGET_H #define PANICONWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qrect.h> -#include <qimage.h> +#include <tqwidget.h> +#include <tqrect.h> +#include <tqimage.h> // Local includes. @@ -41,20 +41,21 @@ namespace Digikam class ImagePanIconWidget; class PanIconWidgetPriv; -class PanIconWidget : public QWidget +class PanIconWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PanIconWidget(QWidget *parent=0, WFlags flags=Qt::WDestructiveClose); + PanIconWidget(TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose); ~PanIconWidget(); - void setImage(int previewWidth, int previewHeight, const QImage& image); + void setImage(int previewWidth, int previewHeight, const TQImage& image); void setImage(int previewWidth, int previewHeight, const DImg& image); - void setRegionSelection(const QRect& regionSelection); - QRect getRegionSelection(); + void setRegionSelection(const TQRect& regionSelection); + TQRect getRegionSelection(); void setCenterSelection(); void setCursorToLocalRegionSelectionCenter(); @@ -65,7 +66,7 @@ signals: // Used with ImagePreview widget. // Emit when selection have been moved with mouse. 'targetDone' booleen // value is used for indicate if the mouse have been released. - void signalSelectionMoved(const QRect& rect, bool targetDone ); + void signalSelectionMoved(const TQRect& rect, bool targetDone ); void signalSelectionTakeFocus(); @@ -77,12 +78,12 @@ public slots: protected: - void hideEvent(QHideEvent*); - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void timerEvent(QTimerEvent*); + void hideEvent(TQHideEvent*); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void timerEvent(TQTimerEvent*); /** Recalculate the target selection position and emit 'signalSelectionMoved'.*/ void regionSelectionMoved(bool targetDone); @@ -103,10 +104,10 @@ protected: double m_zoomFactor; - QRect m_rect; - QRect m_localRegionSelection; // Thumbnail size selection. + TQRect m_rect; + TQRect m_localRegionSelection; // Thumbnail size selection. - QPixmap *m_pixmap; + TQPixmap *m_pixmap; private: diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index d48f4ac..8af3e87 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -25,16 +25,16 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qcache.h> -#include <qpainter.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qrect.h> -#include <qtimer.h> -#include <qguardedptr.h> +#include <tqstring.h> +#include <tqcache.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqrect.h> +#include <tqtimer.h> +#include <tqguardedptr.h> // KDE includes. @@ -66,7 +66,7 @@ public: maxZoom = 12.0; zoomWidth = 0; zoomHeight = 0; - tileTmpPix = new QPixmap(tileSize, tileSize); + tileTmpPix = new TQPixmap(tileSize, tileSize); tileCache.setMaxCost((10*1024*1024)/(tileSize*tileSize*4)); tileCache.setAutoDelete(true); @@ -86,25 +86,25 @@ public: double maxZoom; const double zoomMultiplier; - QPoint centerZoomPoint; + TQPoint centerZoomPoint; - QRect pixmapRect; + TQRect pixmapRect; - QCache<QPixmap> tileCache; + TQCache<TQPixmap> tileCache; - QPixmap* tileTmpPix; + TQPixmap* tileTmpPix; - QColor bgColor; + TQColor bgColor; }; -PreviewWidget::PreviewWidget(QWidget *parent) - : QScrollView(parent, 0, Qt::WDestructiveClose) +PreviewWidget::PreviewWidget(TQWidget *tqparent) + : TQScrollView(tqparent, 0, TQt::WDestructiveClose) { d = new PreviewWidgetPriv; d->bgColor.setRgb(0, 0, 0); m_movingInProgress = false; - viewport()->setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setMouseTracking(false); horizontalScrollBar()->setLineStep( 1 ); @@ -112,7 +112,7 @@ PreviewWidget::PreviewWidget(QWidget *parent) verticalScrollBar()->setLineStep( 1 ); verticalScrollBar()->setPageStep( 1 ); - setFrameStyle(QFrame::GroupBoxPanel|QFrame::Plain); + setFrameStyle(TQFrame::GroupBoxPanel|TQFrame::Plain); setMargin(0); setLineWidth(1); } @@ -123,7 +123,7 @@ PreviewWidget::~PreviewWidget() delete d; } -void PreviewWidget::setBackgroundColor(const QColor& color) +void PreviewWidget::setBackgroundColor(const TQColor& color) { if (d->bgColor == color) return; @@ -138,7 +138,7 @@ void PreviewWidget::slotReset() resetPreview(); } -QRect PreviewWidget::previewRect() +TQRect PreviewWidget::previewRect() { return d->pixmapRect; } @@ -194,12 +194,12 @@ double PreviewWidget::snapZoom(double zoom) // across 50%, 100% or fit-to-window, then return the // the corresponding special value. Otherwise zoom is returned unchanged. double fit = calcAutoZoomFactor(ZoomInOrOut); - QValueList<double> snapValues; + TQValueList<double> snapValues; snapValues.append(0.5); snapValues.append(1.0); snapValues.append(fit); qHeapSort(snapValues); - QValueList<double>::const_iterator it; + TQValueList<double>::const_iterator it; if (d->zoom < zoom) { @@ -300,7 +300,7 @@ void PreviewWidget::setZoomFactor(double zoom, bool centerView) updateContentsSize(); // adapt step size to zoom factor. Overall, using a finer step size than scrollbar default. - int step = QMAX(2, 2*lround(d->zoom)); + int step = TQMAX(2, 2*lround(d->zoom)); horizontalScrollBar()->setLineStep( step ); horizontalScrollBar()->setPageStep( step * 10 ); verticalScrollBar()->setLineStep( step ); @@ -400,7 +400,7 @@ double PreviewWidget::calcAutoZoomFactor(AutoZoomMode mode) double dstWidth = contentsRect().width(); double dstHeight = contentsRect().height(); - double zoom = QMIN(dstWidth/srcWidth, dstHeight/srcHeight); + double zoom = TQMIN(dstWidth/srcWidth, dstHeight/srcHeight); // limit precision as above zoom = floor(zoom * 10000.0) / 10000.0; if (mode == ZoomInOrOut) @@ -408,7 +408,7 @@ double PreviewWidget::calcAutoZoomFactor(AutoZoomMode mode) return zoom; else // ZoomInOnly: accept that an image is smaller than available space, dont scale up - return QMIN(1.0, zoom); + return TQMIN(1.0, zoom); } void PreviewWidget::updateContentsSize() @@ -422,14 +422,14 @@ void PreviewWidget::updateContentsSize() int centery = contentsRect().height()/2; int xoffset = int(centerx - d->zoomWidth/2); int yoffset = int(centery - d->zoomHeight/2); - xoffset = QMAX(xoffset, 0); - yoffset = QMAX(yoffset, 0); + xoffset = TQMAX(xoffset, 0); + yoffset = TQMAX(yoffset, 0); - d->pixmapRect = QRect(xoffset, yoffset, d->zoomWidth, d->zoomHeight); + d->pixmapRect = TQRect(xoffset, yoffset, d->zoomWidth, d->zoomHeight); } else { - d->pixmapRect = QRect(0, 0, d->zoomWidth, d->zoomHeight); + d->pixmapRect = TQRect(0, 0, d->zoomWidth, d->zoomHeight); } d->tileCache.clear(); @@ -442,18 +442,18 @@ void PreviewWidget::setContentsSize() resizeContents(d->zoomWidth, d->zoomHeight); } -void PreviewWidget::resizeEvent(QResizeEvent* e) +void PreviewWidget::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); if (d->autoZoom) updateAutoZoom(); updateContentsSize(); - // No need to repaint. its called + // No need to tqrepaint. its called // automatically after resize // To be sure than corner widget used to pan image will be hide/show @@ -461,27 +461,27 @@ void PreviewWidget::resizeEvent(QResizeEvent* e) zoomFactorChanged(d->zoom); } -void PreviewWidget::viewportPaintEvent(QPaintEvent *e) +void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) { - QRect er(e->rect()); - er = QRect(QMAX(er.x() - 1, 0), - QMAX(er.y() - 1, 0), - QMIN(er.width() + 2, contentsRect().width()), - QMIN(er.height() + 2, contentsRect().height())); + TQRect er(e->rect()); + er = TQRect(TQMAX(er.x() - 1, 0), + TQMAX(er.y() - 1, 0), + TQMIN(er.width() + 2, contentsRect().width()), + TQMIN(er.height() + 2, contentsRect().height())); bool antialias = (d->zoom <= 1.0) ? true : false; - QRect o_cr(viewportToContents(er.topLeft()), viewportToContents(er.bottomRight())); - QRect cr = o_cr; + TQRect o_cr(viewportToContents(er.topLeft()), viewportToContents(er.bottomRight())); + TQRect cr = o_cr; - QRegion clipRegion(er); + TQRegion clipRegion(er); cr = d->pixmapRect.intersect(cr); if (!cr.isEmpty() && !previewIsNull()) { - clipRegion -= QRect(contentsToViewport(cr.topLeft()), cr.size()); + clipRegion -= TQRect(contentsToViewport(cr.topLeft()), cr.size()); - QRect pr = QRect(cr.x() - d->pixmapRect.x(), cr.y() - d->pixmapRect.y(), + TQRect pr = TQRect(cr.x() - d->pixmapRect.x(), cr.y() - d->pixmapRect.y(), cr.width(), cr.height()); int x1 = (int)floor((double)pr.x() / (double)d->tileSize) * d->tileSize; @@ -489,7 +489,7 @@ void PreviewWidget::viewportPaintEvent(QPaintEvent *e) int x2 = (int)ceilf((double)pr.right() / (double)d->tileSize) * d->tileSize; int y2 = (int)ceilf((double)pr.bottom() / (double)d->tileSize) * d->tileSize; - QPixmap pix(d->tileSize, d->tileSize); + TQPixmap pix(d->tileSize, d->tileSize); int sx, sy, sw, sh; int step = (int)floor(d->tileSize / d->zoom); @@ -497,14 +497,14 @@ void PreviewWidget::viewportPaintEvent(QPaintEvent *e) { for (int i = x1 ; i < x2 ; i += d->tileSize) { - QString key = QString("%1,%2").arg(i).arg(j); - QPixmap *pix = d->tileCache.find(key); + TQString key = TQString("%1,%2").tqarg(i).tqarg(j); + TQPixmap *pix = d->tileCache.tqfind(key); if (!pix) { if (antialias) { - pix = new QPixmap(d->tileSize, d->tileSize); + pix = new TQPixmap(d->tileSize, d->tileSize); d->tileCache.insert(key, pix); } else @@ -522,9 +522,9 @@ void PreviewWidget::viewportPaintEvent(QPaintEvent *e) paintPreview(pix, sx, sy, sw, sh); } - QRect r(i, j, d->tileSize, d->tileSize); - QRect ir = pr.intersect(r); - QPoint pt(contentsToViewport(QPoint(ir.x() + d->pixmapRect.x(), + TQRect r(i, j, d->tileSize, d->tileSize); + TQRect ir = pr.intersect(r); + TQPoint pt(contentsToViewport(TQPoint(ir.x() + d->pixmapRect.x(), ir.y() + d->pixmapRect.y()))); bitBlt(viewport(), pt.x(), pt.y(), @@ -535,7 +535,7 @@ void PreviewWidget::viewportPaintEvent(QPaintEvent *e) } } - QPainter p(viewport()); + TQPainter p(viewport()); p.setClipRegion(clipRegion); p.fillRect(er, d->bgColor); p.end(); @@ -543,7 +543,7 @@ void PreviewWidget::viewportPaintEvent(QPaintEvent *e) viewportPaintExtraData(); } -void PreviewWidget::contentsMousePressEvent(QMouseEvent *e) +void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) { if (!e || e->button() == Qt::RightButton) return; @@ -562,8 +562,8 @@ void PreviewWidget::contentsMousePressEvent(QMouseEvent *e) m_movingInProgress = true; d->midButtonX = e->x(); d->midButtonY = e->y(); - viewport()->repaint(false); - viewport()->setCursor(Qt::SizeAllCursor); + viewport()->tqrepaint(false); + viewport()->setCursor(TQt::SizeAllCursor); } return; } @@ -571,7 +571,7 @@ void PreviewWidget::contentsMousePressEvent(QMouseEvent *e) viewport()->setMouseTracking(false); } -void PreviewWidget::contentsMouseMoveEvent(QMouseEvent *e) +void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; @@ -586,7 +586,7 @@ void PreviewWidget::contentsMouseMoveEvent(QMouseEvent *e) } } -void PreviewWidget::contentsMouseReleaseEvent(QMouseEvent *e) +void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e) { if (!e) return; @@ -596,7 +596,7 @@ void PreviewWidget::contentsMouseReleaseEvent(QMouseEvent *e) { emit signalContentsMovedEvent(true); viewport()->unsetCursor(); - viewport()->repaint(false); + viewport()->tqrepaint(false); } if (e->button() == Qt::RightButton) @@ -605,11 +605,11 @@ void PreviewWidget::contentsMouseReleaseEvent(QMouseEvent *e) } } -void PreviewWidget::contentsWheelEvent(QWheelEvent *e) +void PreviewWidget::contentsWheelEvent(TQWheelEvent *e) { e->accept(); - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) { if (e->delta() < 0) emit signalShowNextImage(); @@ -617,7 +617,7 @@ void PreviewWidget::contentsWheelEvent(QWheelEvent *e) emit signalShowPrevImage(); return; } - else if (e->state() & Qt::ControlButton) + else if (e->state() & TQt::ControlButton) { // When zooming with the mouse-wheel, the image center is kept fixed. d->centerZoomPoint = e->pos(); @@ -625,11 +625,11 @@ void PreviewWidget::contentsWheelEvent(QWheelEvent *e) slotDecreaseZoom(); else if (e->delta() > 0 && !maxZoom()) slotIncreaseZoom(); - d->centerZoomPoint = QPoint(); + d->centerZoomPoint = TQPoint(); return; } - QScrollView::contentsWheelEvent(e); + TQScrollView::contentsWheelEvent(e); } void PreviewWidget::zoomFactorChanged(double zoom) diff --git a/digikam/libs/widgets/common/previewwidget.h b/digikam/libs/widgets/common/previewwidget.h index 1e30769..67bf1e8 100644 --- a/digikam/libs/widgets/common/previewwidget.h +++ b/digikam/libs/widgets/common/previewwidget.h @@ -24,37 +24,38 @@ #ifndef PREVIEWWIDGET_H #define PREVIEWWIDGET_H -// Qt includes. +// TQt includes. -#include <qscrollview.h> +#include <tqscrollview.h> // Local includes. #include "digikam_export.h" -class QPainter; -class QPixmap; -class QColor; +class TQPainter; +class TQPixmap; +class TQColor; namespace Digikam { class PreviewWidgetPriv; -class DIGIKAM_EXPORT PreviewWidget : public QScrollView +class DIGIKAM_EXPORT PreviewWidget : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - PreviewWidget(QWidget *parent=0); + PreviewWidget(TQWidget *tqparent=0); ~PreviewWidget(); void setZoomFactor(double z); void setZoomFactor(double z, bool centerView); void setZoomFactorSnapped(double z); - void setBackgroundColor(const QColor& color); + void setBackgroundColor(const TQColor& color); void fitToWindow(); bool isFitToWindow(); void toggleFitToWindow(); @@ -103,21 +104,21 @@ protected: int tileSize(); void updateAutoZoom(AutoZoomMode mode = ZoomInOrOut); void updateContentsSize(); - QRect previewRect(); - - virtual void resizeEvent(QResizeEvent *); - virtual void viewportPaintEvent(QPaintEvent *); - virtual void contentsMousePressEvent(QMouseEvent *); - virtual void contentsMouseMoveEvent(QMouseEvent *); - virtual void contentsMouseReleaseEvent(QMouseEvent *); - virtual void contentsWheelEvent(QWheelEvent *); + TQRect previewRect(); + + virtual void resizeEvent(TQResizeEvent *); + virtual void viewportPaintEvent(TQPaintEvent *); + virtual void contentsMousePressEvent(TQMouseEvent *); + virtual void contentsMouseMoveEvent(TQMouseEvent *); + virtual void contentsMouseReleaseEvent(TQMouseEvent *); + virtual void contentsWheelEvent(TQWheelEvent *); virtual void setContentsSize(); virtual void viewportPaintExtraData(){}; virtual int previewWidth()=0; virtual int previewHeight()=0; virtual bool previewIsNull()=0; virtual void resetPreview()=0; - virtual void paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh)=0; + virtual void paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh)=0; virtual void zoomFactorChanged(double zoom); private: diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index 1a76bbf..219d0a7 100644 --- a/digikam/libs/widgets/common/searchtextbar.cpp +++ b/digikam/libs/widgets/common/searchtextbar.cpp @@ -21,14 +21,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qpalette.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qtoolbutton.h> +#include <tqcolor.h> +#include <tqpalette.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> // KDE includes. @@ -56,11 +56,11 @@ public: bool drawMsg; - QString message; + TQString message; }; -DLineEdit::DLineEdit(const QString &msg, QWidget *parent) - : KLineEdit(parent) +DLineEdit::DLineEdit(const TQString &msg, TQWidget *tqparent) + : KLineEdit(tqparent) { d = new DLineEditPriv; setMessage(msg); @@ -71,33 +71,33 @@ DLineEdit::~DLineEdit() delete d; } -QString DLineEdit::message() const +TQString DLineEdit::message() const { return d->message; } -void DLineEdit::setMessage(const QString &msg) +void DLineEdit::setMessage(const TQString &msg) { d->message = msg; - repaint(); + tqrepaint(); } -void DLineEdit::setText(const QString &txt) +void DLineEdit::setText(const TQString &txt) { d->drawMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText(txt); } -void DLineEdit::drawContents(QPainter *p) +void DLineEdit::drawContents(TQPainter *p) { KLineEdit::drawContents(p); if (d->drawMsg && !hasFocus()) { - QPen tmp = p->pen(); - p->setPen(palette().color(QPalette::Disabled, QColorGroup::Text)); - QRect cr = contentsRect(); + TQPen tmp = p->pen(); + p->setPen(palette().color(TQPalette::Disabled, TQColorGroup::Text)); + TQRect cr = contentsRect(); // Add two pixel margin on the left side cr.rLeft() += 3; @@ -106,30 +106,30 @@ void DLineEdit::drawContents(QPainter *p) } } -void DLineEdit::dropEvent(QDropEvent *e) +void DLineEdit::dropEvent(TQDropEvent *e) { d->drawMsg = false; KLineEdit::dropEvent(e); } -void DLineEdit::focusInEvent(QFocusEvent *e) +void DLineEdit::focusInEvent(TQFocusEvent *e) { if (d->drawMsg) { d->drawMsg = false; - repaint(); + tqrepaint(); } - QLineEdit::focusInEvent(e); + TQLineEdit::focusInEvent(e); } -void DLineEdit::focusOutEvent(QFocusEvent *e) +void DLineEdit::focusOutEvent(TQFocusEvent *e) { if (text().isEmpty()) { d->drawMsg = true; - repaint(); + tqrepaint(); } - QLineEdit::focusOutEvent(e); + TQLineEdit::focusOutEvent(e); } // --------------------------------------------------------------------- @@ -147,21 +147,21 @@ public: bool textQueryCompletion; - QToolButton *clearButton; + TQToolButton *clearButton; DLineEdit *searchEdit; }; -SearchTextBar::SearchTextBar(QWidget *parent, const char* name, const QString &msg) - : QWidget(parent, 0, Qt::WDestructiveClose) +SearchTextBar::SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new SearchTextBarPriv; - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setName(name); - QHBoxLayout *hlay = new QHBoxLayout(this); + TQHBoxLayout *hlay = new TQHBoxLayout(this); - d->clearButton = new QToolButton(this); + d->clearButton = new TQToolButton(this); d->clearButton->setEnabled(false); d->clearButton->setAutoRaise(true); d->clearButton->setIconSet(kapp->iconLoader()->loadIcon("clear_left", @@ -172,21 +172,21 @@ SearchTextBar::SearchTextBar(QWidget *parent, const char* name, const QString &m kcom->setOrder(KCompletion::Sorted); d->searchEdit->setCompletionObject(kcom, true); d->searchEdit->setAutoDeleteCompletionObject(true); - d->searchEdit->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); + d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); hlay->setSpacing(0); hlay->setMargin(0); hlay->addWidget(d->searchEdit); hlay->addWidget(d->clearButton); - connect(d->clearButton, SIGNAL(clicked()), - d->searchEdit, SLOT(clear())); + connect(d->clearButton, TQT_SIGNAL(clicked()), + d->searchEdit, TQT_SLOT(clear())); - connect(d->searchEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(slotTextChanged(const QString&))); + connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotTextChanged(const TQString&))); KConfig *config = kapp->config(); - config->setGroup(name + QString(" Search Text Tool")); + config->setGroup(name + TQString(" Search Text Tool")); d->searchEdit->setCompletionMode((KGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", (int)KGlobalSettings::CompletionAuto)); } @@ -194,7 +194,7 @@ SearchTextBar::SearchTextBar(QWidget *parent, const char* name, const QString &m SearchTextBar::~SearchTextBar() { KConfig *config = kapp->config(); - config->setGroup(name() + QString(" Search Text Tool")); + config->setGroup(name() + TQString(" Search Text Tool")); config->writeEntry("AutoCompletionMode", (int)d->searchEdit->completionMode()); config->sync(); @@ -211,12 +211,12 @@ bool SearchTextBar::textQueryCompletion() const return d->textQueryCompletion; } -void SearchTextBar::setText(const QString& text) +void SearchTextBar::setText(const TQString& text) { d->searchEdit->setText(text); } -QString SearchTextBar::text() const +TQString SearchTextBar::text() const { return d->searchEdit->text(); } @@ -226,7 +226,7 @@ DLineEdit *SearchTextBar::lineEdit() const return d->searchEdit; } -void SearchTextBar::slotTextChanged(const QString& text) +void SearchTextBar::slotTextChanged(const TQString& text) { if (d->searchEdit->text().isEmpty()) d->searchEdit->unsetPalette(); @@ -244,11 +244,11 @@ void SearchTextBar::slotSearchResult(bool match) return; } - QPalette pal = d->searchEdit->palette(); - pal.setColor(QPalette::Active, QColorGroup::Base, - match ? QColor(200, 255, 200) : - QColor(255, 200, 200)); - pal.setColor(QPalette::Active, QColorGroup::Text, Qt::black); + TQPalette pal = d->searchEdit->palette(); + pal.setColor(TQPalette::Active, TQColorGroup::Base, + match ? TQColor(200, 255, 200) : + TQColor(255, 200, 200)); + pal.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black); d->searchEdit->setPalette(pal); // If search result match the text query, we put the text diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index 77f9aca..a1f1ee5 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -24,10 +24,10 @@ #ifndef SEARCH_TEXT_BAR_H #define SEARCH_TEXT_BAR_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -47,40 +47,42 @@ class SearchTextBarPriv; class DIGIKAM_EXPORT DLineEdit : public KLineEdit { Q_OBJECT + TQ_OBJECT public: - DLineEdit(const QString &msg, QWidget *parent); + DLineEdit(const TQString &msg, TQWidget *tqparent); ~DLineEdit(); - void setMessage(const QString &msg); - QString message() const; + void setMessage(const TQString &msg); + TQString message() const; - void setText(const QString& txt); + void setText(const TQString& txt); protected: - void drawContents(QPainter *p); - void dropEvent(QDropEvent *e); - void focusInEvent(QFocusEvent *e); - void focusOutEvent(QFocusEvent *e); + void drawContents(TQPainter *p); + void dropEvent(TQDropEvent *e); + void focusInEvent(TQFocusEvent *e); + void focusOutEvent(TQFocusEvent *e); private : DLineEditPriv* d; }; -class DIGIKAM_EXPORT SearchTextBar : public QWidget +class DIGIKAM_EXPORT SearchTextBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SearchTextBar(QWidget *parent, const char* name, const QString &msg=i18n("Search...")); + SearchTextBar(TQWidget *tqparent, const char* name, const TQString &msg=i18n("Search...")); ~SearchTextBar(); - void setText(const QString& text); - QString text() const; + void setText(const TQString& text); + TQString text() const; void setEnableTextQueryCompletion(bool b); bool textQueryCompletion() const; @@ -89,7 +91,7 @@ public: signals: - void signalTextChanged(const QString&); + void signalTextChanged(const TQString&); public slots: @@ -97,7 +99,7 @@ public slots: private slots: - void slotTextChanged(const QString&); + void slotTextChanged(const TQString&); private : diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index be6f48e..0d935bb 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -24,12 +24,12 @@ /** @file sidebar.cpp */ -// Qt includes. +// TQt includes. -#include <qsplitter.h> -#include <qwidgetstack.h> -#include <qdatastream.h> -#include <qtimer.h> +#include <tqsplitter.h> +#include <tqwidgetstack.h> +#include <tqdatastream.h> +#include <tqtimer.h> // KDE includes. @@ -78,24 +78,24 @@ public: int maxSize; int dragSwitchId; - QWidgetStack *stack; - QSplitter *splitter; - QSize bigSize; - QTimer *dragSwitchTimer; + TQWidgetStack *stack; + TQSplitter *splitter; + TQSize bigSize; + TQTimer *dragSwitchTimer; Sidebar::Side side; }; -Sidebar::Sidebar(QWidget *parent, const char *name, Side side, bool minimizedDefault) - : KMultiTabBar(KMultiTabBar::Vertical, parent, name) +Sidebar::Sidebar(TQWidget *tqparent, const char *name, Side side, bool minimizedDefault) + : KMultiTabBar(KMultiTabBar::Vertical, tqparent, name) { d = new SidebarPriv; d->minimizedDefault = minimizedDefault; d->side = side; - d->dragSwitchTimer = new QTimer(this); + d->dragSwitchTimer = new TQTimer(this); - connect(d->dragSwitchTimer, SIGNAL(timeout()), - this, SLOT(slotDragSwitchTimer())); + connect(d->dragSwitchTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotDragSwitchTimer())); } Sidebar::~Sidebar() @@ -109,14 +109,14 @@ void Sidebar::updateMinimumWidth() int width = 0; for (int i = 0; i < d->tabs; i++) { - QWidget *w = d->stack->widget(i); + TQWidget *w = d->stack->widget(i); if (w && w->width() > width) width = w->width(); } d->stack->setMinimumWidth(width); } -void Sidebar::setSplitter(QSplitter *sp) +void Sidebar::setSplitter(TQSplitter *sp) { #if KDE_IS_VERSION(3,3,0) setStyle(KMultiTabBar::VSNET); @@ -125,7 +125,7 @@ void Sidebar::setSplitter(QSplitter *sp) #endif d->splitter = sp; - d->stack = new QWidgetStack(d->splitter); + d->stack = new TQWidgetStack(d->splitter); if(d->side == Left) setPosition(KMultiTabBar::Left); @@ -133,7 +133,7 @@ void Sidebar::setSplitter(QSplitter *sp) setPosition(KMultiTabBar::Right); } -QSplitter* Sidebar::splitter() const +TQSplitter* Sidebar::splitter() const { return d->splitter; } @@ -141,7 +141,7 @@ QSplitter* Sidebar::splitter() const void Sidebar::loadViewState() { KConfig *config = kapp->config(); - config->setGroup(QString("%1").arg(name())); + config->setGroup(TQString("%1").tqarg(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(QString("%1").arg(name())); + config->setGroup(TQString("%1").tqarg(name())); config->writeEntry("ActiveTab", d->activeTab); config->writeEntry("Minimized", d->minimized); config->sync(); @@ -192,22 +192,22 @@ void Sidebar::restore() KMultiTabBar::show(); } -void Sidebar::appendTab(QWidget *w, const QPixmap &pic, const QString &title) +void Sidebar::appendTab(TQWidget *w, const TQPixmap &pic, const TQString &title) { - w->reparent(d->stack, QPoint(0, 0)); + w->reparent(d->stack, TQPoint(0, 0)); KMultiTabBar::appendTab(pic, d->tabs, title); d->stack->addWidget(w, d->tabs); tab(d->tabs)->setAcceptDrops(true); tab(d->tabs)->installEventFilter(this); - connect(tab(d->tabs), SIGNAL(clicked(int)), - this, SLOT(clicked(int))); + connect(tab(d->tabs), TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(clicked(int))); d->tabs++; } -void Sidebar::deleteTab(QWidget *w) +void Sidebar::deleteTab(TQWidget *w) { int tab = d->stack->id(w); if(tab < 0) @@ -249,7 +249,7 @@ void Sidebar::clicked(int tab) } } -void Sidebar::setActiveTab(QWidget *w) +void Sidebar::setActiveTab(TQWidget *w) { int tab = d->stack->id(w); if(tab < 0) @@ -268,7 +268,7 @@ void Sidebar::setActiveTab(QWidget *w) emit signalChangedTab(d->stack->visibleWidget()); } -QWidget* Sidebar::getActiveTab() +TQWidget* Sidebar::getActiveTab() { return d->stack->visibleWidget(); } @@ -306,22 +306,22 @@ bool Sidebar::isExpanded() return !d->minimized; } -bool Sidebar::eventFilter(QObject *obj, QEvent *ev) +bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) { - QPtrList<KMultiTabBarTab>* pTabs = tabs(); + TQPtrList<KMultiTabBarTab>* pTabs = tabs(); - for (QPtrListIterator<KMultiTabBarTab> it(*pTabs); it.current(); ++it) + for (TQPtrListIterator<KMultiTabBarTab> it(*pTabs); it.current(); ++it) { - if ( obj == *it ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(*it) ) { - if ( ev->type() == QEvent::DragEnter) + if ( ev->type() == TQEvent::DragEnter) { - QDragEnterEvent *e = static_cast<QDragEnterEvent *>(ev); + TQDragEnterEvent *e = static_cast<TQDragEnterEvent *>(ev); enterEvent(e); e->accept(true); return false; } - else if (ev->type() == QEvent::DragMove) + else if (ev->type() == TQEvent::DragMove) { if (!d->dragSwitchTimer->isActive()) { @@ -330,17 +330,17 @@ bool Sidebar::eventFilter(QObject *obj, QEvent *ev) } return false; } - else if (ev->type() == QEvent::DragLeave) + else if (ev->type() == TQEvent::DragLeave) { d->dragSwitchTimer->stop(); - QDragLeaveEvent *e = static_cast<QDragLeaveEvent *>(ev); + TQDragLeaveEvent *e = static_cast<TQDragLeaveEvent *>(ev); leaveEvent(e); return false; } - else if (ev->type() == QEvent::Drop) + else if (ev->type() == TQEvent::Drop) { d->dragSwitchTimer->stop(); - QDropEvent *e = static_cast<QDropEvent *>(ev); + TQDropEvent *e = static_cast<TQDropEvent *>(ev); leaveEvent(e); return false; } @@ -351,7 +351,7 @@ bool Sidebar::eventFilter(QObject *obj, QEvent *ev) } } - // Else, pass the event on to the parent class + // Else, pass the event on to the tqparent class return KMultiTabBar::eventFilter(obj, ev); } diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h index f3e9e02..380acf6 100644 --- a/digikam/libs/widgets/common/sidebar.h +++ b/digikam/libs/widgets/common/sidebar.h @@ -39,7 +39,7 @@ #include "digikam_export.h" -class QSplitter; +class TQSplitter; namespace Digikam { @@ -52,6 +52,7 @@ class SidebarPriv; class DIGIKAM_EXPORT Sidebar : public KMultiTabBar { Q_OBJECT + TQ_OBJECT public: @@ -66,23 +67,23 @@ public: /** * Creates a new sidebar - * @param parent sidebar's parent + * @param tqparent sidebar's tqparent * @param name the name of the widget is used to store its state to config * @param side where the sidebar should be displayed. At the left or right border. * @param minimizedDefault hide the sidebar when the program is started the first time? */ - Sidebar(QWidget *parent, const char *name, Side side=Left, bool mimimizedDefault=false); + Sidebar(TQWidget *tqparent, const char *name, Side side=Left, bool mimimizedDefault=false); virtual ~Sidebar(); /** - * The width of the widget stack can be changed by a QSplitter. + * The width of the widget stack can be changed by a TQSplitter. * @param sp sets the splitter, which should handle the width. The splitter normally * is part of the main view. */ - void setSplitter(QSplitter *sp); - void setSplitterSizePolicy(QSizePolicy p); + void setSplitter(TQSplitter *sp); + void setSplitterSizePolicy(TQSizePolicy p); - QSplitter* splitter() const; + TQSplitter* splitter() const; /** * Appends a new tab to the sidebar @@ -90,22 +91,22 @@ public: * @param pic icon which is shown in this tab * @param title text which is shown it this tab */ - void appendTab(QWidget *w, const QPixmap &pic, const QString &title); + void appendTab(TQWidget *w, const TQPixmap &pic, const TQString &title); /** * Deletes a tab from the tabbar */ - void deleteTab(QWidget *w); + void deleteTab(TQWidget *w); /** * Activates a tab */ - void setActiveTab(QWidget *w); + void setActiveTab(TQWidget *w); /** * Returns the currently activated tab, or 0 if no tab is active */ - QWidget* getActiveTab(); + TQWidget* getActiveTab(); /** * Hides the sidebar (display only the activation buttons) @@ -143,7 +144,7 @@ private: * save the view state to disk */ void saveViewState(); - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); void updateMinimumWidth(); private slots: @@ -160,7 +161,7 @@ signals: /** * is emitted, when another tab is activated */ - void signalChangedTab(QWidget *w); + void signalChangedTab(TQWidget *w); /** * is emitted, when tab is shrink or expanded diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index a9437d2..8294d97 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -22,12 +22,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qfont.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqtimer.h> +#include <tqfont.h> +#include <tqstring.h> +#include <tqcolor.h> // KDE includes. @@ -52,28 +52,28 @@ public: state = 0; progressBarSize = 3; state = 0; - color = Qt::black; - alignment = Qt::AlignLeft; + color = TQt::black; + tqalignment = TQt::AlignLeft; } int state; int progressBarSize; - int alignment; + int tqalignment; - QString string; + TQString string; - QColor color; + TQColor color; }; -SplashScreen::SplashScreen(const QString& splash, WFlags f) - : KSplashScreen(QPixmap(locate("appdata", splash)), f) +SplashScreen::SplashScreen(const TQString& splash, WFlags f) + : KSplashScreen(TQPixmap(locate("appdata", splash)), f) { d = new SplashScreenPriv; - QTimer *timer = new QTimer(this); + TQTimer *timer = new TQTimer(this); - connect(timer, SIGNAL(timeout()), - this, SLOT(animate())); + connect(timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(animate())); timer->start(150); } @@ -86,46 +86,46 @@ SplashScreen::~SplashScreen() void SplashScreen::animate() { d->state = ((d->state + 1) % (2*d->progressBarSize-1)); - repaint(); + tqrepaint(); } -void SplashScreen::setColor(const QColor& color) +void SplashScreen::setColor(const TQColor& color) { d->color = color; } -void SplashScreen::setAlignment(int alignment) +void SplashScreen::tqsetAlignment(int tqalignment) { - d->alignment = alignment; + d->tqalignment = tqalignment; } -void SplashScreen::message(const QString& message) +void SplashScreen::message(const TQString& message) { d->string = message; - QSplashScreen::message(d->string, d->alignment, d->color); + TQSplashScreen::message(d->string, d->tqalignment, d->color); animate(); } -void SplashScreen::drawContents(QPainter* painter) +void SplashScreen::drawContents(TQPainter* painter) { int position; - QColor basecolor(155, 192, 231); + TQColor basecolor(155, 192, 231); // Draw background circles painter->setPen(NoPen); - painter->setBrush(QColor(225, 234, 231)); + painter->setBrush(TQColor(225, 234, 231)); painter->drawEllipse(21, 7, 9, 9); painter->drawEllipse(32, 7, 9, 9); painter->drawEllipse(43, 7, 9, 9); // Draw animated circles, increments are chosen // to get close to background's color - // (didn't work well with QColor::light function) + // (didn't work well with TQColor::light function) for (int i=0; i < d->progressBarSize; i++) { position = (d->state+i)%(2*d->progressBarSize-1); if (position < 3) { - painter->setBrush(QColor(basecolor.red() -18*i, + painter->setBrush(TQColor(basecolor.red() -18*i, basecolor.green()-28*i, basecolor.blue() -10*i)); @@ -135,7 +135,7 @@ void SplashScreen::drawContents(QPainter* painter) painter->setPen(d->color); - QFont fnt(KGlobalSettings::generalFont()); + TQFont fnt(KGlobalSettings::generalFont()); int fntSize = fnt.pointSize(); if (fntSize > 0) { @@ -148,13 +148,13 @@ void SplashScreen::drawContents(QPainter* painter) } painter->setFont(fnt); - QRect r = rect(); + TQRect r = rect(); r.setRect( r.x() + 59, r.y() + 5, r.width() - 10, r.height() - 10 ); // 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->alignment, d->string); + painter->drawText(r, d->tqalignment, d->string); } } // namespace Digikam diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index a5aed33..9845c81 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -25,9 +25,9 @@ #ifndef SPLASHSCREEN_H #define SPLASHSCREEN_H -// Qt includes. +// TQt includes. -#include <qpainter.h> +#include <tqpainter.h> // KDE includes. @@ -45,23 +45,24 @@ class SplashScreenPriv; class DIGIKAM_EXPORT SplashScreen : public KSplashScreen { Q_OBJECT + TQ_OBJECT public: - SplashScreen(const QString& splash, WFlags f=0); + SplashScreen(const TQString& splash, WFlags f=0); virtual ~SplashScreen(); - void setAlignment(int alignment); - void setColor(const QColor& color); + void tqsetAlignment(int tqalignment); + void setColor(const TQColor& color); protected: - void drawContents (QPainter *); + void drawContents (TQPainter *); public slots: void animate(); - void message(const QString &message); + void message(const TQString &message); private: diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 1554b95..a195e4f 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -25,17 +25,17 @@ /** @file squeezedcombobox.cpp */ -// Qt includes. - -#include <qlistbox.h> -#include <qcombobox.h> -#include <qpair.h> -#include <qtimer.h> -#include <qvaluelist.h> -#include <qstyle.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qmap.h> +// TQt includes. + +#include <tqlistbox.h> +#include <tqcombobox.h> +#include <tqpair.h> +#include <tqtimer.h> +#include <tqvaluelist.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqmap.h> // Local includes. @@ -55,31 +55,31 @@ public: tooltip = 0; } - QMap<int, QString> originalItems; + TQMap<int, TQString> originalItems; - QTimer *timer; + TQTimer *timer; SqueezedComboBoxTip *tooltip; }; -SqueezedComboBox::SqueezedComboBox(QWidget *parent, const char *name) - : QComboBox(parent, name) +SqueezedComboBox::SqueezedComboBox(TQWidget *tqparent, const char *name) + : TQComboBox(tqparent, name) { d = new SqueezedComboBoxPriv; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - // See B.K.O #138747 : always for QComboBox instance to use a QListbox to + // See B.K.O #138747 : always for TQComboBox instance to use a TQListbox to // render content independently of Widget style used. - setListBox(new QListBox(this)); + setListBox(new TQListBox(this)); d->tooltip = new SqueezedComboBoxTip(listBox()->viewport(), this); setMinimumWidth(100); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeOut())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeOut())); - connect(this, SIGNAL(activated( int )), - this, SLOT(slotUpdateToolTip( int ))); + connect(this, TQT_SIGNAL(activated( int )), + this, TQT_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() @@ -89,19 +89,19 @@ SqueezedComboBox::~SqueezedComboBox() delete d; } -QSize SqueezedComboBox::sizeHint() const +TQSize SqueezedComboBox::tqsizeHint() const { constPolish(); - QFontMetrics fm = fontMetrics(); + TQFontMetrics fm = fontMetrics(); - int maxW = count() ? 18 : 7 * fm.width(QChar('x')) + 18; - int maxH = QMAX( fm.lineSpacing(), 14 ) + 2; + int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; + int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().sizeFromContents(QStyle::CT_ComboBox, this, - QSize(maxW, maxH)).expandedTo(QApplication::globalStrut()); + return tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this, + TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()); } -void SqueezedComboBox::insertSqueezedItem(const QString& newItem, int index) +void SqueezedComboBox::insertSqueezedItem(const TQString& newItem, int index) { d->originalItems[index] = newItem; insertItem( squeezeText(newItem), index ); @@ -111,23 +111,23 @@ void SqueezedComboBox::insertSqueezedItem(const QString& newItem, int index) slotUpdateToolTip(0); } -void SqueezedComboBox::insertSqueezedList(const QStringList& newItems, int index) +void SqueezedComboBox::insertSqueezedList(const TQStringList& newItems, int index) { - for(QStringList::const_iterator it = newItems.begin() ; it != newItems.end() ; ++it) + for(TQStringList::const_iterator it = newItems.begin() ; it != newItems.end() ; ++it) { insertSqueezedItem(*it, index); index++; } } -void SqueezedComboBox::resizeEvent(QResizeEvent *) +void SqueezedComboBox::resizeEvent(TQResizeEvent *) { d->timer->start(200, true); } void SqueezedComboBox::slotTimeOut() { - QMapIterator<int,QString> it; + TQMapIterator<int,TQString> it; for (it = d->originalItems.begin() ; it != d->originalItems.end(); ++it) { @@ -135,24 +135,24 @@ void SqueezedComboBox::slotTimeOut() } } -QString SqueezedComboBox::squeezeText(const QString& original) +TQString SqueezedComboBox::squeezeText(const TQString& original) { // not the complete widgetSize is usable. Need to compensate for that. int widgetSize = width()-30; - QFontMetrics fm(fontMetrics()); + TQFontMetrics fm(fontMetrics()); // If we can fit the full text, return that. if (fm.width(original) < widgetSize) return(original); // We need to squeeze. - QString sqItem = original; // prevent empty return value; + TQString sqItem = original; // prevent empty return value; widgetSize = widgetSize-fm.width("..."); for (uint i = 0 ; i != original.length(); ++i) { if ((int)fm.width(original.right(i)) > widgetSize) { - sqItem = QString(original.left(i) + "..."); + sqItem = TQString(original.left(i) + "..."); break; } } @@ -161,11 +161,11 @@ QString SqueezedComboBox::squeezeText(const QString& original) void SqueezedComboBox::slotUpdateToolTip(int index) { - QToolTip::remove(this); - QToolTip::add(this, d->originalItems[index]); + TQToolTip::remove(this); + TQToolTip::add(this, d->originalItems[index]); } -QString SqueezedComboBox::itemHighlighted() +TQString SqueezedComboBox::itemHighlighted() { int curItem = listBox()->currentItem(); return d->originalItems[curItem]; @@ -173,23 +173,23 @@ QString SqueezedComboBox::itemHighlighted() // ------------------------------------------------------------------------ -SqueezedComboBoxTip::SqueezedComboBoxTip(QWidget *parent, SqueezedComboBox *name) - : QToolTip( parent ) +SqueezedComboBoxTip::SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name) + : TQToolTip( tqparent ) { m_originalWidget = name; } -void SqueezedComboBoxTip::maybeTip(const QPoint &pos) +void SqueezedComboBoxTip::maybeTip(const TQPoint &pos) { - QListBox* listBox = m_originalWidget->listBox(); + TQListBox* listBox = m_originalWidget->listBox(); if (!listBox) return; - QListBoxItem* selectedItem = listBox->itemAt( pos ); + TQListBoxItem* selectedItem = listBox->itemAt( pos ); if (selectedItem) { - QRect positionToolTip = listBox->itemRect(selectedItem); - QString toolTipText = m_originalWidget->itemHighlighted(); + TQRect positionToolTip = listBox->tqitemRect(selectedItem); + TQString toolTipText = m_originalWidget->itemHighlighted(); if (!toolTipText.isNull()) tip(positionToolTip, toolTipText); } diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index 242948c..c26792c 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -25,13 +25,13 @@ /** @file squeezedcombobox.h */ -#ifndef SQUEEZEDCOMBOBOX_H -#define SQUEEZEDCOMBOBOX_H +#ifndef STQUEEZEDCOMBOBOX_H +#define STQUEEZEDCOMBOBOX_H -// Qt includes. +// TQt includes. -#include <qcombobox.h> -#include <qtooltip.h> +#include <tqcombobox.h> +#include <tqtooltip.h> // Local includes. @@ -44,7 +44,7 @@ class SqueezedComboBoxPriv; /** @class SqueezedComboBox * - * This widget is a QComboBox, but then a little bit + * This widget is a TQComboBox, but then a little bit * different. It only shows the right part of the items * depending on de size of the widget. When it is not * possible to show the complete item, it will be shortened @@ -53,18 +53,19 @@ class SqueezedComboBoxPriv; * @image html squeezedcombobox.png "This is how it looks" * @author Tom Albers */ -class DIGIKAM_EXPORT SqueezedComboBox : public QComboBox +class DIGIKAM_EXPORT SqueezedComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent widget + * @param tqparent tqparent widget * @param name name to give to the widget */ - SqueezedComboBox(QWidget *parent = 0, const char *name = 0 ); + SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 ); /** * destructor @@ -72,36 +73,36 @@ public: virtual ~SqueezedComboBox(); /** - * This inserts a item to the list. See QComboBox::insertItem() - * for details. Please do not use QComboBox::insertItem() to this + * This inserts a item to the list. See TQComboBox::insertItem() + * for details. Please do not use TQComboBox::insertItem() to this * widget, as that will fail. * @param newItem the original (long version) of the item which needs * to be added to the combobox * @param index the position in the widget. */ - void insertSqueezedItem(const QString& newItem, int index); + void insertSqueezedItem(const TQString& newItem, int index); /** - * This inserts items to the list. See QComboBox::insertStringList() - * for details. Please do not use QComboBox::insertStringList() to this + * This inserts items to the list. See TQComboBox::insertStringList() + * for details. Please do not use TQComboBox::insertStringList() to this * widget, as that will fail. * @param newItems the originals (long version) of the items which needs * to be added to the combobox * @param index the position in the widget. */ - void insertSqueezedList(const QStringList& newItems, int index); + void insertSqueezedList(const TQStringList& newItems, int index); /** * This method returns the full text (not squeezed) of the currently * highlighted item. * @return full text of the highlighted item */ - QString itemHighlighted(); + TQString itemHighlighted(); /** - * Sets the sizeHint() of this widget. + * Sets the tqsizeHint() of this widget. */ - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; private slots: @@ -110,8 +111,8 @@ private slots: private: - void resizeEvent(QResizeEvent *); - QString squeezeText(const QString& original); + void resizeEvent(TQResizeEvent *); + TQString squeezeText(const TQString& original); private: @@ -125,11 +126,11 @@ private: * the tooltip will contain the full text and helps * the user find the correct entry. It is automatically * activated when starting a SqueezedComboBox. This is - * inherited from QToolTip + * inherited from TQToolTip * * @author Tom Albers */ -class SqueezedComboBoxTip : public QToolTip +class SqueezedComboBoxTip : public TQToolTip { public: @@ -140,18 +141,18 @@ public: * t = new SqueezedComboBoxTip( this->listBox()->viewport(), this ); * @endcode * - * @param parent parent widget (viewport) - * @param name parent widget + * @param tqparent tqparent widget (viewport) + * @param name tqparent widget */ - SqueezedComboBoxTip(QWidget *parent, SqueezedComboBox *name); + SqueezedComboBoxTip(TQWidget *tqparent, SqueezedComboBox *name); protected: /** - * Reimplemented version from QToolTip which shows the + * Reimplemented version from TQToolTip which shows the * tooltip when needed. * @param pos the point where the mouse currently is */ - void maybeTip(const QPoint& pos); + void maybeTip(const TQPoint& pos); private: @@ -160,4 +161,4 @@ private: } // namespace Digikam -#endif // SQUEEZEDCOMBOBOX_H +#endif // STQUEEZEDCOMBOBOX_H diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp index 3798ade..f63e634 100644 --- a/digikam/libs/widgets/common/statusled.cpp +++ b/digikam/libs/widgets/common/statusled.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qstring.h> +#include <tqpixmap.h> +#include <tqstring.h> // KDE includes. @@ -39,11 +39,11 @@ namespace Digikam { -StatusLed::StatusLed(QWidget *parent) - : QLabel(parent) +StatusLed::StatusLed(TQWidget *tqparent) + : TQLabel(tqparent) { setLedColor(Gray); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); } StatusLed::~StatusLed() @@ -54,25 +54,25 @@ void StatusLed::setLedColor(LedColor color) { m_color = color; - QString file; + TQString file; switch(m_color) { case Green: - file = QString("indicator-green"); + file = TQString("indicator-green"); break; case Red: - file = QString("indicator-red"); + file = TQString("indicator-red"); break; default: - file = QString("indicator-gray"); + file = TQString("indicator-gray"); break; } KGlobal::dirs()->addResourceType(file.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir(file.ascii(), file + QString(".png")); - setPixmap(QPixmap(directory + file + QString(".png"))); + TQString directory = KGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png")); + setPixmap(TQPixmap(directory + file + TQString(".png"))); } StatusLed::LedColor StatusLed::ledColor() const diff --git a/digikam/libs/widgets/common/statusled.h b/digikam/libs/widgets/common/statusled.h index d151c97..11e1fd2 100644 --- a/digikam/libs/widgets/common/statusled.h +++ b/digikam/libs/widgets/common/statusled.h @@ -24,9 +24,9 @@ #ifndef STATUS_LED_H #define STATUS_LED_H -// Qt includes. +// TQt includes. -#include <qlabel.h> +#include <tqlabel.h> // Local includes. @@ -37,9 +37,10 @@ namespace Digikam class StatusNavigateBarPriv; -class DIGIKAM_EXPORT StatusLed : public QLabel +class DIGIKAM_EXPORT StatusLed : public TQLabel { Q_OBJECT + TQ_OBJECT public: @@ -52,7 +53,7 @@ public: public: - StatusLed(QWidget *parent=0); + StatusLed(TQWidget *tqparent=0); ~StatusLed(); LedColor ledColor() const; diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index 6f090cb..4d13651 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.cpp +++ b/digikam/libs/widgets/common/statusnavigatebar.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> // KDE includes. @@ -56,60 +56,60 @@ public: int itemType; - QToolButton *firstButton; - QToolButton *prevButton; - QToolButton *nextButton; - QToolButton *lastButton; + TQToolButton *firstButton; + TQToolButton *prevButton; + TQToolButton *nextButton; + TQToolButton *lastButton; }; -StatusNavigateBar::StatusNavigateBar(QWidget *parent) - : QWidget(parent, 0, Qt::WDestructiveClose) +StatusNavigateBar::StatusNavigateBar(TQWidget *tqparent) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new StatusNavigateBarPriv; - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); - QHBoxLayout *lay = new QHBoxLayout(this); + TQHBoxLayout *lay = new TQHBoxLayout(this); - d->firstButton = new QToolButton(this); - d->firstButton->setFocusPolicy(QWidget::NoFocus); + d->firstButton = new TQToolButton(this); + d->firstButton->setFocusPolicy(TQ_NoFocus); d->firstButton->setAutoRaise(true); d->firstButton->setIconSet(SmallIconSet("start")); - QToolTip::add(d->firstButton, i18n("Go to the first item")); + TQToolTip::add(d->firstButton, i18n("Go to the first item")); - d->prevButton = new QToolButton(this); - d->prevButton->setFocusPolicy(QWidget::NoFocus); + d->prevButton = new TQToolButton(this); + d->prevButton->setFocusPolicy(TQ_NoFocus); d->prevButton->setAutoRaise(true); d->prevButton->setIconSet(SmallIconSet("back")); - QToolTip::add(d->prevButton, i18n("Go to the previous item")); + TQToolTip::add(d->prevButton, i18n("Go to the previous item")); - d->nextButton = new QToolButton(this); - d->nextButton->setFocusPolicy(QWidget::NoFocus); + d->nextButton = new TQToolButton(this); + d->nextButton->setFocusPolicy(TQ_NoFocus); d->nextButton->setAutoRaise(true); d->nextButton->setIconSet(SmallIconSet("forward")); - QToolTip::add(d->nextButton, i18n("Go to the next item")); + TQToolTip::add(d->nextButton, i18n("Go to the next item")); - d->lastButton = new QToolButton(this); - d->lastButton->setFocusPolicy(QWidget::NoFocus); + d->lastButton = new TQToolButton(this); + d->lastButton->setFocusPolicy(TQ_NoFocus); d->lastButton->setAutoRaise(true); d->lastButton->setIconSet(SmallIconSet("finish")); - QToolTip::add(d->lastButton, i18n("Go to the last item")); + TQToolTip::add(d->lastButton, i18n("Go to the last item")); lay->addWidget(d->firstButton); lay->addWidget(d->prevButton); lay->addWidget(d->nextButton); lay->addWidget(d->lastButton); - connect(d->firstButton, SIGNAL(clicked()), - this, SIGNAL(signalFirstItem())); + connect(d->firstButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalFirstItem())); - connect(d->prevButton, SIGNAL(clicked()), - this, SIGNAL(signalPrevItem())); + connect(d->prevButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalPrevItem())); - connect(d->nextButton, SIGNAL(clicked()), - this, SIGNAL(signalNextItem())); + connect(d->nextButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalNextItem())); - connect(d->lastButton, SIGNAL(clicked()), - this, SIGNAL(signalLastItem())); + connect(d->lastButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalLastItem())); } StatusNavigateBar::~StatusNavigateBar() diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/digikam/libs/widgets/common/statusnavigatebar.h index 89ab8aa..cc822b2 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.h +++ b/digikam/libs/widgets/common/statusnavigatebar.h @@ -25,10 +25,10 @@ #ifndef STATUS_NAVIGATE_BAR_H #define STATUS_NAVIGATE_BAR_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // Local includes. @@ -39,9 +39,10 @@ namespace Digikam class StatusNavigateBarPriv; -class DIGIKAM_EXPORT StatusNavigateBar : public QWidget +class DIGIKAM_EXPORT StatusNavigateBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -55,7 +56,7 @@ public: public: - StatusNavigateBar(QWidget *parent=0); + StatusNavigateBar(TQWidget *tqparent=0); ~StatusNavigateBar(); void setNavigateBarState(bool hasPrev, bool hasNext); diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 04866fa..bd1c9ec 100644 --- a/digikam/libs/widgets/common/statusprogressbar.cpp +++ b/digikam/libs/widgets/common/statusprogressbar.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqwidget.h> +#include <tqpushbutton.h> // KDE includes. @@ -64,29 +64,29 @@ public: } - QWidget *progressWidget; + TQWidget *progressWidget; - QPushButton *cancelButton; + TQPushButton *cancelButton; KSqueezedTextLabel *textLabel; KProgress *progressBar; }; -StatusProgressBar::StatusProgressBar(QWidget *parent) - : QWidgetStack(parent, 0, Qt::WDestructiveClose) +StatusProgressBar::StatusProgressBar(TQWidget *tqparent) + : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) { d = new StatusProgressBarPriv; - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); d->textLabel = new KSqueezedTextLabel(this); - d->progressWidget = new QWidget(this); - QHBoxLayout *hBox = new QHBoxLayout(d->progressWidget); + d->progressWidget = new TQWidget(this); + TQHBoxLayout *hBox = new TQHBoxLayout(d->progressWidget); d->progressBar = new KProgress(d->progressWidget); setProgressTotalSteps(100); - d->cancelButton = new QPushButton(d->progressWidget); - d->cancelButton->setFocusPolicy(QWidget::NoFocus); - d->cancelButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); + d->cancelButton = new TQPushButton(d->progressWidget); + d->cancelButton->setFocusPolicy(TQ_NoFocus); + d->cancelButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelButton->setPixmap(SmallIcon("cancel")); // Parent widget will probably have the wait cursor set. @@ -99,8 +99,8 @@ StatusProgressBar::StatusProgressBar(QWidget *parent) addWidget(d->textLabel, StatusProgressBarPriv::TextLabel); addWidget(d->progressWidget, StatusProgressBarPriv::ProgressBar); - connect( d->cancelButton, SIGNAL( clicked() ), - this, SIGNAL( signalCancelButtonPressed() ) ); + connect( d->cancelButton, TQT_SIGNAL( clicked() ), + this, TQT_SIGNAL( signalCancelButtonPressed() ) ); progressBarMode(TextMode); } @@ -110,14 +110,14 @@ StatusProgressBar::~StatusProgressBar() delete d; } -void StatusProgressBar::setText(const QString& text) +void StatusProgressBar::setText(const TQString& text) { d->textLabel->setText(text); } -void StatusProgressBar::setAlignment(int a) +void StatusProgressBar::tqsetAlignment(int a) { - d->textLabel->setAlignment(a); + d->textLabel->tqsetAlignment(a); } int StatusProgressBar::progressValue() @@ -140,13 +140,13 @@ int StatusProgressBar::progressTotalSteps() return d->progressBar->totalSteps(); } -void StatusProgressBar::setProgressText(const QString& text) +void StatusProgressBar::setProgressText(const TQString& text) { - d->progressBar->setFormat( text + QString ("%p%") ); + d->progressBar->setFormat( text + TQString ("%p%") ); d->progressBar->update(); } -void StatusProgressBar::progressBarMode(int mode, const QString& text) +void StatusProgressBar::progressBarMode(int mode, const TQString& text) { if ( mode == TextMode) { diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index 4eb419c..3e801c8 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -27,8 +27,8 @@ // KDE includes. -#include <qwidgetstack.h> -#include <qstring.h> +#include <tqwidgetstack.h> +#include <tqstring.h> // Local includes. @@ -39,9 +39,10 @@ namespace Digikam class StatusProgressBarPriv; -class DIGIKAM_EXPORT StatusProgressBar : public QWidgetStack +class DIGIKAM_EXPORT StatusProgressBar : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: @@ -54,12 +55,12 @@ public: public: - StatusProgressBar(QWidget *parent=0); + StatusProgressBar(TQWidget *tqparent=0); ~StatusProgressBar(); - void setAlignment(int a); + void tqsetAlignment(int a); - void progressBarMode(int mode, const QString& text=QString()); + void progressBarMode(int mode, const TQString& text=TQString()); int progressValue(); @@ -68,9 +69,9 @@ public: public slots: - void setText(const QString& text); + void setText(const TQString& text); void setProgressValue(int v); - void setProgressText(const QString& text); + void setProgressText(const TQString& text); signals: diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 808c529..9f2b002 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -21,13 +21,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtoolbutton.h> -#include <qtimer.h> -#include <qslider.h> -#include <qtooltip.h> -#include <qevent.h> +#include <tqtoolbutton.h> +#include <tqtimer.h> +#include <tqslider.h> +#include <tqtooltip.h> +#include <tqevent.h> // KDE includes. @@ -44,30 +44,30 @@ namespace Digikam { -QSliderReverseWheel::QSliderReverseWheel(QWidget *parent) - : QSlider(parent) +TQSliderReverseWheel::TQSliderReverseWheel(TQWidget *tqparent) + : TQSlider(tqparent) { // empty, we just need to re-implement wheelEvent to reverse the wheel } -QSliderReverseWheel::~QSliderReverseWheel() +TQSliderReverseWheel::~TQSliderReverseWheel() { } -void QSliderReverseWheel::wheelEvent(QWheelEvent * e) +void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) + if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) return; static float offset = 0; - static QSlider* offset_owner = 0; + static TQSlider* offset_owner = 0; if (offset_owner != this){ offset_owner = this; offset = 0; } // note: different sign in front of e->delta vs. original implementation - offset += e->delta()*QMAX(pageStep(),lineStep())/120; - if (QABS(offset)<1) + offset += e->delta()*TQMAX(pageStep(),lineStep())/120; + if (TQABS(offset)<1) return; setValue( value() + int(offset) ); offset -= int(offset); @@ -90,29 +90,29 @@ public: zoomTimer = 0; } - QToolButton *zoomPlusButton; - QToolButton *zoomMinusButton; + TQToolButton *zoomPlusButton; + TQToolButton *zoomMinusButton; - QTimer *zoomTimer; + TQTimer *zoomTimer; - QSlider *zoomSlider; + TQSlider *zoomSlider; DTipTracker *zoomTracker; }; -StatusZoomBar::StatusZoomBar(QWidget *parent) - : QHBox(parent, 0, Qt::WDestructiveClose) +StatusZoomBar::StatusZoomBar(TQWidget *tqparent) + : TQHBox(tqparent, 0, TQt::WDestructiveClose) { d = new StatusZoomBarPriv; - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); - d->zoomMinusButton = new QToolButton(this); + d->zoomMinusButton = new TQToolButton(this); d->zoomMinusButton->setAutoRaise(true); - d->zoomMinusButton->setFocusPolicy(QWidget::NoFocus); + d->zoomMinusButton->setFocusPolicy(TQ_NoFocus); d->zoomMinusButton->setIconSet(SmallIconSet("viewmag-")); - QToolTip::add(d->zoomMinusButton, i18n("Zoom Out")); + TQToolTip::add(d->zoomMinusButton, i18n("Zoom Out")); - d->zoomSlider = new QSliderReverseWheel(this); + d->zoomSlider = new TQSliderReverseWheel(this); d->zoomSlider->setMinValue(ThumbnailSize::Small); d->zoomSlider->setMaxValue(ThumbnailSize::Huge); d->zoomSlider->setPageStep(ThumbnailSize::Step); @@ -121,32 +121,32 @@ StatusZoomBar::StatusZoomBar(QWidget *parent) d->zoomSlider->setLineStep(ThumbnailSize::Step); d->zoomSlider->setMaximumHeight(fontMetrics().height()+2); d->zoomSlider->setFixedWidth(120); - d->zoomSlider->setFocusPolicy(QWidget::NoFocus); + d->zoomSlider->setFocusPolicy(TQ_NoFocus); - d->zoomPlusButton = new QToolButton(this); + d->zoomPlusButton = new TQToolButton(this); d->zoomPlusButton->setAutoRaise(true); d->zoomPlusButton->setIconSet(SmallIconSet("viewmag+")); - d->zoomPlusButton->setFocusPolicy(QWidget::NoFocus); - QToolTip::add(d->zoomPlusButton, i18n("Zoom In")); + d->zoomPlusButton->setFocusPolicy(TQ_NoFocus); + TQToolTip::add(d->zoomPlusButton, i18n("Zoom In")); d->zoomTracker = new DTipTracker("", d->zoomSlider); // ------------------------------------------------------------- - connect(d->zoomMinusButton, SIGNAL(clicked()), - this, SIGNAL(signalZoomMinusClicked())); + connect(d->zoomMinusButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalZoomMinusClicked())); - connect(d->zoomPlusButton, SIGNAL(clicked()), - this, SIGNAL(signalZoomPlusClicked())); + connect(d->zoomPlusButton, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalZoomPlusClicked())); - connect(d->zoomSlider, SIGNAL(valueChanged(int)), - this, SIGNAL(signalZoomSliderChanged(int))); + connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalZoomSliderChanged(int))); - connect(d->zoomSlider, SIGNAL(valueChanged(int)), - this, SLOT(slotZoomSliderChanged(int))); + connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotZoomSliderChanged(int))); - connect(d->zoomSlider, SIGNAL(sliderReleased()), - this, SLOT(slotZoomSliderReleased())); + connect(d->zoomSlider, TQT_SIGNAL(sliderReleased()), + this, TQT_SLOT(slotZoomSliderReleased())); } StatusZoomBar::~StatusZoomBar() @@ -166,9 +166,9 @@ void StatusZoomBar::slotZoomSliderChanged(int) delete d->zoomTimer; } - d->zoomTimer = new QTimer( this ); - connect(d->zoomTimer, SIGNAL(timeout()), - this, SLOT(slotDelayedZoomSliderChanged()) ); + d->zoomTimer = new TQTimer( this ); + connect(d->zoomTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotDelayedZoomSliderChanged()) ); d->zoomTimer->start(300, true); } @@ -189,7 +189,7 @@ void StatusZoomBar::setZoomSliderValue(int v) d->zoomSlider->blockSignals(false); } -void StatusZoomBar::setZoomTrackerText(const QString& text) +void StatusZoomBar::setZoomTrackerText(const TQString& text) { d->zoomTracker->setText(text); } diff --git a/digikam/libs/widgets/common/statuszoombar.h b/digikam/libs/widgets/common/statuszoombar.h index 4ef0447..e0a4093 100644 --- a/digikam/libs/widgets/common/statuszoombar.h +++ b/digikam/libs/widgets/common/statuszoombar.h @@ -24,15 +24,15 @@ #ifndef STATUSSTATUSBAR_H #define STATUSSTATUSBAR_H -// Qt includes. +// TQt includes. -#include <qslider.h> -#include <qevent.h> +#include <tqslider.h> +#include <tqevent.h> // KDE includes. -#include <qhbox.h> -#include <qstring.h> +#include <tqhbox.h> +#include <tqstring.h> // Local includes. @@ -44,36 +44,37 @@ namespace Digikam class StatusZoomBarPriv; -class DIGIKAM_EXPORT QSliderReverseWheel : public QSlider +class DIGIKAM_EXPORT TQSliderReverseWheel : public TQSlider { public: - QSliderReverseWheel(QWidget *parent=0); - ~QSliderReverseWheel(); + TQSliderReverseWheel(TQWidget *tqparent=0); + ~TQSliderReverseWheel(); private: - void wheelEvent(QWheelEvent *e); + void wheelEvent(TQWheelEvent *e); }; // ---------------------------------------------------------------------- -class DIGIKAM_EXPORT StatusZoomBar : public QHBox +class DIGIKAM_EXPORT StatusZoomBar : public TQHBox { Q_OBJECT + TQ_OBJECT public: - StatusZoomBar( QWidget *parent=0 ); + StatusZoomBar( TQWidget *tqparent=0 ); ~StatusZoomBar(); void setEnableZoomPlus(bool e); void setEnableZoomMinus(bool e); void setZoomSliderValue(int v); - void setZoomTrackerText(const QString& text); + void setZoomTrackerText(const TQString& text); signals: diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index 78da59f..abbf928 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -29,13 +29,13 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qimage.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qfile.h> -#include <qtimer.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqfile.h> +#include <tqtimer.h> // KDE includes. @@ -182,9 +182,9 @@ public: int pxrows; int pos; // Position of animation during loading/calculation. - QPainter painter; - QPixmap pixmap; - QTimer *blinkTimer; + TQPainter painter; + TQPixmap pixmap; + TQTimer *blinkTimer; cmsHPROFILE hMonitorProfile; cmsHPROFILE hXYZProfile; @@ -195,11 +195,11 @@ public: MEASUREMENT Measurement; }; -CIETongueWidget::CIETongueWidget(int w, int h, QWidget *parent, cmsHPROFILE hMonitor) - : QWidget(parent, 0, Qt::WDestructiveClose) +CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *tqparent, cmsHPROFILE hMonitor) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new CIETongueWidgetPriv; - d->blinkTimer = new QTimer( this ); + d->blinkTimer = new TQTimer( this ); setMinimumSize(w, h); cmsErrorAction(LCMS_ERROR_SHOW); @@ -213,8 +213,8 @@ CIETongueWidget::CIETongueWidget(int w, int h, QWidget *parent, cmsHPROFILE hMon d->hMonitorProfile, TYPE_RGB_8, INTENT_PERCEPTUAL, 0); - connect(d->blinkTimer, SIGNAL(timeout()), - this, SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotBlinkTimerDone())); } CIETongueWidget::~CIETongueWidget() @@ -236,11 +236,11 @@ int CIETongueWidget::grids(double val) const return (int) floor(val * d->gridside + 0.5); } -bool CIETongueWidget::setProfileData(const QByteArray &profileData) +bool CIETongueWidget::setProfileData(const TQByteArray &profileData) { if (!profileData.isEmpty()) { - cmsHPROFILE hProfile = cmsOpenProfileFromMem(profileData.data(), + cmsHPROFILE hProfile = cmsOpenProfileFromMem(const_cast<char*>(profileData.data()), (DWORD)profileData.size()); if (!hProfile) @@ -265,7 +265,7 @@ bool CIETongueWidget::setProfileData(const QByteArray &profileData) d->loadingImageMode = false; d->blinkTimer->stop(); - repaint(false); + tqrepaint(false); return (d->profileDataAvailable); } @@ -273,7 +273,7 @@ bool CIETongueWidget::setProfileFromFile(const KURL& file) { if (!file.isEmpty() && file.isValid()) { - cmsHPROFILE hProfile = cmsOpenProfileFromFile(QFile::encodeName(file.path()), "r"); + cmsHPROFILE hProfile = cmsOpenProfileFromFile(TQFile::encodeName(file.path()), "r"); if (!hProfile) { @@ -295,7 +295,7 @@ bool CIETongueWidget::setProfileFromFile(const KURL& file) } d->blinkTimer->stop(); - repaint(false); + tqrepaint(false); return (d->profileDataAvailable); } @@ -376,12 +376,12 @@ void CIETongueWidget::biasedLine(int x1, int y1, int x2, int y2) d->painter.drawLine(x1 + d->xBias, y1, x2 + d->xBias, y2); } -void CIETongueWidget::biasedText(int x, int y, QString Txt) +void CIETongueWidget::biasedText(int x, int y, TQString Txt) { - d->painter.drawText(QPoint(d->xBias + x, y), Txt); + d->painter.drawText(TQPoint(d->xBias + x, y), Txt); } -QRgb CIETongueWidget::colorByCoord(double x, double y) +TQRgb CIETongueWidget::colorByCoord(double x, double y) { // Get xyz components scaled from coordinates @@ -400,7 +400,7 @@ QRgb CIETongueWidget::colorByCoord(double x, double y) cmsFloat2XYZEncoded(XYZW, &XYZ); cmsDoTransform(d->hXFORM, XYZW, RGB, 1); - return qRgb(RGB[0], RGB[1], RGB[2]); + return tqRgb(RGB[0], RGB[1], RGB[2]); } void CIETongueWidget::outlineTongue() @@ -438,7 +438,7 @@ void CIETongueWidget::outlineTongue() void CIETongueWidget::fillTongue() { - QImage Img = d->pixmap.convertToImage(); + TQImage Img = d->pixmap.convertToImage(); int x; @@ -450,11 +450,11 @@ void CIETongueWidget::fillTongue() for (x = 0; x < d->pxcols; x++) { - if ((QColor) Img.pixel(x + d->xBias, y) != Qt::black) + if ((TQColor) Img.pixel(x + d->xBias, y) != TQt::black) { for (xe = d->pxcols - 1; xe >= x; xe--) { - if ((QColor) Img.pixel(xe + d->xBias, y) != Qt::black) + if ((TQColor) Img.pixel(xe + d->xBias, y) != TQt::black) { break; } @@ -468,29 +468,29 @@ void CIETongueWidget::fillTongue() { for ( ; x <= xe; x++) { - QRgb Color = colorByCoord(x, y); + TQRgb Color = colorByCoord(x, y); Img.setPixel(x + d->xBias, y, Color); } } } - d->pixmap.convertFromImage(Img, QPixmap::AvoidDither ); + d->pixmap.convertFromImage(Img, TQPixmap::AvoidDither ); } void CIETongueWidget::drawTongueAxis() { - QFont font; + TQFont font; font.setPointSize(6); d->painter.setFont(font); - d->painter.setPen(qRgb(255, 255, 255)); + d->painter.setPen(tqRgb(255, 255, 255)); biasedLine(0, 0, 0, d->pxrows - 1); biasedLine(0, d->pxrows-1, d->pxcols-1, d->pxrows - 1); for (int y = 1; y <= 9; y += 1) { - QString s; + TQString s; int xstart = (y * (d->pxcols - 1)) / 10; int ystart = (y * (d->pxrows - 1)) / 10; @@ -506,7 +506,7 @@ void CIETongueWidget::drawTongueAxis() void CIETongueWidget::drawTongueGrid() { - d->painter.setPen(qRgb(80, 80, 80)); + d->painter.setPen(tqRgb(80, 80, 80)); for (int y = 1; y <= 9; y += 1) { @@ -520,13 +520,13 @@ void CIETongueWidget::drawTongueGrid() void CIETongueWidget::drawLabels() { - QFont font; + TQFont font; font.setPointSize(5); d->painter.setFont(font); for (int x = 450; x <= 650; x += (x > 470 && x < 600) ? 5 : 10) { - QString wl; + TQString wl; int bx = 0, by = 0, tx, ty; if (x < 520) @@ -555,10 +555,10 @@ void CIETongueWidget::drawLabels() tx = icx + ((x < 520) ? grids(-2) : ((x >= 535) ? grids(2) : 0)); ty = icy + ((x < 520) ? 0 : ((x >= 535) ? grids(-1) : grids(-2))); - d->painter.setPen(qRgb(255, 255, 255)); + d->painter.setPen(tqRgb(255, 255, 255)); biasedLine(icx, icy, tx, ty); - QRgb Color = colorByCoord(icx, icy); + TQRgb Color = colorByCoord(icx, icy); d->painter.setPen(Color); wl.sprintf("%d", x); @@ -571,7 +571,7 @@ void CIETongueWidget::drawSmallElipse(LPcmsCIExyY xyY, BYTE r, BYTE g, BYTE b, i int icx, icy; mapPoint(icx, icy, xyY); - d->painter.setPen(qRgb(r, g, b)); + d->painter.setPen(tqRgb(r, g, b)); d->painter.drawEllipse(icx + d->xBias- sz/2, icy-sz/2, sz, sz); } @@ -607,7 +607,7 @@ void CIETongueWidget::drawPatches() if (icx2 < 5 || icy2 < 5 || icx1 < 5 || icy1 < 5) continue; - d->painter.setPen(qRgb(255, 255, 0)); + d->painter.setPen(tqRgb(255, 255, 0)); biasedLine(icx1, icy1, icx2, icy2); } } @@ -626,7 +626,7 @@ void CIETongueWidget::drawColorantTriangle() mapPoint(x2, y2, &(d->Primaries.Green)); mapPoint(x3, y3, &(d->Primaries.Blue)); - d->painter.setPen(qRgb(255, 255, 255)); + d->painter.setPen(tqRgb(255, 255, 255)); biasedLine(x1, y1, x2, y2); biasedLine(x2, y2, x3, y3); @@ -684,7 +684,7 @@ void CIETongueWidget::loadingStarted() d->pos = 0; d->loadingImageMode = true; d->loadingImageSucess = false; - repaint(false); + tqrepaint(false); d->blinkTimer->start(200); } @@ -694,21 +694,21 @@ void CIETongueWidget::loadingFailed() d->pos = 0; d->loadingImageMode = false; d->loadingImageSucess = false; - repaint(false); + tqrepaint(false); } -void CIETongueWidget::paintEvent(QPaintEvent*) +void CIETongueWidget::paintEvent(TQPaintEvent*) { - d->pixmap = QPixmap(size()); - d->pixmap.setOptimization(QPixmap::BestOptim); + d->pixmap = TQPixmap(size()); + d->pixmap.setOptimization(TQPixmap::BestOptim); // Widget is disable : drawing grayed frame. if ( !isEnabled() ) { d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); - d->painter.setPen(QPen(palette().disabled().foreground(), 1, Qt::SolidLine)); + d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background()); + d->painter.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); d->painter.end(); bitBlt(this, 0, 0, &d->pixmap); @@ -722,14 +722,14 @@ void CIETongueWidget::paintEvent(QPaintEvent*) // In first, we draw an animation. int asize = 24; - QPixmap anim(asize, asize); - QPainter p2; - p2.begin(&anim, this); - p2.fillRect(0, 0, asize, asize, palette().active().background()); + TQPixmap anim(asize, asize); + TQPainter p2; + p2.tqbegin(&anim, TQT_TQOBJECT(this)); + p2.fillRect(0, 0, asize, asize, tqpalette().active().background()); p2.translate(asize/2, asize/2); d->pos = (d->pos + 10) % 360; - p2.setPen(QPen(palette().active().text())); + p2.setPen(TQPen(tqpalette().active().text())); p2.rotate(d->pos); for ( int i=0 ; i<12 ; i++ ) { @@ -741,11 +741,11 @@ void CIETongueWidget::paintEvent(QPaintEvent*) // ... and we render busy text. d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background()); + d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background()); d->painter.drawPixmap(width()/2 - asize /2, asize, anim); - d->painter.setPen(QPen(palette().active().text(), 1, Qt::SolidLine)); + d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); - d->painter.drawText(0, 0, size().width(), size().height(), Qt::AlignCenter, + d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter, i18n("Loading image...")); d->painter.end(); @@ -758,10 +758,10 @@ void CIETongueWidget::paintEvent(QPaintEvent*) if (!d->profileDataAvailable || (!d->loadingImageMode && !d->loadingImageSucess)) { d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background()); - d->painter.setPen(QPen(palette().active().text(), 1, Qt::SolidLine)); + d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background()); + d->painter.setPen(TQPen(tqpalette().active().text(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); - d->painter.drawText(0, 0, size().width(), size().height(), Qt::AlignCenter, + d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter, i18n("No profile available...")); d->painter.end(); @@ -771,20 +771,20 @@ void CIETongueWidget::paintEvent(QPaintEvent*) // Draw the CIE tongue curve. - d->pixmap.fill(Qt::black); + d->pixmap.fill(TQt::black); d->painter.begin(&d->pixmap); int pixcols = d->pixmap.width(); int pixrows = d->pixmap.height(); - d->gridside = (QMIN(pixcols, pixrows)) / 512.0; + d->gridside = (TQMIN(pixcols, pixrows)) / 512.0; d->xBias = grids(32); d->yBias = grids(20); d->pxcols = pixcols - d->xBias; d->pxrows = pixrows - d->yBias; - d->painter.setBackgroundColor(qRgb(0, 0, 0)); - d->painter.setPen(qRgb(255, 255, 255)); + d->painter.setBackgroundColor(tqRgb(0, 0, 0)); + d->painter.setPen(tqRgb(255, 255, 255)); outlineTongue(); fillTongue(); @@ -809,7 +809,7 @@ void CIETongueWidget::paintEvent(QPaintEvent*) void CIETongueWidget::slotBlinkTimerDone() { - repaint(false); + tqrepaint(false); d->blinkTimer->start( 200 ); } diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/digikam/libs/widgets/iccprofiles/cietonguewidget.h index cd1bba8..db00e7d 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.h @@ -30,10 +30,10 @@ #include <config.h> -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqcolor.h> // KDE includes. @@ -55,16 +55,17 @@ namespace Digikam class CIETongueWidgetPriv; -class DIGIKAM_EXPORT CIETongueWidget : public QWidget +class DIGIKAM_EXPORT CIETongueWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CIETongueWidget(int w, int h, QWidget *parent=0, cmsHPROFILE hMonitor=0); + CIETongueWidget(int w, int h, TQWidget *tqparent=0, cmsHPROFILE hMonitor=0); ~CIETongueWidget(); - bool setProfileData(const QByteArray& profileData=QByteArray()); + bool setProfileData(const TQByteArray& profileData=TQByteArray()); bool setProfileFromFile(const KURL& file=KURL()); void loadingStarted(); @@ -80,10 +81,10 @@ protected: void drawTongueGrid(); void drawLabels(); - QRgb colorByCoord(double x, double y); + TQRgb colorByCoord(double x, double y); void drawSmallElipse(LPcmsCIExyY xyY, BYTE r, BYTE g, BYTE b, int sz); - void paintEvent( QPaintEvent * ); + void paintEvent( TQPaintEvent * ); private: @@ -93,7 +94,7 @@ private: void mapPoint(int& icx, int& icy, LPcmsCIExyY xyY); void biasedLine(int x1, int y1, int x2, int y2); - void biasedText(int x, int y, QString Txt); + void biasedText(int x, int y, TQString Txt); void sweep_sRGB(); diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp index d280c5c..8da25e9 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qfileinfo.h> -#include <qlayout.h> -#include <qvgroupbox.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> // KDE includes. @@ -42,15 +42,15 @@ namespace Digikam { -ICCPreviewWidget::ICCPreviewWidget(QWidget *parent) - : KPreviewWidgetBase( parent ) +ICCPreviewWidget::ICCPreviewWidget(TQWidget *tqparent) + : KPreviewWidgetBase( tqparent ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - QVGroupBox *box = new QVGroupBox( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVGroupBox *box = new TQVGroupBox( this ); box->setInsideMargin(0); - box->setFrameStyle(QFrame::NoFrame|QFrame::Plain); + box->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); m_iccProfileWidget = new ICCProfileWidget(box); - layout->addWidget( box ); + tqlayout->addWidget( box ); } ICCPreviewWidget::~ICCPreviewWidget() @@ -60,7 +60,7 @@ ICCPreviewWidget::~ICCPreviewWidget() void ICCPreviewWidget::showPreview( const KURL &url) { clearPreview(); - QFileInfo fInfo(url.path()); + TQFileInfo fInfo(url.path()); if ( url.isLocalFile() && fInfo.isFile() && fInfo.isReadable() ) { diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h index d0d786c..aa71941 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h @@ -44,10 +44,11 @@ class DIGIKAM_EXPORT ICCPreviewWidget : public KPreviewWidgetBase { Q_OBJECT + TQ_OBJECT public: - ICCPreviewWidget(QWidget *parent); + ICCPreviewWidget(TQWidget *tqparent); ~ICCPreviewWidget(); public slots: diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp index caec9d4..2490710 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -23,18 +23,18 @@ #include <config.h> -// Qt includes. - -#include <qlayout.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qlabel.h> -#include <qmap.h> -#include <qhbox.h> -#include <qfile.h> -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qmap.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> +#include <tqmap.h> +#include <tqhbox.h> +#include <tqfile.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> +#include <tqmap.h> // KDE includes. @@ -85,19 +85,19 @@ public: ICCTagInfo(){} - ICCTagInfo(const QString& title, const QString& description) + ICCTagInfo(const TQString& title, const TQString& description) : m_title(title), m_description(description){} - QString title() const { return m_title; } - QString description() const { return m_description; } + TQString title() const { return m_title; } + TQString description() const { return m_description; } private: - QString m_title; - QString m_description; + TQString m_title; + TQString m_description; }; -typedef QMap<QString, ICCTagInfo> ICCTagInfoMap; +typedef TQMap<TQString, ICCTagInfo> ICCTagInfoMap; class ICCProfileWidgetPriv { @@ -109,8 +109,8 @@ public: cieTongue = 0; } - QStringList tagsfilter; - QStringList keysFilter; + TQStringList tagsfilter; + TQStringList keysFilter; CIETongueWidget *cieTongue; @@ -118,8 +118,8 @@ public: }; -ICCProfileWidget::ICCProfileWidget(QWidget* parent, const char* name, int w, int h) - : MetadataWidget(parent, name) +ICCProfileWidget::ICCProfileWidget(TQWidget* tqparent, const char* name, int w, int h) + : MetadataWidget(tqparent, name) { cmsErrorAction(LCMS_ERROR_SHOW); @@ -154,19 +154,19 @@ ICCProfileWidget::ICCProfileWidget(QWidget* parent, const char* name, int w, int i18n("The ICC profile color management flags")); // Set the list of keys and tags filters. - for (int i=0 ; QString(ICCEntryList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ICCEntryList[i]) != TQString("-1") ; i++) d->keysFilter << ICCEntryList[i]; - for (int i=0 ; QString(ICCHumanList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ICCHumanList[i]) != TQString("-1") ; i++) d->tagsfilter << ICCHumanList[i]; // Add CIE tongue graph to the widget area d->cieTongue = new CIETongueWidget(w, h, this); - QWhatsThis::add( d->cieTongue, i18n("<p>This area contains a CIE or chromaticity diagram. " + 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-shaped area. In addition you will see a " + "by the colored sail-tqshaped 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. " @@ -196,7 +196,7 @@ void ICCProfileWidget::setLoadingFailed() d->cieTongue->loadingFailed(); } -QString ICCProfileWidget::getMetadataTitle() +TQString ICCProfileWidget::getMetadataTitle() { return i18n("ICC Color Profile Information"); } @@ -213,7 +213,7 @@ bool ICCProfileWidget::loadFromURL(const KURL& url) } else { - QFile file(url.path()); + TQFile file(url.path()); if ( !file.open(IO_ReadOnly) ) { setMetadata(); @@ -221,8 +221,8 @@ bool ICCProfileWidget::loadFromURL(const KURL& url) return false; } - QByteArray iccData(file.size()); - QDataStream stream( &file ); + TQByteArray iccData(file.size()); + TQDataStream stream( &file ); stream.readRawBytes(iccData.data(), iccData.size()); file.close(); @@ -244,7 +244,7 @@ bool ICCProfileWidget::loadFromURL(const KURL& url) bool ICCProfileWidget::decodeMetadata() { - QByteArray iccData = getMetadata(); + TQByteArray iccData = getMetadata(); if (iccData.isNull()) return false; @@ -260,29 +260,29 @@ bool ICCProfileWidget::decodeMetadata() DMetadata::MetaDataMap metaDataMap; - if ( !QString(cmsTakeProductName(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Name", QString(cmsTakeProductName(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeProductName(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Name", TQString(cmsTakeProductName(hProfile)).tqreplace("\n", " ")); - if ( !QString(cmsTakeProductDesc(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Description", QString(cmsTakeProductDesc(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeProductDesc(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Description", TQString(cmsTakeProductDesc(hProfile)).tqreplace("\n", " ")); - if ( !QString(cmsTakeProductInfo(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Information", QString(cmsTakeProductInfo(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeProductInfo(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Information", TQString(cmsTakeProductInfo(hProfile)).tqreplace("\n", " ")); - if ( !QString(cmsTakeManufacturer(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Manufacturer", QString(cmsTakeManufacturer(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeManufacturer(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Manufacturer", TQString(cmsTakeManufacturer(hProfile)).tqreplace("\n", " ")); - if ( !QString(cmsTakeModel(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Model", QString(cmsTakeModel(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeModel(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Model", TQString(cmsTakeModel(hProfile)).tqreplace("\n", " ")); - if ( !QString(cmsTakeCopyright(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Copyright", QString(cmsTakeCopyright(hProfile)).replace("\n", " ")); + if ( !TQString(cmsTakeCopyright(hProfile)).isEmpty() ) + metaDataMap.insert("Icc.Header.Copyright", TQString(cmsTakeCopyright(hProfile)).tqreplace("\n", " ")); - metaDataMap.insert("Icc.Header.ProfileID", QString::number((uint)*cmsTakeProfileID(hProfile))); - metaDataMap.insert("Icc.Header.ProfileVersion", QString::number((uint)cmsGetProfileICCversion(hProfile))); - metaDataMap.insert("Icc.Header.CMMFlags", QString::number((uint)cmsTakeHeaderFlags(hProfile))); + metaDataMap.insert("Icc.Header.ProfileID", TQString::number((uint)*cmsTakeProfileID(hProfile))); + metaDataMap.insert("Icc.Header.ProfileVersion", TQString::number((uint)cmsGetProfileICCversion(hProfile))); + metaDataMap.insert("Icc.Header.CMMFlags", TQString::number((uint)cmsTakeHeaderFlags(hProfile))); - QString colorSpace; + TQString colorSpace; switch (cmsGetColorSpace(hProfile)) { case icSigLabData: @@ -315,7 +315,7 @@ bool ICCProfileWidget::decodeMetadata() } metaDataMap.insert("Icc.Header.ColorSpace", colorSpace); - QString connectionSpace; + TQString connectionSpace; switch (cmsGetPCS(hProfile)) { case icSigLabData: @@ -348,7 +348,7 @@ bool ICCProfileWidget::decodeMetadata() } metaDataMap.insert("Icc.Header.ConnectionSpace", connectionSpace); - QString device; + TQString device; switch ((int)cmsGetDeviceClass(hProfile)) { case icSigInputClass: @@ -378,7 +378,7 @@ bool ICCProfileWidget::decodeMetadata() } metaDataMap.insert("Icc.Header.DeviceClass", device); - QString intent; + TQString intent; switch (cmsTakeRenderingIntent(hProfile)) { case 0: @@ -414,15 +414,15 @@ void ICCProfileWidget::buildView() } else { - setIfdList(getMetadataMap(), d->keysFilter, QStringList()); + setIfdList(getMetadataMap(), d->keysFilter, TQStringList()); } MetadataWidget::buildView(); } -QString ICCProfileWidget::getTagTitle(const QString& key) +TQString ICCProfileWidget::getTagTitle(const TQString& key) { - ICCTagInfoMap::Iterator it = d->iccTagsDescription.find(key); + ICCTagInfoMap::Iterator it = d->iccTagsDescription.tqfind(key); if (it != d->iccTagsDescription.end()) return(it.data().title()); @@ -432,13 +432,13 @@ QString ICCProfileWidget::getTagTitle(const QString& key) void ICCProfileWidget::slotSaveMetadataToFile() { KURL url = saveMetadataToFile(i18n("ICC color profile File to Save"), - QString("*.icc *.icm|"+i18n("ICC Files (*.icc; *.icm)"))); + TQString("*.icc *.icm|"+i18n("ICC Files (*.icc; *.icm)"))); storeMetadataToFile(url); } -QString ICCProfileWidget::getTagDescription(const QString& key) +TQString ICCProfileWidget::getTagDescription(const TQString& key) { - ICCTagInfoMap::Iterator it = d->iccTagsDescription.find(key); + ICCTagInfoMap::Iterator it = d->iccTagsDescription.tqfind(key); if (it != d->iccTagsDescription.end()) return(it.data().description()); diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h index c2079c7..8ce9348 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h @@ -24,10 +24,10 @@ #ifndef ICCPROFILEWIDGET_H #define ICCPROFILEWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // Local includes. @@ -42,18 +42,19 @@ class ICCProfileWidgetPriv; class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget { Q_OBJECT + TQ_OBJECT public: - ICCProfileWidget(QWidget* parent, const char* name=0, int w=256, int h=256); + ICCProfileWidget(TQWidget* tqparent, const char* name=0, int w=256, int h=256); ~ICCProfileWidget(); bool loadFromURL(const KURL& url); - QString getTagDescription(const QString& key); - QString getTagTitle(const QString& key); + TQString getTagDescription(const TQString& key); + TQString getTagTitle(const TQString& key); - QString getMetadataTitle(); + TQString getMetadataTitle(); void setLoadingFailed(); void setDataLoading(); diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index 26eb15f..168501f 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -21,18 +21,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qregion.h> -#include <qpainter.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qtimer.h> -#include <qrect.h> -#include <qbrush.h> -#include <qfont.h> -#include <qfontmetrics.h> +// TQt includes. + +#include <tqregion.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqtimer.h> +#include <tqrect.h> +#include <tqbrush.h> +#include <tqfont.h> +#include <tqfontmetrics.h> // KDE includes. @@ -84,24 +84,24 @@ public: int renderingPreviewMode; // Current spot position in preview coordinates. - QPoint spot; + TQPoint spot; - QRect rect; + TQRect rect; - QColor guideColor; + TQColor guideColor; - QPixmap *pixmap; + TQPixmap *pixmap; ImageIface *iface; DImg preview; }; -ImageGuideWidget::ImageGuideWidget(int w, int h, QWidget *parent, +ImageGuideWidget::ImageGuideWidget(int w, int h, TQWidget *tqparent, bool spotVisible, int guideMode, - const QColor& guideColor, int guideSize, + const TQColor& guideColor, int guideSize, bool blink, bool useImageSelection) - : QWidget(parent, 0, Qt::WDestructiveClose) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new ImageGuideWidgetPriv; d->spotVisible = spotVisible; @@ -109,7 +109,7 @@ ImageGuideWidget::ImageGuideWidget(int w, int h, QWidget *parent, d->guideColor = guideColor; d->guideSize = guideSize; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setMinimumSize(w, h); setMouseTracking(true); @@ -125,8 +125,8 @@ ImageGuideWidget::ImageGuideWidget(int w, int h, QWidget *parent, delete [] data; - d->pixmap = new QPixmap(w, h); - d->rect = QRect(w/2-d->width/2, h/2-d->height/2, d->width, d->height); + d->pixmap = new TQPixmap(w, h); + d->rect = TQRect(w/2-d->width/2, h/2-d->height/2, d->width, d->height); resetSpotPosition(); setSpotVisible(d->spotVisible, blink); @@ -180,9 +180,9 @@ int ImageGuideWidget::getRenderingPreviewMode() return (d->renderingPreviewMode); } -QPoint ImageGuideWidget::getSpotPosition() +TQPoint ImageGuideWidget::getSpotPosition() { - return (QPoint( (int)((float)d->spot.x() * (float)d->iface->originalWidth() / (float)d->width), + return (TQPoint( (int)((float)d->spot.x() * (float)d->iface->originalWidth() / (float)d->width), (int)((float)d->spot.y() * (float)d->iface->originalHeight() / (float)d->height))); } @@ -215,7 +215,7 @@ void ImageGuideWidget::setSpotVisible(bool spotVisible, bool blink) updatePreview(); } -void ImageGuideWidget::slotChangeGuideColor(const QColor &color) +void ImageGuideWidget::slotChangeGuideColor(const TQColor &color) { d->guideColor = color; updatePreview(); @@ -229,13 +229,13 @@ void ImageGuideWidget::slotChangeGuideSize(int size) void ImageGuideWidget::updatePixmap() { - QPainter p(d->pixmap); - QString text; - QRect textRect, fontRect; - QFontMetrics fontMt = p.fontMetrics(); - p.setPen(QPen(Qt::red, 1)) ; + TQPainter p(d->pixmap); + TQString text; + TQRect textRect, fontRect; + TQFontMetrics fontMt = p.fontMetrics(); + p.setPen(TQPen(TQt::red, 1)) ; - d->pixmap->fill(colorGroup().background()); + d->pixmap->fill(tqcolorGroup().background()); if (d->renderingPreviewMode == PreviewOriginalImage || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == false )) @@ -244,16 +244,16 @@ void ImageGuideWidget::updatePixmap() text = i18n("Original"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + 20, d->rect.y() + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(d->rect.x() + 20, d->rect.y() + 20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); } else if (d->renderingPreviewMode == PreviewTargetImage || d->renderingPreviewMode == NoPreviewMode || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == true )) { - d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), + d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), d->rect.width(), d->rect.height(), d->underExposureIndicator, d->overExposureIndicator); @@ -262,11 +262,11 @@ void ImageGuideWidget::updatePixmap() { text = i18n("Target"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + 20, d->rect.y() + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(d->rect.x() + 20, d->rect.y() + 20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); } } else if (d->renderingPreviewMode == PreviewBothImagesVert || @@ -278,7 +278,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(d->pixmap, + d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x()+d->rect.width()/2, d->rect.y(), d->rect.width()/2, @@ -289,7 +289,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(d->pixmap, + d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), d->rect.width(), @@ -303,37 +303,37 @@ void ImageGuideWidget::updatePixmap() } // Drawing the information and others stuff. - p.fillRect(d->rect.right(), 0, width(), height(), colorGroup().background()); + p.fillRect(d->rect.right(), 0, width(), height(), tqcolorGroup().background()); - p.setPen(QPen(Qt::white, 2, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(d->rect.x()+d->rect.width()/2-1, d->rect.y(), d->rect.x()+d->rect.width()/2-1, d->rect.y()+d->rect.height()); - p.setPen(QPen(Qt::red, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 2, TQt::DotLine)); p.drawLine(d->rect.x()+d->rect.width()/2-1, d->rect.y(), d->rect.x()+d->rect.width()/2-1, d->rect.y()+d->rect.height()); - p.setPen(QPen(Qt::red, 1)) ; + p.setPen(TQPen(TQt::red, 1)) ; text = i18n("Target"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + d->rect.width()/2 + 20, + textRect.setTopLeft(TQPoint(d->rect.x() + d->rect.width()/2 + 20, d->rect.y() + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); text = i18n("Original"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + 20, d->rect.y() + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(d->rect.x() + 20, d->rect.y() + 20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); } else if (d->renderingPreviewMode == PreviewBothImagesHorz || d->renderingPreviewMode == PreviewBothImagesHorzCont) @@ -344,7 +344,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(d->pixmap, + d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y()+d->rect.height()/2, d->rect.width(), @@ -355,7 +355,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(d->pixmap, + d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), d->rect.width(), @@ -368,37 +368,37 @@ void ImageGuideWidget::updatePixmap() 0, 0, d->rect.width(), d->rect.height()/2); } - p.fillRect(0, d->rect.bottom(), width(), height(), colorGroup().background()); + p.fillRect(0, d->rect.bottom(), width(), height(), tqcolorGroup().background()); - p.setPen(QPen(Qt::white, 2, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(d->rect.x(), d->rect.y()+d->rect.height()/2-1, d->rect.x()+d->rect.width(), d->rect.y()+d->rect.height()/2-1); - p.setPen(QPen(Qt::red, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 2, TQt::DotLine)); p.drawLine(d->rect.x(), d->rect.y()+d->rect.height()/2-1, d->rect.x()+d->rect.width(), d->rect.y()+d->rect.height()/2-1); - p.setPen(QPen(Qt::red, 1)) ; + p.setPen(TQPen(TQt::red, 1)) ; text = i18n("Target"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + 20, + textRect.setTopLeft(TQPoint(d->rect.x() + 20, d->rect.y() + d->rect.height()/2 + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); text = i18n("Original"); fontRect = fontMt.boundingRect(0, 0, d->rect.width(), d->rect.height(), 0, text); - textRect.setTopLeft(QPoint(d->rect.x() + 20, d->rect.y() + 20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(d->rect.x() + 20, d->rect.y() + 20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); } if (d->spotVisible) @@ -411,10 +411,10 @@ void ImageGuideWidget::updatePixmap() { case HVGuideMode: { - p.setPen(QPen(Qt::white, d->guideSize, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, d->guideSize, TQt::SolidLine)); p.drawLine(xspot, d->rect.top() + d->flicker, xspot, d->rect.bottom() - d->flicker); p.drawLine(d->rect.left() + d->flicker, yspot, d->rect.right() - d->flicker, yspot); - p.setPen(QPen(d->guideColor, d->guideSize, Qt::DotLine)); + p.setPen(TQPen(d->guideColor, d->guideSize, TQt::DotLine)); p.drawLine(xspot, d->rect.top() + d->flicker, xspot, d->rect.bottom() - d->flicker); p.drawLine(d->rect.left() + d->flicker, yspot, d->rect.right() - d->flicker, yspot); break; @@ -422,15 +422,15 @@ void ImageGuideWidget::updatePixmap() case PickColorMode: { - p.setPen(QPen(d->guideColor, 1, Qt::SolidLine)); + p.setPen(TQPen(d->guideColor, 1, TQt::SolidLine)); p.drawLine(xspot-10, yspot-10, xspot+10, yspot+10); p.drawLine(xspot+10, yspot-10, xspot-10, yspot+10); - p.setPen(QPen(d->guideColor, 3, Qt::SolidLine)); + p.setPen(TQPen(d->guideColor, 3, TQt::SolidLine)); p.drawEllipse( xspot-5, yspot-5, 11, 11 ); if (d->flicker%2 != 0) { - p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); p.drawEllipse( xspot-5, yspot-5, 11, 11 ); } @@ -442,7 +442,7 @@ void ImageGuideWidget::updatePixmap() p.end(); } -void ImageGuideWidget::paintEvent(QPaintEvent*) +void ImageGuideWidget::paintEvent(TQPaintEvent*) { bitBlt(this, 0, 0, d->pixmap); } @@ -450,10 +450,10 @@ void ImageGuideWidget::paintEvent(QPaintEvent*) void ImageGuideWidget::updatePreview() { updatePixmap(); - repaint(false); + tqrepaint(false); } -void ImageGuideWidget::timerEvent(QTimerEvent* e) +void ImageGuideWidget::timerEvent(TQTimerEvent* e) { if (e->timerId() == d->timerID) { @@ -462,10 +462,10 @@ void ImageGuideWidget::timerEvent(QTimerEvent* e) updatePreview(); } else - QWidget::timerEvent(e); + TQWidget::timerEvent(e); } -void ImageGuideWidget::resizeEvent(QResizeEvent* e) +void ImageGuideWidget::resizeEvent(TQResizeEvent* e) { blockSignals(true); delete d->pixmap; @@ -484,8 +484,8 @@ void ImageGuideWidget::resizeEvent(QResizeEvent* e) delete [] data; - d->pixmap = new QPixmap(w, h); - d->rect = QRect(w/2-d->width/2, h/2-d->height/2, d->width, d->height); + d->pixmap = new TQPixmap(w, h); + d->rect = TQRect(w/2-d->width/2, h/2-d->height/2, d->width, d->height); d->spot.setX((int)((float)d->spot.x() * ( (float)d->width / (float)old_w))); d->spot.setY((int)((float)d->spot.y() * ( (float)d->height / (float)old_h))); @@ -494,10 +494,10 @@ void ImageGuideWidget::resizeEvent(QResizeEvent* e) emit signalResized(); } -void ImageGuideWidget::mousePressEvent(QMouseEvent* e) +void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) { if ( !d->focus && e->button() == Qt::LeftButton && - d->rect.contains( e->x(), e->y() ) && d->spotVisible ) + d->rect.tqcontains( e->x(), e->y() ) && d->spotVisible ) { d->focus = true; d->spot.setX(e->x()-d->rect.x()); @@ -506,9 +506,9 @@ void ImageGuideWidget::mousePressEvent(QMouseEvent* e) } } -void ImageGuideWidget::mouseReleaseEvent(QMouseEvent* e) +void ImageGuideWidget::mouseReleaseEvent(TQMouseEvent* e) { - if ( d->rect.contains( e->x(), e->y() ) && d->focus && d->spotVisible) + if ( d->rect.tqcontains( e->x(), e->y() ) && d->focus && d->spotVisible) { d->focus = false; updatePreview(); @@ -516,7 +516,7 @@ void ImageGuideWidget::mouseReleaseEvent(QMouseEvent* e) d->spot.setY(e->y()-d->rect.y()); DColor color; - QPoint point = getSpotPosition(); + TQPoint point = getSpotPosition(); if (d->renderingPreviewMode == PreviewOriginalImage) { @@ -533,7 +533,7 @@ void ImageGuideWidget::mouseReleaseEvent(QMouseEvent* e) if (d->spot.x() > d->rect.width()/2) { color = getSpotColor(TargetPreviewImage); - emit spotPositionChangedFromTarget(color, QPoint(d->spot.x() - d->rect.width()/2, + emit spotPositionChangedFromTarget(color, TQPoint(d->spot.x() - d->rect.width()/2, d->spot.y())); } else @@ -560,7 +560,7 @@ void ImageGuideWidget::mouseReleaseEvent(QMouseEvent* e) if (d->spot.y() > d->rect.height()/2) { color = getSpotColor(TargetPreviewImage); - emit spotPositionChangedFromTarget(color, QPoint(d->spot.x(), + emit spotPositionChangedFromTarget(color, TQPoint(d->spot.x(), d->spot.y() - d->rect.height()/2 )); } else @@ -585,13 +585,13 @@ void ImageGuideWidget::mouseReleaseEvent(QMouseEvent* e) } } -void ImageGuideWidget::mouseMoveEvent(QMouseEvent* e) +void ImageGuideWidget::mouseMoveEvent(TQMouseEvent* e) { - if ( d->rect.contains( e->x(), e->y() ) && !d->focus && d->spotVisible ) + if ( d->rect.tqcontains( e->x(), e->y() ) && !d->focus && d->spotVisible ) { setCursor( KCursor::crossCursor() ); } - else if ( d->rect.contains( e->x(), e->y() ) && d->focus && d->spotVisible ) + else if ( d->rect.tqcontains( e->x(), e->y() ) && d->focus && d->spotVisible ) { d->spot.setX(e->x()-d->rect.x()); d->spot.setY(e->y()-d->rect.y()); @@ -602,23 +602,23 @@ void ImageGuideWidget::mouseMoveEvent(QMouseEvent* e) } } -void ImageGuideWidget::enterEvent(QEvent*) +void ImageGuideWidget::enterEvent(TQEvent*) { if ( !d->focus && d->renderingPreviewMode == PreviewToggleOnMouseOver ) { d->onMouseMovePreviewToggled = false; updatePixmap(); - repaint(false); + tqrepaint(false); } } -void ImageGuideWidget::leaveEvent(QEvent*) +void ImageGuideWidget::leaveEvent(TQEvent*) { if ( !d->focus && d->renderingPreviewMode == PreviewToggleOnMouseOver ) { d->onMouseMovePreviewToggled = true; updatePixmap(); - repaint(false); + tqrepaint(false); } } diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h index 71c17da..d583871 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.h +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h @@ -24,18 +24,18 @@ #ifndef IMAGEGUIDEWIDGET_H #define IMAGEGUIDEWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qpoint.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqcolor.h> // Local includes. #include "dcolor.h" #include "digikam_export.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -44,9 +44,10 @@ class DColor; class ImageIface; class ImageGuideWidgetPriv; -class DIGIKAM_EXPORT ImageGuideWidget : public QWidget +class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -59,10 +60,10 @@ public: enum RenderingPreviewMode { PreviewOriginalImage=0, // Original image only. - PreviewBothImagesHorz, // Horizontal with original and target duplicated. - PreviewBothImagesVert, // Vertical with original and target duplicated. - PreviewBothImagesHorzCont, // Horizontal with original and target in contiguous. - PreviewBothImagesVertCont, // Vertical with original and target in contiguous. + PreviewBothImagesHorz, //Qt::Horizontal with original and target duplicated. + PreviewBothImagesVert, //Qt::Vertical with original and target duplicated. + PreviewBothImagesHorzCont, //Qt::Horizontal with original and target in contiguous. + PreviewBothImagesVertCont, //Qt::Vertical with original and target in contiguous. PreviewTargetImage, // Target image only. PreviewToggleOnMouseOver, // Original image if mouse is over image area, else target image. NoPreviewMode // Target image only without information displayed. @@ -77,15 +78,15 @@ public: public: - ImageGuideWidget(int w, int h, QWidget *parent=0, + ImageGuideWidget(int w, int h, TQWidget *tqparent=0, bool spotVisible=true, int guideMode=HVGuideMode, - const QColor& guideColor=Qt::red, int guideSize=1, + const TQColor& guideColor=TQt::red, int guideSize=1, bool blink=false, bool useImageSelection=false); ~ImageGuideWidget(); ImageIface* imageIface(); - QPoint getSpotPosition(); + TQPoint getSpotPosition(); DColor getSpotColor(int getColorFrom); void setSpotVisible(bool spotVisible, bool blink=false); int getRenderingPreviewMode(); @@ -94,7 +95,7 @@ public: public slots: - void slotChangeGuideColor(const QColor &color); + void slotChangeGuideColor(const TQColor &color); void slotChangeGuideSize(int size); void slotChangeRenderingPreviewMode(int mode); void slotToggleUnderExposure(bool); @@ -102,20 +103,20 @@ public slots: signals: - void spotPositionChangedFromOriginal(const Digikam::DColor &color, const QPoint &position); - void spotPositionChangedFromTarget(const Digikam::DColor &color, const QPoint &position); + void spotPositionChangedFromOriginal(const Digikam::DColor &color, const TQPoint &position); + void spotPositionChangedFromTarget(const Digikam::DColor &color, const TQPoint &position); void signalResized(); protected: - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); - void timerEvent(QTimerEvent*); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - void mouseMoveEvent(QMouseEvent*); - void enterEvent(QEvent*); - void leaveEvent(QEvent*); + void paintEvent(TQPaintEvent*); + void resizeEvent(TQResizeEvent*); + void timerEvent(TQTimerEvent*); + void mousePressEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent*); + void mouseMoveEvent(TQMouseEvent*); + void enterEvent(TQEvent*); + void leaveEvent(TQEvent*); private: diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 36f2b0b..62626ea 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -21,19 +21,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qframe.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qpixmap.h> +// TQt includes. + +#include <tqframe.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqpixmap.h> // KDE includes. @@ -68,32 +68,32 @@ public: separateView = 0; } - QString settingsSection; + TQString settingsSection; - QHButtonGroup *separateView; + TQHButtonGroup *separateView; ImagePanIconWidget *imagePanIconWidget; ImageRegionWidget *imageRegionWidget; }; -ImagePanelWidget::ImagePanelWidget(uint w, uint h, const QString& settingsSection, - ImagePanIconWidget *pan, QWidget *parent, int separateViewMode) - : QWidget(parent, 0, Qt::WDestructiveClose) +ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSection, + ImagePanIconWidget *pan, TQWidget *tqparent, int separateViewMode) + : TQWidget(tqparent, 0, TQt::WDestructiveClose) { d = new ImagePanelWidgetPriv; d->settingsSection = settingsSection; d->imagePanIconWidget = pan; - QGridLayout *grid = new QGridLayout(this, 2, 3); + TQGridLayout *grid = new TQGridLayout(this, 2, 3); // ------------------------------------------------------------- - QFrame *preview = new QFrame(this); - QVBoxLayout* l1 = new QVBoxLayout(preview, 5, 0); + TQFrame *preview = new TQFrame(this); + TQVBoxLayout* l1 = new TQVBoxLayout(preview, 5, 0); d->imageRegionWidget = new ImageRegionWidget(w, h, preview, false); - d->imageRegionWidget->setFrameStyle(QFrame::NoFrame); - preview->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QWhatsThis::add( d->imageRegionWidget, i18n("<p>Here you can see the original clip image " + d->imageRegionWidget->setFrameStyle(TQFrame::NoFrame); + preview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQWhatsThis::add( d->imageRegionWidget, i18n("<p>Here you can see the original clip image " "which will be used for the preview computation." "<p>Click and drag the mouse cursor in the " "image to change the clip focus.")); @@ -101,33 +101,33 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const QString& settingsSectio // ------------------------------------------------------------- - QString directory; - d->separateView = new QHButtonGroup(this); + TQString directory; + d->separateView = new TQHButtonGroup(this); d->separateView->setExclusive(true); d->separateView->setInsideMargin( 0 ); - d->separateView->setFrameShape(QFrame::NoFrame); + d->separateView->setFrameShape(TQFrame::NoFrame); if (separateViewMode == SeparateViewDuplicate || separateViewMode == SeparateViewAll) { - QPushButton *duplicateHorButton = new QPushButton( d->separateView ); + TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); - duplicateHorButton->setPixmap( QPixmap( directory + "duplicatebothhorz.png" ) ); + duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setToggleButton(true); - QWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " "horizontally, displaying the original and target image " "at the same time. The target is duplicated from the original " "below the red dashed line." ) ); - QPushButton *duplicateVerButton = new QPushButton( d->separateView ); + TQPushButton *duplicateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); - duplicateVerButton->setPixmap( QPixmap( directory + "duplicatebothvert.png" ) ); + duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setToggleButton(true); - QWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " "vertically, displaying the original and target image " "at the same time. The target is duplicated from the original to " "the right of the red dashed line." ) ); @@ -136,36 +136,36 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const QString& settingsSectio if (separateViewMode == SeparateViewNormal || separateViewMode == SeparateViewAll) { - QPushButton *separateHorButton = new QPushButton( d->separateView ); + TQPushButton *separateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); - separateHorButton->setPixmap( QPixmap( directory + "bothhorz.png" ) ); + separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setToggleButton(true); - QWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " "horizontally, displaying the original and target image " "at the same time. The original is above the " "red dashed line, the target below it." ) ); - QPushButton *separateVerButton = new QPushButton( d->separateView ); + TQPushButton *separateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); - separateVerButton->setPixmap( QPixmap( directory + "bothvert.png" ) ); + separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setToggleButton(true); - QWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " "vertically, displaying the original and target image " "at the same time. The original is to the left of the " "red dashed line, the target to the right of it." ) ); } - QPushButton *noSeparateButton = new QPushButton( d->separateView ); + TQPushButton *noSeparateButton = new TQPushButton( d->separateView ); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("target", "target.png"); - noSeparateButton->setPixmap( QPixmap( directory + "target.png" ) ); + noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setToggleButton(true); - QWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " + TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " "be separated." ) ); // ------------------------------------------------------------- @@ -179,24 +179,24 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const QString& settingsSectio // ------------------------------------------------------------- - QTimer::singleShot(0, this, SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, SIGNAL(signalContentsMovedEvent(bool)), - this, SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), + this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotSetImageRegionPosition(const QRect&, bool))); + connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, SIGNAL(signalSelectionTakeFocus()), - this, SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), + this, TQT_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, SIGNAL(released(int)), - d->imagePanIconWidget, SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQT_SIGNAL(released(int)), + d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, SIGNAL(released(int)), - d->imageRegionWidget, SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQT_SIGNAL(released(int)), + d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); } ImagePanelWidget::~ImagePanelWidget() @@ -215,8 +215,8 @@ void ImagePanelWidget::readSettings() KConfig *config = kapp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); - mode = QMAX(ImageRegionWidget::SeparateViewHorizontal, mode); - mode = QMIN(ImageRegionWidget::SeparateViewDuplicateHorz, mode); + mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); + mode = TQMIN(ImageRegionWidget::SeparateViewDuplicateHorz, mode); d->imageRegionWidget->blockSignals(true); d->imagePanIconWidget->blockSignals(true); @@ -240,7 +240,7 @@ void ImagePanelWidget::writeSettings() void ImagePanelWidget::slotOriginalImageRegionChanged(bool target) { d->imagePanIconWidget->slotZoomFactorChanged(d->imageRegionWidget->zoomFactor()); - QRect rect = getOriginalImageRegion(); + TQRect rect = getOriginalImageRegion(); d->imagePanIconWidget->setRegionSelection(rect); updateSelectionInfo(rect); @@ -264,7 +264,7 @@ void ImagePanelWidget::slotZoomSliderChanged(int size) d->imageRegionWidget->setZoomFactorSnapped(z); } -void ImagePanelWidget::resizeEvent(QResizeEvent *) +void ImagePanelWidget::resizeEvent(TQResizeEvent *) { emit signalResized(); } @@ -276,7 +276,7 @@ void ImagePanelWidget::slotInitGui() slotOriginalImageRegionChanged(true); } -void ImagePanelWidget::setPanIconHighLightPoints(const QPointArray& pt) +void ImagePanelWidget::setPanIconHighLightPoints(const TQPointArray& pt) { d->imageRegionWidget->setHighLightPoints(pt); d->imagePanIconWidget->setHighLightPoints(pt); @@ -293,12 +293,12 @@ void ImagePanelWidget::setEnable(bool b) d->separateView->setEnabled(b); } -QRect ImagePanelWidget::getOriginalImageRegion() +TQRect ImagePanelWidget::getOriginalImageRegion() { return ( d->imageRegionWidget->getImageRegion() ); } -QRect ImagePanelWidget::getOriginalImageRegionToRender() +TQRect ImagePanelWidget::getOriginalImageRegionToRender() { return ( d->imageRegionWidget->getImageRegionToRender() ); } @@ -311,7 +311,7 @@ DImg ImagePanelWidget::getOriginalRegionImage() void ImagePanelWidget::setPreviewImage(DImg img) { d->imageRegionWidget->updatePreviewImage(&img); - d->imageRegionWidget->repaintContents(false); + d->imageRegionWidget->tqrepaintContents(false); } void ImagePanelWidget::setCenterImageRegionPosition() @@ -319,17 +319,17 @@ void ImagePanelWidget::setCenterImageRegionPosition() d->imageRegionWidget->setCenterContentsPosition(); } -void ImagePanelWidget::slotSetImageRegionPosition(const QRect& rect, bool targetDone) +void ImagePanelWidget::slotSetImageRegionPosition(const TQRect& rect, bool targetDone) { d->imageRegionWidget->setContentsPosition(rect.x(), rect.y(), targetDone); } -void ImagePanelWidget::updateSelectionInfo(const QRect& rect) +void ImagePanelWidget::updateSelectionInfo(const TQRect& rect) { - QToolTip::add( d->imagePanIconWidget, + TQToolTip::add( d->imagePanIconWidget, i18n("<nobr>(%1,%2)(%3x%4)</nobr>") - .arg(rect.left()).arg(rect.top()) - .arg(rect.width()).arg(rect.height())); + .tqarg(rect.left()).tqarg(rect.top()) + .tqarg(rect.width()).tqarg(rect.height())); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/digikam/libs/widgets/imageplugins/imagepanelwidget.h index 85f7c7a..716e8e4 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.h @@ -24,12 +24,12 @@ #ifndef IMAGEPANELWIDGET_H #define IMAGEPANELWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qimage.h> -#include <qrect.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqstring.h> // Local includes. @@ -45,9 +45,10 @@ class ImagePanelWidgetPriv; class ImageRegionWidget; class ImagePanIconWidget; -class DIGIKAM_EXPORT ImagePanelWidget : public QWidget +class DIGIKAM_EXPORT ImagePanelWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -60,19 +61,19 @@ public: public: - ImagePanelWidget(uint w, uint h, const QString& settingsSection, ImagePanIconWidget *pan, - QWidget *parent=0, int separateViewMode=SeparateViewAll); + ImagePanelWidget(uint w, uint h, const TQString& settingsSection, ImagePanIconWidget *pan, + TQWidget *tqparent=0, int separateViewMode=SeparateViewAll); ~ImagePanelWidget(); - QRect getOriginalImageRegion(); - QRect getOriginalImageRegionToRender(); + TQRect getOriginalImageRegion(); + TQRect getOriginalImageRegionToRender(); DImg getOriginalRegionImage(); void setPreviewImage(DImg img); void setCenterImageRegionPosition(); void setEnable(bool b); - void setPanIconHighLightPoints(const QPointArray& pt); + void setPanIconHighLightPoints(const TQPointArray& pt); void writeSettings(); @@ -86,14 +87,14 @@ signals: public slots: // Set the top/Left conner clip position. - void slotSetImageRegionPosition(const QRect& rect, bool targetDone); + void slotSetImageRegionPosition(const TQRect& rect, bool targetDone); // Slot used when the original image clip focus is changed by the user. void slotOriginalImageRegionChanged(bool target); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); private slots: @@ -103,7 +104,7 @@ private slots: private: - void updateSelectionInfo(const QRect& rect); + void updateSelectionInfo(const TQRect& rect); void readSettings(); private: diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 2f53066..91cc1fa 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -26,12 +26,12 @@ #include <cmath> -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qpen.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpen.h> +#include <tqtimer.h> // Local includes. @@ -59,13 +59,13 @@ public: int separateView; - QPointArray hightlightPoints; + TQPointArray hightlightPoints; ImageIface *iface; }; -ImagePanIconWidget::ImagePanIconWidget(int w, int h, QWidget *parent, WFlags flags) - : PanIconWidget(parent, flags) +ImagePanIconWidget::ImagePanIconWidget(int w, int h, TQWidget *tqparent, WFlags flags) + : PanIconWidget(tqparent, flags) { d = new ImagePanIconWidgetPriv; @@ -77,11 +77,11 @@ ImagePanIconWidget::ImagePanIconWidget(int w, int h, QWidget *parent, WFlags fla m_orgHeight = d->iface->originalHeight(); m_zoomedOrgWidth = d->iface->originalWidth(); m_zoomedOrgHeight = d->iface->originalHeight(); - m_pixmap = new QPixmap(w, h); + m_pixmap = new TQPixmap(w, h); setFixedSize(m_width, m_height); - m_rect = QRect(width()/2-m_width/2, height()/2-m_height/2, m_width, m_height); + m_rect = TQRect(width()/2-m_width/2, height()/2-m_height/2, m_width, m_height); updatePixmap(); m_timerID = startTimer(800); } @@ -93,36 +93,36 @@ ImagePanIconWidget::~ImagePanIconWidget() delete d; } -void ImagePanIconWidget::setHighLightPoints(const QPointArray& pointsList) +void ImagePanIconWidget::setHighLightPoints(const TQPointArray& pointsList) { d->hightlightPoints = pointsList; updatePixmap(); - repaint(false); + tqrepaint(false); } void ImagePanIconWidget::updatePixmap() { // Drawing background and image. - m_pixmap->fill(colorGroup().background()); - d->iface->paint(m_pixmap, m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); + m_pixmap->fill(tqcolorGroup().background()); + d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); - QPainter p(m_pixmap); + TQPainter p(m_pixmap); // Drawing HighLighted points. if (!d->hightlightPoints.isEmpty()) { - QPoint pt; + TQPoint pt; for (int i = 0 ; i < d->hightlightPoints.count() ; i++) { pt = d->hightlightPoints.point(i); pt.setX((int)(pt.x() * (float)(m_width) / (float)d->iface->originalWidth())); pt.setY((int)(pt.y() * (float)(m_height) / (float)d->iface->originalHeight())); - p.setPen(QPen(Qt::black, 1, Qt::SolidLine)); + p.setPen(TQPen(TQt::black, 1, TQt::SolidLine)); p.drawLine(pt.x(), pt.y()-1, pt.x(), pt.y()+1); p.drawLine(pt.x()-1, pt.y(), pt.x()+1, pt.y()); - p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); p.drawPoint(pt.x()-1, pt.y()-1); p.drawPoint(pt.x()+1, pt.y()+1); p.drawPoint(pt.x()-1, pt.y()+1); @@ -132,16 +132,16 @@ void ImagePanIconWidget::updatePixmap() // Drawing selection border - if (m_flicker) p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); - else p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + if (m_flicker) p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); + else p.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p.drawRect(m_localRegionSelection.x(), m_localRegionSelection.y(), m_localRegionSelection.width(), m_localRegionSelection.height()); - if (m_flicker) p.setPen(QPen(Qt::red, 1, Qt::DotLine)); - else p.setPen(QPen(Qt::white, 1, Qt::DotLine)); + if (m_flicker) p.setPen(TQPen(TQt::red, 1, TQt::DotLine)); + else p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); p.drawRect(m_localRegionSelection.x(), m_localRegionSelection.y(), @@ -150,16 +150,16 @@ void ImagePanIconWidget::updatePixmap() if (d->separateView == ImageRegionWidget::SeparateViewVertical) { - if (m_flicker) p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); - else p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + if (m_flicker) p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); + else p.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p.drawLine(m_localRegionSelection.topLeft().x() + m_localRegionSelection.width()/2, m_localRegionSelection.topLeft().y(), m_localRegionSelection.bottomLeft().x() + m_localRegionSelection.width()/2, m_localRegionSelection.bottomLeft().y()); - if (m_flicker) p.setPen(QPen(Qt::red, 1, Qt::DotLine)); - else p.setPen(QPen(Qt::white, 1, Qt::DotLine)); + if (m_flicker) p.setPen(TQPen(TQt::red, 1, TQt::DotLine)); + else p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); p.drawLine(m_localRegionSelection.topLeft().x() + m_localRegionSelection.width()/2, m_localRegionSelection.topLeft().y() + 1, @@ -168,16 +168,16 @@ void ImagePanIconWidget::updatePixmap() } else if (d->separateView == ImageRegionWidget::SeparateViewHorizontal) { - if (m_flicker) p.setPen(QPen(Qt::white, 1, Qt::SolidLine)); - else p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); + if (m_flicker) p.setPen(TQPen(TQt::white, 1, TQt::SolidLine)); + else p.setPen(TQPen(TQt::red, 1, TQt::SolidLine)); p.drawLine(m_localRegionSelection.topLeft().x(), m_localRegionSelection.topLeft().y() + m_localRegionSelection.height()/2, m_localRegionSelection.topRight().x(), m_localRegionSelection.topRight().y() + m_localRegionSelection.height()/2); - if (m_flicker) p.setPen(QPen(Qt::red, 1, Qt::DotLine)); - else p.setPen(QPen(Qt::white, 1, Qt::DotLine)); + if (m_flicker) p.setPen(TQPen(TQt::red, 1, TQt::DotLine)); + else p.setPen(TQPen(TQt::white, 1, TQt::DotLine)); p.drawLine(m_localRegionSelection.topLeft().x() + 1, m_localRegionSelection.topLeft().y() + m_localRegionSelection.height()/2, @@ -192,7 +192,7 @@ void ImagePanIconWidget::slotSeparateViewToggled(int t) { d->separateView = t; updatePixmap(); - repaint(false); + tqrepaint(false); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h index a4d3134..2a5b1ef 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h @@ -25,9 +25,9 @@ #ifndef IMAGEPANICONWIDGET_H #define IMAGEPANICONWIDGET_H -// Qt includes. +// TQt includes. -#include <qpointarray.h> +#include <tqpointarray.h> // Local includes. @@ -41,13 +41,14 @@ class ImagePanIconWidgetPriv; class ImagePanIconWidget : public PanIconWidget { Q_OBJECT + TQ_OBJECT public: - ImagePanIconWidget(int width, int height, QWidget *parent=0, WFlags flags=Qt::WDestructiveClose); + ImagePanIconWidget(int width, int height, TQWidget *tqparent=0, WFlags flags=TQt::WDestructiveClose); ~ImagePanIconWidget(); - void setHighLightPoints(const QPointArray& pointsList); + void setHighLightPoints(const TQPointArray& pointsList); public slots: diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index f45e61a..c29681f 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -21,19 +21,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qframe.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qtimer.h> -#include <qhbuttongroup.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qpixmap.h> +// TQt includes. + +#include <tqframe.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> +#include <tqhbuttongroup.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqpixmap.h> // KDE includes. @@ -80,18 +80,18 @@ public: zoomBar = 0; } - QGridLayout *mainLayout; + TQGridLayout *mainLayout; - QHButtonGroup *separateView; + TQHButtonGroup *separateView; - QString settingsSection; + TQString settingsSection; - QWidget *settings; - QWidget *previewWidget; + TQWidget *settings; + TQWidget *previewWidget; - QVBoxLayout *settingsLayout; + TQVBoxLayout *settingsLayout; - QSplitter *splitter; + TQSplitter *splitter; KProgress *progressBar; @@ -103,71 +103,71 @@ public: StatusZoomBar *zoomBar; }; -ImagePannelWidget::ImagePannelWidget(uint w, uint h, const QString& settingsSection, - QWidget *parent, int separateViewMode) - : QHBox(parent, 0, Qt::WDestructiveClose) +ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSection, + TQWidget *tqparent, int separateViewMode) + : TQHBox(tqparent, 0, TQt::WDestructiveClose) { d = new ImagePannelWidgetPriv; d->settingsSection = settingsSection; - d->splitter = new QSplitter(this); - d->previewWidget = new QWidget(d->splitter); - d->mainLayout = new QGridLayout( d->previewWidget, 2, 3, 0, KDialog::spacingHint()); + d->splitter = new TQSplitter(this); + d->previewWidget = new TQWidget(d->splitter); + d->mainLayout = new TQGridLayout( d->previewWidget, 2, 3, 0, KDialog::spacingHint()); - d->splitter->setFrameStyle( QFrame::NoFrame ); - d->splitter->setFrameShadow( QFrame::Plain ); - d->splitter->setFrameShape( QFrame::NoFrame ); + d->splitter->setFrameStyle( TQFrame::NoFrame ); + d->splitter->setFrameShadow( TQFrame::Plain ); + d->splitter->setFrameShape( TQFrame::NoFrame ); d->splitter->setOpaqueResize(false); // ------------------------------------------------------------- - QFrame *preview = new QFrame(d->previewWidget); - QVBoxLayout* l1 = new QVBoxLayout(preview, 5, 0); + TQFrame *preview = new TQFrame(d->previewWidget); + TQVBoxLayout* l1 = new TQVBoxLayout(preview, 5, 0); d->imageRegionWidget = new ImageRegionWidget(w, h, preview, false); - d->imageRegionWidget->setFrameStyle(QFrame::NoFrame); - preview->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QWhatsThis::add( d->imageRegionWidget, i18n("<p>Here you can see the original clip image " + d->imageRegionWidget->setFrameStyle(TQFrame::NoFrame); + preview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQWhatsThis::add( d->imageRegionWidget, i18n("<p>Here you can see the original clip image " "which will be used for the preview computation." "<p>Click and drag the mouse cursor in the " "image to change the clip focus.")); l1->addWidget(d->imageRegionWidget, 0); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); - d->previewWidget->setSizePolicy(rightSzPolicy); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); + d->previewWidget->tqsetSizePolicy(rightSzPolicy); // ------------------------------------------------------------- d->zoomBar = new StatusZoomBar(d->previewWidget); - QWhatsThis::add( d->zoomBar, i18n("<p>Here set the zoom factor of the preview area.") ); + TQWhatsThis::add( d->zoomBar, i18n("<p>Here set the zoom factor of the preview area.") ); // ------------------------------------------------------------- - QString directory; - d->separateView = new QHButtonGroup(d->previewWidget); + TQString directory; + d->separateView = new TQHButtonGroup(d->previewWidget); d->separateView->setExclusive(true); d->separateView->setInsideMargin( 0 ); - d->separateView->setFrameShape(QFrame::NoFrame); + d->separateView->setFrameShape(TQFrame::NoFrame); if (separateViewMode == SeparateViewDuplicate || separateViewMode == SeparateViewAll) { - QPushButton *duplicateHorButton = new QPushButton( d->separateView ); + TQPushButton *duplicateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz); KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); - duplicateHorButton->setPixmap( QPixmap( directory + "duplicatebothhorz.png" ) ); + duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); duplicateHorButton->setToggleButton(true); - QWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area " "horizontally, displaying the original and target image " "at the same time. The target is duplicated from the original " "below the red dashed line." ) ); - QPushButton *duplicateVerButton = new QPushButton( d->separateView ); + TQPushButton *duplicateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert); KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); - duplicateVerButton->setPixmap( QPixmap( directory + "duplicatebothvert.png" ) ); + duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); duplicateVerButton->setToggleButton(true); - QWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area " "vertically, displaying the original and target image " "at the same time. The target is duplicated from the original to " "the right of the red dashed line." ) ); @@ -176,42 +176,42 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const QString& settingsSect if (separateViewMode == SeparateViewNormal || separateViewMode == SeparateViewAll) { - QPushButton *separateHorButton = new QPushButton( d->separateView ); + TQPushButton *separateHorButton = new TQPushButton( d->separateView ); d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal); KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); - separateHorButton->setPixmap( QPixmap( directory + "bothhorz.png" ) ); + separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); separateHorButton->setToggleButton(true); - QWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area " "horizontally, displaying the original and target image " "at the same time. The original is above the " "red dashed line, the target below it." ) ); - QPushButton *separateVerButton = new QPushButton( d->separateView ); + TQPushButton *separateVerButton = new TQPushButton( d->separateView ); d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical); KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); - separateVerButton->setPixmap( QPixmap( directory + "bothvert.png" ) ); + separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) ); separateVerButton->setToggleButton(true); - QWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " + TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area " "vertically, displaying the original and target image " "at the same time. The original is to the left of the " "red dashed line, the target to the right of it." ) ); } - QPushButton *noSeparateButton = new QPushButton( d->separateView ); + TQPushButton *noSeparateButton = new TQPushButton( d->separateView ); d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone); KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("target", "target.png"); - noSeparateButton->setPixmap( QPixmap( directory + "target.png" ) ); + noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) ); noSeparateButton->setToggleButton(true); - QWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " + TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not " "be separated." ) ); // ------------------------------------------------------------- d->progressBar = new KProgress(100, d->previewWidget); - QWhatsThis::add(d->progressBar ,i18n("<p>This is the percentage of the task which has been completed up to this point.")); + TQWhatsThis::add(d->progressBar ,i18n("<p>This is the percentage of the task which has been completed up to this point.")); d->progressBar->setProgress(0); d->progressBar->setMaximumHeight( fontMetrics().height() ); @@ -227,24 +227,24 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const QString& settingsSect // ------------------------------------------------------------- - QString sbName(d->settingsSection + QString(" Image Plugin Sidebar")); + TQString sbName(d->settingsSection + TQString(" Image Plugin Sidebar")); d->settingsSideBar = new Sidebar(this, sbName.ascii(), Sidebar::Right); d->settingsSideBar->setSplitter(d->splitter); - d->settings = new QWidget(d->settingsSideBar); - d->settingsLayout = new QVBoxLayout(d->settings); + d->settings = new TQWidget(d->settingsSideBar); + d->settingsLayout = new TQVBoxLayout(d->settings); - QFrame *frame3 = new QFrame(d->settings); - frame3->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l3 = new QVBoxLayout(frame3, 5, 0); + TQFrame *frame3 = new TQFrame(d->settings); + frame3->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l3 = new TQVBoxLayout(frame3, 5, 0); d->imagePanIconWidget = new ImagePanIconWidget(360, 240, frame3); - QWhatsThis::add( d->imagePanIconWidget, i18n("<p>Here you can see the original image panel " + TQWhatsThis::add( d->imagePanIconWidget, i18n("<p>Here you can see the original image panel " "which can help you to select the clip preview." "<p>Click and drag the mouse cursor in the " "red rectangle to change the clip focus.")); - l3->addWidget(d->imagePanIconWidget, 0, Qt::AlignCenter); + l3->addWidget(d->imagePanIconWidget, 0, TQt::AlignCenter); - d->settingsLayout->addWidget(frame3, 0, Qt::AlignHCenter); + d->settingsLayout->addWidget(frame3, 0, TQt::AlignHCenter); d->settingsLayout->addSpacing(KDialog::spacingHint()); d->settingsSideBar->appendTab(d->settings, SmallIcon("configure"), i18n("Settings")); @@ -253,33 +253,33 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const QString& settingsSect // ------------------------------------------------------------- setProgressVisible(false); - QTimer::singleShot(0, this, SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, SIGNAL(signalContentsMovedEvent(bool)), - this, SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), + this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotSetImageRegionPosition(const QRect&, bool))); + connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, SIGNAL(signalSelectionTakeFocus()), - this, SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), + this, TQT_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, SIGNAL(released(int)), - d->imageRegionWidget, SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQT_SIGNAL(released(int)), + d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, SIGNAL(released(int)), - d->imagePanIconWidget, SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQT_SIGNAL(released(int)), + d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); - connect(d->zoomBar, SIGNAL(signalZoomMinusClicked()), - d->imageRegionWidget, SLOT(slotDecreaseZoom())); + connect(d->zoomBar, TQT_SIGNAL(signalZoomMinusClicked()), + d->imageRegionWidget, TQT_SLOT(slotDecreaseZoom())); - connect(d->zoomBar, SIGNAL(signalZoomPlusClicked()), - d->imageRegionWidget, SLOT(slotIncreaseZoom())); + connect(d->zoomBar, TQT_SIGNAL(signalZoomPlusClicked()), + d->imageRegionWidget, TQT_SLOT(slotIncreaseZoom())); - connect(d->zoomBar, SIGNAL(signalZoomSliderReleased(int)), - this, SLOT(slotZoomSliderChanged(int))); + connect(d->zoomBar, TQT_SIGNAL(signalZoomSliderReleased(int)), + this, TQT_SLOT(slotZoomSliderChanged(int))); } ImagePannelWidget::~ImagePannelWidget() @@ -294,8 +294,8 @@ void ImagePannelWidget::readSettings() KConfig *config = kapp->config(); config->setGroup(d->settingsSection); int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert); - mode = QMAX(ImageRegionWidget::SeparateViewHorizontal, mode); - mode = QMIN(ImageRegionWidget::SeparateViewDuplicateHorz, mode); + mode = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode); + mode = TQMIN(ImageRegionWidget::SeparateViewDuplicateHorz, mode); d->imageRegionWidget->blockSignals(true); d->imagePanIconWidget->blockSignals(true); @@ -319,7 +319,7 @@ void ImagePannelWidget::writeSettings() void ImagePannelWidget::slotOriginalImageRegionChanged(bool target) { slotZoomFactorChanged(d->imageRegionWidget->zoomFactor()); - QRect rect = getOriginalImageRegion(); + TQRect rect = getOriginalImageRegion(); d->imagePanIconWidget->setRegionSelection(rect); updateSelectionInfo(rect); @@ -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%").arg((int)(zoom*100.0))); + d->zoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); d->zoomBar->setEnableZoomPlus(true); d->zoomBar->setEnableZoomMinus(true); @@ -373,7 +373,7 @@ KProgress *ImagePannelWidget::progressBar() return d->progressBar; } -void ImagePannelWidget::resizeEvent(QResizeEvent *) +void ImagePannelWidget::resizeEvent(TQResizeEvent *) { emit signalResized(); } @@ -385,7 +385,7 @@ void ImagePannelWidget::slotInitGui() slotOriginalImageRegionChanged(true); } -void ImagePannelWidget::setPanIconHighLightPoints(const QPointArray& pt) +void ImagePannelWidget::setPanIconHighLightPoints(const TQPointArray& pt) { d->imageRegionWidget->setHighLightPoints(pt); d->imagePanIconWidget->setHighLightPoints(pt); @@ -396,9 +396,9 @@ void ImagePannelWidget::slotPanIconTakeFocus() d->imageRegionWidget->restorePixmapRegion(); } -void ImagePannelWidget::setUserAreaWidget(QWidget *w) +void ImagePannelWidget::setUserAreaWidget(TQWidget *w) { - w->reparent( d->settings, QPoint(0, 0) ); + w->reparent( d->settings, TQPoint(0, 0) ); d->settingsLayout->addSpacing(KDialog::spacingHint()); d->settingsLayout->addWidget(w); d->settingsLayout->addStretch(); @@ -423,9 +423,9 @@ void ImagePannelWidget::setProgressVisible(bool b) else d->progressBar->hide(); } -void ImagePannelWidget::setProgressWhatsThis(const QString& desc) +void ImagePannelWidget::setProgressWhatsThis(const TQString& desc) { - QWhatsThis::add( d->progressBar, desc); + TQWhatsThis::add( d->progressBar, desc); } void ImagePannelWidget::setPreviewImageWaitCursor(bool enable) @@ -436,12 +436,12 @@ void ImagePannelWidget::setPreviewImageWaitCursor(bool enable) d->imageRegionWidget->unsetCursor(); } -QRect ImagePannelWidget::getOriginalImageRegion() +TQRect ImagePannelWidget::getOriginalImageRegion() { return ( d->imageRegionWidget->getImageRegion() ); } -QRect ImagePannelWidget::getOriginalImageRegionToRender() +TQRect ImagePannelWidget::getOriginalImageRegionToRender() { return ( d->imageRegionWidget->getImageRegionToRender() ); } @@ -461,17 +461,17 @@ void ImagePannelWidget::setCenterImageRegionPosition() d->imageRegionWidget->setCenterContentsPosition(); } -void ImagePannelWidget::slotSetImageRegionPosition(const QRect& rect, bool targetDone) +void ImagePannelWidget::slotSetImageRegionPosition(const TQRect& rect, bool targetDone) { d->imageRegionWidget->setContentsPosition(rect.x(), rect.y(), targetDone); } -void ImagePannelWidget::updateSelectionInfo(const QRect& rect) +void ImagePannelWidget::updateSelectionInfo(const TQRect& rect) { - QToolTip::add( d->imagePanIconWidget, + TQToolTip::add( d->imagePanIconWidget, i18n("<nobr>(%1,%2)(%3x%4)</nobr>") - .arg(rect.left()).arg(rect.top()) - .arg(rect.width()).arg(rect.height())); + .tqarg(rect.left()).tqarg(rect.top()) + .tqarg(rect.width()).tqarg(rect.height())); } } // NameSpace Digikam diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/digikam/libs/widgets/imageplugins/imagepannelwidget.h index 7f9eff9..35df830 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.h @@ -24,12 +24,12 @@ #ifndef IMAGEPANNELWIDGET_H #define IMAGEPANNELWIDGET_H -// Qt includes. +// TQt includes. -#include <qhbox.h> -#include <qimage.h> -#include <qrect.h> -#include <qstring.h> +#include <tqhbox.h> +#include <tqimage.h> +#include <tqrect.h> +#include <tqstring.h> // Local includes @@ -44,9 +44,10 @@ namespace Digikam class ImagePannelWidgetPriv; class ImageRegionWidget; -class DIGIKAM_EXPORT ImagePannelWidget : public QHBox +class DIGIKAM_EXPORT ImagePannelWidget : public TQHBox { Q_OBJECT + TQ_OBJECT public: @@ -59,12 +60,12 @@ public: public: - ImagePannelWidget(uint w, uint h, const QString& settingsSection, QWidget *parent=0, + ImagePannelWidget(uint w, uint h, const TQString& settingsSection, TQWidget *tqparent=0, int separateViewMode=SeparateViewAll); ~ImagePannelWidget(); - QRect getOriginalImageRegion(); - QRect getOriginalImageRegionToRender(); + TQRect getOriginalImageRegion(); + TQRect getOriginalImageRegionToRender(); DImg getOriginalRegionImage(); void setPreviewImage(DImg img); void setPreviewImageWaitCursor(bool enable); @@ -74,11 +75,11 @@ public: void setProgress(int val); void setProgressVisible(bool b); - void setProgressWhatsThis(const QString& desc); + void setProgressWhatsThis(const TQString& desc); - void setUserAreaWidget(QWidget *w); + void setUserAreaWidget(TQWidget *w); - void setPanIconHighLightPoints(const QPointArray& pt); + void setPanIconHighLightPoints(const TQPointArray& pt); KProgress *progressBar(); @@ -90,14 +91,14 @@ signals: public slots: // Set the top/Left conner clip position. - void slotSetImageRegionPosition(const QRect& rect, bool targetDone); + void slotSetImageRegionPosition(const TQRect& rect, bool targetDone); // Slot used when the original image clip focus is changed by the user. void slotOriginalImageRegionChanged(bool target); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(TQResizeEvent *e); private slots: @@ -108,7 +109,7 @@ private slots: private: - void updateSelectionInfo(const QRect& rect); + void updateSelectionInfo(const TQRect& rect); void readSettings(); void writeSettings(); diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index 2d54137..c44e482 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -25,18 +25,18 @@ #include <cmath> -// Qt includes. - -#include <qpainter.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qpen.h> -#include <qimage.h> -#include <qbrush.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qpointarray.h> +// TQt includes. + +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqimage.h> +#include <tqbrush.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqpointarray.h> // KDE includes. @@ -70,33 +70,33 @@ public: int xpos; int ypos; - QPixmap pixmapRegion; // Pixmap of current region to render. + TQPixmap pixmapRegion; // Pixmap of current region to render. - QPointArray hightlightPoints; + TQPointArray hightlightPoints; DImg image; // Entire content image to render pixmap. ImageIface *iface; }; -ImageRegionWidget::ImageRegionWidget(int wp, int hp, QWidget *parent, bool scrollBar) - : PreviewWidget(parent) +ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *tqparent, bool scrollBar) + : PreviewWidget(tqparent) { d = new ImageRegionWidgetPriv; d->iface = new ImageIface(0, 0); d->image = d->iface->getOriginalImg()->copy(); setMinimumSize(wp, hp); - setBackgroundColor(colorGroup().background()); + setBackgroundColor(tqcolorGroup().background()); if( !scrollBar ) { - setVScrollBarMode( QScrollView::AlwaysOff ); - setHScrollBarMode( QScrollView::AlwaysOff ); + setVScrollBarMode( TQScrollView::AlwaysOff ); + setHScrollBarMode( TQScrollView::AlwaysOff ); } - connect(this, SIGNAL(signalZoomFactorChanged(double)), - this, SLOT(slotZoomFactorChanged())); + connect(this, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SLOT(slotZoomFactorChanged())); } ImageRegionWidget::~ImageRegionWidget() @@ -105,11 +105,11 @@ ImageRegionWidget::~ImageRegionWidget() delete d; } -void ImageRegionWidget::resizeEvent(QResizeEvent* e) +void ImageRegionWidget::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); // NOTE: We will always adapt the min. zoom factor to the visible size of canvas @@ -117,7 +117,7 @@ void ImageRegionWidget::resizeEvent(QResizeEvent* e) double srcHeight = previewHeight(); double dstWidth = contentsRect().width(); double dstHeight = contentsRect().height(); - double zoom = QMAX(dstWidth/srcWidth, dstHeight/srcHeight); + double zoom = TQMAX(dstWidth/srcWidth, dstHeight/srcHeight); setZoomMin(zoom); setZoomMax(zoom*12.0); @@ -144,17 +144,17 @@ void ImageRegionWidget::resetPreview() d->image.reset(); } -void ImageRegionWidget::paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh) +void ImageRegionWidget::paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh) { DImg img = d->image.smoothScaleSection(sx, sy, sw, sh, tileSize(), tileSize()); - QPixmap pix2 = d->iface->convertToPixmap(img); + TQPixmap pix2 = d->iface->convertToPixmap(img); bitBlt(pix, 0, 0, &pix2, 0, 0); } -void ImageRegionWidget::setHighLightPoints(const QPointArray& pointsList) +void ImageRegionWidget::setHighLightPoints(const TQPointArray& pointsList) { d->hightlightPoints = pointsList; - repaintContents(false); + tqrepaintContents(false); } void ImageRegionWidget::slotZoomFactorChanged() @@ -169,22 +169,22 @@ void ImageRegionWidget::slotSeparateViewToggled(int mode) slotZoomFactorChanged(); } -QRect ImageRegionWidget::getImageRegion() +TQRect ImageRegionWidget::getImageRegion() { - QRect region; + TQRect region; switch (d->separateView) { case SeparateViewVertical: case SeparateViewHorizontal: case SeparateViewNone: - region = QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()); + region = TQRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()); break; case SeparateViewDuplicateVert: - region = QRect(contentsX(), contentsY(), visibleWidth()/2, visibleHeight()); + region = TQRect(contentsX(), contentsY(), visibleWidth()/2, visibleHeight()); break; case SeparateViewDuplicateHorz: - region = QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()/2); + region = TQRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()/2); break; } @@ -195,12 +195,12 @@ void ImageRegionWidget::viewportPaintExtraData() { if (!m_movingInProgress && !d->pixmapRegion.isNull()) { - QPainter p(viewport()); - QRect region = getLocalTargetImageRegion(); - QRect rt(contentsToViewport(region.topLeft()), contentsToViewport(region.bottomRight())); + TQPainter p(viewport()); + TQRect region = getLocalTargetImageRegion(); + TQRect rt(contentsToViewport(region.topLeft()), contentsToViewport(region.bottomRight())); region = getLocalImageRegionToRender(); - QRect ro(contentsToViewport(region.topLeft()), contentsToViewport(region.bottomRight())); + TQRect ro(contentsToViewport(region.topLeft()), contentsToViewport(region.bottomRight())); bitBlt(viewport(), rt.x(), rt.y(), &d->pixmapRegion, 0, 0, rt.width(), rt.height()); @@ -211,24 +211,24 @@ void ImageRegionWidget::viewportPaintExtraData() case SeparateViewVertical: case SeparateViewDuplicateVert: { - p.setPen(QPen(Qt::white, 2, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(rt.topLeft().x(), rt.topLeft().y(), rt.bottomLeft().x(), rt.bottomLeft().y()); - p.setPen(QPen(Qt::red, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 2, TQt::DotLine)); p.drawLine(rt.topLeft().x(), rt.topLeft().y()+1, rt.bottomLeft().x(), rt.bottomLeft().y()-1); - p.setPen(QPen(Qt::red, 1)) ; - QFontMetrics fontMt = p.fontMetrics(); + p.setPen(TQPen(TQt::red, 1)) ; + TQFontMetrics fontMt = p.fontMetrics(); - QString text(i18n("Target")); - QRect textRect; - QRect fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); - textRect.setTopLeft(QPoint(rt.topLeft().x()+20, rt.topLeft().y()+20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + TQString text(i18n("Target")); + TQRect textRect; + TQRect fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); + textRect.setTopLeft(TQPoint(rt.topLeft().x()+20, rt.topLeft().y()+20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); text = i18n("Original"); fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); @@ -236,34 +236,34 @@ void ImageRegionWidget::viewportPaintExtraData() if (d->separateView == SeparateViewVertical) ro.moveBy(-ro.width(), 0); - textRect.setTopLeft(QPoint(ro.topLeft().x()+20, ro.topLeft().y()+20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(ro.topLeft().x()+20, ro.topLeft().y()+20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); break; } case SeparateViewHorizontal: case SeparateViewDuplicateHorz: { - p.setPen(QPen(Qt::white, 2, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(rt.topLeft().x()+1, rt.topLeft().y(), rt.topRight().x()-1, rt.topRight().y()); - p.setPen(QPen(Qt::red, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 2, TQt::DotLine)); p.drawLine(rt.topLeft().x(), rt.topLeft().y(), rt.topRight().x(), rt.topRight().y()); - p.setPen(QPen(Qt::red, 1)) ; - QFontMetrics fontMt = p.fontMetrics(); + p.setPen(TQPen(TQt::red, 1)) ; + TQFontMetrics fontMt = p.fontMetrics(); - QString text(i18n("Target")); - QRect textRect; - QRect fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); - textRect.setTopLeft(QPoint(rt.topLeft().x()+20, rt.topLeft().y()+20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + TQString text(i18n("Target")); + TQRect textRect; + TQRect fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); + textRect.setTopLeft(TQPoint(rt.topLeft().x()+20, rt.topLeft().y()+20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); text = i18n("Original"); fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text); @@ -271,11 +271,11 @@ void ImageRegionWidget::viewportPaintExtraData() if (d->separateView == SeparateViewHorizontal) ro.moveBy(0, -ro.height()); - textRect.setTopLeft(QPoint(ro.topLeft().x()+20, ro.topLeft().y()+20)); - textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2 ) ); - p.fillRect(textRect, QBrush(QColor(250, 250, 255)) ); + textRect.setTopLeft(TQPoint(ro.topLeft().x()+20, ro.topLeft().y()+20)); + textRect.setSize( TQSize(fontRect.width()+2, fontRect.height()+2 ) ); + p.fillRect(textRect, TQBrush(TQColor(250, 250, 255)) ); p.drawRect(textRect); - p.drawText(textRect, Qt::AlignCenter, text); + p.drawText(textRect, TQt::AlignCenter, text); break; } } @@ -284,23 +284,23 @@ void ImageRegionWidget::viewportPaintExtraData() if (!d->hightlightPoints.isEmpty()) { - QPoint pt; - QRect hpArea; + TQPoint pt; + TQRect hpArea; for (int i = 0 ; i < d->hightlightPoints.count() ; i++) { pt = d->hightlightPoints.point(i); - if ( getImageRegionToRender().contains(pt) ) + if ( getImageRegionToRender().tqcontains(pt) ) { int x = (int)(((double)pt.x() * tileSize()) / floor(tileSize() / zoomFactor())); int y = (int)(((double)pt.y() * tileSize()) / floor(tileSize() / zoomFactor())); - QPoint hp(contentsToViewport(QPoint(x, y))); - hpArea.setSize(QSize((int)(16*zoomFactor()), (int)(16*zoomFactor()))); + TQPoint hp(contentsToViewport(TQPoint(x, y))); + hpArea.setSize(TQSize((int)(16*zoomFactor()), (int)(16*zoomFactor()))); hpArea.moveCenter(hp); - p.setPen(QPen(Qt::white, 2, Qt::SolidLine)); + p.setPen(TQPen(TQt::white, 2, TQt::SolidLine)); p.drawLine(hp.x(), hpArea.y(), hp.x(), hp.y()-(int)(3*zoomFactor())); p.drawLine(hp.x(), hp.y()+(int)(3*zoomFactor()), @@ -310,7 +310,7 @@ void ImageRegionWidget::viewportPaintExtraData() p.drawLine(hp.x()+(int)(3*zoomFactor()), hp.y(), hpArea.right(), hp.y()); - p.setPen(QPen(Qt::red, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::red, 2, TQt::DotLine)); p.drawLine(hp.x(), hpArea.y(), hp.x(), hp.y()-(int)(3*zoomFactor())); p.drawLine(hp.x(), hp.y()+(int)(3*zoomFactor()), @@ -345,19 +345,19 @@ void ImageRegionWidget::setContentsPosition(int x, int y, bool targetDone) void ImageRegionWidget::backupPixmapRegion() { - d->pixmapRegion = QPixmap(); + d->pixmapRegion = TQPixmap(); } void ImageRegionWidget::restorePixmapRegion() { m_movingInProgress = true; - viewport()->repaint(false); + viewport()->tqrepaint(false); } void ImageRegionWidget::updatePreviewImage(DImg *img) { DImg image = img->copy(); - QRect r = getLocalImageRegionToRender(); + TQRect r = getLocalImageRegionToRender(); image.resize(r.width(), r.height()); // Because image plugins are tool witch only work on image data, the DImg container @@ -372,55 +372,55 @@ DImg ImageRegionWidget::getImageRegionImage() return (d->image.copy(getImageRegionToRender())); } -QRect ImageRegionWidget::getImageRegionToRender() +TQRect ImageRegionWidget::getImageRegionToRender() { - QRect r = getLocalImageRegionToRender(); + TQRect r = getLocalImageRegionToRender(); int x = (int)(((double)r.x() / tileSize()) * floor(tileSize() / zoomFactor())); int y = (int)(((double)r.y() / tileSize()) * floor(tileSize() / zoomFactor())); int w = (int)(((double)r.width() / tileSize()) * floor(tileSize() / zoomFactor())); int h = (int)(((double)r.height() / tileSize()) * floor(tileSize() / zoomFactor())); - QRect rect(x, y, w, h); + TQRect rect(x, y, w, h); return (rect); } -QRect ImageRegionWidget::getLocalImageRegionToRender() +TQRect ImageRegionWidget::getLocalImageRegionToRender() { - QRect region; + TQRect region; if (d->separateView == SeparateViewVertical) { - region = QRect((int)ceilf(contentsX()+visibleWidth()/2.0), contentsY(), + region = TQRect((int)ceilf(contentsX()+visibleWidth()/2.0), contentsY(), (int)ceilf(visibleWidth()/2.0), visibleHeight()); } else if (d->separateView == SeparateViewHorizontal) { - region = QRect(contentsX(), (int)ceilf(contentsY()+visibleHeight()/2.0), + region = TQRect(contentsX(), (int)ceilf(contentsY()+visibleHeight()/2.0), visibleWidth(), (int)ceilf(visibleHeight()/2.0)); } else if (d->separateView == SeparateViewDuplicateVert) { - region = QRect(contentsX(), contentsY(), + region = TQRect(contentsX(), contentsY(), (int)ceilf(visibleWidth()/2.0), visibleHeight()); } else if (d->separateView == SeparateViewDuplicateHorz) { - region = QRect(contentsX(), contentsY(), + region = TQRect(contentsX(), contentsY(), visibleWidth(), (int)ceilf(visibleHeight()/2.0)); } else { - region = QRect(contentsX(), contentsY(), + region = TQRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()); } return (region); } -QRect ImageRegionWidget::getLocalTargetImageRegion() +TQRect ImageRegionWidget::getLocalTargetImageRegion() { - QRect region = getLocalImageRegionToRender(); + TQRect region = getLocalImageRegionToRender(); if (d->separateView == SeparateViewDuplicateVert) region.moveBy(region.width(), 0); @@ -456,11 +456,11 @@ void ImageRegionWidget::setContentsSize() } } -void ImageRegionWidget::contentsWheelEvent(QWheelEvent *e) +void ImageRegionWidget::contentsWheelEvent(TQWheelEvent *e) { e->accept(); - if (e->state() & Qt::ControlButton) + if (e->state() & TQt::ControlButton) { if (e->delta() < 0 && !maxZoom()) slotIncreaseZoom(); diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/digikam/libs/widgets/imageplugins/imageregionwidget.h index d71818e..2b1e51e 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.h +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.h @@ -24,9 +24,9 @@ #ifndef IMAGEREGIONWIDGET_H #define IMAGEREGIONWIDGET_H -// Qt includes. +// TQt includes. -#include <qrect.h> +#include <tqrect.h> // Local includes. @@ -42,6 +42,7 @@ class ImageRegionWidgetPriv; class DIGIKAM_EXPORT ImageRegionWidget : public PreviewWidget { Q_OBJECT + TQ_OBJECT public: @@ -56,7 +57,7 @@ public: public: - ImageRegionWidget(int wp, int hp, QWidget *parent=0, bool scrollBar=true); + ImageRegionWidget(int wp, int hp, TQWidget *tqparent=0, bool scrollBar=true); ~ImageRegionWidget(); void setContentsPosition(int x, int y, bool targetDone); @@ -64,10 +65,10 @@ public: /** To get image region including original or/and target area depending of separate view mode. The region is given using not scaled image unit.*/ - QRect getImageRegion(); + TQRect getImageRegion(); /** To get target image region area to render */ - QRect getImageRegionToRender(); + TQRect getImageRegionToRender(); /** To get target image region image to use for render operations */ DImg getImageRegionImage(); @@ -77,7 +78,7 @@ public: void backupPixmapRegion(); void restorePixmapRegion(); - void setHighLightPoints(const QPointArray& pointsList); + void setHighLightPoints(const TQPointArray& pointsList); void drawSeparateView(); public slots: @@ -91,18 +92,18 @@ private slots: private: void updatePixmap(DImg& img); - QRect getLocalTargetImageRegion(); - QRect getLocalImageRegionToRender(); + TQRect getLocalTargetImageRegion(); + TQRect getLocalImageRegionToRender(); void viewportPaintExtraData(); int previewWidth(); int previewHeight(); bool previewIsNull(); void resetPreview(); void setContentsSize(); - void resizeEvent(QResizeEvent *); - void contentsWheelEvent(QWheelEvent *); + void resizeEvent(TQResizeEvent *); + void contentsWheelEvent(TQWheelEvent *); - inline void paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh); + inline void paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh); private: diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 7c0fac5..0424ca3 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qhbuttongroup.h> -#include <qpushbutton.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqhbuttongroup.h> +#include <tqpushbutton.h> // KDE includes. @@ -62,145 +62,145 @@ public: previewWidget = 0; } - QString settingsSection; + TQString settingsSection; - QHButtonGroup *previewButtons; + TQHButtonGroup *previewButtons; - QPushButton *underExposureButton; - QPushButton *overExposureButton; + TQPushButton *underExposureButton; + TQPushButton *overExposureButton; KSqueezedTextLabel *spotInfoLabel; ImageGuideWidget *previewWidget; }; -ImageWidget::ImageWidget(const QString& settingsSection, QWidget *parent, - const QString& previewWhatsThis, bool prevModeOptions, +ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *tqparent, + const TQString& previewWhatsThis, bool prevModeOptions, int guideMode, bool guideVisible, bool useImageSelection) - : QWidget(parent) + : TQWidget(tqparent) { d = new ImageWidgetPriv; d->settingsSection = settingsSection; // ------------------------------------------------------------- - QGridLayout* grid = new QGridLayout(this, 2, 3); + TQGridLayout* grid = new TQGridLayout(this, 2, 3); d->spotInfoLabel = new KSqueezedTextLabel(this); - d->spotInfoLabel->setAlignment(Qt::AlignRight); + d->spotInfoLabel->tqsetAlignment(TQt::AlignRight); // ------------------------------------------------------------- - d->previewButtons = new QHButtonGroup(this); + d->previewButtons = new TQHButtonGroup(this); d->previewButtons->setExclusive(true); d->previewButtons->setInsideMargin(0); - d->previewButtons->setFrameShape(QFrame::NoFrame); + d->previewButtons->setFrameShape(TQFrame::NoFrame); - QPushButton *previewOriginalButton = new QPushButton( d->previewButtons ); + TQPushButton *previewOriginalButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewOriginalButton, ImageGuideWidget::PreviewOriginalImage); KGlobal::dirs()->addResourceType("original", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("original", "original.png"); - previewOriginalButton->setPixmap( QPixmap( directory + "original.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("original", "original.png"); + previewOriginalButton->setPixmap( TQPixmap( directory + "original.png" ) ); previewOriginalButton->setToggleButton(true); - QWhatsThis::add( previewOriginalButton, i18n( "<p>If you enable this option, you will see " + TQWhatsThis::add( previewOriginalButton, i18n( "<p>If you enable this option, you will see " "the original image." ) ); - QPushButton *previewBothButtonVert = new QPushButton( d->previewButtons ); + TQPushButton *previewBothButtonVert = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewBothButtonVert, ImageGuideWidget::PreviewBothImagesVertCont); KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png"); - previewBothButtonVert->setPixmap( QPixmap( directory + "bothvert.png" ) ); + previewBothButtonVert->setPixmap( TQPixmap( directory + "bothvert.png" ) ); previewBothButtonVert->setToggleButton(true); - QWhatsThis::add( previewBothButtonVert, i18n( "<p>If you enable this option, the preview area will " + TQWhatsThis::add( previewBothButtonVert, i18n( "<p>If you enable this option, the preview area will " "split vertically. " "A contiguous area of the image will be shown, " "with one half from the original image, " "the other half from the target image.") ); - QPushButton *previewBothButtonHorz = new QPushButton( d->previewButtons ); + TQPushButton *previewBothButtonHorz = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorzCont); KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png"); - previewBothButtonHorz->setPixmap( QPixmap( directory + "bothhorz.png" ) ); + previewBothButtonHorz->setPixmap( TQPixmap( directory + "bothhorz.png" ) ); previewBothButtonHorz->setToggleButton(true); - QWhatsThis::add( previewBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " + TQWhatsThis::add( previewBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " "split horizontally. " "A contiguous area of the image will be shown, " "with one half from the original image, " "the other half from the target image.") ); - QPushButton *previewDuplicateBothButtonVert = new QPushButton( d->previewButtons ); + TQPushButton *previewDuplicateBothButtonVert = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewDuplicateBothButtonVert, ImageGuideWidget::PreviewBothImagesVert); KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png"); - previewDuplicateBothButtonVert->setPixmap( QPixmap( directory + "duplicatebothvert.png" ) ); + previewDuplicateBothButtonVert->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) ); previewDuplicateBothButtonVert->setToggleButton(true); - QWhatsThis::add( previewDuplicateBothButtonVert, i18n( "<p>If you enable this option, the preview area will " + TQWhatsThis::add( previewDuplicateBothButtonVert, i18n( "<p>If you enable this option, the preview area will " "split vertically. " "The same part of the original and the target image " "will be shown side by side.") ); - QPushButton *previewDupplicateBothButtonHorz = new QPushButton( d->previewButtons ); + TQPushButton *previewDupplicateBothButtonHorz = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewDupplicateBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorz); KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png"); - previewDupplicateBothButtonHorz->setPixmap( QPixmap( directory + "duplicatebothhorz.png" ) ); + previewDupplicateBothButtonHorz->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) ); previewDupplicateBothButtonHorz->setToggleButton(true); - QWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " + TQWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "<p>If you enable this option, the preview area will " "split horizontally. " "The same part of the original and the target image " "will be shown side by side.") ); - QPushButton *previewtargetButton = new QPushButton( d->previewButtons ); + TQPushButton *previewtargetButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewtargetButton, ImageGuideWidget::PreviewTargetImage); KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("target", "target.png"); - previewtargetButton->setPixmap( QPixmap( directory + "target.png" ) ); + previewtargetButton->setPixmap( TQPixmap( directory + "target.png" ) ); previewtargetButton->setToggleButton(true); - QWhatsThis::add( previewtargetButton, i18n( "<p>If you enable this option, you will see " + TQWhatsThis::add( previewtargetButton, i18n( "<p>If you enable this option, you will see " "the target image." ) ); - QPushButton *previewToggleMouseOverButton = new QPushButton( d->previewButtons ); + TQPushButton *previewToggleMouseOverButton = new TQPushButton( d->previewButtons ); d->previewButtons->insert(previewToggleMouseOverButton, ImageGuideWidget::PreviewToggleOnMouseOver); KGlobal::dirs()->addResourceType("togglemouseover", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png"); - previewToggleMouseOverButton->setPixmap( QPixmap( directory + "togglemouseover.png" ) ); + previewToggleMouseOverButton->setPixmap( TQPixmap( directory + "togglemouseover.png" ) ); previewToggleMouseOverButton->setToggleButton(true); - QWhatsThis::add( previewToggleMouseOverButton, i18n( "<p>If you enable this option, you will see " + TQWhatsThis::add( previewToggleMouseOverButton, i18n( "<p>If you enable this option, you will see " "the original image when the mouse is over image area, " "else the target image." ) ); // ------------------------------------------------------------- - QHButtonGroup *exposureButtons = new QHButtonGroup(this); + TQHButtonGroup *exposureButtons = new TQHButtonGroup(this); exposureButtons->setInsideMargin(0); - exposureButtons->setFrameShape(QFrame::NoFrame); + exposureButtons->setFrameShape(TQFrame::NoFrame); - d->underExposureButton = new QPushButton(exposureButtons); + d->underExposureButton = new TQPushButton(exposureButtons); exposureButtons->insert(d->underExposureButton, UnderExposure); d->underExposureButton->setPixmap(SmallIcon("underexposure")); d->underExposureButton->setToggleButton(true); - QWhatsThis::add(d->underExposureButton, i18n("<p>Set this option to display black " + TQWhatsThis::add(d->underExposureButton, i18n("<p>Set this option to display black " "overlaid on the preview. This will help you to avoid " "under-exposing the image." ) ); - d->overExposureButton = new QPushButton(exposureButtons); + d->overExposureButton = new TQPushButton(exposureButtons); exposureButtons->insert(d->overExposureButton, OverExposure); d->overExposureButton->setPixmap(SmallIcon("overexposure")); d->overExposureButton->setToggleButton(true); - QWhatsThis::add(d->overExposureButton, i18n("<p>Set this option on display white " + TQWhatsThis::add(d->overExposureButton, i18n("<p>Set this option on display white " "overlaid on the preview. This will help you to avoid " "over-exposing the image." ) ); // ------------------------------------------------------------- - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* l = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* l = new TQVBoxLayout(frame, 5, 0); d->previewWidget = new ImageGuideWidget(480, 320, frame, guideVisible, - guideMode, Qt::red, 1, false, + guideMode, TQt::red, 1, false, useImageSelection); - QWhatsThis::add( d->previewWidget, previewWhatsThis); + TQWhatsThis::add( d->previewWidget, previewWhatsThis); l->addWidget(d->previewWidget, 0); // ------------------------------------------------------------- @@ -217,29 +217,29 @@ ImageWidget::ImageWidget(const QString& settingsSection, QWidget *parent, // ------------------------------------------------------------- - connect(d->previewWidget, SIGNAL(signalResized()), - this, SIGNAL(signalResized())); + connect(d->previewWidget, TQT_SIGNAL(signalResized()), + this, TQT_SIGNAL(signalResized())); - connect(d->previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & ))); + connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const QPoint & ))); + connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & ))); + connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const QPoint & )), - this, SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const QPoint & ))); + connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewButtons, SIGNAL(released(int)), - d->previewWidget, SLOT(slotChangeRenderingPreviewMode(int))); + connect(d->previewButtons, TQT_SIGNAL(released(int)), + d->previewWidget, TQT_SLOT(slotChangeRenderingPreviewMode(int))); - connect(d->underExposureButton, SIGNAL(toggled(bool)), - d->previewWidget, SLOT(slotToggleUnderExposure(bool))); + connect(d->underExposureButton, TQT_SIGNAL(toggled(bool)), + d->previewWidget, TQT_SLOT(slotToggleUnderExposure(bool))); - connect(d->overExposureButton, SIGNAL(toggled(bool)), - d->previewWidget, SLOT(slotToggleOverExposure(bool))); + connect(d->overExposureButton, TQT_SIGNAL(toggled(bool)), + d->previewWidget, TQT_SLOT(slotToggleOverExposure(bool))); // ------------------------------------------------------------- @@ -270,7 +270,7 @@ void ImageWidget::updatePreview() d->previewWidget->updatePreview(); } -void ImageWidget::slotChangeGuideColor(const QColor &color) +void ImageWidget::slotChangeGuideColor(const TQColor &color) { d->previewWidget->slotChangeGuideColor(color); } @@ -285,7 +285,7 @@ void ImageWidget::resetSpotPosition() d->previewWidget->resetSpotPosition(); } -QPoint ImageWidget::getSpotPosition() +TQPoint ImageWidget::getSpotPosition() { return ( d->previewWidget->getSpotPosition() ); } @@ -311,13 +311,13 @@ void ImageWidget::setRenderingPreviewMode(int mode) d->previewWidget->slotChangeRenderingPreviewMode(mode); } -void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const QPoint &point) +void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint &point) { DColor color = col; d->spotInfoLabel->setText(i18n("(%1,%2) RGBA:%3,%4,%5,%6") - .arg(point.x()).arg(point.y()) - .arg(color.red()).arg(color.green()) - .arg(color.blue()).arg(color.alpha()) ); + .tqarg(point.x()).tqarg(point.y()) + .tqarg(color.red()).tqarg(color.green()) + .tqarg(color.blue()).tqarg(color.alpha()) ); } void ImageWidget::readSettings() @@ -329,8 +329,8 @@ void ImageWidget::readSettings() d->overExposureButton->setOn(config->readBoolEntry("Over Exposure Indicator", false)); int mode = config->readNumEntry("Separate View", ImageGuideWidget::PreviewBothImagesVertCont); - mode = QMAX(ImageGuideWidget::PreviewOriginalImage, mode); - mode = QMIN(ImageGuideWidget::NoPreviewMode, mode); + mode = TQMAX(ImageGuideWidget::PreviewOriginalImage, mode); + mode = TQMIN(ImageGuideWidget::NoPreviewMode, mode); setRenderingPreviewMode(mode); } diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/digikam/libs/widgets/imageplugins/imagewidget.h index c7f0e5f..cd38768 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.h +++ b/digikam/libs/widgets/imageplugins/imagewidget.h @@ -25,12 +25,12 @@ #ifndef IMAGEWIDGET_H #define IMAGEWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qpoint.h> -#include <qcolor.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqcolor.h> +#include <tqstring.h> // Local includes. @@ -44,9 +44,10 @@ namespace Digikam class ImageIface; class ImageWidgetPriv; -class DIGIKAM_EXPORT ImageWidget : public QWidget +class DIGIKAM_EXPORT ImageWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -58,15 +59,15 @@ public: public: - ImageWidget(const QString& settingsSection, QWidget *parent=0, - const QString& previewWhatsThis=QString(), bool prevModeOptions=true, + ImageWidget(const TQString& settingsSection, TQWidget *tqparent=0, + const TQString& previewWhatsThis=TQString(), bool prevModeOptions=true, int guideMode=ImageGuideWidget::PickColorMode, bool guideVisible=true, bool useImageSelection=false); ~ImageWidget(); ImageIface* imageIface(); - QPoint getSpotPosition(); + TQPoint getSpotPosition(); DColor getSpotColor(int getColorFrom); void setSpotVisible(bool spotVisible, bool blink=false); int getRenderingPreviewMode(); @@ -78,18 +79,18 @@ public: public slots: - void slotChangeGuideColor(const QColor &color); + void slotChangeGuideColor(const TQColor &color); void slotChangeGuideSize(int size); signals: - void spotPositionChangedFromOriginal( const Digikam::DColor &color, const QPoint &position ); - void spotPositionChangedFromTarget( const Digikam::DColor &color, const QPoint &position ); + void spotPositionChangedFromOriginal( const Digikam::DColor &color, const TQPoint &position ); + void spotPositionChangedFromTarget( const Digikam::DColor &color, const TQPoint &position ); void signalResized(); private slots: - void slotUpdateSpotInfo(const Digikam::DColor &col, const QPoint &point); + void slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint &point); private: diff --git a/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp b/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp index 0638065..8ba63a6 100644 --- a/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp +++ b/digikam/libs/widgets/imageplugins/listboxpreviewitem.cpp @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2006-10-05 - * Description : a QListBoxItem which can display an image preview + * Description : a TQListBoxItem which can display an image preview * as a thumbnail and a customized qwhatsthis class * for listbox items * @@ -30,31 +30,31 @@ namespace Digikam { -int ListBoxPreviewItem::height(const QListBox *lb) const +int ListBoxPreviewItem::height(const TQListBox *lb) const { - int height = QListBoxPixmap::height(lb); - return QMAX(height, pixmap()->height() + 5); + int height = TQListBoxPixmap::height(lb); + return TQMAX(height, pixmap()->height() + 5); } -int ListBoxPreviewItem::width(const QListBox *lb) const +int ListBoxPreviewItem::width(const TQListBox *lb) const { - int width = QListBoxPixmap::width(lb); - return QMAX(width, pixmap()->width() + 5); + int width = TQListBoxPixmap::width(lb); + return TQMAX(width, pixmap()->width() + 5); } // ------------------------------------------------------------------- -QString ListBoxWhatsThis::text(const QPoint &p) +TQString ListBoxWhatsThis::text(const TQPoint &p) { - QListBoxItem* item = m_listBox->itemAt(p); + TQListBoxItem* item = m_listBox->itemAt(p); if (item != 0) return m_itemWhatsThisMap[item]; - return QString(); + return TQString(); } -void ListBoxWhatsThis::add(QListBoxItem* item, const QString& text) +void ListBoxWhatsThis::add(TQListBoxItem* item, const TQString& text) { m_itemWhatsThisMap[item] = text; } diff --git a/digikam/libs/widgets/imageplugins/listboxpreviewitem.h b/digikam/libs/widgets/imageplugins/listboxpreviewitem.h index df38e31..50b769c 100644 --- a/digikam/libs/widgets/imageplugins/listboxpreviewitem.h +++ b/digikam/libs/widgets/imageplugins/listboxpreviewitem.h @@ -4,7 +4,7 @@ * http://www.digikam.org * * Date : 2006-10-05 - * Description : a QListBoxItem which can display an image preview + * Description : a TQListBoxItem which can display an image preview * as a thumbnail and a customized qwhatsthis class * for listbox items * @@ -26,12 +26,12 @@ #ifndef LISTBOXPREVIEWITEM_H #define LISTBOXPREVIEWITEM_H -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qpixmap.h> +#include <tqmap.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqpixmap.h> // Local includes. @@ -40,39 +40,39 @@ namespace Digikam { -class DIGIKAM_EXPORT ListBoxPreviewItem : public QListBoxPixmap +class DIGIKAM_EXPORT ListBoxPreviewItem : public TQListBoxPixmap { public: - ListBoxPreviewItem(QListBox *listbox, const QPixmap &pix, const QString &text) - : QListBoxPixmap(listbox, pix, text) {}; + ListBoxPreviewItem(TQListBox *listbox, const TQPixmap &pix, const TQString &text) + : TQListBoxPixmap(listbox, pix, text) {}; - ListBoxPreviewItem(const QPixmap &pix, const QString &text) - : QListBoxPixmap(pix, text) {}; + ListBoxPreviewItem(const TQPixmap &pix, const TQString &text) + : TQListBoxPixmap(pix, text) {}; - virtual int height ( const QListBox * lb ) const; - virtual int width ( const QListBox * lb ) const; + virtual int height ( const TQListBox * lb ) const; + virtual int width ( const TQListBox * lb ) const; }; /** * A qwhatthis class which can be pointed to a specific item - * in a QListBox rather than the QListBox itself + * in a TQListBox rather than the TQListBox itself * */ -class DIGIKAM_EXPORT ListBoxWhatsThis : public QWhatsThis +class DIGIKAM_EXPORT ListBoxWhatsThis : public TQWhatsThis { public: - ListBoxWhatsThis(QListBox* w) : QWhatsThis(w), m_listBox(w) {} - virtual QString text (const QPoint &); - void add(QListBoxItem*, const QString& text); + ListBoxWhatsThis(TQListBox* w) : TQWhatsThis(w), m_listBox(w) {} + virtual TQString text (const TQPoint &); + void add(TQListBoxItem*, const TQString& text); protected: - QMap<QListBoxItem*, QString> m_itemWhatsThisMap; - QListBox *m_listBox; + TQMap<TQListBoxItem*, TQString> m_itemWhatsThisMap; + TQListBox *m_listBox; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/exifwidget.cpp b/digikam/libs/widgets/metadata/exifwidget.cpp index f0a269a..78aac53 100644 --- a/digikam/libs/widgets/metadata/exifwidget.cpp +++ b/digikam/libs/widgets/metadata/exifwidget.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qfile.h> +#include <tqmap.h> +#include <tqfile.h> // KDE includes. @@ -81,15 +81,15 @@ static const char* StandardExifEntryList[] = "-1" }; -ExifWidget::ExifWidget(QWidget* parent, const char* name) - : MetadataWidget(parent, name) +ExifWidget::ExifWidget(TQWidget* tqparent, const char* name) + : MetadataWidget(tqparent, name) { view()->setSortColumn(-1); - for (int i=0 ; QString(StandardExifEntryList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(StandardExifEntryList[i]) != TQString("-1") ; i++) m_keysFilter << StandardExifEntryList[i]; - for (int i=0 ; QString(ExifHumanList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ExifHumanList[i]) != TQString("-1") ; i++) m_tagsfilter << ExifHumanList[i]; } @@ -97,7 +97,7 @@ ExifWidget::~ExifWidget() { } -QString ExifWidget::getMetadataTitle() +TQString ExifWidget::getMetadataTitle() { return i18n("Standard EXIF Tags"); } @@ -114,7 +114,7 @@ bool ExifWidget::loadFromURL(const KURL& url) else { DMetadata metadata(url.path()); - QByteArray exifData = metadata.getExif(); + TQByteArray exifData = metadata.getExif(); if (exifData.isEmpty()) { @@ -147,16 +147,16 @@ void ExifWidget::buildView() } else { - setIfdList(getMetadataMap(), m_keysFilter, QStringList()); + setIfdList(getMetadataMap(), m_keysFilter, TQStringList()); } MetadataWidget::buildView(); } -QString ExifWidget::getTagTitle(const QString& key) +TQString ExifWidget::getTagTitle(const TQString& key) { DMetadata meta; - QString title = meta.getExifTagTitle(key.ascii()); + TQString title = meta.getExifTagTitle(key.ascii()); if (title.isEmpty()) return key.section('.', -1); @@ -164,10 +164,10 @@ QString ExifWidget::getTagTitle(const QString& key) return title; } -QString ExifWidget::getTagDescription(const QString& key) +TQString ExifWidget::getTagDescription(const TQString& key) { DMetadata meta; - QString desc = meta.getExifTagDescription(key.ascii()); + TQString desc = meta.getExifTagDescription(key.ascii()); if (desc.isEmpty()) return i18n("No description available"); @@ -178,7 +178,7 @@ QString ExifWidget::getTagDescription(const QString& key) void ExifWidget::slotSaveMetadataToFile() { KURL url = saveMetadataToFile(i18n("EXIF File to Save"), - QString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); + TQString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); storeMetadataToFile(url); } diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/digikam/libs/widgets/metadata/exifwidget.h index 54217da..e6fe806 100644 --- a/digikam/libs/widgets/metadata/exifwidget.h +++ b/digikam/libs/widgets/metadata/exifwidget.h @@ -24,9 +24,9 @@ #ifndef EXIFWIDGET_H #define EXIFWIDGET_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. @@ -39,18 +39,19 @@ namespace Digikam class DIGIKAM_EXPORT ExifWidget : public MetadataWidget { Q_OBJECT + TQ_OBJECT public: - ExifWidget(QWidget* parent, const char* name=0); + ExifWidget(TQWidget* tqparent, const char* name=0); ~ExifWidget(); bool loadFromURL(const KURL& url); - QString getTagDescription(const QString& key); - QString getTagTitle(const QString& key); + TQString getTagDescription(const TQString& key); + TQString getTagTitle(const TQString& key); - QString getMetadataTitle(); + TQString getMetadataTitle(); protected slots: @@ -63,8 +64,8 @@ private: private: - QStringList m_tagsfilter; - QStringList m_keysFilter; + TQStringList m_tagsfilter; + TQStringList m_keysFilter; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index 34ee2da..2ce83b4 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -26,15 +26,15 @@ Any good explainations about GPS (in French) can be found at this url : http://www.gpspassion.com/forumsen/topic.asp?TOPIC_ID=16593 */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qpushbutton.h> -#include <qmap.h> -#include <qhbox.h> -#include <qfile.h> -#include <qcombobox.h> -#include <qgroupbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqmap.h> +#include <tqhbox.h> +#include <tqfile.h> +#include <tqcombobox.h> +#include <tqgroupbox.h> // KDE includes. @@ -81,47 +81,47 @@ public: map = 0; } - QStringList tagsfilter; - QStringList keysFilter; + TQStringList tagsfilter; + TQStringList keysFilter; - QPushButton *detailsButton; + TQPushButton *detailsButton; - QComboBox *detailsCombo; + TQComboBox *detailsCombo; WorldMapWidget *map; }; -GPSWidget::GPSWidget(QWidget* parent, const char* name) - : MetadataWidget(parent, name) +GPSWidget::GPSWidget(TQWidget* tqparent, const char* name) + : MetadataWidget(tqparent, name) { d = new GPSWidgetPriv; - for (int i=0 ; QString(StandardExifGPSEntryList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(StandardExifGPSEntryList[i]) != TQString("-1") ; i++) d->keysFilter << StandardExifGPSEntryList[i]; - for (int i=0 ; QString(ExifGPSHumanList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ExifGPSHumanList[i]) != TQString("-1") ; i++) d->tagsfilter << ExifGPSHumanList[i]; // -------------------------------------------------------- - QWidget *gpsInfo = new QWidget(this); - QGridLayout *layout = new QGridLayout(gpsInfo, 3, 2); + TQWidget *gpsInfo = new TQWidget(this); + TQGridLayout *tqlayout = new TQGridLayout(gpsInfo, 3, 2); d->map = new WorldMapWidget(256, 256, gpsInfo); // -------------------------------------------------------- - QGroupBox* box2 = new QGroupBox( 0, Qt::Vertical, gpsInfo ); + TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, gpsInfo ); box2->setInsideMargin(0); box2->setInsideSpacing(0); - box2->setFrameStyle( QFrame::NoFrame ); - QGridLayout* box2Layout = new QGridLayout( box2->layout(), 0, 2, KDialog::spacingHint() ); - - d->detailsCombo = new QComboBox( false, box2 ); - d->detailsButton = new QPushButton(i18n("More Info..."), box2); - d->detailsCombo->insertItem(QString("MapQuest"), MapQuest); - d->detailsCombo->insertItem(QString("Google Maps"), GoogleMaps); - d->detailsCombo->insertItem(QString("MSN Maps"), MsnMaps); - d->detailsCombo->insertItem(QString("MultiMap"), MultiMap); + box2->setFrameStyle( TQFrame::NoFrame ); + TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 0, 2, KDialog::spacingHint() ); + + d->detailsCombo = new TQComboBox( false, box2 ); + d->detailsButton = new TQPushButton(i18n("More Info..."), box2); + d->detailsCombo->insertItem(TQString("MapQuest"), MapQuest); + d->detailsCombo->insertItem(TQString("Google Maps"), GoogleMaps); + d->detailsCombo->insertItem(TQString("MSN Maps"), MsnMaps); + d->detailsCombo->insertItem(TQString("MultiMap"), MultiMap); box2Layout->addMultiCellWidget( d->detailsCombo, 0, 0, 0, 0 ); box2Layout->addMultiCellWidget( d->detailsButton, 0, 0, 1, 1 ); @@ -129,17 +129,17 @@ GPSWidget::GPSWidget(QWidget* parent, const char* name) // -------------------------------------------------------- - layout->addMultiCellWidget(d->map, 0, 0, 0, 2); - layout->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 1, 1, 0, 2); - layout->addMultiCellWidget(box2, 2, 2, 0, 0); - layout->setColStretch(2, 10); - layout->setRowStretch(3, 10); + tqlayout->addMultiCellWidget(d->map, 0, 0, 0, 2); + tqlayout->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); // -------------------------------------------------------- - connect(d->detailsButton, SIGNAL(clicked()), - this, SLOT(slotGPSDetails())); + connect(d->detailsButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotGPSDetails())); setUserAreaWidget(gpsInfo); decodeMetadata(); @@ -162,7 +162,7 @@ void GPSWidget::setWebGPSLocator(int locator) void GPSWidget::slotGPSDetails() { - QString val, url; + TQString val, url; switch( getWebGPSLocator() ) { @@ -215,7 +215,7 @@ void GPSWidget::slotGPSDetails() KApplication::kApplication()->invokeBrowser(url); } -QString GPSWidget::getMetadataTitle() +TQString GPSWidget::getMetadataTitle() { return i18n("Global Positioning System Information"); } @@ -232,7 +232,7 @@ bool GPSWidget::loadFromURL(const KURL& url) else { DMetadata metadata(url.path()); - QByteArray exifData = metadata.getExif(); + TQByteArray exifData = metadata.getExif(); if (exifData.isEmpty()) { @@ -287,16 +287,16 @@ void GPSWidget::buildView() } else { - setIfdList(getMetadataMap(), d->keysFilter, QStringList()); + setIfdList(getMetadataMap(), d->keysFilter, TQStringList()); } MetadataWidget::buildView(); } -QString GPSWidget::getTagTitle(const QString& key) +TQString GPSWidget::getTagTitle(const TQString& key) { DMetadata meta; - QString title = meta.getExifTagTitle(key.ascii()); + TQString title = meta.getExifTagTitle(key.ascii()); if (title.isEmpty()) return key.section('.', -1); @@ -304,10 +304,10 @@ QString GPSWidget::getTagTitle(const QString& key) return title; } -QString GPSWidget::getTagDescription(const QString& key) +TQString GPSWidget::getTagDescription(const TQString& key) { DMetadata meta; - QString desc = meta.getExifTagDescription(key.ascii()); + TQString desc = meta.getExifTagDescription(key.ascii()); if (desc.isEmpty()) return i18n("No description available"); @@ -333,7 +333,7 @@ bool GPSWidget::decodeGPSPosition() void GPSWidget::slotSaveMetadataToFile() { KURL url = saveMetadataToFile(i18n("EXIF File to Save"), - QString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); + TQString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); storeMetadataToFile(url); } diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/digikam/libs/widgets/metadata/gpswidget.h index 3718138..3ba524c 100644 --- a/digikam/libs/widgets/metadata/gpswidget.h +++ b/digikam/libs/widgets/metadata/gpswidget.h @@ -24,10 +24,10 @@ #ifndef GPSWIDGET_H #define GPSWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // Local includes. @@ -43,6 +43,7 @@ class WorldMapWidget; class DIGIKAM_EXPORT GPSWidget : public MetadataWidget { Q_OBJECT + TQ_OBJECT public: @@ -56,15 +57,15 @@ public: public: - GPSWidget(QWidget* parent, const char* name=0); + GPSWidget(TQWidget* tqparent, const char* name=0); ~GPSWidget(); bool loadFromURL(const KURL& url); - QString getTagDescription(const QString& key); - QString getTagTitle(const QString& key); + TQString getTagDescription(const TQString& key); + TQString getTagTitle(const TQString& key); - QString getMetadataTitle(); + TQString getMetadataTitle(); int getWebGPSLocator(); void setWebGPSLocator(int locator); diff --git a/digikam/libs/widgets/metadata/iptcwidget.cpp b/digikam/libs/widgets/metadata/iptcwidget.cpp index f841422..f2ccdcf 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.cpp +++ b/digikam/libs/widgets/metadata/iptcwidget.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qfile.h> +#include <tqmap.h> +#include <tqfile.h> // KDE includes. @@ -64,13 +64,13 @@ static const char* StandardIptcEntryList[] = "-1" }; -IptcWidget::IptcWidget(QWidget* parent, const char* name) - : MetadataWidget(parent, name) +IptcWidget::IptcWidget(TQWidget* tqparent, const char* name) + : MetadataWidget(tqparent, name) { - for (int i=0 ; QString(StandardIptcEntryList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(StandardIptcEntryList[i]) != TQString("-1") ; i++) m_keysFilter << StandardIptcEntryList[i]; - for (int i=0 ; QString(IptcHumanList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(IptcHumanList[i]) != TQString("-1") ; i++) m_tagsfilter << IptcHumanList[i]; } @@ -78,7 +78,7 @@ IptcWidget::~IptcWidget() { } -QString IptcWidget::getMetadataTitle() +TQString IptcWidget::getMetadataTitle() { return i18n("IPTC Records"); } @@ -95,7 +95,7 @@ bool IptcWidget::loadFromURL(const KURL& url) else { DMetadata metadata(url.path()); - QByteArray iptcData = metadata.getIptc(); + TQByteArray iptcData = metadata.getIptc(); if (iptcData.isEmpty()) { @@ -134,10 +134,10 @@ void IptcWidget::buildView() MetadataWidget::buildView(); } -QString IptcWidget::getTagTitle(const QString& key) +TQString IptcWidget::getTagTitle(const TQString& key) { DMetadata meta; - QString title = meta.getIptcTagTitle(key.ascii()); + TQString title = meta.getIptcTagTitle(key.ascii()); if (title.isEmpty()) return key.section('.', -1); @@ -145,10 +145,10 @@ QString IptcWidget::getTagTitle(const QString& key) return title; } -QString IptcWidget::getTagDescription(const QString& key) +TQString IptcWidget::getTagDescription(const TQString& key) { DMetadata meta; - QString desc = meta.getIptcTagDescription(key.ascii()); + TQString desc = meta.getIptcTagDescription(key.ascii()); if (desc.isEmpty()) return i18n("No description available"); @@ -159,7 +159,7 @@ QString IptcWidget::getTagDescription(const QString& key) void IptcWidget::slotSaveMetadataToFile() { KURL url = saveMetadataToFile(i18n("IPTC File to Save"), - QString("*.iptc|"+i18n("IPTC binary Files (*.iptc)"))); + TQString("*.iptc|"+i18n("IPTC binary Files (*.iptc)"))); storeMetadataToFile(url); } diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/digikam/libs/widgets/metadata/iptcwidget.h index f1d57a8..e2076a4 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.h +++ b/digikam/libs/widgets/metadata/iptcwidget.h @@ -35,18 +35,19 @@ namespace Digikam class DIGIKAM_EXPORT IptcWidget : public MetadataWidget { Q_OBJECT + TQ_OBJECT public: - IptcWidget(QWidget* parent, const char* name=0); + IptcWidget(TQWidget* tqparent, const char* name=0); ~IptcWidget(); bool loadFromURL(const KURL& url); - QString getTagDescription(const QString& key); - QString getTagTitle(const QString& key); + TQString getTagDescription(const TQString& key); + TQString getTagTitle(const TQString& key); - QString getMetadataTitle(); + TQString getMetadataTitle(); protected slots: @@ -59,8 +60,8 @@ private: private: - QStringList m_tagsfilter; - QStringList m_keysFilter; + TQStringList m_tagsfilter; + TQStringList m_keysFilter; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/makernotewidget.cpp b/digikam/libs/widgets/metadata/makernotewidget.cpp index 75072b5..c9b5707 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.cpp +++ b/digikam/libs/widgets/metadata/makernotewidget.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qmap.h> -#include <qfile.h> +#include <tqmap.h> +#include <tqfile.h> // KDE includes. @@ -108,13 +108,13 @@ static const char* ExifEntryListToIgnore[] = "-1" }; -MakerNoteWidget::MakerNoteWidget(QWidget* parent, const char* name) - : MetadataWidget(parent, name) +MakerNoteWidget::MakerNoteWidget(TQWidget* tqparent, const char* name) + : MetadataWidget(tqparent, name) { - for (int i=0 ; QString(ExifEntryListToIgnore[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ExifEntryListToIgnore[i]) != TQString("-1") ; i++) m_keysFilter << ExifEntryListToIgnore[i]; - for (int i=0 ; QString(MakerNoteHumanList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(MakerNoteHumanList[i]) != TQString("-1") ; i++) m_tagsfilter << MakerNoteHumanList[i]; } @@ -122,7 +122,7 @@ MakerNoteWidget::~MakerNoteWidget() { } -QString MakerNoteWidget::getMetadataTitle() +TQString MakerNoteWidget::getMetadataTitle() { return i18n("MakerNote EXIF Tags"); } @@ -139,7 +139,7 @@ bool MakerNoteWidget::loadFromURL(const KURL& url) else { DMetadata metadata(url.path()); - QByteArray exifData = metadata.getExif(); + TQByteArray exifData = metadata.getExif(); if (exifData.isEmpty()) { @@ -178,10 +178,10 @@ void MakerNoteWidget::buildView() MetadataWidget::buildView(); } -QString MakerNoteWidget::getTagTitle(const QString& key) +TQString MakerNoteWidget::getTagTitle(const TQString& key) { DMetadata meta; - QString title = meta.getExifTagTitle(key.ascii()); + TQString title = meta.getExifTagTitle(key.ascii()); if (title.isEmpty()) return key.section('.', -1); @@ -189,10 +189,10 @@ QString MakerNoteWidget::getTagTitle(const QString& key) return title; } -QString MakerNoteWidget::getTagDescription(const QString& key) +TQString MakerNoteWidget::getTagDescription(const TQString& key) { DMetadata meta; - QString desc = meta.getExifTagDescription(key.ascii()); + TQString desc = meta.getExifTagDescription(key.ascii()); if (desc.isEmpty()) return i18n("No description available"); @@ -203,7 +203,7 @@ QString MakerNoteWidget::getTagDescription(const QString& key) void MakerNoteWidget::slotSaveMetadataToFile() { KURL url = saveMetadataToFile(i18n("EXIF File to Save"), - QString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); + TQString("*.exif|"+i18n("EXIF binary Files (*.exif)"))); storeMetadataToFile(url); } diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/digikam/libs/widgets/metadata/makernotewidget.h index be5bd7e..de53d41 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.h +++ b/digikam/libs/widgets/metadata/makernotewidget.h @@ -36,18 +36,19 @@ namespace Digikam class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget { Q_OBJECT + TQ_OBJECT public: - MakerNoteWidget(QWidget* parent, const char* name=0); + MakerNoteWidget(TQWidget* tqparent, const char* name=0); ~MakerNoteWidget(); bool loadFromURL(const KURL& url); - QString getTagDescription(const QString& key); - QString getTagTitle(const QString& key); + TQString getTagDescription(const TQString& key); + TQString getTagTitle(const TQString& key); - QString getMetadataTitle(); + TQString getMetadataTitle(); protected slots: @@ -60,8 +61,8 @@ private: private: - QStringList m_tagsfilter; - QStringList m_keysFilter; + TQStringList m_tagsfilter; + TQStringList m_keysFilter; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp index 36bf65d..36e4970 100644 --- a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp +++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpalette.h> -#include <qfont.h> -#include <qpainter.h> +#include <tqpalette.h> +#include <tqfont.h> +#include <tqpainter.h> // KDE includes. @@ -41,8 +41,8 @@ namespace Digikam { -MdKeyListViewItem::MdKeyListViewItem(QListView *parent, const QString& key) - : QListViewItem(parent) +MdKeyListViewItem::MdKeyListViewItem(TQListView *tqparent, const TQString& key) + : TQListViewItem(tqparent) { m_decryptedKey = key; @@ -66,28 +66,28 @@ MdKeyListViewItem::~MdKeyListViewItem() { } -QString MdKeyListViewItem::getMdKey() +TQString MdKeyListViewItem::getMdKey() { return m_decryptedKey; } -void MdKeyListViewItem::paintCell(QPainter* p, const QColorGroup&, +void MdKeyListViewItem::paintCell(TQPainter* p, const TQColorGroup&, int column, int, int) { p->save(); - QFont fn(p->font()); + TQFont fn(p->font()); fn.setBold(true); fn.setItalic(false); p->setFont(fn); p->setPen(ThemeEngine::instance()->textSelColor()); int width = listView()->contentsWidth(); - QRect rect(0, 0, width, fn.weight()); + TQRect rect(0, 0, width, fn.weight()); if (column == 1) rect.moveLeft(-width/2); p->fillRect(rect, ThemeEngine::instance()->thumbSelColor()); - p->drawText(rect, Qt::AlignHCenter, m_decryptedKey); + p->drawText(rect, TQt::AlignHCenter, m_decryptedKey); p->restore(); } diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.h b/digikam/libs/widgets/metadata/mdkeylistviewitem.h index f034bbb..78bf8dc 100644 --- a/digikam/libs/widgets/metadata/mdkeylistviewitem.h +++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.h @@ -25,37 +25,37 @@ #ifndef MDKEYLISTVIEWITEM_H #define MDKEYLISTVIEWITEM_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqlistview.h> // Local includes. #include "digikam_export.h" -class QPainter; +class TQPainter; namespace Digikam { -class DIGIKAM_EXPORT MdKeyListViewItem : public QListViewItem +class DIGIKAM_EXPORT MdKeyListViewItem : public TQListViewItem { public: - MdKeyListViewItem(QListView *parent, const QString& key); + MdKeyListViewItem(TQListView *tqparent, const TQString& key); ~MdKeyListViewItem(); - QString getMdKey(); + TQString getMdKey(); protected: - void paintCell(QPainter*, const QColorGroup &, int, int, int); + void paintCell(TQPainter*, const TQColorGroup &, int, int, int); private: - QString m_decryptedKey; + TQString m_decryptedKey; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index b829823..b762a2b 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qptrlist.h> -#include <qpalette.h> -#include <qheader.h> -#include <qwhatsthis.h> +#include <tqtimer.h> +#include <tqptrlist.h> +#include <tqpalette.h> +#include <tqheader.h> +#include <tqwhatsthis.h> // KDE includes. @@ -44,30 +44,30 @@ namespace Digikam { -MetadataListView::MetadataListView(QWidget* parent) - : QListView(parent) +MetadataListView::MetadataListView(TQWidget* tqparent) + : TQListView(tqparent) { header()->hide(); addColumn("Name"); // No need i18n here. addColumn("Value"); // No need i18n here. setItemMargin(0); setAllColumnsShowFocus(true); - setResizeMode(QListView::AllColumns); - // Vertical scroll bar is always disable to give more + setResizeMode(TQListView::AllColumns); + //Qt::Vertical scroll bar is always disable to give more // free space to metadata content - setVScrollBarMode(QScrollView::AlwaysOff); + setVScrollBarMode(TQScrollView::AlwaysOff); - m_parent = dynamic_cast<MetadataWidget *>(parent); + m_parent = dynamic_cast<MetadataWidget *>(tqparent); - connect(this, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectionChanged(QListViewItem*))); + connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } MetadataListView::~MetadataListView() { } -QString MetadataListView::getCurrentItemKey() +TQString MetadataListView::getCurrentItemKey() { if (currentItem()) { @@ -78,15 +78,15 @@ QString MetadataListView::getCurrentItemKey() } } - return QString(); + return TQString(); } -void MetadataListView::setCurrentItemByKey(QString itemKey) +void MetadataListView::setCurrentItemByKey(TQString itemKey) { if (itemKey.isNull()) return; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while ( it.current() ) { if ( it.current()->isSelectable() ) @@ -106,52 +106,52 @@ void MetadataListView::setCurrentItemByKey(QString itemKey) } } -void MetadataListView::slotSelectionChanged(QListViewItem *item) +void MetadataListView::slotSelectionChanged(TQListViewItem *item) { if (!item) return; MetadataListViewItem* viewItem = static_cast<MetadataListViewItem *>(item); m_selectedItemKey = viewItem->getKey(); - QString tagValue = viewItem->getValue().simplifyWhiteSpace(); - QString tagTitle = m_parent->getTagTitle(m_selectedItemKey); - QString tagDesc = m_parent->getTagDescription(m_selectedItemKey); + TQString tagValue = viewItem->getValue().simplifyWhiteSpace(); + TQString tagTitle = m_parent->getTagTitle(m_selectedItemKey); + TQString tagDesc = m_parent->getTagDescription(m_selectedItemKey); if (tagValue.length() > 128) { tagValue.truncate(128); tagValue.append("..."); } - QWhatsThis::add(this, i18n("<b>Title: </b><p>%1<p>" + TQWhatsThis::add(this, i18n("<b>Title: </b><p>%1<p>" "<b>Value: </b><p>%2<p>" "<b>Description: </b><p>%3") - .arg(tagTitle) - .arg(tagValue) - .arg(tagDesc)); + .tqarg(tagTitle) + .tqarg(tagValue) + .tqarg(tagDesc)); } -void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStringList& tagsfilter) +void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& tagsfilter) { clear(); uint subItems = 0; - QString ifDItemName; - MdKeyListViewItem *parentifDItem = 0; + TQString ifDItemName; + MdKeyListViewItem *tqparentifDItem = 0; for (DMetadata::MetaDataMap::const_iterator it = ifds.begin(); it != ifds.end(); ++it) { // We checking if we have changed of ifDName - QString currentIfDName = it.key().section('.', 1, 1); + TQString currentIfDName = it.key().section('.', 1, 1); if ( currentIfDName != ifDItemName ) { ifDItemName = currentIfDName; // Check if the current IfD have any items. If no remove it before to toggle to the next IfD. - if ( subItems == 0 && parentifDItem) - delete parentifDItem; + if ( subItems == 0 && tqparentifDItem) + delete tqparentifDItem; - parentifDItem = new MdKeyListViewItem(this, currentIfDName); + tqparentifDItem = new MdKeyListViewItem(this, currentIfDName); subItems = 0; } @@ -162,10 +162,10 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStr { // We using the filter to make a more user friendly output (Simple Mode) - if (tagsfilter.contains(it.key().section('.', 2, 2))) + if (tagsfilter.tqcontains(it.key().section('.', 2, 2))) { - QString tagTitle = m_parent->getTagTitle(it.key()); - new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); + TQString tagTitle = m_parent->getTagTitle(it.key()); + new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data()); subItems++; } } @@ -173,35 +173,35 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStr { // We don't filter the output (Complete Mode) - QString tagTitle = m_parent->getTagTitle(it.key()); - new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); + TQString tagTitle = m_parent->getTagTitle(it.key()); + new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data()); subItems++; } } } // To check if the last IfD have any items... - if ( subItems == 0 && parentifDItem) - delete parentifDItem; + if ( subItems == 0 && tqparentifDItem) + delete tqparentifDItem; setCurrentItemByKey(m_selectedItemKey); - QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); } -void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStringList& keysFilter, - const QStringList& tagsFilter) +void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& keysFilter, + const TQStringList& tagsFilter) { clear(); uint subItems = 0; - MdKeyListViewItem *parentifDItem = 0; + MdKeyListViewItem *tqparentifDItem = 0; - for (QStringList::const_iterator itKeysFilter = keysFilter.begin(); + for (TQStringList::const_iterator itKeysFilter = keysFilter.begin(); itKeysFilter != keysFilter.end(); ++itKeysFilter) { subItems = 0; - parentifDItem = new MdKeyListViewItem(this, *itKeysFilter); + tqparentifDItem = new MdKeyListViewItem(this, *itKeysFilter); DMetadata::MetaDataMap::const_iterator it = ifds.end(); @@ -216,10 +216,10 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStr { // We using the filter to make a more user friendly output (Simple Mode) - if (tagsFilter.contains(it.key().section('.', 2, 2))) + if (tagsFilter.tqcontains(it.key().section('.', 2, 2))) { - QString tagTitle = m_parent->getTagTitle(it.key()); - new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); + TQString tagTitle = m_parent->getTagTitle(it.key()); + new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data()); subItems++; } } @@ -227,8 +227,8 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStr { // We don't filter the output (Complete Mode) - QString tagTitle = m_parent->getTagTitle(it.key()); - new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); + TQString tagTitle = m_parent->getTagTitle(it.key()); + new MetadataListViewItem(tqparentifDItem, it.key(), tagTitle, it.data()); subItems++; } } @@ -239,33 +239,33 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const QStr } // We checking if the last IfD have any items. If no, we remove it. - if ( subItems == 0 && parentifDItem) - delete parentifDItem; + if ( subItems == 0 && tqparentifDItem) + delete tqparentifDItem; } setCurrentItemByKey(m_selectedItemKey); - QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); } -void MetadataListView::viewportResizeEvent(QResizeEvent* e) +void MetadataListView::viewportResizeEvent(TQResizeEvent* e) { - QListView::viewportResizeEvent(e); - QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) ); + TQListView::viewportResizeEvent(e); + TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); } -void MetadataListView::slotSearchTextChanged(const QString& filter) +void MetadataListView::slotSearchTextChanged(const TQString& filter) { bool query = false; - QString search = filter.lower(); + TQString search = filter.lower(); - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for ( ; it.current(); ++it ) { MetadataListViewItem *item = dynamic_cast<MetadataListViewItem*>(it.current()); if (item) { - if (item->text(0).lower().contains(search) || - item->text(1).lower().contains(search)) + if (item->text(0).lower().tqcontains(search) || + item->text(1).lower().tqcontains(search)) { query = true; item->setVisible(true); diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/digikam/libs/widgets/metadata/metadatalistview.h index 2fa415d..f03140c 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.h +++ b/digikam/libs/widgets/metadata/metadatalistview.h @@ -25,12 +25,12 @@ #ifndef METADATALISTVIEW_H #define METADATALISTVIEW_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqlistview.h> // Local includes. @@ -40,21 +40,22 @@ namespace Digikam { -class DIGIKAM_EXPORT MetadataListView : public QListView +class DIGIKAM_EXPORT MetadataListView : public TQListView { Q_OBJECT + TQ_OBJECT public: - MetadataListView(QWidget* parent); + MetadataListView(TQWidget* tqparent); ~MetadataListView(); - QString getCurrentItemKey(); - void setCurrentItemByKey(QString itemKey); + TQString getCurrentItemKey(); + void setCurrentItemByKey(TQString itemKey); - void setIfdList(const DMetadata::MetaDataMap& ifds, const QStringList& tagsfilter); - void setIfdList(const DMetadata::MetaDataMap& ifds, const QStringList& keysFilter, - const QStringList& tagsFilter); + void setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& tagsfilter); + void setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& keysFilter, + const TQStringList& tagsFilter); signals: @@ -62,19 +63,19 @@ signals: public slots: - void slotSearchTextChanged(const QString&); + void slotSearchTextChanged(const TQString&); protected: - void viewportResizeEvent(QResizeEvent*); + void viewportResizeEvent(TQResizeEvent*); private slots: - void slotSelectionChanged(QListViewItem *item); + void slotSelectionChanged(TQListViewItem *item); private: - QString m_selectedItemKey; + TQString m_selectedItemKey; MetadataWidget *m_parent; }; diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp b/digikam/libs/widgets/metadata/metadatalistviewitem.cpp index dafdf95..f3e4569 100644 --- a/digikam/libs/widgets/metadata/metadatalistviewitem.cpp +++ b/digikam/libs/widgets/metadata/metadatalistviewitem.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpalette.h> -#include <qfont.h> -#include <qpainter.h> +#include <tqpalette.h> +#include <tqfont.h> +#include <tqpainter.h> // Local includes. @@ -35,16 +35,16 @@ namespace Digikam { -MetadataListViewItem::MetadataListViewItem(QListViewItem *parent, const QString& key, - const QString& title, const QString& value) - : QListViewItem(parent) +MetadataListViewItem::MetadataListViewItem(TQListViewItem *tqparent, const TQString& key, + const TQString& title, const TQString& value) + : TQListViewItem(tqparent) { m_key = key; setSelectable(true); setText(0, title); - QString tagVal = value.simplifyWhiteSpace(); + TQString tagVal = value.simplifyWhiteSpace(); if (tagVal.length() > 128) { tagVal.truncate(128); @@ -57,17 +57,17 @@ MetadataListViewItem::~MetadataListViewItem() { } -QString MetadataListViewItem::getKey() +TQString MetadataListViewItem::getKey() { return m_key; } -QString MetadataListViewItem::getTitle() +TQString MetadataListViewItem::getTitle() { return text(0); } -QString MetadataListViewItem::getValue() +TQString MetadataListViewItem::getValue() { return text(1); } diff --git a/digikam/libs/widgets/metadata/metadatalistviewitem.h b/digikam/libs/widgets/metadata/metadatalistviewitem.h index 9159986..9560553 100644 --- a/digikam/libs/widgets/metadata/metadatalistviewitem.h +++ b/digikam/libs/widgets/metadata/metadatalistviewitem.h @@ -25,10 +25,10 @@ #ifndef METADATALISTVIEWITEM_H #define METADATALISTVIEWITEM_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqlistview.h> // Local includes. @@ -37,21 +37,21 @@ namespace Digikam { -class DIGIKAM_EXPORT MetadataListViewItem : public QListViewItem +class DIGIKAM_EXPORT MetadataListViewItem : public TQListViewItem { public: - MetadataListViewItem(QListViewItem *parent, const QString& key, - const QString& title, const QString& value); + MetadataListViewItem(TQListViewItem *tqparent, const TQString& key, + const TQString& title, const TQString& value); ~MetadataListViewItem(); - QString getKey(); - QString getTitle(); - QString getValue(); + TQString getKey(); + TQString getTitle(); + TQString getValue(); private: - QString m_key; + TQString m_key; }; } // namespace Digikam diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 168036a..6ee370d 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -21,25 +21,25 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qmap.h> -#include <qfile.h> -#include <qmime.h> -#include <qheader.h> -#include <qwhatsthis.h> -#include <qpainter.h> -#include <qhbuttongroup.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qdragobject.h> -#include <qclipboard.h> -#include <qsimplerichtext.h> -#include <qpaintdevicemetrics.h> -#include <qstylesheet.h> -#include <qlistview.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqmap.h> +#include <tqfile.h> +#include <tqmime.h> +#include <tqheader.h> +#include <tqwhatsthis.h> +#include <tqpainter.h> +#include <tqhbuttongroup.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqdragobject.h> +#include <tqclipboard.h> +#include <tqsimplerichtext.h> +#include <tqpaintdevicemetrics.h> +#include <tqstylesheet.h> +#include <tqlistview.h> +#include <tqtooltip.h> // KDE includes. @@ -78,14 +78,14 @@ public: searchBar = 0; } - QGridLayout *mainLayout; + TQGridLayout *mainLayout; - QHButtonGroup *toolButtons; - QHButtonGroup *levelButtons; + TQHButtonGroup *toolButtons; + TQHButtonGroup *levelButtons; - QByteArray metadata; + TQByteArray metadata; - QString fileName; + TQString fileName; MetadataListView *view; @@ -94,57 +94,57 @@ public: DMetadata::MetaDataMap metaDataMap; }; -MetadataWidget::MetadataWidget(QWidget* parent, const char* name) - : QWidget(parent, name) +MetadataWidget::MetadataWidget(TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name) { d = new MetadataWidgetPriv; - d->mainLayout = new QGridLayout(this, 3, 4, KDialog::spacingHint(), KDialog::spacingHint()); + d->mainLayout = new TQGridLayout(this, 3, 4, KDialog::spacingHint(), KDialog::spacingHint()); KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); - d->levelButtons = new QHButtonGroup(this); + d->levelButtons = new TQHButtonGroup(this); d->levelButtons->setInsideMargin( 0 ); d->levelButtons->setExclusive(true); - d->levelButtons->setFrameShape(QFrame::NoFrame); + d->levelButtons->setFrameShape(TQFrame::NoFrame); - QPushButton *simpleLevel = new QPushButton( d->levelButtons ); + TQPushButton *simpleLevel = new TQPushButton( d->levelButtons ); simpleLevel->setPixmap( iconLoader->loadIcon( "ascii", (KIcon::Group)KIcon::Toolbar ) ); simpleLevel->setToggleButton(true); - QWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) ); - QToolTip::add( simpleLevel, i18n( "Simple list" )); + TQWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) ); + TQToolTip::add( simpleLevel, i18n( "Simple list" )); d->levelButtons->insert(simpleLevel, SIMPLE); - QPushButton *fullLevel = new QPushButton( d->levelButtons ); + TQPushButton *fullLevel = new TQPushButton( d->levelButtons ); fullLevel->setPixmap( iconLoader->loadIcon( "document", (KIcon::Group)KIcon::Toolbar ) ); fullLevel->setToggleButton(true); - QWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) ); - QToolTip::add( fullLevel, i18n( "Full list" )); + TQWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) ); + TQToolTip::add( fullLevel, i18n( "Full list" )); d->levelButtons->insert(fullLevel, FULL); - d->toolButtons = new QHButtonGroup(this); + d->toolButtons = new TQHButtonGroup(this); d->toolButtons->setInsideMargin( 0 ); - d->toolButtons->setFrameShape(QFrame::NoFrame); + d->toolButtons->setFrameShape(TQFrame::NoFrame); - QPushButton *saveMetadata = new QPushButton( d->toolButtons ); + TQPushButton *saveMetadata = new TQPushButton( d->toolButtons ); saveMetadata->setPixmap( iconLoader->loadIcon( "filesave", (KIcon::Group)KIcon::Toolbar ) ); - QWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) ); - QToolTip::add( saveMetadata, i18n( "Save metadata" )); + TQWhatsThis::add( saveMetadata, i18n( "Save metadata to a binary file" ) ); + TQToolTip::add( saveMetadata, i18n( "Save metadata" )); d->toolButtons->insert(saveMetadata); - QPushButton *printMetadata = new QPushButton( d->toolButtons ); + TQPushButton *printMetadata = new TQPushButton( d->toolButtons ); printMetadata->setPixmap( iconLoader->loadIcon( "fileprint", (KIcon::Group)KIcon::Toolbar ) ); - QWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) ); - QToolTip::add( printMetadata, i18n( "Print metadata" )); + TQWhatsThis::add( printMetadata, i18n( "Print metadata to printer" ) ); + TQToolTip::add( printMetadata, i18n( "Print metadata" )); d->toolButtons->insert(printMetadata); - QPushButton *copy2ClipBoard = new QPushButton( d->toolButtons ); + TQPushButton *copy2ClipBoard = new TQPushButton( d->toolButtons ); copy2ClipBoard->setPixmap( iconLoader->loadIcon( "editcopy", (KIcon::Group)KIcon::Toolbar ) ); - QWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) ); - QToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" )); + TQWhatsThis::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" ) ); + TQToolTip::add( copy2ClipBoard, i18n( "Copy metadata to clipboard" )); d->toolButtons->insert(copy2ClipBoard); d->view = new MetadataListView(this); - QString barName = QString(name) + "SearchBar"; + TQString barName = TQString(name) + "SearchBar"; d->searchBar = new SearchTextBar(this, barName.ascii()); // ----------------------------------------------------------------- @@ -158,23 +158,23 @@ MetadataWidget::MetadataWidget(QWidget* parent, const char* name) // ----------------------------------------------------------------- - connect(d->levelButtons, SIGNAL(released(int)), - this, SLOT(slotModeChanged(int))); + connect(d->levelButtons, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotModeChanged(int))); - connect(copy2ClipBoard, SIGNAL(clicked()), - this, SLOT(slotCopy2Clipboard())); + connect(copy2ClipBoard, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCopy2Clipboard())); - connect(printMetadata, SIGNAL(clicked()), - this, SLOT(slotPrintMetadata())); + connect(printMetadata, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotPrintMetadata())); - connect(saveMetadata, SIGNAL(clicked()), - this, SLOT(slotSaveMetadataToFile())); + connect(saveMetadata, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSaveMetadataToFile())); - connect(d->searchBar, SIGNAL(signalTextChanged(const QString&)), - d->view, SLOT(slotSearchTextChanged(const QString&))); + connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + d->view, TQT_SLOT(slotSearchTextChanged(const TQString&))); - connect(d->view, SIGNAL(signalTextFilterMatch(bool)), - d->searchBar, SLOT(slotSearchResult(bool))); + connect(d->view, TQT_SIGNAL(signalTextFilterMatch(bool)), + d->searchBar, TQT_SLOT(slotSearchResult(bool))); } MetadataWidget::~MetadataWidget() @@ -192,7 +192,7 @@ void MetadataWidget::enabledToolButtons(bool b) d->toolButtons->setEnabled(b); } -bool MetadataWidget::setMetadata(const QByteArray& data) +bool MetadataWidget::setMetadata(const TQByteArray& data) { d->metadata = data; @@ -223,7 +223,7 @@ void MetadataWidget::setMetadataEmpty() enabledToolButtons(false); } -const QByteArray& MetadataWidget::getMetadata() +const TQByteArray& MetadataWidget::getMetadata() { return d->metadata; } @@ -233,11 +233,11 @@ bool MetadataWidget::storeMetadataToFile(const KURL& url) if( url.isEmpty() ) return false; - QFile file(url.path()); + TQFile file(url.path()); if ( !file.open(IO_WriteOnly) ) return false; - QDataStream stream( &file ); + TQDataStream stream( &file ); stream.writeRawBytes(d->metadata.data(), d->metadata.size()); file.close(); return true; @@ -253,13 +253,13 @@ const DMetadata::MetaDataMap& MetadataWidget::getMetadataMap() return d->metaDataMap; } -void MetadataWidget::setIfdList(const DMetadata::MetaDataMap &ifds, const QStringList& tagsFilter) +void MetadataWidget::setIfdList(const DMetadata::MetaDataMap &ifds, const TQStringList& tagsFilter) { d->view->setIfdList(ifds, tagsFilter); } -void MetadataWidget::setIfdList(const DMetadata::MetaDataMap &ifds, const QStringList& keysFilter, - const QStringList& tagsFilter) +void MetadataWidget::setIfdList(const DMetadata::MetaDataMap &ifds, const TQStringList& keysFilter, + const TQStringList& tagsFilter) { d->view->setIfdList(ifds, keysFilter, tagsFilter); } @@ -271,8 +271,8 @@ void MetadataWidget::slotModeChanged(int) void MetadataWidget::slotCopy2Clipboard() { - QString textmetadata = i18n("File name: %1 (%2)").arg(d->fileName).arg(getMetadataTitle()); - QListViewItemIterator it( d->view ); + TQString textmetadata = i18n("File name: %1 (%2)").tqarg(d->fileName).tqarg(getMetadataTitle()); + TQListViewItemIterator it( d->view ); while ( it.current() ) { @@ -285,7 +285,7 @@ void MetadataWidget::slotCopy2Clipboard() } else { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); textmetadata.append(item->text(0)); textmetadata.append(" : "); textmetadata.append(item->text(1)); @@ -295,15 +295,15 @@ void MetadataWidget::slotCopy2Clipboard() ++it; } - QApplication::clipboard()->setData(new QTextDrag(textmetadata), QClipboard::Clipboard); + TQApplication::tqclipboard()->setData(new TQTextDrag(textmetadata), TQClipboard::Clipboard); } void MetadataWidget::slotPrintMetadata() { - QString textmetadata = i18n("<p><big><big><b>File name: %1 (%2)</b></big></big>") - .arg(d->fileName) - .arg(getMetadataTitle()); - QListViewItemIterator it( d->view ); + TQString textmetadata = i18n("<p><big><big><b>File name: %1 (%2)</b></big></big>") + .tqarg(d->fileName) + .tqarg(getMetadataTitle()); + TQListViewItemIterator it( d->view ); while ( it.current() ) { @@ -316,7 +316,7 @@ void MetadataWidget::slotPrintMetadata() } else { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); textmetadata.append(item->text(0)); textmetadata.append(" : <i>"); textmetadata.append(item->text(1)); @@ -333,33 +333,33 @@ void MetadataWidget::slotPrintMetadata() if ( printer.setup( this ) ) { - QPainter p( &printer ); + TQPainter p( &printer ); if ( !p.device() ) return; - QPaintDeviceMetrics metrics(p.device()); + TQPaintDeviceMetrics metrics(p.device()); int dpiy = metrics.logicalDpiY(); int margin = (int) ( (2/2.54)*dpiy ); // 2 cm margins - QRect view( margin, margin, metrics.width() - 2*margin, metrics.height() - 2*margin ); - QFont font(KApplication::font()); + TQRect view( margin, margin, metrics.width() - 2*margin, metrics.height() - 2*margin ); + TQFont font(KApplication::font()); font.setPointSize( 10 ); // we define 10pt to be a nice base size for printing - QSimpleRichText richText( textmetadata, font, - QString(), - QStyleSheet::defaultSheet(), - QMimeSourceFactory::defaultFactory(), + TQSimpleRichText richText( textmetadata, font, + TQString(), + TQStyleSheet::defaultSheet(), + TQMimeSourceFactory::defaultFactory(), view.height() ); richText.setWidth( &p, view.width() ); int page = 1; do { - richText.draw( &p, margin, margin, view, colorGroup() ); + richText.draw( &p, margin, margin, view, tqcolorGroup() ); view.moveBy( 0, view.height() ); p.translate( 0 , -view.height() ); p.setFont( font ); - p.drawText( view.right() - p.fontMetrics().width( QString::number( page ) ), - view.bottom() + p.fontMetrics().ascent() + 5, QString::number( page ) ); + p.drawText( view.right() - p.fontMetrics().width( TQString::number( page ) ), + view.bottom() + p.fontMetrics().ascent() + 5, TQString::number( page ) ); if ( view.top() - margin >= richText.height() ) break; @@ -371,10 +371,10 @@ void MetadataWidget::slotPrintMetadata() } } -KURL MetadataWidget::saveMetadataToFile(const QString& caption, const QString& fileFilter) +KURL MetadataWidget::saveMetadataToFile(const TQString& caption, const TQString& fileFilter) { KFileDialog fileSaveDialog(KGlobalSettings::documentPath(), - QString(), + TQString(), this, "MetadataFileSaveDialog", false); @@ -407,40 +407,40 @@ int MetadataWidget::getMode() return level; } -QString MetadataWidget::getCurrentItemKey() const +TQString MetadataWidget::getCurrentItemKey() const { return d->view->getCurrentItemKey(); } -void MetadataWidget::setCurrentItemByKey(const QString& itemKey) +void MetadataWidget::setCurrentItemByKey(const TQString& itemKey) { d->view->setCurrentItemByKey(itemKey); } -bool MetadataWidget::loadFromData(const QString& fileName, const QByteArray& data) +bool MetadataWidget::loadFromData(const TQString& fileName, const TQByteArray& data) { setFileName(fileName); return(setMetadata(data)); } -QString MetadataWidget::getTagTitle(const QString&) +TQString MetadataWidget::getTagTitle(const TQString&) { - return QString(); + return TQString(); } -QString MetadataWidget::getTagDescription(const QString&) +TQString MetadataWidget::getTagDescription(const TQString&) { - return QString(); + return TQString(); } -void MetadataWidget::setFileName(const QString& fileName) +void MetadataWidget::setFileName(const TQString& fileName) { d->fileName = fileName; } -void MetadataWidget::setUserAreaWidget(QWidget *w) +void MetadataWidget::setUserAreaWidget(TQWidget *w) { - QVBoxLayout *vLayout = new QVBoxLayout( KDialog::spacingHint() ); + TQVBoxLayout *vLayout = new TQVBoxLayout( KDialog::spacingHint() ); vLayout->addWidget(w); vLayout->addStretch(); d->mainLayout->addMultiCellLayout(vLayout, 3, 3, 0, 4); diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/digikam/libs/widgets/metadata/metadatawidget.h index b5b96ca..112213f 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.h +++ b/digikam/libs/widgets/metadata/metadatawidget.h @@ -24,10 +24,10 @@ #ifndef METADATAWIDGET_H #define METADATAWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -44,9 +44,10 @@ namespace Digikam class MetadataListView; class MetadataWidgetPriv; -class DIGIKAM_EXPORT MetadataWidget : public QWidget +class DIGIKAM_EXPORT MetadataWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -58,21 +59,21 @@ public: public: - MetadataWidget(QWidget* parent, const char* name=0); + MetadataWidget(TQWidget* tqparent, const char* name=0); ~MetadataWidget(); int getMode(); void setMode(int mode); - QString getCurrentItemKey() const; - void setCurrentItemByKey(const QString& itemKey); + TQString getCurrentItemKey() const; + void setCurrentItemByKey(const TQString& itemKey); - void setUserAreaWidget(QWidget *w); + void setUserAreaWidget(TQWidget *w); - virtual QString getTagTitle(const QString& key); - virtual QString getTagDescription(const QString& key); + virtual TQString getTagTitle(const TQString& key); + virtual TQString getTagDescription(const TQString& key); - virtual bool loadFromData(const QString &fileName, const QByteArray& data=QByteArray()); + virtual bool loadFromData(const TQString &fileName, const TQByteArray& data=TQByteArray()); virtual bool loadFromURL(const KURL& url)=0; private slots: @@ -88,25 +89,25 @@ protected slots: protected: void enabledToolButtons(bool); - void setFileName(const QString& fileName); + void setFileName(const TQString& fileName); MetadataListView* view(); - bool setMetadata(const QByteArray& data=QByteArray()); - const QByteArray& getMetadata(); + bool setMetadata(const TQByteArray& data=TQByteArray()); + const TQByteArray& getMetadata(); void setMetadataMap(const DMetadata::MetaDataMap& data=DMetadata::MetaDataMap()); const DMetadata::MetaDataMap& getMetadataMap(); - void setIfdList(const DMetadata::MetaDataMap &ifds, const QStringList& tagsFilter=QStringList()); - void setIfdList(const DMetadata::MetaDataMap &ifds, const QStringList& keysFilter, - const QStringList& tagsFilter); + void setIfdList(const DMetadata::MetaDataMap &ifds, const TQStringList& tagsFilter=TQStringList()); + void setIfdList(const DMetadata::MetaDataMap &ifds, const TQStringList& keysFilter, + const TQStringList& tagsFilter); - KURL saveMetadataToFile(const QString& caption, const QString& fileFilter); + KURL saveMetadataToFile(const TQString& caption, const TQString& fileFilter); bool storeMetadataToFile(const KURL& url); virtual void buildView(); virtual bool decodeMetadata()=0; - virtual QString getMetadataTitle()=0; + virtual TQString getMetadataTitle()=0; virtual void setMetadataEmpty(); private: diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 3590be9..ee7494a 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qstring.h> -#include <qpixmap.h> -#include <qlabel.h> +#include <tqpainter.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqlabel.h> // KDE includes. @@ -64,32 +64,32 @@ public: double latitude; double longitude; - QLabel *latLonPos; + TQLabel *latLonPos; - static QPixmap *worldMap; + static TQPixmap *worldMap; }; -static KStaticDeleter<QPixmap> pixmapDeleter; +static KStaticDeleter<TQPixmap> pixmapDeleter; -QPixmap *WorldMapWidgetPriv::worldMap = 0; +TQPixmap *WorldMapWidgetPriv::worldMap = 0; -WorldMapWidget::WorldMapWidget(int w, int h, QWidget *parent) - : QScrollView(parent, 0, Qt::WDestructiveClose) +WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *tqparent) + : TQScrollView(tqparent, 0, TQt::WDestructiveClose) { d = new WorldMapWidgetPriv; - setVScrollBarMode(QScrollView::AlwaysOff); - setHScrollBarMode(QScrollView::AlwaysOff); + setVScrollBarMode(TQScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); viewport()->setMouseTracking(true); - viewport()->setPaletteBackgroundColor(colorGroup().background()); + viewport()->setPaletteBackgroundColor(tqcolorGroup().background()); setMinimumWidth(w); setMaximumHeight(h); resizeContents(worldMapPixmap().width(), worldMapPixmap().height()); - d->latLonPos = new QLabel(viewport()); + d->latLonPos = new TQLabel(viewport()); d->latLonPos->setMaximumHeight(fontMetrics().height()); - d->latLonPos->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - d->latLonPos->setFrameStyle(QFrame::Panel | QFrame::Sunken); + d->latLonPos->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + d->latLonPos->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); addChild(d->latLonPos); } @@ -98,13 +98,13 @@ WorldMapWidget::~WorldMapWidget() delete d; } -QPixmap &WorldMapWidget::worldMapPixmap() +TQPixmap &WorldMapWidget::worldMapPixmap() { if (!d->worldMap) { KGlobal::dirs()->addResourceType("worldmap", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg"); - pixmapDeleter.setObject(d->worldMap, new QPixmap(directory + "worldmap.jpg")); + TQString directory = KGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg"); + pixmapDeleter.setObject(d->worldMap, new TQPixmap(directory + "worldmap.jpg")); } return *d->worldMap; } @@ -126,7 +126,7 @@ void WorldMapWidget::setEnabled(bool b) else d->latLonPos->show(); - QScrollView::setEnabled(b); + TQScrollView::setEnabled(b); } void WorldMapWidget::setGPSPosition(double lat, double lng) @@ -143,38 +143,38 @@ void WorldMapWidget::setGPSPosition(double lat, double lng) d->xPos = (int)(longMid + longOffset); d->yPos = (int)(latMid - latOffset); - repaintContents(false); + tqrepaintContents(false); center(d->xPos, d->yPos); - QString la, lo; - d->latLonPos->setText(QString("(%1, %2)").arg(la.setNum(d->latitude, 'f', 2)) - .arg(lo.setNum(d->longitude, 'f', 2))); + TQString la, lo; + d->latLonPos->setText(TQString("(%1, %2)").tqarg(la.setNum(d->latitude, 'f', 2)) + .tqarg(lo.setNum(d->longitude, 'f', 2))); moveChild(d->latLonPos, contentsX()+10, contentsY()+10); } -void WorldMapWidget::drawContents(QPainter *p, int x, int y, int w, int h) +void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h) { if (isEnabled()) { p->drawPixmap(x, y, worldMapPixmap(), x, y, w, h); - p->setPen(QPen(Qt::white, 0, Qt::SolidLine)); + p->setPen(TQPen(TQt::white, 0, TQt::SolidLine)); p->drawLine(d->xPos, 0, d->xPos, contentsHeight()); p->drawLine(0, d->yPos, contentsWidth(), d->yPos); - p->setPen(QPen(Qt::red, 0, Qt::DotLine)); + p->setPen(TQPen(TQt::red, 0, TQt::DotLine)); p->drawLine(d->xPos, 0, d->xPos, contentsHeight()); p->drawLine(0, d->yPos, contentsWidth(), d->yPos); - p->setPen( Qt::red ); - p->setBrush( Qt::red ); + p->setPen( TQt::red ); + p->setBrush( TQt::red ); p->drawEllipse( d->xPos-2, d->yPos-2, 4, 4 ); } else { - p->fillRect(x, y, w, h, palette().disabled().background()); + p->fillRect(x, y, w, h, tqpalette().disabled().background()); } } -void WorldMapWidget::contentsMousePressEvent ( QMouseEvent * e ) +void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton ) { @@ -184,12 +184,12 @@ void WorldMapWidget::contentsMousePressEvent ( QMouseEvent * e ) } } -void WorldMapWidget::contentsMouseReleaseEvent ( QMouseEvent * ) +void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * ) { unsetCursor(); } -void WorldMapWidget::contentsMouseMoveEvent( QMouseEvent * e ) +void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e ) { if ( e->state() == Qt::LeftButton ) { @@ -197,7 +197,7 @@ void WorldMapWidget::contentsMouseMoveEvent( QMouseEvent * e ) uint newypos = e->y(); scrollBy (-(newxpos - d->xMousePos), -(newypos - d->yMousePos)); - repaintContents(false); + tqrepaintContents(false); d->xMousePos = newxpos - (newxpos-d->xMousePos); d->yMousePos = newypos - (newypos-d->yMousePos); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/digikam/libs/widgets/metadata/worldmapwidget.h index 1143b02..096b725 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.h +++ b/digikam/libs/widgets/metadata/worldmapwidget.h @@ -24,9 +24,9 @@ #ifndef WORLDMAPWIDGET_H #define WORLDMAPWIDGET_H -// Qt includes. +// TQt includes. -#include <qscrollview.h> +#include <tqscrollview.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class WorldMapWidgetPriv; -class DIGIKAM_EXPORT WorldMapWidget : public QScrollView +class DIGIKAM_EXPORT WorldMapWidget : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - WorldMapWidget(int w, int h, QWidget *parent); + WorldMapWidget(int w, int h, TQWidget *tqparent); ~WorldMapWidget(); void setGPSPosition(double lat, double lng); @@ -54,12 +55,12 @@ public: private: - void drawContents(QPainter *p, int x, int y, int w, int h); - void contentsMousePressEvent ( QMouseEvent * e ); - void contentsMouseReleaseEvent ( QMouseEvent * e ); - void contentsMouseMoveEvent( QMouseEvent * e ); + void drawContents(TQPainter *p, int x, int y, int w, int h); + void contentsMousePressEvent ( TQMouseEvent * e ); + void contentsMouseReleaseEvent ( TQMouseEvent * e ); + void contentsMouseMoveEvent( TQMouseEvent * e ); - QPixmap &worldMapPixmap(); + TQPixmap &worldMapPixmap(); private: diff --git a/digikam/project/Doxyfile b/digikam/project/Doxyfile index e9735e9..e3c8981 100644 --- a/digikam/project/Doxyfile +++ b/digikam/project/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ diff --git a/digikam/project/NEWS.0.9.0 b/digikam/project/NEWS.0.9.0 index ffb1f1c..76df473 100644 --- a/digikam/project/NEWS.0.9.0 +++ b/digikam/project/NEWS.0.9.0 @@ -58,7 +58,7 @@ Showfoto : Thumbbar moved to the left by default in vertical mode. Image pr right to make a consistant GUI with digiKam main interface. Showfoto : Thumbbar can be used to the bottom in horizontal mode. Showfoto : New Exif Auto-rotate option like in digiKam ImageEditor. -Showfoto : New Set Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor. +Showfoto : New Set Qt::Orientation Exif flag to normal after Rotate/Flip like in digiKam ImageEditor. *** 0.9.0-beta2 ******************************************************* @@ -136,7 +136,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b 005 ==> 116248 : Ask user which plugins should be enabled on first startup. 006 ==> 115441 : Resize EXIF-rotated images doesn't work. 007 ==> 115460 : Opening and closing right pane with tag filter also changes width of left pane and vv. -008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find parent for Tag. +008 ==> 124688 : digiKam loading time is big because of : WARNING: Failed to find tqparent for Tag. 009 ==> 109253 : digiKam does not store comments in image EXIF tags. 010 ==> 115764 : Modify EXIF creation date. 011 ==> 121487 : "Tip of the day" text gets cut off. @@ -203,7 +203,7 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b 071 ==> 126326 : Camera download: auto-rotated images loose EXIF info when 'No EXIF information found.' is written to console. 072 ==> 121242 : mimelnk/x-image-raw.desktop conflicts with kdegraphics-3.5.x. -073 ==> 127374 : Unsharp mask: max. radius way too small. +073 ==> 127374 : Unsharp tqmask: max. radius way too small. 074 ==> 116485 : Mimimize button missing on "Compaq Flash Reader" camera window. 075 ==> 127577 : Raw display too dark and not rotated. 076 ==> 127634 : Communication between digiKam and its kioslaves broken if size_t != off_t. @@ -260,12 +260,12 @@ digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://b 122 ==> 131301 : Crash after add second image. 123 ==> 109820 : Utility script to export tag information of images into the filesystem. 124 ==> 117375 : Change file name without affecting extension. -125 ==> 131603 : Orientation of RAW-images (especially Canons *.cr2). +125 ==> 131603 : Qt::Orientation of RAW-images (especially Canons *.cr2). 126 ==> 131532 : Minolta exception code can break EXIF rotation. 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 unicode characters in the name. +130 ==> 131920 : Can't create preview folders with tqunicode 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. diff --git a/digikam/project/NEWS.0.9.1 b/digikam/project/NEWS.0.9.1 index 24c537d..f6a4db7 100644 --- a/digikam/project/NEWS.0.9.1 +++ b/digikam/project/NEWS.0.9.1 @@ -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 layout to show Comments & Tags side bar contents. +General : New optimized tqlayout 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. @@ -15,7 +15,7 @@ General : New native SlideShow tool witch use the Image Preview feature. RAW files can be slided very fast. AlbumGUI : Improvement of pop-up menu of Tags Filter View and Comment & Tags - about auto selection/deselection of parents/childs tags in Tags treeview. + about auto selection/deselection of tqparents/childs tags in Tags treeview. AlbumGUI : Main Root album show a Welcome page for new users (like Kmail or Konqueror). AlbumGUI : Video files can be previewed using an embedded instance of @@ -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 alignment about print pictures. +Image Editor : Add new advanced options to keep ratio and tqalignment 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. @@ -61,7 +61,7 @@ CameraGUI : JPEG Exif thumbnail and Iptc image preview are recomputed during CameraGUI : digiKam theme support. AlbumGUI : Improvement of pop-up menu of Tags Filter View and Comment & Tags about - auto selection/deselection of parents/childs tags in Tags treeview. + auto selection/deselection of tqparents/childs tags in Tags treeview. AlbumGUI : Main Root album show a Welcome page for new users (like Kmail or Konqueror). AlbumGUI : Video files can be previewed using an embedded instance of default KDE media player. @@ -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 alignment about print pictures. +Image Editor : Add new advanced options to keep ratio and tqalignment 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. @@ -102,7 +102,7 @@ General : Native slideshow tool : preaparing slideshow is now cancelable. ---------------------------------------------------------------------------- digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): -001 ==> 115157 : Usability: Image comments/tags dialog: hard to find/see all +001 ==> 115157 : Usability: Image comments/tags dialog: hard to tqfind/see all already selected tags (and to 'de'select them). 002 ==> 132309 : Wish: enhance video support in digiKam. 003 ==> 115153 : Assigns tags not only to selected images with drag and drop. diff --git a/digikam/project/NEWS.0.9.2 b/digikam/project/NEWS.0.9.2 index f28327e..e26f43a 100644 --- a/digikam/project/NEWS.0.9.2 +++ b/digikam/project/NEWS.0.9.2 @@ -9,7 +9,7 @@ digiKam BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 063 ==> 146436 : digiKam try to include Exiv2 library headers. 064 ==> 146464 : Light Table does not deal with colour management. 065 ==> 142133 : Typo English documentation docbook. -066 ==> 146744 : Tag that contains '&' is not displayed correctly in menus. +066 ==> 146744 : Tag that tqcontains '&' is not displayed correctly in menus. ********************************************************************************************** @@ -149,10 +149,10 @@ 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 "children", not "childs". +034 ==> 144214 : The plural form of "child" is "tqchildren", not "childs". 035 ==> 124487 : No way to pause a slide show. -036 ==> 128975 : "Correct Exif Orientation Tag" does not change the mtime +036 ==> 128975 : "Correct Exif Qt::Orientation Tag" does not change the mtime of the image file. 037 ==> 139814 : The window of digiKam exceed the screen if the resolution is 800x600. -038 ==> 144481 : Vertical window size cannot be reduced to VGA resolution. +038 ==> 144481 :Qt::Vertical window size cannot be reduced to VGA resolution. 039 ==> 136254 : Editing tags does not change IPTC-keywords. diff --git a/digikam/project/NEWS.0.9.4 b/digikam/project/NEWS.0.9.4 index e93ca0a..630ed8a 100644 --- a/digikam/project/NEWS.0.9.4 +++ b/digikam/project/NEWS.0.9.4 @@ -14,7 +14,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 003 ==> 165823 : Digikam crashes if last picture is removed from lighttable. 004 ==> 165921 : Translation bug: Missing german translation. 005 ==> 130906 : Allow user to click text of tags to tag an image (not checkbox only). -006 ==> 126871 : Click on parent folder in tree should generate a reaction. +006 ==> 126871 : Click on tqparent folder in tree should generate a reaction. 007 ==> 162812 : Sharpen slider enhancement refresh previews continuously. 008 ==> 166274 : Rename files on download from camera. 009 ==> 166472 : Thumbnail bar gone in image editor when switching back from fullscreen. @@ -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 geometry (X-pixel / Y-pixel) missed. +004 ==> 164615 : Image detail info about tqgeometry (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. @@ -104,7 +104,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 007 ==> 147466 : digiKam crashes on termination if an audio file played. 008 ==> 146973 : Crashes when clicking on preview image. 009 ==> 148976 : digiKam Deleted 2.3 g of Pictures. -010 ==> 145252 : Umask settings used for album directory, not for image files. +010 ==> 145252 : Utqmask settings used for album directory, not for image files. 011 ==> 125775 : digiKam way to save and delete "Searches". 012 ==> 150908 : Canon g3 not recognized works version 0.9.1. 013 ==> 152092 : Showfoto crashes ( signal 11 ) on exit. @@ -162,7 +162,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 001 ==> 146393 : No gamma adjustment when opening RAW file. 002 ==> 158377 : digiKam duplicates downloaded images while overwriting existing ones. 003 ==> 151122 : Opening Albums Has Become Very Slow. -004 ==> 145252 : Umask settings used for album directory, not for image files +004 ==> 145252 : Utqmask settings used for album directory, not for image files 005 ==> 144253 : Failed to update old Database to new Database format. 006 ==> 159467 : Misleading error message with path change in digikamrc file. 007 ==> 157237 : Connect the data when using the left tabs. @@ -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 children albums. + tqparents album sum-up the number of items from all undisplayed tqchildren albums. Count of items is performed in background by digiKam KIO-Slaves. A new option from Setup/Album dialog page can toggle on/off this feature. diff --git a/digikam/project/NEWS.0.9.5 b/digikam/project/NEWS.0.9.5 index 290a77f..85a1e7b 100644 --- a/digikam/project/NEWS.0.9.5 +++ b/digikam/project/NEWS.0.9.5 @@ -48,7 +48,7 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 010 ==> 129379 : Renamed Album is shown multiple times although there is only on related picture directory. 011 ==> 171247 : Album creation error when name start by a number. 012 ==> 150906 : digiKam unable to connect to Panasonic LUMIX DMC-TZ3. -013 ==> 148812 : "Auto Rotate/Flip &Using Exif Orientation" fails with some images. +013 ==> 148812 : "Auto Rotate/Flip &Using Exif Qt::Orientation" fails with some images. 014 ==> 150342 : Camera image window keeps scrolling to the currently downloaded picture. 015 ==> 147475 : digiKam Slideshow - Pause button does not stay sticky / work. 016 ==> 148899 : Image Editor does not get the focus after clicking on an image. diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp index ff06c2f..08805c2 100644 --- a/digikam/showfoto/main.cpp +++ b/digikam/showfoto/main.cpp @@ -50,9 +50,9 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - QString libInfo = Digikam::libraryInfo(); + TQString libInfo = Digikam::libraryInfo(); - QString Description = Digikam::showFotoDescription(); + TQString Description = Digikam::showFotoDescription(); KAboutData aboutData( "showfoto", I18N_NOOP("showFoto"), diff --git a/digikam/showfoto/pics/showfoto-splash.xcf b/digikam/showfoto/pics/showfoto-splash.xcf Binary files differindex 8d70ef4..110d931 100644 --- a/digikam/showfoto/pics/showfoto-splash.xcf +++ b/digikam/showfoto/pics/showfoto-splash.xcf diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp index 47c8cd7..4cf76d9 100644 --- a/digikam/showfoto/setup/setup.cpp +++ b/digikam/showfoto/setup/setup.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtabwidget.h> -#include <qapplication.h> -#include <qframe.h> +#include <tqtabwidget.h> +#include <tqapplication.h> +#include <tqframe.h> // KDE includes. @@ -68,12 +68,12 @@ public: page_icc = 0; } - QFrame *page_editor; - QFrame *page_toolTip; - QFrame *page_dcraw; - QFrame *page_iofiles; - QFrame *page_slideshow; - QFrame *page_icc; + TQFrame *page_editor; + TQFrame *page_toolTip; + TQFrame *page_dcraw; + TQFrame *page_iofiles; + TQFrame *page_slideshow; + TQFrame *page_icc; SetupEditor *editorPage; SetupToolTip *toolTipPage; @@ -84,8 +84,8 @@ public: Digikam::SetupICC *iccPage; }; -Setup::Setup(QWidget* parent, const char* name, Setup::Page page) - : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent, +Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page) + : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent, name, true, true ) { d = new SetupPrivate; @@ -115,8 +115,8 @@ Setup::Setup(QWidget* parent, const char* name, Setup::Page page) BarIcon("slideshow", KIcon::SizeMedium)); d->slideshowPage = new Digikam::SetupSlideShow(d->page_slideshow); - connect(this, SIGNAL(okClicked()), - this, SLOT(slotOkClicked()) ); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(slotOkClicked()) ); if (page != LastPageUsed) showPage((int) page); diff --git a/digikam/showfoto/setup/setup.h b/digikam/showfoto/setup/setup.h index 774915c..957eb76 100644 --- a/digikam/showfoto/setup/setup.h +++ b/digikam/showfoto/setup/setup.h @@ -28,7 +28,7 @@ #include <kdialogbase.h> -class QFrame; +class TQFrame; namespace Digikam { @@ -46,6 +46,7 @@ class SetupPrivate; class Setup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -60,7 +61,7 @@ public: ICCPage }; - Setup(QWidget* parent=0, const char* name=0, Page page=LastPageUsed); + Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed); ~Setup(); private slots: diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp index ecdab19..06fc4ca 100644 --- a/digikam/showfoto/setup/setupeditor.cpp +++ b/digikam/showfoto/setup/setupeditor.cpp @@ -22,16 +22,16 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qcolor.h> -#include <qhbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> // KDE includes. @@ -73,119 +73,119 @@ public: useRawImportTool = 0; } - QHBox *colorBox; + TQHBox *colorBox; - QCheckBox *sortReverse; - QCheckBox *hideToolBar; - QCheckBox *hideThumbBar; - QCheckBox *horizontalThumbBar; - QCheckBox *showSplash; - QCheckBox *useTrash; - QCheckBox *exifRotateBox; - QCheckBox *exifSetOrientationBox; - QCheckBox *themebackgroundColor; - QCheckBox *useRawImportTool; + TQCheckBox *sortReverse; + TQCheckBox *hideToolBar; + TQCheckBox *hideThumbBar; + TQCheckBox *horizontalThumbBar; + TQCheckBox *showSplash; + TQCheckBox *useTrash; + TQCheckBox *exifRotateBox; + TQCheckBox *exifSetOrientationBox; + TQCheckBox *themebackgroundColor; + TQCheckBox *useRawImportTool; - QComboBox *sortOrderComboBox; + TQComboBox *sortOrderComboBox; KColorButton *backgroundColor; KColorButton *underExposureColor; KColorButton *overExposureColor; }; -SetupEditor::SetupEditor(QWidget* parent ) - : QWidget(parent) +SetupEditor::SetupEditor(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupEditorPriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - QVGroupBox *interfaceOptionsGroup = new QVGroupBox(i18n("Interface Options"), parent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); - d->themebackgroundColor = new QCheckBox(i18n("&Use theme background color"), + d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); - QWhatsThis::add( d->themebackgroundColor, i18n("<p>Enable this option to use background theme " + TQWhatsThis::add( d->themebackgroundColor, i18n("<p>Enable this option to use background theme " "color in image editor area") ); - d->colorBox = new QHBox(interfaceOptionsGroup); - QLabel *backgroundColorlabel = new QLabel( i18n("&Background color:"), d->colorBox); + d->colorBox = new TQHBox(interfaceOptionsGroup); + TQLabel *backgroundColorlabel = new TQLabel( i18n("&Background color:"), d->colorBox); d->backgroundColor = new KColorButton(d->colorBox); backgroundColorlabel->setBuddy(d->backgroundColor); - QWhatsThis::add( d->backgroundColor, i18n("<p>Select background color to use " + TQWhatsThis::add( d->backgroundColor, i18n("<p>Select background color to use " "for image editor area.") ); - d->hideToolBar = new QCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); - d->hideThumbBar = new QCheckBox(i18n("Hide &thumbbar in fullscreen mode"), interfaceOptionsGroup); - d->horizontalThumbBar = new QCheckBox(i18n("Use &horizontal thumbbar (need to restart showFoto)"), interfaceOptionsGroup); - QWhatsThis::add( d->horizontalThumbBar, i18n("<p>If this option is enabled, the thumbnails bar will be displayed horizontally behind " + d->hideToolBar = new TQCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); + d->hideThumbBar = new TQCheckBox(i18n("Hide &thumbbar in fullscreen mode"), interfaceOptionsGroup); + d->horizontalThumbBar = new TQCheckBox(i18n("Use &horizontal thumbbar (need to restart showFoto)"), interfaceOptionsGroup); + TQWhatsThis::add( d->horizontalThumbBar, i18n("<p>If this option is enabled, the thumbnails bar will be displayed horizontally behind " "the image area. You need to restart showFoto for this option take effect.<p>")); - d->useTrash = new QCheckBox(i18n("&Deleting items should move them to trash"), interfaceOptionsGroup); - d->showSplash = new QCheckBox(i18n("&Show splash screen at startup"), interfaceOptionsGroup); + d->useTrash = new TQCheckBox(i18n("&Deleting items should move them to trash"), interfaceOptionsGroup); + d->showSplash = new TQCheckBox(i18n("&Show splash screen at startup"), interfaceOptionsGroup); - d->useRawImportTool = new QCheckBox(i18n("Use Raw Import Tool to handle Raw image"), interfaceOptionsGroup); - QWhatsThis::add(d->useRawImportTool, i18n("<p>Set on this option to use Raw Import " + d->useRawImportTool = new TQCheckBox(i18n("Use Raw Import Tool to handle Raw image"), interfaceOptionsGroup); + TQWhatsThis::add(d->useRawImportTool, i18n("<p>Set on this option to use Raw Import " "tool before to load a Raw image, " "to customize indeep decoding settings.")); // -------------------------------------------------------- - QVGroupBox *exposureOptionsGroup = new QVGroupBox(i18n("Exposure Indicators"), parent); + TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent); - QHBox *underExpoBox = new QHBox(exposureOptionsGroup); - QLabel *underExpoColorlabel = new QLabel( i18n("&Under-exposure color:"), underExpoBox); + TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup); + TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox); d->underExposureColor = new KColorButton(underExpoBox); underExpoColorlabel->setBuddy(d->underExposureColor); - QWhatsThis::add( d->underExposureColor, i18n("<p>Customize color used in image editor to identify " + TQWhatsThis::add( d->underExposureColor, i18n("<p>Customize color used in image editor to identify " "under-exposed pixels.") ); - QHBox *overExpoBox = new QHBox(exposureOptionsGroup); - QLabel *overExpoColorlabel = new QLabel( i18n("&Over-exposure color:"), overExpoBox); + TQHBox *overExpoBox = new TQHBox(exposureOptionsGroup); + TQLabel *overExpoColorlabel = new TQLabel( i18n("&Over-exposure color:"), overExpoBox); d->overExposureColor = new KColorButton(overExpoBox); overExpoColorlabel->setBuddy(d->overExposureColor); - QWhatsThis::add( d->overExposureColor, i18n("<p>Customize color used in image editor to identify " + TQWhatsThis::add( d->overExposureColor, i18n("<p>Customize color used in image editor to identify " "over-exposed pixels.") ); // -------------------------------------------------------- - QVGroupBox *ExifGroupOptions = new QVGroupBox(i18n("EXIF Actions"), parent); + TQVGroupBox *ExifGroupOptions = new TQVGroupBox(i18n("EXIF Actions"), tqparent); - d->exifRotateBox = new QCheckBox(ExifGroupOptions); + d->exifRotateBox = new TQCheckBox(ExifGroupOptions); d->exifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); - d->exifSetOrientationBox = new QCheckBox(ExifGroupOptions); + d->exifSetOrientationBox = new TQCheckBox(ExifGroupOptions); d->exifSetOrientationBox->setText(i18n("Set orientation tag to normal after rotate/flip")); // -------------------------------------------------------- - QVGroupBox *sortOptionsGroup = new QVGroupBox(i18n("Sort order for images"), parent); + TQVGroupBox *sortOptionsGroup = new TQVGroupBox(i18n("Sort order for images"), tqparent); - QHBox* sortBox = new QHBox(sortOptionsGroup); - new QLabel(i18n("Sort images by:"), sortBox); - d->sortOrderComboBox = new QComboBox(false, sortBox); + TQHBox* sortBox = new TQHBox(sortOptionsGroup); + new TQLabel(i18n("Sort images by:"), sortBox); + d->sortOrderComboBox = new TQComboBox(false, sortBox); d->sortOrderComboBox->insertItem(i18n("File Date"), 0); d->sortOrderComboBox->insertItem(i18n("File Name"), 1); d->sortOrderComboBox->insertItem(i18n("File size"), 2); - QWhatsThis::add(d->sortOrderComboBox, i18n("<p>Here, select whether newly-loaded " + TQWhatsThis::add(d->sortOrderComboBox, i18n("<p>Here, select whether newly-loaded " "images are sorted by file-date, file-name, or file-size.")); - d->sortReverse = new QCheckBox(i18n("Reverse ordering"), sortOptionsGroup); - QWhatsThis::add(d->sortReverse, i18n("<p>If this option is enabled, newly-loaded " + d->sortReverse = new TQCheckBox(i18n("Reverse ordering"), sortOptionsGroup); + TQWhatsThis::add(d->sortReverse, i18n("<p>If this option is enabled, newly-loaded " "images will be sorted in descending order.")); // -------------------------------------------------------- - layout->addWidget(interfaceOptionsGroup); - layout->addWidget(exposureOptionsGroup); - layout->addWidget(ExifGroupOptions); - layout->addWidget(sortOptionsGroup); - layout->addStretch(); + tqlayout->addWidget(interfaceOptionsGroup); + tqlayout->addWidget(exposureOptionsGroup); + tqlayout->addWidget(ExifGroupOptions); + tqlayout->addWidget(sortOptionsGroup); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->themebackgroundColor, SIGNAL(toggled(bool)), - this, SLOT(slotThemeBackgroundColor(bool))); + connect(d->themebackgroundColor, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotThemeBackgroundColor(bool))); readSettings(); } @@ -203,8 +203,8 @@ void SetupEditor::slotThemeBackgroundColor(bool e) void SetupEditor::readSettings() { KConfig* config = kapp->config(); - QColor Black(Qt::black); - QColor White(Qt::white); + TQColor Black(TQt::black); + TQColor White(TQt::white); config->setGroup("ImageViewer Settings"); d->themebackgroundColor->setChecked(config->readBoolEntry("UseThemeBackgroundColor", true)); d->backgroundColor->setColor( config->readColorEntry("BackgroundColor", &Black ) ); @@ -214,7 +214,7 @@ void SetupEditor::readSettings() d->useTrash->setChecked(config->readBoolEntry("DeleteItem2Trash", false)); d->showSplash->setChecked(config->readBoolEntry("ShowSplash", true)); d->exifRotateBox->setChecked(config->readBoolEntry("EXIF Rotate", true)); - d->exifSetOrientationBox->setChecked(config->readBoolEntry("EXIF Set Orientation", true)); + d->exifSetOrientationBox->setChecked(config->readBoolEntry("EXIF Set Qt::Orientation", true)); d->underExposureColor->setColor(config->readColorEntry("UnderExposureColor", &White)); d->overExposureColor->setColor(config->readColorEntry("OverExposureColor", &Black)); d->sortOrderComboBox->setCurrentItem(config->readNumEntry("SortOrder", 0)); @@ -234,7 +234,7 @@ void SetupEditor::applySettings() config->writeEntry("DeleteItem2Trash", d->useTrash->isChecked()); config->writeEntry("ShowSplash", d->showSplash->isChecked()); config->writeEntry("EXIF Rotate", d->exifRotateBox->isChecked()); - config->writeEntry("EXIF Set Orientation", d->exifSetOrientationBox->isChecked()); + config->writeEntry("EXIF Set Qt::Orientation", d->exifSetOrientationBox->isChecked()); config->writeEntry("UnderExposureColor", d->underExposureColor->color()); config->writeEntry("OverExposureColor", d->overExposureColor->color()); config->writeEntry("SortOrder", d->sortOrderComboBox->currentItem()); diff --git a/digikam/showfoto/setup/setupeditor.h b/digikam/showfoto/setup/setupeditor.h index a98bf39..e2c74fc 100644 --- a/digikam/showfoto/setup/setupeditor.h +++ b/digikam/showfoto/setup/setupeditor.h @@ -24,22 +24,23 @@ #ifndef SETUPEDITOR_H #define SETUPEDITOR_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace ShowFoto { class SetupEditorPriv; -class SetupEditor : public QWidget +class SetupEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupEditor(QWidget* parent=0); + SetupEditor(TQWidget* tqparent=0); ~SetupEditor(); void applySettings(); diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp index 2e88dbc..4f295f9 100644 --- a/digikam/showfoto/setup/setuptooltip.cpp +++ b/digikam/showfoto/setup/setuptooltip.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -69,100 +69,100 @@ public: photoSettingBox = 0; } - QCheckBox *showToolTipsBox; + TQCheckBox *showToolTipsBox; - QCheckBox *showFileNameBox; - QCheckBox *showFileDateBox; - QCheckBox *showFileSizeBox; - QCheckBox *showImageTypeBox; - QCheckBox *showImageDimBox; + TQCheckBox *showFileNameBox; + TQCheckBox *showFileDateBox; + TQCheckBox *showFileSizeBox; + TQCheckBox *showImageTypeBox; + TQCheckBox *showImageDimBox; - QCheckBox *showPhotoMakeBox; - QCheckBox *showPhotoDateBox; - QCheckBox *showPhotoFocalBox; - QCheckBox *showPhotoExpoBox; - QCheckBox *showPhotoModeBox; - QCheckBox *showPhotoFlashBox; - QCheckBox *showPhotoWbBox; + TQCheckBox *showPhotoMakeBox; + TQCheckBox *showPhotoDateBox; + TQCheckBox *showPhotoFocalBox; + TQCheckBox *showPhotoExpoBox; + TQCheckBox *showPhotoModeBox; + TQCheckBox *showPhotoFlashBox; + TQCheckBox *showPhotoWbBox; - QVGroupBox *fileSettingBox; - QVGroupBox *photoSettingBox; + TQVGroupBox *fileSettingBox; + TQVGroupBox *photoSettingBox; }; -SetupToolTip::SetupToolTip(QWidget* parent) - : QWidget(parent) +SetupToolTip::SetupToolTip(TQWidget* tqparent) + : TQWidget(tqparent) { d = new SetupToolTipPriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); - d->showToolTipsBox = new QCheckBox(i18n("Show Thumbbar items toolti&ps"), parent); - QWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when " + d->showToolTipsBox = new TQCheckBox(i18n("Show Thumbbar items toolti&ps"), tqparent); + TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when " "the mouse hovers over a thumbbar item.")); - layout->addWidget(d->showToolTipsBox); + tqlayout->addWidget(d->showToolTipsBox); // -------------------------------------------------------- - d->fileSettingBox = new QVGroupBox(i18n("File/Image Information"), parent); + d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent); - d->showFileNameBox = new QCheckBox(i18n("Show file name"), d->fileSettingBox); - QWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name.")); + d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox); + TQWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name.")); - d->showFileDateBox = new QCheckBox(i18n("Show file date"), d->fileSettingBox); - QWhatsThis::add( d->showFileDateBox, i18n("<p>Set this option to display the image file date.")); + d->showFileDateBox = new TQCheckBox(i18n("Show file date"), d->fileSettingBox); + TQWhatsThis::add( d->showFileDateBox, i18n("<p>Set this option to display the image file date.")); - d->showFileSizeBox = new QCheckBox(i18n("Show file size"), d->fileSettingBox); - QWhatsThis::add( d->showFileSizeBox, i18n("<p>Set this option to display the image file size.")); + d->showFileSizeBox = new TQCheckBox(i18n("Show file size"), d->fileSettingBox); + TQWhatsThis::add( d->showFileSizeBox, i18n("<p>Set this option to display the image file size.")); - d->showImageTypeBox = new QCheckBox(i18n("Show image type"), d->fileSettingBox); - QWhatsThis::add( d->showImageTypeBox, i18n("<p>Set this option to display the image type.")); + d->showImageTypeBox = new TQCheckBox(i18n("Show image type"), d->fileSettingBox); + TQWhatsThis::add( d->showImageTypeBox, i18n("<p>Set this option to display the image type.")); - d->showImageDimBox = new QCheckBox(i18n("Show image dimensions"), d->fileSettingBox); - QWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels.")); + 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.")); - layout->addWidget(d->fileSettingBox); + tqlayout->addWidget(d->fileSettingBox); // -------------------------------------------------------- - d->photoSettingBox = new QVGroupBox(i18n("Photograph Information"), parent); + d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent); - d->showPhotoMakeBox = new QCheckBox(i18n("Show camera make and model"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the " + d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the " "camera with which the image has been taken.")); - d->showPhotoDateBox = new QCheckBox(i18n("Show camera date"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoDateBox, i18n("<p>Set this option to display the date when the image was taken.")); + d->showPhotoDateBox = new TQCheckBox(i18n("Show camera date"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoDateBox, i18n("<p>Set this option to display the date when the image was taken.")); - d->showPhotoFocalBox = new QCheckBox(i18n("Show camera aperture and focal length"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoFocalBox, i18n("<p>Set this option to display the camera aperture and focal settings " + d->showPhotoFocalBox = new TQCheckBox(i18n("Show camera aperture and focal length"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoFocalBox, i18n("<p>Set this option to display the camera aperture and focal settings " "used to take the image.")); - d->showPhotoExpoBox = new QCheckBox(i18n("Show camera exposure and sensitivity"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoExpoBox, i18n("<p>Set this option to display the camera exposure and sensitivity " + d->showPhotoExpoBox = new TQCheckBox(i18n("Show camera exposure and sensitivity"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoExpoBox, i18n("<p>Set this option to display the camera exposure and sensitivity " "used to take the image.")); - d->showPhotoModeBox = new QCheckBox(i18n("Show camera mode and program"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoModeBox, i18n("<p>Set this option to display the camera mode and program " + d->showPhotoModeBox = new TQCheckBox(i18n("Show camera mode and program"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoModeBox, i18n("<p>Set this option to display the camera mode and program " "used to take the image.")); - d->showPhotoFlashBox = new QCheckBox(i18n("Show camera flash settings"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoFlashBox, i18n("<p>Set this option to display the camera flash settings " + d->showPhotoFlashBox = new TQCheckBox(i18n("Show camera flash settings"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoFlashBox, i18n("<p>Set this option to display the camera flash settings " "used to take the image.")); - d->showPhotoWbBox = new QCheckBox(i18n("Show camera white balance settings"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings " + d->showPhotoWbBox = new TQCheckBox(i18n("Show camera white balance settings"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings " "used to take the image.")); - layout->addWidget(d->photoSettingBox); - layout->addStretch(); + tqlayout->addWidget(d->photoSettingBox); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->showToolTipsBox, SIGNAL(toggled(bool)), - d->fileSettingBox, SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), + d->fileSettingBox, TQT_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, SIGNAL(toggled(bool)), - d->photoSettingBox, SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), + d->photoSettingBox, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- diff --git a/digikam/showfoto/setup/setuptooltip.h b/digikam/showfoto/setup/setuptooltip.h index c0a77cc..bbd0292 100644 --- a/digikam/showfoto/setup/setuptooltip.h +++ b/digikam/showfoto/setup/setuptooltip.h @@ -24,22 +24,23 @@ #ifndef SETUPTOOLTIP_H #define SETUPTOOLTIP_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace ShowFoto { class SetupToolTipPriv; -class SetupToolTip : public QWidget +class SetupToolTip : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupToolTip(QWidget* parent = 0); + SetupToolTip(TQWidget* tqparent = 0); ~SetupToolTip(); void applySettings(); diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 487f810..4c06c98 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -36,15 +36,15 @@ extern "C" #include <cstdio> -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qlayout.h> -#include <qsplitter.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qcursor.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqsplitter.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqcursor.h> // KDE includes. @@ -138,7 +138,7 @@ public: int itemsNb; - QSplitter *vSplitter; + TQSplitter *vSplitter; KURL lastOpenedDirectory; @@ -204,7 +204,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList) // Load image plugins to GUI - m_imagePluginLoader = new Digikam::ImagePluginLoader(this, d->splash); + m_imagePluginLoader = new Digikam::ImagePluginLoader(TQT_TQOBJECT(this), d->splash); loadImagePlugins(); // If plugin core is not available, plug BCG actions to collection instead. @@ -215,22 +215,22 @@ ShowFoto::ShowFoto(const KURL::List& urlList) d->BCGAction->setDelayed(false); KAction *incGammaAction = new KAction(i18n("Increase Gamma"), 0, ALT+Key_G, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "gamma_plus"); KAction *decGammaAction = new KAction(i18n("Decrease Gamma"), 0, ALT+SHIFT+Key_G, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "gamma_minus"); KAction *incBrightAction = new KAction(i18n("Increase Brightness"), 0, ALT+Key_B, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "brightness_plus"); KAction *decBrightAction = new KAction(i18n("Decrease Brightness"), 0, ALT+SHIFT+Key_B, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "brightness_minus"); KAction *incContrastAction = new KAction(i18n("Increase Contrast"), 0, ALT+Key_C, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "contrast_plus"); KAction *decContrastAction = new KAction(i18n("Decrease Contrast"), 0, ALT+SHIFT+Key_C, - this, SLOT(slotChangeBCG()), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()), actionCollection(), "contrast_minus"); d->BCGAction->insert(incBrightAction); @@ -240,7 +240,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList) d->BCGAction->insert(incGammaAction); d->BCGAction->insert(decGammaAction); - QPtrList<KAction> bcg_actions; + TQPtrList<KAction> bcg_actions; bcg_actions.append( d->BCGAction ); unplugActionList( "showfoto_bcg" ); plugActionList( "showfoto_bcg", bcg_actions ); @@ -268,7 +268,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList) KURL url = *it; if (url.isLocalFile()) { - QFileInfo fi(url.path()); + TQFileInfo fi(url.path()); if (fi.isDir()) { // Local Dir @@ -359,7 +359,7 @@ void ShowFoto::show() KConfig* config = kapp->config(); if(!d->validIccPath) { - QString message = i18n("<qt><p>The ICC profile path seems to be invalid.</p>" + TQString message = i18n("<qt><p>The ICC profile path seems to be invalid.</p>" "<p>If you want to set it now, select \"Yes\", otherwise " "select \"No\". In this case, \"Color Management\" feature " "will be disabled until you solve this issue</p></qt>"); @@ -392,17 +392,17 @@ void ShowFoto::setupConnections() { setupStandardConnections(); - connect(d->thumbBar, SIGNAL(signalURLSelected(const KURL&)), - this, SLOT(slotOpenURL(const KURL&))); + connect(d->thumbBar, TQT_SIGNAL(signalURLSelected(const KURL&)), + TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL(const KURL&))); - connect(d->thumbBar, SIGNAL(signalItemAdded()), - this, SLOT(slotUpdateItemInfo())); + connect(d->thumbBar, TQT_SIGNAL(signalItemAdded()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateItemInfo())); - connect(this, SIGNAL(signalSelectionChanged(const QRect &)), - d->rightSidebar, SLOT(slotImageSelectionChanged(const QRect &))); + connect(this, TQT_SIGNAL(signalSelectionChanged(const TQRect &)), + d->rightSidebar, TQT_SLOT(slotImageSelectionChanged(const TQRect &))); - connect(this, SIGNAL(signalNoCurrentItem()), - d->rightSidebar, SLOT(slotNoCurrentItem())); + connect(this, TQT_SIGNAL(signalNoCurrentItem()), + d->rightSidebar, TQT_SLOT(slotNoCurrentItem())); } void ShowFoto::setupUserArea() @@ -410,17 +410,17 @@ void ShowFoto::setupUserArea() KConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); - QWidget* widget = new QWidget(this); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); + TQWidget* widget = new TQWidget(this); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); - if(!config->readBoolEntry("HorizontalThumbbar", false)) // Vertical thumbbar layout + if(!config->readBoolEntry("HorizontalThumbbar", false)) //Qt::Vertical thumbbar tqlayout { - QHBoxLayout *hlay = new QHBoxLayout(widget); - m_splitter = new QSplitter(widget); + 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->setSizePolicy(rightSzPolicy); + m_canvas->tqsetSizePolicy(rightSzPolicy); d->rightSidebar = new Digikam::ImagePropertiesSideBar(widget, "ShowFoto Sidebar Right", m_splitter, Digikam::Sidebar::Right); @@ -428,26 +428,26 @@ void ShowFoto::setupUserArea() hlay->addWidget(m_splitter); hlay->addWidget(d->rightSidebar); } - else // Horizontal thumbbar layout + else //Qt::Horizontal thumbbar tqlayout { - m_splitter = new QSplitter(Qt::Horizontal, widget); - QWidget* widget2 = new QWidget(m_splitter); - QVBoxLayout *vlay = new QVBoxLayout(widget2); - d->vSplitter = new QSplitter(Qt::Vertical, widget2); + m_splitter = new TQSplitter(Qt::Horizontal, widget); + TQWidget* widget2 = new TQWidget(m_splitter); + TQVBoxLayout *vlay = new TQVBoxLayout(widget2); + d->vSplitter = new TQSplitter(Qt::Vertical, widget2); m_stackView = new Digikam::EditorStackView(d->vSplitter); m_canvas = new Digikam::Canvas(m_stackView); d->thumbBar = new Digikam::ThumbBarView(d->vSplitter, Digikam::ThumbBarView::Horizontal); - m_canvas->setSizePolicy(rightSzPolicy); + m_canvas->tqsetSizePolicy(rightSzPolicy); - d->vSplitter->setFrameStyle( QFrame::NoFrame ); - d->vSplitter->setFrameShadow( QFrame::Plain ); - d->vSplitter->setFrameShape( QFrame::NoFrame ); + d->vSplitter->setFrameStyle( TQFrame::NoFrame ); + d->vSplitter->setFrameShadow( TQFrame::Plain ); + d->vSplitter->setFrameShape( TQFrame::NoFrame ); d->vSplitter->setOpaqueResize(false); vlay->addWidget(d->vSplitter); - QHBoxLayout *hlay = new QHBoxLayout(widget); + TQHBoxLayout *hlay = new TQHBoxLayout(widget); d->rightSidebar = new Digikam::ImagePropertiesSideBar(widget, "ShowFoto Sidebar Right", m_splitter, Digikam::Sidebar::Right); hlay->addWidget(m_splitter); @@ -458,9 +458,9 @@ void ShowFoto::setupUserArea() m_stackView->setCanvas(m_canvas); m_stackView->setViewMode(Digikam::EditorStackView::CanvasMode); - m_splitter->setFrameStyle( QFrame::NoFrame ); - m_splitter->setFrameShadow( QFrame::Plain ); - m_splitter->setFrameShape( QFrame::NoFrame ); + m_splitter->setFrameStyle( TQFrame::NoFrame ); + m_splitter->setFrameShadow( TQFrame::Plain ); + m_splitter->setFrameShape( TQFrame::NoFrame ); m_splitter->setOpaqueResize(false); setCentralWidget(widget); d->rightSidebar->loadViewState(); @@ -478,24 +478,24 @@ void ShowFoto::setupActions() // Extra 'File' menu actions --------------------------------------------- - d->fileOpenAction = KStdAction::open(this, SLOT(slotOpenFile()), + d->fileOpenAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), actionCollection(), "showfoto_open_file"); d->openFilesInFolderAction = new KAction(i18n("Open folder"), "folder_image", CTRL+SHIFT+Key_O, - this, - SLOT(slotOpenFilesInFolder()), + TQT_TQOBJECT(this), + TQT_SLOT(slotOpenFilesInFolder()), actionCollection(), "showfoto_open_folder"); - KStdAction::quit(this, SLOT(close()), actionCollection(), "showfoto_quit"); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "showfoto_quit"); // Extra 'View' menu actions --------------------------------------------- d->showBarAction = new KToggleAction(i18n("Show Thumbnails"), 0, CTRL+Key_T, - this, SLOT(slotToggleShowBar()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowBar()), actionCollection(), "shofoto_showthumbs"); // --- Create the gui -------------------------------------------------------------- @@ -518,11 +518,11 @@ void ShowFoto::readSettings() d->lastOpenedDirectory.setPath( config->readEntry("Last Opened Directory", KGlobalSettings::documentPath()) ); - QSizePolicy szPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); + TQSizePolicy szPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); if(config->hasKey("Vertical Splitter Sizes") && d->vSplitter) d->vSplitter->setSizes(config->readIntListEntry("Vertical Splitter Sizes")); else - m_canvas->setSizePolicy(szPolicy); + m_canvas->tqsetSizePolicy(szPolicy); Digikam::ThemeEngine::instance()->setCurrentTheme(config->readEntry("Theme", i18n("Default"))); } @@ -569,7 +569,7 @@ void ShowFoto::applySettings() m_canvas->setExifOrient(exifRotate); d->thumbBar->setExifRotate(exifRotate); - m_setExifOrientationTag = config->readBoolEntry("EXIF Set Orientation", true); + m_setExifOrientationTag = config->readBoolEntry("EXIF Set Qt::Orientation", true); d->fullScreenHideThumbBar = config->readBoolEntry("FullScreenHideThumbBar", true); @@ -627,7 +627,7 @@ void ShowFoto::slotOpenURL(const KURL& url) if(!d->currentItem) return; - QString localFile; + TQString localFile; #if KDE_IS_VERSION(3,2,0) KIO::NetAccess::download(url, localFile, this); #else @@ -672,9 +672,9 @@ void ShowFoto::slotToggleShowBar() void ShowFoto::slotChangeBCG() { - QString name; + TQString name; if (sender()) - name = sender()->name(); + name = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); if (name == "gamma_plus") { @@ -704,18 +704,18 @@ void ShowFoto::slotChangeBCG() void ShowFoto::slotChanged() { - QString mpixels; - QSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); + TQString mpixels; + TQSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); - QString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + TQString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); m_resLabel->setText(str); if (d->currentItem) { if (d->currentItem->url().isValid()) { - QRect sel = m_canvas->getSelectedArea(); + TQRect sel = m_canvas->getSelectedArea(); Digikam::DImg* img = m_canvas->interface()->getImg(); d->rightSidebar->itemChanged(d->currentItem->url(), sel, img); } @@ -751,7 +751,7 @@ bool ShowFoto::setup(bool iccSetupPage) { Setup setup(this, 0, iccSetupPage ? Setup::ICCPage : Setup::LastPageUsed); - if (setup.exec() != QDialog::Accepted) + if (setup.exec() != TQDialog::Accepted) return false; kapp->config()->sync(); @@ -773,7 +773,7 @@ void ShowFoto::slotUpdateItemInfo(void) m_rotatedOrFlipped = false; int index = 0; - QString text; + TQString text; if (d->itemsNb > 0) { @@ -790,8 +790,8 @@ void ShowFoto::slotUpdateItemInfo(void) text = d->currentItem->url().filename() + i18n(" (%2 of %3)") - .arg(QString::number(index)) - .arg(QString::number(d->itemsNb)); + .tqarg(TQString::number(index)) + .tqarg(TQString::number(d->itemsNb)); setCaption(d->currentItem->url().directory()); } @@ -811,7 +811,7 @@ void ShowFoto::slotOpenFolder(const KURL& url) if (d->currentItem && !promptUserSave(d->currentItem->url())) return; - m_canvas->load(QString(), m_IOFileSettings); + m_canvas->load(TQString(), m_IOFileSettings); d->thumbBar->clear(true); emit signalNoCurrentItem(); d->currentItem = 0; @@ -827,21 +827,21 @@ void ShowFoto::openFolder(const KURL& url) // Parse KDE image IO mime types registration to get files filter pattern. - QStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading); - QString filter; + TQStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading); + TQString filter; - for (QStringList::ConstIterator it = mimeTypes.begin() ; it != mimeTypes.end() ; ++it) + for (TQStringList::ConstIterator it = mimeTypes.begin() ; it != mimeTypes.end() ; ++it) { - QString format = KImageIO::typeForMime(*it); + TQString format = KImageIO::typeForMime(*it); filter.append ("*."); filter.append (format); filter.append (" "); } // Because KImageIO return only *.JPEG and *.TIFF mime types. - if ( filter.contains("*.TIFF") ) + if ( filter.tqcontains("*.TIFF") ) filter.append (" *.TIF"); - if ( filter.contains("*.JPEG") ) + if ( filter.tqcontains("*.JPEG") ) { filter.append (" *.JPG"); filter.append (" *.JPE"); @@ -851,13 +851,13 @@ void ShowFoto::openFolder(const KURL& url) // defines to digikam/libs/dcraw/rawfiles.h filter.append (" "); #if KDCRAW_VERSION < 0x000106 - filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) ); + filter.append ( TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) ); #else - filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) ); + filter.append ( TQString(KDcrawIface::KDcraw::rawFiles()) ); #endif filter.append (" "); - QString patterns = filter.lower(); + TQString patterns = filter.lower(); patterns.append (" "); patterns.append (filter.upper()); @@ -865,8 +865,8 @@ void ShowFoto::openFolder(const KURL& url) // Get all image files from directory. - QDir dir(url.path(), patterns); - dir.setFilter ( QDir::Files | QDir::NoSymLinks ); + TQDir dir(url.path(), patterns); + dir.setFilter ( TQDir::Files | TQDir::NoSymLinks ); if (!dir.exists()) return; @@ -880,33 +880,33 @@ void ShowFoto::openFolder(const KURL& url) switch(config->readNumEntry("SortOrder", 0)) { case 1: - flag = QDir::Name; // Ordering by file name. + flag = TQDir::Name; // Ordering by file name. break; case 2: - flag = QDir::Size; // Ordering by file size. + flag = TQDir::Size; // Ordering by file size. break; default: - flag = QDir::Time; // Ordering by file date. + flag = TQDir::Time; // Ordering by file date. break; } // Disabled reverse in the settings leads e.g. to increasing dates - // Note, that this is just the opposite to the sort order for QDir. + // Note, that this is just the opposite to the sort order for TQDir. if (!config->readBoolEntry("ReverseSort", false)) - flag = flag | QDir::Reversed; + flag = flag | TQDir::Reversed; dir.setSorting(flag); - const QFileInfoList* fileinfolist = dir.entryInfoList(); + const TQFileInfoList* fileinfolist = dir.entryInfoList(); if (!fileinfolist || fileinfolist->isEmpty()) { KMessageBox::sorry(this, i18n("There are no images in this folder.")); return; } - QFileInfoListIterator it(*fileinfolist); - QFileInfo* fi; + TQFileInfoListIterator it(*fileinfolist); + TQFileInfo* fi; // And open all items in image editor. @@ -1006,7 +1006,7 @@ void ShowFoto::toggleNavigation(int index) } } -void ShowFoto::slotLoadingStarted(const QString& filename) +void ShowFoto::slotLoadingStarted(const TQString& filename) { Digikam::EditorWindow::slotLoadingStarted(filename); @@ -1015,7 +1015,7 @@ void ShowFoto::slotLoadingStarted(const QString& filename) d->fileOpenAction->setEnabled(false); } -void ShowFoto::slotLoadingFinished(const QString& filename, bool success) +void ShowFoto::slotLoadingFinished(const TQString& filename, bool success) { Digikam::EditorWindow::slotLoadingFinished(filename, success); @@ -1024,7 +1024,7 @@ void ShowFoto::slotLoadingFinished(const QString& filename, bool success) d->fileOpenAction->setEnabled(true); } -void ShowFoto::slotSavingStarted(const QString& filename) +void ShowFoto::slotSavingStarted(const TQString& filename) { Digikam::EditorWindow::slotSavingStarted(filename); @@ -1045,7 +1045,7 @@ void ShowFoto::finishSaving(bool success) void ShowFoto::saveIsComplete() { Digikam::LoadingCacheInterface::putImage(m_savingContext->destinationURL.path(), m_canvas->currentImage()); - d->thumbBar->invalidateThumb(d->currentItem); + d->thumbBar->tqinvalidateThumb(d->currentItem); } void ShowFoto::saveAsIsComplete() @@ -1055,7 +1055,7 @@ void ShowFoto::saveAsIsComplete() // Add the file to the list of thumbbar images if it's not there already Digikam::ThumbBarItem* foundItem = d->thumbBar->findItemByURL(m_savingContext->destinationURL); - d->thumbBar->invalidateThumb(foundItem); + d->thumbBar->tqinvalidateThumb(foundItem); if (!foundItem) foundItem = new Digikam::ThumbBarItem(d->thumbBar, m_savingContext->destinationURL); @@ -1101,8 +1101,8 @@ void ShowFoto::slotDeleteCurrentItem() if (!d->deleteItem2Trash) { - QString warnMsg(i18n("About to delete file \"%1\"\nAre you sure?") - .arg(urlCurrent.filename())); + TQString warnMsg(i18n("About to delete file \"%1\"\nAre you sure?") + .tqarg(urlCurrent.filename())); if (KMessageBox::warningContinueCancel(this, warnMsg, i18n("Warning"), @@ -1114,8 +1114,8 @@ void ShowFoto::slotDeleteCurrentItem() else { KIO::Job* job = KIO::del( urlCurrent ); - connect( job, SIGNAL(result( KIO::Job* )), - this, SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( KIO::Job* )), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); } } else @@ -1128,8 +1128,8 @@ void ShowFoto::slotDeleteCurrentItem() } KIO::Job* job = KIO::move( urlCurrent, dest ); - connect( job, SIGNAL(result( KIO::Job* )), - this, SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); + connect( job, TQT_SIGNAL(result( KIO::Job* )), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItemResult( KIO::Job*)) ); } } @@ -1137,7 +1137,7 @@ void ShowFoto::slotDeleteCurrentItemResult( KIO::Job * job ) { if (job->error() != 0) { - QString errMsg(job->errorString()); + TQString errMsg(job->errorString()); KMessageBox::error(this, errMsg); return; } @@ -1168,7 +1168,7 @@ void ShowFoto::slotDeleteCurrentItemResult( KIO::Job * job ) emit signalNoCurrentItem(); slotUpdateItemInfo(); toggleActions(false); - m_canvas->load(QString(), m_IOFileSettings); + m_canvas->load(TQString(), m_IOFileSettings); } else { @@ -1183,7 +1183,7 @@ void ShowFoto::slotDeleteCurrentItemResult( KIO::Job * job ) void ShowFoto::slotContextMenu() { - m_contextMenu->exec(QCursor::pos()); + m_contextMenu->exec(TQCursor::pos()); } void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& settings) @@ -1217,7 +1217,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett kapp->processEvents(); } - m_nameLabel->progressBarMode(Digikam::StatusProgressBar::TextMode, QString()); + m_nameLabel->progressBarMode(Digikam::StatusProgressBar::TextMode, TQString()); if (!m_cancelSlideShow) { diff --git a/digikam/showfoto/showfoto.h b/digikam/showfoto/showfoto.h index fe53c27..9028a57 100644 --- a/digikam/showfoto/showfoto.h +++ b/digikam/showfoto/showfoto.h @@ -53,6 +53,7 @@ class ShowFotoPriv; class ShowFoto : public Digikam::EditorWindow { Q_OBJECT + TQ_OBJECT public: @@ -117,9 +118,9 @@ private slots: void slotDeleteCurrentItemResult( KIO::Job * job ); - void slotLoadingStarted(const QString &filename); - void slotLoadingFinished(const QString &filename, bool success); - void slotSavingStarted(const QString &filename); + void slotLoadingStarted(const TQString &filename); + void slotLoadingFinished(const TQString &filename, bool success); + void slotSavingStarted(const TQString &filename); void slotContextMenu(); void slotRevert(); diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp index 0616ea0..ae462e0 100644 --- a/digikam/themedesigner/main.cpp +++ b/digikam/themedesigner/main.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp index 1e9868d..85c2b60 100644 --- a/digikam/themedesigner/mainwindow.cpp +++ b/digikam/themedesigner/mainwindow.cpp @@ -22,20 +22,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qpushbutton.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qframe.h> -#include <qsplitter.h> -#include <qheader.h> -#include <qlayout.h> -#include <qfileinfo.h> -#include <qtextstream.h> -#include <qdatetime.h> +// TQt includes. + +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqframe.h> +#include <tqsplitter.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> +#include <tqdatetime.h> // KDE includes. @@ -64,7 +64,7 @@ namespace Digikam { MainWindow::MainWindow() - : QWidget(0, 0, WDestructiveClose) + : TQWidget(0, 0, WDestructiveClose) { setCaption(i18n("digiKam Theme Designer")); @@ -78,11 +78,11 @@ MainWindow::MainWindow() // Actual views ------------------------------------------------ - QGridLayout* layout = new QGridLayout(this); + TQGridLayout* tqlayout = new TQGridLayout(this); - QSplitter* splitter = new QSplitter(this); - splitter->setOrientation( QSplitter::Horizontal ); - splitter->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + TQSplitter* splitter = new TQSplitter(this); + splitter->setOrientation( Qt::Horizontal ); + splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_folderView = new FolderView(splitter); m_iconView = new ThemedIconView(splitter); @@ -90,30 +90,30 @@ MainWindow::MainWindow() // Property Editor --------------------------------------------- - QGroupBox *groupBox = new QGroupBox(this); - QVBoxLayout* vlay = new QVBoxLayout(groupBox); + TQGroupBox *groupBox = new TQGroupBox(this); + TQVBoxLayout* vlay = new TQVBoxLayout(groupBox); - QLabel* label1 = new QLabel("Property: ", groupBox); - m_propertyCombo = new QComboBox(groupBox); + TQLabel* label1 = new TQLabel("Property: ", groupBox); + m_propertyCombo = new TQComboBox(groupBox); - m_bevelLabel = new QLabel("Bevel: ", groupBox); - m_bevelCombo = new QComboBox(groupBox); + m_bevelLabel = new TQLabel("Bevel: ", groupBox); + m_bevelCombo = new TQComboBox(groupBox); - m_gradientLabel = new QLabel("Gradient: ", groupBox); - m_gradientCombo = new QComboBox(groupBox); + m_gradientLabel = new TQLabel("Gradient: ", groupBox); + m_gradientCombo = new TQComboBox(groupBox); - m_begColorLabel = new QLabel("Start Color: ", groupBox); + m_begColorLabel = new TQLabel("Start Color: ", groupBox); m_begColorBtn = new KColorButton(groupBox); - m_endColorLabel = new QLabel("End Color: ", groupBox); + m_endColorLabel = new TQLabel("End Color: ", groupBox); m_endColorBtn = new KColorButton(groupBox); - m_addBorderCheck = new QCheckBox("Add Border", groupBox); + m_addBorderCheck = new TQCheckBox("Add Border", groupBox); - m_borderColorLabel = new QLabel("Border Color: ", groupBox); + m_borderColorLabel = new TQLabel("Border Color: ", groupBox); m_borderColorBtn = new KColorButton(groupBox); - vlay->setAlignment(Qt::AlignTop); + vlay->tqsetAlignment(TQt::AlignTop); vlay->setSpacing(5); vlay->setMargin(5); vlay->addWidget(label1); @@ -129,12 +129,12 @@ MainWindow::MainWindow() vlay->addWidget( m_addBorderCheck ); vlay->addWidget(m_borderColorLabel); vlay->addWidget(m_borderColorBtn); - vlay->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + vlay->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - layout->setMargin(5); - layout->setSpacing(5); - layout->addWidget(splitter, 0, 0); - layout->addWidget(groupBox, 0, 1); + tqlayout->setMargin(5); + tqlayout->setSpacing(5); + tqlayout->addWidget(splitter, 0, 0); + tqlayout->addWidget(groupBox, 0, 1); // ------------------------------------------------------------- @@ -176,65 +176,65 @@ MainWindow::MainWindow() m_gradientReverseMap[Theme::VERTICAL] = VERTICAL; m_gradientReverseMap[Theme::DIAGONAL] = DIAGONAL; - m_begColorBtn->setColor(Qt::black); - m_endColorBtn->setColor(Qt::black); - m_borderColorBtn->setColor(Qt::black); - - connect(m_propertyCombo, SIGNAL(activated(int)), - this, SLOT(slotPropertyChanged())); - connect(m_bevelCombo, SIGNAL(activated(int)), - this, SLOT(slotUpdateTheme())); - connect(m_gradientCombo, SIGNAL(activated(int)), - this, SLOT(slotUpdateTheme())); - - connect(m_begColorBtn, SIGNAL(changed(const QColor&)), - this, SLOT(slotUpdateTheme())); - connect(m_endColorBtn, SIGNAL(changed(const QColor&)), - this, SLOT(slotUpdateTheme())); - connect(m_addBorderCheck, SIGNAL(toggled(bool)), - this, SLOT(slotUpdateTheme())); - connect(m_borderColorBtn, SIGNAL(changed(const QColor&)), - this, SLOT(slotUpdateTheme())); + m_begColorBtn->setColor(TQt::black); + m_endColorBtn->setColor(TQt::black); + m_borderColorBtn->setColor(TQt::black); + + connect(m_propertyCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotPropertyChanged())); + connect(m_bevelCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotUpdateTheme())); + connect(m_gradientCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotUpdateTheme())); + + connect(m_begColorBtn, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(slotUpdateTheme())); + connect(m_endColorBtn, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(slotUpdateTheme())); + connect(m_addBorderCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotUpdateTheme())); + connect(m_borderColorBtn, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(slotUpdateTheme())); // Bottom button bar ------------------------------------------------------- - QHBoxLayout* buttonLayout = new QHBoxLayout(0); + TQHBoxLayout* buttonLayout = new TQHBoxLayout(0); buttonLayout->setMargin(5); buttonLayout->setSpacing(5); - buttonLayout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, - QSizePolicy::Minimum)); + buttonLayout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, + TQSizePolicy::Minimum)); - QPushButton* loadButton = new QPushButton( this ); + TQPushButton* loadButton = new TQPushButton( this ); loadButton->setText( "&Load" ); buttonLayout->addWidget( loadButton ); - QPushButton* saveButton = new QPushButton( this ); + TQPushButton* saveButton = new TQPushButton( this ); saveButton->setText( "&Save" ); buttonLayout->addWidget( saveButton ); - QPushButton* closeButton = new QPushButton( this ); + TQPushButton* closeButton = new TQPushButton( this ); closeButton->setText( "&Close" ); buttonLayout->addWidget( closeButton ); - layout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1); + tqlayout->addMultiCellLayout(buttonLayout, 1, 1, 0, 1); - connect(loadButton, SIGNAL(clicked()), - this, SLOT(slotLoad())); - connect(saveButton, SIGNAL(clicked()), - this, SLOT(slotSave())); - connect(closeButton, SIGNAL(clicked()), - this, SLOT(close())); + connect(loadButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotLoad())); + connect(saveButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSave())); + connect(closeButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(close())); // ------------------------------------------------------------------------ m_folderView->addColumn("My Albums"); - m_folderView->setResizeMode(QListView::LastColumn); + m_folderView->setResizeMode(TQListView::LastColumn); m_folderView->setRootIsDecorated(true); KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); for (int i=0; i<10; i++) { - FolderItem* folderItem = new FolderItem(m_folderView, QString("Album %1").arg(i)); + FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").tqarg(i)); folderItem->setPixmap(0, iconLoader->loadIcon("folder", KIcon::NoGroup, 32, KIcon::DefaultState, 0, true)); if (i == 2) @@ -255,12 +255,12 @@ MainWindow::~MainWindow() void MainWindow::slotLoad() { - QString path = KFileDialog::getOpenFileName(QString::null, QString::null, + TQString path = KFileDialog::getOpenFileName(TQString(), TQString(), this); if (path.isEmpty()) return; - QFileInfo fi(path); + TQFileInfo fi(path); m_theme->name = fi.fileName(); m_theme->filePath = path; @@ -271,18 +271,18 @@ void MainWindow::slotLoad() void MainWindow::slotSave() { - QString path = KFileDialog::getSaveFileName(QString::null, QString::null, this); + TQString path = KFileDialog::getSaveFileName(TQString(), TQString(), this); if (path.isEmpty()) return; - QFile file(path); + TQFile file(path); if (!file.open(IO_WriteOnly)) { KMessageBox::error(this, "Failed to open file for writing"); return; } - QFileInfo fi(path); + TQFileInfo fi(path); m_theme->name = fi.fileName(); m_theme->filePath = path; diff --git a/digikam/themedesigner/mainwindow.h b/digikam/themedesigner/mainwindow.h index 042d1e2..4829cac 100644 --- a/digikam/themedesigner/mainwindow.h +++ b/digikam/themedesigner/mainwindow.h @@ -25,14 +25,14 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qmap.h> +#include <tqwidget.h> +#include <tqmap.h> -class QComboBox; -class QCheckBox; -class QLabel; +class TQComboBox; +class TQCheckBox; +class TQLabel; class KColorButton; namespace Digikam @@ -43,9 +43,10 @@ class FolderView; class ThemedIconView; class Theme; -class MainWindow : public QWidget +class MainWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -92,22 +93,22 @@ private slots: private: - QLabel *m_bevelLabel; - QLabel *m_gradientLabel; - QLabel *m_begColorLabel; - QLabel *m_endColorLabel; - QLabel *m_borderColorLabel; + TQLabel *m_bevelLabel; + TQLabel *m_gradientLabel; + TQLabel *m_begColorLabel; + TQLabel *m_endColorLabel; + TQLabel *m_borderColorLabel; - QComboBox *m_propertyCombo; - QComboBox *m_bevelCombo; - QComboBox *m_gradientCombo; + TQComboBox *m_propertyCombo; + TQComboBox *m_bevelCombo; + TQComboBox *m_gradientCombo; - QCheckBox *m_addBorderCheck; + TQCheckBox *m_addBorderCheck; - QMap<int,int> m_bevelMap; - QMap<int,int> m_bevelReverseMap; - QMap<int,int> m_gradientMap; - QMap<int,int> m_gradientReverseMap; + TQMap<int,int> m_bevelMap; + TQMap<int,int> m_bevelReverseMap; + TQMap<int,int> m_gradientMap; + TQMap<int,int> m_gradientReverseMap; KColorButton *m_endColorBtn; KColorButton *m_begColorBtn; diff --git a/digikam/themedesigner/themedicongroupitem.cpp b/digikam/themedesigner/themedicongroupitem.cpp index 6586825..585bd52 100644 --- a/digikam/themedesigner/themedicongroupitem.cpp +++ b/digikam/themedesigner/themedicongroupitem.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqpainter.h> // KDE includes. @@ -50,11 +50,11 @@ ThemedIconGroupItem::~ThemedIconGroupItem() void ThemedIconGroupItem::paintBanner() { - QRect r(0, 0, rect().width(), rect().height()); + TQRect r(0, 0, rect().width(), rect().height()); - QPixmap pix(m_view->bannerPixmap()); + TQPixmap pix(m_view->bannerPixmap()); - QFont fn(m_view->font()); + TQFont fn(m_view->font()); fn.setBold(true); int fnSize = fn.pointSize(); bool usePointSize; @@ -70,13 +70,13 @@ void ThemedIconGroupItem::paintBanner() usePointSize = false; } - QPainter p(&pix); + TQPainter p(&pix); p.setPen(ThemeEngine::instance()->textSelColor()); p.setFont(fn); - QRect tr; + TQRect tr; p.drawText(5, 5, r.width(), r.height(), - Qt::AlignLeft | Qt::AlignTop, i18n("Album Banner"), + TQt::AlignLeft | TQt::AlignTop, i18n("Album Banner"), -1, &tr); r.setY(tr.height() + 2); @@ -90,13 +90,13 @@ void ThemedIconGroupItem::paintBanner() p.setFont(fn); p.drawText(5, r.y(), r.width(), r.height(), - Qt::AlignLeft | Qt::AlignVCenter, i18n("July 2007 - 10 Items")); + TQt::AlignLeft | TQt::AlignVCenter, i18n("July 2007 - 10 Items")); p.end(); r = rect(); - r = QRect(iconView()->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(iconView()->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(iconView()->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index 7195384..eb2a964 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -21,15 +21,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qpalette.h> -#include <qpen.h> -#include <qfontmetrics.h> -#include <qfont.h> -#include <qdatetime.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpalette.h> +#include <tqpen.h> +#include <tqfontmetrics.h> +#include <tqfont.h> +#include <tqdatetime.h> // KDE includes. @@ -47,21 +47,21 @@ namespace Digikam { -static void dateToString(const QDateTime& datetime, QString& str) +static void dateToString(const TQDateTime& datetime, TQString& str) { str = KGlobal::locale()->formatDateTime(datetime, true, false); } -static QString squeezedText(QPainter* p, int width, const QString& text) +static TQString squeezedText(TQPainter* p, int width, const TQString& text) { - QString fullText(text); - fullText.replace("\n"," "); - QFontMetrics fm(p->fontMetrics()); + TQString fullText(text); + fullText.tqreplace("\n"," "); + TQFontMetrics fm(p->fontMetrics()); int textWidth = fm.width(fullText); if (textWidth > width) { // start with the dots only - QString squeezedText = "..."; + TQString squeezedText = "..."; int squeezedWidth = fm.width(squeezedText); // estimate how many letters we can add to the dots on both sides @@ -107,8 +107,8 @@ static QString squeezedText(QPainter* p, int width, const QString& text) return fullText; } -ThemedIconItem::ThemedIconItem(IconGroupItem* parent) - : IconItem(parent) +ThemedIconItem::ThemedIconItem(IconGroupItem* tqparent) + : IconItem(tqparent) { } @@ -120,8 +120,8 @@ void ThemedIconItem::paintItem() { ThemedIconView* view = (ThemedIconView*)iconView(); - QPixmap pix; - QRect r; + TQPixmap pix; + TQRect r; if (isSelected()) pix = *(view->itemBaseSelPixmap()); @@ -130,13 +130,13 @@ void ThemedIconItem::paintItem() ThemeEngine* te = ThemeEngine::instance(); - QPainter p(&pix); + TQPainter p(&pix); p.setPen(isSelected() ? te->textSelColor() : te->textRegColor()); { r = view->itemPixmapRect(); KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); - QPixmap thumbnail = iconLoader->loadIcon("colors", KIcon::NoGroup, + TQPixmap thumbnail = iconLoader->loadIcon("colors", KIcon::NoGroup, 100, KIcon::DefaultState, 0, true); p.drawPixmap(r.x() + (r.width()-thumbnail.width())/2, @@ -146,47 +146,47 @@ void ThemedIconItem::paintItem() r = view->itemNameRect(); p.setFont(view->itemFontReg()); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), "IMG_00.JPG")); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), "IMG_00.JPG")); p.setFont(view->itemFontCom()); r = view->itemCommentsRect(); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), i18n("Photo caption"))); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), i18n("Photo caption"))); p.setFont(view->itemFontXtra()); { - QDateTime date = QDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); r = view->itemDateRect(); p.setFont(view->itemFontXtra()); - QString str; + TQString str; dateToString(date, str); - p.drawText(r, Qt::AlignCenter, squeezedText(&p, r.width(), str)); + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), str)); } p.setFont(view->itemFontCom()); p.setPen(isSelected() ? te->textSpecialSelColor() : te->textSpecialRegColor()); { - QString tags = i18n("Events, Places, Vacation"); + TQString tags = i18n("Events, Places, Vacation"); r = view->itemTagRect(); - p.drawText(r, Qt::AlignCenter, + p.drawText(r, TQt::AlignCenter, squeezedText(&p, r.width(), tags)); } if (this == view->currentItem()) { - p.setPen(QPen(isSelected() ? te->textSelColor() : te->textRegColor(), - 0, Qt::DotLine)); + p.setPen(TQPen(isSelected() ? te->textSelColor() : te->textRegColor(), + 0, TQt::DotLine)); p.drawRect(1, 1, pix.width()-2, pix.height()-2); } p.end(); r = rect(); - r = QRect(view->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(view->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height()); diff --git a/digikam/themedesigner/themediconitem.h b/digikam/themedesigner/themediconitem.h index 0d54cce..9505ce2 100644 --- a/digikam/themedesigner/themediconitem.h +++ b/digikam/themedesigner/themediconitem.h @@ -35,7 +35,7 @@ class ThemedIconItem : public IconItem { public: - ThemedIconItem(IconGroupItem* parent); + ThemedIconItem(IconGroupItem* tqparent); ~ThemedIconItem(); protected: diff --git a/digikam/themedesigner/themediconview.cpp b/digikam/themedesigner/themediconview.cpp index 2600434..59b2cb8 100644 --- a/digikam/themedesigner/themediconview.cpp +++ b/digikam/themedesigner/themediconview.cpp @@ -39,27 +39,27 @@ public: int thumbSize; - QRect itemRect; - QRect itemDateRect; - QRect itemPixmapRect; - QRect itemNameRect; - QRect itemCommentsRect; - QRect itemResolutionRect; - QRect itemSizeRect; - QRect itemTagRect; - QRect bannerRect; - - QPixmap itemRegPixmap; - QPixmap itemSelPixmap; - QPixmap bannerPixmap; - - QFont fnReg; - QFont fnCom; - QFont fnXtra; + TQRect tqitemRect; + TQRect itemDateRect; + TQRect itemPixmapRect; + TQRect itemNameRect; + TQRect itemCommentsRect; + TQRect itemResolutionRect; + TQRect itemSizeRect; + TQRect itemTagRect; + TQRect bannerRect; + + TQPixmap itemRegPixmap; + TQPixmap itemSelPixmap; + TQPixmap bannerPixmap; + + TQFont fnReg; + TQFont fnCom; + TQFont fnXtra; }; -ThemedIconView::ThemedIconView(QWidget* parent) - : IconView(parent) +ThemedIconView::ThemedIconView(TQWidget* tqparent) + : IconView(tqparent) { d = new ThemedIconViewPriv; d->thumbSize = 128; @@ -76,8 +76,8 @@ ThemedIconView::ThemedIconView(QWidget* parent) updateBannerRectPixmap(); updateItemRectsPixmap(); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); } ThemedIconView::~ThemedIconView() @@ -85,77 +85,77 @@ ThemedIconView::~ThemedIconView() delete d; } -QRect ThemedIconView::itemRect() const +TQRect ThemedIconView::tqitemRect() const { - return d->itemRect; + return d->tqitemRect; } -QRect ThemedIconView::itemDateRect() const +TQRect ThemedIconView::itemDateRect() const { return d->itemDateRect; } -QRect ThemedIconView::itemPixmapRect() const +TQRect ThemedIconView::itemPixmapRect() const { return d->itemPixmapRect; } -QRect ThemedIconView::itemNameRect() const +TQRect ThemedIconView::itemNameRect() const { return d->itemNameRect; } -QRect ThemedIconView::itemCommentsRect() const +TQRect ThemedIconView::itemCommentsRect() const { return d->itemCommentsRect; } -QRect ThemedIconView::itemResolutionRect() const +TQRect ThemedIconView::itemResolutionRect() const { return d->itemResolutionRect; } -QRect ThemedIconView::itemTagRect() const +TQRect ThemedIconView::itemTagRect() const { return d->itemTagRect; } -QRect ThemedIconView::itemSizeRect() const +TQRect ThemedIconView::itemSizeRect() const { return d->itemSizeRect; } -QRect ThemedIconView::bannerRect() const +TQRect ThemedIconView::bannerRect() const { return d->bannerRect; } -QPixmap* ThemedIconView::itemBaseRegPixmap() const +TQPixmap* ThemedIconView::itemBaseRegPixmap() const { return &d->itemRegPixmap; } -QPixmap* ThemedIconView::itemBaseSelPixmap() const +TQPixmap* ThemedIconView::itemBaseSelPixmap() const { return &d->itemSelPixmap; } -QPixmap ThemedIconView::bannerPixmap() const +TQPixmap ThemedIconView::bannerPixmap() const { return d->bannerPixmap; } -QFont ThemedIconView::itemFontReg() const +TQFont ThemedIconView::itemFontReg() const { return d->fnReg; } -QFont ThemedIconView::itemFontCom() const +TQFont ThemedIconView::itemFontCom() const { return d->fnCom; } -QFont ThemedIconView::itemFontXtra() const +TQFont ThemedIconView::itemFontXtra() const { return d->fnXtra; } @@ -168,7 +168,7 @@ void ThemedIconView::slotThemeChanged() viewport()->update(); } -void ThemedIconView::resizeEvent(QResizeEvent* e) +void ThemedIconView::resizeEvent(TQResizeEvent* e) { IconView::resizeEvent(e); @@ -178,10 +178,10 @@ void ThemedIconView::resizeEvent(QResizeEvent* e) void ThemedIconView::updateBannerRectPixmap() { - d->bannerRect = QRect(0, 0, 0, 0); + d->bannerRect = TQRect(0, 0, 0, 0); // Title -------------------------------------------------------- - QFont fn(font()); + TQFont fn(font()); int fnSize = fn.pointSize(); bool usePointSize; if (fnSize > 0) @@ -197,9 +197,9 @@ void ThemedIconView::updateBannerRectPixmap() } fn.setBold(true); - QFontMetrics fm(fn); - QRect tr = fm.boundingRect(0, 0, frameRect().width(), - 0xFFFFFFFF, Qt::AlignLeft | Qt::AlignVCenter, + TQFontMetrics fm(fn); + TQRect tr = fm.boundingRect(0, 0, frameRect().width(), + 0xFFFFFFFF, TQt::AlignLeft | TQt::AlignVCenter, "XXX"); d->bannerRect.setHeight(tr.height()); @@ -209,10 +209,10 @@ void ThemedIconView::updateBannerRectPixmap() fn.setPixelSize(font().pixelSize()); fn.setBold(false); - fm = QFontMetrics(fn); + fm = TQFontMetrics(fn); tr = fm.boundingRect(0, 0, frameRect().width(), - 0xFFFFFFFF, Qt::AlignLeft | Qt::AlignVCenter, + 0xFFFFFFFF, TQt::AlignLeft | TQt::AlignVCenter, "XXX"); d->bannerRect.setHeight(d->bannerRect.height() + tr.height() + 10); @@ -224,14 +224,14 @@ void ThemedIconView::updateBannerRectPixmap() void ThemedIconView::updateItemRectsPixmap() { - d->itemRect = QRect(0,0,0,0); - d->itemDateRect = QRect(0,0,0,0); - d->itemPixmapRect = QRect(0,0,0,0); - d->itemNameRect = QRect(0,0,0,0); - d->itemCommentsRect = QRect(0,0,0,0); - d->itemResolutionRect = QRect(0,0,0,0); - d->itemSizeRect = QRect(0,0,0,0); - d->itemTagRect = QRect(0,0,0,0); + d->tqitemRect = 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); + d->itemCommentsRect = TQRect(0,0,0,0); + d->itemResolutionRect = TQRect(0,0,0,0); + d->itemSizeRect = TQRect(0,0,0,0); + d->itemTagRect = TQRect(0,0,0,0); d->fnReg = font(); d->fnCom = font(); @@ -254,51 +254,51 @@ void ThemedIconView::updateItemRectsPixmap() int margin = 5; int w = d->thumbSize + 2*margin; - QFontMetrics fm(d->fnReg); - QRect oneRowRegRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + TQFontMetrics fm(d->fnReg); + TQRect oneRowRegRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); - fm = QFontMetrics(d->fnCom); - QRect oneRowComRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + fm = TQFontMetrics(d->fnCom); + TQRect oneRowComRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); - fm = QFontMetrics(d->fnXtra); - QRect oneRowXtraRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, - Qt::AlignTop | Qt::AlignHCenter, + fm = TQFontMetrics(d->fnXtra); + TQRect oneRowXtraRect = fm.boundingRect(0, 0, w, 0xFFFFFFFF, + TQt::AlignTop | TQt::AlignHCenter, "XXXXXXXXX"); int y = margin; - d->itemPixmapRect = QRect(margin, y, w, d->thumbSize+margin); + d->itemPixmapRect = TQRect(margin, y, w, d->thumbSize+margin); y = d->itemPixmapRect.bottom(); { - d->itemNameRect = QRect(margin, y, w, oneRowRegRect.height()); + d->itemNameRect = TQRect(margin, y, w, oneRowRegRect.height()); y = d->itemNameRect.bottom(); } { - d->itemCommentsRect = QRect(margin, y, w, oneRowComRect.height()); + d->itemCommentsRect = TQRect(margin, y, w, oneRowComRect.height()); y = d->itemCommentsRect.bottom(); } { - d->itemDateRect = QRect(margin, y, w, oneRowXtraRect.height()); + d->itemDateRect = TQRect(margin, y, w, oneRowXtraRect.height()); y = d->itemDateRect.bottom(); } { - d->itemTagRect = QRect(margin, y, w, oneRowComRect.height()); + d->itemTagRect = TQRect(margin, y, w, oneRowComRect.height()); y = d->itemTagRect.bottom(); } - d->itemRect = QRect(0, 0, w+2*margin, y+margin); + d->tqitemRect = TQRect(0, 0, w+2*margin, y+margin); - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); } } // NameSpace Digikam diff --git a/digikam/themedesigner/themediconview.h b/digikam/themedesigner/themediconview.h index 462b453..1018bc5 100644 --- a/digikam/themedesigner/themediconview.h +++ b/digikam/themedesigner/themediconview.h @@ -24,9 +24,9 @@ #ifndef THEMEDICONVIEW_H #define THEMEDICONVIEW_H -// Qt includes. +// TQt includes. -#include <qpixmap.h> +#include <tqpixmap.h> // Local includes. @@ -40,33 +40,34 @@ class ThemedIconViewPriv; class ThemedIconView : public IconView { Q_OBJECT + TQ_OBJECT public: - ThemedIconView(QWidget* parent); + ThemedIconView(TQWidget* tqparent); ~ThemedIconView(); - QRect itemRect() const; - QRect itemDateRect() const; - QRect itemPixmapRect() const; - QRect itemNameRect() const; - QRect itemCommentsRect() const; - QRect itemResolutionRect() const; - QRect itemSizeRect() const; - QRect itemTagRect() const; - QRect bannerRect() const; - - QPixmap* itemBaseRegPixmap() const; - QPixmap* itemBaseSelPixmap() const; - QPixmap bannerPixmap() const; - - QFont itemFontReg() const; - QFont itemFontCom() const; - QFont itemFontXtra() const; + TQRect tqitemRect() const; + TQRect itemDateRect() const; + TQRect itemPixmapRect() const; + TQRect itemNameRect() const; + TQRect itemCommentsRect() const; + TQRect itemResolutionRect() const; + TQRect itemSizeRect() const; + TQRect itemTagRect() const; + TQRect bannerRect() const; + + TQPixmap* itemBaseRegPixmap() const; + TQPixmap* itemBaseSelPixmap() const; + TQPixmap bannerPixmap() const; + + TQFont itemFontReg() const; + TQFont itemFontCom() const; + TQFont itemFontXtra() const; protected: - void resizeEvent(QResizeEvent* e); + void resizeEvent(TQResizeEvent* e); private: diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp index a889e21..bb4b0db 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp +++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qtimer.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqdatetime.h> // KDE includes. @@ -61,7 +61,7 @@ public: bool cancel; - QTime duration; + TQTime duration; ImageInfoJob *imageInfoJob; @@ -69,8 +69,8 @@ public: AlbumList::Iterator albumsIt; }; -BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(QWidget* parent) - : DProgressDlg(parent) +BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(TQWidget* tqparent) + : DProgressDlg(tqparent) { d = new BatchAlbumsSyncMetadataPriv; d->imageInfoJob = new ImageInfoJob(); @@ -79,7 +79,7 @@ BatchAlbumsSyncMetadata::BatchAlbumsSyncMetadata(QWidget* parent) setLabel(i18n("<b>Syncing the metadata of all images with the digiKam database. Please wait...</b>")); setButtonText(i18n("&Abort")); resize(600, 300); - QTimer::singleShot(500, this, SLOT(slotStart())); + TQTimer::singleShot(500, this, TQT_SLOT(slotStart())); } BatchAlbumsSyncMetadata::~BatchAlbumsSyncMetadata() @@ -92,11 +92,11 @@ void BatchAlbumsSyncMetadata::slotStart() setTitle(i18n("Parsing all albums")); setTotalSteps(d->palbumList.count()); - connect(d->imageInfoJob, SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, SIGNAL(signalCompleted()), - this, SLOT(slotComplete())); + connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), + this, TQT_SLOT(slotComplete())); d->albumsIt = d->palbumList.begin(); parseAlbum(); @@ -106,10 +106,10 @@ void BatchAlbumsSyncMetadata::parseAlbum() { if (d->albumsIt == d->palbumList.end()) // All is done. { - QTime t; + 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").arg(t.toString())); + setTitle(i18n("Duration: %1").tqarg(t.toString())); setButtonText(i18n("&Close")); advance(1); abort(); @@ -128,7 +128,7 @@ void BatchAlbumsSyncMetadata::parseAlbum() void BatchAlbumsSyncMetadata::slotAlbumParsed(const ImageInfoList& list) { - QPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( + TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon( "folder_image", KIcon::NoGroup, 32); ImageInfoList imageInfoList = list; @@ -165,7 +165,7 @@ void BatchAlbumsSyncMetadata::slotCancel() done(Cancel); } -void BatchAlbumsSyncMetadata::closeEvent(QCloseEvent *e) +void BatchAlbumsSyncMetadata::closeEvent(TQCloseEvent *e) { abort(); e->accept(); diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.h b/digikam/utilities/batch/batchalbumssyncmetadata.h index 8aa1971..c923d2f 100644 --- a/digikam/utilities/batch/batchalbumssyncmetadata.h +++ b/digikam/utilities/batch/batchalbumssyncmetadata.h @@ -30,7 +30,7 @@ #include "imageinfo.h" #include "dprogressdlg.h" -class QWidget; +class TQWidget; class KURL; @@ -42,10 +42,11 @@ class BatchAlbumsSyncMetadataPriv; class BatchAlbumsSyncMetadata : public DProgressDlg { Q_OBJECT + TQ_OBJECT public: - BatchAlbumsSyncMetadata(QWidget* parent); + BatchAlbumsSyncMetadata(TQWidget* tqparent); ~BatchAlbumsSyncMetadata(); signals: @@ -59,7 +60,7 @@ private: protected: - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); protected slots: diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp index 4caedb2..23d5d41 100644 --- a/digikam/utilities/batch/batchsyncmetadata.cpp +++ b/digikam/utilities/batch/batchsyncmetadata.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -70,15 +70,15 @@ public: ImageInfo *imageInfo; }; -BatchSyncMetadata::BatchSyncMetadata(QObject* parent, Album *album) - : QObject(parent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, Album *album) + : TQObject(tqparent) { d = new BatchSyncMetadataPriv; d->album = album; } -BatchSyncMetadata::BatchSyncMetadata(QObject* parent, const ImageInfoList& list) - : QObject(parent) +BatchSyncMetadata::BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list) + : TQObject(tqparent) { d = new BatchSyncMetadataPriv; d->imageInfoList = list; @@ -93,11 +93,11 @@ void BatchSyncMetadata::parseAlbum() { d->imageInfoJob->allItemsFromAlbum(d->album); - connect(d->imageInfoJob, SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, SLOT(slotAlbumParsed(const ImageInfoList&))); + connect(d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQT_SLOT(slotAlbumParsed(const ImageInfoList&))); - connect(d->imageInfoJob, SIGNAL(signalCompleted()), - this, SLOT(slotComplete())); + connect(d->imageInfoJob, TQT_SIGNAL(signalCompleted()), + this, TQT_SLOT(slotComplete())); } void BatchSyncMetadata::slotComplete() @@ -157,7 +157,7 @@ void BatchSyncMetadata::slotAbort() void BatchSyncMetadata::complete() { - emit signalProgressBarMode(StatusProgressBar::TextMode, QString()); + emit signalProgressBarMode(StatusProgressBar::TextMode, TQString()); emit signalComplete(); } diff --git a/digikam/utilities/batch/batchsyncmetadata.h b/digikam/utilities/batch/batchsyncmetadata.h index f1d1592..6cc61ea 100644 --- a/digikam/utilities/batch/batchsyncmetadata.h +++ b/digikam/utilities/batch/batchsyncmetadata.h @@ -25,9 +25,9 @@ #ifndef BATCHSYNCMETADATA_H #define BATCHSYNCMETADATA_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> // Local includes. @@ -41,17 +41,18 @@ namespace Digikam class Album; class BatchSyncMetadataPriv; -class BatchSyncMetadata : public QObject +class BatchSyncMetadata : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructor witch sync all metatada pictures from an Album */ - BatchSyncMetadata(QObject* parent, Album *album); + BatchSyncMetadata(TQObject* tqparent, Album *album); /** Constructor witch sync all metatada from an images list */ - BatchSyncMetadata(QObject* parent, const ImageInfoList& list); + BatchSyncMetadata(TQObject* tqparent, const ImageInfoList& list); ~BatchSyncMetadata(); @@ -62,7 +63,7 @@ signals: void signalComplete(); void signalProgressValue(int); - void signalProgressBarMode(int, const QString&); + void signalProgressBarMode(int, const TQString&); public slots: diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 3d6e7ec..1350343 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -28,13 +28,13 @@ extern "C" #include <unistd.h> } -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qtimer.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqdatetime.h> // KDE includes. @@ -69,20 +69,20 @@ public: bool cancel; - QTime duration; + TQTime duration; - QGuardedPtr<ThumbnailJob> thumbJob; + TQGuardedPtr<ThumbnailJob> thumbJob; }; -BatchThumbsGenerator::BatchThumbsGenerator(QWidget* parent) - : DProgressDlg(parent) +BatchThumbsGenerator::BatchThumbsGenerator(TQWidget* tqparent) + : DProgressDlg(tqparent) { d = new BatchThumbsGeneratorPriv; setValue(0); setCaption(i18n("Thumbnails processing")); setLabel(i18n("<b>Updating thumbnails database. Please wait...</b>")); setButtonText(i18n("&Abort")); - QTimer::singleShot(500, this, SLOT(slotRebuildThumbs128())); + TQTimer::singleShot(500, this, TQT_SLOT(slotRebuildThumbs128())); resize(600, 300); } @@ -102,8 +102,8 @@ void BatchThumbsGenerator::slotRebuildThumbs128() setTitle(i18n("Processing small thumbs")); rebuildAllThumbs(128); - connect(this, SIGNAL(signalRebuildThumbsDone()), - this, SLOT(slotRebuildThumbs256())); + connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), + this, TQT_SLOT(slotRebuildThumbs256())); } void BatchThumbsGenerator::slotRebuildThumbs256() @@ -111,27 +111,27 @@ void BatchThumbsGenerator::slotRebuildThumbs256() setTitle(i18n("Processing large thumbs")); rebuildAllThumbs(256); - disconnect(this, SIGNAL(signalRebuildThumbsDone()), - this, SLOT(slotRebuildThumbs256())); + disconnect(this, TQT_SIGNAL(signalRebuildThumbsDone()), + this, TQT_SLOT(slotRebuildThumbs256())); - connect(this, SIGNAL(signalRebuildThumbsDone()), - this, SLOT(slotRebuildAllThumbComplete())); + connect(this, TQT_SIGNAL(signalRebuildThumbsDone()), + this, TQT_SLOT(slotRebuildAllThumbComplete())); } void BatchThumbsGenerator::slotRebuildAllThumbComplete() { - QTime t; + TQTime t; t = t.addMSecs(d->duration.elapsed()); setLabel(i18n("<b>The thumbnails database has been updated.</b>")); - setTitle(i18n("Duration: %1").arg(t.toString())); + setTitle(i18n("Duration: %1").tqarg(t.toString())); setButtonText(i18n("&Close")); } void BatchThumbsGenerator::rebuildAllThumbs(int size) { - QStringList allPicturesPath; - QString thumbCacheDir = QDir::homeDirPath() + "/.thumbnails/"; - QString filesFilter = AlbumSettings::instance()->getAllFileFilter(); + TQStringList allPicturesPath; + TQString thumbCacheDir = TQDir::homeDirPath() + "/.thumbnails/"; + TQString filesFilter = AlbumSettings::instance()->getAllFileFilter(); bool exifRotate = AlbumSettings::instance()->getExifRotate(); AlbumDB *db = AlbumManager::instance()->albumDB(); AlbumList palbumList = AlbumManager::instance()->allPAlbums(); @@ -146,15 +146,15 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) continue; db->beginTransaction(); - QStringList albumItemsPath = db->getItemURLsInAlbum((*it)->id()); + TQStringList albumItemsPath = db->getItemURLsInAlbum((*it)->id()); db->commitTransaction(); - QStringList pathSorted; - for (QStringList::iterator it2 = albumItemsPath.begin(); + TQStringList pathSorted; + for (TQStringList::iterator it2 = albumItemsPath.begin(); !d->cancel && (it2 != albumItemsPath.end()); ++it2) { - QFileInfo fi(*it2); - if (filesFilter.contains(fi.extension(false))) + TQFileInfo fi(*it2); + if (filesFilter.tqcontains(fi.extension(false))) pathSorted.append(*it2); } @@ -165,20 +165,20 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) // Remove all current album item thumbs from disk cache. - for (QStringList::iterator it = allPicturesPath.begin(); + for (TQStringList::iterator it = allPicturesPath.begin(); !d->cancel && (it != allPicturesPath.end()); ++it) { - QString uri = "file://" + QDir::cleanDirPath(*it); - KMD5 md5(QFile::encodeName(uri)); + TQString uri = "file://" + TQDir::cleanDirPath(*it); + KMD5 md5(TQFile::encodeName(uri).data()); uri = md5.hexDigest(); - QString smallThumbPath = thumbCacheDir + "normal/" + uri + ".png"; - QString bigThumbPath = thumbCacheDir + "large/" + uri + ".png"; + TQString smallThumbPath = thumbCacheDir + "normal/" + uri + ".png"; + TQString bigThumbPath = thumbCacheDir + "large/" + uri + ".png"; if (size <= 128) - ::unlink(QFile::encodeName(smallThumbPath)); + ::unlink(TQFile::encodeName(smallThumbPath)); else - ::unlink(QFile::encodeName(bigThumbPath)); + ::unlink(TQFile::encodeName(bigThumbPath)); } if (!d->thumbJob.isNull()) @@ -189,17 +189,17 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) d->thumbJob = new ThumbnailJob(KURL::List(allPicturesPath), size, true, exifRotate); - connect(d->thumbJob, SIGNAL(signalThumbnail(const KURL&, const QPixmap&)), - this, SLOT(slotRebuildThumbDone(const KURL&, const QPixmap&))); + connect(d->thumbJob, TQT_SIGNAL(signalThumbnail(const KURL&, const TQPixmap&)), + this, TQT_SLOT(slotRebuildThumbDone(const KURL&, const TQPixmap&))); - connect(d->thumbJob, SIGNAL(signalFailed(const KURL&)), - this, SLOT(slotRebuildThumbDone(const KURL&))); + connect(d->thumbJob, TQT_SIGNAL(signalFailed(const KURL&)), + this, TQT_SLOT(slotRebuildThumbDone(const KURL&))); - connect(d->thumbJob, SIGNAL(signalCompleted()), - this, SIGNAL(signalRebuildThumbsDone())); + connect(d->thumbJob, TQT_SIGNAL(signalCompleted()), + this, TQT_SIGNAL(signalRebuildThumbsDone())); } -void BatchThumbsGenerator::slotRebuildThumbDone(const KURL& url, const QPixmap& pix) +void BatchThumbsGenerator::slotRebuildThumbDone(const KURL& url, const TQPixmap& pix) { addedAction(pix, url.path()); advance(1); @@ -211,7 +211,7 @@ void BatchThumbsGenerator::slotCancel() done(Cancel); } -void BatchThumbsGenerator::closeEvent(QCloseEvent *e) +void BatchThumbsGenerator::closeEvent(TQCloseEvent *e) { abort(); e->accept(); diff --git a/digikam/utilities/batch/batchthumbsgenerator.h b/digikam/utilities/batch/batchthumbsgenerator.h index 774da11..5a51916 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.h +++ b/digikam/utilities/batch/batchthumbsgenerator.h @@ -28,8 +28,8 @@ #include "dprogressdlg.h" -class QWidget; -class QPixmap; +class TQWidget; +class TQPixmap; class KURL; @@ -41,10 +41,11 @@ class BatchThumbsGeneratorPriv; class BatchThumbsGenerator : public DProgressDlg { Q_OBJECT + TQ_OBJECT public: - BatchThumbsGenerator(QWidget* parent); + BatchThumbsGenerator(TQWidget* tqparent); ~BatchThumbsGenerator(); signals: @@ -59,7 +60,7 @@ private: protected: - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); protected slots: @@ -69,7 +70,7 @@ private slots: void slotRebuildThumbs128(); void slotRebuildThumbs256(); - void slotRebuildThumbDone(const KURL& url, const QPixmap& pix=QPixmap()); + void slotRebuildThumbDone(const KURL& url, const TQPixmap& pix=TQPixmap()); void slotRebuildAllThumbComplete(); private: diff --git a/digikam/utilities/batch/imageinfoalbumsjob.cpp b/digikam/utilities/batch/imageinfoalbumsjob.cpp index 5fbc914..49bf3dc 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.cpp +++ b/digikam/utilities/batch/imageinfoalbumsjob.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -59,11 +59,11 @@ ImageInfoAlbumsJob::ImageInfoAlbumsJob() { d = new ImageInfoAlbumsJobPriv; - connect(&d->imageInfoJob, SIGNAL(signalItemsInfo(const ImageInfoList&)), - this, SLOT(slotItemsInfo(const ImageInfoList&))); + connect(&d->imageInfoJob, TQT_SIGNAL(signalItemsInfo(const ImageInfoList&)), + this, TQT_SLOT(slotItemsInfo(const ImageInfoList&))); - connect(&d->imageInfoJob, SIGNAL(signalCompleted()), - this, SLOT(slotComplete())); + connect(&d->imageInfoJob, TQT_SIGNAL(signalCompleted()), + this, TQT_SLOT(slotComplete())); } ImageInfoAlbumsJob::~ImageInfoAlbumsJob() diff --git a/digikam/utilities/batch/imageinfoalbumsjob.h b/digikam/utilities/batch/imageinfoalbumsjob.h index a1d22d5..9ed0008 100644 --- a/digikam/utilities/batch/imageinfoalbumsjob.h +++ b/digikam/utilities/batch/imageinfoalbumsjob.h @@ -24,10 +24,10 @@ #ifndef IMAGEINFOALBUMSJOB_H #define IMAGEINFOALBUMSJOB_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qcstring.h> +#include <tqobject.h> +#include <tqcstring.h> // Local includes. @@ -44,9 +44,10 @@ namespace Digikam class ImageInfoAlbumsJobPriv; -class ImageInfoAlbumsJob : public QObject +class ImageInfoAlbumsJob : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/batch/imageinfojob.cpp b/digikam/utilities/batch/imageinfojob.cpp index d7570d1..e58d375 100644 --- a/digikam/utilities/batch/imageinfojob.cpp +++ b/digikam/utilities/batch/imageinfojob.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatastream.h> +#include <tqstring.h> +#include <tqdatastream.h> // KDE includes. @@ -59,7 +59,7 @@ public: settings->getRawFileFilter().upper(); } - QString imagefilter; + TQString imagefilter; KIO::TransferJob *job; }; @@ -85,8 +85,8 @@ void ImageInfoJob::allItemsFromAlbum(Album *album) if (!album) return; - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << AlbumManager::instance()->getLibraryPath(); ds << album->kurl(); ds << d->imagefilter; @@ -96,13 +96,13 @@ void ImageInfoJob::allItemsFromAlbum(Album *album) // Protocol = digikamalbums -> kio_digikamalbums d->job = new KIO::TransferJob(album->kurl(), KIO::CMD_SPECIAL, - ba, QByteArray(), false); + ba, TQByteArray(), false); - connect(d->job, SIGNAL(result(KIO::Job*)), - this, SLOT(slotResult(KIO::Job*))); + connect(d->job, TQT_SIGNAL(result(KIO::Job*)), + this, TQT_SLOT(slotResult(KIO::Job*))); - connect(d->job, SIGNAL(data(KIO::Job*, const QByteArray&)), - this, SLOT(slotData(KIO::Job*, const QByteArray&))); + connect(d->job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), + this, TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); } void ImageInfoJob::stop() @@ -127,19 +127,19 @@ void ImageInfoJob::slotResult(KIO::Job* job) emit signalCompleted(); } -void ImageInfoJob::slotData(KIO::Job*, const QByteArray& data) +void ImageInfoJob::slotData(KIO::Job*, const TQByteArray& data) { if (data.isEmpty()) return; - Q_LLONG imageID; + TQ_LLONG imageID; int albumID; - QString name; - QString date; + TQString name; + TQString date; size_t size; - QSize dims; + TQSize dims; ImageInfoList itemsList; - QDataStream ds(data, IO_ReadOnly); + TQDataStream ds(data, IO_ReadOnly); while (!ds.atEnd()) { @@ -151,7 +151,7 @@ void ImageInfoJob::slotData(KIO::Job*, const QByteArray& data) ds >> dims; ImageInfo* info = new ImageInfo(imageID, albumID, name, - QDateTime::fromString(date, Qt::ISODate), + TQDateTime::fromString(date, Qt::ISODate), size, dims); itemsList.append(info); diff --git a/digikam/utilities/batch/imageinfojob.h b/digikam/utilities/batch/imageinfojob.h index 80fb112..e20371d 100644 --- a/digikam/utilities/batch/imageinfojob.h +++ b/digikam/utilities/batch/imageinfojob.h @@ -25,10 +25,10 @@ #ifndef IMAGEINFOJOB_H #define IMAGEINFOJOB_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qcstring.h> +#include <tqobject.h> +#include <tqcstring.h> // Local includes. @@ -45,9 +45,10 @@ namespace Digikam class Album; class ImageInfoJobPriv; -class ImageInfoJob : public QObject +class ImageInfoJob : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -65,7 +66,7 @@ signals: private slots: void slotResult(KIO::Job* job); - void slotData(KIO::Job* job, const QByteArray& data); + void slotData(KIO::Job* job, const TQByteArray& data); private: diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index a94f4df..d9e432c 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -23,15 +23,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qframe.h> -#include <qlayout.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qmap.h> +#include <tqlabel.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqdatetime.h> +#include <tqmap.h> // KDE includes. @@ -71,22 +71,22 @@ public: bool allowRootSelection; - QString newAlbumString; + TQString newAlbumString; - QMap<FolderItem*, PAlbum*> albumMap; + TQMap<FolderItem*, PAlbum*> albumMap; FolderView *folderView; SearchTextBar *searchBar; }; -AlbumSelectDialog::AlbumSelectDialog(QWidget* parent, PAlbum* albumToSelect, - const QString& header, - const QString& newAlbumString, +AlbumSelectDialog::AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, + const TQString& header, + const TQString& newAlbumString, bool allowRootSelection ) : KDialogBase(Plain, i18n("Select Album"), Help|User1|Ok|Cancel, Ok, - parent, 0, true, true, + tqparent, 0, true, true, i18n("&New Album")) { d = new AlbumSelectDialogPrivate; @@ -98,27 +98,27 @@ AlbumSelectDialog::AlbumSelectDialog(QWidget* parent, PAlbum* albumToSelect, // ------------------------------------------------------------- - QGridLayout* grid = new QGridLayout(plainPage(), 2, 1, 0, spacingHint()); + TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 1, 0, spacingHint()); - QLabel *logo = new QLabel(plainPage()); + TQLabel *logo = new TQLabel(plainPage()); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); - QLabel *message = new QLabel(plainPage()); + TQLabel *message = new TQLabel(plainPage()); if (!header.isEmpty()) message->setText(header); d->folderView = new FolderView(plainPage()); d->folderView->addColumn(i18n("My Albums")); - d->folderView->setColumnWidthMode( 0, QListView::Maximum ); - d->folderView->setResizeMode( QListView::AllColumns ); + d->folderView->setColumnWidthMode( 0, TQListView::Maximum ); + d->folderView->setResizeMode( TQListView::AllColumns ); d->folderView->setRootIsDecorated(true); d->searchBar = new SearchTextBar(plainPage(), "AlbumSelectDialogSearchBar"); // ------------------------------------------------------------- - QPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, + TQPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, AlbumSettings::instance()->getDefaultTreeIconSize(), KIcon::DefaultState, 0, true); AlbumList aList = AlbumManager::instance()->allPAlbums(); @@ -136,16 +136,16 @@ AlbumSelectDialog::AlbumSelectDialog(QWidget* parent, PAlbum* albumToSelect, } else { - FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); + FolderItem* tqparentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); - if (!parentItem) + if (!tqparentItem) { - DWarning() << "Failed to find parent for Album " + DWarning() << "Failed to find tqparent for Album " << album->title() << endl; continue; } - viewItem = new FolderItem(parentItem, album->title()); + viewItem = new FolderItem(tqparentItem, album->title()); } if (viewItem) @@ -173,23 +173,23 @@ AlbumSelectDialog::AlbumSelectDialog(QWidget* parent, PAlbum* albumToSelect, // ------------------------------------------------------------- - connect(AlbumManager::instance(), SIGNAL(signalAlbumAdded(Album*)), - this, SLOT(slotAlbumAdded(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumAdded(Album*)), + this, TQT_SLOT(slotAlbumAdded(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumDeleted(Album*)), - this, SLOT(slotAlbumDeleted(Album*))); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumDeleted(Album*)), + this, TQT_SLOT(slotAlbumDeleted(Album*))); - connect(AlbumManager::instance(), SIGNAL(signalAlbumsCleared()), - this, SLOT(slotAlbumsCleared())); + connect(AlbumManager::instance(), TQT_SIGNAL(signalAlbumsCleared()), + this, TQT_SLOT(slotAlbumsCleared())); - connect(d->folderView, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(d->folderView, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); - connect(d->folderView, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotContextMenu(QListViewItem*, const QPoint&, int))); + connect(d->folderView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int))); - connect(d->searchBar, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotSearchTextChanged(const QString&))); + connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotSearchTextChanged(const TQString&))); // ------------------------------------------------------------- @@ -207,21 +207,21 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album) if (!album || album->type() != Album::PHYSICAL) return; - FolderItem* parentItem = (FolderItem*)(album->parent()->extraData(d->folderView)); + FolderItem* tqparentItem = (FolderItem*)(album->tqparent()->extraData(d->folderView)); - if (!parentItem) + if (!tqparentItem) { - DWarning() << "Failed to find parent for Album " + DWarning() << "Failed to find tqparent for Album " << album->title() << endl; return; } KIconLoader *iconLoader = KApplication::kApplication()->iconLoader(); - QPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, + TQPixmap icon = iconLoader->loadIcon("folder", KIcon::NoGroup, AlbumSettings::instance()->getDefaultTreeIconSize(), KIcon::DefaultState, 0, true); - FolderItem* viewItem = new FolderItem(parentItem, album->title()); + FolderItem* viewItem = new FolderItem(tqparentItem, album->title()); viewItem->setPixmap(0, icon); album->setExtraData(d->folderView, viewItem); d->albumMap.insert(viewItem, (PAlbum*)album); @@ -249,8 +249,8 @@ void AlbumSelectDialog::slotAlbumsCleared() void AlbumSelectDialog::slotSelectionChanged() { - QListViewItem* selItem = 0; - QListViewItemIterator it(d->folderView); + TQListViewItem* selItem = 0; + TQListViewItemIterator it(d->folderView); while (it.current()) { @@ -272,20 +272,20 @@ void AlbumSelectDialog::slotSelectionChanged() enableButtonOK(true); } -void AlbumSelectDialog::slotContextMenu(QListViewItem *, const QPoint &, int) +void AlbumSelectDialog::slotContextMenu(TQListViewItem *, const TQPoint &, int) { - QPopupMenu popmenu(d->folderView); + TQPopupMenu popmenu(d->folderView); KAction *action = new KAction(i18n( "Create New Album" ), - "albumfolder-new", 0, this, - SLOT( slotUser1() ), - &popmenu); + "albumfolder-new", 0, TQT_TQOBJECT(this), + TQT_SLOT( slotUser1() ), + TQT_TQOBJECT(&popmenu)); action->plug(&popmenu); - popmenu.exec(QCursor::pos()); + popmenu.exec(TQCursor::pos()); } void AlbumSelectDialog::slotUser1() { - QListViewItem* item = d->folderView->currentItem(); + TQListViewItem* item = d->folderView->currentItem(); if (!item) item = d->folderView->firstChild(); @@ -297,18 +297,18 @@ void AlbumSelectDialog::slotUser1() return; bool ok; - QString newAlbumName = KInputDialog::getText(i18n("New Album Name"), + TQString newAlbumName = KInputDialog::getText(i18n("New Album Name"), i18n("Creating new album in '%1'\n" "Enter album name:") - .arg(album->prettyURL()), + .tqarg(album->prettyURL()), d->newAlbumString, &ok, this); if (!ok) return; - QString errMsg; + TQString errMsg; PAlbum* newAlbum = AlbumManager::instance()->createPAlbum(album, newAlbumName, - QString(), QDate::currentDate(), - QString(), errMsg); + TQString(), TQDate::tqcurrentDate(), + TQString(), errMsg); if (!newAlbum) { KMessageBox::error(this, errMsg); @@ -323,13 +323,13 @@ void AlbumSelectDialog::slotUser1() } } -PAlbum* AlbumSelectDialog::selectAlbum(QWidget* parent, +PAlbum* AlbumSelectDialog::selectAlbum(TQWidget* tqparent, PAlbum* albumToSelect, - const QString& header, - const QString& newAlbumString, + const TQString& header, + const TQString& newAlbumString, bool allowRootSelection ) { - AlbumSelectDialog dlg(parent, albumToSelect, + AlbumSelectDialog dlg(tqparent, albumToSelect, header, newAlbumString, allowRootSelection); @@ -346,9 +346,9 @@ PAlbum* AlbumSelectDialog::selectAlbum(QWidget* parent, return dlg.d->albumMap[item]; } -void AlbumSelectDialog::slotSearchTextChanged(const QString& filter) +void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter) { - QString search = filter.lower(); + TQString search = filter.lower(); bool atleastOneMatch = false; @@ -361,30 +361,30 @@ void AlbumSelectDialog::slotSearchTextChanged(const QString& filter) if (palbum->isRoot()) continue; - bool match = palbum->title().lower().contains(search); + bool match = palbum->title().lower().tqcontains(search); if (!match) { - // check if any of the parents match the search - Album* parent = palbum->parent(); - while (parent && !parent->isRoot()) + // check if any of the tqparents match the search + Album* tqparent = palbum->tqparent(); + while (tqparent && !tqparent->isRoot()) { - if (parent->title().lower().contains(search)) + if (tqparent->title().lower().tqcontains(search)) { match = true; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } } if (!match) { - // check if any of the children match the search + // check if any of the tqchildren match the search AlbumIterator it(palbum); while (it.current()) { - if ((*it)->title().lower().contains(search)) + if ((*it)->title().lower().tqcontains(search)) { match = true; break; diff --git a/digikam/utilities/cameragui/albumselectdialog.h b/digikam/utilities/cameragui/albumselectdialog.h index 20dc756..d9c70f7 100644 --- a/digikam/utilities/cameragui/albumselectdialog.h +++ b/digikam/utilities/cameragui/albumselectdialog.h @@ -26,9 +26,9 @@ #ifndef ALBUMSELECTDIALOG_H #define ALBUMSELECTDIALOG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -43,20 +43,21 @@ class AlbumSelectDialogPrivate; class AlbumSelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AlbumSelectDialog(QWidget* parent, PAlbum* albumToSelect, - const QString& header=QString(), - const QString& newAlbumString=QString(), + AlbumSelectDialog(TQWidget* tqparent, PAlbum* albumToSelect, + const TQString& header=TQString(), + const TQString& newAlbumString=TQString(), bool allowRootSelection=false); ~AlbumSelectDialog(); - static PAlbum* selectAlbum(QWidget* parent, + static PAlbum* selectAlbum(TQWidget* tqparent, PAlbum* albumToSelect, - const QString& header=QString(), - const QString& newAlbumString=QString(), + const TQString& header=TQString(), + const TQString& newAlbumString=TQString(), bool allowRootSelection=false); private slots: @@ -65,9 +66,9 @@ private slots: void slotAlbumDeleted(Album*); void slotAlbumsCleared(); void slotSelectionChanged(); - void slotContextMenu(QListViewItem *item, const QPoint&, int); + void slotContextMenu(TQListViewItem *item, const TQPoint&, int); void slotUser1(); - void slotSearchTextChanged(const QString&); + void slotSearchTextChanged(const TQString&); private: diff --git a/digikam/utilities/cameragui/animwidget.cpp b/digikam/utilities/cameragui/animwidget.cpp index a1112ab..ad60c05 100644 --- a/digikam/utilities/cameragui/animwidget.cpp +++ b/digikam/utilities/cameragui/animwidget.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> -#include <qpalette.h> -#include <qcolor.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpalette.h> +#include <tqcolor.h> +#include <tqtimer.h> // Local includes. @@ -51,25 +51,25 @@ public: int pos; int size; - QTimer *timer; + TQTimer *timer; - QPixmap pix; + TQPixmap pix; }; -AnimWidget::AnimWidget(QWidget* parent, int size) - : QWidget(parent, 0, WResizeNoErase|WRepaintNoErase) +AnimWidget::AnimWidget(TQWidget* tqparent, int size) + : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) { d = new AnimWidgetPriv; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); d->size = size; - d->pix = QPixmap(d->size, d->size); + d->pix = TQPixmap(d->size, d->size); setFixedSize(d->size, d->size); - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeout())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeout())); } AnimWidget::~AnimWidget() @@ -87,24 +87,24 @@ void AnimWidget::stop() { d->pos = 0; d->timer->stop(); - repaint(); + tqrepaint(); } -void AnimWidget::paintEvent(QPaintEvent*) +void AnimWidget::paintEvent(TQPaintEvent*) { - d->pix.fill(colorGroup().background()); - QPainter p(&d->pix); + d->pix.fill(tqcolorGroup().background()); + TQPainter p(&d->pix); p.translate(d->size/2, d->size/2); if (d->timer->isActive()) { - p.setPen(QPen(colorGroup().text())); + p.setPen(TQPen(tqcolorGroup().text())); p.rotate( d->pos ); } else { - p.setPen(QPen(colorGroup().dark())); + p.setPen(TQPen(tqcolorGroup().dark())); } for ( int i=0 ; i<12 ; i++ ) @@ -120,7 +120,7 @@ void AnimWidget::paintEvent(QPaintEvent*) void AnimWidget::slotTimeout() { d->pos = (d->pos + 10) % 360; - repaint(); + tqrepaint(); } bool AnimWidget::running() const diff --git a/digikam/utilities/cameragui/animwidget.h b/digikam/utilities/cameragui/animwidget.h index 533ef37..a286f9e 100644 --- a/digikam/utilities/cameragui/animwidget.h +++ b/digikam/utilities/cameragui/animwidget.h @@ -25,22 +25,23 @@ #ifndef ANIMWIDGET_H #define ANIMWIDGET_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class AnimWidgetPriv; -class AnimWidget : public QWidget +class AnimWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AnimWidget(QWidget* parent, int size=28); + AnimWidget(TQWidget* tqparent, int size=28); ~AnimWidget(); void start(); @@ -49,7 +50,7 @@ public: protected: - void paintEvent(QPaintEvent*); + void paintEvent(TQPaintEvent*); private slots: diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp index 10e134c..cbfefc9 100644 --- a/digikam/utilities/cameragui/cameracontroller.cpp +++ b/digikam/utilities/cameragui/cameracontroller.cpp @@ -32,20 +32,20 @@ extern "C" #include <typeinfo> #include <cstdio> -// Qt includes. - -#include <qthread.h> -#include <qmutex.h> -#include <qwaitcondition.h> -#include <qevent.h> -#include <qapplication.h> -#include <qdeepcopy.h> -#include <qvariant.h> -#include <qimage.h> -#include <qdatastream.h> -#include <qfile.h> -#include <qtimer.h> -#include <qregexp.h> +// TQt includes. + +#include <tqthread.h> +#include <tqmutex.h> +#include <tqwaitcondition.h> +#include <tqevent.h> +#include <tqapplication.h> +#include <tqdeepcopy.h> +#include <tqvariant.h> +#include <tqimage.h> +#include <tqdatastream.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqregexp.h> // KDE includes. @@ -95,10 +95,10 @@ public: }; Action action; - QMap<QString,QVariant> map; + TQMap<TQString,TQVariant> map; }; -class CameraEvent : public QCustomEvent +class CameraEvent : public TQCustomEvent { public: @@ -126,12 +126,12 @@ public: }; CameraEvent(State state) : - QCustomEvent(QEvent::User+state) + TQCustomEvent(TQEvent::User+state) {} bool result; - QString msg; - QMap<QString,QVariant> map; + TQString msg; + TQMap<TQString,TQVariant> map; }; class CameraControllerPriv @@ -145,7 +145,7 @@ public: skipAll = false; canceled = false; downloadTotal = 0; - parent = 0; + tqparent = 0; timer = 0; camera = 0; thread = 0; @@ -158,9 +158,9 @@ public: int downloadTotal; - QWidget *parent; + TQWidget *tqparent; - QTimer *timer; + TQTimer *timer; CameraThread *thread; @@ -169,7 +169,7 @@ public: MTQueue<CameraCommand> cmdQueue; }; -class CameraThread : public QThread +class CameraThread : public TQThread { public: @@ -177,8 +177,8 @@ public: ~CameraThread(); void sendBusy(bool busy); - void sendError(const QString& msg); - void sendInfo(const QString& msg); + void sendError(const TQString& msg); + void sendInfo(const TQString& msg); protected: @@ -188,11 +188,11 @@ private: CameraControllerPriv *d; - QObject *parent; + TQObject *tqparent; }; CameraThread::CameraThread(CameraController* controller) - : d(controller->d), parent(controller) + : d(controller->d), tqparent(controller) { } @@ -220,7 +220,7 @@ void CameraThread::run() CameraEvent* event = new CameraEvent(CameraEvent::gp_connected); event->result = result; - QApplication::postEvent(parent, event); + TQApplication::postEvent(tqparent, event); if (result) sendInfo(i18n("Connection established")); @@ -233,34 +233,34 @@ void CameraThread::run() { sendInfo(i18n("Getting camera information...")); - QString summary, manual, about; + TQString summary, manual, about; d->camera->cameraSummary(summary); d->camera->cameraManual(manual); d->camera->cameraAbout(about); CameraEvent* event = new CameraEvent(CameraEvent::gp_cameraInformations); - event->map.insert("summary", QVariant(summary)); - event->map.insert("manual", QVariant(manual)); - event->map.insert("about", QVariant(about)); - QApplication::postEvent(parent, event); + event->map.insert("summary", TQVariant(summary)); + event->map.insert("manual", TQVariant(manual)); + event->map.insert("about", TQVariant(about)); + TQApplication::postEvent(tqparent, event); break; } case(CameraCommand::gp_listfolders): { sendInfo(i18n("Listing folders...")); - QStringList folderList; + TQStringList folderList; folderList.append(d->camera->path()); d->camera->getAllFolders(d->camera->path(), folderList); /* TODO: ugly hack since qt <= 3.1.2 does not define - QStringList with QDeepCopy as a friend. */ - QValueList<QString> flist(folderList); + TQStringList with TQDeepCopy as a friend. */ + TQValueList<TQString> flist(folderList); CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfolders); - event->map.insert("folders", QVariant(flist)); - QApplication::postEvent(parent, event); + event->map.insert("folders", TQVariant(flist)); + TQApplication::postEvent(tqparent, event); sendInfo(i18n("The folders have been listed.")); @@ -268,63 +268,63 @@ void CameraThread::run() } case(CameraCommand::gp_listfiles): { - QString folder = cmd->map["folder"].asString(); + TQString folder = cmd->map["folder"].asString(); - sendInfo(i18n("The files in %1 have been listed.").arg(folder)); + sendInfo(i18n("The files in %1 have been listed.").tqarg(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").arg(folder)); + sendError(i18n("Failed to list files in %1").tqarg(folder)); } if (!itemsList.isEmpty()) { CameraEvent* event = new CameraEvent(CameraEvent::gp_listedfiles); - event->map.insert("folder", QVariant(folder)); + event->map.insert("folder", TQVariant(folder)); - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << itemsList; - event->map.insert("files", QVariant(ba)); - QApplication::postEvent(parent, event); + event->map.insert("files", TQVariant(ba)); + TQApplication::postEvent(tqparent, event); } - sendInfo(i18n("Listing files in %1 is complete").arg(folder)); + sendInfo(i18n("Listing files in %1 is complete").tqarg(folder)); break; } case(CameraCommand::gp_thumbnail): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); sendInfo(i18n("Getting thumbnails...")); - QImage thumbnail; + TQImage thumbnail; d->camera->getThumbnail(folder, file, thumbnail); if (!thumbnail.isNull()) { - thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, QImage::ScaleMin); + thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, TQ_ScaleMin); CameraEvent* event = new CameraEvent(CameraEvent::gp_thumbnailed); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("thumbnail", QVariant(thumbnail)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("thumbnail", TQVariant(thumbnail)); + TQApplication::postEvent(tqparent, event); } break; } case(CameraCommand::gp_exif): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); - sendInfo(i18n("Getting EXIF information for %1/%2...").arg(folder).arg(file)); + sendInfo(i18n("Getting EXIF information for %1/%2...").tqarg(folder).tqarg(file)); char* edata = 0; int esize = 0; @@ -332,52 +332,52 @@ void CameraThread::run() if (edata || esize) { - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds.writeRawBytes(edata, esize); delete [] edata; CameraEvent* event = new CameraEvent(CameraEvent::gp_exif); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("exifSize", QVariant(esize)); - event->map.insert("exifData", QVariant(ba)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("exifSize", TQVariant(esize)); + event->map.insert("exifData", TQVariant(ba)); + TQApplication::postEvent(tqparent, event); } break; } case(CameraCommand::gp_download): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); - QString dest = cmd->map["dest"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); + TQString dest = cmd->map["dest"].asString(); bool autoRotate = cmd->map["autoRotate"].asBool(); bool fixDateTime = cmd->map["fixDateTime"].asBool(); - QDateTime newDateTime = cmd->map["newDateTime"].asDateTime(); + TQDateTime newDateTime = cmd->map["newDateTime"].asDateTime(); bool setPhotographerId = cmd->map["setPhotographerId"].asBool(); - QString author = cmd->map["author"].asString(); - QString authorTitle = cmd->map["authorTitle"].asString(); + TQString author = cmd->map["author"].asString(); + TQString authorTitle = cmd->map["authorTitle"].asString(); bool setCredits = cmd->map["setCredits"].asBool(); - QString credit = cmd->map["credit"].asString(); - QString source = cmd->map["source"].asString(); - QString copyright = cmd->map["copyright"].asString(); + TQString credit = cmd->map["credit"].asString(); + TQString source = cmd->map["source"].asString(); + TQString copyright = cmd->map["copyright"].asString(); bool convertJpeg = cmd->map["convertJpeg"].asBool(); - QString losslessFormat = cmd->map["losslessFormat"].asString(); - sendInfo(i18n("Downloading file %1...").arg(file)); + TQString losslessFormat = cmd->map["losslessFormat"].asString(); + sendInfo(i18n("Downloading file %1...").tqarg(file)); // download to a temp file CameraEvent* event = new CameraEvent(CameraEvent::gp_downloadstarted); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("dest", QVariant(dest)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("dest", TQVariant(dest)); + TQApplication::postEvent(tqparent, event); KURL tempURL(dest); tempURL = tempURL.upURL(); - tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()).append(file)); + tempURL.addPath( TQString(".digikam-camera-tmp1-%1").tqarg(getpid()).append(file)); DDebug() << "Downloading: " << file << " using (" << tempURL.path() << ")" << endl; - QString temp = tempURL.path(); + TQString temp = tempURL.path(); bool result = d->camera->downloadItem(folder, file, 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...").arg(file)); + sendInfo(i18n("EXIF rotating file %1...").tqarg(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...").arg(file)); + sendInfo(i18n("Setting Metadata tags to file %1...").tqarg(file)); DMetadata metadata(tempURL.path()); if (fixDateTime) @@ -414,24 +414,24 @@ void CameraThread::run() if (convertJpeg) { DDebug() << "Convert to LossLess: " << file << " using (" << tempURL.path() << ")" << endl; - sendInfo(i18n("Converting %1 to lossless file format...").arg(file)); + sendInfo(i18n("Converting %1 to lossless file format...").tqarg(file)); KURL tempURL2(dest); tempURL2 = tempURL2.upURL(); - tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()).append(file)); + tempURL2.addPath( TQString(".digikam-camera-tmp2-%1").tqarg(getpid()).append(file)); temp = tempURL2.path(); if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat)) { // convert failed. delete the temp file - unlink(QFile::encodeName(tempURL.path())); - unlink(QFile::encodeName(tempURL2.path())); + unlink(TQFile::encodeName(tempURL.path())); + unlink(TQFile::encodeName(tempURL2.path())); result = false; } else { // Else remove only the first temp file. - unlink(QFile::encodeName(tempURL.path())); + unlink(TQFile::encodeName(tempURL.path())); } } } @@ -439,58 +439,58 @@ void CameraThread::run() if (result) { CameraEvent* event = new CameraEvent(CameraEvent::gp_downloaded); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("dest", QVariant(dest)); - event->map.insert("temp", QVariant(temp)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("dest", TQVariant(dest)); + event->map.insert("temp", TQVariant(temp)); + TQApplication::postEvent(tqparent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_downloadFailed); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("dest", QVariant(dest)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("dest", TQVariant(dest)); + TQApplication::postEvent(tqparent, event); } break; } case(CameraCommand::gp_open): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); - QString dest = cmd->map["dest"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); + TQString dest = cmd->map["dest"].asString(); - sendInfo(i18n("Retrieving file %1 from camera...").arg(file)); + sendInfo(i18n("Retrieving file %1 from camera...").tqarg(file)); bool result = d->camera->downloadItem(folder, file, dest); if (result) { CameraEvent* event = new CameraEvent(CameraEvent::gp_opened); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("dest", QVariant(dest)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("dest", TQVariant(dest)); + TQApplication::postEvent(tqparent, event); } else { - sendError(i18n("Failed to retrieve file %1 from camera").arg(file)); + sendError(i18n("Failed to retrieve file %1 from camera").tqarg(file)); } break; } case(CameraCommand::gp_upload): { - QString folder = cmd->map["destFolder"].asString(); + TQString folder = cmd->map["destFolder"].asString(); // We will using the same source file name to create the dest file // name in camera. - QString file = cmd->map["destFile"].asString(); + TQString file = cmd->map["destFile"].asString(); // The source file path to download in camera. - QString src = cmd->map["srcFilePath"].asString(); + TQString src = cmd->map["srcFilePath"].asString(); - sendInfo(i18n("Uploading file %1 to camera...").arg(file)); + sendInfo(i18n("Uploading file %1 to camera...").tqarg(file)); GPItemInfo itemsInfo; @@ -499,71 +499,71 @@ void CameraThread::run() if (result) { CameraEvent* event = new CameraEvent(CameraEvent::gp_uploaded); - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); ds << itemsInfo; - event->map.insert("info", QVariant(ba)); + event->map.insert("info", TQVariant(ba)); - QApplication::postEvent(parent, event); + TQApplication::postEvent(tqparent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_uploadFailed); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - event->map.insert("src", QVariant(src)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + event->map.insert("src", TQVariant(src)); + TQApplication::postEvent(tqparent, event); } break; } case(CameraCommand::gp_delete): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); - sendInfo(i18n("Deleting file %1...").arg(file)); + sendInfo(i18n("Deleting file %1...").tqarg(file)); bool result = d->camera->deleteItem(folder, file); if (result) { CameraEvent* event = new CameraEvent(CameraEvent::gp_deleted); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + TQApplication::postEvent(tqparent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_deleteFailed); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + TQApplication::postEvent(tqparent, event); } break; } case(CameraCommand::gp_lock): { - QString folder = cmd->map["folder"].asString(); - QString file = cmd->map["file"].asString(); + TQString folder = cmd->map["folder"].asString(); + TQString file = cmd->map["file"].asString(); bool lock = cmd->map["lock"].asBool(); - sendInfo(i18n("Toggle lock file %1...").arg(file)); + sendInfo(i18n("Toggle lock file %1...").tqarg(file)); bool result = d->camera->setLockItem(folder, file, lock); if (result) { CameraEvent* event = new CameraEvent(CameraEvent::gp_locked); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + TQApplication::postEvent(tqparent, event); } else { CameraEvent* event = new CameraEvent(CameraEvent::gp_lockFailed); - event->map.insert("folder", QVariant(folder)); - event->map.insert("file", QVariant(file)); - QApplication::postEvent(parent, event); + event->map.insert("folder", TQVariant(folder)); + event->map.insert("file", TQVariant(file)); + TQApplication::postEvent(tqparent, event); } break; } @@ -581,33 +581,33 @@ void CameraThread::sendBusy(bool val) { CameraEvent* event = new CameraEvent(CameraEvent::gp_busy); event->result = val; - QApplication::postEvent(parent, event); + TQApplication::postEvent(tqparent, event); } -void CameraThread::sendError(const QString& msg) +void CameraThread::sendError(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_errormsg); event->msg = msg; - QApplication::postEvent(parent, event); + TQApplication::postEvent(tqparent, event); } -void CameraThread::sendInfo(const QString& msg) +void CameraThread::sendInfo(const TQString& msg) { CameraEvent* event = new CameraEvent(CameraEvent::gp_infomsg); event->msg = msg; - QApplication::postEvent(parent, event); + TQApplication::postEvent(tqparent, event); } //-- Camera Controller ------------------------------------------------------ -CameraController::CameraController(QWidget* parent, const QString& title, const QString& model, - const QString& port, const QString& path) - : QObject(parent) +CameraController::CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, + const TQString& port, const TQString& path) + : TQObject(tqparent) { d = new CameraControllerPriv; - d->parent = parent; + d->tqparent = tqparent; d->canceled = false; d->close = false; d->overwriteAll = false; @@ -620,15 +620,15 @@ CameraController::CameraController(QWidget* parent, const QString& title, const { KURL url(path); DDebug() << "path " << path << " " << url << " " << url.host() << endl; - QString xport = url.host(); + TQString xport = url.host(); if (xport.startsWith("usb:")) { DDebug() << "xport " << xport << endl; - QRegExp x = QRegExp("(usb:[0-9,]*)"); + TQRegExp x = TQRegExp("(usb:[0-9,]*)"); if (x.search(xport) != -1) { - QString usbport = x.cap(1); + TQString usbport = x.cap(1); DDebug() << "USB " << xport << " " << usbport << endl; // if ((xport == usbport) || ((count == 1) && (xport == "usb:"))) { // model = xmodel; @@ -647,10 +647,10 @@ CameraController::CameraController(QWidget* parent, const QString& title, const } d->thread = new CameraThread(this); - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotProcessNext())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotProcessNext())); d->timer->start(50, false); } @@ -675,15 +675,15 @@ CameraController::~CameraController() delete d; } -QString CameraController::getCameraPath() +TQString CameraController::getCameraPath() { - if (!d->camera) return QString(); + if (!d->camera) return TQString(); return d->camera->path(); } -QString CameraController::getCameraTitle() +TQString CameraController::getCameraTitle() { - if (!d->camera) return QString(); + if (!d->camera) return TQString(); return d->camera->title(); } @@ -703,32 +703,32 @@ void CameraController::listFolders() d->cmdQueue.enqueue(cmd); } -void CameraController::listFiles(const QString& folder) +void CameraController::listFiles(const TQString& folder) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_listfiles; - cmd->map.insert("folder", QVariant(folder)); + cmd->map.insert("folder", TQVariant(folder)); d->cmdQueue.enqueue(cmd); } -void CameraController::getThumbnail(const QString& folder, const QString& file) +void CameraController::getThumbnail(const TQString& folder, const TQString& file) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_thumbnail; - cmd->map.insert("folder", QVariant(folder)); - cmd->map.insert("file", QVariant(file)); + cmd->map.insert("folder", TQVariant(folder)); + cmd->map.insert("file", TQVariant(file)); d->cmdQueue.enqueue(cmd); } -void CameraController::getExif(const QString& folder, const QString& file) +void CameraController::getExif(const TQString& folder, const TQString& file) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_exif; - cmd->map.insert("folder", QVariant(folder)); - cmd->map.insert("file", QVariant(file)); + cmd->map.insert("folder", TQVariant(folder)); + cmd->map.insert("file", TQVariant(file)); d->cmdQueue.enqueue(cmd); } @@ -740,14 +740,14 @@ void CameraController::getCameraInformations() d->cmdQueue.enqueue(cmd); } -void CameraController::upload(const QFileInfo& srcFileInfo, const QString& destFile, const QString& destFolder) +void CameraController::upload(const TQFileInfo& srcFileInfo, const TQString& destFile, const TQString& destFolder) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_upload; - cmd->map.insert("srcFilePath", QVariant(srcFileInfo.filePath())); - cmd->map.insert("destFile", QVariant(destFile)); - cmd->map.insert("destFolder", QVariant(destFolder)); + cmd->map.insert("srcFilePath", TQVariant(srcFileInfo.filePath())); + cmd->map.insert("destFile", TQVariant(destFile)); + cmd->map.insert("destFolder", TQVariant(destFolder)); d->cmdQueue.enqueue(cmd); DDebug() << "Uploading '" << srcFileInfo.filePath() << "' into camera : '" << destFolder << "' (" << destFile << ")" << endl; @@ -765,53 +765,53 @@ void CameraController::download(DownloadSettingsContainer downloadSettings) d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_download; - cmd->map.insert("folder", QVariant(downloadSettings.folder)); - cmd->map.insert("file", QVariant(downloadSettings.file)); - cmd->map.insert("dest", QVariant(downloadSettings.dest)); - cmd->map.insert("autoRotate", QVariant(downloadSettings.autoRotate, 0)); - cmd->map.insert("fixDateTime", QVariant(downloadSettings.fixDateTime, 0)); - cmd->map.insert("newDateTime", QVariant(downloadSettings.newDateTime)); - cmd->map.insert("setPhotographerId", QVariant(downloadSettings.setPhotographerId, 0)); - cmd->map.insert("author", QVariant(downloadSettings.author)); - cmd->map.insert("authorTitle", QVariant(downloadSettings.authorTitle)); - cmd->map.insert("setCredits", QVariant(downloadSettings.setCredits, 0)); - cmd->map.insert("credit", QVariant(downloadSettings.credit)); - cmd->map.insert("source", QVariant(downloadSettings.source)); - cmd->map.insert("copyright", QVariant(downloadSettings.copyright)); - cmd->map.insert("convertJpeg", QVariant(downloadSettings.convertJpeg, 0)); - cmd->map.insert("losslessFormat", QVariant(downloadSettings.losslessFormat)); + cmd->map.insert("folder", TQVariant(downloadSettings.folder)); + cmd->map.insert("file", TQVariant(downloadSettings.file)); + cmd->map.insert("dest", TQVariant(downloadSettings.dest)); + cmd->map.insert("autoRotate", TQVariant(downloadSettings.autoRotate, 0)); + cmd->map.insert("fixDateTime", TQVariant(downloadSettings.fixDateTime, 0)); + cmd->map.insert("newDateTime", TQVariant(downloadSettings.newDateTime)); + cmd->map.insert("setPhotographerId", TQVariant(downloadSettings.setPhotographerId, 0)); + cmd->map.insert("author", TQVariant(downloadSettings.author)); + cmd->map.insert("authorTitle", TQVariant(downloadSettings.authorTitle)); + cmd->map.insert("setCredits", TQVariant(downloadSettings.setCredits, 0)); + cmd->map.insert("credit", TQVariant(downloadSettings.credit)); + cmd->map.insert("source", TQVariant(downloadSettings.source)); + cmd->map.insert("copyright", TQVariant(downloadSettings.copyright)); + cmd->map.insert("convertJpeg", TQVariant(downloadSettings.convertJpeg, 0)); + cmd->map.insert("losslessFormat", TQVariant(downloadSettings.losslessFormat)); d->cmdQueue.enqueue(cmd); } -void CameraController::deleteFile(const QString& folder, const QString& file) +void CameraController::deleteFile(const TQString& folder, const TQString& file) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_delete; - cmd->map.insert("folder", QVariant(folder)); - cmd->map.insert("file", QVariant(file)); + cmd->map.insert("folder", TQVariant(folder)); + cmd->map.insert("file", TQVariant(file)); d->cmdQueue.enqueue(cmd); } -void CameraController::lockFile(const QString& folder, const QString& file, bool lock) +void CameraController::lockFile(const TQString& folder, const TQString& file, bool lock) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_lock; - cmd->map.insert("folder", QVariant(folder)); - cmd->map.insert("file", QVariant(file)); - cmd->map.insert("lock", QVariant(lock, 0)); + cmd->map.insert("folder", TQVariant(folder)); + cmd->map.insert("file", TQVariant(file)); + cmd->map.insert("lock", TQVariant(lock, 0)); d->cmdQueue.enqueue(cmd); } -void CameraController::openFile(const QString& folder, const QString& file) +void CameraController::openFile(const TQString& folder, const TQString& file) { d->canceled = false; CameraCommand *cmd = new CameraCommand; cmd->action = CameraCommand::gp_open; - cmd->map.insert("folder", QVariant(folder)); - cmd->map.insert("file", QVariant(file)); - cmd->map.insert("dest", QVariant(locateLocal("tmp", file))); + cmd->map.insert("folder", TQVariant(folder)); + cmd->map.insert("file", TQVariant(file)); + cmd->map.insert("dest", TQVariant(locateLocal("tmp", file))); d->cmdQueue.enqueue(cmd); } @@ -822,7 +822,7 @@ void CameraController::slotCancel() d->camera->cancel(); } -void CameraController::customEvent(QCustomEvent* e) +void CameraController::customEvent(TQCustomEvent* e) { CameraEvent* event = dynamic_cast<CameraEvent*>(e); if (!event) @@ -830,7 +830,7 @@ void CameraController::customEvent(QCustomEvent* e) return; } - switch(event->type()-QEvent::User) + switch(event->type()-TQEvent::User) { case (CameraEvent::gp_connected) : { @@ -839,15 +839,15 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_cameraInformations) : { - QString summary = QDeepCopy<QString>(event->map["summary"].asString()); - QString manual = QDeepCopy<QString>(event->map["manual"].asString()); - QString about = QDeepCopy<QString>(event->map["about"].asString()); + TQString summary = TQDeepCopy<TQString>(event->map["summary"].asString()); + TQString manual = TQDeepCopy<TQString>(event->map["manual"].asString()); + TQString about = TQDeepCopy<TQString>(event->map["about"].asString()); emit signalCameraInformations(summary, manual, about); break; } case (CameraEvent::gp_errormsg) : { - emit signalErrorMsg(QDeepCopy<QString>(event->msg)); + emit signalErrorMsg(TQDeepCopy<TQString>(event->msg)); break; } case (CameraEvent::gp_busy) : @@ -859,20 +859,20 @@ void CameraController::customEvent(QCustomEvent* e) case (CameraEvent::gp_infomsg) : { if (!d->canceled) - emit signalInfoMsg(QDeepCopy<QString>(event->msg)); + emit signalInfoMsg(TQDeepCopy<TQString>(event->msg)); break; } case (CameraEvent::gp_listedfolders) : { /* TODO: ugly hack since qt <= 3.1.2 does not define - QStringList with QDeepCopy as a friend. */ - QValueList<QVariant> flist = QDeepCopy< QValueList<QVariant> >(event->map["folders"].toList()); + TQStringList with TQDeepCopy as a friend. */ + TQValueList<TQVariant> flist = TQDeepCopy< TQValueList<TQVariant> >(event->map["folders"].toList()); - QStringList folderList; - QValueList<QVariant>::Iterator it; + TQStringList folderList; + TQValueList<TQVariant>::Iterator it; for (it = flist.begin(); it != flist.end(); ++it ) { - folderList.append(QDeepCopy<QString>((*it).asString())); + folderList.append(TQDeepCopy<TQString>((*it).asString())); } emit signalFolderList(folderList); @@ -880,9 +880,9 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_listedfiles) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QByteArray ba = QDeepCopy<QByteArray>(event->map["files"].asByteArray()); - QDataStream ds(ba, IO_ReadOnly); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQByteArray ba = TQDeepCopy<TQByteArray>(event->map["files"].asByteArray()); + TQDataStream ds(ba, IO_ReadOnly); GPItemInfoList items; ds >> items; emit signalFileList(items); @@ -890,33 +890,33 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_thumbnailed) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); - QImage thumb = QDeepCopy<QImage>(event->map["thumbnail"].asImage()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); + TQImage thumb = TQDeepCopy<TQImage>(event->map["thumbnail"].asImage()); emit signalThumbnail(folder, file, thumb); break; } case (CameraEvent::gp_exif) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); - QByteArray ba = QDeepCopy<QByteArray>(event->map["exifData"].asByteArray()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); + TQByteArray ba = TQDeepCopy<TQByteArray>(event->map["exifData"].asByteArray()); emit signalExifData(ba); break; } case (CameraEvent::gp_downloadstarted) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); emit signalDownloaded(folder, file, GPItemInfo::DownloadStarted); break; } case (CameraEvent::gp_downloaded) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); - QString dest = QDeepCopy<QString>(event->map["dest"].asString()); - QString temp = QDeepCopy<QString>(event->map["temp"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); + TQString dest = TQDeepCopy<TQString>(event->map["dest"].asString()); + TQString temp = TQDeepCopy<TQString>(event->map["temp"].asString()); d->timer->stop(); @@ -928,7 +928,7 @@ void CameraController::customEvent(QCustomEvent* e) if (!d->overwriteAll) { - QFileInfo info(dest); + TQFileInfo info(dest); while (info.exists()) { @@ -938,13 +938,13 @@ void CameraController::customEvent(QCustomEvent* e) break; } - KIO::RenameDlg dlg(d->parent, i18n("Rename File"), - folder + QString("/") + file, dest, + KIO::RenameDlg dlg(d->tqparent, i18n("Rename File"), + folder + TQString("/") + file, dest, KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP)); int result = dlg.exec(); dest = dlg.newDestURL().path(); - info = QFileInfo(dest); + info = TQFileInfo(dest); switch (result) { @@ -986,7 +986,7 @@ void CameraController::customEvent(QCustomEvent* e) if (cancel) { - unlink(QFile::encodeName(temp)); + unlink(TQFile::encodeName(temp)); slotCancel(); d->timer->start(50); emit signalSkipped(folder, file); @@ -994,18 +994,18 @@ void CameraController::customEvent(QCustomEvent* e) } else if (skip) { - unlink(QFile::encodeName(temp)); + unlink(TQFile::encodeName(temp)); d->timer->start(50); - emit signalInfoMsg(i18n("Skipped file %1").arg(file)); + emit signalInfoMsg(i18n("Skipped file %1").tqarg(file)); emit signalSkipped(folder, file); return; } // move the file to the destination file - if (rename(QFile::encodeName(temp), QFile::encodeName(dest)) != 0) + if (rename(TQFile::encodeName(temp), TQFile::encodeName(dest)) != 0) { // rename failed. delete the temp file - unlink(QFile::encodeName(temp)); + unlink(TQFile::encodeName(temp)); d->timer->start(50); emit signalDownloaded(folder, file, GPItemInfo::DownloadFailed); } @@ -1018,23 +1018,23 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_downloadFailed) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); d->timer->stop(); - QString msg = i18n("Failed to download file \"%1\".").arg(file); + TQString msg = i18n("Failed to download file \"%1\".").tqarg(file); if (!d->canceled) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->parent, msg); + KMessageBox::error(d->tqparent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->parent, msg); + int result = KMessageBox::warningContinueCancel(d->tqparent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1046,8 +1046,8 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_uploaded) : { - QByteArray ba = QDeepCopy<QByteArray>(event->map["info"].asByteArray()); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = TQDeepCopy<TQByteArray>(event->map["info"].asByteArray()); + TQDataStream ds(ba, IO_ReadOnly); GPItemInfo itemInfo; ds >> itemInfo; @@ -1056,24 +1056,24 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_uploadFailed) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); - QString src = QDeepCopy<QString>(event->map["src"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); + TQString src = TQDeepCopy<TQString>(event->map["src"].asString()); d->timer->stop(); - QString msg = i18n("Failed to upload file \"%1\".").arg(file); + TQString msg = i18n("Failed to upload file \"%1\".").tqarg(file); if (!d->canceled) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->parent, msg); + KMessageBox::error(d->tqparent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->parent, msg); + int result = KMessageBox::warningContinueCancel(d->tqparent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1084,31 +1084,31 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_deleted) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); emit signalDeleted(folder, file, true); break; } case (CameraEvent::gp_deleteFailed) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); d->timer->stop(); emit signalDeleted(folder, file, false); - QString msg = i18n("Failed to delete file \"%1\".").arg(file); + TQString msg = i18n("Failed to delete file \"%1\".").tqarg(file); if (!d->canceled) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->parent, msg); + KMessageBox::error(d->tqparent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->parent, msg); + int result = KMessageBox::warningContinueCancel(d->tqparent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1119,31 +1119,31 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_locked) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); emit signalLocked(folder, file, true); break; } case (CameraEvent::gp_lockFailed) : { - QString folder = QDeepCopy<QString>(event->map["folder"].asString()); - QString file = QDeepCopy<QString>(event->map["file"].asString()); + TQString folder = TQDeepCopy<TQString>(event->map["folder"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); d->timer->stop(); emit signalLocked(folder, file, false); - QString msg = i18n("Failed to toggle lock file \"%1\".").arg(file); + TQString msg = i18n("Failed to toggle lock file \"%1\".").tqarg(file); if (!d->canceled) { if (d->cmdQueue.isEmpty()) { - KMessageBox::error(d->parent, msg); + KMessageBox::error(d->tqparent, msg); } else { msg += i18n(" Do you want to continue?"); - int result = KMessageBox::warningContinueCancel(d->parent, msg); + int result = KMessageBox::warningContinueCancel(d->tqparent, msg); if (result != KMessageBox::Continue) slotCancel(); } @@ -1154,15 +1154,15 @@ void CameraController::customEvent(QCustomEvent* e) } case (CameraEvent::gp_opened) : { - QString file = QDeepCopy<QString>(event->map["file"].asString()); - QString dest = QDeepCopy<QString>(event->map["dest"].asString()); + TQString file = TQDeepCopy<TQString>(event->map["file"].asString()); + TQString dest = TQDeepCopy<TQString>(event->map["dest"].asString()); KURL url(dest); KURL::List urlList; urlList << url; ImageWindow *im = ImageWindow::imagewindow(); - im->loadURL(urlList, url, i18n("Camera \"%1\"").arg(d->camera->model()), false); + im->loadURL(urlList, url, i18n("Camera \"%1\"").tqarg(d->camera->model()), false); if (im->isHidden()) im->show(); @@ -1195,15 +1195,15 @@ void CameraController::slotProcessNext() CameraCommand* cmd = d->cmdQueue.head(); - QString folder; - QString file; - QString dest; + TQString folder; + TQString file; + TQString dest; if ((cmd->action == CameraCommand::gp_exif) && (typeid(*(d->camera)) == typeid(UMSCamera))) { - folder = QDeepCopy<QString>(cmd->map["folder"].asString()); - file = QDeepCopy<QString>(cmd->map["file"].asString()); + folder = TQDeepCopy<TQString>(cmd->map["folder"].asString()); + file = TQDeepCopy<TQString>(cmd->map["file"].asString()); emit signalExifFromFile(folder, file); @@ -1214,10 +1214,10 @@ void CameraController::slotProcessNext() if (cmd->action == CameraCommand::gp_download) { - folder = QDeepCopy<QString>(cmd->map["folder"].asString()); - file = QDeepCopy<QString>(cmd->map["file"].asString()); - dest = QDeepCopy<QString>(cmd->map["dest"].asString()); - cmd->map["dest"] = QVariant(QDeepCopy<QString>(dest)); + folder = TQDeepCopy<TQString>(cmd->map["folder"].asString()); + file = TQDeepCopy<TQString>(cmd->map["file"].asString()); + dest = TQDeepCopy<TQString>(cmd->map["dest"].asString()); + cmd->map["dest"] = TQVariant(TQDeepCopy<TQString>(dest)); } d->thread->start(); diff --git a/digikam/utilities/cameragui/cameracontroller.h b/digikam/utilities/cameragui/cameracontroller.h index 577ded7..dd7ddbe 100644 --- a/digikam/utilities/cameragui/cameracontroller.h +++ b/digikam/utilities/cameragui/cameracontroller.h @@ -25,11 +25,11 @@ #ifndef CAMERACONTROLLER_H #define CAMERACONTROLLER_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qstring.h> -#include <qfileinfo.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqfileinfo.h> // Local includes. @@ -41,53 +41,54 @@ namespace Digikam class CameraControllerPriv; -class CameraController : public QObject +class CameraController : public TQObject { Q_OBJECT + TQ_OBJECT public: - CameraController(QWidget* parent, const QString& title, const QString& model, - const QString& port, const QString& path); + CameraController(TQWidget* tqparent, const TQString& title, const TQString& model, + const TQString& port, const TQString& path); ~CameraController(); void listFolders(); - void listFiles(const QString& folder); - void getThumbnail(const QString& folder, const QString& file); - void getExif(const QString& folder, const QString& file); + void listFiles(const TQString& folder); + void getThumbnail(const TQString& folder, const TQString& file); + void getExif(const TQString& folder, const TQString& file); void getCameraInformations(); - QString getCameraPath(); - QString getCameraTitle(); + TQString getCameraPath(); + TQString getCameraTitle(); void downloadPrep(); void download(DownloadSettingsContainer downloadSettings); - void upload(const QFileInfo& srcFileInfo, const QString& destFile, const QString& destFolder); - void deleteFile(const QString& folder, const QString& file); - void lockFile(const QString& folder, const QString& file, bool lock); - void openFile(const QString& folder, const QString& file); + void upload(const TQFileInfo& srcFileInfo, const TQString& destFile, const TQString& destFolder); + void deleteFile(const TQString& folder, const TQString& file); + void lockFile(const TQString& folder, const TQString& file, bool lock); + void openFile(const TQString& folder, const TQString& file); signals: void signalBusy(bool val); - void signalInfoMsg(const QString& msg); - void signalErrorMsg(const QString& msg); - void signalCameraInformations(const QString& summary, const QString& manual, const QString& about); + void signalInfoMsg(const TQString& msg); + void signalErrorMsg(const TQString& msg); + void signalCameraInformations(const TQString& summary, const TQString& manual, const TQString& about); void signalConnected(bool val); - void signalFolderList(const QStringList& folderList); + void signalFolderList(const TQStringList& folderList); void signalFileList(const GPItemInfoList& infoList); void signalUploaded(const GPItemInfo& itemInfo); - void signalDownloaded(const QString& folder, const QString& file, int status); - void signalSkipped(const QString& folder, const QString& file); - void signalDeleted(const QString& folder, const QString& file, bool status); - void signalLocked(const QString& folder, const QString& file, bool status); - void signalThumbnail(const QString& folder, const QString& file, const QImage& thumb); - void signalExifFromFile(const QString& folder, const QString& file); - void signalExifData(const QByteArray& exifData); + void signalDownloaded(const TQString& folder, const TQString& file, int status); + void signalSkipped(const TQString& folder, const TQString& file); + void signalDeleted(const TQString& folder, const TQString& file, bool status); + void signalLocked(const TQString& folder, const TQString& file, bool status); + void signalThumbnail(const TQString& folder, const TQString& file, const TQImage& thumb); + void signalExifFromFile(const TQString& folder, const TQString& file); + void signalExifData(const TQByteArray& exifData); protected: - void customEvent(QCustomEvent* e); + void customEvent(TQCustomEvent* e); public slots: diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp index c5d72f5..36c31d5 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.cpp +++ b/digikam/utilities/cameragui/camerafolderdialog.cpp @@ -21,11 +21,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> // KDE includes. @@ -45,11 +45,11 @@ namespace Digikam { -CameraFolderDialog::CameraFolderDialog(QWidget *parent, CameraIconView *cameraView, - const QStringList& cameraFolderList, - const QString& cameraName, const QString& rootPath) - : KDialogBase(parent, 0, true, - i18n("%1 - Select Camera Folder").arg(cameraName), +CameraFolderDialog::CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, + const TQStringList& cameraFolderList, + const TQString& cameraName, const TQString& rootPath) + : KDialogBase(tqparent, 0, true, + i18n("%1 - Select Camera Folder").tqarg(cameraName), Help|Ok|Cancel, Ok, true) { setHelp("camerainterface.anchor", "digikam"); @@ -57,12 +57,12 @@ CameraFolderDialog::CameraFolderDialog(QWidget *parent, CameraIconView *cameraVi m_rootPath = rootPath; - QFrame *page = makeMainWidget(); - QGridLayout* grid = new QGridLayout(page, 2, 1, 0, spacingHint()); + TQFrame *page = makeMainWidget(); + TQGridLayout* grid = new TQGridLayout(page, 2, 1, 0, spacingHint()); m_folderView = new CameraFolderView(page); - QLabel *logo = new QLabel(page); - QLabel *message = new QLabel(page); + TQLabel *logo = new TQLabel(page); + TQLabel *message = new TQLabel(page); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true)); @@ -77,26 +77,26 @@ CameraFolderDialog::CameraFolderDialog(QWidget *parent, CameraIconView *cameraVi m_folderView->addVirtualFolder(cameraName); m_folderView->addRootFolder("/", cameraView->countItemsByFolder(rootPath)); - for (QStringList::const_iterator it = cameraFolderList.begin(); + for (TQStringList::const_iterator it = cameraFolderList.begin(); it != cameraFolderList.end(); ++it) { - QString folder(*it); - if (folder.startsWith(rootPath) && rootPath != QString("/")) + TQString folder(*it); + if (folder.startsWith(rootPath) && rootPath != TQString("/")) folder.remove(0, rootPath.length()); - if (folder != QString("/") && !folder.isEmpty()) + if (folder != TQString("/") && !folder.isEmpty()) { - QString root = folder.section( '/', 0, -2 ); - if (root.isEmpty()) root = QString("/"); + TQString root = folder.section( '/', 0, -2 ); + if (root.isEmpty()) root = TQString("/"); - QString sub = folder.section( '/', -1 ); + TQString sub = folder.section( '/', -1 ); m_folderView->addFolder(root, sub, cameraView->countItemsByFolder(*it)); DDebug() << "Camera folder: '" << folder << "' (root='" << root << "', sub='" <<sub <<"')" << endl; } } - connect(m_folderView, SIGNAL(signalFolderChanged(CameraFolderItem*)), - this, SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); + connect(m_folderView, TQT_SIGNAL(signalFolderChanged(CameraFolderItem*)), + this, TQT_SLOT(slotFolderPathSelectionChanged(CameraFolderItem*))); resize(500, 500); } @@ -105,17 +105,17 @@ CameraFolderDialog::~CameraFolderDialog() { } -QString CameraFolderDialog::selectedFolderPath() +TQString CameraFolderDialog::selectedFolderPath() { - QListViewItem *item = m_folderView->currentItem(); - if (!item) return QString(); + TQListViewItem *item = m_folderView->currentItem(); + if (!item) return TQString(); CameraFolderItem *folderItem = static_cast<CameraFolderItem *>(item); if (folderItem->isVirtualFolder()) - return QString(m_rootPath); + return TQString(m_rootPath); // Case of Gphoto2 cameras. No need to duplicate root '/'. - if (m_rootPath == QString("/")) + if (m_rootPath == TQString("/")) return(folderItem->folderPath()); return(m_rootPath + folderItem->folderPath()); diff --git a/digikam/utilities/cameragui/camerafolderdialog.h b/digikam/utilities/cameragui/camerafolderdialog.h index 788d36e..8aaf477 100644 --- a/digikam/utilities/cameragui/camerafolderdialog.h +++ b/digikam/utilities/cameragui/camerafolderdialog.h @@ -24,9 +24,9 @@ #ifndef CAMERAFOLDERDIALOG_H #define CAMERAFOLDERDIALOG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -42,14 +42,15 @@ class CameraFolderItem; class CameraFolderDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CameraFolderDialog(QWidget *parent, CameraIconView *cameraView, const QStringList& cameraFolderList, - const QString& cameraName, const QString& rootPath); + CameraFolderDialog(TQWidget *tqparent, CameraIconView *cameraView, const TQStringList& cameraFolderList, + const TQString& cameraName, const TQString& rootPath); ~CameraFolderDialog(); - QString selectedFolderPath(); + TQString selectedFolderPath(); private slots: @@ -57,7 +58,7 @@ private slots: private: - QString m_rootPath; + TQString m_rootPath; CameraFolderView *m_folderView; }; diff --git a/digikam/utilities/cameragui/camerafolderitem.cpp b/digikam/utilities/cameragui/camerafolderitem.cpp index 506c3f8..722c71f 100644 --- a/digikam/utilities/cameragui/camerafolderitem.cpp +++ b/digikam/utilities/cameragui/camerafolderitem.cpp @@ -42,13 +42,13 @@ public: int count; - QString folderName; - QString folderPath; - QString name; + TQString folderName; + TQString folderPath; + TQString name; }; -CameraFolderItem::CameraFolderItem(QListView* parent, const QString& name, const QPixmap& pixmap) - : QListViewItem(parent, name) +CameraFolderItem::CameraFolderItem(TQListView* tqparent, const TQString& name, const TQPixmap& pixmap) + : TQListViewItem(tqparent, name) { d = new CameraFolderItemPriv; d->virtualFolder = true; @@ -56,9 +56,9 @@ CameraFolderItem::CameraFolderItem(QListView* parent, const QString& name, const setPixmap(0, pixmap); } -CameraFolderItem::CameraFolderItem(QListViewItem* parent, const QString& folderName, - const QString& folderPath, const QPixmap& pixmap) - : QListViewItem(parent, folderName) +CameraFolderItem::CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, + const TQString& folderPath, const TQPixmap& pixmap) + : TQListViewItem(tqparent, folderName) { d = new CameraFolderItemPriv; d->folderName = folderName; @@ -78,12 +78,12 @@ bool CameraFolderItem::isVirtualFolder() return d->virtualFolder; } -QString CameraFolderItem::folderName() +TQString CameraFolderItem::folderName() { return d->folderName; } -QString CameraFolderItem::folderPath() +TQString CameraFolderItem::folderPath() { return d->folderPath; } @@ -91,13 +91,13 @@ QString CameraFolderItem::folderPath() void CameraFolderItem::changeCount(int val) { d->count += val; - setText(0, QString("%1 (%2)").arg(d->name).arg(QString::number(d->count))); + setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count))); } void CameraFolderItem::setCount(int val) { d->count = val; - setText(0, QString("%1 (%2)").arg(d->name).arg(QString::number(d->count))); + setText(0, TQString("%1 (%2)").tqarg(d->name).tqarg(TQString::number(d->count))); } int CameraFolderItem::count() diff --git a/digikam/utilities/cameragui/camerafolderitem.h b/digikam/utilities/cameragui/camerafolderitem.h index 5aa33ac..b88ce2d 100644 --- a/digikam/utilities/cameragui/camerafolderitem.h +++ b/digikam/utilities/cameragui/camerafolderitem.h @@ -25,10 +25,10 @@ #ifndef CAMERAFOLDERITEM_H #define CAMERAFOLDERITEM_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqlistview.h> // KDE includes. @@ -39,21 +39,21 @@ namespace Digikam class CameraFolderItemPriv; -class CameraFolderItem : public QListViewItem +class CameraFolderItem : public TQListViewItem { public: - CameraFolderItem(QListView* parent, const QString& name, - const QPixmap& pixmap=SmallIcon("folder")); + CameraFolderItem(TQListView* tqparent, const TQString& name, + const TQPixmap& pixmap=SmallIcon("folder")); - CameraFolderItem(QListViewItem* parent, const QString& folderName, const QString& folderPath, - const QPixmap& pixmap=SmallIcon("folder")); + CameraFolderItem(TQListViewItem* tqparent, const TQString& folderName, const TQString& folderPath, + const TQPixmap& pixmap=SmallIcon("folder")); ~CameraFolderItem(); - QString folderName(); - QString folderPath(); + TQString folderName(); + TQString folderPath(); bool isVirtualFolder(); void changeCount(int val); void setCount(int val); diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp index 7dbf612..d459f18 100644 --- a/digikam/utilities/cameragui/camerafolderview.cpp +++ b/digikam/utilities/cameragui/camerafolderview.cpp @@ -45,30 +45,30 @@ public: { virtualFolder = 0; rootFolder = 0; - cameraName = QString("Camera"); + cameraName = TQString("Camera"); } - QString cameraName; + TQString cameraName; CameraFolderItem *virtualFolder; CameraFolderItem *rootFolder; }; -CameraFolderView::CameraFolderView(QWidget* parent) - : QListView(parent) +CameraFolderView::CameraFolderView(TQWidget* tqparent) + : TQListView(tqparent) { d = new CameraFolderViewPriv; addColumn(i18n("Camera Folders")); - setColumnWidthMode( 0, QListView::Maximum ); - setResizeMode( QListView::AllColumns ); - setSelectionMode(QListView::Single); + setColumnWidthMode( 0, TQListView::Maximum ); + setResizeMode( TQListView::AllColumns ); + setSelectionMode(TQListView::Single); - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(slotCurrentChanged(QListViewItem*))); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); - connect(this, SIGNAL(clicked(QListViewItem*)), - this, SLOT(slotCurrentChanged(QListViewItem*))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), + this, TQT_SLOT(slotCurrentChanged(TQListViewItem*))); } CameraFolderView::~CameraFolderView() @@ -76,7 +76,7 @@ CameraFolderView::~CameraFolderView() delete d; } -void CameraFolderView::addVirtualFolder(const QString& name, const QPixmap& pixmap) +void CameraFolderView::addVirtualFolder(const TQString& name, const TQPixmap& pixmap) { d->cameraName = name; d->virtualFolder = new CameraFolderItem(this, d->cameraName, pixmap); @@ -85,30 +85,30 @@ void CameraFolderView::addVirtualFolder(const QString& name, const QPixmap& pixm d->virtualFolder->setSelectable(false); } -void CameraFolderView::addRootFolder(const QString& folder, int nbItems, const QPixmap& pixmap) +void CameraFolderView::addRootFolder(const TQString& folder, int nbItems, const TQPixmap& pixmap) { d->rootFolder = new CameraFolderItem(d->virtualFolder, folder, folder, pixmap); d->rootFolder->setOpen(true); d->rootFolder->setCount(nbItems); } -CameraFolderItem* CameraFolderView::addFolder(const QString& folder, const QString& subFolder, - int nbItems, const QPixmap& pixmap) +CameraFolderItem* CameraFolderView::addFolder(const TQString& folder, const TQString& subFolder, + int nbItems, const TQPixmap& pixmap) { - CameraFolderItem *parentItem = findFolder(folder); + CameraFolderItem *tqparentItem = findFolder(folder); DDebug() << "CameraFolderView: Adding Subfolder " << subFolder << " of folder " << folder << endl; - if (parentItem) + if (tqparentItem) { - QString path(folder); + TQString path(folder); if (!folder.endsWith("/")) path += '/'; path += subFolder; - CameraFolderItem* item = new CameraFolderItem(parentItem, subFolder, path, pixmap); + CameraFolderItem* item = new CameraFolderItem(tqparentItem, subFolder, path, pixmap); DDebug() << "CameraFolderView: Added ViewItem with path " << item->folderPath() << endl; @@ -119,16 +119,16 @@ CameraFolderItem* CameraFolderView::addFolder(const QString& folder, const QStri } else { - DWarning() << "CameraFolderView: Couldn't find parent for subFolder " + DWarning() << "CameraFolderView: Couldn't find tqparent for subFolder " << subFolder << " of folder " << folder << endl; return 0; } } -CameraFolderItem* CameraFolderView::findFolder(const QString& folderPath) +CameraFolderItem* CameraFolderView::findFolder(const TQString& folderPath) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); for ( ; it.current(); ++it) { CameraFolderItem* item = static_cast<CameraFolderItem*>(it.current()); @@ -140,7 +140,7 @@ CameraFolderItem* CameraFolderView::findFolder(const QString& folderPath) return 0; } -void CameraFolderView::slotCurrentChanged(QListViewItem* item) +void CameraFolderView::slotCurrentChanged(TQListViewItem* item) { if (!item) emit signalFolderChanged(0); @@ -160,7 +160,7 @@ CameraFolderItem* CameraFolderView::rootFolder() void CameraFolderView::clear() { - QListView::clear(); + TQListView::clear(); d->virtualFolder = 0; d->rootFolder = 0; emit signalCleared(); diff --git a/digikam/utilities/cameragui/camerafolderview.h b/digikam/utilities/cameragui/camerafolderview.h index 8687e99..207bf10 100644 --- a/digikam/utilities/cameragui/camerafolderview.h +++ b/digikam/utilities/cameragui/camerafolderview.h @@ -25,10 +25,10 @@ #ifndef CAMERAFOLDERVIEW_H #define CAMERAFOLDERVIEW_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqlistview.h> // KDE includes. @@ -40,22 +40,23 @@ namespace Digikam class CameraFolderItem; class CameraFolderViewPriv; -class CameraFolderView : public QListView +class CameraFolderView : public TQListView { Q_OBJECT + TQ_OBJECT public: - CameraFolderView(QWidget* parent); + CameraFolderView(TQWidget* tqparent); ~CameraFolderView(); - void addVirtualFolder(const QString& name, const QPixmap& pixmap=SmallIcon("camera")); - void addRootFolder(const QString& folder, int nbItems, const QPixmap& pixmap=SmallIcon("folder")); + void addVirtualFolder(const TQString& name, const TQPixmap& pixmap=SmallIcon("camera")); + void addRootFolder(const TQString& folder, int nbItems, const TQPixmap& pixmap=SmallIcon("folder")); - CameraFolderItem* addFolder(const QString& folder, const QString& subFolder, int nbItems, - const QPixmap& pixmap=SmallIcon("folder")); + CameraFolderItem* addFolder(const TQString& folder, const TQString& subFolder, int nbItems, + const TQPixmap& pixmap=SmallIcon("folder")); - CameraFolderItem* findFolder(const QString& folderPath); + CameraFolderItem* findFolder(const TQString& folderPath); CameraFolderItem* virtualFolder(); CameraFolderItem* rootFolder(); @@ -69,7 +70,7 @@ signals: private slots: - void slotCurrentChanged(QListViewItem*); + void slotCurrentChanged(TQListViewItem*); private: diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp index c7cd180..d6fbf24 100644 --- a/digikam/utilities/cameragui/cameraiconitem.cpp +++ b/digikam/utilities/cameragui/cameraiconitem.cpp @@ -22,10 +22,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> // KDE includes. @@ -54,21 +54,21 @@ public: itemInfo = 0; } - QString downloadName; + TQString downloadName; - QPixmap pixmap; - QPixmap thumbnail; + TQPixmap pixmap; + TQPixmap thumbnail; - QRect pixRect; - QRect textRect; - QRect extraRect; + TQRect pixRect; + TQRect textRect; + TQRect extraRect; GPItemInfo *itemInfo; }; -CameraIconViewItem::CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, - const QImage& thumbnail, const QString& downloadName) - : IconItem(parent) +CameraIconViewItem::CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, + const TQImage& thumbnail, const TQString& downloadName) + : IconItem(tqparent) { d = new CameraIconViewItemPriv; d->itemInfo = new GPItemInfo(itemInfo); @@ -82,9 +82,9 @@ CameraIconViewItem::~CameraIconViewItem() delete d; } -void CameraIconViewItem::setThumbnail(const QImage& thumbnail) +void CameraIconViewItem::setThumbnail(const TQImage& thumbnail) { - d->thumbnail = QPixmap(thumbnail); + d->thumbnail = TQPixmap(thumbnail); } GPItemInfo* CameraIconViewItem::itemInfo() const @@ -95,10 +95,10 @@ GPItemInfo* CameraIconViewItem::itemInfo() const void CameraIconViewItem::paintItem() { CameraIconView* view = (CameraIconView*)iconView(); - QFont fn(view->font()); + TQFont fn(view->font()); - QPixmap pix; - QRect r(rect()); + TQPixmap pix; + TQRect r(rect()); if (isSelected()) pix = *(view->itemBaseSelPixmap()); @@ -107,10 +107,10 @@ void CameraIconViewItem::paintItem() ThemeEngine* te = ThemeEngine::instance(); - QPainter p(&pix); + TQPainter p(&pix); - QString itemName = AlbumIconItem::squeezedText(&p, r.width()-5, d->itemInfo->name); - QString downloadName = AlbumIconItem::squeezedText(&p, r.width()-5, d->downloadName); + TQString itemName = AlbumIconItem::squeezedText(&p, r.width()-5, d->itemInfo->name); + TQString downloadName = AlbumIconItem::squeezedText(&p, r.width()-5, d->downloadName); calcRect(itemName, downloadName); p.setPen(isSelected() ? te->textSelColor() : te->textRegColor()); @@ -119,32 +119,32 @@ void CameraIconViewItem::paintItem() d->pixRect.y() + (d->pixRect.height() - d->pixmap.height()) /2, d->pixmap); - p.drawText(d->textRect, Qt::AlignHCenter|Qt::AlignTop, itemName); + p.drawText(d->textRect, TQt::AlignHCenter|TQt::AlignTop, itemName); if (!d->downloadName.isEmpty()) { if (fn.pointSize() > 0) - fn.setPointSize(QMAX(fn.pointSize()-2, 6)); + fn.setPointSize(TQMAX(fn.pointSize()-2, 6)); p.setFont(fn); p.setPen(isSelected() ? te->textSpecialSelColor() : te->textSpecialRegColor()); - p.drawText(d->extraRect, Qt::AlignHCenter|Qt::AlignTop, downloadName); + p.drawText(d->extraRect, TQt::AlignHCenter|TQt::AlignTop, downloadName); } if (this == iconView()->currentItem()) { - p.setPen(QPen(isSelected() ? Qt::white : Qt::black, 1, Qt::DotLine)); + p.setPen(TQPen(isSelected() ? TQt::white : TQt::black, 1, TQt::DotLine)); p.drawRect(0, 0, r.width(), r.height()); } // Draw download status icon. - QPixmap downloaded; + TQPixmap downloaded; switch (d->itemInfo->downloaded) { case GPItemInfo::NewPicture: { - downloaded = QPixmap(view->newPicturePixmap()); + downloaded = TQPixmap(view->newPicturePixmap()); break; } case GPItemInfo::DownloadedYes: @@ -183,19 +183,19 @@ void CameraIconViewItem::paintItem() p.end(); - r = QRect(view->contentsToViewport(QPoint(r.x(), r.y())), - QSize(r.width(), r.height())); + r = TQRect(view->contentsToViewport(TQPoint(r.x(), r.y())), + TQSize(r.width(), r.height())); bitBlt(view->viewport(), r.x(), r.y(), &pix); } -void CameraIconViewItem::setDownloadName(const QString& downloadName) +void CameraIconViewItem::setDownloadName(const TQString& downloadName) { d->downloadName = downloadName; - repaint(); + tqrepaint(); } -QString CameraIconViewItem::getDownloadName() const +TQString CameraIconViewItem::getDownloadName() const { return d->downloadName; } @@ -203,7 +203,7 @@ QString CameraIconViewItem::getDownloadName() const void CameraIconViewItem::setDownloaded(int status) { d->itemInfo->downloaded = status; - repaint(); + tqrepaint(); } bool CameraIconViewItem::isDownloaded() const @@ -218,81 +218,81 @@ void CameraIconViewItem::toggleLock() else d->itemInfo->writePermissions = 0; - repaint(); + tqrepaint(); } -void CameraIconViewItem::calcRect(const QString& itemName, const QString& downloadName) +void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& downloadName) { CameraIconView* view = (CameraIconView*)iconView(); int thumbSize = view->thumbnailSize().size(); - d->pixmap = QPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, QImage::ScaleMin)); - d->pixRect = QRect(0,0,0,0); - d->textRect = QRect(0,0,0,0); - d->extraRect = QRect(0,0,0,0); - QRect itemRect = rect(); - itemRect.moveTopLeft(QPoint(0, 0)); + d->pixmap = TQPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, TQ_ScaleMin)); + 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)); d->pixRect.setWidth(thumbSize); d->pixRect.setHeight(thumbSize); - QFontMetrics fm(iconView()->font()); - QRect r = QRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, - Qt::AlignHCenter | Qt::AlignTop, + TQFontMetrics fm(iconView()->font()); + TQRect r = TQRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, + TQt::AlignHCenter | TQt::AlignTop, itemName)); d->textRect.setWidth(r.width()); d->textRect.setHeight(r.height()); if (!d->downloadName.isEmpty()) { - QFont fn(iconView()->font()); + TQFont fn(iconView()->font()); if (fn.pointSize() > 0) { - fn.setPointSize(QMAX(fn.pointSize()-2, 6)); + fn.setPointSize(TQMAX(fn.pointSize()-2, 6)); } - fm = QFontMetrics(fn); - r = QRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, - Qt::AlignHCenter | Qt::WordBreak, + fm = TQFontMetrics(fn); + r = TQRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, + TQt::AlignHCenter | TQt::WordBreak, downloadName)); d->extraRect.setWidth(r.width()); d->extraRect.setHeight(r.height()); - d->textRect.setWidth(QMAX(d->textRect.width(), d->extraRect.width())); + d->textRect.setWidth(TQMAX(d->textRect.width(), d->extraRect.width())); d->textRect.setHeight(d->textRect.height() + d->extraRect.height()); } - int w = QMAX(d->textRect.width(), d->pixRect.width() ); + int w = TQMAX(d->textRect.width(), d->pixRect.width() ); int h = d->textRect.height() + d->pixRect.height() ; - itemRect.setWidth(w+4); - itemRect.setHeight(h+4); + tqitemRect.setWidth(w+4); + tqitemRect.setHeight(h+4); // Center the pix and text rect - d->pixRect = QRect(2, 2, d->pixRect.width(), d->pixRect.height()); - d->textRect = QRect((itemRect.width() - d->textRect.width())/2, - itemRect.height() - d->textRect.height(), + 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.width(), d->textRect.height()); if (!d->extraRect.isEmpty()) { - d->extraRect = QRect((itemRect.width() - d->extraRect.width())/2, - itemRect.height() - d->extraRect.height(), + d->extraRect = TQRect((tqitemRect.width() - d->extraRect.width())/2, + tqitemRect.height() - d->extraRect.height(), d->extraRect.width(), d->extraRect.height()); } } -QRect CameraIconViewItem::clickToOpenRect() +TQRect CameraIconViewItem::clickToOpenRect() { - QRect r(rect()); + TQRect r(rect()); if (d->pixmap.isNull()) { - QRect pixRect(d->pixRect); + TQRect pixRect(d->pixRect); pixRect.moveBy(r.x(), r.y()); return pixRect; } - QRect pixRect(d->pixRect.x() + (d->pixRect.width() - d->pixmap.width())/2, + TQRect pixRect(d->pixRect.x() + (d->pixRect.width() - d->pixmap.width())/2, d->pixRect.y() + (d->pixRect.height() - d->pixmap.height())/2, d->pixmap.width(), d->pixmap.height()); pixRect.moveBy(r.x(), r.y()); diff --git a/digikam/utilities/cameragui/cameraiconitem.h b/digikam/utilities/cameragui/cameraiconitem.h index 7d03d86..e053010 100644 --- a/digikam/utilities/cameragui/cameraiconitem.h +++ b/digikam/utilities/cameragui/cameraiconitem.h @@ -25,10 +25,10 @@ #ifndef CAMERAICONITEM_H #define CAMERAICONITEM_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qimage.h> +#include <tqstring.h> +#include <tqimage.h> // Local includes. @@ -45,14 +45,14 @@ class CameraIconViewItem : public IconItem public: - CameraIconViewItem(IconGroupItem* parent, const GPItemInfo& itemInfo, - const QImage& thumbnail, const QString& downloadName=QString()); + CameraIconViewItem(IconGroupItem* tqparent, const GPItemInfo& itemInfo, + const TQImage& thumbnail, const TQString& downloadName=TQString()); ~CameraIconViewItem(); - void setThumbnail(const QImage& thumbnail); + void setThumbnail(const TQImage& thumbnail); - void setDownloadName(const QString& downloadName); - QString getDownloadName() const; + void setDownloadName(const TQString& downloadName); + TQString getDownloadName() const; void setDownloaded(int status); bool isDownloaded() const; @@ -61,7 +61,7 @@ public: GPItemInfo* itemInfo() const; // reimplemented from IconItem - virtual QRect clickToOpenRect(); + virtual TQRect clickToOpenRect(); protected: @@ -69,7 +69,7 @@ protected: private: - void calcRect(const QString& itemName, const QString& downloadName); + void calcRect(const TQString& itemName, const TQString& downloadName); private: diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index b1e8e6c..4203fdf 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -22,18 +22,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qfile.h> -#include <qfileinfo.h> -#include <qtimer.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qfontmetrics.h> -#include <qfont.h> -#include <qdragobject.h> -#include <qclipboard.h> +// TQt includes. + +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqfontmetrics.h> +#include <tqfont.h> +#include <tqdragobject.h> +#include <tqclipboard.h> // KDE includes. @@ -72,21 +72,21 @@ public: groupItem = 0; cameraUI = 0; thumbSize = ThumbnailSize::Large; - pixmapNewPicture = QPixmap(newPicture_xpm); - pixmapUnknowPicture = QPixmap(unknowPicture_xpm); + pixmapNewPicture = TQPixmap(newPicture_xpm); + pixmapUnknowPicture = TQPixmap(unknowPicture_xpm); } static const char *newPicture_xpm[]; static const char *unknowPicture_xpm[]; - QDict<CameraIconViewItem> itemDict; + TQDict<CameraIconViewItem> itemDict; - QRect itemRect; + TQRect tqitemRect; - QPixmap itemRegPixmap; - QPixmap itemSelPixmap; - QPixmap pixmapNewPicture; - QPixmap pixmapUnknowPicture; + TQPixmap itemRegPixmap; + TQPixmap itemSelPixmap; + TQPixmap pixmapNewPicture; + TQPixmap pixmapUnknowPicture; RenameCustomizer *renamer; @@ -222,14 +222,14 @@ const char *CameraIconViewPriv::unknowPicture_xpm[] = " " }; -CameraIconView::CameraIconView(CameraUI* ui, QWidget* parent) - : IconView(parent) +CameraIconView::CameraIconView(CameraUI* ui, TQWidget* tqparent) + : IconView(tqparent) { d = new CameraIconViewPriv; d->cameraUI = ui; d->groupItem = new IconGroupItem(this); - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); setMinimumSize(400, 300); setAcceptDrops(true); @@ -237,23 +237,23 @@ CameraIconView::CameraIconView(CameraUI* ui, QWidget* parent) // ---------------------------------------------------------------- - connect(this, SIGNAL(signalSelectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(signalSelectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); - connect(this, SIGNAL(signalNewSelection(bool)), - this, SLOT(slotUpdateDownloadNames(bool))); + connect(this, TQT_SIGNAL(signalNewSelection(bool)), + this, TQT_SLOT(slotUpdateDownloadNames(bool))); - connect(this, SIGNAL(signalRightButtonClicked(IconItem*, const QPoint&)), - this, SLOT(slotContextMenu(IconItem*, const QPoint&))); + connect(this, TQT_SIGNAL(signalRightButtonClicked(IconItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(IconItem*, const TQPoint&))); - connect(this, SIGNAL(signalRightButtonClicked(const QPoint &)), - this, SLOT(slotRightButtonClicked(const QPoint &))); + connect(this, TQT_SIGNAL(signalRightButtonClicked(const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(const TQPoint &))); - connect(this, SIGNAL(signalDoubleClicked(IconItem*)), - this, SLOT(slotDoubleClicked(IconItem*))); + connect(this, TQT_SIGNAL(signalDoubleClicked(IconItem*)), + this, TQT_SLOT(slotDoubleClicked(IconItem*))); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); // ---------------------------------------------------------------- @@ -267,22 +267,22 @@ CameraIconView::~CameraIconView() delete d; } -QPixmap* CameraIconView::itemBaseRegPixmap() const +TQPixmap* CameraIconView::itemBaseRegPixmap() const { return &d->itemRegPixmap; } -QPixmap* CameraIconView::itemBaseSelPixmap() const +TQPixmap* CameraIconView::itemBaseSelPixmap() const { return &d->itemSelPixmap; } -QPixmap CameraIconView::newPicturePixmap() const +TQPixmap CameraIconView::newPicturePixmap() const { return d->pixmapNewPicture; } -QPixmap CameraIconView::unknowPicturePixmap() const +TQPixmap CameraIconView::unknowPicturePixmap() const { return d->pixmapUnknowPicture; } @@ -291,20 +291,20 @@ void CameraIconView::setRenameCustomizer(RenameCustomizer* renamer) { d->renamer = renamer; - connect(d->renamer, SIGNAL(signalChanged()), - this, SLOT(slotDownloadNameChanged())); + connect(d->renamer, TQT_SIGNAL(signalChanged()), + this, TQT_SLOT(slotDownloadNameChanged())); } void CameraIconView::addItem(const GPItemInfo& info) { - QImage thumb; + TQImage thumb; // Just to have a generic image thumb from desktop with KDE < 3.5.0 - KMimeType::Ptr mime = KMimeType::mimeType(info.mime == QString("image/x-raw") ? - QString("image/tiff") : info.mime); + KMimeType::Ptr mime = KMimeType::mimeType(info.mime == TQString("image/x-raw") ? + TQString("image/tiff") : info.mime); if (mime) { - thumb = QImage(mime->pixmap(KIcon::Desktop, ThumbnailSize::Huge, KIcon::DefaultState) + thumb = TQImage(mime->pixmap(KIcon::Desktop, ThumbnailSize::Huge, KIcon::DefaultState) .convertToImage()); } else @@ -315,7 +315,7 @@ void CameraIconView::addItem(const GPItemInfo& info) .convertToImage(); } - QString downloadName; + TQString downloadName; if (d->renamer) { @@ -333,9 +333,9 @@ void CameraIconView::addItem(const GPItemInfo& info) d->itemDict.insert(info.folder+info.name, item); } -void CameraIconView::removeItem(const QString& folder, const QString& file) +void CameraIconView::removeItem(const TQString& folder, const TQString& file) { - CameraIconViewItem* item = d->itemDict.find(folder+file); + CameraIconViewItem* item = d->itemDict.tqfind(folder+file); if (!item) return; d->itemDict.remove(folder+file); @@ -345,12 +345,12 @@ void CameraIconView::removeItem(const QString& folder, const QString& file) setDelayedRearrangement(false); } -CameraIconViewItem* CameraIconView::findItem(const QString& folder, const QString& file) +CameraIconViewItem* CameraIconView::findItem(const TQString& folder, const TQString& file) { - return d->itemDict.find(folder+file); + return d->itemDict.tqfind(folder+file); } -int CameraIconView::countItemsByFolder(QString folder) +int CameraIconView::countItemsByFolder(TQString folder) { int count = 0; if (folder.endsWith("/")) folder.truncate(folder.length()-1); @@ -358,7 +358,7 @@ int CameraIconView::countItemsByFolder(QString folder) for (IconItem* item = firstItem(); item; item = item->nextItem()) { CameraIconViewItem* iconItem = static_cast<CameraIconViewItem*>(item); - QString itemFolder = iconItem->itemInfo()->folder; + TQString itemFolder = iconItem->itemInfo()->folder; if (itemFolder.endsWith("/")) itemFolder.truncate(itemFolder.length()-1); if (folder == itemFolder) @@ -368,14 +368,14 @@ int CameraIconView::countItemsByFolder(QString folder) return count; } -void CameraIconView::setThumbnail(const QString& folder, const QString& filename, const QImage& image) +void CameraIconView::setThumbnail(const TQString& folder, const TQString& filename, const TQImage& image) { - CameraIconViewItem* item = d->itemDict.find(folder+filename); + CameraIconViewItem* item = d->itemDict.tqfind(folder+filename); if (!item) return; item->setThumbnail(image); - item->repaint(); + item->tqrepaint(); } void CameraIconView::ensureItemVisible(CameraIconViewItem *item) @@ -388,9 +388,9 @@ void CameraIconView::ensureItemVisible(const GPItemInfo& itemInfo) ensureItemVisible(itemInfo.folder, itemInfo.name); } -void CameraIconView::ensureItemVisible(const QString& folder, const QString& file) +void CameraIconView::ensureItemVisible(const TQString& folder, const TQString& file) { - CameraIconViewItem* item = d->itemDict.find(folder+file); + CameraIconViewItem* item = d->itemDict.tqfind(folder+file); if (!item) return; @@ -425,7 +425,7 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) } bool convertLossLessJpeg = d->cameraUI->convertLosslessJpegFiles(); - QString losslessFormat = d->cameraUI->losslessFormat(); + TQString losslessFormat = d->cameraUI->losslessFormat(); viewport()->setUpdatesEnabled(false); @@ -438,7 +438,7 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) for (IconItem* item = lastItem(); item; item = item->prevItem()) { - QString downloadName; + TQString downloadName; CameraIconViewItem* viewItem = static_cast<CameraIconViewItem*>(item); if (item->isSelected()) @@ -453,9 +453,9 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) if (convertLossLessJpeg && !downloadName.isEmpty()) { - QFileInfo fi(downloadName); - QString ext = fi.extension(false).upper(); - if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE")) + TQFileInfo fi(downloadName); + TQString ext = fi.extension(false).upper(); + if (ext == TQString("JPEG") || ext == TQString("JPG") || ext == TQString("JPE")) { downloadName.truncate(downloadName.length() - ext.length()); downloadName.append(losslessFormat.lower()); @@ -471,7 +471,7 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) for (IconItem* item = lastItem(); item; item = item->prevItem()) { - QString downloadName; + TQString downloadName; CameraIconViewItem* viewItem = static_cast<CameraIconViewItem*>(item); if (!useDefault) @@ -481,9 +481,9 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) if (convertLossLessJpeg) { - QFileInfo fi(downloadName); - QString ext = fi.extension(false).upper(); - if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE")) + TQFileInfo fi(downloadName); + TQString ext = fi.extension(false).upper(); + if (ext == TQString("JPEG") || ext == TQString("JPG") || ext == TQString("JPE")) { downloadName.truncate(downloadName.length() - ext.length()); downloadName.append(losslessFormat.lower()); @@ -499,7 +499,7 @@ void CameraIconView::slotUpdateDownloadNames(bool hasSelection) viewport()->update(); } -QString CameraIconView::defaultDownloadName(CameraIconViewItem *viewItem) +TQString CameraIconView::defaultDownloadName(CameraIconViewItem *viewItem) { RenameCustomizer::Case renamecase = RenameCustomizer::NONE; if (d->renamer) @@ -508,25 +508,25 @@ QString CameraIconView::defaultDownloadName(CameraIconViewItem *viewItem) return getCasedName( renamecase, viewItem->itemInfo() ); } -QString CameraIconView::getTemplatedName(const GPItemInfo* itemInfo, int position) +TQString CameraIconView::getTemplatedName(const GPItemInfo* itemInfo, int position) { - QString ext = itemInfo->name; - int pos = ext.findRev('.'); + TQString ext = itemInfo->name; + int pos = ext.tqfindRev('.'); if (pos < 0) ext = ""; else ext = ext.right( ext.length() - pos ); - QDateTime mtime; + TQDateTime mtime; mtime.setTime_t(itemInfo->mtime); return d->renamer->newName(mtime, position+1, ext); } -QString CameraIconView::getCasedName(const RenameCustomizer::Case ccase, +TQString CameraIconView::getCasedName(const RenameCustomizer::Case ccase, const GPItemInfo* itemInfo) { - QString dname; + TQString dname; switch (ccase) { @@ -571,7 +571,7 @@ void CameraIconView::slotSelectionChanged() viewport()->update(); } -void CameraIconView::slotContextMenu(IconItem * item, const QPoint&) +void CameraIconView::slotContextMenu(IconItem * item, const TQPoint&) { if (!item) return; @@ -591,7 +591,7 @@ void CameraIconView::slotContextMenu(IconItem * item, const QPoint&) menu.insertSeparator(-1); menu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 2); - int result = menu.exec(QCursor::pos()); + int result = menu.exec(TQCursor::pos()); switch (result) { @@ -672,7 +672,7 @@ void CameraIconView::slotSelectNew() void CameraIconView::startDrag() { - QStringList lst; + TQStringList lst; for (IconItem* item = firstItem(); item; item = item->nextItem()) { @@ -680,34 +680,34 @@ void CameraIconView::startDrag() continue; CameraIconViewItem* iconItem = static_cast<CameraIconViewItem*>(item); - QString itemPath = iconItem->itemInfo()->folder + iconItem->itemInfo()->name; + TQString itemPath = iconItem->itemInfo()->folder + iconItem->itemInfo()->name; lst.append(itemPath); } - QDragObject * drag = new CameraItemListDrag(lst, d->cameraUI); + TQDragObject * drag = new CameraItemListDrag(lst, d->cameraUI); if (drag) { - QPixmap icon(DesktopIcon("image", 48)); + TQPixmap icon(DesktopIcon("image", 48)); int w = icon.width(); int h = icon.height(); - QPixmap pix(w+4,h+4); - QString text(QString::number(lst.count())); + TQPixmap pix(w+4,h+4); + TQString text(TQString::number(lst.count())); - QPainter p(&pix); - p.fillRect(0, 0, w+4, h+4, QColor(Qt::white)); - p.setPen(QPen(Qt::black, 1)); + TQPainter p(&pix); + p.fillRect(0, 0, w+4, h+4, TQColor(TQt::white)); + p.setPen(TQPen(TQt::black, 1)); p.drawRect(0, 0, w+4, h+4); p.drawPixmap(2, 2, icon); - QRect r = p.boundingRect(2,2,w,h,Qt::AlignLeft|Qt::AlignTop,text); - r.setWidth(QMAX(r.width(),r.height())); - r.setHeight(QMAX(r.width(),r.height())); - p.fillRect(r, QColor(0,80,0)); - p.setPen(Qt::white); - QFont f(font()); + TQRect r = p.boundingRect(2,2,w,h,TQt::AlignLeft|TQt::AlignTop,text); + r.setWidth(TQMAX(r.width(),r.height())); + r.setHeight(TQMAX(r.width(),r.height())); + p.fillRect(r, TQColor(0,80,0)); + p.setPen(TQt::white); + TQFont f(font()); f.setBold(true); p.setFont(f); - p.drawText(r, Qt::AlignCenter, text); + p.drawText(r, TQt::AlignCenter, text); p.end(); drag->setPixmap(pix); @@ -715,13 +715,13 @@ void CameraIconView::startDrag() } } -void CameraIconView::contentsDropEvent(QDropEvent *event) +void CameraIconView::contentsDropEvent(TQDropEvent *event) { // don't popup context menu if the camera is busy if (d->cameraUI->isBusy()) return; - if ( (!QUriDrag::canDecode(event) && !CameraDragObject::canDecode(event) ) + if ( (!TQUriDrag::canDecode(event) && !CameraDragObject::canDecode(event) ) || event->source() == this) { event->ignore(); @@ -733,14 +733,14 @@ void CameraIconView::contentsDropEvent(QDropEvent *event) uploadItemPopupMenu(srcURLs); } -void CameraIconView::slotRightButtonClicked(const QPoint&) +void CameraIconView::slotRightButtonClicked(const TQPoint&) { // don't popup context menu if the camera is busy if (d->cameraUI->isBusy()) return; - QMimeSource *data = kapp->clipboard()->data(QClipboard::Clipboard); - if(!data || !QUriDrag::canDecode(data)) + TQMimeSource *data = kapp->tqclipboard()->data(TQClipboard::Clipboard); + if(!data || !TQUriDrag::canDecode(data)) return; KURL::List srcURLs; @@ -757,7 +757,7 @@ void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs) popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") ); popMenu.setMouseTracking(true); - int id = popMenu.exec(QCursor::pos()); + int id = popMenu.exec(TQCursor::pos()); switch(id) { case 10: @@ -770,9 +770,9 @@ void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs) } } -QRect CameraIconView::itemRect() const +TQRect CameraIconView::tqitemRect() const { - return d->itemRect; + return d->tqitemRect; } void CameraIconView::setThumbnailSize(const ThumbnailSize& thumbSize) @@ -794,44 +794,44 @@ void CameraIconView::updateItemRectsPixmap() { int thumbSize = d->thumbSize.size(); - QRect pixRect; - QRect textRect; - QRect extraRect; + TQRect pixRect; + TQRect textRect; + TQRect extraRect; pixRect.setWidth(thumbSize); pixRect.setHeight(thumbSize); - QFontMetrics fm(font()); - QRect r = QRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, - Qt::AlignHCenter | Qt::AlignTop, + TQFontMetrics fm(font()); + TQRect r = TQRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, + TQt::AlignHCenter | TQt::AlignTop, "XXXXXXXXX")); textRect.setWidth(r.width()); textRect.setHeight(r.height()); - QFont fn(font()); + TQFont fn(font()); if (fn.pointSize() > 0) { - fn.setPointSize(QMAX(fn.pointSize()-2, 6)); + fn.setPointSize(TQMAX(fn.pointSize()-2, 6)); } - fm = QFontMetrics(fn); - r = QRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, - Qt::AlignHCenter | Qt::AlignTop, + fm = TQFontMetrics(fn); + r = TQRect(fm.boundingRect(0, 0, thumbSize, 0xFFFFFFFF, + TQt::AlignHCenter | TQt::AlignTop, "XXXXXXXXX")); extraRect.setWidth(r.width()); extraRect.setHeight(r.height()); - r = QRect(); - r.setWidth(QMAX(QMAX(pixRect.width(), textRect.width()), extraRect.width()) + 4); + r = TQRect(); + r.setWidth(TQMAX(TQMAX(pixRect.width(), textRect.width()), extraRect.width()) + 4); r.setHeight(pixRect.height() + textRect.height() + extraRect.height() + 4); - d->itemRect = r; + d->tqitemRect = r; - d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); - d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(), - d->itemRect.height()); + d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->tqitemRect.width(), + d->tqitemRect.height()); } void CameraIconView::slotThemeChanged() @@ -869,7 +869,7 @@ void CameraIconView::itemsSelectionSizeInfo(unsigned long& fSizeKB, unsigned lon continue; fSize += size; - if (iconItem->itemInfo()->mime == QString("image/jpeg")) + if (iconItem->itemInfo()->mime == TQString("image/jpeg")) { if (d->cameraUI->convertLosslessJpegFiles()) { diff --git a/digikam/utilities/cameragui/cameraiconview.h b/digikam/utilities/cameragui/cameraiconview.h index 733023e..d70d1ba 100644 --- a/digikam/utilities/cameragui/cameraiconview.h +++ b/digikam/utilities/cameragui/cameraiconview.h @@ -25,10 +25,10 @@ #ifndef CAMERAICONVIEW_H #define CAMERAICONVIEW_H -// Qt includes. +// TQt includes. -#include <qdict.h> -#include <qrect.h> +#include <tqdict.h> +#include <tqrect.h> // KDE includes. @@ -39,7 +39,7 @@ #include "iconview.h" #include "renamecustomizer.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -54,38 +54,39 @@ class CameraIconViewPriv; class CameraIconView : public IconView { Q_OBJECT + TQ_OBJECT public: - CameraIconView(CameraUI* ui, QWidget* parent); + CameraIconView(CameraUI* ui, TQWidget* tqparent); ~CameraIconView(); void setRenameCustomizer(RenameCustomizer* renamer); void addItem(const GPItemInfo& itemInfo); - void removeItem(const QString& folder, const QString& file); - void setThumbnail(const QString& folder, const QString& filename, const QImage& image); + void removeItem(const TQString& folder, const TQString& file); + void setThumbnail(const TQString& folder, const TQString& filename, const TQImage& image); void ensureItemVisible(CameraIconViewItem *item); void ensureItemVisible(const GPItemInfo& itemInfo); - void ensureItemVisible(const QString& folder, const QString& file); + void ensureItemVisible(const TQString& folder, const TQString& file); void setThumbnailSize(const ThumbnailSize& thumbSize); ThumbnailSize thumbnailSize() const; - CameraIconViewItem* findItem(const QString& folder, const QString& file); + CameraIconViewItem* findItem(const TQString& folder, const TQString& file); - int countItemsByFolder(QString folder); + int countItemsByFolder(TQString folder); int itemsDownloaded(); - QPixmap* itemBaseRegPixmap() const; - QPixmap* itemBaseSelPixmap() const; - QPixmap newPicturePixmap() const; - QPixmap unknowPicturePixmap() const; + TQPixmap* itemBaseRegPixmap() const; + TQPixmap* itemBaseSelPixmap() const; + TQPixmap newPicturePixmap() const; + TQPixmap unknowPicturePixmap() const; - virtual QRect itemRect() const; + virtual TQRect tqitemRect() const; - QString defaultDownloadName(CameraIconViewItem *item); + TQString defaultDownloadName(CameraIconViewItem *item); void itemsSelectionSizeInfo(unsigned long& fSize, unsigned long& dSize); @@ -112,8 +113,8 @@ public slots: private slots: - void slotRightButtonClicked(const QPoint& pos); - void slotContextMenu(IconItem* item, const QPoint& pos); + void slotRightButtonClicked(const TQPoint& pos); + void slotContextMenu(IconItem* item, const TQPoint& pos); void slotDoubleClicked(IconItem* item); void slotThemeChanged(); void slotUpdateDownloadNames(bool hasSelection); @@ -121,13 +122,13 @@ private slots: protected: void startDrag(); - void contentsDropEvent(QDropEvent *event); + void contentsDropEvent(TQDropEvent *event); void updateItemRectsPixmap(); private: - QString getTemplatedName(const GPItemInfo* itemInfo, int position); - QString getCasedName(const RenameCustomizer::Case ccase, const GPItemInfo* itemInfo); + TQString getTemplatedName(const GPItemInfo* itemInfo, int position); + TQString getCasedName(const RenameCustomizer::Case ccase, const GPItemInfo* itemInfo); void uploadItemPopupMenu(const KURL::List& srcURLs); private: diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp index f7453e9..42a83d4 100644 --- a/digikam/utilities/cameragui/camerainfodialog.cpp +++ b/digikam/utilities/cameragui/camerainfodialog.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qframe.h> -#include <qtextedit.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqtextedit.h> // KDE includes. @@ -40,42 +40,42 @@ namespace Digikam { -CameraInfoDialog::CameraInfoDialog(QWidget *parent, const QString& summary, const QString& manual, - const QString& about) - : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, parent, 0, true, true) +CameraInfoDialog::CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, + const TQString& about) + : KDialogBase(IconList, i18n("Camera Information"), Help|Ok, Ok, tqparent, 0, true, true) { setHelp("digitalstillcamera.anchor", "digikam"); resize(500, 400); // ---------------------------------------------------------- - QFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) ); - QVBoxLayout *p1layout = new QVBoxLayout( p1, 0, 6 ); + TQFrame *p1 = addPage( i18n("Summary"), i18n("Camera Summary"), BarIcon("contents2", KIcon::SizeMedium) ); + TQVBoxLayout *p1tqlayout = new TQVBoxLayout( p1, 0, 6 ); - QTextEdit *summaryView = new QTextEdit(summary, QString(), p1); - summaryView->setWordWrap(QTextEdit::WidgetWidth); + TQTextEdit *summaryView = new TQTextEdit(summary, TQString(), p1); + summaryView->setWordWrap(TQTextEdit::WidgetWidth); summaryView->setReadOnly(true); - p1layout->addWidget(summaryView); + p1tqlayout->addWidget(summaryView); // ---------------------------------------------------------- - QFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) ); - QVBoxLayout *p2layout = new QVBoxLayout( p2, 0, 6 ); + TQFrame *p2 = addPage( i18n("Manual"), i18n("Camera Manual"), BarIcon("contents", KIcon::SizeMedium) ); + TQVBoxLayout *p2tqlayout = new TQVBoxLayout( p2, 0, 6 ); - QTextEdit *manualView = new QTextEdit(manual, QString(), p2); - manualView->setWordWrap(QTextEdit::WidgetWidth); + TQTextEdit *manualView = new TQTextEdit(manual, TQString(), p2); + manualView->setWordWrap(TQTextEdit::WidgetWidth); manualView->setReadOnly(true); - p2layout->addWidget(manualView); + p2tqlayout->addWidget(manualView); // ---------------------------------------------------------- - QFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) ); - QVBoxLayout *p3layout = new QVBoxLayout( p3, 0, 6 ); + TQFrame *p3 = addPage( i18n("About"), i18n("About Driver"), BarIcon("camera", KIcon::SizeMedium) ); + TQVBoxLayout *p3tqlayout = new TQVBoxLayout( p3, 0, 6 ); - QTextEdit *aboutView = new QTextEdit(about, QString(), p3); - aboutView->setWordWrap(QTextEdit::WidgetWidth); + TQTextEdit *aboutView = new TQTextEdit(about, TQString(), p3); + aboutView->setWordWrap(TQTextEdit::WidgetWidth); aboutView->setReadOnly(true); - p3layout->addWidget(aboutView); + p3tqlayout->addWidget(aboutView); } CameraInfoDialog::~CameraInfoDialog() diff --git a/digikam/utilities/cameragui/camerainfodialog.h b/digikam/utilities/cameragui/camerainfodialog.h index 889d880..07ca63e 100644 --- a/digikam/utilities/cameragui/camerainfodialog.h +++ b/digikam/utilities/cameragui/camerainfodialog.h @@ -25,9 +25,9 @@ #ifndef CAMERAINFODIALOG_H #define CAMERAINFODIALOG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -40,8 +40,8 @@ class CameraInfoDialog : public KDialogBase { public: - CameraInfoDialog(QWidget *parent, const QString& summary, const QString& manual, - const QString& about); + CameraInfoDialog(TQWidget *tqparent, const TQString& summary, const TQString& manual, + const TQString& about); ~CameraInfoDialog(); }; diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 8b41f1f..ec20cd8 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -24,30 +24,30 @@ #define CAMERA_INFO_MENU_ID 255 -// Qt includes. - -#include <qvgroupbox.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qiconview.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qpopupmenu.h> -#include <qsplitter.h> -#include <qpixmap.h> -#include <qcombobox.h> -#include <qtoolbox.h> -#include <qframe.h> -#include <qvbuttongroup.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qtooltip.h> -#include <qtimer.h> -#include <qwhatsthis.h> -#include <qfile.h> -#include <qfileinfo.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqiconview.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqpopupmenu.h> +#include <tqsplitter.h> +#include <tqpixmap.h> +#include <tqcombobox.h> +#include <tqtoolbox.h> +#include <tqframe.h> +#include <tqvbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqtooltip.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> +#include <tqfile.h> +#include <tqfileinfo.h> // KDE includes. @@ -169,37 +169,37 @@ public: bool busy; bool closed; - QString cameraTitle; + TQString cameraTitle; - QStringList currentlyDeleting; - QStringList foldersToScan; - QStringList cameraFolderList; + TQStringList currentlyDeleting; + TQStringList foldersToScan; + TQStringList cameraFolderList; - QPopupMenu *downloadMenu; - QPopupMenu *deleteMenu; - QPopupMenu *imageMenu; + TQPopupMenu *downloadMenu; + TQPopupMenu *deleteMenu; + TQPopupMenu *imageMenu; - QToolButton *cancelBtn; + TQToolButton *cancelBtn; - QToolBox *advBox; + TQToolBox *advBox; - QCheckBox *autoRotateCheck; - QCheckBox *autoAlbumDateCheck; - QCheckBox *autoAlbumExtCheck; - QCheckBox *fixDateTimeCheck; - QCheckBox *setPhotographerId; - QCheckBox *setCredits; - QCheckBox *convertJpegCheck; + TQCheckBox *autoRotateCheck; + TQCheckBox *autoAlbumDateCheck; + TQCheckBox *autoAlbumExtCheck; + TQCheckBox *fixDateTimeCheck; + TQCheckBox *setPhotographerId; + TQCheckBox *setCredits; + TQCheckBox *convertJpegCheck; - QLabel *formatLabel; - QLabel *folderDateLabel; + TQLabel *formatLabel; + TQLabel *folderDateLabel; - QComboBox *losslessFormat; - QComboBox *folderDateFormat; + TQComboBox *losslessFormat; + TQComboBox *folderDateFormat; - QSplitter *splitter; + TQSplitter *splitter; - QDateTime lastAccess; + TQDateTime lastAccess; KProgress *progress; @@ -224,12 +224,12 @@ public: FreeSpaceWidget *freeSpaceWidget; }; -CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, - const QString& model, const QString& port, - const QString& path, const QDateTime lastAccess) +CameraUI::CameraUI(TQWidget* /*tqparent*/, const TQString& cameraTitle, + const TQString& model, const TQString& port, + const TQString& path, const TQDateTime lastAccess) : KDialogBase(Plain, cameraTitle, Help|User1|User2|User3|Close, Close, - 0, // B.K.O # 116485: no parent for this modal dialog. + 0, // B.K.O # 116485: no tqparent for this modal dialog. 0, false, true, i18n("D&elete"), i18n("&Download"), @@ -242,42 +242,42 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, // ------------------------------------------------------------------------- - QGridLayout* viewBoxLayout = new QGridLayout(plainPage(), 2, 7); + TQGridLayout* viewBoxLayout = new TQGridLayout(plainPage(), 2, 7); - QHBox* widget = new QHBox(plainPage()); - d->splitter = new QSplitter(widget); + TQHBox* widget = new TQHBox(plainPage()); + d->splitter = new TQSplitter(widget); d->view = new CameraIconView(this, d->splitter); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); - d->view->setSizePolicy(rightSzPolicy); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); + d->view->tqsetSizePolicy(rightSzPolicy); d->rightSidebar = new ImagePropertiesSideBarCamGui(widget, "CameraGui Sidebar Right", d->splitter, Sidebar::Right, true); - d->splitter->setFrameStyle( QFrame::NoFrame ); - d->splitter->setFrameShadow( QFrame::Plain ); - d->splitter->setFrameShape( QFrame::NoFrame ); + d->splitter->setFrameStyle( TQFrame::NoFrame ); + d->splitter->setFrameShadow( TQFrame::Plain ); + d->splitter->setFrameShape( TQFrame::NoFrame ); d->splitter->setOpaqueResize(false); // ------------------------------------------------------------------------- - d->advBox = new QToolBox(d->rightSidebar); + d->advBox = new TQToolBox(d->rightSidebar); d->renameCustomizer = new RenameCustomizer(d->advBox, d->cameraTitle); d->view->setRenameCustomizer(d->renameCustomizer); - QWhatsThis::add( d->advBox, i18n("<p>Set how digiKam will rename files as they are downloaded.")); + TQWhatsThis::add( d->advBox, i18n("<p>Set how digiKam will rename files as they are downloaded.")); d->advBox->insertItem(CameraUIPriv::RENAMEFILEPAGE, d->renameCustomizer, SmallIconSet("fileimport"), i18n("File Renaming Options")); // -- Albums Auto-creation options ----------------------------------------- - QWidget* albumBox = new QWidget(d->advBox); - QVBoxLayout* albumVlay = new QVBoxLayout(albumBox, marginHint(), spacingHint()); - d->autoAlbumExtCheck = new QCheckBox(i18n("Extension-based sub-albums"), albumBox); - d->autoAlbumDateCheck = new QCheckBox(i18n("Date-based sub-albums"), albumBox); - QHBox *hbox1 = new QHBox(albumBox); - d->folderDateLabel = new QLabel(i18n("Date format:"), hbox1); - d->folderDateFormat = new QComboBox(hbox1); + TQWidget* albumBox = new TQWidget(d->advBox); + TQVBoxLayout* albumVlay = new TQVBoxLayout(albumBox, marginHint(), spacingHint()); + d->autoAlbumExtCheck = new TQCheckBox(i18n("Extension-based sub-albums"), albumBox); + d->autoAlbumDateCheck = new TQCheckBox(i18n("Date-based sub-albums"), albumBox); + TQHBox *hbox1 = new TQHBox(albumBox); + d->folderDateLabel = new TQLabel(i18n("Date format:"), hbox1); + d->folderDateFormat = new TQComboBox(hbox1); d->folderDateFormat->insertItem(i18n("ISO"), CameraUIPriv::IsoDateFormat); d->folderDateFormat->insertItem(i18n("Full Text"), CameraUIPriv::TextDateFormat); d->folderDateFormat->insertItem(i18n("Local Settings"), CameraUIPriv::LocalDateFormat); @@ -286,14 +286,14 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, albumVlay->addWidget(hbox1); albumVlay->addStretch(); - QWhatsThis::add( albumBox, i18n("<p>Set how digiKam creates albums automatically when downloading.")); - QWhatsThis::add( d->autoAlbumExtCheck, i18n("<p>Enable this option if you want to download your " + TQWhatsThis::add( albumBox, i18n("<p>Set how digiKam creates albums automatically when downloading.")); + TQWhatsThis::add( d->autoAlbumExtCheck, i18n("<p>Enable this option if you want to download your " "pictures into automatically created file extension-based sub-albums of the destination " "album. This way, you can separate JPEG and RAW files as they are downloaded from your camera.")); - QWhatsThis::add( d->autoAlbumDateCheck, i18n("<p>Enable this option if you want to " + TQWhatsThis::add( d->autoAlbumDateCheck, i18n("<p>Enable this option if you want to " "download your pictures into automatically created file date-based sub-albums " "of the destination album.")); - QWhatsThis::add( d->folderDateFormat, i18n("<p>Select your preferred date format used to " + TQWhatsThis::add( d->folderDateFormat, i18n("<p>Select your preferred date format used to " "create new albums. The options available are:<p>" "<b>ISO</b>: the date format is in accordance with ISO 8601 " "(YYYY-MM-DD). E.g.: <i>2006-08-24</i><p>" @@ -306,17 +306,17 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, // -- On the Fly options --------------------------------------------------- - QWidget* onFlyBox = new QWidget(d->advBox); - QVBoxLayout* onFlyVlay = new QVBoxLayout(onFlyBox, marginHint(), spacingHint()); - d->setPhotographerId = new QCheckBox(i18n("Set default photographer identity"), onFlyBox); - d->setCredits = new QCheckBox(i18n("Set default credit and copyright"), onFlyBox); - d->fixDateTimeCheck = new QCheckBox(i18n("Fix internal date && time"), onFlyBox); + TQWidget* onFlyBox = new TQWidget(d->advBox); + TQVBoxLayout* onFlyVlay = new TQVBoxLayout(onFlyBox, marginHint(), spacingHint()); + d->setPhotographerId = new TQCheckBox(i18n("Set default photographer identity"), onFlyBox); + d->setCredits = new TQCheckBox(i18n("Set default credit and copyright"), onFlyBox); + d->fixDateTimeCheck = new TQCheckBox(i18n("Fix internal date && time"), onFlyBox); d->dateTimeEdit = new KDateTimeEdit(onFlyBox, "datepicker"); - d->autoRotateCheck = new QCheckBox(i18n("Auto-rotate/flip image"), onFlyBox); - d->convertJpegCheck = new QCheckBox(i18n("Convert to lossless file format"), onFlyBox); - QHBox *hbox2 = new QHBox(onFlyBox); - d->formatLabel = new QLabel(i18n("New image format:"), hbox2); - d->losslessFormat = new QComboBox(hbox2); + d->autoRotateCheck = new TQCheckBox(i18n("Auto-rotate/flip image"), onFlyBox); + d->convertJpegCheck = new TQCheckBox(i18n("Convert to lossless file format"), onFlyBox); + TQHBox *hbox2 = new TQHBox(onFlyBox); + d->formatLabel = new TQLabel(i18n("New image format:"), hbox2); + d->losslessFormat = new TQComboBox(hbox2); d->losslessFormat->insertItem("PNG", 0); onFlyVlay->addWidget(d->setPhotographerId); onFlyVlay->addWidget(d->setCredits); @@ -327,22 +327,22 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, onFlyVlay->addWidget(hbox2); onFlyVlay->addStretch(); - QWhatsThis::add( onFlyBox, i18n("<p>Set here all options to fix/transform JPEG files automatically " + TQWhatsThis::add( onFlyBox, i18n("<p>Set here all options to fix/transform JPEG files automatically " "as they are downloaded.")); - QWhatsThis::add( d->autoRotateCheck, i18n("<p>Enable this option if you want images automatically " + TQWhatsThis::add( d->autoRotateCheck, i18n("<p>Enable this option if you want images automatically " "rotated or flipped using EXIF information provided by the camera.")); - QWhatsThis::add( d->setPhotographerId, i18n("<p>Enable this option to store the default " + TQWhatsThis::add( d->setPhotographerId, i18n("<p>Enable this option to store the default " "photographer identity in the IPTC tags using digiKam's metadata settings.")); - QWhatsThis::add( d->setCredits, i18n("<p>Enable this option to store the default credit " + TQWhatsThis::add( d->setCredits, i18n("<p>Enable this option to store the default credit " "and copyright information in the IPTC tags using digiKam's metadata settings.")); - QWhatsThis::add( d->fixDateTimeCheck, i18n("<p>Enable this option to set date and time metadata " + TQWhatsThis::add( d->fixDateTimeCheck, i18n("<p>Enable this option to set date and time metadata " "tags to the right values if your camera does not set " "these tags correctly when pictures are taken. The values will " "be saved in the DateTimeDigitized and DateTimeCreated EXIF/IPTC fields.")); - QWhatsThis::add( d->convertJpegCheck, i18n("<p>Enable this option to automatically convert " + TQWhatsThis::add( d->convertJpegCheck, i18n("<p>Enable this option to automatically convert " "all JPEG files to a lossless image format. <b>Note:</b> Image conversion can take a " "while on a slow computer.")); - QWhatsThis::add( d->losslessFormat, i18n("<p>Select your preferred lossless image file format to " + TQWhatsThis::add( d->losslessFormat, i18n("<p>Select your preferred lossless image file format to " "convert to. <b>Note:</b> All metadata will be preserved during the conversion.")); d->advBox->insertItem(CameraUIPriv::ONFLYPAGE, onFlyBox, SmallIconSet("run"), @@ -353,8 +353,8 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, // ------------------------------------------------------------------------- - d->cancelBtn = new QToolButton(plainPage()); - d->cancelBtn->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) ); + d->cancelBtn = new TQToolButton(plainPage()); + d->cancelBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); d->cancelBtn->setPixmap( SmallIcon( "cancel" ) ); d->cancelBtn->setEnabled(false); @@ -363,26 +363,26 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, d->progress->setMaximumHeight( fontMetrics().height()+4 ); d->progress->hide(); - QWidget *frame = new QWidget(plainPage()); - QHBoxLayout* layout = new QHBoxLayout(frame); - frame->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); + TQWidget *frame = new TQWidget(plainPage()); + TQHBoxLayout* tqlayout = new TQHBoxLayout(frame); + frame->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); - KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), QString(), frame ); + KURLLabel *pixmapLogo = new KURLLabel( Digikam::webProjectUrl(), TQString(), frame ); pixmapLogo->setMargin(0); pixmapLogo->setScaledContents( false ); - pixmapLogo->setSizePolicy(QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum)); - QToolTip::add(pixmapLogo, i18n("Visit digiKam project website")); + pixmapLogo->tqsetSizePolicy(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"); - QString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); - pixmapLogo->setPixmap( QPixmap( directory + "logo-digikam.png" ) ); - pixmapLogo->setFocusPolicy(QWidget::NoFocus); + TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png"); + pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) ); + pixmapLogo->setFocusPolicy(TQ_NoFocus); d->anim = new AnimWidget(frame, pixmapLogo->height()-2); - layout->setMargin(0); - layout->setSpacing(0); - layout->addWidget( pixmapLogo ); - layout->addWidget( d->anim ); + tqlayout->setMargin(0); + tqlayout->setSpacing(0); + tqlayout->addWidget( pixmapLogo ); + tqlayout->addWidget( d->anim ); d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100); @@ -407,121 +407,121 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, // ------------------------------------------------------------------------- - d->imageMenu = new QPopupMenu(this); - d->imageMenu->insertItem(i18n("Select &All"), d->view, SLOT(slotSelectAll()), CTRL+Key_A, 0); - d->imageMenu->insertItem(i18n("Select N&one"), d->view, SLOT(slotSelectNone()), CTRL+Key_U, 1); - d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); + d->imageMenu = new TQPopupMenu(this); + d->imageMenu->insertItem(i18n("Select &All"), d->view, TQT_SLOT(slotSelectAll()), CTRL+Key_A, 0); + d->imageMenu->insertItem(i18n("Select N&one"), d->view, TQT_SLOT(slotSelectNone()), CTRL+Key_U, 1); + d->imageMenu->insertItem(i18n("&Invert Selection"), d->view, TQT_SLOT(slotSelectInvert()), CTRL+Key_Asterisk, 2); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Select &New Items"), d->view, SLOT(slotSelectNew()), 0, 3); + d->imageMenu->insertItem(i18n("Select &New Items"), d->view, TQT_SLOT(slotSelectNew()), 0, 3); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); - d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); + d->imageMenu->insertItem(i18n("Increase Thumbnail Size"), this, TQT_SLOT(slotIncreaseThumbSize()), CTRL+Key_Plus, 4); + d->imageMenu->insertItem(i18n("Decrease Thumbnail Size"), this, TQT_SLOT(slotDecreaseThumbSize()), CTRL+Key_Minus, 5); d->imageMenu->insertSeparator(); - d->imageMenu->insertItem(i18n("Toggle Lock"), this, SLOT(slotToggleLock()), 0, 6); + d->imageMenu->insertItem(i18n("Toggle Lock"), this, TQT_SLOT(slotToggleLock()), 0, 6); actionButton(User3)->setPopup(d->imageMenu); // ------------------------------------------------------------------------- - d->downloadMenu = new QPopupMenu(this); + d->downloadMenu = new TQPopupMenu(this); d->downloadMenu->insertItem(i18n("Download Selected"), - this, SLOT(slotDownloadSelected()), 0, 0); + this, TQT_SLOT(slotDownloadSelected()), 0, 0); d->downloadMenu->insertItem(i18n("Download All"), - this, SLOT(slotDownloadAll()), 0, 1); + this, TQT_SLOT(slotDownloadAll()), 0, 1); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Download/Delete Selected"), - this, SLOT(slotDownloadAndDeleteSelected()), 0, 2); + this, TQT_SLOT(slotDownloadAndDeleteSelected()), 0, 2); d->downloadMenu->insertItem(i18n("Download/Delete All"), - this, SLOT(slotDownloadAndDeleteAll()), 0, 3); + this, TQT_SLOT(slotDownloadAndDeleteAll()), 0, 3); d->downloadMenu->insertSeparator(); d->downloadMenu->insertItem(i18n("Upload..."), - this, SLOT(slotUpload()), 0, 4); + this, TQT_SLOT(slotUpload()), 0, 4); d->downloadMenu->setItemEnabled(0, false); d->downloadMenu->setItemEnabled(2, false); actionButton(User2)->setPopup(d->downloadMenu); // ------------------------------------------------------------------------- - d->deleteMenu = new QPopupMenu(this); - d->deleteMenu->insertItem(i18n("Delete Selected"), this, SLOT(slotDeleteSelected()), 0, 0); - d->deleteMenu->insertItem(i18n("Delete All"), this, SLOT(slotDeleteAll()), 0, 1); + d->deleteMenu = new TQPopupMenu(this); + d->deleteMenu->insertItem(i18n("Delete Selected"), this, TQT_SLOT(slotDeleteSelected()), 0, 0); + d->deleteMenu->insertItem(i18n("Delete All"), this, TQT_SLOT(slotDeleteAll()), 0, 1); d->deleteMenu->setItemEnabled(0, false); actionButton(User1)->setPopup(d->deleteMenu); // ------------------------------------------------------------------------- - QPushButton *helpButton = actionButton( Help ); + TQPushButton *helpButton = actionButton( Help ); d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false); d->helpMenu->menu()->insertItem(SmallIcon("camera"), i18n("Camera Information"), - this, SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); + this, TQT_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0); helpButton->setPopup( d->helpMenu->menu() ); // ------------------------------------------------------------------------- - connect(d->autoAlbumDateCheck, SIGNAL(toggled(bool)), - d->folderDateFormat, SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), + d->folderDateFormat, TQT_SLOT(setEnabled(bool))); - connect(d->autoAlbumDateCheck, SIGNAL(toggled(bool)), - d->folderDateLabel, SLOT(setEnabled(bool))); + connect(d->autoAlbumDateCheck, TQT_SIGNAL(toggled(bool)), + d->folderDateLabel, TQT_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, SIGNAL(toggled(bool)), - d->losslessFormat, SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), + d->losslessFormat, TQT_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, SIGNAL(toggled(bool)), - d->formatLabel, SLOT(setEnabled(bool))); + connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), + d->formatLabel, TQT_SLOT(setEnabled(bool))); - connect(d->convertJpegCheck, SIGNAL(toggled(bool)), - d->view, SLOT(slotDownloadNameChanged())); + connect(d->convertJpegCheck, TQT_SIGNAL(toggled(bool)), + d->view, TQT_SLOT(slotDownloadNameChanged())); - connect(d->fixDateTimeCheck, SIGNAL(toggled(bool)), - d->dateTimeEdit, SLOT(setEnabled(bool))); + connect(d->fixDateTimeCheck, TQT_SIGNAL(toggled(bool)), + d->dateTimeEdit, TQT_SLOT(setEnabled(bool))); - connect(pixmapLogo, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(slotProcessURL(const QString&))); + connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(slotProcessURL(const TQString&))); // ------------------------------------------------------------------------- - connect(d->view, SIGNAL(signalSelected(CameraIconViewItem*, bool)), - this, SLOT(slotItemsSelected(CameraIconViewItem*, bool))); + connect(d->view, TQT_SIGNAL(signalSelected(CameraIconViewItem*, bool)), + this, TQT_SLOT(slotItemsSelected(CameraIconViewItem*, bool))); - connect(d->view, SIGNAL(signalFileView(CameraIconViewItem*)), - this, SLOT(slotFileView(CameraIconViewItem*))); + connect(d->view, TQT_SIGNAL(signalFileView(CameraIconViewItem*)), + this, TQT_SLOT(slotFileView(CameraIconViewItem*))); - connect(d->view, SIGNAL(signalUpload(const KURL::List&)), - this, SLOT(slotUploadItems(const KURL::List&))); + connect(d->view, TQT_SIGNAL(signalUpload(const KURL::List&)), + this, TQT_SLOT(slotUploadItems(const KURL::List&))); - connect(d->view, SIGNAL(signalDownload()), - this, SLOT(slotDownloadSelected())); + connect(d->view, TQT_SIGNAL(signalDownload()), + this, TQT_SLOT(slotDownloadSelected())); - connect(d->view, SIGNAL(signalDownloadAndDelete()), - this, SLOT(slotDownloadAndDeleteSelected())); + connect(d->view, TQT_SIGNAL(signalDownloadAndDelete()), + this, TQT_SLOT(slotDownloadAndDeleteSelected())); - connect(d->view, SIGNAL(signalDelete()), - this, SLOT(slotDeleteSelected())); + connect(d->view, TQT_SIGNAL(signalDelete()), + this, TQT_SLOT(slotDeleteSelected())); - connect(d->view, SIGNAL(signalToggleLock()), - this, SLOT(slotToggleLock())); + connect(d->view, TQT_SIGNAL(signalToggleLock()), + this, TQT_SLOT(slotToggleLock())); - connect(d->view, SIGNAL(signalNewSelection(bool)), - this, SLOT(slotNewSelection(bool))); + connect(d->view, TQT_SIGNAL(signalNewSelection(bool)), + this, TQT_SLOT(slotNewSelection(bool))); // ------------------------------------------------------------------------- - connect(d->rightSidebar, SIGNAL(signalFirstItem()), - this, SLOT(slotFirstItem())); + connect(d->rightSidebar, TQT_SIGNAL(signalFirstItem()), + this, TQT_SLOT(slotFirstItem())); - connect(d->rightSidebar, SIGNAL(signalNextItem()), - this, SLOT(slotNextItem())); + connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), + this, TQT_SLOT(slotNextItem())); - connect(d->rightSidebar, SIGNAL(signalPrevItem()), - this, SLOT(slotPrevItem())); + connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), + this, TQT_SLOT(slotPrevItem())); - connect(d->rightSidebar, SIGNAL(signalLastItem()), - this, SLOT(slotLastItem())); + connect(d->rightSidebar, TQT_SIGNAL(signalLastItem()), + this, TQT_SLOT(slotLastItem())); // ------------------------------------------------------------------------- - connect(d->cancelBtn, SIGNAL(clicked()), - this, SLOT(slotCancelButton())); + connect(d->cancelBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCancelButton())); // -- Read settings & Check free space availability on album root path ----- @@ -531,55 +531,55 @@ CameraUI::CameraUI(QWidget* /*parent*/, const QString& cameraTitle, d->controller = new CameraController(this, d->cameraTitle, model, port, path); - connect(d->controller, SIGNAL(signalConnected(bool)), - this, SLOT(slotConnected(bool))); + connect(d->controller, TQT_SIGNAL(signalConnected(bool)), + this, TQT_SLOT(slotConnected(bool))); - connect(d->controller, SIGNAL(signalInfoMsg(const QString&)), - d->status, SLOT(setText(const QString&))); + connect(d->controller, TQT_SIGNAL(signalInfoMsg(const TQString&)), + d->status, TQT_SLOT(setText(const TQString&))); - connect(d->controller, SIGNAL(signalErrorMsg(const QString&)), - this, SLOT(slotErrorMsg(const QString&))); + connect(d->controller, TQT_SIGNAL(signalErrorMsg(const TQString&)), + this, TQT_SLOT(slotErrorMsg(const TQString&))); - connect(d->controller, SIGNAL(signalCameraInformations(const QString&, const QString&, const QString&)), - this, SLOT(slotCameraInformations(const QString&, const QString&, const QString&))); + connect(d->controller, TQT_SIGNAL(signalCameraInformations(const TQString&, const TQString&, const TQString&)), + this, TQT_SLOT(slotCameraInformations(const TQString&, const TQString&, const TQString&))); - connect(d->controller, SIGNAL(signalBusy(bool)), - this, SLOT(slotBusy(bool))); + connect(d->controller, TQT_SIGNAL(signalBusy(bool)), + this, TQT_SLOT(slotBusy(bool))); - connect(d->controller, SIGNAL(signalFolderList(const QStringList&)), - this, SLOT(slotFolderList(const QStringList&))); + connect(d->controller, TQT_SIGNAL(signalFolderList(const TQStringList&)), + this, TQT_SLOT(slotFolderList(const TQStringList&))); - connect(d->controller, SIGNAL(signalFileList(const GPItemInfoList&)), - this, SLOT(slotFileList(const GPItemInfoList&))); + connect(d->controller, TQT_SIGNAL(signalFileList(const GPItemInfoList&)), + this, TQT_SLOT(slotFileList(const GPItemInfoList&))); - connect(d->controller, SIGNAL(signalThumbnail(const QString&, const QString&, const QImage&)), - this, SLOT(slotThumbnail(const QString&, const QString&, const QImage&))); + connect(d->controller, TQT_SIGNAL(signalThumbnail(const TQString&, const TQString&, const TQImage&)), + this, TQT_SLOT(slotThumbnail(const TQString&, const TQString&, const TQImage&))); - connect(d->controller, SIGNAL(signalDownloaded(const QString&, const QString&, int)), - this, SLOT(slotDownloaded(const QString&, const QString&, int))); + connect(d->controller, TQT_SIGNAL(signalDownloaded(const TQString&, const TQString&, int)), + this, TQT_SLOT(slotDownloaded(const TQString&, const TQString&, int))); - connect(d->controller, SIGNAL(signalSkipped(const QString&, const QString&)), - this, SLOT(slotSkipped(const QString&, const QString&))); + connect(d->controller, TQT_SIGNAL(signalSkipped(const TQString&, const TQString&)), + this, TQT_SLOT(slotSkipped(const TQString&, const TQString&))); - connect(d->controller, SIGNAL(signalDeleted(const QString&, const QString&, bool)), - this, SLOT(slotDeleted(const QString&, const QString&, bool))); + connect(d->controller, TQT_SIGNAL(signalDeleted(const TQString&, const TQString&, bool)), + this, TQT_SLOT(slotDeleted(const TQString&, const TQString&, bool))); - connect(d->controller, SIGNAL(signalLocked(const QString&, const QString&, bool)), - this, SLOT(slotLocked(const QString&, const QString&, bool))); + connect(d->controller, TQT_SIGNAL(signalLocked(const TQString&, const TQString&, bool)), + this, TQT_SLOT(slotLocked(const TQString&, const TQString&, bool))); - connect(d->controller, SIGNAL(signalExifFromFile(const QString&, const QString&)), - this, SLOT(slotExifFromFile(const QString&, const QString&))); + connect(d->controller, TQT_SIGNAL(signalExifFromFile(const TQString&, const TQString&)), + this, TQT_SLOT(slotExifFromFile(const TQString&, const TQString&))); - connect(d->controller, SIGNAL(signalExifData(const QByteArray&)), - this, SLOT(slotExifFromData(const QByteArray&))); + connect(d->controller, TQT_SIGNAL(signalExifData(const TQByteArray&)), + this, TQT_SLOT(slotExifFromData(const TQByteArray&))); - connect(d->controller, SIGNAL(signalUploaded(const GPItemInfo&)), - this, SLOT(slotUploaded(const GPItemInfo&))); + connect(d->controller, TQT_SIGNAL(signalUploaded(const GPItemInfo&)), + this, TQT_SLOT(slotUploaded(const GPItemInfo&))); // ------------------------------------------------------------------------- d->view->setFocus(); - QTimer::singleShot(0, d->controller, SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); } CameraUI::~CameraUI() @@ -640,7 +640,7 @@ void CameraUI::saveSettings() config->sync(); } -void CameraUI::slotProcessURL(const QString& url) +void CameraUI::slotProcessURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -665,12 +665,12 @@ bool CameraUI::autoRotateJpegFiles() const return d->autoRotateCheck->isChecked(); } -QString CameraUI::losslessFormat() +TQString CameraUI::losslessFormat() { return d->losslessFormat->currentText(); } -QString CameraUI::cameraTitle() const +TQString CameraUI::cameraTitle() const { return d->cameraTitle; } @@ -679,11 +679,11 @@ void CameraUI::slotCancelButton() { d->status->setText(i18n("Cancelling current operation, please wait...")); d->progress->hide(); - QTimer::singleShot(0, d->controller, SLOT(slotCancel())); + TQTimer::singleShot(0, d->controller, TQT_SLOT(slotCancel())); d->currentlyDeleting.clear(); } -void CameraUI::closeEvent(QCloseEvent* e) +void CameraUI::closeEvent(TQCloseEvent* e) { if (dialogClosed()) e->accept(); @@ -739,7 +739,7 @@ void CameraUI::finishDialog() { CameraList* clist = CameraList::instance(); if (clist) - clist->changeCameraAccessTime(d->cameraTitle, QDateTime::QDateTime::currentDateTime()); + clist->changeCameraAccessTime(d->cameraTitle, TQDateTime::TQDateTime::tqcurrentDateTime()); } // When a directory is created, a watch is put on it to spot new files @@ -749,7 +749,7 @@ void CameraUI::finishDialog() d->status->setText(i18n("Scanning for new files, please wait...")); ScanLib sLib; - for (QStringList::iterator it = d->foldersToScan.begin(); + for (TQStringList::iterator it = d->foldersToScan.begin(); it != d->foldersToScan.end(); ++it) { //DDebug() << "Scanning " << (*it) << endl; @@ -868,7 +868,7 @@ void CameraUI::slotConnected(bool val) i18n("Retry"), i18n("Abort")) == KMessageBox::Yes) - QTimer::singleShot(0, d->controller, SLOT(slotConnect())); + TQTimer::singleShot(0, d->controller, TQT_SLOT(slotConnect())); else close(); } @@ -878,7 +878,7 @@ void CameraUI::slotConnected(bool val) } } -void CameraUI::slotFolderList(const QStringList& folderList) +void CameraUI::slotFolderList(const TQStringList& folderList) { if (d->closed) return; @@ -888,7 +888,7 @@ void CameraUI::slotFolderList(const QStringList& folderList) d->progress->show(); d->cameraFolderList = folderList; - for (QStringList::const_iterator it = folderList.begin(); + for (TQStringList::const_iterator it = folderList.begin(); it != folderList.end(); ++it) { d->controller->listFiles(*it); @@ -907,8 +907,8 @@ void CameraUI::slotFileList(const GPItemInfoList& fileList) // We sort the map by time stamp // and we remove internal camera files which are not image/video/sounds. - QStringList fileNames, fileExts; - QFileInfo info; + TQStringList fileNames, fileExts; + TQFileInfo info; // JVC camera (see B.K.O #133185). fileNames.append("mgr_data"); @@ -928,8 +928,8 @@ void CameraUI::slotFileList(const GPItemInfoList& fileList) for(it = fileList.begin() ; it != fileList.end() ; ++it) { info.setFile((*it).name); - if (!fileNames.contains(info.fileName().lower()) && - !fileExts.contains(info.extension(false).lower())) + if (!fileNames.tqcontains(info.fileName().lower()) && + !fileExts.tqcontains(info.extension(false).lower())) { kdDebug() << info.fileName() << " : " << (*it).mtime << endl; @@ -963,8 +963,8 @@ void CameraUI::slotFileList(const GPItemInfoList& fileList) d->progress->setTotalSteps(d->progress->totalSteps() + fileList.count()); } -void CameraUI::slotThumbnail(const QString& folder, const QString& file, - const QImage& thumbnail) +void CameraUI::slotThumbnail(const TQString& folder, const TQString& file, + const TQImage& thumbnail) { d->view->setThumbnail(folder, file, thumbnail); int curr = d->progress->progress(); @@ -979,13 +979,13 @@ void CameraUI::slotInformations() d->controller->getCameraInformations(); } -void CameraUI::slotCameraInformations(const QString& summary, const QString& manual, const QString& about) +void CameraUI::slotCameraInformations(const TQString& summary, const TQString& manual, const TQString& about) { CameraInfoDialog *infoDlg = new CameraInfoDialog(this, summary, manual, about); infoDlg->show(); } -void CameraUI::slotErrorMsg(const QString& msg) +void CameraUI::slotErrorMsg(const TQString& msg) { KMessageBox::error(this, msg); } @@ -995,18 +995,18 @@ void CameraUI::slotUpload() if (d->busy) return; - QString fileformats; + TQString fileformats; - QStringList patternList = QStringList::split('\n', KImageIO::pattern(KImageIO::Reading)); + TQStringList patternList = TQStringList::split('\n', KImageIO::pattern(KImageIO::Reading)); // All Images from list must been always the first entry given by KDE API - QString allPictures = patternList[0]; + TQString allPictures = patternList[0]; // Add RAW file format to All Images" type mime and remplace current. #if KDCRAW_VERSION < 0x000106 - allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles())); + allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())); #else - allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles())); + allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::KDcraw::rawFiles())); #endif patternList.remove(patternList[0]); patternList.prepend(allPictures); @@ -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(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); + patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); #else - patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles()))); + patternList.append(TQString("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::KDcraw::rawFiles()))); #endif fileformats = patternList.join("\n"); @@ -1041,28 +1041,28 @@ void CameraUI::slotUploadItems(const KURL::List& urls) CameraFolderDialog dlg(this, d->view, d->cameraFolderList, d->controller->getCameraTitle(), d->controller->getCameraPath()); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; - QString cameraFolder = dlg.selectedFolderPath(); + TQString cameraFolder = dlg.selectedFolderPath(); for (KURL::List::const_iterator it = urls.begin() ; it != urls.end() ; ++it) { - QFileInfo fi((*it).path()); + TQFileInfo fi((*it).path()); if (!fi.exists()) continue; if (fi.isDir()) continue; - QString ext = QString(".") + fi.extension(); - QString name = fi.fileName(); + TQString ext = TQString(".") + fi.extension(); + TQString name = fi.fileName(); name.truncate(fi.fileName().length() - ext.length()); bool ok; while (d->view->findItem(cameraFolder, name + ext)) { - QString msg(i18n("Camera Folder <b>%1</b> already contains item <b>%2</b><br>" + TQString msg(i18n("Camera Folder <b>%1</b> already contains item <b>%2</b><br>" "Please enter a new file name (without extension):") - .arg(cameraFolder).arg(fi.fileName())); + .tqarg(cameraFolder).tqarg(fi.fileName())); #if KDE_IS_VERSION(3,2,0) name = KInputDialog::getText(i18n("File already exists"), msg, name, &ok, this); @@ -1125,18 +1125,18 @@ 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") - .arg(KIO::convertSizeFromKB(dSize)) - .arg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); + .tqarg(KIO::convertSizeFromKB(dSize)) + .tqarg(KIO::convertSizeFromKB(d->freeSpaceWidget->kBAvail()))); return; } - QString newDirName; + TQString newDirName; IconItem* firstItem = d->view->firstItem(); if (firstItem) { CameraIconViewItem* iconItem = static_cast<CameraIconViewItem*>(firstItem); - QDateTime dateTime; + TQDateTime dateTime; dateTime.setTime_t(iconItem->itemInfo()->mtime); switch(d->folderDateFormat->currentItem()) @@ -1163,7 +1163,7 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) if (album && album->type() != Album::PHYSICAL) album = 0; - QString header(i18n("<p>Please select the destination album from the digiKam library to " + TQString header(i18n("<p>Please select the destination album from the digiKam library to " "import the camera pictures into.</p>")); album = AlbumSelectDialog::selectAlbum(this, (PAlbum*)album, header, newDirName, @@ -1183,7 +1183,7 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) d->controller->downloadPrep(); DownloadSettingsContainer downloadSettings; - QString downloadName; + TQString downloadName; time_t mtime; int total = 0; @@ -1221,15 +1221,15 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) mtime = iconItem->itemInfo()->mtime; KURL u(url); - QString errMsg; - QDateTime dateTime; + TQString errMsg; + TQDateTime dateTime; dateTime.setTime_t(mtime); // Auto sub-albums creation based on file date. if (d->autoAlbumDateCheck->isChecked()) { - QString dirName; + TQString dirName; switch(d->folderDateFormat->currentItem()) { @@ -1261,18 +1261,18 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) { // We use the target file name to compute sub-albums name to take a care about // convertion on the fly option. - QFileInfo fi(downloadName); - - QString subAlbum = fi.extension(false).upper(); - if (fi.extension(false).upper() == QString("JPEG") || - fi.extension(false).upper() == QString("JPE")) - subAlbum = QString("JPG"); - if (fi.extension(false).upper() == QString("TIFF")) - subAlbum = QString("TIF"); - if (fi.extension(false).upper() == QString("MPEG") || - fi.extension(false).upper() == QString("MPE") || - fi.extension(false).upper() == QString("MPO")) - subAlbum = QString("MPG"); + TQFileInfo fi(downloadName); + + TQString subAlbum = fi.extension(false).upper(); + if (fi.extension(false).upper() == TQString("JPEG") || + fi.extension(false).upper() == TQString("JPE")) + subAlbum = TQString("JPG"); + if (fi.extension(false).upper() == TQString("TIFF")) + subAlbum = TQString("TIF"); + if (fi.extension(false).upper() == TQString("MPEG") || + fi.extension(false).upper() == TQString("MPE") || + fi.extension(false).upper() == TQString("MPO")) + subAlbum = TQString("MPG"); // See B.K.O #136927 : we need to support file system which do not // handle upper case properly. @@ -1292,7 +1292,7 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) downloadSettings.dest = u.path(); d->controller->download(downloadSettings); - addFileExtension(QFileInfo(u.path()).extension(false)); + addFileExtension(TQFileInfo(u.path()).extension(false)); total++; } @@ -1311,7 +1311,7 @@ void CameraUI::slotDownload(bool onlySelected, bool deleteAfter, Album *album) d->deleteAfter = deleteAfter; } -void CameraUI::slotDownloaded(const QString& folder, const QString& file, int status) +void CameraUI::slotDownloaded(const TQString& folder, const TQString& file, int status) { CameraIconViewItem* iconItem = d->view->findItem(folder, file); if (iconItem) @@ -1331,7 +1331,7 @@ void CameraUI::slotDownloaded(const QString& folder, const QString& file, int st } } -void CameraUI::slotSkipped(const QString& folder, const QString& file) +void CameraUI::slotSkipped(const TQString& folder, const TQString& file) { CameraIconViewItem* iconItem = d->view->findItem(folder, file); if (iconItem) @@ -1350,8 +1350,8 @@ void CameraUI::slotToggleLock() CameraIconViewItem* iconItem = static_cast<CameraIconViewItem*>(item); if (iconItem->isSelected()) { - QString folder = iconItem->itemInfo()->folder; - QString file = iconItem->itemInfo()->name; + TQString folder = iconItem->itemInfo()->folder; + TQString file = iconItem->itemInfo()->name; int writePerm = iconItem->itemInfo()->writePermissions; bool lock = true; @@ -1372,7 +1372,7 @@ void CameraUI::slotToggleLock() } } -void CameraUI::slotLocked(const QString& folder, const QString& file, bool status) +void CameraUI::slotLocked(const TQString& folder, const TQString& file, bool status) { if (status) { @@ -1389,16 +1389,16 @@ void CameraUI::slotLocked(const QString& folder, const QString& file, bool statu d->progress->setProgress(curr+1); } -void CameraUI::checkItem4Deletion(CameraIconViewItem* iconItem, QStringList& folders, QStringList& files, - QStringList& deleteList, QStringList& lockedList) +void CameraUI::checkItem4Deletion(CameraIconViewItem* iconItem, TQStringList& folders, TQStringList& files, + TQStringList& deleteList, TQStringList& lockedList) { if (iconItem->itemInfo()->writePermissions != 0) // Item not locked ? { - QString folder = iconItem->itemInfo()->folder; - QString file = iconItem->itemInfo()->name; + TQString folder = iconItem->itemInfo()->folder; + TQString file = iconItem->itemInfo()->name; folders.append(folder); files.append(file); - deleteList.append(folder + QString("/") + file); + deleteList.append(folder + TQString("/") + file); } else { @@ -1408,10 +1408,10 @@ void CameraUI::checkItem4Deletion(CameraIconViewItem* iconItem, QStringList& fol void CameraUI::deleteItems(bool onlySelected, bool onlyDownloaded) { - QStringList folders; - QStringList files; - QStringList deleteList; - QStringList lockedList; + TQStringList folders; + TQStringList files; + TQStringList deleteList; + TQStringList lockedList; for (IconItem* item = d->view->firstItem(); item; item = item->nextItem()) { @@ -1451,7 +1451,7 @@ void CameraUI::deleteItems(bool onlySelected, bool onlyDownloaded) // If we want to delete some locked files, just give a feedback to user. if (!lockedList.isEmpty()) { - QString infoMsg(i18n("The items listed below are locked by camera (read-only). " + TQString infoMsg(i18n("The items listed below are locked by camera (read-only). " "These items will not be deleted. If you really want to delete these items, " "please unlock them and try again.")); KMessageBox::informationList(this, infoMsg, lockedList, i18n("Information")); @@ -1460,7 +1460,7 @@ void CameraUI::deleteItems(bool onlySelected, bool onlyDownloaded) if (folders.isEmpty()) return; - QString warnMsg(i18n("About to delete this image. " + TQString warnMsg(i18n("About to delete this image. " "Deleted files are unrecoverable. " "Are you sure?", "About to delete these %n images. " @@ -1473,8 +1473,8 @@ void CameraUI::deleteItems(bool onlySelected, bool onlyDownloaded) i18n("Delete")) == KMessageBox::Continue) { - QStringList::iterator itFolder = folders.begin(); - QStringList::iterator itFile = files.begin(); + TQStringList::iterator itFolder = folders.begin(); + TQStringList::iterator itFile = files.begin(); d->progress->setProgress(0); d->progress->setTotalSteps(deleteList.count()); @@ -1500,7 +1500,7 @@ void CameraUI::slotDeleteAll() deleteItems(false, false); } -void CameraUI::slotDeleted(const QString& folder, const QString& file, bool status) +void CameraUI::slotDeleted(const TQString& folder, const TQString& file, bool status) { if (status) { @@ -1518,17 +1518,17 @@ void CameraUI::slotFileView(CameraIconViewItem* item) d->controller->openFile(item->itemInfo()->folder, item->itemInfo()->name); } -void CameraUI::slotExifFromFile(const QString& folder, const QString& file) +void CameraUI::slotExifFromFile(const TQString& folder, const TQString& file) { CameraIconViewItem* item = d->view->findItem(folder, file); if (!item) return; - d->rightSidebar->itemChanged(item->itemInfo(), folder + QString("/") + file, - QByteArray(), d->view, item); + d->rightSidebar->itemChanged(item->itemInfo(), folder + TQString("/") + file, + TQByteArray(), d->view, item); } -void CameraUI::slotExifFromData(const QByteArray& exifData) +void CameraUI::slotExifFromData(const TQByteArray& exifData) { CameraIconViewItem* item = dynamic_cast<CameraIconViewItem*>(d->view->currentItem()); @@ -1546,12 +1546,12 @@ void CameraUI::slotExifFromData(const QByteArray& exifData) if (!exifData.isEmpty()) { - int i = exifData.find(*exifHeader); + int i = exifData.tqfind(*exifHeader); if (i != -1) { DDebug() << "Exif header found at position " << i << endl; i = i + sizeof(exifHeader); - QByteArray data(exifData.size()-i); + TQByteArray data(exifData.size()-i); memcpy(data.data(), exifData.data()+i, data.size()); d->rightSidebar->itemChanged(item->itemInfo(), url, data, d->view, item); return; @@ -1589,11 +1589,11 @@ void CameraUI::slotItemsSelected(CameraIconViewItem* item, bool selected) if (selected) { // if selected item is in the list of item which will be deleted, set no current item - if (d->currentlyDeleting.find(item->itemInfo()->folder + item->itemInfo()->name) + if (d->currentlyDeleting.tqfind(item->itemInfo()->folder + item->itemInfo()->name) == d->currentlyDeleting.end()) { KURL url(item->itemInfo()->folder + '/' + item->itemInfo()->name); - d->rightSidebar->itemChanged(item->itemInfo(), url, QByteArray(), d->view, item); + d->rightSidebar->itemChanged(item->itemInfo(), url, TQByteArray(), d->view, item); d->controller->getExif(item->itemInfo()->folder, item->itemInfo()->name); } else @@ -1605,14 +1605,14 @@ void CameraUI::slotItemsSelected(CameraIconViewItem* item, bool selected) d->rightSidebar->slotNoCurrentItem(); } -bool CameraUI::createAutoAlbum(const KURL& parentURL, const QString& sub, - const QDate& date, QString& errMsg) +bool CameraUI::createAutoAlbum(const KURL& tqparentURL, const TQString& sub, + const TQDate& date, TQString& errMsg) { - KURL u(parentURL); + KURL u(tqparentURL); u.addPath(sub); // first stat to see if the album exists - QFileInfo info(u.path()); + TQFileInfo info(u.path()); if (info.exists()) { // now check if its really a directory @@ -1621,8 +1621,8 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const QString& sub, else { errMsg = i18n("A file with same name (%1) exists in folder %2") - .arg(sub) - .arg(parentURL.path()); + .tqarg(sub) + .tqarg(tqparentURL.path()); return false; } } @@ -1630,30 +1630,30 @@ bool CameraUI::createAutoAlbum(const KURL& parentURL, const QString& sub, // looks like the directory does not exist, try to create it AlbumManager* aman = AlbumManager::instance(); - PAlbum* parent = aman->findPAlbum(parentURL); - if (!parent) + PAlbum* tqparent = aman->findPAlbum(tqparentURL); + if (!tqparent) { errMsg = i18n("Failed to find Album for path '%1'") - .arg(parentURL.path()); + .tqarg(tqparentURL.path()); return false; } - return aman->createPAlbum(parent, sub, QString(""), date, QString(""), errMsg); + return aman->createPAlbum(tqparent, sub, TQString(""), date, TQString(""), errMsg); } -void CameraUI::addFileExtension(const QString& ext) +void CameraUI::addFileExtension(const TQString& ext) { AlbumSettings* settings = AlbumSettings::instance(); if (!settings) return; - if (settings->getImageFileFilter().upper().contains(ext.upper()) || - settings->getMovieFileFilter().upper().contains(ext.upper()) || - settings->getAudioFileFilter().upper().contains(ext.upper()) || - settings->getRawFileFilter().upper().contains(ext.upper())) + if (settings->getImageFileFilter().upper().tqcontains(ext.upper()) || + settings->getMovieFileFilter().upper().tqcontains(ext.upper()) || + settings->getAudioFileFilter().upper().tqcontains(ext.upper()) || + settings->getRawFileFilter().upper().tqcontains(ext.upper())) return; - settings->setImageFileFilter(settings->getImageFileFilter() + QString(" *.") + ext); + settings->setImageFileFilter(settings->getImageFileFilter() + TQString(" *.") + ext); emit signalAlbumSettingsChanged(); } @@ -1696,7 +1696,7 @@ void CameraUI::slotLastItem(void) // Backport KDialog::keyPressEvent() implementation from KDELibs to ignore Enter/Return Key events // to prevent any conflicts between dialog keys events and SpinBox keys events. -void CameraUI::keyPressEvent(QKeyEvent *e) +void CameraUI::keyPressEvent(TQKeyEvent *e) { if ( e->state() == 0 ) { diff --git a/digikam/utilities/cameragui/cameraui.h b/digikam/utilities/cameragui/cameraui.h index 8038b1c..39a267e 100644 --- a/digikam/utilities/cameragui/cameraui.h +++ b/digikam/utilities/cameragui/cameraui.h @@ -25,11 +25,11 @@ #ifndef CAMERAUI_H #define CAMERAUI_H -// Qt includes. +// TQt includes. -#include <qdatetime.h> -#include <qstring.h> -#include <qimage.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqimage.h> // KDE includes. @@ -50,12 +50,13 @@ class CameraUIPriv; class CameraUI : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CameraUI(QWidget* parent, const QString& cameraTitle, - const QString& model, const QString& port, - const QString& path, const QDateTime lastAccess); + CameraUI(TQWidget* tqparent, const TQString& cameraTitle, + const TQString& model, const TQString& port, + const TQString& path, const TQDateTime lastAccess); ~CameraUI(); bool isBusy() const; @@ -65,9 +66,9 @@ public: /** Get status of JPEG conversion files to lossless format during download.*/ bool convertLosslessJpegFiles() const; - QString losslessFormat(); + TQString losslessFormat(); - QString cameraTitle() const; + TQString cameraTitle() const; signals: @@ -80,37 +81,37 @@ public slots: protected: - void closeEvent(QCloseEvent* e); - void keyPressEvent(QKeyEvent *e); + void closeEvent(TQCloseEvent* e); + void keyPressEvent(TQKeyEvent *e); private: void readSettings(); void saveSettings(); bool dialogClosed(); - bool createAutoAlbum(const KURL& parentURL, const QString& sub, - const QDate& date, QString& errMsg); - void addFileExtension(const QString& ext); + bool createAutoAlbum(const KURL& tqparentURL, const TQString& sub, + const TQDate& date, TQString& errMsg); + void addFileExtension(const TQString& ext); void finishDialog(); void deleteItems(bool onlySelected, bool onlyDownloaded); - void checkItem4Deletion(CameraIconViewItem* iconItem, QStringList& folders, QStringList& files, - QStringList& deleteList, QStringList& lockedList); + void checkItem4Deletion(CameraIconViewItem* iconItem, TQStringList& folders, TQStringList& files, + TQStringList& deleteList, TQStringList& lockedList); private slots: void slotClose(); void slotCancelButton(); - void slotProcessURL(const QString& url); + void slotProcessURL(const TQString& url); void slotConnected(bool val); void slotBusy(bool val); - void slotErrorMsg(const QString& msg); + void slotErrorMsg(const TQString& msg); void slotInformations(); - void slotCameraInformations(const QString&, const QString&, const QString&); + void slotCameraInformations(const TQString&, const TQString&, const TQString&); - void slotFolderList(const QStringList& folderList); + void slotFolderList(const TQStringList& folderList); void slotFileList(const GPItemInfoList& fileList); - void slotThumbnail(const QString&, const QString&, const QImage&); + void slotThumbnail(const TQString&, const TQString&, const TQImage&); void slotIncreaseThumbSize(); void slotDecreaseThumbSize(); @@ -128,16 +129,16 @@ private slots: void slotFileView(CameraIconViewItem* item); void slotUploaded(const GPItemInfo&); - void slotDownloaded(const QString&, const QString&, int); - void slotSkipped(const QString&, const QString&); - void slotDeleted(const QString&, const QString&, bool); - void slotLocked(const QString&, const QString&, bool); + void slotDownloaded(const TQString&, const TQString&, int); + void slotSkipped(const TQString&, const TQString&); + void slotDeleted(const TQString&, const TQString&, bool); + void slotLocked(const TQString&, const TQString&, bool); void slotNewSelection(bool); void slotItemsSelected(CameraIconViewItem* item, bool selected); - void slotExifFromFile(const QString& folder, const QString& file); - void slotExifFromData(const QByteArray& exifData); + void slotExifFromFile(const TQString& folder, const TQString& file); + void slotExifFromData(const TQByteArray& exifData); void slotFirstItem(void); void slotPrevItem(void); diff --git a/digikam/utilities/cameragui/dkcamera.cpp b/digikam/utilities/cameragui/dkcamera.cpp index a0adaff..f5abe39 100644 --- a/digikam/utilities/cameragui/dkcamera.cpp +++ b/digikam/utilities/cameragui/dkcamera.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdeepcopy.h> +#include <tqdeepcopy.h> // Local includes. @@ -34,7 +34,7 @@ namespace Digikam { -DKCamera::DKCamera(const QString& title, const QString& model, const QString& port, const QString& path) +DKCamera::DKCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) { m_title = title; m_model = model; @@ -42,10 +42,10 @@ DKCamera::DKCamera(const QString& title, const QString& model, const QString& po m_path = path; AlbumSettings* settings = AlbumSettings::instance(); - m_imageFilter = QDeepCopy<QString>(settings->getImageFileFilter()); - m_movieFilter = QDeepCopy<QString>(settings->getMovieFileFilter()); - m_audioFilter = QDeepCopy<QString>(settings->getAudioFileFilter()); - m_rawFilter = QDeepCopy<QString>(settings->getRawFileFilter()); + m_imageFilter = TQDeepCopy<TQString>(settings->getImageFileFilter()); + m_movieFilter = TQDeepCopy<TQString>(settings->getMovieFileFilter()); + m_audioFilter = TQDeepCopy<TQString>(settings->getAudioFileFilter()); + m_rawFilter = TQDeepCopy<TQString>(settings->getRawFileFilter()); m_imageFilter = m_imageFilter.lower(); m_movieFilter = m_movieFilter.lower(); @@ -57,32 +57,32 @@ DKCamera::~DKCamera() { } -QString DKCamera::title() const +TQString DKCamera::title() const { return m_title; } -QString DKCamera::model() const +TQString DKCamera::model() const { return m_model; } -QString DKCamera::port() const +TQString DKCamera::port() const { return m_port; } -QString DKCamera::path() const +TQString DKCamera::path() const { return m_path; } -QString DKCamera::mimeType(const QString& fileext) const +TQString DKCamera::mimeType(const TQString& fileext) const { - if (fileext.isEmpty()) return QString(); + if (fileext.isEmpty()) return TQString(); - QString ext = fileext; - QString mime; + TQString ext = fileext; + TQString mime; // Massage known variations of known mimetypes into KDE specific ones if (ext == "jpg" || ext == "jpe") @@ -90,21 +90,21 @@ QString DKCamera::mimeType(const QString& fileext) const else if (ext == "tif") ext = "tiff"; - if (m_rawFilter.contains(ext)) + if (m_rawFilter.tqcontains(ext)) { - mime = QString("image/x-raw"); + mime = TQString("image/x-raw"); } - else if (m_imageFilter.contains(ext)) + else if (m_imageFilter.tqcontains(ext)) { - mime = QString("image/") + ext; + mime = TQString("image/") + ext; } - else if (m_movieFilter.contains(ext)) + else if (m_movieFilter.tqcontains(ext)) { - mime = QString("video/") + ext; + mime = TQString("video/") + ext; } - else if (m_audioFilter.contains(ext)) + else if (m_audioFilter.tqcontains(ext)) { - mime = QString("audio/") + ext; + mime = TQString("audio/") + ext; } return mime; diff --git a/digikam/utilities/cameragui/dkcamera.h b/digikam/utilities/cameragui/dkcamera.h index 0180986..2ef7672 100644 --- a/digikam/utilities/cameragui/dkcamera.h +++ b/digikam/utilities/cameragui/dkcamera.h @@ -25,16 +25,16 @@ #ifndef DKCAMERA_H #define DKCAMERA_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. #include "gpiteminfo.h" -class QStringList; -class QImage; +class TQStringList; +class TQImage; namespace Digikam { @@ -43,53 +43,53 @@ class DKCamera { public: - DKCamera(const QString& title, const QString& model, const QString& port, const QString& path); + DKCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path); virtual ~DKCamera(); virtual bool doConnect() = 0; virtual void cancel() = 0; - virtual void getAllFolders(const QString& folder, QStringList& subFolderList) = 0; + virtual void getAllFolders(const TQString& folder, TQStringList& subFolderList) = 0; /// If getImageDimensions is false, the camera shall set width and height to -1 /// if the values are not immediately available - virtual bool getItemsInfoList(const QString& folder, GPItemInfoList& infoList, bool getImageDimensions = true) = 0; + virtual bool getItemsInfoList(const TQString& folder, GPItemInfoList& infoList, bool getImageDimensions = true) = 0; - virtual bool getThumbnail(const QString& folder, const QString& itemName, QImage& thumbnail) = 0; - virtual bool getExif(const QString& folder, const QString& itemName, char **edata, int& esize) = 0; + virtual bool getThumbnail(const TQString& folder, const TQString& itemName, TQImage& thumbnail) = 0; + virtual bool getExif(const TQString& folder, const TQString& itemName, char **edata, int& esize) = 0; - virtual bool downloadItem(const QString& folder, const QString& itemName, const QString& saveFile) = 0; - virtual bool deleteItem(const QString& folder, const QString& itemName) = 0; - virtual bool uploadItem(const QString& folder, const QString& itemName, const QString& localFile, + virtual bool downloadItem(const TQString& folder, const TQString& itemName, const TQString& saveFile) = 0; + virtual bool deleteItem(const TQString& folder, const TQString& itemName) = 0; + virtual bool uploadItem(const TQString& folder, const TQString& itemName, const TQString& localFile, GPItemInfo& itemInfo, bool getImageDimensions=true) = 0; - virtual bool cameraSummary(QString& summary) = 0; - virtual bool cameraManual(QString& manual) = 0; - virtual bool cameraAbout(QString& about) = 0; + virtual bool cameraSummary(TQString& summary) = 0; + virtual bool cameraManual(TQString& manual) = 0; + virtual bool cameraAbout(TQString& about) = 0; - virtual bool setLockItem(const QString& folder, const QString& itemName, bool lock) = 0; + virtual bool setLockItem(const TQString& folder, const TQString& itemName, bool lock) = 0; - QString title() const; - QString model() const; - QString port() const; - QString path() const; + TQString title() const; + TQString model() const; + TQString port() const; + TQString path() const; protected: - QString mimeType(const QString& fileext) const; + TQString mimeType(const TQString& fileext) const; protected: - QString m_imageFilter; - QString m_movieFilter; - QString m_audioFilter; - QString m_rawFilter; + TQString m_imageFilter; + TQString m_movieFilter; + TQString m_audioFilter; + TQString m_rawFilter; private: - QString m_title; - QString m_model; - QString m_port; - QString m_path; + TQString m_title; + TQString m_model; + TQString m_port; + TQString m_path; }; } // namespace Digikam diff --git a/digikam/utilities/cameragui/downloadsettingscontainer.h b/digikam/utilities/cameragui/downloadsettingscontainer.h index 7004326..b3e5950 100644 --- a/digikam/utilities/cameragui/downloadsettingscontainer.h +++ b/digikam/utilities/cameragui/downloadsettingscontainer.h @@ -24,10 +24,10 @@ #ifndef DOWNLOADSETTINGSCONTAINER_H #define DOWNLOADSETTINGSCONTAINER_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqdatetime.h> namespace Digikam { @@ -56,22 +56,22 @@ public: bool setCredits; bool convertJpeg; - QDateTime newDateTime; + TQDateTime newDateTime; // File path to download. - QString folder; - QString file; - QString dest; + TQString folder; + TQString file; + TQString dest; // New format to convert Jpeg files. - QString losslessFormat; + TQString losslessFormat; // IPTC settings - QString author; - QString authorTitle; - QString credit; - QString source; - QString copyright; + TQString author; + TQString authorTitle; + TQString credit; + TQString source; + TQString copyright; }; } // namespace Digikam diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp index 2794110..f964f07 100644 --- a/digikam/utilities/cameragui/freespacewidget.cpp +++ b/digikam/utilities/cameragui/freespacewidget.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpalette.h> -#include <qcolor.h> -#include <qtimer.h> -#include <qfont.h> -#include <qfontmetrics.h> +// TQt includes. + +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpalette.h> +#include <tqcolor.h> +#include <tqtimer.h> +#include <tqfont.h> +#include <tqfontmetrics.h> // KDE includes. @@ -74,26 +74,26 @@ public: unsigned long kBUsed; unsigned long kBAvail; - QString mountPoint; + TQString mountPoint; - QTimer *timer; + TQTimer *timer; - QPixmap pix; + TQPixmap pix; }; -FreeSpaceWidget::FreeSpaceWidget(QWidget* parent, int width) - : QWidget(parent, 0, WResizeNoErase|WRepaintNoErase) +FreeSpaceWidget::FreeSpaceWidget(TQWidget* tqparent, int width) + : TQWidget(tqparent, 0, WResizeNoErase|WRepaintNoErase) { d = new FreeSpaceWidgetPriv; - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setFixedWidth(width); setMaximumHeight(fontMetrics().height()+4); slotTimeout(); - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeout())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeout())); d->timer->start(10000); } @@ -109,7 +109,7 @@ void FreeSpaceWidget::setEstimatedDSizeKb(unsigned long dSize) { d->dSizeKb = dSize; updatePixmap(); - repaint(); + tqrepaint(); } unsigned long FreeSpaceWidget::estimatedDSizeKb() @@ -142,19 +142,19 @@ unsigned long FreeSpaceWidget::kBAvail() return d->kBAvail; } -QString FreeSpaceWidget::mountPoint() +TQString FreeSpaceWidget::mountPoint() { return d->mountPoint; } void FreeSpaceWidget::updatePixmap() { - QPixmap fimgPix = SmallIcon("folder_image"); - d->pix = QPixmap(size()); - d->pix.fill(colorGroup().background()); + TQPixmap fimgPix = SmallIcon("folder_image"); + d->pix = TQPixmap(size()); + d->pix.fill(tqcolorGroup().background()); - QPainter p(&d->pix); - p.setPen(colorGroup().mid()); + TQPainter p(&d->pix); + p.setPen(tqcolorGroup().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()); @@ -165,29 +165,29 @@ void FreeSpaceWidget::updatePixmap() unsigned long eUsedKb = d->dSizeKb + d->kBUsed; int peUsed = (int)(100.0*((double)eUsedKb/(double)d->kBSize)); int pClamp = peUsed > 100 ? 100 : peUsed; - p.setBrush(peUsed > 95 ? Qt::red : Qt::darkGreen); - p.setPen(Qt::white); - QRect gRect(fimgPix.height()+2, 1, + p.setBrush(peUsed > 95 ? TQt::red : TQt::darkGreen); + p.setPen(TQt::white); + TQRect gRect(fimgPix.height()+2, 1, (int)(((double)d->pix.width()-2.0-fimgPix.width()-2.0)*(pClamp/100.0)), d->pix.height()-2); p.drawRect(gRect); - QRect tRect(fimgPix.height()+2, 1, d->pix.width()-2-fimgPix.width()-2, d->pix.height()-2); - QString text = QString("%1%").arg(peUsed); - p.setPen(colorGroup().text()); - QFontMetrics fontMt = p.fontMetrics(); - QRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(), + 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()); + TQFontMetrics fontMt = p.fontMetrics(); + TQRect fontRect = fontMt.boundingRect(tRect.x(), tRect.y(), tRect.width(), tRect.height(), 0, text); - p.drawText(tRect, Qt::AlignCenter, text); + p.drawText(tRect, TQt::AlignCenter, text); - QString tipText, value; - QString header = i18n("Album Library"); - QString headBeg("<tr bgcolor=\"orange\"><td colspan=\"2\">" + TQString tipText, value; + TQString header = i18n("Album Library"); + TQString headBeg("<tr bgcolor=\"orange\"><td colspan=\"2\">" "<nobr><font size=\"-1\" color=\"black\"><b>"); - QString headEnd("</b></font></nobr></td></tr>"); - QString cellBeg("<tr><td><nobr><font size=-1>"); - QString cellMid("</font></nobr></td><td><nobr><font size=-1>"); - QString cellEnd("</font></nobr></td></tr>"); + TQString headEnd("</b></font></nobr></td></tr>"); + TQString cellBeg("<tr><td><nobr><font size=-1>"); + TQString cellMid("</font></nobr></td><td><nobr><font size=-1>"); + TQString cellEnd("</font></nobr></td></tr>"); tipText = "<table cellspacing=0 cellpadding=0>"; tipText += headBeg + header + headEnd; @@ -213,31 +213,31 @@ void FreeSpaceWidget::updatePixmap() tipText += "</table>"; - QWhatsThis::add(this, tipText); - QToolTip::add(this, tipText); + TQWhatsThis::add(this, tipText); + TQToolTip::add(this, tipText); } p.end(); } -void FreeSpaceWidget::paintEvent(QPaintEvent*) +void FreeSpaceWidget::paintEvent(TQPaintEvent*) { bitBlt(this, 0, 0, &d->pix); } void FreeSpaceWidget::slotTimeout() { - QString mountPoint = KIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); + TQString mountPoint = KIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath()); KDiskFreeSp *job = new KDiskFreeSp; - connect(job, SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, - const unsigned long&, const QString&)), - this, SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, - const unsigned long&, const QString&))); + connect(job, TQT_SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&, + const unsigned long&, const TQString&)), + this, TQT_SLOT(slotAvailableFreeSpace(const unsigned long&, const unsigned long&, + const unsigned long&, const TQString&))); job->readDF(mountPoint); } void FreeSpaceWidget::slotAvailableFreeSpace(const unsigned long& kBSize, const unsigned long& kBUsed, - const unsigned long& kBAvail, const QString& mountPoint) + const unsigned long& kBAvail, const TQString& mountPoint) { d->mountPoint = mountPoint; d->kBSize = kBSize; @@ -246,7 +246,7 @@ void FreeSpaceWidget::slotAvailableFreeSpace(const unsigned long& kBSize, const d->percentUsed = 100 - (int)(100.0*kBAvail/kBSize); d->isValid = true; updatePixmap(); - repaint(); + tqrepaint(); } } // namespace Digikam diff --git a/digikam/utilities/cameragui/freespacewidget.h b/digikam/utilities/cameragui/freespacewidget.h index e58f382..c8ad03f 100644 --- a/digikam/utilities/cameragui/freespacewidget.h +++ b/digikam/utilities/cameragui/freespacewidget.h @@ -24,23 +24,24 @@ #ifndef FREESPACEWIDGET_H #define FREESPACEWIDGET_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> namespace Digikam { class FreeSpaceWidgetPriv; -class FreeSpaceWidget : public QWidget +class FreeSpaceWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FreeSpaceWidget(QWidget* parent, int width); + FreeSpaceWidget(TQWidget* tqparent, int width); ~FreeSpaceWidget(); void setEstimatedDSizeKb(unsigned long dSize); @@ -51,18 +52,18 @@ public: unsigned long kBSize(); unsigned long kBUsed(); unsigned long kBAvail(); - QString mountPoint(); + TQString mountPoint(); protected: - void paintEvent(QPaintEvent*); + void paintEvent(TQPaintEvent*); void updatePixmap(); private slots: void slotTimeout(); void slotAvailableFreeSpace(const unsigned long& kBSize, const unsigned long& kBUsed, - const unsigned long& kBAvail, const QString& mountPoint); + const unsigned long& kBAvail, const TQString& mountPoint); private: diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp index 2e5b372..9c6be9b 100644 --- a/digikam/utilities/cameragui/gpcamera.cpp +++ b/digikam/utilities/cameragui/gpcamera.cpp @@ -27,14 +27,14 @@ #include <cstdio> #include <iostream> -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qstringlist.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qdom.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqdom.h> +#include <tqfile.h> // KDE includes. @@ -72,27 +72,27 @@ public: bool mkDirSupport; bool delDirSupport; - QString model; - QString port; - QString globalPath; + TQString model; + TQString port; + TQString globalPath; Camera *camera; CameraAbilities cameraAbilities; }; -class GPStatus +class GPtqStatus { public: - GPStatus() + GPtqStatus() { context = gp_context_new(); cancel = false; gp_context_set_cancel_func(context, cancel_func, 0); } - ~GPStatus() + ~GPtqStatus() { gp_context_unref(context); cancel = false; @@ -108,9 +108,9 @@ public: } }; -bool GPStatus::cancel = false; +bool GPtqStatus::cancel = false; -GPCamera::GPCamera(const QString& title, const QString& model, const QString& port, const QString& path) +GPCamera::GPCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) : DKCamera(title, model, port, path) { m_status = 0; @@ -139,17 +139,17 @@ GPCamera::~GPCamera() delete d; } -QString GPCamera::model() const +TQString GPCamera::model() const { return d->model; } -QString GPCamera::port() const +TQString GPCamera::port() const { return d->port; } -QString GPCamera::path() const +TQString GPCamera::path() const { return d->globalPath; } @@ -202,7 +202,7 @@ bool GPCamera::doConnect() m_status = 0; } - m_status = new GPStatus(); + m_status = new GPtqStatus(); 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 GPStatus(); + m_status = new GPtqStatus(); // Try and initialize the camera to see if its connected errorCode = gp_camera_init(d->camera, m_status->context); @@ -300,27 +300,27 @@ void GPCamera::cancel() m_status->cancel = true; } -void GPCamera::getAllFolders(const QString& rootFolder, - QStringList& folderList) +void GPCamera::getAllFolders(const TQString& rootFolder, + TQStringList& folderList) { - QStringList subfolders; + TQStringList subfolders; getSubFolders(rootFolder, subfolders); - for (QStringList::iterator it = subfolders.begin(); + for (TQStringList::iterator it = subfolders.begin(); it != subfolders.end(); ++it) { - *it = rootFolder + QString(rootFolder.endsWith("/") ? "" : "/") + (*it); + *it = rootFolder + TQString(rootFolder.endsWith("/") ? "" : "/") + (*it); folderList.append(*it); } - for (QStringList::iterator it = subfolders.begin(); + for (TQStringList::iterator it = subfolders.begin(); it != subfolders.end(); ++it) { getAllFolders(*it, folderList); } } -bool GPCamera::getSubFolders(const QString& folder, QStringList& subFolderList) +bool GPCamera::getSubFolders(const TQString& folder, TQStringList& subFolderList) { int errorCode; CameraList *clist; @@ -331,9 +331,9 @@ bool GPCamera::getSubFolders(const QString& folder, QStringList& subFolderList) delete m_status; m_status = 0; } - m_status = new GPStatus(); + m_status = new GPtqStatus(); - errorCode = gp_camera_folder_list_folders(d->camera, QFile::encodeName(folder), clist, m_status->context); + errorCode = gp_camera_folder_list_folders(d->camera, TQFile::encodeName(folder), clist, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to get folders list from camera!" << endl; @@ -360,14 +360,14 @@ bool GPCamera::getSubFolders(const QString& folder, QStringList& subFolderList) return false; } - subFolderList.append(QFile::decodeName(subFolder)); + subFolderList.append(TQFile::decodeName(subFolder)); } gp_list_unref(clist); return true; } -bool GPCamera::getItemsList(const QString& folder, QStringList& itemsList) +bool GPCamera::getItemsList(const TQString& folder, TQStringList& itemsList) { int errorCode; CameraList *clist; @@ -378,11 +378,11 @@ bool GPCamera::getItemsList(const QString& folder, QStringList& itemsList) delete m_status; m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; gp_list_new(&clist); - errorCode = gp_camera_folder_list_files(d->camera, QFile::encodeName(folder), clist, m_status->context); + errorCode = gp_camera_folder_list_files(d->camera, TQFile::encodeName(folder), clist, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to get folder files list from camera!" << endl; @@ -407,7 +407,7 @@ bool GPCamera::getItemsList(const QString& folder, QStringList& itemsList) return false; } - itemsList.append(QFile::decodeName(cname)); + itemsList.append(TQFile::decodeName(cname)); } gp_list_unref(clist); @@ -418,7 +418,7 @@ bool GPCamera::getItemsList(const QString& folder, QStringList& itemsList) return true; } -bool GPCamera::getItemsInfoList(const QString& folder, GPItemInfoList& items, bool /*getImageDimensions*/) +bool GPCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& items, bool /*getImageDimensions*/) { int errorCode; CameraList *clist; @@ -429,11 +429,11 @@ bool GPCamera::getItemsInfoList(const QString& folder, GPItemInfoList& items, bo delete m_status; m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; gp_list_new(&clist); - errorCode = gp_camera_folder_list_files(d->camera, QFile::encodeName(folder), clist, m_status->context); + errorCode = gp_camera_folder_list_files(d->camera, TQFile::encodeName(folder), clist, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to get folder files list from camera!" << endl; @@ -460,11 +460,11 @@ bool GPCamera::getItemsInfoList(const QString& folder, GPItemInfoList& items, bo GPItemInfo itemInfo; - itemInfo.name = QFile::decodeName(cname); + itemInfo.name = TQFile::decodeName(cname); itemInfo.folder = folder; CameraFileInfo info; - gp_camera_file_get_info(d->camera, QFile::encodeName(folder), + gp_camera_file_get_info(d->camera, TQFile::encodeName(folder), cname, &info, m_status->context); itemInfo.mtime = -1; @@ -480,7 +480,7 @@ bool GPCamera::getItemsInfoList(const QString& folder, GPItemInfoList& items, bo if (info.file.fields & GP_FILE_INFO_TYPE) itemInfo.mime = info.file.type;*/ - itemInfo.mime = mimeType(itemInfo.name.section('.', -1).lower()); + itemInfo.mime = mimeType(TQString(itemInfo.name.section('.', -1)).lower()); if (info.file.fields & GP_FILE_INFO_MTIME) itemInfo.mtime = info.file.mtime; @@ -523,7 +523,7 @@ bool GPCamera::getItemsInfoList(const QString& folder, GPItemInfoList& items, bo return true; } -bool GPCamera::getThumbnail(const QString& folder, const QString& itemName, QImage& thumbnail) +bool GPCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQImage& thumbnail) { int errorCode; CameraFile *cfile; @@ -538,10 +538,10 @@ bool GPCamera::getThumbnail(const QString& folder, const QString& itemName, QIma m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; - errorCode = gp_camera_file_get(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), + errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), GP_FILE_TYPE_PREVIEW, cfile, m_status->context); if (errorCode != GP_OK) @@ -572,7 +572,7 @@ bool GPCamera::getThumbnail(const QString& folder, const QString& itemName, QIma return true; } -bool GPCamera::getExif(const QString& folder, const QString& itemName, +bool GPCamera::getExif(const TQString& folder, const TQString& itemName, char **edata, int& esize) { int errorCode; @@ -588,10 +588,10 @@ bool GPCamera::getExif(const QString& folder, const QString& itemName, m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; - errorCode = gp_camera_file_get(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), + errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), GP_FILE_TYPE_EXIF, cfile, m_status->context); if (errorCode != GP_OK) @@ -624,8 +624,8 @@ bool GPCamera::getExif(const QString& folder, const QString& itemName, return true; } -bool GPCamera::downloadItem(const QString& folder, const QString& itemName, - const QString& saveFile) +bool GPCamera::downloadItem(const TQString& folder, const TQString& itemName, + const TQString& saveFile) { int errorCode; CameraFile *cfile; @@ -638,10 +638,10 @@ bool GPCamera::downloadItem(const QString& folder, const QString& itemName, m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; - errorCode = gp_camera_file_get(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), + errorCode = gp_camera_file_get(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), GP_FILE_TYPE_NORMAL, cfile, m_status->context); if ( errorCode != GP_OK) @@ -657,7 +657,7 @@ bool GPCamera::downloadItem(const QString& folder, const QString& itemName, delete m_status; m_status = 0; - errorCode = gp_file_save(cfile, QFile::encodeName(saveFile)); + errorCode = gp_file_save(cfile, TQFile::encodeName(saveFile)); if (errorCode != GP_OK) { DDebug() << "Failed to save camera item!" << endl; @@ -670,7 +670,7 @@ bool GPCamera::downloadItem(const QString& folder, const QString& itemName, return true; } -bool GPCamera::setLockItem(const QString& folder, const QString& itemName, bool lock) +bool GPCamera::setLockItem(const TQString& folder, const TQString& itemName, bool lock) { int errorCode; if (m_status) @@ -679,11 +679,11 @@ bool GPCamera::setLockItem(const QString& folder, const QString& itemName, bool m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; CameraFileInfo info; - errorCode = gp_camera_file_get_info(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), &info, m_status->context); + errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), &info, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to get camera item properties!" << endl; @@ -712,8 +712,8 @@ bool GPCamera::setLockItem(const QString& folder, const QString& itemName, bool info.preview.fields = GP_FILE_INFO_NONE; info.audio.fields = GP_FILE_INFO_NONE; - errorCode = gp_camera_file_set_info(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), info, m_status->context); + errorCode = gp_camera_file_set_info(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), info, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to set camera item lock properties!" << endl; @@ -728,7 +728,7 @@ bool GPCamera::setLockItem(const QString& folder, const QString& itemName, bool return true; } -bool GPCamera::deleteItem(const QString& folder, const QString& itemName) +bool GPCamera::deleteItem(const TQString& folder, const TQString& itemName) { int errorCode; if (m_status) @@ -737,10 +737,10 @@ bool GPCamera::deleteItem(const QString& folder, const QString& itemName) m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; - errorCode = gp_camera_file_delete(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), + errorCode = gp_camera_file_delete(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), m_status->context); if (errorCode != GP_OK) { @@ -758,10 +758,10 @@ bool GPCamera::deleteItem(const QString& folder, const QString& itemName) } // recursively delete all items -bool GPCamera::deleteAllItems(const QString& folder) +bool GPCamera::deleteAllItems(const TQString& folder) { int errorCode; - QStringList folderList; + TQStringList folderList; // Get all subfolders in this folder getSubFolders(folder, folderList); @@ -770,7 +770,7 @@ bool GPCamera::deleteAllItems(const QString& folder) { for (unsigned int i = 0 ; i < folderList.count() ; i++) { - QString subFolder(folder); + TQString subFolder(folder); if (!subFolder.endsWith("/")) subFolder += '/'; @@ -786,9 +786,9 @@ bool GPCamera::deleteAllItems(const QString& folder) m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; - errorCode = gp_camera_folder_delete_all(d->camera, QFile::encodeName(folder), + errorCode = gp_camera_folder_delete_all(d->camera, TQFile::encodeName(folder), m_status->context); if (errorCode != GP_OK) { @@ -805,7 +805,7 @@ bool GPCamera::deleteAllItems(const QString& folder) return true; } -bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const QString& localFile, +bool GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const TQString& localFile, GPItemInfo& itemInfo, bool /*getImageDimensions*/) { int errorCode; @@ -819,7 +819,7 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const return false; } - errorCode = gp_file_open(cfile, QFile::encodeName(localFile)); + errorCode = gp_file_open(cfile, TQFile::encodeName(localFile)); if (errorCode != GP_OK) { DDebug() << "Failed to open file!" << endl; @@ -828,7 +828,7 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const return false; } - errorCode = gp_file_set_name(cfile, QFile::encodeName(itemName)); + errorCode = gp_file_set_name(cfile, TQFile::encodeName(itemName)); if (errorCode != GP_OK) { DDebug() << "Failed to rename item from camera!" << endl; @@ -843,10 +843,10 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; errorCode = gp_camera_folder_put_file(d->camera, - QFile::encodeName(folder), + TQFile::encodeName(folder), cfile, m_status->context); if (errorCode != GP_OK) @@ -865,8 +865,8 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const itemInfo.folder = folder; CameraFileInfo info; - errorCode = gp_camera_file_get_info(d->camera, QFile::encodeName(folder), - QFile::encodeName(itemName), &info, m_status->context); + errorCode = gp_camera_file_get_info(d->camera, TQFile::encodeName(folder), + TQFile::encodeName(itemName), &info, m_status->context); if (errorCode != GP_OK) { DDebug() << "Failed to get camera item information!" << endl; @@ -890,7 +890,7 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const if (info.file.fields & GP_FILE_INFO_TYPE) itemInfo.mime = info.file.type;*/ - itemInfo.mime = mimeType(itemInfo.name.section('.', -1).lower()); + itemInfo.mime = mimeType(TQString(itemInfo.name.section('.', -1)).lower()); if (info.file.fields & GP_FILE_INFO_MTIME) itemInfo.mtime = info.file.mtime; @@ -930,7 +930,7 @@ bool GPCamera::uploadItem(const QString& folder, const QString& itemName, const return true; } -bool GPCamera::cameraSummary(QString& summary) +bool GPCamera::cameraSummary(TQString& summary) { int errorCode; CameraText sum; @@ -941,7 +941,7 @@ bool GPCamera::cameraSummary(QString& summary) m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; errorCode = gp_camera_get_summary(d->camera, &sum, m_status->context); if (errorCode != GP_OK) @@ -962,24 +962,24 @@ bool GPCamera::cameraSummary(QString& summary) "Upload items: %7\n" "Create directories: %8\n" "Delete directories: %9\n\n") - .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(QString(sum.text)); + .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")); + + summary.append(TQString(sum.text)); delete m_status; m_status = 0; return true; } -bool GPCamera::cameraManual(QString& manual) +bool GPCamera::cameraManual(TQString& manual) { int errorCode; CameraText man; @@ -990,7 +990,7 @@ bool GPCamera::cameraManual(QString& manual) m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; errorCode = gp_camera_get_manual(d->camera, &man, m_status->context); if (errorCode != GP_OK) @@ -1002,14 +1002,14 @@ bool GPCamera::cameraManual(QString& manual) return false; } - manual = QString(man.text); + manual = TQString(man.text); delete m_status; m_status = 0; return true; } -bool GPCamera::cameraAbout(QString& about) +bool GPCamera::cameraAbout(TQString& about) { int errorCode; CameraText abt; @@ -1020,7 +1020,7 @@ bool GPCamera::cameraAbout(QString& about) m_status = 0; } - m_status = new GPStatus; + m_status = new GPtqStatus; errorCode = gp_camera_get_about(d->camera, &abt, m_status->context); if (errorCode != GP_OK) @@ -1032,7 +1032,7 @@ bool GPCamera::cameraAbout(QString& about) return false; } - about = QString(abt.text); + about = TQString(abt.text); about.append(i18n("\n\nTo report problems about this driver, please contact " "the gphoto2 team at:\n\nhttp://gphoto.org/bugs")); @@ -1049,7 +1049,7 @@ void GPCamera::printGphotoErrorDescription(int errorCode) << " (" << errorCode << ")" << endl; } -void GPCamera::getSupportedCameras(int& count, QStringList& clist) +void GPCamera::getSupportedCameras(int& count, TQStringList& clist) { clist.clear(); count = 0; @@ -1077,7 +1077,7 @@ void GPCamera::getSupportedCameras(int& count, QStringList& clist) { gp_abilities_list_get_abilities( abilList, i, &abil ); const char *cname = abil.model; - clist.append( QString( cname ) ); + clist.append( TQString( cname ) ); } } @@ -1085,7 +1085,7 @@ void GPCamera::getSupportedCameras(int& count, QStringList& clist) gp_context_unref( context ); } -void GPCamera::getSupportedPorts(QStringList& plist) +void GPCamera::getSupportedPorts(TQStringList& plist) { GPPortInfoList *list; GPPortInfo info; @@ -1115,7 +1115,7 @@ void GPCamera::getSupportedPorts(QStringList& plist) gp_port_info_list_free( list ); } -void GPCamera::getCameraSupportedPorts(const QString& model, QStringList& plist) +void GPCamera::getCameraSupportedPorts(const TQString& model, TQStringList& plist) { int i = 0; plist.clear(); @@ -1141,7 +1141,7 @@ void GPCamera::getCameraSupportedPorts(const QString& model, QStringList& plist) gp_context_unref( context ); } -int GPCamera::autoDetect(QString& model, QString& port) +int GPCamera::autoDetect(TQString& model, TQString& port) { CameraList *camList; CameraAbilitiesList *abilList; @@ -1193,8 +1193,8 @@ int GPCamera::autoDetect(QString& model, QString& port) if (camModel_ && camPort_) { - model = QString::fromLatin1(camModel_); - port = QString::fromLatin1(camPort_); + model = TQString::tqfromLatin1(camModel_); + port = TQString::tqfromLatin1(camPort_); gp_list_free(camList); return 0; } diff --git a/digikam/utilities/cameragui/gpcamera.h b/digikam/utilities/cameragui/gpcamera.h index b487e2b..50752d6 100644 --- a/digikam/utilities/cameragui/gpcamera.h +++ b/digikam/utilities/cameragui/gpcamera.h @@ -29,13 +29,13 @@ #include "dkcamera.h" -class QImage; +class TQImage; namespace Digikam { class GPCameraPrivate; -class GPStatus; +class GPtqStatus; // Gphoto2 camera Implementation of abstract type DKCamera @@ -44,8 +44,8 @@ class GPCamera : public DKCamera public: - GPCamera(const QString& title, const QString& model, - const QString& port, const QString& path); + GPCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path); ~GPCamera(); bool thumbnailSupport(); @@ -58,38 +58,38 @@ public: void cancel(); - void getAllFolders(const QString& folder, QStringList& subFolderList); - bool getSubFolders(const QString& folder, QStringList& subFolderList); - bool getItemsList(const QString& folder, QStringList& itemsList); - bool getItemsInfoList(const QString& folder, GPItemInfoList& items, bool getImageDimensions = true); - bool getThumbnail(const QString& folder, const QString& itemName, QImage& thumbnail); - bool getExif(const QString& folder, const QString& itemName, char **edata, int& esize); + void getAllFolders(const TQString& folder, TQStringList& subFolderList); + bool getSubFolders(const TQString& folder, TQStringList& subFolderList); + bool getItemsList(const TQString& folder, TQStringList& itemsList); + bool getItemsInfoList(const TQString& folder, GPItemInfoList& items, bool getImageDimensions = true); + bool getThumbnail(const TQString& folder, const TQString& itemName, TQImage& thumbnail); + bool getExif(const TQString& folder, const TQString& itemName, char **edata, int& esize); - bool setLockItem(const QString& folder, const QString& itemName, bool lock); + bool setLockItem(const TQString& folder, const TQString& itemName, bool lock); - bool downloadItem(const QString& folder, const QString& itemName, const QString& saveFile); - bool deleteItem(const QString& folder, const QString& itemName); + bool downloadItem(const TQString& folder, const TQString& itemName, const TQString& saveFile); + bool deleteItem(const TQString& folder, const TQString& itemName); // recursively delete all items - bool deleteAllItems(const QString& folder); + bool deleteAllItems(const TQString& folder); - bool uploadItem(const QString& folder, const QString& itemName, const QString& localFile, + bool uploadItem(const TQString& folder, const TQString& itemName, const TQString& localFile, GPItemInfo& itemInfo, bool getImageDimensions=true); - bool cameraSummary(QString& summary); - bool cameraManual(QString& manual); - bool cameraAbout(QString& about); + bool cameraSummary(TQString& summary); + bool cameraManual(TQString& manual); + bool cameraAbout(TQString& about); - QString model() const; - QString port() const; - QString path() const; + TQString model() const; + TQString port() const; + TQString path() const; // Public static methods shared with Camera Setup - static int autoDetect(QString& model, QString& port); - static void getSupportedCameras(int& count, QStringList& clist); - static void getSupportedPorts(QStringList& plist); - static void getCameraSupportedPorts(const QString& model, QStringList& plist); + static int autoDetect(TQString& model, TQString& port); + static void getSupportedCameras(int& count, TQStringList& clist); + static void getSupportedPorts(TQStringList& plist); + static void getCameraSupportedPorts(const TQString& model, TQStringList& plist); private: @@ -99,7 +99,7 @@ private: private: GPCameraPrivate *d; - GPStatus *m_status; + GPtqStatus *m_status; }; } // namespace Digikam diff --git a/digikam/utilities/cameragui/gpiteminfo.cpp b/digikam/utilities/cameragui/gpiteminfo.cpp index e32e470..3a1d53e 100644 --- a/digikam/utilities/cameragui/gpiteminfo.cpp +++ b/digikam/utilities/cameragui/gpiteminfo.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdatastream.h> +#include <tqdatastream.h> // Local includes. @@ -33,7 +33,7 @@ namespace Digikam { -QDataStream& operator<<( QDataStream& ds, const GPItemInfo& info) +TQDataStream& operator<<( TQDataStream& ds, const GPItemInfo& info) { ds << info.name; ds << info.folder; @@ -49,7 +49,7 @@ QDataStream& operator<<( QDataStream& ds, const GPItemInfo& info) return ds; } -QDataStream& operator>>(QDataStream& ds, GPItemInfo& info) +TQDataStream& operator>>(TQDataStream& ds, GPItemInfo& info) { ds >> info.name; ds >> info.folder; diff --git a/digikam/utilities/cameragui/gpiteminfo.h b/digikam/utilities/cameragui/gpiteminfo.h index 768685d..8143c5f 100644 --- a/digikam/utilities/cameragui/gpiteminfo.h +++ b/digikam/utilities/cameragui/gpiteminfo.h @@ -29,12 +29,12 @@ #include <ctime> -// Qt includes. +// TQt includes. -#include <qvaluelist.h> -#include <qcstring.h> +#include <tqvaluelist.h> +#include <tqcstring.h> -class QDataStream; +class TQDataStream; namespace Digikam { @@ -44,7 +44,7 @@ class GPItemInfo public: - enum DownloadStatus + enum DownloadtqStatus { DownloadUnknow = -1, DownloadedNo = 0, @@ -59,21 +59,21 @@ public: long size; int width; int height; - int downloaded; // See DownloadStatus enum. + int downloaded; // See DownloadtqStatus enum. int readPermissions; int writePermissions; - QString name; - QString folder; - QString mime; + TQString name; + TQString folder; + TQString mime; time_t mtime; }; -QDataStream& operator<<( QDataStream &, const GPItemInfo & ); -QDataStream& operator>>( QDataStream &, GPItemInfo & ); +TQDataStream& operator<<( TQDataStream &, const GPItemInfo & ); +TQDataStream& operator>>( TQDataStream &, GPItemInfo & ); -typedef QValueList<GPItemInfo> GPItemInfoList; +typedef TQValueList<GPItemInfo> GPItemInfoList; } // namespace Digikam diff --git a/digikam/utilities/cameragui/mtqueue.h b/digikam/utilities/cameragui/mtqueue.h index 1933c35..95b1931 100644 --- a/digikam/utilities/cameragui/mtqueue.h +++ b/digikam/utilities/cameragui/mtqueue.h @@ -21,13 +21,13 @@ * * ============================================================ */ -#ifndef COMMAND_QUEUE_H -#define COMMAND_QUEUE_H +#ifndef COMMAND_TQUEUE_H +#define COMMAND_TQUEUE_H -// Qt includes. +// TQt includes. -#include <qptrqueue.h> -#include <qmutex.h> +#include <tqptrqueue.h> +#include <tqmutex.h> namespace Digikam { @@ -107,10 +107,10 @@ public: private: - QPtrQueue<Type> queue_; - QMutex mutex_; + TQPtrQueue<Type> queue_; + TQMutex mutex_; }; } // namespace Digikam -#endif // COMMAND_QUEUE_H +#endif // COMMAND_TQUEUE_H diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index fc90ce2..3d57ac3 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -23,18 +23,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qdatetime.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqdatetime.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> // KDE includes. @@ -94,31 +94,31 @@ public: dateTimeFormat = 0; } - QWidget *focusedWidget; + TQWidget *focusedWidget; - QString cameraTitle; + TQString cameraTitle; - QRadioButton *renameDefault; - QRadioButton *renameCustom; + TQRadioButton *renameDefault; + TQRadioButton *renameCustom; - QGroupBox *renameDefaultBox; - QGroupBox *renameCustomBox; + TQGroupBox *renameDefaultBox; + TQGroupBox *renameCustomBox; - QLabel *renameDefaultCase; - QLabel *startIndexLabel; - QLabel *dateTimeLabel; + TQLabel *renameDefaultCase; + TQLabel *startIndexLabel; + TQLabel *dateTimeLabel; - QComboBox *renameDefaultCaseType; - QComboBox *dateTimeFormat; + TQComboBox *renameDefaultCaseType; + TQComboBox *dateTimeFormat; - QCheckBox *addDateTimeBox; - QCheckBox *addCameraNameBox; - QCheckBox *addSeqNumberBox; + TQCheckBox *addDateTimeBox; + TQCheckBox *addCameraNameBox; + TQCheckBox *addSeqNumberBox; - QPushButton *dateTimeButton; - QString dateTimeFormatString; + TQPushButton *dateTimeButton; + TQString dateTimeFormatString; - QTimer *changedTimer; + TQTimer *changedTimer; KLineEdit *renameCustomPrefix; KLineEdit *renameCustomSuffix; @@ -126,42 +126,42 @@ public: KIntNumInput *startIndexInput; }; -RenameCustomizer::RenameCustomizer(QWidget* parent, const QString& cameraTitle) - : QButtonGroup(parent) +RenameCustomizer::RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle) + : TQButtonGroup(tqparent) { d = new RenameCustomizerPriv; - d->changedTimer = new QTimer(this); + d->changedTimer = new TQTimer(this); d->cameraTitle = cameraTitle; - setFrameStyle( QFrame::NoFrame ); + setFrameStyle( TQFrame::NoFrame ); setRadioButtonExclusive(true); setColumnLayout(0, Qt::Vertical); - QGridLayout* mainLayout = new QGridLayout(layout(), 4, 1); + TQGridLayout* mainLayout = new TQGridLayout(tqlayout(), 4, 1); // ---------------------------------------------------------------- - d->renameDefault = new QRadioButton(i18n("Camera filenames"), this); - QWhatsThis::add( d->renameDefault, i18n("<p>Turn on this option to use camera " + d->renameDefault = new TQRadioButton(i18n("Camera filenames"), this); + TQWhatsThis::add( d->renameDefault, i18n("<p>Turn on this option to use camera " "provided image filenames without modifications.")); mainLayout->addMultiCellWidget(d->renameDefault, 0, 0, 0, 1); - d->renameDefaultBox = new QGroupBox( this ); - d->renameDefaultBox->setFrameStyle(QFrame::NoFrame|QFrame::Plain); + d->renameDefaultBox = new TQGroupBox( this ); + d->renameDefaultBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameDefaultBox->setInsideMargin(0); d->renameDefaultBox->setColumnLayout(0, Qt::Vertical); - d->renameDefaultCase = new QLabel( i18n("Change case to:"), d->renameDefaultBox ); - d->renameDefaultCase->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ); + d->renameDefaultCase = new TQLabel( i18n("Change case to:"), d->renameDefaultBox ); + d->renameDefaultCase->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); - d->renameDefaultCaseType = new QComboBox( d->renameDefaultBox ); + 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->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - QWhatsThis::add( d->renameDefaultCaseType, i18n("<p>Set the method to use to change the case " + d->renameDefaultCaseType->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); + TQWhatsThis::add( d->renameDefaultCaseType, i18n("<p>Set the method to use to change the case " "of image filenames.")); - QHBoxLayout* boxLayout1 = new QHBoxLayout( d->renameDefaultBox->layout() ); + TQHBoxLayout* boxLayout1 = new TQHBoxLayout( d->renameDefaultBox->tqlayout() ); boxLayout1->addSpacing( 10 ); boxLayout1->addWidget( d->renameDefaultCase ); boxLayout1->addWidget( d->renameDefaultCaseType ); @@ -170,48 +170,48 @@ RenameCustomizer::RenameCustomizer(QWidget* parent, const QString& cameraTitle) // ------------------------------------------------------------- - d->renameCustom = new QRadioButton(i18n("Customize"), this); + d->renameCustom = new TQRadioButton(i18n("Customize"), this); mainLayout->addMultiCellWidget(d->renameCustom, 2, 2, 0, 1); - QWhatsThis::add( d->renameCustom, i18n("<p>Turn on this option to customize image filenames " + TQWhatsThis::add( d->renameCustom, i18n("<p>Turn on this option to customize image filenames " "during download.")); - d->renameCustomBox = new QGroupBox(this); - d->renameCustomBox->setFrameStyle(QFrame::NoFrame|QFrame::Plain); + d->renameCustomBox = new TQGroupBox(this); + d->renameCustomBox->setFrameStyle(TQFrame::NoFrame|TQFrame::Plain); d->renameCustomBox->setInsideMargin(0); d->renameCustomBox->setColumnLayout(0, Qt::Vertical); - QGridLayout* renameCustomBoxLayout = new QGridLayout(d->renameCustomBox->layout(), + TQGridLayout* renameCustomBoxLayout = new TQGridLayout(d->renameCustomBox->tqlayout(), 6, 2, KDialogBase::spacingHint()); renameCustomBoxLayout->setColSpacing( 0, 10 ); - QLabel* prefixLabel = new QLabel(i18n("Prefix:"), d->renameCustomBox); + TQLabel* prefixLabel = new TQLabel(i18n("Prefix:"), d->renameCustomBox); renameCustomBoxLayout->addMultiCellWidget(prefixLabel, 0, 0, 1, 1); d->renameCustomPrefix = new KLineEdit(d->renameCustomBox); d->focusedWidget = d->renameCustomPrefix; renameCustomBoxLayout->addMultiCellWidget(d->renameCustomPrefix, 0, 0, 2, 2); - QWhatsThis::add( d->renameCustomPrefix, i18n("<p>Set the prefix which will be added to " + TQWhatsThis::add( d->renameCustomPrefix, i18n("<p>Set the prefix which will be added to " "image filenames.")); - QLabel* suffixLabel = new QLabel(i18n("Suffix:"), d->renameCustomBox); + TQLabel* suffixLabel = new TQLabel(i18n("Suffix:"), d->renameCustomBox); renameCustomBoxLayout->addMultiCellWidget(suffixLabel, 1, 1, 1, 1); d->renameCustomSuffix = new KLineEdit(d->renameCustomBox); renameCustomBoxLayout->addMultiCellWidget(d->renameCustomSuffix, 1, 1, 2, 2); - QWhatsThis::add( d->renameCustomSuffix, i18n("<p>Set the suffix which will be added to " + TQWhatsThis::add( d->renameCustomSuffix, i18n("<p>Set the suffix which will be added to " "image filenames.")); - d->addDateTimeBox = new QCheckBox( i18n("Add Date && Time"), d->renameCustomBox ); + d->addDateTimeBox = new TQCheckBox( i18n("Add Date && Time"), d->renameCustomBox ); renameCustomBoxLayout->addMultiCellWidget(d->addDateTimeBox, 2, 2, 1, 2); - QWhatsThis::add( d->addDateTimeBox, i18n("<p>Set this option to add the camera provided date and time.")); + TQWhatsThis::add( d->addDateTimeBox, i18n("<p>Set this option to add the camera provided date and time.")); - QWidget *dateTimeWidget = new QWidget(d->renameCustomBox); - d->dateTimeLabel = new QLabel(i18n("Date format:"), dateTimeWidget); - d->dateTimeFormat = new QComboBox(dateTimeWidget); + TQWidget *dateTimeWidget = new TQWidget(d->renameCustomBox); + d->dateTimeLabel = new TQLabel(i18n("Date format:"), dateTimeWidget); + d->dateTimeFormat = new TQComboBox(dateTimeWidget); d->dateTimeFormat->insertItem(i18n("Standard"), RenameCustomizerPriv::DigikamStandard); d->dateTimeFormat->insertItem(i18n("ISO"), RenameCustomizerPriv::IsoDateFormat); d->dateTimeFormat->insertItem(i18n("Full Text"), RenameCustomizerPriv::TextDateFormat); d->dateTimeFormat->insertItem(i18n("Local Settings"), RenameCustomizerPriv::LocalDateFormat); d->dateTimeFormat->insertItem(i18n("Advanced..."), RenameCustomizerPriv::Advanced); - QWhatsThis::add( d->dateTimeFormat, i18n("<p>Select your preferred date format for " + TQWhatsThis::add( d->dateTimeFormat, i18n("<p>Select your preferred date format for " "creating new albums. The options available are:</p>" "<p><b>Standard</b>: the date format that has been used as a standard by digiKam. " "E.g.: <i>20060824T142618</i></p>" @@ -221,29 +221,29 @@ RenameCustomizer::RenameCustomizer(QWidget* parent, const QString& cameraTitle) "E.g.: <i>Thu Aug 24 14:26:18 2006</i></p>" "<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 QPushButton(SmallIcon("configure"), QString(), dateTimeWidget); - QSizePolicy policy = d->dateTimeButton->sizePolicy(); - policy.setHorData(QSizePolicy::Maximum); - d->dateTimeButton->setSizePolicy(policy); - QHBoxLayout *boxLayout2 = new QHBoxLayout(dateTimeWidget); + d->dateTimeButton = new TQPushButton(SmallIcon("configure"), TQString(), dateTimeWidget); + TQSizePolicy policy = d->dateTimeButton->tqsizePolicy(); + policy.setHorData(TQSizePolicy::Maximum); + d->dateTimeButton->tqsetSizePolicy(policy); + TQHBoxLayout *boxLayout2 = new TQHBoxLayout(dateTimeWidget); boxLayout2->addWidget(d->dateTimeLabel); boxLayout2->addWidget(d->dateTimeFormat); boxLayout2->addWidget(d->dateTimeButton); renameCustomBoxLayout->addMultiCellWidget(dateTimeWidget, 3, 3, 1, 2); - d->addCameraNameBox = new QCheckBox( i18n("Add Camera Name"), d->renameCustomBox ); + d->addCameraNameBox = new TQCheckBox( i18n("Add Camera Name"), d->renameCustomBox ); renameCustomBoxLayout->addMultiCellWidget(d->addCameraNameBox, 4, 4, 1, 2); - QWhatsThis::add( d->addCameraNameBox, i18n("<p>Set this option to add the camera name.")); + TQWhatsThis::add( d->addCameraNameBox, i18n("<p>Set this option to add the camera name.")); - d->addSeqNumberBox = new QCheckBox( i18n("Add Sequence Number"), d->renameCustomBox ); + d->addSeqNumberBox = new TQCheckBox( i18n("Add Sequence Number"), d->renameCustomBox ); renameCustomBoxLayout->addMultiCellWidget(d->addSeqNumberBox, 5, 5, 1, 2); - QWhatsThis::add( d->addSeqNumberBox, i18n("<p>Set this option to add a sequence number " + TQWhatsThis::add( d->addSeqNumberBox, i18n("<p>Set this option to add a sequence number " "starting with the index set below.")); - d->startIndexLabel = new QLabel( i18n("Start Index:"), d->renameCustomBox ); + d->startIndexLabel = new TQLabel( i18n("Start Index:"), d->renameCustomBox ); d->startIndexInput = new KIntNumInput(1, d->renameCustomBox); d->startIndexInput->setRange(1, 900000, 1, false); - QWhatsThis::add( d->startIndexInput, i18n("<p>Set the starting index value used to rename " + TQWhatsThis::add( d->startIndexInput, i18n("<p>Set the starting index value used to rename " "files with a sequence number.")); renameCustomBoxLayout->addMultiCellWidget(d->startIndexLabel, 6, 6, 1, 1); @@ -254,41 +254,41 @@ RenameCustomizer::RenameCustomizer(QWidget* parent, const QString& cameraTitle) // -- setup connections ------------------------------------------------- - connect(this, SIGNAL(clicked(int)), - this, SLOT(slotRadioButtonClicked(int))); + connect(this, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(slotRadioButtonClicked(int))); - connect(d->renameCustomPrefix, SIGNAL(textChanged(const QString&)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomPrefix, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->renameCustomSuffix, SIGNAL(textChanged(const QString&)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->renameCustomSuffix, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->addDateTimeBox, SIGNAL(toggled(bool)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->addCameraNameBox, SIGNAL(toggled(bool)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->addCameraNameBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->addSeqNumberBox, SIGNAL(toggled(bool)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->addSeqNumberBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->renameDefaultCaseType, SIGNAL(activated(const QString&)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->renameDefaultCaseType, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->startIndexInput, SIGNAL(valueChanged (int)), - this, SLOT(slotRenameOptionsChanged())); + connect(d->startIndexInput, TQT_SIGNAL(valueChanged (int)), + this, TQT_SLOT(slotRenameOptionsChanged())); - connect(d->changedTimer, SIGNAL(timeout()), - this, SIGNAL(signalChanged())); + connect(d->changedTimer, TQT_SIGNAL(timeout()), + this, TQT_SIGNAL(signalChanged())); - connect(d->dateTimeButton, SIGNAL(clicked()), - this, SLOT(slotDateTimeButtonClicked())); + connect(d->dateTimeButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDateTimeButtonClicked())); - connect(d->dateTimeFormat, SIGNAL(activated(int)), - this, SLOT(slotDateTimeFormatChanged(int))); + connect(d->dateTimeFormat, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotDateTimeFormatChanged(int))); - connect(d->addDateTimeBox, SIGNAL(toggled(bool)), - this, SLOT(slotDateTimeBoxToggled(bool))); + connect(d->addDateTimeBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotDateTimeBoxToggled(bool))); // -- initial values --------------------------------------------------- @@ -315,16 +315,16 @@ int RenameCustomizer::startIndex() const return d->startIndexInput->value(); } -QString RenameCustomizer::newName(const QDateTime &dateTime, int index, const QString &extension) const +TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const TQString &extension) const { if (d->renameDefault->isChecked()) - return QString(); + return TQString(); else { - QString name(d->renameCustomPrefix->text()); + TQString name(d->renameCustomPrefix->text()); // use the "T" as a delimiter between date and time - QString date; + TQString date; switch (d->dateTimeFormat->currentItem()) { case RenameCustomizerPriv::DigikamStandard: @@ -344,8 +344,8 @@ QString RenameCustomizer::newName(const QDateTime &dateTime, int index, const QS break; } - // it seems that QString::number does not support padding with zeros - QString seq; + // it seems that TQString::number does not support padding with zeros + TQString seq; seq.sprintf("-%06d", index); if (d->addDateTimeBox->isChecked()) @@ -355,7 +355,7 @@ QString RenameCustomizer::newName(const QDateTime &dateTime, int index, const QS name += seq; if (d->addCameraNameBox->isChecked()) - name += QString("-%1").arg(d->cameraTitle.simplifyWhiteSpace().replace(" ", "")); + name += TQString("-%1").tqarg(d->cameraTitle.simplifyWhiteSpace().tqreplace(" ", "")); name += d->renameCustomSuffix->text(); name += extension; @@ -378,7 +378,7 @@ RenameCustomizer::Case RenameCustomizer::changeCase() const void RenameCustomizer::slotRadioButtonClicked(int) { - QRadioButton* btn = dynamic_cast<QRadioButton*>(selected()); + TQRadioButton* btn = dynamic_cast<TQRadioButton*>(selected()); if (!btn) return; @@ -389,7 +389,7 @@ void RenameCustomizer::slotRadioButtonClicked(int) void RenameCustomizer::slotRenameOptionsChanged() { - d->focusedWidget = focusWidget(); + d->focusedWidget = tqfocusWidget(); if (d->addSeqNumberBox->isChecked()) { @@ -433,7 +433,7 @@ void RenameCustomizer::slotDateTimeFormatChanged(int index) void RenameCustomizer::slotDateTimeButtonClicked() { bool ok; - QString message = i18n("<qt><p>Enter the format for date and time.</p>" + TQString message = i18n("<qt><p>Enter the format for date and time.</p>" "<p>Use <i>dd</i> for the day, " "<i>MM</i> for the month, " "<i>yyyy</i> for the year, " @@ -446,11 +446,11 @@ void RenameCustomizer::slotDateTimeButtonClicked() "for 2006-08-24 14:24:18.</p></qt>"); #if KDE_IS_VERSION(3,2,0) - QString newFormat = KInputDialog::getText(i18n("Change Date and Time Format"), + TQString newFormat = KInputDialog::getText(i18n("Change Date and Time Format"), message, d->dateTimeFormatString, &ok, this); #else - QString newFormat = KLineEditDlg::getText(i18n("Change Date and Time Format"), + TQString newFormat = KLineEditDlg::getText(i18n("Change Date and Time Format"), message, d->dateTimeFormatString, &ok, this); #endif @@ -472,11 +472,11 @@ void RenameCustomizer::readSettings() bool adddateTime = config->readBoolEntry("Add Date Time", false); bool addCamName = config->readBoolEntry("Add Camera Name", false); int chcaseT = config->readNumEntry("Case Type", NONE); - QString prefix = config->readEntry("Rename Prefix", i18n("photo")); - QString suffix = config->readEntry("Rename Postfix", QString()); + TQString prefix = config->readEntry("Rename Prefix", i18n("photo")); + TQString suffix = config->readEntry("Rename Postfix", TQString()); int startIndex = config->readNumEntry("Rename Start Index", 1); int dateTime = config->readNumEntry("Date Time Format", RenameCustomizerPriv::IsoDateFormat); - QString format = config->readEntry("Date Time Format String", "yyyyMMddThhmmss"); + TQString format = config->readEntry("Date Time Format String", "yyyyMMddThhmmss"); if (def) { diff --git a/digikam/utilities/cameragui/renamecustomizer.h b/digikam/utilities/cameragui/renamecustomizer.h index 7e03858..843344a 100644 --- a/digikam/utilities/cameragui/renamecustomizer.h +++ b/digikam/utilities/cameragui/renamecustomizer.h @@ -26,20 +26,21 @@ #ifndef RENAMECUSTOMIZER_H #define RENAMECUSTOMIZER_H -// Qt includes. +// TQt includes. -#include <qbuttongroup.h> +#include <tqbuttongroup.h> -class QDateTime; +class TQDateTime; namespace Digikam { class RenameCustomizerPriv; -class RenameCustomizer : public QButtonGroup +class RenameCustomizer : public TQButtonGroup { Q_OBJECT + TQ_OBJECT public: @@ -50,12 +51,12 @@ public: LOWER }; - RenameCustomizer(QWidget* parent, const QString& cameraTitle); + RenameCustomizer(TQWidget* tqparent, const TQString& cameraTitle); ~RenameCustomizer(); void setUseDefault(bool val); bool useDefault() const; - QString newName(const QDateTime &date, int index, const QString &extension) const; + TQString newName(const TQDateTime &date, int index, const TQString &extension) const; Case changeCase() const; int startIndex() const; diff --git a/digikam/utilities/cameragui/umscamera.cpp b/digikam/utilities/cameragui/umscamera.cpp index a06d02c..ed5e416 100644 --- a/digikam/utilities/cameragui/umscamera.cpp +++ b/digikam/utilities/cameragui/umscamera.cpp @@ -32,14 +32,14 @@ extern "C" #include <utime.h> } -// Qt includes. +// TQt includes. -#include <qdir.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qstringlist.h> -#include <qdeepcopy.h> -#include <qwmatrix.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqdeepcopy.h> +#include <tqwmatrix.h> // KDE includes. @@ -60,7 +60,7 @@ extern "C" namespace Digikam { -UMSCamera::UMSCamera(const QString& title, const QString& model, const QString& port, const QString& path) +UMSCamera::UMSCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path) : DKCamera(title, model, port, path) { m_cancel = false; @@ -81,7 +81,7 @@ void UMSCamera::cancel() m_cancel = true; } -void UMSCamera::getAllFolders(const QString& folder, QStringList& subFolderList) +void UMSCamera::getAllFolders(const TQString& folder, TQStringList& subFolderList) { m_cancel = false; subFolderList.clear(); @@ -89,36 +89,36 @@ void UMSCamera::getAllFolders(const QString& folder, QStringList& subFolderList) listFolders(folder, subFolderList); } -bool UMSCamera::getItemsInfoList(const QString& folder, GPItemInfoList& infoList, bool getImageDimensions) +bool UMSCamera::getItemsInfoList(const TQString& folder, GPItemInfoList& infoList, bool getImageDimensions) { m_cancel = false; infoList.clear(); - QDir dir(folder); - dir.setFilter(QDir::Files); + TQDir dir(folder); + dir.setFilter(TQDir::Files); - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return false; - QFileInfoListIterator it(*list); - QFileInfo *fi; - QFileInfo thmlo, thmup; + TQFileInfoListIterator it(*list); + TQFileInfo *fi; + TQFileInfo thmlo, thmup; DMetadata meta; while ((fi = it.current()) != 0 && !m_cancel) { ++it; - QString mime = mimeType(fi->extension(false).lower()); + TQString mime = mimeType(fi->extension(false).lower()); if (!mime.isEmpty()) { - QSize dims; - QDateTime dt; + TQSize dims; + TQDateTime dt; GPItemInfo info; - thmlo.setFile(folder + QString("/") + fi->baseName() + QString(".thm")); - thmup.setFile(folder + QString("/") + fi->baseName() + QString(".THM")); + thmlo.setFile(folder + TQString("/") + fi->baseName() + TQString(".thm")); + thmup.setFile(folder + TQString("/") + fi->baseName() + TQString(".THM")); if (thmlo.exists()) { @@ -134,7 +134,7 @@ bool UMSCamera::getItemsInfoList(const QString& folder, GPItemInfoList& infoList dt = meta.getImageDateTime(); dims = meta.getImageDimensions(); } - else if (mime == QString("image/x-raw")) + else if (mime == TQString("image/x-raw")) { // If no thumbnail sidecar file available , try to load image metadata with Raw files. meta.load(fi->filePath()); @@ -170,7 +170,7 @@ bool UMSCamera::getItemsInfoList(const QString& folder, GPItemInfoList& infoList } info.name = fi->fileName(); - info.folder = !folder.endsWith("/") ? folder + QString("/") : folder; + info.folder = !folder.endsWith("/") ? folder + TQString("/") : folder; info.mime = mime; info.mtime = dt.toTime_t(); info.size = fi->size(); @@ -187,20 +187,20 @@ bool UMSCamera::getItemsInfoList(const QString& folder, GPItemInfoList& infoList return true; } -bool UMSCamera::getThumbnail(const QString& folder, const QString& itemName, QImage& thumbnail) +bool UMSCamera::getThumbnail(const TQString& folder, const TQString& itemName, TQImage& thumbnail) { m_cancel = false; // JPEG files: try to get thumbnail from Exif data. - DMetadata metadata(QFile::encodeName(folder + QString("/") + itemName)); + DMetadata metadata(TQFile::encodeName(folder + TQString("/") + itemName)); thumbnail = metadata.getExifThumbnail(true); if (!thumbnail.isNull()) return true; // RAW files : try to extract embedded thumbnail using dcraw - KDcrawIface::KDcraw::loadDcrawPreview(thumbnail, QString(folder + QString("/") + itemName)); + KDcrawIface::KDcraw::loadDcrawPreview(thumbnail, TQString(folder + TQString("/") + itemName)); if (!thumbnail.isNull()) return true; @@ -209,14 +209,14 @@ bool UMSCamera::getThumbnail(const QString& folder, const QString& itemName, QIm // Using this way speed up thumbnailization and limit data transfered between camera and computer. // NOTE: the thumbnail extracted with this method can provide a poor quality preview. - QFileInfo fi(folder + QString("/") + itemName); + TQFileInfo fi(folder + TQString("/") + itemName); - if (thumbnail.load(folder + QString("/") + fi.baseName() + QString(".thm"))) // Lowercase + if (thumbnail.load(folder + TQString("/") + fi.baseName() + TQString(".thm"))) // Lowercase { if (!thumbnail.isNull()) return true; } - else if (thumbnail.load(folder + QString("/") + fi.baseName() + QString(".THM"))) // Uppercase + else if (thumbnail.load(folder + TQString("/") + fi.baseName() + TQString(".THM"))) // Uppercase { if (!thumbnail.isNull()) return true; @@ -224,18 +224,18 @@ bool UMSCamera::getThumbnail(const QString& folder, const QString& itemName, QIm // Finaly, we trying to get thumbnail using DImg API (slow). - DImg dimgThumb(QFile::encodeName(folder + QString("/") + itemName)); + DImg dimgThumb(TQCString(TQFile::encodeName(folder + TQString("/") + itemName))); if (!dimgThumb.isNull()) { - thumbnail = dimgThumb.copyQImage(); + thumbnail = dimgThumb.copyTQImage(); return true; } return false; } -bool UMSCamera::getExif(const QString&, const QString&, char **, int&) +bool UMSCamera::getExif(const TQString&, const TQString&, char **, int&) { // not necessary to implement this. read it directly from the file // (done in camera controller) @@ -243,14 +243,14 @@ bool UMSCamera::getExif(const QString&, const QString&, char **, int&) return false; } -bool UMSCamera::downloadItem(const QString& folder, const QString& itemName, const QString& saveFile) +bool UMSCamera::downloadItem(const TQString& folder, const TQString& itemName, const TQString& saveFile) { m_cancel = false; - QString src = folder + QString("/") + itemName; - QString dest = saveFile; + TQString src = folder + TQString("/") + itemName; + TQString dest = saveFile; - QFile sFile(src); - QFile dFile(dest); + TQFile sFile(src); + TQFile dFile(dest); if ( !sFile.open(IO_ReadOnly) ) { @@ -270,10 +270,10 @@ bool UMSCamera::downloadItem(const QString& folder, const QString& itemName, con const int MAX_IPC_SIZE = (1024*32); char buffer[MAX_IPC_SIZE]; - Q_LONG len; + TQ_LONG len; while ((len = sFile.readBlock(buffer, MAX_IPC_SIZE)) != 0 && !m_cancel) { - if (len == -1 || dFile.writeBlock(buffer, (Q_ULONG)len) != len) + if (len == -1 || dFile.writeBlock(buffer, (TQ_ULONG)len) != len) { sFile.close(); dFile.close(); @@ -287,68 +287,68 @@ bool UMSCamera::downloadItem(const QString& folder, const QString& itemName, con // set the file modification time of the downloaded file to that // of the original file struct stat st; - ::stat(QFile::encodeName(src), &st); + ::stat(TQFile::encodeName(src), &st); struct utimbuf ut; ut.modtime = st.st_mtime; ut.actime = st.st_atime; - ::utime(QFile::encodeName(dest), &ut); + ::utime(TQFile::encodeName(dest), &ut); return true; } -bool UMSCamera::setLockItem(const QString& folder, const QString& itemName, bool lock) +bool UMSCamera::setLockItem(const TQString& folder, const TQString& itemName, bool lock) { - QString src = folder + QString("/") + itemName; + TQString src = folder + TQString("/") + itemName; if (lock) { // Lock the file to set read only flag - if (::chmod(QFile::encodeName(src), S_IREAD) == -1) + if (::chmod(TQFile::encodeName(src), S_IREAD) == -1) return false; } else { // Unlock the file to set read/write flag - if (::chmod(QFile::encodeName(src), S_IREAD | S_IWRITE) == -1) + if (::chmod(TQFile::encodeName(src), S_IREAD | S_IWRITE) == -1) return false; } return true; } -bool UMSCamera::deleteItem(const QString& folder, const QString& itemName) +bool UMSCamera::deleteItem(const TQString& folder, const TQString& itemName) { m_cancel = false; // Any camera provide THM (thumbnail) file with real image. We need to remove it also. - QFileInfo fi(folder + QString("/") + itemName); + TQFileInfo fi(folder + TQString("/") + itemName); - QFileInfo thmLo(folder + QString("/") + fi.baseName() + ".thm"); // Lowercase + TQFileInfo thmLo(folder + TQString("/") + fi.baseName() + ".thm"); // Lowercase if (thmLo.exists()) - ::unlink(QFile::encodeName(thmLo.filePath())); + ::unlink(TQFile::encodeName(thmLo.filePath())); - QFileInfo thmUp(folder + QString("/") + fi.baseName() + ".THM"); // Uppercase + TQFileInfo thmUp(folder + TQString("/") + fi.baseName() + ".THM"); // Uppercase if (thmUp.exists()) - ::unlink(QFile::encodeName(thmUp.filePath())); + ::unlink(TQFile::encodeName(thmUp.filePath())); // Remove the real image. - return (::unlink(QFile::encodeName(folder + QString("/") + itemName)) == 0); + return (::unlink(TQFile::encodeName(folder + TQString("/") + itemName)) == 0); } -bool UMSCamera::uploadItem(const QString& folder, const QString& itemName, const QString& localFile, +bool UMSCamera::uploadItem(const TQString& folder, const TQString& itemName, const TQString& localFile, GPItemInfo& info, bool getImageDimensions) { m_cancel = false; - QString dest = folder + QString("/") + itemName; - QString src = localFile; + TQString dest = folder + TQString("/") + itemName; + TQString src = localFile; - QFile sFile(src); - QFile dFile(dest); + TQFile sFile(src); + TQFile dFile(dest); if ( !sFile.open(IO_ReadOnly) ) { @@ -368,10 +368,10 @@ bool UMSCamera::uploadItem(const QString& folder, const QString& itemName, const const int MAX_IPC_SIZE = (1024*32); char buffer[MAX_IPC_SIZE]; - Q_LONG len; + TQ_LONG len; while ((len = sFile.readBlock(buffer, MAX_IPC_SIZE)) != 0 && !m_cancel) { - if (len == -1 || dFile.writeBlock(buffer, (Q_ULONG)len) == -1) + if (len == -1 || dFile.writeBlock(buffer, (TQ_ULONG)len) == -1) { sFile.close(); dFile.close(); @@ -385,26 +385,26 @@ bool UMSCamera::uploadItem(const QString& folder, const QString& itemName, const // set the file modification time of the uploaded file to that // of the original file struct stat st; - ::stat(QFile::encodeName(src), &st); + ::stat(TQFile::encodeName(src), &st); struct utimbuf ut; ut.modtime = st.st_mtime; ut.actime = st.st_atime; - ::utime(QFile::encodeName(dest), &ut); + ::utime(TQFile::encodeName(dest), &ut); // Get new camera item information. DMetadata meta; - QFileInfo fi(dest); - QString mime = mimeType(fi.extension(false).lower()); + TQFileInfo fi(dest); + TQString mime = mimeType(fi.extension(false).lower()); if (!mime.isEmpty()) { - QSize dims; - QDateTime dt; + TQSize dims; + TQDateTime dt; - if (mime == QString("image/x-raw")) + if (mime == TQString("image/x-raw")) { // Try to load image metadata with Raw files. meta.load(fi.filePath()); @@ -440,7 +440,7 @@ bool UMSCamera::uploadItem(const QString& folder, const QString& itemName, const } info.name = fi.fileName(); - info.folder = !folder.endsWith("/") ? folder + QString("/") : folder; + info.folder = !folder.endsWith("/") ? folder + TQString("/") : folder; info.mime = mime; info.mtime = dt.toTime_t(); info.size = fi.size(); @@ -454,20 +454,20 @@ bool UMSCamera::uploadItem(const QString& folder, const QString& itemName, const return true; } -void UMSCamera::listFolders(const QString& folder, QStringList& subFolderList) +void UMSCamera::listFolders(const TQString& folder, TQStringList& subFolderList) { if (m_cancel) return; - QDir dir(folder); - dir.setFilter(QDir::Dirs|QDir::Executable); + TQDir dir(folder); + dir.setFilter(TQDir::Dirs|TQDir::Executable); - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return; - QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; while ((fi = it.current()) != 0 && !m_cancel) { @@ -476,39 +476,39 @@ void UMSCamera::listFolders(const QString& folder, QStringList& subFolderList) if (fi->fileName() == "." || fi->fileName() == "..") continue; - QString subfolder = folder + QString(folder.endsWith("/") ? "" : "/") + fi->fileName(); + TQString subfolder = folder + TQString(folder.endsWith("/") ? "" : "/") + fi->fileName(); subFolderList.append(subfolder); listFolders(subfolder, subFolderList); } } -bool UMSCamera::cameraSummary(QString& summary) +bool UMSCamera::cameraSummary(TQString& summary) { - summary = QString(i18n("<b>Mounted Camera</b> driver for USB/IEEE1394 mass storage cameras and " + summary = TQString(i18n("<b>Mounted Camera</b> driver for USB/IEEE1394 mass storage cameras and " "Flash disk card readers.<br><br>")); summary.append(i18n("Title: %1<br>" "Model: %2<br>" "Port: %3<br>" "Path: %4<br>") - .arg(title()) - .arg(model()) - .arg(port()) - .arg(path())); + .tqarg(title()) + .tqarg(model()) + .tqarg(port()) + .tqarg(path())); return true; } -bool UMSCamera::cameraManual(QString& manual) +bool UMSCamera::cameraManual(TQString& manual) { - manual = QString(i18n("For more information about the <b>Mounted Camera</b> driver, " + manual = TQString(i18n("For more information about the <b>Mounted Camera</b> driver, " "please read <b>Supported Digital Still " "Cameras</b> section in the digiKam manual.")); return true; } -bool UMSCamera::cameraAbout(QString& about) +bool UMSCamera::cameraAbout(TQString& about) { - about = QString(i18n("The <b>Mounted Camera</b> driver is a simple interface to a camera disk " + about = TQString(i18n("The <b>Mounted Camera</b> driver is a simple interface to a camera disk " "mounted locally on your system.<br><br>" "It doesn't use libgphoto2 drivers.<br><br>" "To report any problems with this driver, please contact the digiKam team at:<br><br>" diff --git a/digikam/utilities/cameragui/umscamera.h b/digikam/utilities/cameragui/umscamera.h index 9654a27..697ef61 100644 --- a/digikam/utilities/cameragui/umscamera.h +++ b/digikam/utilities/cameragui/umscamera.h @@ -25,9 +25,9 @@ #ifndef UMSCAMERA_H #define UMSCAMERA_H -// Qt includes. +// TQt includes. -#include <qstringlist.h> +#include <tqstringlist.h> // Local includes. @@ -42,31 +42,31 @@ class UMSCamera : public DKCamera { public: - UMSCamera(const QString& title, const QString& model, const QString& port, const QString& path); + UMSCamera(const TQString& title, const TQString& model, const TQString& port, const TQString& path); ~UMSCamera(); bool doConnect(); void cancel(); - void getAllFolders(const QString& folder, QStringList& subFolderList); - bool getItemsInfoList(const QString& folder, GPItemInfoList& infoList, bool getImageDimensions=true); - bool getThumbnail(const QString& folder, const QString& itemName, QImage& thumbnail); - bool getExif(const QString& folder, const QString& itemName, char **edata, int& esize); + void getAllFolders(const TQString& folder, TQStringList& subFolderList); + bool getItemsInfoList(const TQString& folder, GPItemInfoList& infoList, bool getImageDimensions=true); + bool getThumbnail(const TQString& folder, const TQString& itemName, TQImage& thumbnail); + bool getExif(const TQString& folder, const TQString& itemName, char **edata, int& esize); - bool setLockItem(const QString& folder, const QString& itemName, bool lock); + bool setLockItem(const TQString& folder, const TQString& itemName, bool lock); - bool downloadItem(const QString& folder, const QString& itemName, const QString& saveFile); - bool deleteItem(const QString& folder, const QString& itemName); - bool uploadItem(const QString& folder, const QString& itemName, const QString& localFile, + bool downloadItem(const TQString& folder, const TQString& itemName, const TQString& saveFile); + bool deleteItem(const TQString& folder, const TQString& itemName); + bool uploadItem(const TQString& folder, const TQString& itemName, const TQString& localFile, GPItemInfo& info, bool getImageDimensions=true); - bool cameraSummary(QString& summary); - bool cameraManual(QString& manual); - bool cameraAbout(QString& about); + bool cameraSummary(TQString& summary); + bool cameraManual(TQString& manual); + bool cameraAbout(TQString& about); private: - void listFolders(const QString& folder, QStringList& subFolderList); + void listFolders(const TQString& folder, TQStringList& subFolderList); private: diff --git a/digikam/utilities/hotplug/digikam-download.desktop.in b/digikam/utilities/hotplug/digikam-download.desktop.in index 81cb873..f8258c0 100644 --- a/digikam/utilities/hotplug/digikam-download.desktop.in +++ b/digikam/utilities/hotplug/digikam-download.desktop.in @@ -16,7 +16,7 @@ Name[nl]=Foto's downloaden met digiKam Name[pl]=Pobierz zdjęcia programem digiKam Name[pt]=Obter Fotografias com o digiKam Name[pt_BR]=Obter Fotografias com o digiKam -Name[sk]=Stiahnuť fotky pomocou digiKam +Name[sk]=Stiahnuť fotky potqmocou digiKam Name[sr]=Преузми слике помоћу digiKam-а Name[sr@Latn]=Преузми слике помоћу digiKam-а Name[sv]=Ladda ner foton med Digikam diff --git a/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in b/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in index 5f354bf..d6a768f 100644 --- a/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in +++ b/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in @@ -16,7 +16,7 @@ Name[nl]=Foto's downloaden met digiKam Name[pl]=Pobierz zdjęcia programem digiKam Name[pt]=Obter Fotografias com o digiKam Name[pt_BR]=Obter Fotografias com o digiKam -Name[sk]=Stiahnuť fotky pomocou digiKam +Name[sk]=Stiahnuť fotky potqmocou digiKam Name[sr]=Преузми слике помоћу digiKam-а Name[sr@Latn]=Преузми слике помоћу digiKam-а Name[sv]=Ladda ner foton med Digikam diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 9c6734f..f089259 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -27,27 +27,27 @@ #include <cstdio> #include <cmath> -// Qt includes. - -#include <qtooltip.h> -#include <qfile.h> -#include <qstring.h> -#include <qevent.h> -#include <qpoint.h> -#include <qpainter.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qstyle.h> -#include <qapplication.h> -#include <qcursor.h> -#include <qimage.h> -#include <qregion.h> -#include <qtimer.h> -#include <qcache.h> -#include <qcolor.h> -#include <qdragobject.h> -#include <qclipboard.h> -#include <qtoolbutton.h> +// TQt includes. + +#include <tqtooltip.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqevent.h> +#include <tqpoint.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqcursor.h> +#include <tqimage.h> +#include <tqregion.h> +#include <tqtimer.h> +#include <tqcache.h> +#include <tqcolor.h> +#include <tqdragobject.h> +#include <tqclipboard.h> +#include <tqtoolbutton.h> // KDE includes. @@ -94,13 +94,13 @@ public: panIconPopup = 0; panIconWidget = 0; cornerButton = 0; - parent = 0; + tqparent = 0; im = 0; rubber = 0; autoZoom = false; fullScreen = false; zoom = 1.0; - tileTmpPix = new QPixmap(tileSize, tileSize); + tileTmpPix = new TQPixmap(tileSize, tileSize); tileCache.setMaxCost((10*1024*1024)/(tileSize*tileSize*4)); tileCache.setAutoDelete(true); @@ -125,19 +125,19 @@ public: const double maxZoom; const double zoomMultiplier; - QToolButton *cornerButton; + TQToolButton *cornerButton; - QRect *rubber; - QRect pixmapRect; + TQRect *rubber; + TQRect pixmapRect; - QCache<QPixmap> tileCache; + TQCache<TQPixmap> tileCache; - QPixmap* tileTmpPix; - QPixmap qcheck; + TQPixmap* tileTmpPix; + TQPixmap qcheck; - QColor bgColor; + TQColor bgColor; - QWidget *parent; + TQWidget *tqparent; KPopupFrame *panIconPopup; @@ -146,63 +146,63 @@ public: ImagePanIconWidget *panIconWidget; }; -Canvas::Canvas(QWidget *parent) - : QScrollView(parent) +Canvas::Canvas(TQWidget *tqparent) + : TQScrollView(tqparent) { d = new CanvasPrivate; d->im = new DImgInterface(); - d->parent = parent; + d->tqparent = tqparent; d->bgColor.setRgb(0, 0, 0); d->qcheck.resize(16, 16); - QPainter p(&d->qcheck); - p.fillRect(0, 0, 8, 8, QColor(144, 144, 144)); - p.fillRect(8, 8, 8, 8, QColor(144, 144, 144)); - p.fillRect(0, 8, 8, 8, QColor(100, 100, 100)); - p.fillRect(8, 0, 8, 8, QColor(100, 100, 100)); + TQPainter p(&d->qcheck); + p.fillRect(0, 0, 8, 8, TQColor(144, 144, 144)); + p.fillRect(8, 8, 8, 8, TQColor(144, 144, 144)); + p.fillRect(0, 8, 8, 8, TQColor(100, 100, 100)); + p.fillRect(8, 0, 8, 8, TQColor(100, 100, 100)); p.end(); - d->cornerButton = new QToolButton(this); + d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); d->cornerButton->hide(); - QToolTip::add(d->cornerButton, i18n("Pan the image to a region")); + TQToolTip::add(d->cornerButton, i18n("Pan the image to a region")); setCornerWidget(d->cornerButton); - viewport()->setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); viewport()->setMouseTracking(false); - setFrameStyle( QFrame::NoFrame ); + setFrameStyle( TQFrame::NoFrame ); // ------------------------------------------------------------ - connect(this, SIGNAL(signalZoomChanged(double)), - this, SLOT(slotZoomChanged(double))); + connect(this, TQT_SIGNAL(signalZoomChanged(double)), + this, TQT_SLOT(slotZoomChanged(double))); - connect(d->cornerButton, SIGNAL(pressed()), - this, SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(slotCornerButtonPressed())); - connect(d->im, SIGNAL(signalModified()), - this, SLOT(slotModified())); + connect(d->im, TQT_SIGNAL(signalModified()), + this, TQT_SLOT(slotModified())); - connect(d->im, SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, SIGNAL(signalUndoStateChanged(bool, bool, bool))); + connect(d->im, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool))); - connect(d->im, SIGNAL(signalLoadingStarted(const QString&)), - this, SIGNAL(signalLoadingStarted(const QString&))); + connect(d->im, TQT_SIGNAL(signalLoadingStarted(const TQString&)), + this, TQT_SIGNAL(signalLoadingStarted(const TQString&))); - connect(d->im, SIGNAL(signalImageLoaded(const QString&, bool)), - this, SLOT(slotImageLoaded(const QString&, bool))); + connect(d->im, TQT_SIGNAL(signalImageLoaded(const TQString&, bool)), + this, TQT_SLOT(slotImageLoaded(const TQString&, bool))); - connect(d->im, SIGNAL(signalImageSaved(const QString&, bool)), - this, SLOT(slotImageSaved(const QString&, bool))); + connect(d->im, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQT_SLOT(slotImageSaved(const TQString&, bool))); - connect(d->im, SIGNAL(signalLoadingProgress(const QString&, float)), - this, SIGNAL(signalLoadingProgress(const QString&, float))); + connect(d->im, TQT_SIGNAL(signalLoadingProgress(const TQString&, float)), + this, TQT_SIGNAL(signalLoadingProgress(const TQString&, float))); - connect(d->im, SIGNAL(signalSavingProgress(const QString&, float)), - this, SIGNAL(signalSavingProgress(const QString&, float))); + connect(d->im, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQT_SIGNAL(signalSavingProgress(const TQString&, float))); - connect(this, SIGNAL(signalSelected(bool)), - this, SLOT(slotSelected())); + connect(this, TQT_SIGNAL(signalSelected(bool)), + this, TQT_SLOT(slotSelected())); } Canvas::~Canvas() @@ -236,18 +236,18 @@ void Canvas::reset() d->tileCache.clear(); } -void Canvas::load(const QString& filename, IOFileSettingsContainer *IOFileSettings) +void Canvas::load(const TQString& filename, IOFileSettingsContainer *IOFileSettings) { reset(); viewport()->setUpdatesEnabled(false); - d->im->load( filename, IOFileSettings, d->parent ); + d->im->load( filename, IOFileSettings, d->tqparent ); emit signalPrepareToLoad(); } -void Canvas::slotImageLoaded(const QString& filePath, bool success) +void Canvas::slotImageLoaded(const TQString& filePath, bool success) { d->zoom = 1.0; d->im->zoom(d->zoom); @@ -265,40 +265,40 @@ void Canvas::slotImageLoaded(const QString& filePath, bool success) emit signalLoadingFinished(filePath, success); } -void Canvas::preload(const QString& /*filename*/) +void Canvas::preload(const TQString& /*filename*/) { // d->im->preload(filename); } /* These code part are unused and untested -void Canvas::save(const QString& filename, IOFileSettingsContainer *IOFileSettings) +void Canvas::save(const TQString& filename, IOFileSettingsContainer *IOFileSettings) { d->im->save(filename, IOFileSettings); emit signalSavingStarted(filename); } -void Canvas::saveAs(const QString& filename,IOFileSettingsContainer *IOFileSettings, - const QString& mimeType) +void Canvas::saveAs(const TQString& filename,IOFileSettingsContainer *IOFileSettings, + const TQString& mimeType) { d->im->saveAs(filename, IOFileSettings, mimeType); emit signalSavingStarted(filename); } */ -void Canvas::saveAs(const QString& filename, IOFileSettingsContainer *IOFileSettings, - bool setExifOrientationTag, const QString& mimeType) +void Canvas::saveAs(const TQString& filename, IOFileSettingsContainer *IOFileSettings, + bool setExifOrientationTag, const TQString& mimeType) { d->im->saveAs(filename, IOFileSettings, setExifOrientationTag, mimeType); emit signalSavingStarted(filename); } -void Canvas::slotImageSaved(const QString& filePath, bool success) +void Canvas::slotImageSaved(const TQString& filePath, bool success) { emit signalSavingFinished(filePath, success); } -void Canvas::switchToLastSaved(const QString& newFilename) +void Canvas::switchToLastSaved(const TQString& newFilename) { d->im->switchToLastSaved(newFilename); } @@ -313,7 +313,7 @@ void Canvas::setModified() d->im->setModified(); } -void Canvas::readMetadataFromFile(const QString &file) +void Canvas::readMetadataFromFile(const TQString &file) { d->im->readMetadataFromFile(file); } @@ -338,12 +338,12 @@ DImg Canvas::currentImage() return DImg(*d->im->getImg()); } -QString Canvas::currentImageFileFormat() +TQString Canvas::currentImageFileFormat() { return d->im->getImageFormat(); } -QString Canvas::currentImageFilePath() +TQString Canvas::currentImageFilePath() { return d->im->getImageFilePath(); } @@ -363,11 +363,11 @@ bool Canvas::isReadOnly() return d->im->isReadOnly(); } -QRect Canvas::getSelectedArea() +TQRect Canvas::getSelectedArea() { int x, y, w, h; d->im->getSelectedArea(x, y, w, h); - return ( QRect(x, y, w, h) ); + return ( TQRect(x, y, w, h) ); } DImgInterface *Canvas::interface() const @@ -388,7 +388,7 @@ double Canvas::calcAutoZoomFactor() double srcHeight = d->im->origHeight(); double dstWidth = contentsRect().width(); double dstHeight = contentsRect().height(); - return QMIN(dstWidth/srcWidth, dstHeight/srcHeight); + return TQMIN(dstWidth/srcWidth, dstHeight/srcHeight); } void Canvas::updateAutoZoom() @@ -427,14 +427,14 @@ void Canvas::updateContentsSize(bool deleteRubber) int centery = contentsRect().height()/2; int xoffset = int(centerx - wZ/2); int yoffset = int(centery - hZ/2); - xoffset = QMAX(xoffset, 0); - yoffset = QMAX(yoffset, 0); + xoffset = TQMAX(xoffset, 0); + yoffset = TQMAX(yoffset, 0); - d->pixmapRect = QRect(xoffset, yoffset, wZ, hZ); + d->pixmapRect = TQRect(xoffset, yoffset, wZ, hZ); } else { - d->pixmapRect = QRect(0, 0, wZ, hZ); + d->pixmapRect = TQRect(0, 0, wZ, hZ); } if (!deleteRubber && d->rubber) @@ -457,19 +457,19 @@ void Canvas::updateContentsSize(bool deleteRubber) viewport()->setUpdatesEnabled(true); } -void Canvas::resizeEvent(QResizeEvent* e) +void Canvas::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); if (d->autoZoom) updateAutoZoom(); updateContentsSize(false); - // No need to repaint. its called + // No need to tqrepaint. its called // automatically after resize // To be sure than corner widget used to pan image will be hide/show @@ -477,30 +477,30 @@ void Canvas::resizeEvent(QResizeEvent* e) slotZoomChanged(d->zoom); } -void Canvas::viewportPaintEvent(QPaintEvent *e) +void Canvas::viewportPaintEvent(TQPaintEvent *e) { - QRect er(e->rect()); - er = QRect(QMAX(er.x() - 1, 0), - QMAX(er.y() - 1, 0), - QMIN(er.width() + 2, contentsRect().width()), - QMIN(er.height() + 2, contentsRect().height())); + TQRect er(e->rect()); + er = TQRect(TQMAX(er.x() - 1, 0), + TQMAX(er.y() - 1, 0), + TQMIN(er.width() + 2, contentsRect().width()), + TQMIN(er.height() + 2, contentsRect().height())); paintViewport(er, (d->zoom <= 1.0) ? true : false); } -void Canvas::paintViewport(const QRect& er, bool antialias) +void Canvas::paintViewport(const TQRect& er, bool antialias) { - QRect o_cr(viewportToContents(er.topLeft()), viewportToContents(er.bottomRight())); - QRect cr = o_cr; + TQRect o_cr(viewportToContents(er.topLeft()), viewportToContents(er.bottomRight())); + TQRect cr = o_cr; - QRegion clipRegion(er); + TQRegion clipRegion(er); cr = d->pixmapRect.intersect(cr); if (!cr.isEmpty() && d->im->imageValid()) { - clipRegion -= QRect(contentsToViewport(cr.topLeft()), cr.size()); + clipRegion -= TQRect(contentsToViewport(cr.topLeft()), cr.size()); - QRect pr = QRect(cr.x() - d->pixmapRect.x(), cr.y() - d->pixmapRect.y(), + TQRect pr = TQRect(cr.x() - d->pixmapRect.x(), cr.y() - d->pixmapRect.y(), cr.width(), cr.height()); int x1 = (int)floor((double)pr.x() / (double)d->tileSize) * d->tileSize; @@ -508,7 +508,7 @@ void Canvas::paintViewport(const QRect& er, bool antialias) int x2 = (int)ceilf((double)pr.right() / (double)d->tileSize) * d->tileSize; int y2 = (int)ceilf((double)pr.bottom() / (double)d->tileSize) * d->tileSize; - QPixmap pix(d->tileSize, d->tileSize); + TQPixmap pix(d->tileSize, d->tileSize); int sx, sy, sw, sh; int step = (int)floor(d->tileSize / d->zoom); @@ -523,14 +523,14 @@ void Canvas::paintViewport(const QRect& er, bool antialias) { for (int i = x1 ; i < x2 ; i += d->tileSize) { - QString key = QString("%1,%2").arg(i).arg(j); - QPixmap *pix = d->tileCache.find(key); + TQString key = TQString("%1,%2").tqarg(i).tqarg(j); + TQPixmap *pix = d->tileCache.tqfind(key); if (!pix) { if (antialias) { - pix = new QPixmap(d->tileSize, d->tileSize); + pix = new TQPixmap(d->tileSize, d->tileSize); d->tileCache.insert(key, pix); } else @@ -540,7 +540,7 @@ void Canvas::paintViewport(const QRect& er, bool antialias) if (d->im->hasAlpha()) { - QPainter p(pix); + TQPainter p(pix); p.drawTiledPixmap(0, 0, d->tileSize, d->tileSize, d->qcheck, 0, 0); p.end(); @@ -565,10 +565,10 @@ void Canvas::paintViewport(const QRect& er, bool antialias) if (d->rubber && d->pressedMoved && !d->pressedMoving) { - QRect rr(d->rubber->normalize()); - QRect r(i, j, d->tileSize, d->tileSize); + TQRect rr(d->rubber->normalize()); + TQRect r(i, j, d->tileSize, d->tileSize); - d->im->paintOnDevice(pix, sx, sy, sw, sh, + d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, rr.x() - i - d->pixmapRect.x(), rr.y() - j - d->pixmapRect.y(), @@ -577,8 +577,8 @@ void Canvas::paintViewport(const QRect& er, bool antialias) rr.moveBy(-i -d->pixmapRect.x(), -j -d->pixmapRect.y()); - QPainter p(pix); - p.setPen(QPen(QColor(250, 250, 255), 1)); + TQPainter p(pix); + p.setPen(TQPen(TQColor(250, 250, 255), 1)); p.drawRect(rr); if (rr.width() >= 10 && rr.height() >= 10) { @@ -591,15 +591,15 @@ void Canvas::paintViewport(const QRect& er, bool antialias) } else { - d->im->paintOnDevice(pix, sx, sy, sw, sh, + d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, antialias); } } - QRect r(i, j, d->tileSize, d->tileSize); - QRect ir = pr.intersect(r); - QPoint pt(contentsToViewport(QPoint(ir.x() + d->pixmapRect.x(), + TQRect r(i, j, d->tileSize, d->tileSize); + TQRect ir = pr.intersect(r); + TQPoint pt(contentsToViewport(TQPoint(ir.x() + d->pixmapRect.x(), ir.y() + d->pixmapRect.y()))); bitBlt(viewport(), pt.x(), pt.y(), @@ -616,7 +616,7 @@ void Canvas::paintViewport(const QRect& er, bool antialias) } } - QPainter painter(viewport()); + TQPainter painter(viewport()); painter.setClipRegion(clipRegion); painter.fillRect(er, d->bgColor); painter.end(); @@ -627,24 +627,24 @@ void Canvas::drawRubber() if (!d->rubber || !d->im->imageValid()) return; - QPainter p(viewport()); - p.setRasterOp(Qt::NotROP ); - p.setPen(QPen(Qt::color0, 1)); + TQPainter p(viewport()); + p.setRasterOp(TQt::NotROP ); + p.setPen(TQPen(TQt::color0, 1)); p.setBrush(NoBrush); - QRect r(d->rubber->normalize()); - r = QRect(contentsToViewport(QPoint(r.x(), r.y())), r.size()); + TQRect r(d->rubber->normalize()); + r = TQRect(contentsToViewport(TQPoint(r.x(), r.y())), r.size()); - QPoint pnt(r.x(), r.y()); + TQPoint pnt(r.x(), r.y()); - style().drawPrimitive(QStyle::PE_FocusRect, &p, - QRect(pnt.x(), pnt.y(), r.width(), r.height()), - colorGroup(), QStyle::Style_Default, - QStyleOption(colorGroup().base())); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, + TQRect(pnt.x(), pnt.y(), r.width(), r.height()), + tqcolorGroup(), TQStyle::Style_Default, + TQStyleOption(tqcolorGroup().base())); p.end(); } -void Canvas::contentsMousePressEvent(QMouseEvent *e) +void Canvas::contentsMousePressEvent(TQMouseEvent *e) { if (!e || e->button() == Qt::RightButton) return; @@ -662,7 +662,7 @@ void Canvas::contentsMousePressEvent(QMouseEvent *e) // Set diagonally opposite corner as anchor - QRect r(d->rubber->normalize()); + TQRect r(d->rubber->normalize()); if (d->ltActive) { @@ -690,7 +690,7 @@ void Canvas::contentsMousePressEvent(QMouseEvent *e) d->pressedMoving = true; d->tileCache.clear(); - viewport()->repaint(false); + viewport()->tqrepaint(false); return; } @@ -700,7 +700,7 @@ void Canvas::contentsMousePressEvent(QMouseEvent *e) if (visibleWidth() < d->im->width() || visibleHeight() < d->im->height()) { - viewport()->setCursor(Qt::SizeAllCursor); + viewport()->setCursor(TQt::SizeAllCursor); d->midButtonPressed = true; d->midButtonX = e->x(); d->midButtonY = e->y(); @@ -714,7 +714,7 @@ void Canvas::contentsMousePressEvent(QMouseEvent *e) d->rubber = 0; } - d->rubber = new QRect(e->x(), e->y(), 0, 0); + d->rubber = new TQRect(e->x(), e->y(), 0, 0); if (d->pressedMoved) { @@ -728,7 +728,7 @@ void Canvas::contentsMousePressEvent(QMouseEvent *e) viewport()->setMouseTracking(false); } -void Canvas::contentsMouseMoveEvent(QMouseEvent *e) +void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; @@ -783,36 +783,36 @@ void Canvas::contentsMouseMoveEvent(QMouseEvent *e) if (!d->rubber) return; - QRect r(d->rubber->normalize()); + TQRect r(d->rubber->normalize()); - QRect lt(r.x()-5, r.y()-5, 10, 10); - QRect rt(r.x()+r.width()-5, r.y()-5, 10, 10); - QRect lb(r.x()-5, r.y()+r.height()-5, 10, 10); - QRect rb(r.x()+r.width()-5, r.y()+r.height()-5, 10, 10); + TQRect lt(r.x()-5, r.y()-5, 10, 10); + TQRect rt(r.x()+r.width()-5, r.y()-5, 10, 10); + TQRect lb(r.x()-5, r.y()+r.height()-5, 10, 10); + TQRect rb(r.x()+r.width()-5, r.y()+r.height()-5, 10, 10); d->ltActive = false; d->rtActive = false; d->lbActive = false; d->rbActive = false; - if (lt.contains(e->x(), e->y())) + if (lt.tqcontains(e->x(), e->y())) { - viewport()->setCursor(Qt::SizeFDiagCursor); + viewport()->setCursor(TQt::SizeFDiagCursor); d->ltActive = true; } - else if (rb.contains(e->x(), e->y())) + else if (rb.tqcontains(e->x(), e->y())) { - viewport()->setCursor(Qt::SizeFDiagCursor); + viewport()->setCursor(TQt::SizeFDiagCursor); d->rbActive = true; } - else if (lb.contains(e->x(), e->y())) + else if (lb.tqcontains(e->x(), e->y())) { - viewport()->setCursor(Qt::SizeBDiagCursor); + viewport()->setCursor(TQt::SizeBDiagCursor); d->lbActive = true; } - else if (rt.contains(e->x(), e->y())) + else if (rt.tqcontains(e->x(), e->y())) { - viewport()->setCursor(Qt::SizeBDiagCursor); + viewport()->setCursor(TQt::SizeBDiagCursor); d->rtActive = true; } else @@ -820,7 +820,7 @@ void Canvas::contentsMouseMoveEvent(QMouseEvent *e) } } -void Canvas::contentsMouseReleaseEvent(QMouseEvent *e) +void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e) { if (!e) return; @@ -836,7 +836,7 @@ void Canvas::contentsMouseReleaseEvent(QMouseEvent *e) if (d->pressedMoved && d->rubber) { // Normalize rubber rectangle to always have the selection into the image - QRect rec = d->rubber->normalize(); + TQRect rec = d->rubber->normalize(); if (rec.left() < d->pixmapRect.left()) rec.setLeft(d->pixmapRect.left()); if (rec.right() > d->pixmapRect.right()) rec.setRight(d->pixmapRect.right()); @@ -876,11 +876,11 @@ void Canvas::contentsMouseReleaseEvent(QMouseEvent *e) } } -void Canvas::contentsWheelEvent(QWheelEvent *e) +void Canvas::contentsWheelEvent(TQWheelEvent *e) { e->accept(); - if (e->state() & Qt::ShiftButton) + if (e->state() & TQt::ShiftButton) { if (e->delta() < 0) emit signalShowNextImage(); @@ -888,7 +888,7 @@ void Canvas::contentsWheelEvent(QWheelEvent *e) emit signalShowPrevImage(); return; } - else if (e->state() & Qt::ControlButton) + else if (e->state() & TQt::ControlButton) { if (e->delta() < 0) slotDecreaseZoom(); @@ -897,7 +897,7 @@ void Canvas::contentsWheelEvent(QWheelEvent *e) return; } - QScrollView::contentsWheelEvent(e); + TQScrollView::contentsWheelEvent(e); } bool Canvas::maxZoom() @@ -921,13 +921,13 @@ double Canvas::snapZoom(double zoom) // across 50%, 100% or fit-to-window, then return the // the corresponding special value. Otherwise zoom is returned unchanged. double fit = calcAutoZoomFactor(); - QValueList<double> snapValues; + TQValueList<double> snapValues; snapValues.append(0.5); snapValues.append(1.0); snapValues.append(fit); qHeapSort(snapValues); - QValueList<double>::const_iterator it; + TQValueList<double>::const_iterator it; if (d->zoom < zoom) { @@ -944,7 +944,7 @@ double Canvas::snapZoom(double zoom) else { // We need to go through the list in reverse order, - // however, qCopyBackward does not seem to work here, so + // however, tqCopyBackward does not seem to work here, so // a simple for loop over integers is used instead. for(int i=snapValues.size()-1; i>=0; i--) { @@ -1066,7 +1066,7 @@ void Canvas::fitToSelect() double dstWidth = contentsRect().width(); double dstHeight = contentsRect().height(); - d->zoom = QMIN(dstWidth/srcWidth, dstHeight/srcHeight); + d->zoom = TQMIN(dstWidth/srcWidth, dstHeight/srcHeight); d->autoZoom = false; emit signalToggleOffFitToWindow(); @@ -1147,7 +1147,7 @@ void Canvas::resizeImage(int w, int h) d->im->resize(w, h); } -void Canvas::setBackgroundColor(const QColor& color) +void Canvas::setBackgroundColor(const TQColor& color) { if (d->bgColor == color) return; @@ -1232,12 +1232,12 @@ void Canvas::slotUndo(int steps) } } -void Canvas::getUndoHistory(QStringList &titles) +void Canvas::getUndoHistory(TQStringList &titles) { d->im->getUndoHistory(titles); } -void Canvas::getRedoHistory(QStringList &titles) +void Canvas::getRedoHistory(TQStringList &titles) { d->im->getRedoHistory(titles); } @@ -1259,14 +1259,14 @@ void Canvas::slotCopy() if (!w && !h ) // No current selection. return; - QApplication::setOverrideCursor (Qt::waitCursor); + TQApplication::setOverrideCursor (TQt::waitCursor); uchar* data = d->im->getImageSelection(); DImg selDImg = DImg(w, h, d->im->sixteenBit(), d->im->hasAlpha(), data); delete [] data; - QImage selImg = selDImg.copyQImage(); - QApplication::clipboard()->setData(new QImageDrag(selImg), QClipboard::Clipboard); - QApplication::restoreOverrideCursor (); + TQImage selImg = selDImg.copyTQImage(); + TQApplication::tqclipboard()->setData(new TQImageDrag(selImg), TQClipboard::Clipboard); + TQApplication::restoreOverrideCursor (); } void Canvas::slotSelected() @@ -1275,7 +1275,7 @@ void Canvas::slotSelected() if (d->rubber && d->pressedMoved) { - QRect sel = calcSeletedArea(); + TQRect sel = calcSeletedArea(); x = sel.x(); y = sel.y(); w = sel.width(); @@ -1285,10 +1285,10 @@ void Canvas::slotSelected() d->im->setSelectedArea(x, y, w, h); } -QRect Canvas::calcSeletedArea() +TQRect Canvas::calcSeletedArea() { int x=0, y=0, w=0, h=0; - QRect r(d->rubber->normalize()); + TQRect r(d->rubber->normalize()); if (r.isValid()) { @@ -1299,10 +1299,10 @@ QRect Canvas::calcSeletedArea() w = (int)(((double)r.width() / d->tileSize) * floor(d->tileSize / d->zoom)); h = (int)(((double)r.height() / d->tileSize) * floor(d->tileSize / d->zoom)); - x = QMIN(imageWidth(), QMAX(x, 0)); - y = QMIN(imageHeight(), QMAX(y, 0)); - w = QMIN(imageWidth(), QMAX(w, 0)); - h = QMIN(imageHeight(), QMAX(h, 0)); + x = TQMIN(imageWidth(), TQMAX(x, 0)); + y = TQMIN(imageHeight(), TQMAX(y, 0)); + w = TQMIN(imageWidth(), TQMAX(w, 0)); + h = TQMIN(imageHeight(), TQMAX(h, 0)); // Avoid empty selection by rubberband - at least mark one pixel // At high zoom factors, the rubberband may operate at subpixel level! @@ -1312,7 +1312,7 @@ QRect Canvas::calcSeletedArea() h = 1; } - return QRect(x, y, w, h); + return TQRect(x, y, w, h); } void Canvas::slotModified() @@ -1344,21 +1344,21 @@ void Canvas::slotCornerButtonPressed() ImagePanIconWidget *pan = new ImagePanIconWidget(180, 120, d->panIconPopup); d->panIconPopup->setMainWidget(pan); - QRect r((int)(contentsX() / d->zoom), (int)(contentsY() / d->zoom), + TQRect r((int)(contentsX() / d->zoom), (int)(contentsY() / d->zoom), (int)(visibleWidth() / d->zoom), (int)(visibleHeight() / d->zoom)); pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotPanIconSelectionMoved(const QRect&, bool))); + connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, SIGNAL(signalHiden()), - this, SLOT(slotPanIconHiden())); + connect(pan, TQT_SIGNAL(signalHiden()), + this, TQT_SLOT(slotPanIconHiden())); - QPoint g = mapToGlobal(viewport()->pos()); + TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); g.setY(g.y()+ viewport()->size().height()); - d->panIconPopup->popup(QPoint(g.x() - d->panIconPopup->width(), + d->panIconPopup->popup(TQPoint(g.x() - d->panIconPopup->width(), g.y() - d->panIconPopup->height())); pan->setCursorToLocalRegionSelectionCenter(); @@ -1371,7 +1371,7 @@ void Canvas::slotPanIconHiden() d->cornerButton->blockSignals(false); } -void Canvas::slotPanIconSelectionMoved(const QRect& r, bool b) +void Canvas::slotPanIconSelectionMoved(const TQRect& r, bool b) { setContentsPos((int)(r.x()*d->zoom), (int)(r.y()*d->zoom)); @@ -1402,7 +1402,7 @@ void Canvas::slotSelectAll() d->rubber = 0; } - d->rubber = new QRect(d->pixmapRect); + d->rubber = new TQRect(d->pixmapRect); d->pressedMoved = true; d->tileCache.clear(); viewport()->setMouseTracking(true); diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/digikam/utilities/imageeditor/canvas/canvas.h index b10ae61..2ce3493 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.h +++ b/digikam/utilities/imageeditor/canvas/canvas.h @@ -25,24 +25,24 @@ #ifndef CANVAS_H #define CANVAS_H -// Qt includes. +// TQt includes. -#include <qscrollview.h> -#include <qrect.h> +#include <tqscrollview.h> +#include <tqrect.h> // Local includes. #include "digikam_export.h" #include "dimg.h" -class QString; -class QStringList; -class QPixmap; -class QPaintEvent; -class QResizeEvent; -class QWheelEvent; -class QKeyEvent; -class QColor; +class TQString; +class TQStringList; +class TQPixmap; +class TQPaintEvent; +class TQResizeEvent; +class TQWheelEvent; +class TQKeyEvent; +class TQColor; namespace Digikam { @@ -53,31 +53,32 @@ class ExposureSettingsContainer; class ICCSettingsContainer; class IOFileSettingsContainer; -class DIGIKAM_EXPORT Canvas : public QScrollView +class DIGIKAM_EXPORT Canvas : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - Canvas(QWidget *parent=0); + Canvas(TQWidget *tqparent=0); ~Canvas(); - void load(const QString& filename, IOFileSettingsContainer *IOFileSettings); - void preload(const QString& filename); + void load(const TQString& filename, IOFileSettingsContainer *IOFileSettings); + void preload(const TQString& filename); - void saveAs(const QString& filename, IOFileSettingsContainer *IOFileSettings, - bool setExifOrientationTag, const QString& mimeType=QString()); + void saveAs(const TQString& filename, IOFileSettingsContainer *IOFileSettings, + bool setExifOrientationTag, const TQString& mimeType=TQString()); void resetImage(); - void switchToLastSaved(const QString& newFilename); + void switchToLastSaved(const TQString& newFilename); void abortSaving(); void setModified(); - void readMetadataFromFile(const QString &file); + void readMetadataFromFile(const TQString &file); void clearUndoHistory(); void setUndoHistoryOrigin(); void updateUndoState(); DImg currentImage(); - QString currentImageFileFormat(); - QString currentImageFilePath(); + TQString currentImageFileFormat(); + TQString currentImageFilePath(); DImgInterface *interface() const; void makeDefaultEditingCanvas(); @@ -93,7 +94,7 @@ public: bool exifRotated(); int imageWidth(); int imageHeight(); - QRect getSelectedArea(); + TQRect getSelectedArea(); // If current image file format is only available in read only, // typicially all RAW image file formats. @@ -101,7 +102,7 @@ public: void resizeImage(int w, int h); - void setBackgroundColor(const QColor& color); + void setBackgroundColor(const TQColor& color); void setICCSettings(ICCSettingsContainer *cmSettings); void setExposureSettings(ExposureSettingsContainer *expoSettings); @@ -114,8 +115,8 @@ public: void increaseContrast(); void decreaseContrast(); - void getUndoHistory(QStringList &titles); - void getRedoHistory(QStringList &titles); + void getUndoHistory(TQStringList &titles); + void getRedoHistory(TQStringList &titles); void toggleFitToWindow(); void fitToSelect(); @@ -132,13 +133,13 @@ signals: void signalShowNextImage(); void signalShowPrevImage(); void signalPrepareToLoad(); - void signalLoadingStarted(const QString &filename); - void signalLoadingFinished(const QString &filename, bool success); - void signalLoadingProgress(const QString& filePath, float progress); - void signalSavingStarted(const QString &filename); - void signalSavingFinished(const QString &filename, bool success); - void signalSavingProgress(const QString& filePath, float progress); - void signalSelectionChanged(const QRect&); + void signalLoadingStarted(const TQString &filename); + void signalLoadingFinished(const TQString &filename, bool success); + void signalLoadingProgress(const TQString& filePath, float progress); + void signalSavingStarted(const TQString &filename); + void signalSavingFinished(const TQString &filename, bool success); + void signalSavingProgress(const TQString& filePath, float progress); + void signalSelectionChanged(const TQRect&); void signalToggleOffFitToWindow(); public slots: @@ -167,22 +168,22 @@ public slots: protected: - void resizeEvent(QResizeEvent* e); - void viewportPaintEvent(QPaintEvent *e); - void contentsMousePressEvent(QMouseEvent *e); - void contentsMouseMoveEvent(QMouseEvent *e); - void contentsMouseReleaseEvent(QMouseEvent *e); - void contentsWheelEvent(QWheelEvent *e); + void resizeEvent(TQResizeEvent* e); + void viewportPaintEvent(TQPaintEvent *e); + void contentsMousePressEvent(TQMouseEvent *e); + void contentsMouseMoveEvent(TQMouseEvent *e); + void contentsMouseReleaseEvent(TQMouseEvent *e); + void contentsWheelEvent(TQWheelEvent *e); private: - QRect calcSeletedArea(); + TQRect calcSeletedArea(); double calcAutoZoomFactor(); void updateAutoZoom(); void updateContentsSize(bool deleteRubber); void drawRubber(); - void paintViewport(const QRect& er, bool antialias); + void paintViewport(const TQRect& er, bool antialias); void reset(); @@ -190,11 +191,11 @@ private slots: void slotSelected(); void slotModified(); - void slotImageLoaded(const QString& filePath, bool success); - void slotImageSaved(const QString& filePath, bool success); + void slotImageLoaded(const TQString& filePath, bool success); + void slotImageSaved(const TQString& filePath, bool success); void slotCornerButtonPressed(); void slotZoomChanged(double); - void slotPanIconSelectionMoved(const QRect&, bool); + void slotPanIconSelectionMoved(const TQRect&, bool); void slotPanIconHiden(); private: diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index 098a7d7..e9d0074 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -22,15 +22,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qstring.h> -#include <qfileinfo.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqstring.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> // KDE includes. @@ -51,13 +51,13 @@ namespace Digikam { -ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview, - IccTransform *iccTrans, const QString& file) - : KDialogBase(parent, "", true, QString(), +ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* tqparent, DImg *preview, + IccTransform *iccTrans, const TQString& file) + : KDialogBase(tqparent, "", true, TQString(), Help|Ok|Apply|Cancel, Ok, true) { m_iccTrans = iccTrans; - m_parent = parent; + m_parent = tqparent; setHelp("iccprofile.anchor", "digikam"); setButtonText(Ok, i18n("Convert")); setButtonTip(Ok, i18n("Apply the default color workspace profile to the image")); @@ -66,25 +66,25 @@ ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview, setButtonText(Apply, i18n("Assign")); setButtonTip(Apply, i18n("Only embed the color workspace profile in the image, don't change the image")); - QFileInfo fi(file); + TQFileInfo fi(file); setCaption(fi.fileName()); - QWidget *page = new QWidget(this); - QGridLayout* grid = new QGridLayout(page, 3, 2, 0, KDialog::spacingHint()); + TQWidget *page = new TQWidget(this); + TQGridLayout* grid = new TQGridLayout(page, 3, 2, 0, KDialog::spacingHint()); - QLabel *originalTitle = new QLabel(i18n("Original Image:"), page); - QLabel *previewOriginal = new QLabel(page); - QLabel *targetTitle = new QLabel(i18n("Corrected Image:"), page); - QLabel *previewTarget = new QLabel(page); - QLabel *logo = new QLabel(page); - QLabel *message = new QLabel(page); - QLabel *currentProfileTitle = new QLabel(i18n("Current workspace color profile:"), page); - QLabel *currentProfileDesc = new QLabel(QString("<b>%1</b>").arg(m_iccTrans->getOutpoutProfileDescriptor()), page); - QPushButton *currentProfInfo = new QPushButton(i18n("Info..."), page); - QLabel *embeddedProfileTitle = new QLabel(i18n("Embedded color profile:"), page); - QLabel *embeddedProfileDesc = new QLabel(QString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); - QPushButton *embeddedProfInfo = new QPushButton(i18n("Info..."), page); - KSeparator *line = new KSeparator (Horizontal, page); + TQLabel *originalTitle = new TQLabel(i18n("Original Image:"), page); + TQLabel *previewOriginal = new TQLabel(page); + TQLabel *targetTitle = new TQLabel(i18n("Corrected Image:"), page); + TQLabel *previewTarget = new TQLabel(page); + 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); + 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); + TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); + KSeparator *line = new KSeparator(Qt::Horizontal, page); if (m_iccTrans->embeddedProfile().isEmpty()) { @@ -113,15 +113,15 @@ ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview, grid->addMultiCellWidget(targetTitle, 2, 2, 0, 0); grid->addMultiCellWidget(previewTarget, 3, 3, 0, 0); - QVBoxLayout *vlay = new QVBoxLayout( KDialog::spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( KDialog::spacingHint() ); vlay->addWidget(logo); vlay->addWidget(message); - vlay->addWidget(new KSeparator (Horizontal, page)); + vlay->addWidget(new KSeparator(Qt::Horizontal, page)); vlay->addWidget(currentProfileTitle); vlay->addWidget(currentProfileDesc); - QHBoxLayout *hlay1 = new QHBoxLayout( KDialog::spacingHint() ); + TQHBoxLayout *hlay1 = new TQHBoxLayout( KDialog::spacingHint() ); hlay1->addWidget(currentProfInfo); hlay1->addStretch(); vlay->addLayout(hlay1); @@ -130,28 +130,28 @@ ColorCorrectionDlg::ColorCorrectionDlg(QWidget* parent, DImg *preview, vlay->addWidget(embeddedProfileTitle); vlay->addWidget(embeddedProfileDesc); - QHBoxLayout *hlay2 = new QHBoxLayout( KDialog::spacingHint() ); + TQHBoxLayout *hlay2 = new TQHBoxLayout( KDialog::spacingHint() ); hlay2->addWidget(embeddedProfInfo); hlay2->addStretch(); vlay->addLayout(hlay2); vlay->addStretch(); - grid->addMultiCell(new QSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), - QSizePolicy::Minimum, QSizePolicy::Expanding), 0, 3, 1, 1); + grid->addMultiCell(new TQSpacerItem(KDialog::spacingHint(), KDialog::spacingHint(), + TQSizePolicy::Minimum, TQSizePolicy::Expanding), 0, 3, 1, 1); grid->addMultiCellLayout(vlay, 0, 3, 2, 2); setMainWidget(page); // -------------------------------------------------------------------- - connect(currentProfInfo, SIGNAL(clicked()), - this, SLOT(slotCurrentProfInfo()) ); + connect(currentProfInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCurrentProfInfo()) ); - connect(embeddedProfInfo, SIGNAL(clicked()), - this, SLOT(slotEmbeddedProfInfo()) ); + connect(embeddedProfInfo, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEmbeddedProfInfo()) ); - connect(this, SIGNAL(applyClicked()), - this, SLOT(slotApplyClicked())); + connect(this, TQT_SIGNAL(applyClicked()), + this, TQT_SLOT(slotApplyClicked())); } ColorCorrectionDlg::~ColorCorrectionDlg() @@ -163,7 +163,7 @@ void ColorCorrectionDlg::slotCurrentProfInfo() if (m_iccTrans->outputProfile().isEmpty()) return; - ICCProfileInfoDlg infoDlg(m_parent, QString(), m_iccTrans->outputProfile()); + ICCProfileInfoDlg infoDlg(m_parent, TQString(), m_iccTrans->outputProfile()); infoDlg.exec(); } @@ -172,7 +172,7 @@ void ColorCorrectionDlg::slotEmbeddedProfInfo() if (m_iccTrans->embeddedProfile().isEmpty()) return; - ICCProfileInfoDlg infoDlg(m_parent, QString(), m_iccTrans->embeddedProfile()); + ICCProfileInfoDlg infoDlg(m_parent, TQString(), m_iccTrans->embeddedProfile()); infoDlg.exec(); } diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h index 1be5134..c8165de 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h @@ -25,9 +25,9 @@ #ifndef COLORCORRECTIONDLG_H #define COLORCORRECTIONDLG_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -46,11 +46,12 @@ class DImg; class DIGIKAM_EXPORT ColorCorrectionDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ColorCorrectionDlg(QWidget *parent, DImg *preview, - IccTransform *iccTrans, const QString& file); + ColorCorrectionDlg(TQWidget *tqparent, DImg *preview, + IccTransform *iccTrans, const TQString& file); ~ColorCorrectionDlg(); private slots: @@ -61,7 +62,7 @@ private slots: private: - QWidget *m_parent; + TQWidget *m_parent; IccTransform *m_iccTrans; }; diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index a713662..ba04834 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -34,15 +34,15 @@ #include <cstdlib> #include <iostream> -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qbitmap.h> -#include <qcolor.h> -#include <qfile.h> -#include <qvariant.h> +#include <tqwidget.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqcolor.h> +#include <tqfile.h> +#include <tqvariant.h> // KDE includes. @@ -79,7 +79,7 @@ public: DImgInterfacePrivate() { - parent = 0; + tqparent = 0; undoMan = 0; cmSettings = 0; expoSettings = 0; @@ -120,10 +120,10 @@ public: double zoom; // Used by ICC color profile dialog. - QWidget *parent; + TQWidget *tqparent; - QString filename; - QString savingFilename; + TQString filename; + TQString savingFilename; DImg image; @@ -155,24 +155,24 @@ void DImgInterface::setDefaultInterface(DImgInterface *defaultInterface) } DImgInterface::DImgInterface() - : QObject() + : TQObject() { d = new DImgInterfacePrivate; d->undoMan = new UndoManager(this); d->thread = new SharedLoadSaveThread; - connect( d->thread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); + connect( d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQT_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); - connect( d->thread, SIGNAL(signalImageSaved(const QString&, bool)), - this, SLOT(slotImageSaved(const QString&, bool)) ); + connect( d->thread, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQT_SLOT(slotImageSaved(const TQString&, bool)) ); - connect( d->thread, SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), - this, SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); + connect( d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), + this, TQT_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); - connect( d->thread, SIGNAL(signalSavingProgress(const QString&, float)), - this, SLOT(slotSavingProgress(const QString&, float)) ); + connect( d->thread, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQT_SLOT(slotSavingProgress(const TQString&, float)) ); } DImgInterface::~DImgInterface() @@ -184,28 +184,28 @@ DImgInterface::~DImgInterface() m_defaultInterface = 0; } -void DImgInterface::load(const QString& filename, IOFileSettingsContainer *iofileSettings, - QWidget *parent) +void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofileSettings, + TQWidget *tqparent) { // store here in case filename == d->fileName, and is then reset by resetValues - QString newFileName = filename; + TQString newFileName = filename; resetValues(); d->filename = newFileName; d->iofileSettings = iofileSettings; - d->parent = parent; + d->tqparent = tqparent; if (d->iofileSettings->useRAWImport && DImg::fileFormat(d->filename) == DImg::RAW) { RawImport *rawImport = new RawImport(KURL(d->filename), this); EditorToolIface::editorToolIface()->loadTool(rawImport); - connect(rawImport, SIGNAL(okClicked()), - this, SLOT(slotUseRawImportSettings())); + connect(rawImport, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(slotUseRawImportSettings())); - connect(rawImport, SIGNAL(cancelClicked()), - this, SLOT(slotUseDefaultSettings())); + connect(rawImport, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(slotUseDefaultSettings())); } else { @@ -247,7 +247,7 @@ void DImgInterface::resetImage() void DImgInterface::resetValues() { d->valid = false; - d->filename = QString(); + d->filename = TQString(); d->width = 0; d->height = 0; d->origWidth = 0; @@ -261,7 +261,7 @@ void DImgInterface::resetValues() d->brightness = 0.0; d->changedBCG = false; d->iofileSettings = 0; - d->parent = 0; + d->tqparent = 0; d->cmod.reset(); d->undoMan->clear(); @@ -280,7 +280,7 @@ void DImgInterface::setExposureSettings(ExposureSettingsContainer *expoSettings) void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription, const DImg& img) { - const QString &fileName = loadingDescription.filePath; + const TQString &fileName = loadingDescription.filePath; if (fileName != d->filename) return; @@ -301,21 +301,21 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // We don't have a feedback from dcraw about auto-rotated RAW file during decoding. Well set transformed // flag as well. - if (d->image.attribute("format").toString() == QString("RAW")) + if (d->image.attribute("format").toString() == TQString("RAW")) d->rotatedOrFlipped = true; if (d->exifOrient && - (d->image.attribute("format").toString() == QString("JPEG") || - d->image.attribute("format").toString() == QString("PNG") || - d->image.attribute("format").toString() == QString("TIFF"))) + (d->image.attribute("format").toString() == TQString("JPEG") || + d->image.attribute("format").toString() == TQString("PNG") || + d->image.attribute("format").toString() == TQString("TIFF"))) exifRotate(d->filename); if (d->cmSettings->enableCMSetting) { - if (QFile::exists(d->cmSettings->workspaceSetting)) + if (TQFile::exists(d->cmSettings->workspaceSetting)) { IccTransform trans; - QByteArray fakeProfile; + TQByteArray fakeProfile; // First possibility: image has no embedded profile if(d->image.getICCProfil().isNull()) @@ -323,45 +323,45 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); - trans.setProfiles(QFile::encodeName(d->cmSettings->inputSetting), - QFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), + TQFile::encodeName(d->cmSettings->workspaceSetting)); // NOTE: If Input color profile do not exist, using built-in sRGB intead. trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, - QFile::exists(d->cmSettings->inputSetting)); + TQFile::exists(d->cmSettings->inputSetting)); - d->image.getICCProfilFromFile(QFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->parent) d->parent->unsetCursor(); + d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->unsetCursor(); } else { - // To repaint image in canvas before to ask about to apply ICC profile. + // To tqrepaint image in canvas before to ask about to apply ICC profile. emit signalImageLoaded(d->filename, valRet); - DImg preview = d->image.smoothScale(240, 180, QSize::ScaleMin); - trans.setProfiles(QFile::encodeName(d->cmSettings->inputSetting), - QFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); + DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); + trans.setProfiles(TQFile::encodeName(d->cmSettings->inputSetting), + TQFile::encodeName(d->cmSettings->workspaceSetting)); + ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); switch (dlg.exec()) { - case QDialog::Accepted: - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); + case TQDialog::Accepted: + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); // NOTE: If Input color profile do not exist, using built-in sRGB intead. trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, - QFile::exists(d->cmSettings->inputSetting)); + TQFile::exists(d->cmSettings->inputSetting)); - d->image.getICCProfilFromFile(QFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->parent) d->parent->unsetCursor(); + d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->unsetCursor(); break; case -1: - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); - d->image.getICCProfilFromFile(QFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->parent) d->parent->unsetCursor(); + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -375,11 +375,11 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription // Ask or apply? if (d->cmSettings->askOrApplySetting) { - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); - trans.setProfiles(QFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); - if (d->parent) d->parent->unsetCursor(); + if (d->tqparent) d->tqparent->unsetCursor(); } else { @@ -390,26 +390,26 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription DDebug() << "Embedded profile: " << trans.getEmbeddedProfileDescriptor() << endl; - // To repaint image in canvas before to ask about to apply ICC profile. + // To tqrepaint image in canvas before to ask about to apply ICC profile. emit signalImageLoaded(d->filename, valRet); - DImg preview = d->image.smoothScale(240, 180, QSize::ScaleMin); - trans.setProfiles(QFile::encodeName(d->cmSettings->workspaceSetting)); - ColorCorrectionDlg dlg(d->parent, &preview, &trans, fileName); + DImg preview = d->image.smoothScale(240, 180, TQSize::ScaleMin); + trans.setProfiles(TQFile::encodeName(d->cmSettings->workspaceSetting)); + ColorCorrectionDlg dlg(d->tqparent, &preview, &trans, fileName); switch (dlg.exec()) { - case QDialog::Accepted: - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); + case TQDialog::Accepted: + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); trans.apply(d->image, fakeProfile, d->cmSettings->renderingSetting, d->cmSettings->BPCSetting, false, false); - d->image.getICCProfilFromFile(QFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->parent) d->parent->unsetCursor(); + d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->unsetCursor(); break; case -1: - if (d->parent) d->parent->setCursor( KCursor::waitCursor() ); - d->image.getICCProfilFromFile(QFile::encodeName(d->cmSettings->workspaceSetting)); - if (d->parent) d->parent->unsetCursor(); + if (d->tqparent) d->tqparent->setCursor( KCursor::waitCursor() ); + d->image.getICCProfilFromFile(TQFile::encodeName(d->cmSettings->workspaceSetting)); + if (d->tqparent) d->tqparent->unsetCursor(); DDebug() << "dimginterface.cpp: Apply pressed" << endl; break; } @@ -419,12 +419,12 @@ void DImgInterface::slotImageLoaded(const LoadingDescription &loadingDescription } else { - QString message = i18n("Cannot find the ICC color-space profile file. " + TQString message = i18n("Cannot find the ICC color-space profile file. " "The ICC profiles path seems to be invalid. " "No color transform will be applied. " "Please check the \"Color Management\" " "configuration in digiKam's setup to verify the ICC path."); - KMessageBox::information(d->parent, message); + KMessageBox::information(d->tqparent, message); } } } @@ -448,7 +448,7 @@ bool DImgInterface::exifRotated() return d->rotatedOrFlipped; } -void DImgInterface::exifRotate(const QString& filename) +void DImgInterface::exifRotate(const TQString& filename) { // Rotate image based on EXIF rotate tag @@ -535,7 +535,7 @@ void DImgInterface::restore() /* This code is unused and untested -void DImgInterface::save(const QString& file, IOFileSettingsContainer *iofileSettings) +void DImgInterface::save(const TQString& file, IOFileSettingsContainer *iofileSettings) { d->cmod.reset(); d->cmod.setGamma(d->gamma); @@ -548,7 +548,7 @@ void DImgInterface::save(const QString& file, IOFileSettingsContainer *iofileSet d->contrast = 1.0; d->brightness = 0.0; - QString currentMimeType(QImageIO::imageFormat(d->filename)); + TQString currentMimeType(TQImageIO::imageFormat(d->filename)); d->needClearUndoManager = true; @@ -556,8 +556,8 @@ void DImgInterface::save(const QString& file, IOFileSettingsContainer *iofileSet } */ -void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iofileSettings, - bool setExifOrientationTag, const QString& givenMimeType) +void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *iofileSettings, + bool setExifOrientationTag, const TQString& givenMimeType) { // No need to toggle off undo, redo or save action during saving using // signalUndoStateChanged(), this is will done by GUI implementation directly. @@ -572,34 +572,34 @@ void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iof } // Try hard to find a mimetype. - QString mimeType = givenMimeType; + TQString mimeType = givenMimeType; // This is possibly empty if (mimeType.isEmpty()) mimeType = getImageFormat(); - DDebug() << "Saving to :" << QFile::encodeName(fileName).data() << " (" + DDebug() << "Saving to :" << TQFile::encodeName(fileName).data() << " (" << mimeType << ")" << endl; // JPEG file format. - if ( mimeType.upper() == QString("JPG") || mimeType.upper() == QString("JPEG") || - mimeType.upper() == QString("JPE")) + if ( mimeType.upper() == TQString("JPG") || mimeType.upper() == TQString("JPEG") || + mimeType.upper() == TQString("JPE")) { d->image.setAttribute("quality", iofileSettings->JPEGCompression); d->image.setAttribute("subsampling", iofileSettings->JPEGSubSampling); } // PNG file format. - if ( mimeType.upper() == QString("PNG") ) + if ( mimeType.upper() == TQString("PNG") ) d->image.setAttribute("quality", iofileSettings->PNGCompression); // TIFF file format. - if ( mimeType.upper() == QString("TIFF") || mimeType.upper() == QString("TIF") ) + if ( mimeType.upper() == TQString("TIFF") || mimeType.upper() == TQString("TIF") ) d->image.setAttribute("compress", iofileSettings->TIFFCompression); // JPEG 2000 file format. - if ( mimeType.upper() == QString("JP2") || mimeType.upper() == QString("JPX") || - mimeType.upper() == QString("JPC") || mimeType.upper() == QString("PGX")) + if ( mimeType.upper() == TQString("JP2") || mimeType.upper() == TQString("JPX") || + mimeType.upper() == TQString("JPC") || mimeType.upper() == TQString("PGX")) { if (iofileSettings->JPEG2000LossLess) d->image.setAttribute("quality", 100); // LossLess compression @@ -620,10 +620,10 @@ void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iof // broken. Note that IPTC image preview tag is limited to 256K!!! // There is no limitation with TIFF and PNG about IPTC byte array size. - QImage preview = d->image.smoothScale(1280, 1024, QSize::ScaleMin).copyQImage(); + TQImage preview = d->image.smoothScale(1280, 1024, TQSize::ScaleMin).copyTQImage(); - if ( mimeType.upper() != QString("JPG") && mimeType.upper() != QString("JPEG") && - mimeType.upper() != QString("JPE")) + if ( mimeType.upper() != TQString("JPG") && mimeType.upper() != TQString("JPEG") && + mimeType.upper() != TQString("JPE")) { // Non JPEG file, we update IPTC preview meta.setImagePreview(preview); @@ -637,7 +637,7 @@ void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iof } // Update Exif thumbnail. - QImage thumb = preview.smoothScale(160, 120, QImage::ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Image dimensions. @@ -646,7 +646,7 @@ void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iof // Update Exif Document Name tag with the original file name. meta.setExifTagString("Exif.Image.DocumentName", getImageFileName()); - // Update Exif Orientation tag if necessary. + // Update Exif Qt::Orientation tag if necessary. if( setExifOrientationTag ) meta.setImageOrientation(DMetadata::ORIENTATION_NORMAL); @@ -657,19 +657,19 @@ void DImgInterface::saveAs(const QString& fileName, IOFileSettingsContainer *iof d->thread->save(d->image, fileName, mimeType); } -void DImgInterface::slotImageSaved(const QString& filePath, bool success) +void DImgInterface::slotImageSaved(const TQString& filePath, bool success) { if (filePath != d->savingFilename) return; if (!success) - DWarning() << "error saving image '" << QFile::encodeName(filePath).data() << endl; + DWarning() << "error saving image '" << TQFile::encodeName(filePath).data() << endl; emit signalImageSaved(filePath, success); emit signalUndoStateChanged(d->undoMan->anyMoreUndo(), d->undoMan->anyMoreRedo(), !d->undoMan->isAtOrigin()); } -void DImgInterface::slotSavingProgress(const QString& filePath, float progress) +void DImgInterface::slotSavingProgress(const TQString& filePath, float progress) { if (filePath == d->savingFilename) emit signalSavingProgress(filePath, progress); @@ -681,7 +681,7 @@ void DImgInterface::abortSaving() d->thread->stopSaving(d->savingFilename); } -void DImgInterface::switchToLastSaved(const QString& newFilename) +void DImgInterface::switchToLastSaved(const TQString& newFilename) { // Higher level wants to use the current DImg object to represent the file // it has previously been saved to. @@ -689,7 +689,7 @@ void DImgInterface::switchToLastSaved(const QString& newFilename) // Currently the only place where a DImg is connected to the file it originates from // is the format attribute. - QString savedformat = d->image.attribute("savedformat").toString(); + TQString savedformat = d->image.attribute("savedformat").toString(); if (!savedformat.isEmpty()) d->image.setAttribute("format", savedformat); } @@ -700,7 +700,7 @@ void DImgInterface::setModified() emit signalUndoStateChanged(d->undoMan->anyMoreUndo(), d->undoMan->anyMoreRedo(), !d->undoMan->isAtOrigin()); } -void DImgInterface::readMetadataFromFile(const QString &file) +void DImgInterface::readMetadataFromFile(const TQString &file) { DMetadata meta(file); @@ -796,7 +796,7 @@ void DImgInterface::getSelectedArea(int& x, int& y, int& w, int& h) h = d->selH; } -void DImgInterface::paintOnDevice(QPaintDevice* p, +void DImgInterface::paintOnDevice(TQPaintDevice* p, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int /*antialias*/) @@ -810,12 +810,12 @@ void DImgInterface::paintOnDevice(QPaintDevice* p, if (d->cmSettings->enableCMSetting && d->cmSettings->managedViewSetting) { - QPixmap pix(img.convertToPixmap(&d->monitorICCtrans)); + TQPixmap pix(img.convertToPixmap(&d->monitorICCtrans)); bitBlt(p, dx, dy, &pix, 0, 0); } else { - QPixmap pix(img.convertToPixmap()); + TQPixmap pix(img.convertToPixmap()); bitBlt(p, dx, dy, &pix, 0, 0); } @@ -823,13 +823,13 @@ void DImgInterface::paintOnDevice(QPaintDevice* p, if (d->expoSettings->underExposureIndicator || d->expoSettings->overExposureIndicator) { - QImage pureColorMask = d->image.copy(sx, sy, sw, sh).pureColorMask(d->expoSettings); - QPixmap pixMask(pureColorMask.scale(dw, dh)); + TQImage pureColorMask = d->image.copy(sx, sy, sw, sh).pureColorMask(d->expoSettings); + TQPixmap pixMask(pureColorMask.scale(dw, dh)); bitBlt(p, dx, dy, &pixMask, 0, 0); } } -void DImgInterface::paintOnDevice(QPaintDevice* p, +void DImgInterface::paintOnDevice(TQPaintDevice* p, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int mx, int my, int mw, int mh, @@ -870,12 +870,12 @@ void DImgInterface::paintOnDevice(QPaintDevice* p, if (d->cmSettings->enableCMSetting && d->cmSettings->managedViewSetting) { - QPixmap pix(img.convertToPixmap(&d->monitorICCtrans)); + TQPixmap pix(img.convertToPixmap(&d->monitorICCtrans)); bitBlt(p, dx, dy, &pix, 0, 0); } else { - QPixmap pix(img.convertToPixmap()); + TQPixmap pix(img.convertToPixmap()); bitBlt(p, dx, dy, &pix, 0, 0); } @@ -883,8 +883,8 @@ void DImgInterface::paintOnDevice(QPaintDevice* p, if (d->expoSettings->underExposureIndicator || d->expoSettings->overExposureIndicator) { - QImage pureColorMask = d->image.copy(sx, sy, sw, sh).pureColorMask(d->expoSettings); - QPixmap pixMask(pureColorMask.scale(dw, dh)); + TQImage pureColorMask = d->image.copy(sx, sy, sw, sh).pureColorMask(d->expoSettings); + TQPixmap pixMask(pureColorMask.scale(dw, dh)); bitBlt(p, dx, dy, &pixMask, 0, 0); } } @@ -1105,12 +1105,12 @@ uchar* DImgInterface::getImage() } } -void DImgInterface::putImage(const QString &caller, uchar* data, int w, int h) +void DImgInterface::putImage(const TQString &caller, uchar* data, int w, int h) { putImage(caller, data, w, h, d->image.sixteenBit()); } -void DImgInterface::putImage(const QString &caller, uchar* data, int w, int h, bool sixteenBit) +void DImgInterface::putImage(const TQString &caller, uchar* data, int w, int h, bool sixteenBit) { d->undoMan->addAction(new UndoActionIrreversible(this, caller)); putImage(data, w, h, sixteenBit); @@ -1154,7 +1154,7 @@ void DImgInterface::putImage(uchar* data, int w, int h, bool sixteenBit) setModified(); } -void DImgInterface::setEmbeddedICCToOriginalImage( QString profilePath) +void DImgInterface::setEmbeddedICCToOriginalImage( TQString profilePath) { if (d->image.isNull()) { @@ -1163,7 +1163,7 @@ void DImgInterface::setEmbeddedICCToOriginalImage( QString profilePath) } DDebug() << k_funcinfo << "Embedding profile: " << profilePath << endl; - d->image.getICCProfilFromFile( QFile::encodeName(profilePath)); + d->image.getICCProfilFromFile( TQFile::encodeName(profilePath)); setModified(); } @@ -1181,7 +1181,7 @@ uchar* DImgInterface::getImageSelection() return 0; } -void DImgInterface::putImageSelection(const QString &caller, uchar* data) +void DImgInterface::putImageSelection(const TQString &caller, uchar* data) { if (!data || d->image.isNull()) return; @@ -1193,52 +1193,52 @@ void DImgInterface::putImageSelection(const QString &caller, uchar* data) setModified(); } -void DImgInterface::getUndoHistory(QStringList &titles) +void DImgInterface::getUndoHistory(TQStringList &titles) { d->undoMan->getUndoHistory(titles); } -void DImgInterface::getRedoHistory(QStringList &titles) +void DImgInterface::getRedoHistory(TQStringList &titles) { d->undoMan->getRedoHistory(titles); } -QByteArray DImgInterface::getEmbeddedICC() +TQByteArray DImgInterface::getEmbeddedICC() { return d->image.getICCProfil(); } -QByteArray DImgInterface::getExif() +TQByteArray DImgInterface::getExif() { return d->image.getExif(); } -QByteArray DImgInterface::getIptc() +TQByteArray DImgInterface::getIptc() { return d->image.getIptc(); } -QString DImgInterface::getImageFilePath() +TQString DImgInterface::getImageFilePath() { return d->filename; } -QString DImgInterface::getImageFileName() +TQString DImgInterface::getImageFileName() { return d->filename.section( '/', -1 ); } -QString DImgInterface::getImageFormat() +TQString DImgInterface::getImageFormat() { if (d->image.isNull()) - return QString(); + return TQString(); - QString mimeType = d->image.attribute("format").toString(); + TQString mimeType = d->image.attribute("format").toString(); // It is a bug in the loader if format attribute is not given if (mimeType.isEmpty()) { DWarning() << "DImg object does not contain attribute \"format\"" << endl; - mimeType = QImageIO::imageFormat(d->filename); + mimeType = TQImageIO::imageFormat(d->filename); } return mimeType; } @@ -1248,7 +1248,7 @@ ICCSettingsContainer* DImgInterface::getICCSettings() return d->cmSettings; } -QPixmap DImgInterface::convertToPixmap(DImg& img) +TQPixmap DImgInterface::convertToPixmap(DImg& img) { if (d->cmSettings->enableCMSetting && d->cmSettings->managedViewSetting) return img.convertToPixmap(&d->monitorICCtrans); @@ -1256,12 +1256,12 @@ QPixmap DImgInterface::convertToPixmap(DImg& img) return img.convertToPixmap(); } -QColor DImgInterface::underExposureColor() +TQColor DImgInterface::underExposureColor() { return d->expoSettings->underExposureColor; } -QColor DImgInterface::overExposureColor() +TQColor DImgInterface::overExposureColor() { return d->expoSettings->overExposureColor; } diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/digikam/utilities/imageeditor/canvas/dimginterface.h index 2de684d..9e01893 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.h +++ b/digikam/utilities/imageeditor/canvas/dimginterface.h @@ -25,18 +25,18 @@ #ifndef DIMGINTERFACE_H #define DIMGINTERFACE_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> // Local includes. #include "digikam_export.h" #include "dimg.h" -class QWidget; -class QPixmap; +class TQWidget; +class TQPixmap; namespace Digikam { @@ -47,9 +47,10 @@ class IOFileSettingsContainer; class LoadingDescription; class DImgInterfacePrivate; -class DIGIKAM_EXPORT DImgInterface : public QObject +class DIGIKAM_EXPORT DImgInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -59,7 +60,7 @@ public: DImgInterface(); ~DImgInterface(); - void load(const QString& filename, IOFileSettingsContainer *iofileSettings, QWidget *parent=0); + void load(const TQString& filename, IOFileSettingsContainer *iofileSettings, TQWidget *tqparent=0); void setICCSettings(ICCSettingsContainer *cmSettings); void setExposureSettings(ExposureSettingsContainer *expoSettings); @@ -69,13 +70,13 @@ public: void redo(); void restore(); - void saveAs(const QString& file, IOFileSettingsContainer *iofileSettings, - bool setExifOrientationTag, const QString& mimeType=QString()); + void saveAs(const TQString& file, IOFileSettingsContainer *iofileSettings, + bool setExifOrientationTag, const TQString& mimeType=TQString()); - void switchToLastSaved(const QString& newFilename); + void switchToLastSaved(const TQString& newFilename); void abortSaving(); void setModified(); - void readMetadataFromFile(const QString &file); + void readMetadataFromFile(const TQString &file); void clearUndoManager(); void setUndoManagerOrigin(); void updateUndoState(); @@ -83,11 +84,11 @@ public: void zoom(double val); - void paintOnDevice(QPaintDevice* p, + void paintOnDevice(TQPaintDevice* p, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int antialias); - void paintOnDevice(QPaintDevice* p, + void paintOnDevice(TQPaintDevice* p, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int mx, int my, int mw, int mh, @@ -127,55 +128,55 @@ public: void convertDepth(int depth); - void getUndoHistory(QStringList &titles); - void getRedoHistory(QStringList &titles); + void getUndoHistory(TQStringList &titles); + void getRedoHistory(TQStringList &titles); DImg* getImg(); uchar* getImage(); void putImage(uchar* data, int w, int h); void putImage(uchar* data, int w, int h, bool sixteenBit); - void putImage(const QString &caller, uchar* data, int w, int h); - void putImage(const QString &caller, uchar* data, int w, int h, bool sixteenBit); + void putImage(const TQString &caller, uchar* data, int w, int h); + void putImage(const TQString &caller, uchar* data, int w, int h, bool sixteenBit); uchar* getImageSelection(); - void putImageSelection(const QString &caller, uchar* data); + void putImageSelection(const TQString &caller, uchar* data); - void setEmbeddedICCToOriginalImage( QString profilePath); + void setEmbeddedICCToOriginalImage( TQString profilePath); /** Convert a DImg image to a pixmap for screen using color managemed view if necessary */ - QPixmap convertToPixmap(DImg& img); + TQPixmap convertToPixmap(DImg& img); - QByteArray getEmbeddedICC(); - QByteArray getExif(); - QByteArray getIptc(); + TQByteArray getEmbeddedICC(); + TQByteArray getExif(); + TQByteArray getIptc(); ICCSettingsContainer *getICCSettings(); - QString getImageFileName(); - QString getImageFilePath(); - QString getImageFormat(); + TQString getImageFileName(); + TQString getImageFilePath(); + TQString getImageFormat(); - QColor underExposureColor(); - QColor overExposureColor(); + TQColor underExposureColor(); + TQColor overExposureColor(); protected slots: void slotImageLoaded(const LoadingDescription &loadingDescription, const DImg& img); - void slotImageSaved(const QString& filePath, bool success); + void slotImageSaved(const TQString& filePath, bool success); void slotLoadingProgress(const LoadingDescription &loadingDescription, float progress); - void slotSavingProgress(const QString& filePath, float progress); + void slotSavingProgress(const TQString& filePath, float progress); signals: void signalModified(); void signalUndoStateChanged(bool moreUndo, bool moreRedo, bool canSave); - void signalLoadingStarted(const QString& filename); - void signalLoadingProgress(const QString& filePath, float progress); - void signalImageLoaded(const QString& filePath, bool success); - void signalSavingProgress(const QString& filePath, float progress); - void signalImageSaved(const QString& filePath, bool success); + void signalLoadingStarted(const TQString& filename); + void signalLoadingProgress(const TQString& filePath, float progress); + void signalImageLoaded(const TQString& filePath, bool success); + void signalSavingProgress(const TQString& filePath, float progress); + void signalImageSaved(const TQString& filePath, bool success); private slots: @@ -184,7 +185,7 @@ private slots: private: - void exifRotate(const QString& filename); + void exifRotate(const TQString& filename); void resetValues(); private: diff --git a/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h b/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h index 78d98bf..eadb12f 100644 --- a/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h +++ b/digikam/utilities/imageeditor/canvas/iccsettingscontainer.h @@ -25,9 +25,9 @@ #ifndef ICCSETTINGSCONTAINER_H #define ICCSETTINGSCONTAINER_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // Local includes. @@ -51,10 +51,10 @@ public: renderingSetting = 0; - workspaceSetting = QString(); - monitorSetting = QString(); - inputSetting = QString(); - proofSetting = QString(); + workspaceSetting = TQString(); + monitorSetting = TQString(); + inputSetting = TQString(); + proofSetting = TQString(); }; ~ICCSettingsContainer(){}; @@ -71,10 +71,10 @@ public: int renderingSetting; - QString workspaceSetting; - QString monitorSetting; - QString inputSetting; - QString proofSetting; + TQString workspaceSetting; + TQString monitorSetting; + TQString inputSetting; + TQString proofSetting; }; } // namespace Digikam diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index 8f44332..389c7b3 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -32,8 +32,8 @@ namespace Digikam { -ImagePlugin::ImagePlugin(QObject *parent, const char* name) - : QObject(parent, name) +ImagePlugin::ImagePlugin(TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { } @@ -53,11 +53,11 @@ void ImagePlugin::loadTool(EditorTool* tool) { EditorToolIface::editorToolIface()->loadTool(tool); - connect(tool, SIGNAL(okClicked()), - this, SLOT(slotToolDone())); + connect(tool, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(slotToolDone())); - connect(tool, SIGNAL(cancelClicked()), - this, SLOT(slotToolDone())); + connect(tool, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(slotToolDone())); } void ImagePlugin::slotToolDone() diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/digikam/utilities/imageeditor/canvas/imageplugin.h index 7982b52..0d66ec4 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.h +++ b/digikam/utilities/imageeditor/canvas/imageplugin.h @@ -25,9 +25,9 @@ #ifndef IMAGEPLUGIN_H #define IMAGEPLUGIN_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> // KDE includes. @@ -37,20 +37,21 @@ #include "digikam_export.h" -class QWidget; +class TQWidget; namespace Digikam { class EditorTool; -class DIGIKAM_EXPORT ImagePlugin : public QObject, public KXMLGUIClient +class DIGIKAM_EXPORT ImagePlugin : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - ImagePlugin(QObject *parent, const char* name=0); + ImagePlugin(TQObject *tqparent, const char* name=0); virtual ~ImagePlugin(); virtual void setEnabledSelectionActions(bool enable); diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp index fc5f49c..d806b3c 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp @@ -56,8 +56,8 @@ class ImagePluginLoaderPrivate public: - typedef QPair<QString, ImagePlugin*> PluginType; - typedef QValueList< PluginType > PluginList; + typedef TQPair<TQString, ImagePlugin*> PluginType; + typedef TQValueList< PluginType > PluginList; public: @@ -65,11 +65,11 @@ public: { splash = 0; - for (int i=0 ; QString(ObsoleteImagePluginsList[i]) != QString("-1") ; i++) + for (int i=0 ; TQString(ObsoleteImagePluginsList[i]) != TQString("-1") ; i++) obsoleteImagePluginsList << ObsoleteImagePluginsList[i]; } - QStringList obsoleteImagePluginsList; + TQStringList obsoleteImagePluginsList; SplashScreen *splash; @@ -83,14 +83,14 @@ ImagePluginLoader* ImagePluginLoader::instance() return m_instance; } -ImagePluginLoader::ImagePluginLoader(QObject *parent, SplashScreen *splash) - : QObject(parent) +ImagePluginLoader::ImagePluginLoader(TQObject *tqparent, SplashScreen *splash) + : TQObject(tqparent) { m_instance = this; d = new ImagePluginLoaderPrivate; d->splash = splash; - QStringList imagePluginsList2Load; + TQStringList imagePluginsList2Load; KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin"); KTrader::OfferList::ConstIterator iter; @@ -98,7 +98,7 @@ ImagePluginLoader::ImagePluginLoader(QObject *parent, SplashScreen *splash) for (iter = offers.begin() ; iter != offers.end() ; ++iter) { KService::Ptr service = *iter; - if (!d->obsoleteImagePluginsList.contains(service->library())) + if (!d->obsoleteImagePluginsList.tqcontains(service->library())) imagePluginsList2Load.append(service->library()); } @@ -111,7 +111,7 @@ ImagePluginLoader::~ImagePluginLoader() m_instance = 0; } -void ImagePluginLoader::loadPluginsFromList(const QStringList& list) +void ImagePluginLoader::loadPluginsFromList(const TQStringList& list) { if (d->splash) d->splash->message(i18n("Loading Image Plugins")); @@ -167,7 +167,7 @@ void ImagePluginLoader::loadPluginsFromList(const QStringList& list) KService::Ptr service = *iter; ImagePlugin *plugin; - if (!list.contains(service->library()) && service->library() != "digikamimageplugin_core") + if (!list.tqcontains(service->library()) && service->library() != "digikamimageplugin_core") { if ((plugin = pluginIsLoaded(service->name())) != NULL) d->pluginList.remove(ImagePluginLoaderPrivate::PluginType(service->name(),plugin)); @@ -210,7 +210,7 @@ void ImagePluginLoader::loadPluginsFromList(const QStringList& list) // use the old splashscreen instance. } -ImagePlugin* ImagePluginLoader::pluginIsLoaded(const QString& name) +ImagePlugin* ImagePluginLoader::pluginIsLoaded(const TQString& name) { if ( d->pluginList.isEmpty() ) return 0; @@ -225,7 +225,7 @@ ImagePlugin* ImagePluginLoader::pluginIsLoaded(const QString& name) return 0; } -ImagePlugin* ImagePluginLoader::pluginInstance(const QString& libraryName) +ImagePlugin* ImagePluginLoader::pluginInstance(const TQString& libraryName) { KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin"); KTrader::OfferList::ConstIterator iter; @@ -243,7 +243,7 @@ ImagePlugin* ImagePluginLoader::pluginInstance(const QString& libraryName) return 0; } -bool ImagePluginLoader::pluginLibraryIsLoaded(const QString& libraryName) +bool ImagePluginLoader::pluginLibraryIsLoaded(const TQString& libraryName) { KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin"); KTrader::OfferList::ConstIterator iter; @@ -262,9 +262,9 @@ bool ImagePluginLoader::pluginLibraryIsLoaded(const QString& libraryName) return false; } -QPtrList<ImagePlugin> ImagePluginLoader::pluginList() +TQPtrList<ImagePlugin> ImagePluginLoader::pluginList() { - QPtrList<ImagePlugin> list; + TQPtrList<ImagePlugin> list; for (ImagePluginLoaderPrivate::PluginList::iterator it = d->pluginList.begin(); it != d->pluginList.end(); ++it) diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.h b/digikam/utilities/imageeditor/canvas/imagepluginloader.h index 24e035e..db23d44 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.h +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.h @@ -25,13 +25,13 @@ #ifndef IMAGEPLUGINLOADER_H #define IMAGEPLUGINLOADER_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqpair.h> // Local includes. @@ -44,28 +44,28 @@ namespace Digikam class SplashScreen; class ImagePluginLoaderPrivate; -class DIGIKAM_EXPORT ImagePluginLoader : public QObject +class DIGIKAM_EXPORT ImagePluginLoader : public TQObject { public: - ImagePluginLoader(QObject *parent, SplashScreen *splash=0); + ImagePluginLoader(TQObject *tqparent, SplashScreen *splash=0); ~ImagePluginLoader(); static ImagePluginLoader* instance(); - QPtrList<ImagePlugin> pluginList(); - void loadPluginsFromList(const QStringList& list); + TQPtrList<ImagePlugin> pluginList(); + void loadPluginsFromList(const TQStringList& list); // Return true if plugin library is loaded in memory. // 'libraryName' is internal plugin library name not i18n. - bool pluginLibraryIsLoaded(const QString& libraryName); + bool pluginLibraryIsLoaded(const TQString& libraryName); - ImagePlugin* pluginInstance(const QString& libraryName); + ImagePlugin* pluginInstance(const TQString& libraryName); private: - ImagePlugin* pluginIsLoaded(const QString& name); + ImagePlugin* pluginIsLoaded(const TQString& name); private: diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp index b75d18a..3343596 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.cpp +++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp @@ -41,7 +41,7 @@ UndoAction::~UndoAction() { } -QString UndoAction::getTitle() const +TQString UndoAction::getTitle() const { return m_title; } @@ -108,10 +108,10 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface, UndoActionFlip::Direction dir) : UndoAction(iface), m_dir(dir) { - if(m_dir == Horizontal) - m_title = i18n("Flip Horizontal"); - else if(m_dir == Vertical) - m_title = i18n("Flip Vertical"); + if(m_dir ==Qt::Horizontal) + m_title = i18n("FlipQt::Horizontal"); + else if(m_dir ==Qt::Vertical) + m_title = i18n("FlipQt::Vertical"); } UndoActionFlip::~UndoActionFlip() @@ -122,10 +122,10 @@ void UndoActionFlip::rollBack() { switch(m_dir) { - case(Horizontal): + case Qt::Horizontal: m_iface->flipHoriz(false); return; - case(Vertical): + case Qt::Vertical: m_iface->flipVert(false); return; default: @@ -164,7 +164,7 @@ void UndoActionBCG::execute() } UndoActionIrreversible::UndoActionIrreversible(DImgInterface* iface, - const QString &title) + const TQString &title) : UndoAction(iface) { m_title = title; diff --git a/digikam/utilities/imageeditor/canvas/undoaction.h b/digikam/utilities/imageeditor/canvas/undoaction.h index f3b6562..9a4c924 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.h +++ b/digikam/utilities/imageeditor/canvas/undoaction.h @@ -49,12 +49,12 @@ public: virtual void rollBack() = 0; virtual void execute() = 0; - QString getTitle() const; + TQString getTitle() const; protected: DImgInterface *m_iface; - QString m_title; + TQString m_title; }; class DIGIKAM_EXPORT UndoActionRotate : public UndoAction @@ -87,8 +87,8 @@ public: enum Direction { - Horizontal, - Vertical + Horizontal, + Vertical }; UndoActionFlip(DImgInterface* iface, Direction dir); @@ -132,7 +132,7 @@ class DIGIKAM_EXPORT UndoActionIrreversible : public UndoAction public: UndoActionIrreversible(DImgInterface* iface, - const QString &caller=i18n("Unknown")); + const TQString &caller=i18n("Unknown")); ~UndoActionIrreversible(); void rollBack(); diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index 972ff34..20f07b0 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -29,13 +29,13 @@ extern "C" #include <unistd.h> } -// Qt includes. +// TQt includes. -#include <qcstring.h> -#include <qstring.h> -#include <qfile.h> -#include <qdatastream.h> -#include <qstringlist.h> +#include <tqcstring.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqdatastream.h> +#include <tqstringlist.h> // KDE includes. @@ -56,21 +56,21 @@ class UndoCachePriv { public: - QString cachePrefix; - QStringList cacheFilenames; + TQString cachePrefix; + TQStringList cacheFilenames; }; UndoCache::UndoCache() { d = new UndoCachePriv; - QString cacheDir; + TQString cacheDir; cacheDir = locateLocal("cache", KGlobal::instance()->aboutData()->programName() + '/'); - d->cachePrefix = QString("%1undocache-%2") - .arg(cacheDir) - .arg(getpid()); + d->cachePrefix = TQString("%1undocache-%2") + .tqarg(cacheDir) + .tqarg(getpid()); } UndoCache::~UndoCache() @@ -84,10 +84,10 @@ UndoCache::~UndoCache() */ void UndoCache::clear() { - for (QStringList::iterator it = d->cacheFilenames.begin(); + for (TQStringList::iterator it = d->cacheFilenames.begin(); it != d->cacheFilenames.end(); ++it) { - ::unlink(QFile::encodeName(*it)); + ::unlink(TQFile::encodeName(*it)); } d->cacheFilenames.clear(); @@ -98,21 +98,21 @@ void UndoCache::clear() */ bool UndoCache::putData(int level, int w, int h, int bytesDepth, uchar* data) { - QString cacheFile = QString("%1-%2.bin") - .arg(d->cachePrefix) - .arg(level); + TQString cacheFile = TQString("%1-%2.bin") + .tqarg(d->cachePrefix) + .tqarg(level); - QFile file(cacheFile); + TQFile file(cacheFile); if (file.exists() || !file.open(IO_WriteOnly)) return false; - QDataStream ds(&file); + TQDataStream ds(&file); ds << w; ds << h; ds << bytesDepth; - QByteArray ba(w*h*bytesDepth); + TQByteArray ba(w*h*bytesDepth); memcpy (ba.data(), data, w*h*bytesDepth); ds << ba; @@ -128,15 +128,15 @@ 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) { - QString cacheFile = QString("%1-%2.bin") - .arg(d->cachePrefix) - .arg(level); + TQString cacheFile = TQString("%1-%2.bin") + .tqarg(d->cachePrefix) + .tqarg(level); - QFile file(cacheFile); + TQFile file(cacheFile); if (!file.open(IO_ReadOnly)) return 0; - QDataStream ds(&file); + TQDataStream ds(&file); ds >> w; ds >> h; ds >> bytesDepth; @@ -145,7 +145,7 @@ uchar* UndoCache::getData(int level, int& w, int& h, int& bytesDepth, bool del) if (!data) return 0; - QByteArray ba(w*h*bytesDepth); + TQByteArray ba(w*h*bytesDepth); ds >> ba; memcpy (data, ba.data(), w*h*bytesDepth); @@ -153,7 +153,7 @@ uchar* UndoCache::getData(int level, int& w, int& h, int& bytesDepth, bool del) if(del) { - ::unlink(QFile::encodeName(cacheFile)); + ::unlink(TQFile::encodeName(cacheFile)); d->cacheFilenames.remove(cacheFile); } @@ -165,14 +165,14 @@ uchar* UndoCache::getData(int level, int& w, int& h, int& bytesDepth, bool del) */ void UndoCache::erase(int level) { - QString cacheFile = QString("%1-%2.bin") - .arg(d->cachePrefix) - .arg(level); + TQString cacheFile = TQString("%1-%2.bin") + .tqarg(d->cachePrefix) + .tqarg(level); - if(d->cacheFilenames.find(cacheFile) == d->cacheFilenames.end()) + if(d->cacheFilenames.tqfind(cacheFile) == d->cacheFilenames.end()) return; - ::unlink(QFile::encodeName(cacheFile)); + ::unlink(TQFile::encodeName(cacheFile)); } } // namespace Digikam diff --git a/digikam/utilities/imageeditor/canvas/undocache.h b/digikam/utilities/imageeditor/canvas/undocache.h index 2954c30..732c7c3 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.h +++ b/digikam/utilities/imageeditor/canvas/undocache.h @@ -25,9 +25,9 @@ #ifndef UNDOCACHE_H #define UNDOCACHE_H -// Qt includes. +// TQt includes. -#include <qglobal.h> +#include <tqglobal.h> // Local includes. diff --git a/digikam/utilities/imageeditor/canvas/undomanager.cpp b/digikam/utilities/imageeditor/canvas/undomanager.cpp index 25525dd..87085d5 100644 --- a/digikam/utilities/imageeditor/canvas/undomanager.cpp +++ b/digikam/utilities/imageeditor/canvas/undomanager.cpp @@ -50,8 +50,8 @@ public: origin = 0; } - QValueList<UndoAction*> undoActions; - QValueList<UndoAction*> redoActions; + TQValueList<UndoAction*> undoActions; + TQValueList<UndoAction*> redoActions; int origin; UndoCache *undoCache; @@ -179,7 +179,7 @@ void UndoManager::clear(bool clearCache) void UndoManager::clearUndoActions() { UndoAction *action; - QValueList<UndoAction*>::iterator it; + TQValueList<UndoAction*>::iterator it; for(it = d->undoActions.begin(); it != d->undoActions.end(); ++it) { @@ -195,7 +195,7 @@ void UndoManager::clearRedoActions() return; UndoAction *action; - QValueList<UndoAction*>::iterator it; + TQValueList<UndoAction*>::iterator it; // get the level of the first redo action int level = d->undoActions.size() + 1; @@ -220,9 +220,9 @@ bool UndoManager::anyMoreRedo() return !d->redoActions.isEmpty(); } -void UndoManager::getUndoHistory(QStringList &titles) +void UndoManager::getUndoHistory(TQStringList &titles) { - QValueList<UndoAction*>::iterator it; + TQValueList<UndoAction*>::iterator it; for(it = d->undoActions.begin(); it != d->undoActions.end(); ++it) { @@ -230,9 +230,9 @@ void UndoManager::getUndoHistory(QStringList &titles) } } -void UndoManager::getRedoHistory(QStringList &titles) +void UndoManager::getRedoHistory(TQStringList &titles) { - QValueList<UndoAction*>::iterator it; + TQValueList<UndoAction*>::iterator it; for(it = d->redoActions.begin(); it != d->redoActions.end(); ++it) { diff --git a/digikam/utilities/imageeditor/canvas/undomanager.h b/digikam/utilities/imageeditor/canvas/undomanager.h index 4a633d5..a36ba12 100644 --- a/digikam/utilities/imageeditor/canvas/undomanager.h +++ b/digikam/utilities/imageeditor/canvas/undomanager.h @@ -25,9 +25,9 @@ #ifndef UNDOMANAGER_H #define UNDOMANAGER_H -// Qt includes. +// TQt includes. -#include <qstringlist.h> +#include <tqstringlist.h> // Local includes. @@ -54,8 +54,8 @@ public: void clear(bool clearCache=true); bool anyMoreUndo(); bool anyMoreRedo(); - void getUndoHistory(QStringList &titles); - void getRedoHistory(QStringList &titles); + void getUndoHistory(TQStringList &titles); + void getRedoHistory(TQStringList &titles); bool isAtOrigin(); void setOrigin(); diff --git a/digikam/utilities/imageeditor/editor/editorstackview.cpp b/digikam/utilities/imageeditor/editor/editorstackview.cpp index 7258afd..f96b8a4 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.cpp +++ b/digikam/utilities/imageeditor/editor/editorstackview.cpp @@ -44,12 +44,12 @@ public: toolView = 0; } - QWidget *toolView; + TQWidget *toolView; Canvas *canvas; }; -EditorStackView::EditorStackView(QWidget *parent) - : QWidgetStack(parent, 0, Qt::WDestructiveClose) +EditorStackView::EditorStackView(TQWidget *tqparent) + : TQWidgetStack(tqparent, 0, TQt::WDestructiveClose) { d = new EditorStackViewPriv; } @@ -66,8 +66,8 @@ void EditorStackView::setCanvas(Canvas* canvas) d->canvas = canvas; addWidget(d->canvas, CanvasMode); - connect(d->canvas, SIGNAL(signalZoomChanged(double)), - this, SLOT(slotZoomChanged(double))); + connect(d->canvas, TQT_SIGNAL(signalZoomChanged(double)), + this, TQT_SLOT(slotZoomChanged(double))); } Canvas* EditorStackView::canvas() const @@ -75,7 +75,7 @@ Canvas* EditorStackView::canvas() const return d->canvas; } -void EditorStackView::setToolView(QWidget* view) +void EditorStackView::setToolView(TQWidget* view) { if (d->toolView) removeWidget(d->toolView); @@ -88,12 +88,12 @@ void EditorStackView::setToolView(QWidget* view) PreviewWidget *preview = previewWidget(); if (preview) { - connect(preview, SIGNAL(signalZoomFactorChanged(double)), - this, SLOT(slotZoomChanged(double))); + connect(preview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SLOT(slotZoomChanged(double))); } } -QWidget* EditorStackView::toolView() const +TQWidget* EditorStackView::toolView() const { return d->toolView; } diff --git a/digikam/utilities/imageeditor/editor/editorstackview.h b/digikam/utilities/imageeditor/editor/editorstackview.h index 6f34a89..e2a7618 100644 --- a/digikam/utilities/imageeditor/editor/editorstackview.h +++ b/digikam/utilities/imageeditor/editor/editorstackview.h @@ -26,7 +26,7 @@ // KDE includes. -#include <qwidgetstack.h> +#include <tqwidgetstack.h> // Local includes. @@ -39,9 +39,10 @@ class PreviewWidget; class Canvas; class EditorStackViewPriv; -class DIGIKAM_EXPORT EditorStackView : public QWidgetStack +class DIGIKAM_EXPORT EditorStackView : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: @@ -53,14 +54,14 @@ public: public: - EditorStackView(QWidget *parent=0); + EditorStackView(TQWidget *tqparent=0); ~EditorStackView(); void setCanvas(Canvas* canvas); Canvas *canvas() const; - void setToolView(QWidget* view); - QWidget *toolView() const; + void setToolView(TQWidget* view); + TQWidget *toolView() const; int viewMode(); void setViewMode(int mode); diff --git a/digikam/utilities/imageeditor/editor/editortool.cpp b/digikam/utilities/imageeditor/editor/editortool.cpp index 2b4761d..fa70b28 100644 --- a/digikam/utilities/imageeditor/editor/editortool.cpp +++ b/digikam/utilities/imageeditor/editor/editortool.cpp @@ -21,10 +21,10 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qtimer.h> +#include <tqwidget.h> +#include <tqtimer.h> // KDE includes. @@ -57,26 +57,26 @@ public: settings = 0; } - QString helpAnchor; - QString name; + TQString helpAnchor; + TQString name; - QWidget *view; + TQWidget *view; - QPixmap icon; + TQPixmap icon; - QTimer *timer; + TQTimer *timer; EditorToolSettings *settings; }; -EditorTool::EditorTool(QObject *parent) - : QObject(parent) +EditorTool::EditorTool(TQObject *tqparent) + : TQObject(tqparent) { d = new EditorToolPriv; - d->timer = new QTimer(this); + d->timer = new TQTimer(this); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotEffect())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotEffect())); } EditorTool::~EditorTool() @@ -86,35 +86,35 @@ EditorTool::~EditorTool() void EditorTool::init() { - QTimer::singleShot(0, this, SLOT(slotInit())); + TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); } -QPixmap EditorTool::toolIcon() const +TQPixmap EditorTool::toolIcon() const { return d->icon; } -void EditorTool::setToolIcon(const QPixmap& icon) +void EditorTool::setToolIcon(const TQPixmap& icon) { d->icon = icon; } -QString EditorTool::toolName() const +TQString EditorTool::toolName() const { return d->name; } -void EditorTool::setToolName(const QString& name) +void EditorTool::setToolName(const TQString& name) { d->name = name; } -QWidget* EditorTool::toolView() const +TQWidget* EditorTool::toolView() const { return d->view; } -void EditorTool::setToolView(QWidget *view) +void EditorTool::setToolView(TQWidget *view) { d->view = view; // Will be unblocked in slotInit() @@ -131,23 +131,23 @@ void EditorTool::setToolSettings(EditorToolSettings *settings) { d->settings = settings; - connect(d->settings, SIGNAL(signalOkClicked()), - this, SLOT(slotOk())); + connect(d->settings, TQT_SIGNAL(signalOkClicked()), + this, TQT_SLOT(slotOk())); - connect(d->settings, SIGNAL(signalCancelClicked()), - this, SLOT(slotCancel())); + connect(d->settings, TQT_SIGNAL(signalCancelClicked()), + this, TQT_SLOT(slotCancel())); - connect(d->settings, SIGNAL(signalDefaultClicked()), - this, SLOT(slotResetSettings())); + connect(d->settings, TQT_SIGNAL(signalDefaultClicked()), + this, TQT_SLOT(slotResetSettings())); - connect(d->settings, SIGNAL(signalSaveAsClicked()), - this, SLOT(slotSaveAsSettings())); + connect(d->settings, TQT_SIGNAL(signalSaveAsClicked()), + this, TQT_SLOT(slotSaveAsSettings())); - connect(d->settings, SIGNAL(signalLoadClicked()), - this, SLOT(slotLoadSettings())); + connect(d->settings, TQT_SIGNAL(signalLoadClicked()), + this, TQT_SLOT(slotLoadSettings())); - connect(d->settings, SIGNAL(signalTryClicked()), - this, SLOT(slotEffect())); + connect(d->settings, TQT_SIGNAL(signalTryClicked()), + this, TQT_SLOT(slotEffect())); // Will be unblocked in slotInit() // This will prevent signals emit during tool init. @@ -162,16 +162,16 @@ void EditorTool::slotInit() d->settings->blockSignals(false); } -void EditorTool::setToolHelp(const QString& anchor) +void EditorTool::setToolHelp(const TQString& anchor) { d->helpAnchor = anchor; // TODO: use this anchor with editor Help menu } -QString EditorTool::toolHelp() const +TQString EditorTool::toolHelp() const { if (d->helpAnchor.isEmpty()) - return (name() + QString(".anchor")); + return (name() + TQString(".anchor")); return d->helpAnchor; } @@ -229,13 +229,13 @@ public: EditorToolThreaded::RenderingMode currentRenderingMode; - QString progressMess; + TQString progressMess; DImgThreadedFilter *threadedFilter; }; -EditorToolThreaded::EditorToolThreaded(QObject *parent) - : EditorTool(parent) +EditorToolThreaded::EditorToolThreaded(TQObject *tqparent) + : EditorTool(tqparent) { d = new EditorToolThreadedPriv; } @@ -251,7 +251,7 @@ EditorToolThreaded::RenderingMode EditorToolThreaded::renderingMode() const return d->currentRenderingMode; } -void EditorToolThreaded::setProgressMessage(const QString& mess) +void EditorToolThreaded::setProgressMessage(const TQString& mess) { d->progressMess = mess; } @@ -279,7 +279,7 @@ void EditorToolThreaded::slotResized() filter()->stopComputation(); } - QTimer::singleShot(0, this, SLOT(slotEffect())); + TQTimer::singleShot(0, this, TQT_SLOT(slotEffect())); } void EditorToolThreaded::slotAbort() @@ -300,7 +300,7 @@ void EditorToolThreaded::slotAbort() renderingFinished(); } -void EditorToolThreaded::customEvent(QCustomEvent *e) +void EditorToolThreaded::customEvent(TQCustomEvent *e) { if (!e) return; @@ -361,15 +361,15 @@ void EditorToolThreaded::customEvent(QCustomEvent *e) delete ed; } -void EditorToolThreaded::setToolView(QWidget *view) +void EditorToolThreaded::setToolView(TQWidget *view) { EditorTool::setToolView(view); if (dynamic_cast<ImageWidget*>(view) || dynamic_cast<ImageGuideWidget*>(view) || dynamic_cast<ImagePanelWidget*>(view)) { - connect(view, SIGNAL(signalResized()), - this, SLOT(slotResized())); + connect(view, TQT_SIGNAL(signalResized()), + this, TQT_SLOT(slotResized())); } } diff --git a/digikam/utilities/imageeditor/editor/editortool.h b/digikam/utilities/imageeditor/editor/editortool.h index e54681c..041d899 100644 --- a/digikam/utilities/imageeditor/editor/editortool.h +++ b/digikam/utilities/imageeditor/editor/editortool.h @@ -24,11 +24,11 @@ #ifndef EDITORTOOL_H #define EDITORTOOL_H -// Qt includes. +// TQt includes. -#include <qobject.h> -#include <qstring.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqpixmap.h> // Local includes. @@ -41,21 +41,22 @@ class DImgThreadedFilter; class EditorToolSettings; class EditorToolPriv; -class DIGIKAM_EXPORT EditorTool : public QObject +class DIGIKAM_EXPORT EditorTool : public TQObject { Q_OBJECT + TQ_OBJECT public: - EditorTool(QObject *parent); + EditorTool(TQObject *tqparent); virtual ~EditorTool(); void init(); - QString toolHelp() const; - QString toolName() const; - QPixmap toolIcon() const; - QWidget* toolView() const; + TQString toolHelp() const; + TQString toolName() const; + TQPixmap toolIcon() const; + TQWidget* toolView() const; EditorToolSettings* toolSettings() const; signals: @@ -65,11 +66,11 @@ signals: protected: - void setToolHelp(const QString& anchor); - void setToolName(const QString& name); - void setToolIcon(const QPixmap& icon); + void setToolHelp(const TQString& anchor); + void setToolName(const TQString& name); + void setToolIcon(const TQPixmap& icon); - virtual void setToolView(QWidget *view); + virtual void setToolView(TQWidget *view); virtual void setToolSettings(EditorToolSettings *settings); virtual void setBusy(bool); virtual void readSettings(); @@ -100,6 +101,7 @@ class EditorToolThreadedPriv; class DIGIKAM_EXPORT EditorToolThreaded : public EditorTool { Q_OBJECT + TQ_OBJECT public: @@ -112,13 +114,13 @@ public: public: - EditorToolThreaded(QObject *parent); + EditorToolThreaded(TQObject *tqparent); virtual ~EditorToolThreaded(); /** Set the small text to show in editor status progress bar during tool computation. If it's not set, tool name is used instead. */ - void setProgressMessage(const QString& mess); + void setProgressMessage(const TQString& mess); /** return the current tool rendering mode. */ @@ -133,9 +135,9 @@ protected: DImgThreadedFilter* filter() const; void setFilter(DImgThreadedFilter *filter); - void customEvent(QCustomEvent *event); + void customEvent(TQCustomEvent *event); - virtual void setToolView(QWidget *view); + virtual void setToolView(TQWidget *view); virtual void prepareEffect(){}; virtual void prepareFinal(){}; virtual void putPreviewData(){}; diff --git a/digikam/utilities/imageeditor/editor/editortooliface.cpp b/digikam/utilities/imageeditor/editor/editortooliface.cpp index 20453df..f666bbf 100644 --- a/digikam/utilities/imageeditor/editor/editortooliface.cpp +++ b/digikam/utilities/imageeditor/editor/editortooliface.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -52,7 +52,7 @@ public: tool = 0; } - QWidget *prevTab; + TQWidget *prevTab; EditorTool *tool; @@ -67,7 +67,7 @@ EditorToolIface* EditorToolIface::editorToolIface() } EditorToolIface::EditorToolIface(EditorWindow *editor) - : QObject() + : TQObject() { d = new EditorToolIfacePriv; d->editor = editor; @@ -119,7 +119,7 @@ void EditorToolIface::unLoadTool() d->tool = 0; } -void EditorToolIface::setToolStartProgress(const QString& toolName) +void EditorToolIface::setToolStartProgress(const TQString& toolName) { d->editor->setToolStartProgress(toolName); if (d->editor->editorStackView()->previewWidget()) diff --git a/digikam/utilities/imageeditor/editor/editortooliface.h b/digikam/utilities/imageeditor/editor/editortooliface.h index b00012d..f6407c7 100644 --- a/digikam/utilities/imageeditor/editor/editortooliface.h +++ b/digikam/utilities/imageeditor/editor/editortooliface.h @@ -24,9 +24,9 @@ #ifndef EDITORTOOLIFACE_H #define EDITORTOOLIFACE_H -// Qt includes. +// TQt includes. -#include <qobject.h> +#include <tqobject.h> // Local includes. @@ -39,9 +39,10 @@ class EditorTool; class EditorWindow; class EditorToolIfacePriv; -class DIGIKAM_EXPORT EditorToolIface : public QObject +class DIGIKAM_EXPORT EditorToolIface : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -55,7 +56,7 @@ public: void loadTool(EditorTool* tool); void unLoadTool(); - void setToolStartProgress(const QString& toolName); + void setToolStartProgress(const TQString& toolName); void setToolProgress(int progress); void setToolStopProgress(); diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index 43d4f5d..1d09d96 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -20,15 +20,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qhbox.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qstring.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -82,13 +82,13 @@ public: panIconView = 0; } - QHBox *btnBox1; - QHBox *btnBox2; - QHBox *btnBox3; - QHBox *guideBox; + TQHBox *btnBox1; + TQHBox *btnBox2; + TQHBox *btnBox3; + TQHBox *guideBox; - QVBox *mainVBox; - QWidget *plainPage; + TQVBox *mainVBox; + TQWidget *plainPage; KPushButton *okBtn; KPushButton *cancelBtn; @@ -104,50 +104,50 @@ public: RIntNumInput *guideSize; }; -EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *parent) - : QScrollView(parent) +EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, TQWidget *tqparent) + : TQScrollView(tqparent) { d = new EditorToolSettingsPriv; - viewport()->setBackgroundMode(Qt::PaletteBackground); - setResizePolicy(QScrollView::AutoOneFit); - setFrameStyle(QFrame::NoFrame); + viewport()->setBackgroundMode(TQt::PaletteBackground); + setResizePolicy(TQScrollView::AutoOneFit); + setFrameStyle(TQFrame::NoFrame); - d->mainVBox = new QVBox(viewport()); + d->mainVBox = new TQVBox(viewport()); addChild(d->mainVBox); // --------------------------------------------------------------- - QFrame *frame = new QFrame(d->mainVBox); - frame->setFrameStyle(QFrame::Panel|QFrame::Sunken); - QVBoxLayout* vlay = new QVBoxLayout(frame, 5, 0); + TQFrame *frame = new TQFrame(d->mainVBox); + frame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + TQVBoxLayout* vlay = new TQVBoxLayout(frame, 5, 0); d->panIconView = new ImagePanIconWidget(360, 240, frame); - QWhatsThis::add(d->panIconView, i18n("<p>Here you can see the original image panel " + TQWhatsThis::add(d->panIconView, i18n("<p>Here you can see the original image panel " "which can help you to select the clip preview." "<p>Click and drag the mouse cursor in the " "red rectangle to change the clip focus.")); - vlay->addWidget(d->panIconView, 0, Qt::AlignCenter); + vlay->addWidget(d->panIconView, 0, TQt::AlignCenter); if (!(toolMask & PanIcon)) frame->hide(); // --------------------------------------------------------------- - d->plainPage = new QWidget(d->mainVBox); - d->guideBox = new QHBox(d->mainVBox); - d->btnBox1 = new QHBox(d->mainVBox); - d->btnBox2 = new QHBox(d->mainVBox); + d->plainPage = new TQWidget(d->mainVBox); + d->guideBox = new TQHBox(d->mainVBox); + d->btnBox1 = new TQHBox(d->mainVBox); + d->btnBox2 = new TQHBox(d->mainVBox); // --------------------------------------------------------------- - new QLabel(i18n("Guide:"), d->guideBox); - QLabel *space4 = new QLabel(d->guideBox); - d->guideColorBt = new KColorButton(QColor(Qt::red), d->guideBox); - QWhatsThis::add(d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); + new TQLabel(i18n("Guide:"), d->guideBox); + TQLabel *space4 = new TQLabel(d->guideBox); + d->guideColorBt = new KColorButton(TQColor(TQt::red), d->guideBox); + TQWhatsThis::add(d->guideColorBt, i18n("<p>Set here the color used to draw guides dashed-lines.")); d->guideSize = new RIntNumInput(d->guideBox); d->guideSize->setRange(1, 5, 1); d->guideSize->setDefaultValue(1); - QWhatsThis::add(d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); + TQWhatsThis::add(d->guideSize, i18n("<p>Set here the width in pixels used to draw guides dashed-lines.")); d->guideBox->setStretchFactor(space4, 10); d->guideBox->setSpacing(spacingHint()); @@ -161,11 +161,11 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa d->defaultBtn = new KPushButton(d->btnBox1); d->defaultBtn->setGuiItem(KStdGuiItem::defaults()); d->defaultBtn->setIconSet(SmallIconSet("reload_page")); - QToolTip::add(d->defaultBtn, i18n("<p>Reset all settings to their default values.")); + TQToolTip::add(d->defaultBtn, i18n("<p>Reset all settings to their default values.")); if (!(buttonMask & Default)) d->defaultBtn->hide(); - QLabel *space = new QLabel(d->btnBox1); + TQLabel *space = new TQLabel(d->btnBox1); d->okBtn = new KPushButton(d->btnBox1); d->okBtn->setGuiItem(KStdGuiItem::ok()); @@ -189,22 +189,22 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa d->loadBtn = new KPushButton(d->btnBox2); d->loadBtn->setGuiItem(KStdGuiItem::open()); d->loadBtn->setText(i18n("Load...")); - QToolTip::add(d->loadBtn, i18n("<p>Load all parameters from settings text file.")); + TQToolTip::add(d->loadBtn, i18n("<p>Load all parameters from settings text file.")); if (!(buttonMask & Load)) d->loadBtn->hide(); d->saveAsBtn = new KPushButton(d->btnBox2); d->saveAsBtn->setGuiItem(KStdGuiItem::saveAs()); - QToolTip::add(d->saveAsBtn, i18n("<p>Save all parameters to settings text file.")); + TQToolTip::add(d->saveAsBtn, i18n("<p>Save all parameters to settings text file.")); if (!(buttonMask & SaveAs)) d->saveAsBtn->hide(); - QLabel *space2 = new QLabel(d->btnBox2); + TQLabel *space2 = new TQLabel(d->btnBox2); d->tryBtn = new KPushButton(d->btnBox2); d->tryBtn->setGuiItem(KStdGuiItem::apply()); d->tryBtn->setText(i18n("Try")); - QToolTip::add(d->tryBtn, i18n("<p>Try all settings.")); + TQToolTip::add(d->tryBtn, i18n("<p>Try all settings.")); if (!(buttonMask & Try)) d->tryBtn->hide(); @@ -217,29 +217,29 @@ EditorToolSettings::EditorToolSettings(int buttonMask, int toolMask, QWidget *pa // --------------------------------------------------------------- - connect(d->okBtn, SIGNAL(clicked()), - this, SIGNAL(signalOkClicked())); + connect(d->okBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalOkClicked())); - connect(d->cancelBtn, SIGNAL(clicked()), - this, SIGNAL(signalCancelClicked())); + connect(d->cancelBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalCancelClicked())); - connect(d->tryBtn, SIGNAL(clicked()), - this, SIGNAL(signalTryClicked())); + connect(d->tryBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalTryClicked())); - connect(d->defaultBtn, SIGNAL(clicked()), - this, SIGNAL(signalDefaultClicked())); + connect(d->defaultBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalDefaultClicked())); - connect(d->saveAsBtn, SIGNAL(clicked()), - this, SIGNAL(signalSaveAsClicked())); + connect(d->saveAsBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalSaveAsClicked())); - connect(d->loadBtn, SIGNAL(clicked()), - this, SIGNAL(signalLoadClicked())); + connect(d->loadBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalLoadClicked())); - connect(d->guideColorBt, SIGNAL(changed(const QColor&)), - this, SIGNAL(signalColorGuideChanged())); + connect(d->guideColorBt, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SIGNAL(signalColorGuideChanged())); - connect(d->guideSize, SIGNAL(valueChanged(int)), - this, SIGNAL(signalColorGuideChanged())); + connect(d->guideSize, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalColorGuideChanged())); } EditorToolSettings::~EditorToolSettings() @@ -247,15 +247,15 @@ EditorToolSettings::~EditorToolSettings() delete d; } -QSize EditorToolSettings::minimumSizeHint() const +TQSize EditorToolSettings::tqminimumSizeHint() 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. - QSize hint = QScrollView::minimumSizeHint(); - QRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox); - hint.setWidth(QMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5)); + TQSize hint = TQScrollView::tqminimumSizeHint(); + TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox); + hint.setWidth(TQMIN(d->mainVBox->tqminimumSizeHint().width(), desktopRect.width() * 2 / 5)); return hint; } @@ -269,7 +269,7 @@ int EditorToolSettings::spacingHint() return KDialog::spacingHint(); } -QWidget *EditorToolSettings::plainPage() const +TQWidget *EditorToolSettings::plainPage() const { return d->plainPage; } @@ -308,12 +308,12 @@ void EditorToolSettings::enableButton(int buttonCode, bool state) if (btn) btn->setEnabled(state); } -QColor EditorToolSettings::guideColor() const +TQColor EditorToolSettings::guideColor() const { return d->guideColorBt->color(); } -void EditorToolSettings::setGuideColor(const QColor& color) +void EditorToolSettings::setGuideColor(const TQColor& color) { d->guideColorBt->setColor(color); } diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.h b/digikam/utilities/imageeditor/editor/editortoolsettings.h index a6a515d..b2e8481 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.h +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.h @@ -23,9 +23,9 @@ #ifndef EDITORTOOLSETTINGS_H #define EDITORTOOLSETTINGS_H -// Qt includes. +// TQt includes. -#include <qscrollview.h> +#include <tqscrollview.h> // Local includes. @@ -39,9 +39,10 @@ namespace Digikam class ImagePanIconWidget; class EditorToolSettingsPriv; -class DIGIKAM_EXPORT EditorToolSettings : public QScrollView +class DIGIKAM_EXPORT EditorToolSettings : public TQScrollView { Q_OBJECT + TQ_OBJECT public: @@ -64,7 +65,7 @@ public: public: - EditorToolSettings(int buttonMask, int toolMask=NoTool, QWidget *parent=0); + EditorToolSettings(int buttonMask, int toolMask=NoTool, TQWidget *tqparent=0); ~EditorToolSettings(); virtual void setBusy(bool){}; @@ -75,10 +76,10 @@ public: int marginHint(); int spacingHint(); - QWidget *plainPage() const; + TQWidget *plainPage() const; - QColor guideColor() const; - void setGuideColor(const QColor& color); + TQColor guideColor() const; + void setGuideColor(const TQColor& color); int guideSize() const; void setGuideSize(int size); @@ -87,7 +88,7 @@ public: KPushButton* button(int buttonCode) const; void enableButton(int buttonCode, bool state); - virtual QSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; signals: diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index 2c61ea1..e3bdcdb 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -33,20 +33,20 @@ extern "C" #include <cmath> -// Qt includes. - -#include <qlabel.h> -#include <qdockarea.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qtoolbutton.h> -#include <qsplitter.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qcursor.h> -#include <qtimer.h> -#include <qfileinfo.h> +// TQt includes. + +#include <tqlabel.h> +#include <tqdockarea.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqtoolbutton.h> +#include <tqsplitter.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqfileinfo.h> // KDE includes. @@ -106,8 +106,8 @@ extern "C" #include "editorwindow.h" #include "editorwindow.moc" -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); namespace Digikam { @@ -183,104 +183,104 @@ void EditorWindow::setupStandardConnections() { // -- Canvas connections ------------------------------------------------ - connect(m_canvas, SIGNAL(signalToggleOffFitToWindow()), - this, SLOT(slotToggleOffFitToWindow())); + connect(m_canvas, TQT_SIGNAL(signalToggleOffFitToWindow()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleOffFitToWindow())); - connect(m_canvas, SIGNAL(signalShowNextImage()), - this, SLOT(slotForward())); + connect(m_canvas, TQT_SIGNAL(signalShowNextImage()), + TQT_TQOBJECT(this), TQT_SLOT(slotForward())); - connect(m_canvas, SIGNAL(signalShowPrevImage()), - this, SLOT(slotBackward())); + connect(m_canvas, TQT_SIGNAL(signalShowPrevImage()), + TQT_TQOBJECT(this), TQT_SLOT(slotBackward())); - connect(m_canvas, SIGNAL(signalRightButtonClicked()), - this, SLOT(slotContextMenu())); + connect(m_canvas, TQT_SIGNAL(signalRightButtonClicked()), + TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu())); - connect(m_stackView, SIGNAL(signalZoomChanged(bool, bool, double)), - this, SLOT(slotZoomChanged(bool, bool, double))); + connect(m_stackView, TQT_SIGNAL(signalZoomChanged(bool, bool, double)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomChanged(bool, bool, double))); - connect(m_canvas, SIGNAL(signalChanged()), - this, SLOT(slotChanged())); + connect(m_canvas, TQT_SIGNAL(signalChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotChanged())); - connect(m_canvas, SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, SLOT(slotUndoStateChanged(bool, bool, bool))); + connect(m_canvas, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotUndoStateChanged(bool, bool, bool))); - connect(m_canvas, SIGNAL(signalSelected(bool)), - this, SLOT(slotSelected(bool))); + connect(m_canvas, TQT_SIGNAL(signalSelected(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotSelected(bool))); - connect(m_canvas, SIGNAL(signalPrepareToLoad()), - this, SLOT(slotPrepareToLoad())); + connect(m_canvas, TQT_SIGNAL(signalPrepareToLoad()), + TQT_TQOBJECT(this), TQT_SLOT(slotPrepareToLoad())); - connect(m_canvas, SIGNAL(signalLoadingStarted(const QString &)), - this, SLOT(slotLoadingStarted(const QString &))); + connect(m_canvas, TQT_SIGNAL(signalLoadingStarted(const TQString &)), + TQT_TQOBJECT(this), TQT_SLOT(slotLoadingStarted(const TQString &))); - connect(m_canvas, SIGNAL(signalLoadingFinished(const QString &, bool)), - this, SLOT(slotLoadingFinished(const QString &, bool))); + connect(m_canvas, TQT_SIGNAL(signalLoadingFinished(const TQString &, bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished(const TQString &, bool))); - connect(m_canvas, SIGNAL(signalLoadingProgress(const QString &, float)), - this, SLOT(slotLoadingProgress(const QString &, float))); + connect(m_canvas, TQT_SIGNAL(signalLoadingProgress(const TQString &, float)), + TQT_TQOBJECT(this), TQT_SLOT(slotLoadingProgress(const TQString &, float))); - connect(m_canvas, SIGNAL(signalSavingStarted(const QString&)), - this, SLOT(slotSavingStarted(const QString&))); + connect(m_canvas, TQT_SIGNAL(signalSavingStarted(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(slotSavingStarted(const TQString&))); - connect(m_canvas, SIGNAL(signalSavingFinished(const QString&, bool)), - this, SLOT(slotSavingFinished(const QString&, bool))); + connect(m_canvas, TQT_SIGNAL(signalSavingFinished(const TQString&, bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotSavingFinished(const TQString&, bool))); - connect(m_canvas, SIGNAL(signalSavingProgress(const QString&, float)), - this, SLOT(slotSavingProgress(const QString&, float))); + connect(m_canvas, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), + TQT_TQOBJECT(this), TQT_SLOT(slotSavingProgress(const TQString&, float))); - connect(m_canvas, SIGNAL(signalSelectionChanged(const QRect&)), - this, SLOT(slotSelectionChanged(const QRect&))); + connect(m_canvas, TQT_SIGNAL(signalSelectionChanged(const TQRect&)), + TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged(const TQRect&))); // -- if rotating/flipping set the rotatedflipped flag to true ----------- - connect(d->rotateLeftAction, SIGNAL(activated()), - this, SLOT(slotRotatedOrFlipped())); + connect(d->rotateLeftAction, TQT_SIGNAL(activated()), + TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); - connect(d->rotateRightAction, SIGNAL(activated()), - this, SLOT(slotRotatedOrFlipped())); + connect(d->rotateRightAction, TQT_SIGNAL(activated()), + TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); - connect(d->flipHorizAction, SIGNAL(activated()), - this, SLOT(slotRotatedOrFlipped())); + connect(d->flipHorizAction, TQT_SIGNAL(activated()), + TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); - connect(d->flipVertAction, SIGNAL(activated()), - this, SLOT(slotRotatedOrFlipped())); + connect(d->flipVertAction, TQT_SIGNAL(activated()), + TQT_TQOBJECT(this), TQT_SLOT(slotRotatedOrFlipped())); // -- status bar connections -------------------------------------- - connect(m_nameLabel, SIGNAL(signalCancelButtonPressed()), - this, SLOT(slotNameLabelCancelButtonPressed())); + connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), + TQT_TQOBJECT(this), TQT_SLOT(slotNameLabelCancelButtonPressed())); - connect(m_nameLabel, SIGNAL(signalCancelButtonPressed()), - d->toolIface, SLOT(slotToolAborted())); + connect(m_nameLabel, TQT_SIGNAL(signalCancelButtonPressed()), + d->toolIface, TQT_SLOT(slotToolAborted())); } void EditorWindow::setupStandardActions() { // -- Standard 'File' menu actions --------------------------------------------- - m_backwardAction = KStdAction::back(this, SLOT(slotBackward()), + m_backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), actionCollection(), "editorwindow_backward"); - m_forwardAction = KStdAction::forward(this, SLOT(slotForward()), + m_forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()), actionCollection(), "editorwindow_forward"); m_firstAction = new KAction(i18n("&First"), "start", KStdAccel::shortcut( KStdAccel::Home), - this, SLOT(slotFirst()), + TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), actionCollection(), "editorwindow_first"); m_lastAction = new KAction(i18n("&Last"), "finish", KStdAccel::shortcut( KStdAccel::End), - this, SLOT(slotLast()), + TQT_TQOBJECT(this), TQT_SLOT(slotLast()), actionCollection(), "editorwindow_last"); - m_saveAction = KStdAction::save(this, SLOT(slotSave()), + m_saveAction = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection(), "editorwindow_save"); - m_saveAsAction = KStdAction::saveAs(this, SLOT(slotSaveAs()), + m_saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "editorwindow_saveas"); - m_revertAction = KStdAction::revert(this, SLOT(slotRevert()), + m_revertAction = KStdAction::revert(TQT_TQOBJECT(this), TQT_SLOT(slotRevert()), actionCollection(), "editorwindow_revert"); m_saveAction->setEnabled(false); @@ -289,86 +289,86 @@ void EditorWindow::setupStandardActions() d->filePrintAction = new KAction(i18n("Print Image..."), "fileprint", CTRL+Key_P, - this, SLOT(slotFilePrint()), + TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection(), "editorwindow_print"); m_fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash", Key_Delete, - this, SLOT(slotDeleteCurrentItem()), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItem()), actionCollection(), "editorwindow_delete"); - KStdAction::close(this, SLOT(close()), actionCollection(), "editorwindow_close"); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "editorwindow_close"); // -- Standard 'Edit' menu actions --------------------------------------------- - d->copyAction = KStdAction::copy(m_canvas, SLOT(slotCopy()), + d->copyAction = KStdAction::copy(TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCopy()), actionCollection(), "editorwindow_copy"); d->copyAction->setEnabled(false); m_undoAction = new KToolBarPopupAction(i18n("Undo"), "undo", KStdAccel::shortcut(KStdAccel::Undo), - m_canvas, SLOT(slotUndo()), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()), actionCollection(), "editorwindow_undo"); - connect(m_undoAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShowUndoMenu())); + connect(m_undoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowUndoMenu())); - connect(m_undoAction->popupMenu(), SIGNAL(activated(int)), - m_canvas, SLOT(slotUndo(int))); + connect(m_undoAction->popupMenu(), TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo(int))); m_undoAction->setEnabled(false); m_redoAction = new KToolBarPopupAction(i18n("Redo"), "redo", KStdAccel::shortcut(KStdAccel::Redo), - m_canvas, SLOT(slotRedo()), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()), actionCollection(), "editorwindow_redo"); - connect(m_redoAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotAboutToShowRedoMenu())); + connect(m_redoAction->popupMenu(), TQT_SIGNAL(aboutToShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowRedoMenu())); - connect(m_redoAction->popupMenu(), SIGNAL(activated(int)), - m_canvas, SLOT(slotRedo(int))); + connect(m_redoAction->popupMenu(), TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo(int))); m_redoAction->setEnabled(false); d->selectAllAction = new KAction(i18n("Select All"), 0, CTRL+Key_A, - m_canvas, - SLOT(slotSelectAll()), + TQT_TQOBJECT(m_canvas), + TQT_SLOT(slotSelectAll()), actionCollection(), "editorwindow_selectAll"); d->selectNoneAction = new KAction(i18n("Select None"), 0, CTRL+SHIFT+Key_A, - m_canvas, - SLOT(slotSelectNone()), + TQT_TQOBJECT(m_canvas), + TQT_SLOT(slotSelectNone()), actionCollection(), "editorwindow_selectNone"); // -- Standard 'View' menu actions --------------------------------------------- - d->zoomPlusAction = KStdAction::zoomIn(this, SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()), actionCollection(), "editorwindow_zoomplus"); - d->zoomMinusAction = KStdAction::zoomOut(this, SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()), actionCollection(), "editorwindow_zoomminus"); d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - this, SLOT(slotZoomTo100Percents()), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()), actionCollection(), "editorwindow_zoomto100percents"); d->zoomFitToWindowAction = new KToggleAction(i18n("Fit to &Window"), "view_fit_window", CTRL+SHIFT+Key_E, // NOTE: Gimp 2 use CTRL+SHIFT+E. - this, SLOT(slotToggleFitToWindow()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()), actionCollection(), "editorwindow_zoomfit2window"); d->zoomFitToSelectAction = new KAction(i18n("Fit to &Selection"), "viewmagfit", - ALT+CTRL+Key_S, this, SLOT(slotFitToSelect()), + ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()), actionCollection(), "editorwindow_zoomfit2select"); d->zoomFitToSelectAction->setEnabled(false); d->zoomFitToSelectAction->setWhatsThis(i18n("This option can be used to zoom the image to the " @@ -376,65 +376,65 @@ void EditorWindow::setupStandardActions() d->zoomCombo = new KComboBox(true); d->zoomCombo->setDuplicatesEnabled(false); - d->zoomCombo->setFocusPolicy(ClickFocus); - d->zoomCombo->setInsertionPolicy(QComboBox::NoInsertion); + d->zoomCombo->setFocusPolicy(TQ_ClickFocus); + d->zoomCombo->setInsertionPolicy(TQComboBox::NoInsertion); d->zoomComboAction = new KWidgetAction(d->zoomCombo, i18n("Zoom"), 0, 0, 0, actionCollection(), "editorwindow_zoomto"); - d->zoomCombo->insertItem(QString("10%")); - d->zoomCombo->insertItem(QString("25%")); - d->zoomCombo->insertItem(QString("50%")); - d->zoomCombo->insertItem(QString("75%")); - d->zoomCombo->insertItem(QString("100%")); - d->zoomCombo->insertItem(QString("150%")); - d->zoomCombo->insertItem(QString("200%")); - d->zoomCombo->insertItem(QString("300%")); - d->zoomCombo->insertItem(QString("450%")); - d->zoomCombo->insertItem(QString("600%")); - d->zoomCombo->insertItem(QString("800%")); - d->zoomCombo->insertItem(QString("1200%")); - - connect(d->zoomCombo, SIGNAL(activated(int)), - this, SLOT(slotZoomSelected()) ); - - connect(d->zoomCombo, SIGNAL(returnPressed(const QString&)), - this, SLOT(slotZoomTextChanged(const QString &)) ); + d->zoomCombo->insertItem(TQString("10%")); + d->zoomCombo->insertItem(TQString("25%")); + d->zoomCombo->insertItem(TQString("50%")); + d->zoomCombo->insertItem(TQString("75%")); + d->zoomCombo->insertItem(TQString("100%")); + d->zoomCombo->insertItem(TQString("150%")); + d->zoomCombo->insertItem(TQString("200%")); + d->zoomCombo->insertItem(TQString("300%")); + d->zoomCombo->insertItem(TQString("450%")); + d->zoomCombo->insertItem(TQString("600%")); + d->zoomCombo->insertItem(TQString("800%")); + d->zoomCombo->insertItem(TQString("1200%")); + + connect(d->zoomCombo, TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomSelected()) ); + + connect(d->zoomCombo, TQT_SIGNAL(returnPressed(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) ); // Do not use std KDE action for full screen because action text is too large for app. toolbar. m_fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen", - CTRL+SHIFT+Key_F, this, - SLOT(slotToggleFullScreen()), + CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleFullScreen()), actionCollection(), "editorwindow_fullscreen"); m_fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new KAction(i18n("Slideshow"), "slideshow", Key_F9, - this, SLOT(slotToggleSlideShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()), actionCollection(),"editorwindow_slideshow"); d->viewUnderExpoAction = new KToggleAction(i18n("Under-Exposure Indicator"), "underexposure", - Key_F10, this, - SLOT(slotToggleUnderExposureIndicator()), + Key_F10, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleUnderExposureIndicator()), actionCollection(),"editorwindow_underexposure"); d->viewOverExpoAction = new KToggleAction(i18n("Over-Exposure Indicator"), "overexposure", - Key_F11, this, - SLOT(slotToggleOverExposureIndicator()), + Key_F11, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleOverExposureIndicator()), actionCollection(),"editorwindow_overexposure"); d->viewCMViewAction = new KToggleAction(i18n("Color Managed View"), "tv", - Key_F12, this, - SLOT(slotToggleColorManagedView()), + Key_F12, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleColorManagedView()), actionCollection(),"editorwindow_cmview"); // -- Standard 'Transform' menu actions --------------------------------------------- d->resizeAction = new KAction(i18n("&Resize..."), "resize_image", 0, - this, SLOT(slotResize()), + TQT_TQOBJECT(this), TQT_SLOT(slotResize()), actionCollection(), "editorwindow_resize"); d->cropAction = new KAction(i18n("Crop"), "crop", CTRL+Key_X, - m_canvas, SLOT(slotCrop()), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCrop()), actionCollection(), "editorwindow_crop"); d->cropAction->setEnabled(false); @@ -443,13 +443,13 @@ void EditorWindow::setupStandardActions() // -- Standard 'Flip' menu actions --------------------------------------------- - d->flipHorizAction = new KAction(i18n("Flip Horizontally"), "mirror", CTRL+Key_Asterisk, - m_canvas, SLOT(slotFlipHoriz()), + d->flipHorizAction = new KAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk, + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()), actionCollection(), "editorwindow_flip_horiz"); d->flipHorizAction->setEnabled(false); - d->flipVertAction = new KAction(i18n("Flip Vertically"), "flip", CTRL+Key_Slash, - m_canvas, SLOT(slotFlipVert()), + d->flipVertAction = new KAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash, + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()), actionCollection(), "editorwindow_flip_vert"); d->flipVertAction->setEnabled(false); @@ -457,55 +457,55 @@ void EditorWindow::setupStandardActions() d->rotateLeftAction = new KAction(i18n("Rotate Left"), "rotate_ccw", SHIFT+CTRL+Key_Left, - m_canvas, SLOT(slotRotate270()), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()), actionCollection(), "editorwindow_rotate_left"); d->rotateLeftAction->setEnabled(false); d->rotateRightAction = new KAction(i18n("Rotate Right"), "rotate_cw", SHIFT+CTRL+Key_Right, - m_canvas, SLOT(slotRotate90()), + TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()), actionCollection(), "editorwindow_rotate_right"); d->rotateRightAction->setEnabled(false); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- m_themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); - connect(m_themeMenuAction, SIGNAL(activated(const QString&)), - this, SLOT(slotChangeTheme(const QString&))); + connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); // -- Standard 'Help' menu actions --------------------------------------------- d->donateMoneyAction = new KAction(i18n("Donate..."), 0, 0, - this, SLOT(slotDonateMoney()), + TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()), actionCollection(), "editorwindow_donatemoney"); d->contributeAction = new KAction(i18n("Contribute..."), 0, 0, - this, SLOT(slotContribute()), + TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), actionCollection(), "editorwindow_contribute"); d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - this, - SLOT(slotRawCameraList()), + TQT_TQOBJECT(this), + TQT_SLOT(slotRawCameraList()), actionCollection(), "editorwindow_rawcameralist"); } @@ -516,92 +516,92 @@ void EditorWindow::setupStandardAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit out of the fullscreen mode"), - Key_Escape, this, SLOT(slotEscapePressed()), + Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, this, SLOT(slotForward()), + Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, this, SLOT(slotBackward()), + SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, this, SLOT(slotBackward()), + Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, this, SLOT(slotForward()), + Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, this, SLOT(slotBackward()), + Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom In"), i18n("Zoom in on Image"), - Key_Plus, this, SLOT(slotIncreaseZoom()), + Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom Out"), i18n("Zoom out of Image"), - Key_Minus, this, SLOT(slotDecreaseZoom()), + Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()), false, true); d->accelerators->insert("Redo CTRL+Key_Y", i18n("Redo"), i18n("Redo Last action"), - CTRL+Key_Y, m_canvas, SLOT(slotRedo()), + CTRL+Key_Y, TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()), false, true); } void EditorWindow::setupStatusBar() { m_nameLabel = new StatusProgressBar(statusBar()); - m_nameLabel->setAlignment(Qt::AlignCenter); + m_nameLabel->tqsetAlignment(TQt::AlignCenter); m_nameLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(m_nameLabel, 100); - d->selectLabel = new QLabel(i18n("No selection"), statusBar()); - d->selectLabel->setAlignment(Qt::AlignCenter); + d->selectLabel = new TQLabel(i18n("No selection"), statusBar()); + d->selectLabel->tqsetAlignment(TQt::AlignCenter); d->selectLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(d->selectLabel, 100); - QToolTip::add(d->selectLabel, i18n("Information about current selection area")); + TQToolTip::add(d->selectLabel, i18n("Information about current selection area")); - m_resLabel = new QLabel(statusBar()); - m_resLabel->setAlignment(Qt::AlignCenter); + m_resLabel = new TQLabel(statusBar()); + m_resLabel->tqsetAlignment(TQt::AlignCenter); m_resLabel->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(m_resLabel, 100); - QToolTip::add(m_resLabel, i18n("Information about image size")); + TQToolTip::add(m_resLabel, i18n("Information about image size")); - d->underExposureIndicator = new QToolButton(statusBar()); + d->underExposureIndicator = new TQToolButton(statusBar()); d->underExposureIndicator->setIconSet(SmallIcon("underexposure")); d->underExposureIndicator->setToggleButton(true); statusBar()->addWidget(d->underExposureIndicator, 1); - d->overExposureIndicator = new QToolButton(statusBar()); + d->overExposureIndicator = new TQToolButton(statusBar()); d->overExposureIndicator->setIconSet(SmallIcon("overexposure")); d->overExposureIndicator->setToggleButton(true); statusBar()->addWidget(d->overExposureIndicator, 1); - d->cmViewIndicator = new QToolButton(statusBar()); + d->cmViewIndicator = new TQToolButton(statusBar()); d->cmViewIndicator->setIconSet(SmallIcon("tv")); d->cmViewIndicator->setToggleButton(true); statusBar()->addWidget(d->cmViewIndicator, 1); - connect(d->underExposureIndicator, SIGNAL(toggled(bool)), - this, SLOT(slotToggleUnderExposureIndicator())); + connect(d->underExposureIndicator, TQT_SIGNAL(toggled(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnderExposureIndicator())); - connect(d->overExposureIndicator, SIGNAL(toggled(bool)), - this, SLOT(slotToggleOverExposureIndicator())); + connect(d->overExposureIndicator, TQT_SIGNAL(toggled(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleOverExposureIndicator())); - connect(d->cmViewIndicator, SIGNAL(toggled(bool)), - this, SLOT(slotToggleColorManagedView())); + connect(d->cmViewIndicator, TQT_SIGNAL(toggled(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleColorManagedView())); } void EditorWindow::printImage(KURL url) @@ -618,22 +618,22 @@ void EditorWindow::printImage(KURL url) DImg image(w, h, sixteenBit, hasAlpha, ptr); KPrinter printer; - QString appName = KApplication::kApplication()->aboutData()->appName(); + TQString appName = KApplication::kApplication()->aboutData()->appName(); printer.setDocName( url.filename() ); printer.setCreator( appName ); #if KDE_IS_VERSION(3,2,0) printer.setUsePrinterResolution(true); #endif - KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, (appName.append(" page")).ascii() )); + KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, TQString(appName.append(" page")).ascii() )); - if ( printer.setup( this, i18n("Print %1").arg(printer.docName().section('/', -1)) ) ) + if ( printer.setup( this, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) { ImagePrint printOperations(image, printer, url.filename()); - if (!printOperations.printImageWithQt()) + if (!printOperations.printImageWithTQt()) { KMessageBox::error(this, i18n("Failed to print file: '%1'") - .arg(url.filename())); + .tqarg(url.filename())); } } } @@ -643,7 +643,7 @@ void EditorWindow::slotEditKeys() KKeyDialog dialog(true, this); dialog.insert( actionCollection(), i18n( "General" ) ); - QPtrList<ImagePlugin> pluginList = ImagePluginLoader::instance()->pluginList(); + TQPtrList<ImagePlugin> pluginList = ImagePluginLoader::instance()->pluginList(); for (ImagePlugin* plugin = pluginList.first(); plugin; plugin = pluginList.next()) @@ -666,13 +666,13 @@ void EditorWindow::slotResize() void EditorWindow::slotAboutToShowUndoMenu() { m_undoAction->popupMenu()->clear(); - QStringList titles; + TQStringList titles; m_canvas->getUndoHistory(titles); if(!titles.isEmpty()) { int id = 1; - QStringList::Iterator iter = titles.begin(); + TQStringList::Iterator iter = titles.begin(); for(; iter != titles.end(); ++iter,++id) { m_undoAction->popupMenu()->insertItem(*iter, id); @@ -683,13 +683,13 @@ void EditorWindow::slotAboutToShowUndoMenu() void EditorWindow::slotAboutToShowRedoMenu() { m_redoAction->popupMenu()->clear(); - QStringList titles; + TQStringList titles; m_canvas->getRedoHistory(titles); if(!titles.isEmpty()) { int id = 1; - QStringList::Iterator iter = titles.begin(); + TQStringList::Iterator iter = titles.begin(); for(; iter != titles.end(); ++iter,++id) { m_redoAction->popupMenu()->insertItem(*iter, id); @@ -702,8 +702,8 @@ void EditorWindow::slotConfToolbars() saveMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -749,12 +749,12 @@ void EditorWindow::slotZoomTo100Percents() void EditorWindow::slotZoomSelected() { - QString txt = d->zoomCombo->currentText(); - txt = txt.left(txt.find('%')); + TQString txt = d->zoomCombo->currentText(); + txt = txt.left(txt.tqfind('%')); slotZoomTextChanged(txt); } -void EditorWindow::slotZoomTextChanged(const QString &txt) +void EditorWindow::slotZoomTextChanged(const TQString &txt) { bool r = false; double zoom = KGlobal::locale()->readNumber(txt, &r) / 100.0; @@ -768,7 +768,7 @@ void EditorWindow::slotZoomChanged(bool isMax, bool isMin, double zoom) d->zoomMinusAction->setEnabled(!isMin); d->zoomCombo->blockSignals(true); - d->zoomCombo->setCurrentText(QString::number(lround(zoom*100.0)) + QString("%")); + d->zoomCombo->setCurrentText(TQString::number(lround(zoom*100.0)) + TQString("%")); d->zoomCombo->blockSignals(false); } @@ -795,7 +795,7 @@ void EditorWindow::plugActionAccel(KAction* action) action->whatsThis(), action->shortcut(), action, - SLOT(activate())); + TQT_SLOT(activate())); } void EditorWindow::unplugActionAccel(KAction* action) @@ -805,7 +805,7 @@ void EditorWindow::unplugActionAccel(KAction* action) void EditorWindow::loadImagePlugins() { - QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); + TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); for (ImagePlugin* plugin = pluginList.first(); plugin; plugin = pluginList.next()) @@ -822,7 +822,7 @@ void EditorWindow::loadImagePlugins() void EditorWindow::unLoadImagePlugins() { - QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); + TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); for (ImagePlugin* plugin = pluginList.first(); plugin; plugin = pluginList.next()) @@ -867,10 +867,10 @@ void EditorWindow::applyStandardSettings() d->ICCSettings->BPCSetting = config->readBoolEntry("BPCAlgorithm",false); d->ICCSettings->managedViewSetting = config->readBoolEntry("ManagedView", false); d->ICCSettings->renderingSetting = config->readNumEntry("RenderingIntent"); - d->ICCSettings->inputSetting = config->readPathEntry("InProfileFile", QString()); - d->ICCSettings->workspaceSetting = config->readPathEntry("WorkProfileFile", QString()); - d->ICCSettings->monitorSetting = config->readPathEntry("MonitorProfileFile", QString()); - d->ICCSettings->proofSetting = config->readPathEntry("ProofProfileFile", QString()); + d->ICCSettings->inputSetting = config->readPathEntry("InProfileFile", TQString()); + d->ICCSettings->workspaceSetting = config->readPathEntry("WorkProfileFile", TQString()); + d->ICCSettings->monitorSetting = config->readPathEntry("MonitorProfileFile", TQString()); + d->ICCSettings->proofSetting = config->readPathEntry("ProofProfileFile", TQString()); d->viewCMViewAction->setEnabled(d->ICCSettings->enableCMSetting); d->viewCMViewAction->setChecked(d->ICCSettings->managedViewSetting); @@ -936,11 +936,11 @@ void EditorWindow::applyStandardSettings() // -- GUI Settings ------------------------------------------------------- - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); if(config->hasKey("Splitter Sizes")) m_splitter->setSizes(config->readIntListEntry("Splitter Sizes")); else - m_canvas->setSizePolicy(rightSzPolicy); + m_canvas->tqsetSizePolicy(rightSzPolicy); d->fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false); @@ -948,8 +948,8 @@ void EditorWindow::applyStandardSettings() // -- Exposure Indicators Settings --------------------------------------- - QColor black(Qt::black); - QColor white(Qt::white); + TQColor black(TQt::black); + TQColor white(TQt::white); d->exposureSettings->underExposureIndicator = config->readBoolEntry("UnderExposureIndicator", false); d->exposureSettings->overExposureIndicator = config->readBoolEntry("OverExposureIndicator", false); d->exposureSettings->underExposureColor = config->readColorEntry("UnderExposureColor", &white); @@ -1024,7 +1024,7 @@ void EditorWindow::toggleStandardActions(bool val) m_redoAction->setEnabled(val); } - QPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); + TQPtrList<ImagePlugin> pluginList = m_imagePluginLoader->pluginList(); for (ImagePlugin* plugin = pluginList.first(); plugin; plugin = pluginList.next()) @@ -1042,11 +1042,7 @@ void EditorWindow::slotToggleFullScreen() { m_canvas->setBackgroundColor(m_bgColor); -#if QT_VERSION >= 0x030300 setWindowState( windowState() & ~WindowFullScreen ); -#else - showNormal(); -#endif menuBar()->show(); statusBar()->show(); leftDock()->show(); @@ -1054,11 +1050,11 @@ void EditorWindow::slotToggleFullScreen() topDock()->show(); bottomDock()->show(); - QObject* obj = child("ToolBar","KToolBar"); + TQObject* obj = child("ToolBar","KToolBar"); if (obj) { - KToolBar* toolBar = static_cast<KToolBar*>(obj); + KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj)); if (m_fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton) m_fullScreenAction->unplug(toolBar); @@ -1090,7 +1086,7 @@ void EditorWindow::slotToggleFullScreen() } else // go to fullscreen { - m_canvas->setBackgroundColor(QColor(Qt::black)); + m_canvas->setBackgroundColor(TQColor(TQt::black)); // hide the menubar and the statusbar menuBar()->hide(); @@ -1100,11 +1096,11 @@ void EditorWindow::slotToggleFullScreen() rightDock()->hide(); bottomDock()->hide(); - QObject* obj = child("ToolBar","KToolBar"); + TQObject* obj = child("ToolBar","KToolBar"); if (obj) { - KToolBar* toolBar = static_cast<KToolBar*>(obj); + KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj)); if (d->fullScreenHideToolBar) { @@ -1157,21 +1153,21 @@ void EditorWindow::slotRotatedOrFlipped() m_rotatedOrFlipped = true; } -void EditorWindow::slotLoadingProgress(const QString&, float progress) +void EditorWindow::slotLoadingProgress(const TQString&, float progress) { m_nameLabel->setProgressValue((int)(progress*100.0)); } -void EditorWindow::slotSavingProgress(const QString&, float progress) +void EditorWindow::slotSavingProgress(const TQString&, float progress) { m_nameLabel->setProgressValue((int)(progress*100.0)); } bool EditorWindow::promptForOverWrite() { - QFileInfo fi(m_canvas->currentImageFilePath()); - QString warnMsg(i18n("About to overwrite file \"%1\"\nAre you sure?") - .arg(fi.fileName())); + TQFileInfo fi(m_canvas->currentImageFilePath()); + TQString warnMsg(i18n("About to overwrite file \"%1\"\nAre you sure?") + .tqarg(fi.fileName())); return (KMessageBox::warningContinueCancel(this, warnMsg, i18n("Warning"), @@ -1193,8 +1189,8 @@ 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?") - .arg(url.filename()), - QString(), + .tqarg(url.filename()), + TQString(), KStdGuiItem::save(), KStdGuiItem::discard()); @@ -1257,10 +1253,10 @@ bool EditorWindow::waitForSavingToComplete() void EditorWindow::enter_loop() { - QWidget dummy(0, 0, WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0, 0, WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -1280,21 +1276,21 @@ void EditorWindow::slotSelected(bool val) } } - QRect sel = m_canvas->getSelectedArea(); + TQRect sel = m_canvas->getSelectedArea(); // Update histogram into sidebar. emit signalSelectionChanged(sel); // Update status bar if (val) - d->selectLabel->setText(QString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y()) - .arg(sel.width()).arg(sel.height())); + d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y()) + .tqarg(sel.width()).tqarg(sel.height())); else d->selectLabel->setText(i18n("No selection")); } void EditorWindow::hideToolBars() { - QPtrListIterator<KToolBar> it = toolBarIterator(); + TQPtrListIterator<KToolBar> it = toolBarIterator(); KToolBar* bar; for(;it.current()!=0L; ++it) @@ -1310,7 +1306,7 @@ void EditorWindow::hideToolBars() void EditorWindow::showToolBars() { - QPtrListIterator<KToolBar> it = toolBarIterator(); + TQPtrListIterator<KToolBar> it = toolBarIterator(); KToolBar* bar; for( ; it.current()!=0L ; ++it) @@ -1332,14 +1328,14 @@ void EditorWindow::slotPrepareToLoad() slotUpdateItemInfo(); } -void EditorWindow::slotLoadingStarted(const QString& /*filename*/) +void EditorWindow::slotLoadingStarted(const TQString& /*filename*/) { setCursor( KCursor::waitCursor() ); m_nameLabel->progressBarMode(StatusProgressBar::ProgressBarMode, i18n("Loading: ")); } -void EditorWindow::slotLoadingFinished(const QString& filename, bool success) +void EditorWindow::slotLoadingFinished(const TQString& filename, bool success) { m_nameLabel->progressBarMode(StatusProgressBar::TextMode); slotUpdateItemInfo(); @@ -1351,10 +1347,10 @@ void EditorWindow::slotLoadingFinished(const QString& filename, bool success) unsetCursor(); // Note: in showfoto, we using a null filename to clear canvas. - if (!success && filename != QString()) + if (!success && filename != TQString()) { - QFileInfo fi(filename); - QString message = i18n("Failed to load image \"%1\"").arg(fi.fileName()); + TQFileInfo fi(filename); + TQString message = i18n("Failed to load image \"%1\"").tqarg(fi.fileName()); KMessageBox::error(this, message); DWarning() << "Failed to load image " << fi.fileName() << endl; } @@ -1381,7 +1377,7 @@ void EditorWindow::slotSave() save(); } -void EditorWindow::slotSavingStarted(const QString& /*filename*/) +void EditorWindow::slotSavingStarted(const TQString& /*filename*/) { setCursor( KCursor::waitCursor() ); @@ -1392,7 +1388,7 @@ void EditorWindow::slotSavingStarted(const QString& /*filename*/) m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, i18n("Saving: ")); } -void EditorWindow::slotSavingFinished(const QString& filename, bool success) +void EditorWindow::slotSavingFinished(const TQString& filename, bool success) { if (m_savingContext->savingState == SavingContextContainer::SavingStateSave) { @@ -1404,8 +1400,8 @@ void EditorWindow::slotSavingFinished(const QString& filename, bool success) if (!m_savingContext->abortingSaving) { KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".") - .arg(m_savingContext->destinationURL.filename()) - .arg(m_savingContext->destinationURL.path())); + .tqarg(m_savingContext->destinationURL.filename()) + .tqarg(m_savingContext->destinationURL.path())); } finishSaving(false); return; @@ -1445,8 +1441,8 @@ void EditorWindow::slotSavingFinished(const QString& filename, bool success) if (!m_savingContext->abortingSaving) { KMessageBox::error(this, i18n("Failed to save file\n\"%1\"\nto\n\"%2\".") - .arg(m_savingContext->destinationURL.filename()) - .arg(m_savingContext->destinationURL.path())); + .tqarg(m_savingContext->destinationURL.filename()) + .tqarg(m_savingContext->destinationURL.path())); } finishSaving(false); return; @@ -1485,9 +1481,9 @@ void EditorWindow::finishSaving(bool success) m_savingContext->saveTempFile = 0; } - // Exit of internal Qt event loop to unlock promptUserSave() method. + // Exit of internal TQt event loop to unlock promptUserSave() method. if (m_savingContext->synchronizingState == SavingContextContainer::SynchronousSaving) - qApp->exit_loop(); + tqApp->exit_loop(); // Enable actions as appropriate after saving toggleActions(true); @@ -1532,7 +1528,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) if (m_savingContext->savingState != SavingContextContainer::SavingStateNone) return false; - QString mimetypes = KImageIO::mimeTypes(KImageIO::Writing).join(" "); + TQString mimetypes = KImageIO::mimeTypes(KImageIO::Writing).join(" "); mimetypes.append(" image/tiff"); DDebug () << "mimetypes=" << mimetypes << endl; @@ -1540,18 +1536,18 @@ bool EditorWindow::startingSaveAs(const KURL& url) FileSaveOptionsBox *options = new FileSaveOptionsBox(); KFileDialog imageFileSaveDialog(m_savingContext->srcURL.isLocalFile() ? - m_savingContext->srcURL.directory() : QDir::homeDirPath(), - QString(), + m_savingContext->srcURL.directory() : TQDir::homeDirPath(), + TQString(), this, "imageFileSaveDialog", false, options); - connect(&imageFileSaveDialog, SIGNAL(filterChanged(const QString &)), - options, SLOT(slotImageFileFormatChanged(const QString &))); + connect(&imageFileSaveDialog, TQT_SIGNAL(filterChanged(const TQString &)), + options, TQT_SLOT(slotImageFileFormatChanged(const TQString &))); - connect(&imageFileSaveDialog, SIGNAL(fileSelected(const QString &)), - options, SLOT(slotImageFileSelected(const QString &))); + connect(&imageFileSaveDialog, TQT_SIGNAL(fileSelected(const TQString &)), + options, TQT_SLOT(slotImageFileSelected(const TQString &))); ImageDialogPreview *preview = new ImageDialogPreview(&imageFileSaveDialog); imageFileSaveDialog.setPreviewWidget(preview); @@ -1560,11 +1556,11 @@ bool EditorWindow::startingSaveAs(const KURL& url) imageFileSaveDialog.setCaption(i18n("New Image File Name")); imageFileSaveDialog.setFilter(mimetypes); - QFileInfo info(m_savingContext->srcURL.fileName()); + TQFileInfo info(m_savingContext->srcURL.fileName()); KConfig* config = kapp->config(); config->setGroup("ImageViewer Settings"); - QString ext = config->readEntry("LastSavedImageTypeMime", "png"); - QString fileName = info.baseName(false) + QString(".") + ext; + TQString ext = config->readEntry("LastSavedImageTypeMime", "png"); + TQString fileName = info.baseName(false) + TQString(".") + ext; imageFileSaveDialog.setSelection(fileName); // Start dialog and check if canceled. @@ -1584,36 +1580,36 @@ bool EditorWindow::startingSaveAs(const KURL& url) { // Else, check if target image format have been add to target image file name using extension. - QFileInfo fi(newURL.path()); + TQFileInfo fi(newURL.path()); m_savingContext->format = fi.extension(false); if ( m_savingContext->format.isEmpty() ) { // If format is empty then file format is same as that of the original file. - m_savingContext->format = QImageIO::imageFormat(m_savingContext->srcURL.path()); + m_savingContext->format = TQImageIO::imageFormat(m_savingContext->srcURL.path()); } else { // Else, check if format from file name extension is include on file mime type list. - QString imgExtPattern; - QStringList imgExtList = QStringList::split(" ", mimetypes); - for (QStringList::ConstIterator it = imgExtList.begin() ; it != imgExtList.end() ; ++it) + TQString imgExtPattern; + TQStringList imgExtList = TQStringList::split(" ", mimetypes); + for (TQStringList::ConstIterator it = imgExtList.begin() ; it != imgExtList.end() ; ++it) { imgExtPattern.append (KImageIO::typeForMime(*it).upper()); imgExtPattern.append (" "); } imgExtPattern.append (" TIF TIFF"); - if ( imgExtPattern.contains("JPEG") ) + if ( imgExtPattern.tqcontains("JPEG") ) { imgExtPattern.append (" JPG"); imgExtPattern.append (" JPE"); } - if ( !imgExtPattern.contains( m_savingContext->format.upper() ) ) + if ( !imgExtPattern.tqcontains( m_savingContext->format.upper() ) ) { KMessageBox::error(this, i18n("Target image file format \"%1\" unsupported.") - .arg(m_savingContext->format)); + .tqarg(m_savingContext->format)); DWarning() << k_funcinfo << "target image file format " << m_savingContext->format << " unsupported!" << endl; return false; } @@ -1623,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\".") - .arg(newURL.filename()) - .arg(newURL.path().section('/', -2, -2))); + .tqarg(newURL.filename()) + .tqarg(newURL.path().section('/', -2, -2))); DWarning() << k_funcinfo << "target URL is not valid !" << endl; return false; } @@ -1646,7 +1642,7 @@ bool EditorWindow::startingSaveAs(const KURL& url) // Check for overwrite ---------------------------------------------------------- - QFileInfo fi(newURL.path()); + TQFileInfo fi(newURL.path()); m_savingContext->destinationExisted = fi.exists(); if ( m_savingContext->destinationExisted ) { @@ -1655,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?") - .arg(newURL.filename()), + .tqarg(newURL.filename()), i18n("Overwrite File?"), i18n("Overwrite"), KStdGuiItem::cancel() ); @@ -1691,7 +1687,7 @@ bool EditorWindow::checkPermissions(const KURL& url) //TODO: Check that the permissions can actually be changed // if write permissions are not available. - QFileInfo fi(url.path()); + TQFileInfo fi(url.path()); if (fi.exists() && !fi.isWritable()) { @@ -1701,7 +1697,7 @@ bool EditorWindow::checkPermissions(const KURL& url) "for the file named \"%1\". " "Are you sure you want " "to overwrite it?") - .arg(url.filename()), + .tqarg(url.filename()), i18n("Overwrite File?"), i18n("Overwrite"), KStdGuiItem::cancel() ); @@ -1715,7 +1711,7 @@ bool EditorWindow::checkPermissions(const KURL& url) bool EditorWindow::moveFile() { - QCString dstFileName = QFile::encodeName(m_savingContext->destinationURL.path()); + TQCString dstFileName = TQFile::encodeName(m_savingContext->destinationURL.path()); // Store old permissions: // Just get the current umask. @@ -1737,7 +1733,7 @@ bool EditorWindow::moveFile() } // rename tmp file to dest - if (::rename(QFile::encodeName(m_savingContext->saveTempFile->name()), dstFileName) != 0) + if (::rename(TQFile::encodeName(m_savingContext->saveTempFile->name()), dstFileName) != 0) { KMessageBox::error(this, i18n("Failed to overwrite original file"), i18n("Error Saving File")); @@ -1781,8 +1777,8 @@ void EditorWindow::slotToggleColorManagedView() void EditorWindow::setColorManagedViewIndicatorToolTip(bool available, bool cmv) { - QToolTip::remove(d->cmViewIndicator); - QString tooltip; + TQToolTip::remove(d->cmViewIndicator); + TQString tooltip; if (available) { if (cmv) @@ -1794,7 +1790,7 @@ void EditorWindow::setColorManagedViewIndicatorToolTip(bool available, bool cmv) { tooltip = i18n("Color Management is not configured, so the Color Managed View is not available"); } - QToolTip::add(d->cmViewIndicator, tooltip); + TQToolTip::add(d->cmViewIndicator, tooltip); } void EditorWindow::slotToggleUnderExposureIndicator() @@ -1813,8 +1809,8 @@ void EditorWindow::slotToggleUnderExposureIndicator() void EditorWindow::setUnderExposureToolTip(bool uei) { - QToolTip::remove(d->underExposureIndicator); - QToolTip::add(d->underExposureIndicator, + TQToolTip::remove(d->underExposureIndicator); + TQToolTip::add(d->underExposureIndicator, uei ? i18n("Under-Exposure indicator is enabled") : i18n("Under-Exposure indicator is disabled")); } @@ -1835,8 +1831,8 @@ void EditorWindow::slotToggleOverExposureIndicator() void EditorWindow::setOverExposureToolTip(bool oei) { - QToolTip::remove(d->overExposureIndicator); - QToolTip::add(d->overExposureIndicator, + TQToolTip::remove(d->overExposureIndicator); + TQToolTip::add(d->overExposureIndicator, oei ? i18n("Over-Exposure indicator is enabled") : i18n("Over-Exposure indicator is disabled")); } @@ -1869,10 +1865,10 @@ void EditorWindow::slotToggleSlideShow() slideShow(startWithCurrent, settings); } -void EditorWindow::slotSelectionChanged(const QRect& sel) +void EditorWindow::slotSelectionChanged(const TQRect& sel) { - d->selectLabel->setText(QString("(%1, %2) (%3 x %4)").arg(sel.x()).arg(sel.y()) - .arg(sel.width()).arg(sel.height())); + d->selectLabel->setText(TQString("(%1, %2) (%3 x %4)").tqarg(sel.x()).tqarg(sel.y()) + .tqarg(sel.width()).tqarg(sel.height())); } void EditorWindow::slotRawCameraList() @@ -1883,10 +1879,10 @@ void EditorWindow::slotRawCameraList() void EditorWindow::slotThemeChanged() { - QStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.findIndex(ThemeEngine::instance()->getCurrentThemeName()); + TQStringList themes(ThemeEngine::instance()->themeNames()); + int index = themes.tqfindIndex(ThemeEngine::instance()->getCurrentThemeName()); if (index == -1) - index = themes.findIndex(i18n("Default")); + index = themes.tqfindIndex(i18n("Default")); m_themeMenuAction->setCurrentItem(index); @@ -1894,22 +1890,22 @@ void EditorWindow::slotThemeChanged() config->setGroup("ImageViewer Settings"); if (!config->readBoolEntry("UseThemeBackgroundColor", true)) - m_bgColor = config->readColorEntry("BackgroundColor", &Qt::black); + m_bgColor = config->readColorEntry("BackgroundColor", &TQt::black); else m_bgColor = ThemeEngine::instance()->baseColor(); m_canvas->setBackgroundColor(m_bgColor); } -void EditorWindow::slotChangeTheme(const QString& theme) +void EditorWindow::slotChangeTheme(const TQString& theme) { ThemeEngine::instance()->slotChangeTheme(theme); } -void EditorWindow::setToolStartProgress(const QString& toolName) +void EditorWindow::setToolStartProgress(const TQString& toolName) { m_nameLabel->setProgressValue(0); - m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, QString("%1: ").arg(toolName)); + m_nameLabel->progressBarMode(StatusProgressBar::CancelProgressBarMode, TQString("%1: ").tqarg(toolName)); } void EditorWindow::setToolProgress(int progress) diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/digikam/utilities/imageeditor/editor/editorwindow.h index 6cb20cf..160f543 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.h +++ b/digikam/utilities/imageeditor/editor/editorwindow.h @@ -24,11 +24,11 @@ #ifndef EDITORWINDOW_H #define EDITORWINDOW_H -// Qt includes. +// TQt includes. -#include <qcolor.h> -#include <qstring.h> -#include <qrect.h> +#include <tqcolor.h> +#include <tqstring.h> +#include <tqrect.h> // KDE includes. @@ -40,9 +40,9 @@ #include "sidebar.h" #include "digikam_export.h" -class QSplitter; -class QPopupMenu; -class QLabel; +class TQSplitter; +class TQPopupMenu; +class TQLabel; class KToolBarPopupAction; class KToggleAction; @@ -66,6 +66,7 @@ class EditorWindowPriv; class DIGIKAM_EXPORT EditorWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -77,7 +78,7 @@ public: signals: - void signalSelectionChanged( const QRect & ); + void signalSelectionChanged( const TQRect & ); void signalNoCurrentItem(); protected: @@ -87,11 +88,11 @@ protected: bool m_rotatedOrFlipped; bool m_setExifOrientationTag; - QLabel *m_resLabel; + TQLabel *m_resLabel; - QColor m_bgColor; + TQColor m_bgColor; - QSplitter *m_splitter; + TQSplitter *m_splitter; KAction *m_saveAction; KAction *m_saveAsAction; @@ -188,19 +189,19 @@ protected slots: void slotSelected(bool); - void slotLoadingProgress(const QString& filePath, float progress); - void slotSavingProgress(const QString& filePath, float progress); + void slotLoadingProgress(const TQString& filePath, float progress); + void slotSavingProgress(const TQString& filePath, float progress); void slotNameLabelCancelButtonPressed(); void slotThemeChanged(); - virtual void slotLoadingStarted(const QString& filename); - virtual void slotLoadingFinished(const QString &filename, bool success); - virtual void slotSavingStarted(const QString &filename); + virtual void slotLoadingStarted(const TQString& filename); + virtual void slotLoadingFinished(const TQString &filename, bool success); + virtual void slotSavingStarted(const TQString &filename); virtual void slotSetup(){ setup(); }; - virtual void slotChangeTheme(const QString& theme); + virtual void slotChangeTheme(const TQString& theme); virtual void slotFilePrint()=0; virtual void slotDeleteCurrentItem()=0; @@ -219,15 +220,15 @@ private slots: void slotToggleOverExposureIndicator(); void slotToggleColorManagedView(); void slotRotatedOrFlipped(); - void slotSavingFinished(const QString &filename, bool success); + void slotSavingFinished(const TQString &filename, bool success); void slotDonateMoney(); void slotContribute(); void slotToggleSlideShow(); void slotZoomTo100Percents(); void slotZoomSelected(); - void slotZoomTextChanged(const QString &); + void slotZoomTextChanged(const TQString &); void slotZoomChanged(bool isMax, bool isMin, double zoom); - void slotSelectionChanged(const QRect& sel); + void slotSelectionChanged(const TQRect& sel); void slotToggleFitToWindow(); void slotToggleOffFitToWindow(); void slotFitToSelect(); @@ -246,7 +247,7 @@ private: void setUnderExposureToolTip(bool uei); void setOverExposureToolTip(bool oei); - void setToolStartProgress(const QString& toolName); + void setToolStartProgress(const TQString& toolName); void setToolProgress(int progress); void setToolStopProgress(); diff --git a/digikam/utilities/imageeditor/editor/editorwindowprivate.h b/digikam/utilities/imageeditor/editor/editorwindowprivate.h index e66504e..51265b9 100644 --- a/digikam/utilities/imageeditor/editor/editorwindowprivate.h +++ b/digikam/utilities/imageeditor/editor/editorwindowprivate.h @@ -25,8 +25,8 @@ #ifndef EDITORWINDOWPRIVATE_H #define EDITORWINDOWPRIVATE_H -class QToolButton; -class QLabel; +class TQToolButton; +class TQLabel; class KComboBox; class KAction; @@ -94,11 +94,11 @@ public: bool removeFullScreenButton; bool fullScreenHideToolBar; - QLabel *selectLabel; + TQLabel *selectLabel; - QToolButton *cmViewIndicator; - QToolButton *underExposureIndicator; - QToolButton *overExposureIndicator; + TQToolButton *cmViewIndicator; + TQToolButton *underExposureIndicator; + TQToolButton *overExposureIndicator; KAction *rawCameraListAction; KAction *donateMoneyAction; diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index 600482c..d6134b3 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -22,13 +22,13 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qsize.h> -#include <qpixmap.h> -#include <qbitmap.h> -#include <qpainter.h> +#include <tqwidget.h> +#include <tqsize.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqpainter.h> // Local includes. @@ -67,9 +67,9 @@ public: int previewWidth; int previewHeight; - QPixmap qcheck; - QPixmap qpix; - QBitmap qmask; + TQPixmap qcheck; + TQPixmap qpix; + TQBitmap qtqmask; DImg previewImage; DImg targetPreviewImage; @@ -86,15 +86,15 @@ ImageIface::ImageIface(int w, int h) d->originalHeight = DImgInterface::defaultInterface()->origHeight(); d->originalBytesDepth = DImgInterface::defaultInterface()->bytesDepth(); - d->qpix.setMask(d->qmask); + d->qpix.setMask(d->qtqmask); d->qcheck.resize(8, 8); - QPainter p; + TQPainter p; p.begin(&d->qcheck); - p.fillRect(0, 0, 4, 4, QColor(144,144,144)); - p.fillRect(4, 4, 4, 4, QColor(144,144,144)); - p.fillRect(0, 4, 4, 4, QColor(100,100,100)); - p.fillRect(4, 0, 4, 4, QColor(100,100,100)); + p.fillRect(0, 0, 4, 4, TQColor(144,144,144)); + p.fillRect(4, 4, 4, 4, TQColor(144,144,144)); + p.fillRect(0, 4, 4, 4, TQColor(100,100,100)); + p.fillRect(4, 0, 4, 4, TQColor(100,100,100)); p.end(); } @@ -113,7 +113,7 @@ bool ImageIface::previewType() return d->usePreviewSelection; } -DColor ImageIface::getColorInfoFromOriginalImage(const QPoint& point) +DColor ImageIface::getColorInfoFromOriginalImage(const TQPoint& point) { if ( !DImgInterface::defaultInterface()->getImage() || point.x() > originalWidth() || point.y() > originalHeight() ) { @@ -124,7 +124,7 @@ DColor ImageIface::getColorInfoFromOriginalImage(const QPoint& point) return DImgInterface::defaultInterface()->getImg()->getPixelColor(point.x(), point.y()); } -DColor ImageIface::getColorInfoFromPreviewImage(const QPoint& point) +DColor ImageIface::getColorInfoFromPreviewImage(const TQPoint& point) { if ( d->previewImage.isNull() || point.x() > previewWidth() || point.y() > previewHeight() ) { @@ -135,7 +135,7 @@ DColor ImageIface::getColorInfoFromPreviewImage(const QPoint& point) return d->previewImage.getPixelColor(point.x(), point.y()); } -DColor ImageIface::getColorInfoFromTargetPreviewImage(const QPoint& point) +DColor ImageIface::getColorInfoFromTargetPreviewImage(const TQPoint& point) { if ( d->targetPreviewImage.isNull() || point.x() > previewWidth() || point.y() > previewHeight() ) { @@ -189,8 +189,8 @@ uchar* ImageIface::getPreviewImage() const } } - QSize sz(im->width(), im->height()); - sz.scale(d->constrainWidth, d->constrainHeight, QSize::ScaleMin); + TQSize sz(im->width(), im->height()); + sz.tqscale(d->constrainWidth, d->constrainHeight, TQSize::ScaleMin); d->previewImage = im->smoothScale(sz.width(), sz.height()); d->previewWidth = d->previewImage.width(); @@ -199,7 +199,7 @@ uchar* ImageIface::getPreviewImage() const // only create another copy if needed, in putPreviewImage d->targetPreviewImage = d->previewImage; - d->qmask.resize(d->previewWidth, d->previewHeight); + d->qtqmask.resize(d->previewWidth, d->previewHeight); d->qpix.resize(d->previewWidth, d->previewHeight); if (d->usePreviewSelection) @@ -248,7 +248,7 @@ void ImageIface::putPreviewImage(uchar* data) } } -void ImageIface::putOriginalImage(const QString &caller, uchar* data, int w, int h) +void ImageIface::putOriginalImage(const TQString &caller, uchar* data, int w, int h) { if (!data) return; @@ -256,12 +256,12 @@ void ImageIface::putOriginalImage(const QString &caller, uchar* data, int w, int DImgInterface::defaultInterface()->putImage(caller, data, w, h); } -void ImageIface::setEmbeddedICCToOriginalImage(const QString& profilePath) +void ImageIface::setEmbeddedICCToOriginalImage(const TQString& profilePath) { DImgInterface::defaultInterface()->setEmbeddedICCToOriginalImage( profilePath ); } -void ImageIface::putImageSelection(const QString &caller, uchar* data) +void ImageIface::putImageSelection(const TQString &caller, uchar* data) { if (!data) return; @@ -358,22 +358,22 @@ void ImageIface::convertOriginalColorDepth(int depth) DImgInterface::defaultInterface()->convertDepth(depth); } -QPixmap ImageIface::convertToPixmap(DImg& img) +TQPixmap ImageIface::convertToPixmap(DImg& img) { return DImgInterface::defaultInterface()->convertToPixmap(img); } -QByteArray ImageIface::getEmbeddedICCFromOriginalImage() +TQByteArray ImageIface::getEmbeddedICCFromOriginalImage() { return DImgInterface::defaultInterface()->getEmbeddedICC(); } -QByteArray ImageIface::getExifFromOriginalImage() +TQByteArray ImageIface::getExifFromOriginalImage() { return DImgInterface::defaultInterface()->getExif(); } -QByteArray ImageIface::getIptcFromOriginalImage() +TQByteArray ImageIface::getIptcFromOriginalImage() { return DImgInterface::defaultInterface()->getIptc(); } @@ -386,19 +386,19 @@ PhotoInfoContainer ImageIface::getPhotographInformations() const return meta.getPhotographInformations(); } -void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h, +void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h, bool underExposure, bool overExposure) { if ( !d->targetPreviewImage.isNull() ) { if (d->targetPreviewImage.hasAlpha()) { - QPainter p(&d->qpix); + TQPainter p(&d->qpix); p.drawTiledPixmap(0, 0, d->qpix.width(), d->qpix.height(), d->qcheck); p.end(); } - QPixmap pixImage; + TQPixmap pixImage; ICCSettingsContainer *iccSettings = DImgInterface::defaultInterface()->getICCSettings(); if (iccSettings) @@ -420,7 +420,7 @@ void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h, pixImage = d->targetPreviewImage.convertToPixmap(); } - bitBlt(&d->qpix, 0, 0, &pixImage, 0, 0, w, h, Qt::CopyROP, false); + bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixImage), 0, 0, w, h, TQt::CopyROP, false); // Show the Over/Under exposure pixels indicators @@ -432,13 +432,13 @@ void ImageIface::paint(QPaintDevice* device, int x, int y, int w, int h, expoSettings.underExposureColor = DImgInterface::defaultInterface()->underExposureColor(); expoSettings.overExposureColor = DImgInterface::defaultInterface()->overExposureColor(); - QImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings); - QPixmap pixMask(pureColorMask); - bitBlt(&d->qpix, 0, 0, &pixMask, 0, 0, w, h, Qt::CopyROP, false); + TQImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings); + TQPixmap pixMask(pureColorMask); + bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixMask), 0, 0, w, h, TQt::CopyROP, false); } } - bitBlt(device, x, y, &d->qpix, 0, 0, -1, -1, Qt::CopyROP, false); + bitBlt(TQT_TQPAINTDEVICE(device), x, y, TQT_TQPAINTDEVICE(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false); } } // namespace Digikam diff --git a/digikam/utilities/imageeditor/editor/imageiface.h b/digikam/utilities/imageeditor/editor/imageiface.h index 61d752b..70e1a3e 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.h +++ b/digikam/utilities/imageeditor/editor/imageiface.h @@ -25,10 +25,10 @@ #ifndef IMAGEIFACE_H #define IMAGEIFACE_H -// Qt includes. +// TQt includes. -#include <qglobal.h> -#include <qstring.h> +#include <tqglobal.h> +#include <tqstring.h> // KDE includes. @@ -41,11 +41,11 @@ #include "photoinfocontainer.h" #include "digikam_export.h" -#define MAX3(a, b, c) (QMAX(QMAX(a,b),b)) -#define MIN3(a, b, c) (QMIN(QMIN(a,b),b)) +#define MAX3(a, b, c) (TQMAX(TQMAX(a,b),b)) +#define MIN3(a, b, c) (TQMIN(TQMIN(a,b),b)) #define ROUND(x) ((int) ((x) + 0.5)) -class QPaintDevice; +class TQPaintDevice; namespace Digikam { @@ -102,12 +102,12 @@ public: If w == -1 and h == -1, the size is unchanged. Caller is an i18n'ed string that will be shown as the undo/redo action name. */ - void putOriginalImage(const QString &caller, uchar* data, int w=-1, int h=-1); + void putOriginalImage(const TQString &caller, uchar* data, int w=-1, int h=-1); /** Embed the Color Profile we have used in ICC plugin when this option is selected */ - void setEmbeddedICCToOriginalImage(const QString& profilePath); + void setEmbeddedICCToOriginalImage(const TQString& profilePath); /** Replace the data of the current original image selection with the given data. The characteristics of the data must match the characteristics of the current @@ -116,7 +116,7 @@ public: No ownership of the data pointer is assumed. Caller is an i18n'ed string that will be shown as the undo/redo action name. */ - void putImageSelection(const QString &caller, uchar* data); + void putImageSelection(const TQString &caller, uchar* data); /** Replace the stored target preview data with the given data. The characteristics of the data must match the characteristics of the current @@ -132,9 +132,9 @@ public: or target preview (set by putPreviewImage) image. */ - DColor getColorInfoFromOriginalImage(const QPoint& point); - DColor getColorInfoFromPreviewImage(const QPoint& point); - DColor getColorInfoFromTargetPreviewImage(const QPoint& point); + DColor getColorInfoFromOriginalImage(const TQPoint& point); + DColor getColorInfoFromPreviewImage(const TQPoint& point); + DColor getColorInfoFromTargetPreviewImage(const TQPoint& point); /** Original image information.*/ int originalWidth(); @@ -143,9 +143,9 @@ public: bool originalHasAlpha(); /** Original image metadata.*/ - QByteArray getEmbeddedICCFromOriginalImage(); - QByteArray getExifFromOriginalImage(); - QByteArray getIptcFromOriginalImage(); + TQByteArray getEmbeddedICCFromOriginalImage(); + TQByteArray getExifFromOriginalImage(); + TQByteArray getIptcFromOriginalImage(); /** Get photograph information from original image.*/ PhotoInfoContainer getPhotographInformations() const; @@ -179,13 +179,13 @@ public: /** Convert a DImg image to a pixmap for screen using color managemed view if necessary */ - QPixmap convertToPixmap(DImg& img); + TQPixmap convertToPixmap(DImg& img); /** Paint the current target preview image (or the preview image, if putPreviewImage has not been called) on the given paint device. at x|y, with given maximum width and height. */ - void paint(QPaintDevice* device, int x, int y, int w, int h, + void paint(TQPaintDevice* device, int x, int y, int w, int h, bool underExposure=false, bool overExposure=false); private: diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index d17c6c0..c026568 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -26,15 +26,15 @@ #include <cstdio> -// Qt includes. +// TQt includes. -#include <qcursor.h> -#include <qtimer.h> -#include <qlabel.h> -#include <qimage.h> -#include <qsplitter.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqimage.h> +#include <tqsplitter.h> +#include <tqpainter.h> +#include <tqpixmap.h> // KDE includes. @@ -217,7 +217,7 @@ Sidebar* ImageWindow::rightSideBar() const return dynamic_cast<Sidebar*>(d->rightSidebar); } -void ImageWindow::closeEvent(QCloseEvent* e) +void ImageWindow::closeEvent(TQCloseEvent* e) { if (!e) return; @@ -253,30 +253,30 @@ void ImageWindow::setupConnections() // To toggle properly keyboards shortcuts from comments & tags side bar tab. - connect(d->rightSidebar, SIGNAL(signalNextItem()), - this, SLOT(slotForward())); + connect(d->rightSidebar, TQT_SIGNAL(signalNextItem()), + TQT_TQOBJECT(this), TQT_SLOT(slotForward())); - connect(d->rightSidebar, SIGNAL(signalPrevItem()), - this, SLOT(slotBackward())); + connect(d->rightSidebar, TQT_SIGNAL(signalPrevItem()), + TQT_TQOBJECT(this), TQT_SLOT(slotBackward())); - connect(this, SIGNAL(signalSelectionChanged( const QRect &)), - d->rightSidebar, SLOT(slotImageSelectionChanged( const QRect &))); + connect(this, TQT_SIGNAL(signalSelectionChanged( const TQRect &)), + d->rightSidebar, TQT_SLOT(slotImageSelectionChanged( const TQRect &))); - connect(this, SIGNAL(signalNoCurrentItem()), - d->rightSidebar, SLOT(slotNoCurrentItem())); + connect(this, TQT_SIGNAL(signalNoCurrentItem()), + d->rightSidebar, TQT_SLOT(slotNoCurrentItem())); ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, SIGNAL(signalFileMetadataChanged(const KURL &)), - this, SLOT(slotFileMetadataChanged(const KURL &))); + connect(watch, TQT_SIGNAL(signalFileMetadataChanged(const KURL &)), + TQT_TQOBJECT(this), TQT_SLOT(slotFileMetadataChanged(const KURL &))); } void ImageWindow::setupUserArea() { - QWidget* widget = new QWidget(this); - QHBoxLayout *lay = new QHBoxLayout(widget); + TQWidget* widget = new TQWidget(this); + TQHBoxLayout *lay = new TQHBoxLayout(widget); - m_splitter = new QSplitter(widget); + m_splitter = new TQSplitter(widget); m_stackView = new EditorStackView(m_splitter); m_canvas = new Canvas(m_stackView); m_stackView->setCanvas(m_canvas); @@ -284,17 +284,17 @@ void ImageWindow::setupUserArea() m_canvas->makeDefaultEditingCanvas(); - QSizePolicy rightSzPolicy(QSizePolicy::Preferred, QSizePolicy::Expanding, 2, 1); - m_canvas->setSizePolicy(rightSzPolicy); + TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1); + m_canvas->tqsetSizePolicy(rightSzPolicy); d->rightSidebar = new ImagePropertiesSideBarDB(widget, "ImageEditor Right Sidebar", m_splitter, Sidebar::Right, true); lay->addWidget(m_splitter); lay->addWidget(d->rightSidebar); - m_splitter->setFrameStyle( QFrame::NoFrame ); - m_splitter->setFrameShadow( QFrame::Plain ); - m_splitter->setFrameShape( QFrame::NoFrame ); + m_splitter->setFrameStyle( TQFrame::NoFrame ); + m_splitter->setFrameShadow( TQFrame::Plain ); + m_splitter->setFrameShape( TQFrame::NoFrame ); m_splitter->setOpaqueResize(false); setCentralWidget(widget); } @@ -312,22 +312,22 @@ void ImageWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - this, SLOT(slotAssignRatingNoStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingNoStar()), actionCollection(), "imageview_ratenostar"); d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - this, SLOT(slotAssignRatingOneStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingOneStar()), actionCollection(), "imageview_rateonestar"); d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - this, SLOT(slotAssignRatingTwoStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingTwoStar()), actionCollection(), "imageview_ratetwostar"); d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - this, SLOT(slotAssignRatingThreeStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingThreeStar()), actionCollection(), "imageview_ratethreestar"); d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - this, SLOT(slotAssignRatingFourStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFourStar()), actionCollection(), "imageview_ratefourstar"); d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - this, SLOT(slotAssignRatingFiveStar()), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFiveStar()), actionCollection(), "imageview_ratefivestar"); // -- Special Delete actions --------------------------------------------------------------- @@ -336,8 +336,8 @@ void ImageWindow::setupActions() d->fileDeletePermanentlyAction = new KAction(i18n("Delete File Permanently"), "editdelete", SHIFT+Key_Delete, - this, - SLOT(slotDeleteCurrentItemPermanently()), + TQT_TQOBJECT(this), + TQT_SLOT(slotDeleteCurrentItemPermanently()), actionCollection(), "image_delete_permanently"); @@ -346,16 +346,16 @@ void ImageWindow::setupActions() d->fileDeletePermanentlyDirectlyAction = new KAction(i18n("Delete Permanently without Confirmation"), "editdelete", 0, - this, - SLOT(slotDeleteCurrentItemPermanentlyDirectly()), + TQT_TQOBJECT(this), + TQT_SLOT(slotDeleteCurrentItemPermanentlyDirectly()), actionCollection(), "image_delete_permanently_directly"); d->fileTrashDirectlyAction = new KAction(i18n("Move to Trash without Confirmation"), "edittrash", 0, - this, - SLOT(slotTrashCurrentItemDirectly()), + TQT_TQOBJECT(this), + TQT_SLOT(slotTrashCurrentItemDirectly()), actionCollection(), "image_trash_directly"); @@ -384,7 +384,7 @@ void ImageWindow::refreshView() } void ImageWindow::loadURL(const KURL::List& urlList, const KURL& urlCurrent, - const QString& caption, bool allowSaving) + const TQString& caption, bool allowSaving) { if (!promptUserSave(d->urlCurrent)) return; @@ -398,7 +398,7 @@ void ImageWindow::loadURL(const KURL::List& urlList, const KURL& urlCurrent, } void ImageWindow::loadImageInfos(const ImageInfoList &imageInfoList, ImageInfo *imageInfoCurrent, - const QString& caption, bool allowSaving) + const TQString& caption, bool allowSaving) { // The ownership of objects of imageInfoList is passed to us. // imageInfoCurrent is contained in imageInfoList. @@ -433,7 +433,7 @@ void ImageWindow::loadImageInfos(const ImageInfoList &imageInfoList, ImageInfo * loadCurrentList(caption, allowSaving); } -void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving) +void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving) { // this method contains the code shared by loadURL and loadImageInfos @@ -444,7 +444,7 @@ void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving) } if (!caption.isEmpty()) - setCaption(i18n("Image Editor - %1").arg(caption)); + setCaption(i18n("Image Editor - %1").tqarg(caption)); else setCaption(i18n("Image Editor")); @@ -455,12 +455,12 @@ void ImageWindow::loadCurrentList(const QString& caption, bool allowSaving) m_undoAction->setEnabled(false); m_redoAction->setEnabled(false); - QTimer::singleShot(0, this, SLOT(slotLoadCurrent())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadCurrent())); } void ImageWindow::slotLoadCurrent() { - KURL::List::iterator it = d->urlList.find(d->urlCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); if (it != d->urlList.end()) { @@ -487,8 +487,8 @@ void ImageWindow::slotForward() if(!promptUserSave(d->urlCurrent)) return; - KURL::List::iterator it = d->urlList.find(d->urlCurrent); - int index = d->imageInfoList.find(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + int index = d->imageInfoList.tqfind(d->imageInfoCurrent); if (it != d->urlList.end()) { @@ -507,8 +507,8 @@ void ImageWindow::slotBackward() if(!promptUserSave(d->urlCurrent)) return; - KURL::List::iterator it = d->urlList.find(d->urlCurrent); - int index = d->imageInfoList.find(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + int index = d->imageInfoList.tqfind(d->imageInfoCurrent); if (it != d->urlList.begin()) { @@ -556,8 +556,8 @@ void ImageWindow::slotContextMenu() { // Bulk assignment/removal of tags -------------------------- - Q_LLONG id = d->imageInfoCurrent->id(); - QValueList<Q_LLONG> idList; + TQ_LLONG id = d->imageInfoCurrent->id(); + TQValueList<TQ_LLONG> idList; idList.append(id); assignTagsMenu = new TagsPopupMenu(idList, 1000, TagsPopupMenu::ASSIGN); @@ -568,11 +568,11 @@ void ImageWindow::slotContextMenu() m_contextMenu->insertItem(i18n("Assign Tag"), assignTagsMenu); int i = m_contextMenu->insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -584,13 +584,13 @@ void ImageWindow::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, SIGNAL(activated(int)), - this, SLOT(slotAssignRating(int))); + connect(ratingMenu, TQT_SIGNAL(activated(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotAssignRating(int))); m_contextMenu->insertItem(i18n("Assign Rating"), ratingMenu); } - m_contextMenu->exec(QCursor::pos()); + m_contextMenu->exec(TQCursor::pos()); if (separatorID1 != -1) m_contextMenu->removeItem(separatorID1); @@ -605,11 +605,11 @@ void ImageWindow::slotContextMenu() void ImageWindow::slotChanged() { - QString mpixels; - QSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); + TQString mpixels; + TQSize dims(m_canvas->imageWidth(), m_canvas->imageHeight()); mpixels.setNum(dims.width()*dims.height()/1000000.0, 'f', 2); - QString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") - .arg(dims.width()).arg(dims.height()).arg(mpixels); + TQString str = (!dims.isValid()) ? i18n("Unknown") : i18n("%1x%2 (%3Mpx)") + .tqarg(dims.width()).tqarg(dims.height()).tqarg(mpixels); m_resLabel->setText(str); if (d->urlCurrent.isValid()) @@ -699,7 +699,7 @@ void ImageWindow::slotAssignRatingFiveStar() void ImageWindow::slotAssignRating(int rating) { - rating = QMIN(RatingMax, QMAX(RatingMin, rating)); + rating = TQMIN(RatingMax, TQMAX(RatingMin, rating)); if (d->imageInfoCurrent) { MetadataHub hub; @@ -712,13 +712,13 @@ void ImageWindow::slotAssignRating(int rating) void ImageWindow::slotUpdateItemInfo() { - uint index = d->urlList.findIndex(d->urlCurrent); + uint index = d->urlList.tqfindIndex(d->urlCurrent); m_rotatedOrFlipped = false; - QString text = d->urlCurrent.filename() + i18n(" (%2 of %3)") - .arg(QString::number(index+1)) - .arg(QString::number(d->urlList.count())); + TQString text = d->urlCurrent.filename() + i18n(" (%2 of %3)") + .tqarg(TQString::number(index+1)) + .tqarg(TQString::number(d->urlList.count())); m_nameLabel->setText(text); if (d->urlList.count() == 1) @@ -769,7 +769,7 @@ bool ImageWindow::setup(bool iccSetupPage) { Setup setup(this, 0, iccSetupPage ? Setup::IccProfiles : Setup::LastPageUsed); - if (setup.exec() != QDialog::Accepted) + if (setup.exec() != TQDialog::Accepted) return false; kapp->config()->sync(); @@ -799,7 +799,7 @@ void ImageWindow::saveIsComplete() emit signalFileModified(m_savingContext->destinationURL); // all that is done in slotLoadCurrent, except for loading - KURL::List::iterator it = d->urlList.find(d->urlCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); setViewToURL(*it); if (++it != d->urlList.end()) @@ -817,10 +817,10 @@ void ImageWindow::saveAsIsComplete() // Find the src and dest albums ------------------------------------------ - KURL srcDirURL(QDir::cleanDirPath(m_savingContext->srcURL.directory())); + KURL srcDirURL(TQDir::cleanDirPath(m_savingContext->srcURL.directory())); PAlbum* srcAlbum = AlbumManager::instance()->findPAlbum(srcDirURL); - KURL dstDirURL(QDir::cleanDirPath(m_savingContext->destinationURL.directory())); + KURL dstDirURL(TQDir::cleanDirPath(m_savingContext->destinationURL.directory())); PAlbum* dstAlbum = AlbumManager::instance()->findPAlbum(dstDirURL); if (dstAlbum && srcAlbum) @@ -829,10 +829,10 @@ void ImageWindow::saveAsIsComplete() ImageInfo newInfo(d->imageInfoCurrent->copyItem(dstAlbum, m_savingContext->destinationURL.fileName())); - if ( d->urlList.find(m_savingContext->destinationURL) == d->urlList.end() ) + if ( d->urlList.tqfind(m_savingContext->destinationURL) == d->urlList.end() ) { // The image file did not exist in the list. - KURL::List::iterator it = d->urlList.find(m_savingContext->srcURL); - int index = d->urlList.findIndex(m_savingContext->srcURL); + KURL::List::iterator it = d->urlList.tqfind(m_savingContext->srcURL); + int index = d->urlList.tqfindIndex(m_savingContext->srcURL); d->urlList.insert(it, m_savingContext->destinationURL); d->imageInfoCurrent = new ImageInfo(newInfo); d->imageInfoList.insert(index, d->imageInfoCurrent); @@ -845,7 +845,7 @@ void ImageWindow::saveAsIsComplete() { d->imageInfoCurrent = new ImageInfo(newInfo); // setAutoDelete is true - d->imageInfoList.replace(d->imageInfoList.at(), d->imageInfoCurrent); + d->imageInfoList.tqreplace(d->imageInfoList.at(), d->imageInfoCurrent); break; } } @@ -869,7 +869,7 @@ void ImageWindow::saveAsIsComplete() emit signalFileAdded(m_savingContext->destinationURL); // all that is done in slotLoadCurrent, except for loading - KURL::List::iterator it = d->urlList.find(d->urlCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); if (it != d->urlList.end()) { @@ -987,7 +987,7 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently) if (!SyncJob::del(kioURL, useTrash)) { - QString errMsg(SyncJob::lastErrorMsg()); + TQString errMsg(SyncJob::lastErrorMsg()); KMessageBox::error(this, errMsg, errMsg); return; } @@ -995,8 +995,8 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently) emit signalFileDeleted(d->urlCurrent); KURL CurrentToRemove = d->urlCurrent; - KURL::List::iterator it = d->urlList.find(d->urlCurrent); - int index = d->imageInfoList.find(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + int index = d->imageInfoList.tqfind(d->imageInfoCurrent); if (it != d->urlList.end()) { @@ -1110,7 +1110,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings) } } - m_nameLabel->progressBarMode(StatusProgressBar::TextMode, QString()); + m_nameLabel->progressBarMode(StatusProgressBar::TextMode, TQString()); if (!m_cancelSlideShow) { @@ -1125,11 +1125,11 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings) } } -void ImageWindow::dragMoveEvent(QDragMoveEvent *e) +void ImageWindow::dragMoveEvent(TQDragMoveEvent *e) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; @@ -1144,11 +1144,11 @@ void ImageWindow::dragMoveEvent(QDragMoveEvent *e) e->ignore(); } -void ImageWindow::dropEvent(QDropEvent *e) +void ImageWindow::dropEvent(TQDropEvent *e) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; @@ -1156,7 +1156,7 @@ void ImageWindow::dropEvent(QDropEvent *e) { ImageInfoList imageInfoList; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -1169,7 +1169,7 @@ void ImageWindow::dropEvent(QDropEvent *e) return; } - QString ATitle; + TQString ATitle; AlbumManager* man = AlbumManager::instance(); PAlbum* palbum = man->findPAlbum(albumIDs.first()); if (palbum) ATitle = palbum->title(); @@ -1178,16 +1178,16 @@ void ImageWindow::dropEvent(QDropEvent *e) if (talbum) ATitle = talbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").arg(ATitle), true); + i18n("Album \"%1\"").tqarg(ATitle), true); e->accept(); } else if (AlbumDrag::decode(e, urls, albumID)) { AlbumManager* man = AlbumManager::instance(); - QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInAlbum(albumID); + TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInAlbum(albumID); ImageInfoList imageInfoList; - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -1200,26 +1200,26 @@ void ImageWindow::dropEvent(QDropEvent *e) return; } - QString ATitle; + TQString ATitle; PAlbum* palbum = man->findPAlbum(albumIDs.first()); if (palbum) ATitle = palbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").arg(ATitle), true); + i18n("Album \"%1\"").tqarg(ATitle), true); e->accept(); } else if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; AlbumManager* man = AlbumManager::instance(); - QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); + TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); ImageInfoList imageInfoList; - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -1232,12 +1232,12 @@ void ImageWindow::dropEvent(QDropEvent *e) return; } - QString ATitle; + TQString ATitle; TAlbum* talbum = man->findTAlbum(tagID); if (talbum) ATitle = talbum->title(); loadImageInfos(imageInfoList, imageInfoList.first(), - i18n("Album \"%1\"").arg(ATitle), true); + i18n("Album \"%1\"").tqarg(ATitle), true); e->accept(); } else @@ -1254,7 +1254,7 @@ void ImageWindow::slotRevert() m_canvas->slotRestore(); } -void ImageWindow::slotChangeTheme(const QString& theme) +void ImageWindow::slotChangeTheme(const TQString& theme) { AlbumSettings::instance()->setCurrentTheme(theme); ThemeEngine::instance()->slotChangeTheme(theme); diff --git a/digikam/utilities/imageeditor/editor/imagewindow.h b/digikam/utilities/imageeditor/editor/imagewindow.h index c9f9e62..7416a82 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.h +++ b/digikam/utilities/imageeditor/editor/imagewindow.h @@ -25,9 +25,9 @@ #ifndef IMAGEWINDOW_H #define IMAGEWINDOW_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -38,8 +38,8 @@ #include "editorwindow.h" #include "imageinfo.h" -class QDragMoveEvent; -class QDropEvent; +class TQDragMoveEvent; +class TQDropEvent; namespace Digikam { @@ -51,18 +51,19 @@ class SlideShowSettings; class ImageWindow : public EditorWindow { Q_OBJECT + TQ_OBJECT public: ~ImageWindow(); void loadURL(const KURL::List& urlList, const KURL& urlCurrent, - const QString& caption=QString(), + const TQString& caption=TQString(), bool allowSaving=true); void loadImageInfos(const ImageInfoList &imageInfoList, ImageInfo *imageInfoCurrent, - const QString& caption, bool allowSaving); + const TQString& caption, bool allowSaving); static ImageWindow* imagewindow(); static bool imagewindowCreated(); @@ -82,11 +83,11 @@ signals: private: - void loadCurrentList(const QString& caption, bool allowSaving); - void closeEvent(QCloseEvent* e); + void loadCurrentList(const TQString& caption, bool allowSaving); + void closeEvent(TQCloseEvent* e); - void dragMoveEvent(QDragMoveEvent *e); - void dropEvent(QDropEvent *e); + void dragMoveEvent(TQDragMoveEvent *e); + void dropEvent(TQDropEvent *e); void setupActions(); void setupConnections(); @@ -140,7 +141,7 @@ private slots: void slotAssignRating(int rating); void slotFileMetadataChanged(const KURL &); - void slotChangeTheme(const QString& theme); + void slotChangeTheme(const TQString& theme); private: diff --git a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h index 2ada4bd..b240a10 100644 --- a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h +++ b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h @@ -25,9 +25,9 @@ #ifndef SAVINGCONTEXTCONTAINER_H #define SAVINGCONTEXTCONTAINER_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -75,8 +75,8 @@ public: bool destinationExisted; bool abortingSaving; - QString originalFormat; - QString format; + TQString originalFormat; + TQString format; KURL srcURL; KURL destinationURL; diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp index 30f0a4e..dcce284 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp @@ -20,12 +20,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqstring.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> // KDE includes. @@ -68,8 +68,8 @@ public: RawPreview *previewWidget; }; -RawImport::RawImport(const KURL& url, QObject *parent) - : EditorToolThreaded(parent) +RawImport::RawImport(const KURL& url, TQObject *tqparent) + : EditorToolThreaded(tqparent) { d = new RawImportPriv; d->previewWidget = new RawPreview(url, 0); @@ -95,32 +95,32 @@ void RawImport::slotInit() // --------------------------------------------------------------- - connect(d->previewWidget, SIGNAL(signalLoadingStarted()), - this, SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), + this, TQT_SLOT(slotLoadingStarted())); - connect(d->previewWidget, SIGNAL(signalDemosaicedImage()), - this, SLOT(slotDemosaicedImage())); + connect(d->previewWidget, TQT_SIGNAL(signalDemosaicedImage()), + this, TQT_SLOT(slotDemosaicedImage())); - connect(d->previewWidget, SIGNAL(signalLoadingStarted()), - this, SLOT(slotLoadingStarted())); + connect(d->previewWidget, TQT_SIGNAL(signalLoadingStarted()), + this, TQT_SLOT(slotLoadingStarted())); - connect(d->previewWidget, SIGNAL(signalLoadingProgress(float)), - this, SLOT(slotLoadingProgress(float))); + connect(d->previewWidget, TQT_SIGNAL(signalLoadingProgress(float)), + this, TQT_SLOT(slotLoadingProgress(float))); - connect(d->previewWidget, SIGNAL(signalLoadingFailed()), - this, SLOT(slotLoadingFailed())); + connect(d->previewWidget, TQT_SIGNAL(signalLoadingFailed()), + this, TQT_SLOT(slotLoadingFailed())); - connect(d->settingsBox, SIGNAL(signalDemosaicingChanged()), - this, SLOT(slotDemosaicingChanged())); + connect(d->settingsBox, TQT_SIGNAL(signalDemosaicingChanged()), + this, TQT_SLOT(slotDemosaicingChanged())); - connect(d->settingsBox, SIGNAL(signalPostProcessingChanged()), - this, SLOT(slotTimer())); + connect(d->settingsBox, TQT_SIGNAL(signalPostProcessingChanged()), + this, TQT_SLOT(slotTimer())); - connect(d->settingsBox, SIGNAL(signalUpdatePreview()), - this, SLOT(slotUpdatePreview())); + connect(d->settingsBox, TQT_SIGNAL(signalUpdatePreview()), + this, TQT_SLOT(slotUpdatePreview())); - connect(d->settingsBox, SIGNAL(signalAbortPreview()), - this, SLOT(slotAbort())); + connect(d->settingsBox, TQT_SIGNAL(signalAbortPreview()), + this, TQT_SLOT(slotAbort())); // --------------------------------------------------------------- diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.h b/digikam/utilities/imageeditor/rawimport/rawimport.h index 15da997..4f865d6 100644 --- a/digikam/utilities/imageeditor/rawimport/rawimport.h +++ b/digikam/utilities/imageeditor/rawimport/rawimport.h @@ -46,10 +46,11 @@ class RawImportPriv; class DIGIKAM_EXPORT RawImport : public EditorToolThreaded { Q_OBJECT + TQ_OBJECT public: - RawImport(const KURL& url, QObject *parent); + RawImport(const KURL& url, TQObject *tqparent); ~RawImport(); DRawDecoding rawDecodingSettings(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp index de6d6c5..08c5d25 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.cpp @@ -35,18 +35,18 @@ namespace Digikam { -RawPostProcessing::RawPostProcessing(DImg *orgImage, QObject *parent, const DRawDecoding& settings) - : DImgThreadedFilter(orgImage, parent, "RawPostProcessing") +RawPostProcessing::RawPostProcessing(DImg *orgImage, TQObject *tqparent, const DRawDecoding& settings) + : DImgThreadedFilter(orgImage, tqparent, "RawPostProcessing") { m_customRawSettings = settings; initFilter(); } -RawPostProcessing::RawPostProcessing(DImgThreadedFilter *parentFilter, +RawPostProcessing::RawPostProcessing(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin, int progressEnd, const DRawDecoding& settings) - : DImgThreadedFilter(parentFilter, orgImage, destImage, progressBegin, progressEnd, - parentFilter->filterName() + ": RawPostProcessing") + : DImgThreadedFilter(tqparentFilter, orgImage, destImage, progressBegin, progressEnd, + tqparentFilter->filterName() + ": RawPostProcessing") { m_customRawSettings = settings; filterImage(); diff --git a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h index d9ee96e..ea1339e 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h +++ b/digikam/utilities/imageeditor/rawimport/rawpostprocessing.h @@ -40,10 +40,10 @@ class DIGIKAM_EXPORT RawPostProcessing : public DImgThreadedFilter public: - RawPostProcessing(DImg *orgImage, QObject *parent=0, const DRawDecoding& settings=DRawDecoding()); + RawPostProcessing(DImg *orgImage, TQObject *tqparent=0, const DRawDecoding& settings=DRawDecoding()); // Constructor for slave mode: execute immediately in current thread with specified master filter - RawPostProcessing(DImgThreadedFilter *parentFilter, const DImg &orgImage, const DImg &destImage, + RawPostProcessing(DImgThreadedFilter *tqparentFilter, const DImg &orgImage, const DImg &destImage, int progressBegin=0, int progressEnd=100, const DRawDecoding& settings=DRawDecoding()); ~RawPostProcessing(){}; diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp index 3cac33f..f3a995a 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp @@ -21,14 +21,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qpainter.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qpixmap.h> -#include <qfileinfo.h> +#include <tqstring.h> +#include <tqpainter.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqpixmap.h> +#include <tqfileinfo.h> // KDE includes. @@ -66,7 +66,7 @@ public: double currentFitWindowZoom; - QToolButton *cornerButton; + TQToolButton *cornerButton; KPopupFrame *panIconPopup; @@ -85,35 +85,35 @@ public: LoadingDescription loadingDesc; }; -RawPreview::RawPreview(const KURL& url, QWidget *parent) - : PreviewWidget(parent) +RawPreview::RawPreview(const KURL& url, TQWidget *tqparent) + : PreviewWidget(tqparent) { d = new RawPreviewPriv; d->thread = new ManagedLoadSaveThread; d->url = url; setMinimumWidth(500); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - d->cornerButton = new QToolButton(this); + d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); d->cornerButton->hide(); - QToolTip::add(d->cornerButton, i18n("Pan the image to a region")); + TQToolTip::add(d->cornerButton, i18n("Pan the image to a region")); setCornerWidget(d->cornerButton); // ------------------------------------------------------------ - connect(d->thread, SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), - this, SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); + connect(d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription&, const DImg&)), + this, TQT_SLOT(slotImageLoaded(const LoadingDescription&, const DImg&))); - connect(d->thread, SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), - this, SLOT(slotLoadingProgress(const LoadingDescription&, float))); + connect(d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription&, float)), + this, TQT_SLOT(slotLoadingProgress(const LoadingDescription&, float))); - connect(d->cornerButton, SIGNAL(pressed()), - this, SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(slotCornerButtonPressed())); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -179,14 +179,14 @@ void RawPreview::slotImageLoaded(const LoadingDescription& description, const DI if (image.isNull()) { - QPixmap pix(visibleWidth(), visibleHeight()); + TQPixmap pix(visibleWidth(), visibleHeight()); pix.fill(ThemeEngine::instance()->baseColor()); - QPainter p(&pix); - p.setPen(QPen(ThemeEngine::instance()->textRegColor())); + TQPainter p(&pix); + p.setPen(TQPen(ThemeEngine::instance()->textRegColor())); p.drawText(0, 0, pix.width(), pix.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Cannot decode RAW image for\n\"%1\"") - .arg(QFileInfo(d->loadingDesc.filePath).fileName())); + .tqarg(TQFileInfo(d->loadingDesc.filePath).fileName())); p.end(); // three copies - but the image is small setPostProcessedImage(DImg(pix.convertToImage())); @@ -219,21 +219,21 @@ void RawPreview::slotCornerButtonPressed() pan->setImage(180, 120, postProcessedImage()); d->panIconPopup->setMainWidget(pan); - QRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), + TQRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), (int)(visibleWidth() / zoomFactor()), (int)(visibleHeight() / zoomFactor())); pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotPanIconSelectionMoved(const QRect&, bool))); + connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, SIGNAL(signalHiden()), - this, SLOT(slotPanIconHiden())); + connect(pan, TQT_SIGNAL(signalHiden()), + this, TQT_SLOT(slotPanIconHiden())); - QPoint g = mapToGlobal(viewport()->pos()); + TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); g.setY(g.y()+ viewport()->size().height()); - d->panIconPopup->popup(QPoint(g.x() - d->panIconPopup->width(), + d->panIconPopup->popup(TQPoint(g.x() - d->panIconPopup->width(), g.y() - d->panIconPopup->height())); pan->setCursorToLocalRegionSelectionCenter(); @@ -246,7 +246,7 @@ void RawPreview::slotPanIconHiden() d->cornerButton->blockSignals(false); } -void RawPreview::slotPanIconSelectionMoved(const QRect& r, bool b) +void RawPreview::slotPanIconSelectionMoved(const TQRect& r, bool b) { setContentsPos((int)(r.x()*zoomFactor()), (int)(r.y()*zoomFactor())); @@ -271,11 +271,11 @@ void RawPreview::zoomFactorChanged(double zoom) PreviewWidget::zoomFactorChanged(zoom); } -void RawPreview::resizeEvent(QResizeEvent* e) +void RawPreview::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); if (!d->loadingDesc.filePath.isEmpty()) d->cornerButton->hide(); @@ -326,10 +326,10 @@ void RawPreview::resetPreview() updateZoomAndSize(false); } -void RawPreview::paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh) +void RawPreview::paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh) { DImg img = d->postProcessedImg.smoothScaleSection(sx, sy, sw, sh, tileSize(), tileSize()); - QPixmap pix2 = img.convertToPixmap(); + TQPixmap pix2 = img.convertToPixmap(); bitBlt(pix, 0, 0, &pix2, 0, 0); } diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.h b/digikam/utilities/imageeditor/rawimport/rawpreview.h index eabce7d..a2cdc74 100644 --- a/digikam/utilities/imageeditor/rawimport/rawpreview.h +++ b/digikam/utilities/imageeditor/rawimport/rawpreview.h @@ -24,9 +24,9 @@ #ifndef RAWPREVIEW_H #define RAWPREVIEW_H -// Qt includes. +// TQt includes. -#include <qimage.h> +#include <tqimage.h> // KDE includes. @@ -38,7 +38,7 @@ #include "previewwidget.h" #include "digikam_export.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -50,10 +50,11 @@ class DIGIKAM_EXPORT RawPreview : public PreviewWidget { Q_OBJECT + TQ_OBJECT public: - RawPreview(const KURL& url, QWidget *parent); + RawPreview(const KURL& url, TQWidget *tqparent); ~RawPreview(); DImg& demosaicedImage() const; @@ -74,7 +75,7 @@ signals: protected: - void resizeEvent(QResizeEvent* e); + void resizeEvent(TQResizeEvent* e); private slots: @@ -82,7 +83,7 @@ private slots: void slotImageLoaded(const LoadingDescription& description, const DImg &image); void slotThemeChanged(); void slotCornerButtonPressed(); - void slotPanIconSelectionMoved(const QRect&, bool); + void slotPanIconSelectionMoved(const TQRect&, bool); void slotPanIconHiden(); private: @@ -95,7 +96,7 @@ private: void resetPreview(); void zoomFactorChanged(double zoom); void updateZoomAndSize(bool alwaysFitToWindow); - inline void paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh); + inline void paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh); private: diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 0cd63a8..492cc7d 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -20,19 +20,19 @@ * * ============================================================ */ -// Qt includes. - -#include <qstring.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qhbuttongroup.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qtoolbutton.h> -#include <qtoolbox.h> -#include <qpushbutton.h> +// TQt includes. + +#include <tqstring.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqhbuttongroup.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqtoolbutton.h> +#include <tqtoolbox.h> +#include <tqpushbutton.h> // KDE includes. @@ -119,27 +119,27 @@ public: brightnessInput = 0; } - QWidget *advExposureBox; - QWidget *curveBox; - QWidget *rawdecodingBox; + TQWidget *advExposureBox; + TQWidget *curveBox; + TQWidget *rawdecodingBox; - QComboBox *channelCB; - QComboBox *colorsCB; + TQComboBox *channelCB; + TQComboBox *colorsCB; - QLabel *brightnessLabel; - QLabel *contrastLabel; - QLabel *gammaLabel; - QLabel *saturationLabel; - QLabel *fineExposureLabel; + TQLabel *brightnessLabel; + TQLabel *contrastLabel; + TQLabel *gammaLabel; + TQLabel *saturationLabel; + TQLabel *fineExposureLabel; - QHButtonGroup *scaleBG; + TQHButtonGroup *scaleBG; - QPushButton *abortBtn; - QPushButton *updateBtn; + TQPushButton *abortBtn; + TQPushButton *updateBtn; - QToolButton *resetCurveBtn; + TQToolButton *resetCurveBtn; - QToolBox *postProcessSettingsBox; + TQToolBox *postProcessSettingsBox; KTabWidget *tabView; @@ -161,84 +161,84 @@ public: DcrawSettingsWidget *decodingSettingsBox; }; -RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) - : EditorToolSettings(Default|Ok|Cancel, NoTool, parent) +RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *tqparent) + : EditorToolSettings(Default|Ok|Cancel, NoTool, tqparent) { d = new RawSettingsBoxPriv; // --------------------------------------------------------------- - QGridLayout* gridSettings = new QGridLayout(plainPage(), 5, 4); + TQGridLayout* gridSettings = new TQGridLayout(plainPage(), 5, 4); - QLabel *label1 = new QLabel(i18n("Channel:"), plainPage()); - label1->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - d->channelCB = new QComboBox(false, plainPage()); + TQLabel *label1 = new TQLabel(i18n("Channel:"), plainPage()); + label1->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); + d->channelCB = new TQComboBox(false, plainPage()); d->channelCB->insertItem( i18n("Luminosity") ); d->channelCB->insertItem( i18n("Red") ); d->channelCB->insertItem( i18n("Green") ); d->channelCB->insertItem( i18n("Blue") ); d->channelCB->insertItem( i18n("Colors") ); - QWhatsThis::add(d->channelCB, i18n("<p>Select the histogram channel to display here:<p>" + TQWhatsThis::add(d->channelCB, i18n("<p>Select the histogram channel to display here:<p>" "<b>Luminosity</b>: display the image's luminosity values.<p>" "<b>Red</b>: display the red image-channel values.<p>" "<b>Green</b>: display the green image-channel values.<p>" "<b>Blue</b>: display the blue image-channel values.<p>" "<b>Colors</b>: Display all color channel values at the same time.")); - d->scaleBG = new QHButtonGroup(plainPage()); + d->scaleBG = new TQHButtonGroup(plainPage()); d->scaleBG->setExclusive(true); - d->scaleBG->setFrameShape(QFrame::NoFrame); + d->scaleBG->setFrameShape(TQFrame::NoFrame); d->scaleBG->setInsideMargin( 0 ); - QWhatsThis::add(d->scaleBG, i18n("<p>Select the histogram scale here.<p>" + TQWhatsThis::add(d->scaleBG, i18n("<p>Select the histogram scale here.<p>" "If the image's maximal counts are small, you can use the linear scale.<p>" "Logarithmic scale can be used when the maximal counts are big; " "if it is used, all values (small and large) will be visible on the graph.")); - QPushButton *linHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); + TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); - linHistoButton->setPixmap( QPixmap( directory + "histogram-lin.png" ) ); + TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); - QPushButton *logHistoButton = new QPushButton( d->scaleBG ); - QToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); + TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); + TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); - logHistoButton->setPixmap( QPixmap( directory + "histogram-log.png" ) ); + logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); - QLabel *label10 = new QLabel(i18n("Colors:"), plainPage()); - label10->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - d->colorsCB = new QComboBox(false, plainPage()); + TQLabel *label10 = new TQLabel(i18n("Colors:"), plainPage()); + label10->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter ); + d->colorsCB = new TQComboBox(false, plainPage()); d->colorsCB->insertItem( i18n("Red") ); d->colorsCB->insertItem( i18n("Green") ); d->colorsCB->insertItem( i18n("Blue") ); d->colorsCB->setEnabled( false ); - QWhatsThis::add( d->colorsCB, i18n("<p>Select the main color displayed with Colors Channel mode here:<p>" + TQWhatsThis::add( d->colorsCB, i18n("<p>Select the main color displayed with Colors Channel mode here:<p>" "<b>Red</b>: Draw the red image channel in the foreground.<p>" "<b>Green</b>: Draw the green image channel in the foreground.<p>" "<b>Blue</b>: Draw the blue image channel in the foreground.<p>")); // --------------------------------------------------------------- - QVBox *histoBox = new QVBox(plainPage()); + TQVBox *histoBox = new TQVBox(plainPage()); d->histogramWidget = new HistogramWidget(256, 140, histoBox, false, true, true); - QWhatsThis::add(d->histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " + TQWhatsThis::add(d->histogramWidget, i18n("<p>Here you can see the target preview image histogram drawing " "of the selected image channel. This one is re-computed at any " "settings changes.")); - QLabel *space = new QLabel(histoBox); + TQLabel *space = new TQLabel(histoBox); space->setFixedHeight(1); d->hGradient = new ColorGradientWidget( ColorGradientWidget::Horizontal, 10, histoBox ); - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); // --------------------------------------------------------------- d->tabView = new KTabWidget(plainPage()); - d->rawdecodingBox = new QWidget(d->tabView); - QGridLayout* rawGrid = new QGridLayout(d->rawdecodingBox, 1, 2); + d->rawdecodingBox = new TQWidget(d->tabView); + TQGridLayout* rawGrid = new TQGridLayout(d->rawdecodingBox, 1, 2); d->decodingSettingsBox = new DcrawSettingsWidget(d->rawdecodingBox, true, true, false); KFileDialog *inputDlg = d->decodingSettingsBox->inputProfileUrlEdit()->fileDialog(); @@ -247,17 +247,17 @@ RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) KFileDialog *outputDlg = d->decodingSettingsBox->outputProfileUrlEdit()->fileDialog(); outputDlg->setPreviewWidget(new ICCPreviewWidget(outputDlg)); - d->abortBtn = new QPushButton(d->rawdecodingBox); + d->abortBtn = new TQPushButton(d->rawdecodingBox); d->abortBtn->setText(i18n("Abort")); d->abortBtn->setIconSet(SmallIconSet("stop")); d->abortBtn->setEnabled(false); - QToolTip::add(d->abortBtn, i18n("Abort the current Raw image preview.")); + TQToolTip::add(d->abortBtn, i18n("Abort the current Raw image preview.")); - d->updateBtn = new QPushButton(d->rawdecodingBox); + d->updateBtn = new TQPushButton(d->rawdecodingBox); d->updateBtn->setText(i18n("Update")); d->updateBtn->setIconSet(SmallIconSet("reload_page")); d->updateBtn->setEnabled(false); - QToolTip::add(d->updateBtn, i18n("Generate a Raw image preview using current settings.")); + TQToolTip::add(d->updateBtn, i18n("Generate a Raw image preview using current settings.")); rawGrid->addMultiCellWidget(d->decodingSettingsBox, 0, 0, 0, 2); rawGrid->addMultiCellWidget(d->abortBtn, 1, 1, 0, 0); @@ -268,47 +268,47 @@ RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) // --------------------------------------------------------------- - d->postProcessSettingsBox = new QToolBox(d->tabView); + d->postProcessSettingsBox = new TQToolBox(d->tabView); d->infoBox = new ImageDialogPreview(d->postProcessSettingsBox); d->infoBox->showPreview(url); // --------------------------------------------------------------- - d->advExposureBox = new QWidget(d->postProcessSettingsBox); - QGridLayout* advExposureLayout = new QGridLayout(d->advExposureBox, 5, 2); + d->advExposureBox = new TQWidget(d->postProcessSettingsBox); + TQGridLayout* advExposureLayout = new TQGridLayout(d->advExposureBox, 5, 2); - d->brightnessLabel = new QLabel(i18n("Brightness:"), d->advExposureBox); + d->brightnessLabel = new TQLabel(i18n("Brightness:"), d->advExposureBox); d->brightnessInput = new RIntNumInput(d->advExposureBox); d->brightnessInput->setRange(-100, 100, 1); d->brightnessInput->setDefaultValue(0); - QWhatsThis::add(d->brightnessInput->input(), i18n("<p>Set here the brightness adjustment of the image.")); + TQWhatsThis::add(d->brightnessInput->input(), i18n("<p>Set here the brightness adjustment of the image.")); - d->contrastLabel = new QLabel(i18n("Contrast:"), d->advExposureBox); + d->contrastLabel = new TQLabel(i18n("Contrast:"), d->advExposureBox); d->contrastInput = new RIntNumInput(d->advExposureBox); d->contrastInput->setRange(-100, 100, 1); d->contrastInput->setDefaultValue(0); - QWhatsThis::add(d->contrastInput->input(), i18n("<p>Set here the contrast adjustment of the image.")); + TQWhatsThis::add(d->contrastInput->input(), i18n("<p>Set here the contrast adjustment of the image.")); - d->gammaLabel = new QLabel(i18n("Gamma:"), d->advExposureBox); + d->gammaLabel = new TQLabel(i18n("Gamma:"), d->advExposureBox); d->gammaInput = new RDoubleNumInput(d->advExposureBox); d->gammaInput->setPrecision(2); d->gammaInput->setRange(0.1, 3.0, 0.01); d->gammaInput->setDefaultValue(1.0); - QWhatsThis::add(d->gammaInput->input(), i18n("Set here the gamma adjustement of the image")); + TQWhatsThis::add(d->gammaInput->input(), i18n("Set here the gamma adjustement of the image")); - d->saturationLabel = new QLabel(i18n("Saturation:"), d->advExposureBox); + d->saturationLabel = new TQLabel(i18n("Saturation:"), d->advExposureBox); d->saturationInput = new RDoubleNumInput(d->advExposureBox); d->saturationInput->setPrecision(2); d->saturationInput->setRange(0.0, 2.0, 0.01); d->saturationInput->setDefaultValue(1.0); - QWhatsThis::add(d->saturationInput->input(), i18n("<p>Set here the color saturation correction.")); + TQWhatsThis::add(d->saturationInput->input(), i18n("<p>Set here the color saturation correction.")); - d->fineExposureLabel = new QLabel(i18n("Exposure (E.V):"), d->advExposureBox); + d->fineExposureLabel = new TQLabel(i18n("Exposure (E.V):"), d->advExposureBox); d->fineExposureInput = new RDoubleNumInput(d->advExposureBox); d->fineExposureInput->setPrecision(2); d->fineExposureInput->setRange(-3.0, 3.0, 0.1); d->fineExposureInput->setDefaultValue(0.0); - QWhatsThis::add(d->fineExposureInput->input(), i18n("<p>This value in E.V will be used to perform " + TQWhatsThis::add(d->fineExposureInput->input(), i18n("<p>This value in E.V will be used to perform " "an exposure compensation of the image.")); advExposureLayout->addMultiCellWidget(d->brightnessLabel, 0, 0, 0, 0); @@ -327,30 +327,30 @@ RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) // --------------------------------------------------------------- - d->curveBox = new QWidget(d->postProcessSettingsBox); - QGridLayout* curveLayout = new QGridLayout(d->curveBox, 3, 2); + d->curveBox = new TQWidget(d->postProcessSettingsBox); + TQGridLayout* curveLayout = new TQGridLayout(d->curveBox, 3, 2); ColorGradientWidget* vGradient = new ColorGradientWidget(ColorGradientWidget::Vertical, 10, d->curveBox); - vGradient->setColors( QColor( "white" ), QColor( "black" ) ); + vGradient->setColors( TQColor( "white" ), TQColor( "black" ) ); - QLabel *spacev = new QLabel(d->curveBox); + TQLabel *spacev = new TQLabel(d->curveBox); spacev->setFixedWidth(1); d->curveWidget = new CurvesWidget(256, 192, d->curveBox); - QWhatsThis::add(d->curveWidget, i18n("<p>This is the curve adjustment of the image luminosity")); + TQWhatsThis::add(d->curveWidget, i18n("<p>This is the curve adjustment of the image luminosity")); - d->resetCurveBtn = new QToolButton(d->curveBox); + d->resetCurveBtn = new TQToolButton(d->curveBox); d->resetCurveBtn->setFixedSize(11, 11); d->resetCurveBtn->setIconSet(SmallIconSet("reload_page", 8)); - d->resetCurveBtn->setFocusPolicy(QWidget::NoFocus); + d->resetCurveBtn->setFocusPolicy(TQ_NoFocus); d->resetCurveBtn->setAutoRaise(true); - QToolTip::add(d->resetCurveBtn, i18n("Reset curve to linear")); + TQToolTip::add(d->resetCurveBtn, i18n("Reset curve to linear")); - QLabel *spaceh = new QLabel(d->curveBox); + TQLabel *spaceh = new TQLabel(d->curveBox); spaceh->setFixedHeight(1); ColorGradientWidget *hGradient = new ColorGradientWidget(ColorGradientWidget::Horizontal, 10, d->curveBox); - hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); curveLayout->addMultiCellWidget(vGradient, 0, 0, 0, 0); curveLayout->addMultiCellWidget(spacev, 0, 0, 1, 1); @@ -383,15 +383,15 @@ RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) button(Default)->setText(i18n("Reset")); button(Default)->setIconSet(SmallIconSet("reload_page")); - QToolTip::add(button(Default), i18n("<p>Reset all settings to default values.")); + TQToolTip::add(button(Default), i18n("<p>Reset all settings to default values.")); button(Ok)->setText(i18n("Import")); button(Ok)->setIconSet(SmallIconSet("ok")); - QToolTip::add(button(Ok), i18n("<p>Import image to editor using current settings.")); + TQToolTip::add(button(Ok), i18n("<p>Import image to editor using current settings.")); button(Cancel)->setText(i18n("Use Default")); button(Cancel)->setIconSet(SmallIconSet("gohome")); - QToolTip::add(button(Cancel), i18n("<p>Use general Raw decoding settings to load this image in editor.")); + TQToolTip::add(button(Cancel), i18n("<p>Use general Raw decoding settings to load this image in editor.")); // --------------------------------------------------------------- @@ -409,44 +409,44 @@ RawSettingsBox::RawSettingsBox(const KURL& url, QWidget *parent) // --------------------------------------------------------------- - connect(d->channelCB, SIGNAL(activated(int)), - this, SLOT(slotChannelChanged(int))); + connect(d->channelCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotChannelChanged(int))); - connect(d->scaleBG, SIGNAL(released(int)), - this, SLOT(slotScaleChanged(int))); + connect(d->scaleBG, TQT_SIGNAL(released(int)), + this, TQT_SLOT(slotScaleChanged(int))); - connect(d->colorsCB, SIGNAL(activated(int)), - this, SLOT(slotColorsChanged(int))); + connect(d->colorsCB, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotColorsChanged(int))); - connect(d->resetCurveBtn, SIGNAL(clicked()), - this, SLOT(slotResetCurve())); + connect(d->resetCurveBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetCurve())); - connect(d->updateBtn, SIGNAL(clicked()), - this, SIGNAL(signalUpdatePreview())); + connect(d->updateBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalUpdatePreview())); - connect(d->abortBtn, SIGNAL(clicked()), - this, SIGNAL(signalAbortPreview())); + connect(d->abortBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalAbortPreview())); - connect(d->decodingSettingsBox, SIGNAL(signalSettingsChanged()), - this, SIGNAL(signalDemosaicingChanged())); + connect(d->decodingSettingsBox, TQT_SIGNAL(signalSettingsChanged()), + this, TQT_SIGNAL(signalDemosaicingChanged())); - connect(d->curveWidget, SIGNAL(signalCurvesChanged()), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->curveWidget, TQT_SIGNAL(signalCurvesChanged()), + this, TQT_SIGNAL(signalPostProcessingChanged())); - connect(d->brightnessInput, SIGNAL(valueChanged(int)), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->brightnessInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalPostProcessingChanged())); - connect(d->contrastInput, SIGNAL(valueChanged(int)), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->contrastInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(signalPostProcessingChanged())); - connect(d->gammaInput, SIGNAL(valueChanged(double)), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->gammaInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalPostProcessingChanged())); - connect(d->saturationInput, SIGNAL(valueChanged(double)), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->saturationInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalPostProcessingChanged())); - connect(d->fineExposureInput, SIGNAL(valueChanged(double)), - this, SIGNAL(signalPostProcessingChanged())); + connect(d->fineExposureInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SIGNAL(signalPostProcessingChanged())); } RawSettingsBox::~RawSettingsBox() @@ -546,8 +546,8 @@ void RawSettingsBox::readSettings() (DRawDecoding::OutputColorSpace)config->readNumEntry("Output Color Space", (int)(DRawDecoding::SRGB))); - d->decodingSettingsBox->setInputColorProfile(config->readPathEntry("Input Color Profile", QString())); - d->decodingSettingsBox->setOutputColorProfile(config->readPathEntry("Output Color Profile", QString())); + d->decodingSettingsBox->setInputColorProfile(config->readPathEntry("Input Color Profile", TQString())); + d->decodingSettingsBox->setOutputColorProfile(config->readPathEntry("Output Color Profile", TQString())); d->brightnessInput->setValue(config->readNumEntry("Brightness", 0)); d->contrastInput->setValue(config->readNumEntry("Contrast", 0)); @@ -559,8 +559,8 @@ void RawSettingsBox::readSettings() for (int j = 0 ; j <= 17 ; j++) { - QPoint disable(-1, -1); - QPoint p = config->readPointEntry(QString("CurveAjustmentPoint%1").arg(j), &disable); + TQPoint disable(-1, -1); + TQPoint p = config->readPointEntry(TQString("CurveAjustmentPoint%1").tqarg(j), &disable); if (!d->decodingSettingsBox->sixteenBits() && p != disable) { // Restore point as 16 bits depth. @@ -620,14 +620,14 @@ void RawSettingsBox::writeSettings() for (int j = 0 ; j <= 17 ; j++) { - QPoint p = d->curveWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); + TQPoint p = d->curveWidget->curves()->getCurvePoint(ImageHistogram::ValueChannel, j); if (!d->curveWidget->curves()->isSixteenBits()) { // Store point as 16 bits depth. p.setX(p.x()*255); p.setY(p.y()*255); } - config->writeEntry(QString("CurveAjustmentPoint%1").arg(j), p); + config->writeEntry(TQString("CurveAjustmentPoint%1").tqarg(j), p); } config->writeEntry("Settings Page", d->tabView->currentPage()); @@ -680,42 +680,42 @@ void RawSettingsBox::slotChannelChanged(int channel) { case RawSettingsBoxPriv::LuminosityChannel: d->histogramWidget->m_channelType = HistogramWidget::ValueHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); d->colorsCB->setEnabled(false); break; case RawSettingsBoxPriv::RedChannel: d->histogramWidget->m_channelType = HistogramWidget::RedChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "red" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "red" ) ); d->colorsCB->setEnabled(false); break; case RawSettingsBoxPriv::GreenChannel: d->histogramWidget->m_channelType = HistogramWidget::GreenChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "green" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "green" ) ); d->colorsCB->setEnabled(false); break; case RawSettingsBoxPriv::BlueChannel: d->histogramWidget->m_channelType = HistogramWidget::BlueChannelHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "blue" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "blue" ) ); d->colorsCB->setEnabled(false); break; case RawSettingsBoxPriv::ColorChannels: d->histogramWidget->m_channelType = HistogramWidget::ColorChannelsHistogram; - d->hGradient->setColors( QColor( "black" ), QColor( "white" ) ); + d->hGradient->setColors( TQColor( "black" ), TQColor( "white" ) ); d->colorsCB->setEnabled(true); break; } - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); } void RawSettingsBox::slotScaleChanged(int scale) { d->histogramWidget->m_scaleType = scale; - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); } void RawSettingsBox::slotColorsChanged(int color) @@ -735,7 +735,7 @@ void RawSettingsBox::slotColorsChanged(int color) break; } - d->histogramWidget->repaint(false); + d->histogramWidget->tqrepaint(false); } } // NameSpace Digikam diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h index 5aa60bb..1cc2f0e 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h @@ -43,10 +43,11 @@ class RawSettingsBoxPriv; class DIGIKAM_EXPORT RawSettingsBox : public EditorToolSettings { Q_OBJECT + TQ_OBJECT public: - RawSettingsBox(const KURL& url, QWidget *parent); + RawSettingsBox(const KURL& url, TQWidget *tqparent); ~RawSettingsBox(); void setBusy(bool b); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 465ea65..2b66ba1 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -28,30 +28,30 @@ * * ============================================================ */ -// Qt includes. - -#include <qobject.h> -#include <qpixmap.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qstring.h> -#include <qsize.h> -#include <qcursor.h> -#include <qlabel.h> -#include <qhbox.h> -#include <qcheckbox.h> -#include <qfont.h> -#include <qgrid.h> -#include <qimage.h> -#include <qpaintdevicemetrics.h> -#include <qpainter.h> -#include <qradiobutton.h> -#include <qvbuttongroup.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qstyle.h> -#include <qpushbutton.h> +// TQt includes. + +#include <tqobject.h> +#include <tqpixmap.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqstring.h> +#include <tqsize.h> +#include <tqcursor.h> +#include <tqlabel.h> +#include <tqhbox.h> +#include <tqcheckbox.h> +#include <tqfont.h> +#include <tqgrid.h> +#include <tqimage.h> +#include <tqpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqradiobutton.h> +#include <tqvbuttongroup.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqstyle.h> +#include <tqpushbutton.h> // KDE includes. @@ -87,14 +87,14 @@ public: ImagePrintPrivate(){} - QString filename; - QString inProfilePath; - QString outputProfilePath; + TQString filename; + TQString inProfilePath; + TQString outputProfilePath; DImg image; }; -ImagePrint::ImagePrint(DImg& image, KPrinter& printer, const QString& filename) +ImagePrint::ImagePrint(DImg& image, KPrinter& printer, const TQString& filename) : m_printer(printer) { d = new ImagePrintPrivate(); @@ -107,7 +107,7 @@ ImagePrint::~ImagePrint() delete d; } -bool ImagePrint::printImageWithQt() +bool ImagePrint::printImageWithTQt() { if ( d->image.isNull() ) { @@ -115,8 +115,8 @@ bool ImagePrint::printImageWithQt() return false; } - QString t = "true"; - QString f = "false"; + TQString t = "true"; + TQString f = "false"; if (m_printer.option( "app-imageeditor-color-managed") != f) { @@ -135,7 +135,7 @@ bool ImagePrint::printImageWithQt() transform->apply( d->image ); } - QImage image2Print = d->image.copyQImage(); + TQImage image2Print = d->image.copyTQImage(); // Black & white print ? if ( m_printer.option( "app-imageeditor-blackwhite" ) != f) @@ -145,12 +145,12 @@ bool ImagePrint::printImageWithQt() Qt::AvoidDither ); } - QPainter p; + TQPainter p; p.begin( &m_printer ); - QPaintDeviceMetrics metrics( &m_printer ); + TQPaintDeviceMetrics metrics( &m_printer ); p.setFont( KGlobalSettings::generalFont() ); - QFontMetrics fm = p.fontMetrics(); + TQFontMetrics fm = p.fontMetrics(); int w, h; // will be set to the width and height of the printer // when the orientation is decided. @@ -158,7 +158,7 @@ bool ImagePrint::printImageWithQt() h = metrics.height(); int filenameOffset = 0; - QSize size = image2Print.size(); + TQSize size = image2Print.size(); bool printFilename = m_printer.option( "app-imageeditor-printFilename" ) != f; if ( printFilename ) @@ -175,7 +175,7 @@ bool ImagePrint::printImageWithQt() : KPrinter::Landscape ); // Scale image to fit pagesize - size.scale( w, h, QSize::ScaleMin ); + size.tqscale( w, h, TQSize::ScaleMin ); } else { @@ -206,7 +206,7 @@ bool ImagePrint::printImageWithQt() { int resp = KMessageBox::warningYesNoCancel(KApplication::kApplication()->mainWidget(), i18n("The image will not fit on the page, what do you want to do?"), - QString(),KStdGuiItem::cont(), + TQString(),KStdGuiItem::cont(), i18n("Shrink") ); if (resp==KMessageBox::Cancel) @@ -217,40 +217,40 @@ bool ImagePrint::printImageWithQt() } else if (resp == KMessageBox::No) { // Shrink - size.scale(w, h, QSize::ScaleMin); + size.tqscale(w, h, TQSize::ScaleMin); } } } // Align image. - int alignment = (m_printer.option("app-imageeditor-alignment").isEmpty() ? - Qt::AlignCenter : m_printer.option("app-imageeditor-alignment").toInt()); + int tqalignment = (m_printer.option("app-imageeditor-tqalignment").isEmpty() ? + TQt::AlignCenter : m_printer.option("app-imageeditor-tqalignment").toInt()); int x = 0; int y = 0; - // x - alignment - if ( alignment & Qt::AlignHCenter ) + // x - tqalignment + if ( tqalignment & TQt::AlignHCenter ) x = (w - size.width())/2; - else if ( alignment & Qt::AlignLeft ) + else if ( tqalignment & TQt::AlignLeft ) x = 0; - else if ( alignment & Qt::AlignRight ) + else if ( tqalignment & TQt::AlignRight ) x = w - size.width(); - // y - alignment - if ( alignment & Qt::AlignVCenter ) + // y - tqalignment + if ( tqalignment & TQt::AlignVCenter ) y = (h - size.height())/2; - else if ( alignment & Qt::AlignTop ) + else if ( tqalignment & TQt::AlignTop ) y = 0; - else if ( alignment & Qt::AlignBottom ) + else if ( tqalignment & TQt::AlignBottom ) y = h - size.height(); // Perform the actual drawing. - p.drawImage( QRect( x, y, size.width(), size.height()), image2Print ); + p.drawImage( TQRect( x, y, size.width(), size.height()), image2Print ); if ( printFilename ) { - QString fname = minimizeString( d->filename, fm, w ); + TQString fname = minimizeString( d->filename, fm, w ); if ( !fname.isEmpty() ) { @@ -266,12 +266,12 @@ bool ImagePrint::printImageWithQt() return true; } -QString ImagePrint::minimizeString( QString text, const QFontMetrics& metrics, +TQString ImagePrint::minimizeString( TQString text, const TQFontMetrics& metrics, int maxWidth ) { // no sense to cut that tiny little string if ( text.length() <= 5 ) - return QString(); + return TQString(); bool changed = false; @@ -290,9 +290,9 @@ QString ImagePrint::minimizeString( QString text, const QFontMetrics& metrics, // sanity check if ( mid <= 5 ) - return QString(); + return TQString(); - text.replace( mid - 1, 3, "..." ); + text.tqreplace( mid - 1, 3, "..." ); } return text; @@ -327,7 +327,7 @@ public: autoRotate = 0; colorManaged = 0; cmPreferences = 0; - parent = 0; + tqparent = 0; width = 0; height = 0; units = 0; @@ -335,18 +335,18 @@ public: bool cmEnabled; - QRadioButton *scaleToFit; - QRadioButton *scale; + TQRadioButton *scaleToFit; + TQRadioButton *scale; - QCheckBox *keepRatio; - QCheckBox *addFileName; - QCheckBox *blackwhite; - QCheckBox *autoRotate; - QCheckBox *colorManaged; + TQCheckBox *keepRatio; + TQCheckBox *addFileName; + TQCheckBox *blackwhite; + TQCheckBox *autoRotate; + TQCheckBox *colorManaged; - QPushButton *cmPreferences; + TQPushButton *cmPreferences; - QWidget *parent; + TQWidget *tqparent; KDoubleNumInput *width; KDoubleNumInput *height; @@ -359,28 +359,28 @@ public: ImageEditorPrintDialogPage::Unit previousUnit; }; -ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, QWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { d = new ImageEditorPrintDialogPagePrivate; d->image = image; - d->parent = parent; + d->tqparent = tqparent; setTitle( i18n("Image Settings") ); readSettings(); - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); // ------------------------------------------------------------------------ - QHBoxLayout *layout2 = new QHBoxLayout( layout ); - layout2->setSpacing(3); + TQHBoxLayout *tqlayout2 = new TQHBoxLayout( tqlayout ); + tqlayout2->setSpacing(3); - QLabel* textLabel = new QLabel( this, "Image position:" ); + TQLabel* textLabel = new TQLabel( this, "Image position:" ); textLabel->setText( i18n( "Image position:" ) ); - layout2->addWidget( textLabel ); + tqlayout2->addWidget( textLabel ); d->position = new KComboBox( false, this, "Print position" ); d->position->clear(); d->position->insertItem( i18n( "Top-Left" ) ); @@ -392,57 +392,57 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, QWidget *par d->position->insertItem( i18n( "Bottom-Left" ) ); d->position->insertItem( i18n( "Bottom-Central" ) ); d->position->insertItem( i18n( "Bottom-Right" ) ); - layout2->addWidget( d->position ); - QSpacerItem *spacer1 = new QSpacerItem( 101, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); - layout2->addItem( spacer1 ); + tqlayout2->addWidget( d->position ); + TQSpacerItem *spacer1 = new TQSpacerItem( 101, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + tqlayout2->addItem( spacer1 ); - d->addFileName = new QCheckBox( i18n("Print fi&lename below image"), this); + d->addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this); d->addFileName->setChecked( false ); - layout->addWidget( d->addFileName ); + tqlayout->addWidget( d->addFileName ); - d->blackwhite = new QCheckBox ( i18n("Print image in &black and white"), this); + d->blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this); d->blackwhite->setChecked( false ); - layout->addWidget (d->blackwhite ); + tqlayout->addWidget (d->blackwhite ); - d->autoRotate = new QCheckBox( i18n("&Auto-rotate page"), this ); + d->autoRotate = new TQCheckBox( i18n("&Auto-rotate page"), this ); d->autoRotate->setChecked( false ); - layout->addWidget( d->autoRotate ); + tqlayout->addWidget( d->autoRotate ); // ------------------------------------------------------------------------ - QHBox *cmbox = new QHBox(this); + TQHBox *cmbox = new TQHBox(this); - d->colorManaged = new QCheckBox(i18n("Use Color Management for Printing"), cmbox); + d->colorManaged = new TQCheckBox(i18n("Use Color Management for Printing"), cmbox); d->colorManaged->setChecked( false ); - d->cmPreferences = new QPushButton(i18n("Settings..."), cmbox); + d->cmPreferences = new TQPushButton(i18n("Settings..."), cmbox); - QWidget *space = new QWidget(cmbox); + TQWidget *space = new TQWidget(cmbox); cmbox->setStretchFactor(space, 10); cmbox->setSpacing(KDialog::spacingHint()); - layout->addWidget(cmbox); + tqlayout->addWidget(cmbox); // ------------------------------------------------------------------------ - QVButtonGroup *group = new QVButtonGroup( i18n("Scaling"), this ); + TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this ); group->setRadioButtonExclusive( true ); - layout->addWidget( group ); + tqlayout->addWidget( group ); - d->scaleToFit = new QRadioButton( i18n("Scale image to &fit"), group ); + d->scaleToFit = new TQRadioButton( i18n("Scale image to &fit"), group ); d->scaleToFit->setChecked( true ); - d->scale = new QRadioButton( i18n("Print e&xact size: "), group ); + d->scale = new TQRadioButton( i18n("Print e&xact size: "), group ); - QHBox *hb = new QHBox( group ); + TQHBox *hb = new TQHBox( group ); hb->setSpacing( KDialog::spacingHint() ); - QWidget *w = new QWidget(hb); - w->setFixedWidth(d->scale->style().subRect( QStyle::SR_RadioButtonIndicator, d->scale ).width()); + TQWidget *w = new TQWidget(hb); + w->setFixedWidth(d->scale->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, d->scale ).width()); d->width = new KDoubleNumInput( hb, "exact width" ); d->width->setMinValue( 1 ); - new QLabel( "x", hb ); + new TQLabel( "x", hb ); d->height = new KDoubleNumInput( hb, "exact height" ); d->height->setMinValue( 1 ); @@ -452,34 +452,34 @@ ImageEditorPrintDialogPage::ImageEditorPrintDialogPage(DImg& image, QWidget *par d->units->insertItem( i18n("Centimeters") ); d->units->insertItem( i18n("Inches") ); - d->keepRatio = new QCheckBox( i18n("Keep ratio"), hb); + d->keepRatio = new TQCheckBox( i18n("Keep ratio"), hb); - w = new QWidget(hb); + w = new TQWidget(hb); hb->setStretchFactor( w, 1 ); d->previousUnit = DK_MILLIMETERS; // ------------------------------------------------------------------------ - connect( d->colorManaged, SIGNAL(toggled(bool)), - this, SLOT(slotAlertSettings( bool )) ); + connect( d->colorManaged, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAlertSettings( bool )) ); - connect( d->cmPreferences, SIGNAL(clicked()), - this, SLOT(slotSetupDlg()) ); + connect( d->cmPreferences, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSetupDlg()) ); - connect( d->scale, SIGNAL( toggled( bool )), - this, SLOT( toggleScaling( bool ))); + connect( d->scale, TQT_SIGNAL( toggled( bool )), + this, TQT_SLOT( toggleScaling( bool ))); - connect(d->width, SIGNAL( valueChanged( double )), - this, SLOT( slotWidthChanged( double ))); + connect(d->width, TQT_SIGNAL( valueChanged( double )), + this, TQT_SLOT( slotWidthChanged( double ))); - connect(d->height, SIGNAL( valueChanged( double )), - this, SLOT( slotHeightChanged( double ))); + connect(d->height, TQT_SIGNAL( valueChanged( double )), + this, TQT_SLOT( slotHeightChanged( double ))); - connect(d->keepRatio, SIGNAL( toggled( bool )), - this, SLOT( toggleRatio( bool ))); + connect(d->keepRatio, TQT_SIGNAL( toggled( bool )), + this, TQT_SLOT( toggleRatio( bool ))); - connect(d->units, SIGNAL(activated(const QString &)), - this, SLOT(slotUnitChanged(const QString& ))); + connect(d->units, TQT_SIGNAL(activated(const TQString &)), + this, TQT_SLOT(slotUnitChanged(const TQString& ))); } ImageEditorPrintDialogPage::~ImageEditorPrintDialogPage() @@ -487,34 +487,34 @@ ImageEditorPrintDialogPage::~ImageEditorPrintDialogPage() delete d; } -void ImageEditorPrintDialogPage::getOptions( QMap<QString,QString>& opts, bool /*incldef*/ ) +void ImageEditorPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts, bool /*incldef*/ ) { - QString t = "true"; - QString f = "false"; + TQString t = "true"; + TQString f = "false"; - opts["app-imageeditor-alignment"] = QString::number(getPosition(d->position->currentText())); + opts["app-imageeditor-tqalignment"] = 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; opts["app-imageeditor-scale"] = d->scale->isChecked() ? t : f; - opts["app-imageeditor-scale-unit"] = QString::number(stringToUnit(d->units->currentText())); - opts["app-imageeditor-scale-width"] = QString::number( d->width->value() ); - opts["app-imageeditor-scale-height"] = QString::number( d->height->value() ); + opts["app-imageeditor-scale-unit"] = TQString::number(stringToUnit(d->units->currentText())); + opts["app-imageeditor-scale-width"] = TQString::number( d->width->value() ); + opts["app-imageeditor-scale-height"] = TQString::number( d->height->value() ); opts["app-imageeditor-scale-KeepRatio"] = d->keepRatio->isChecked() ? t : f; opts["app-imageeditor-auto-rotate"] = d->autoRotate->isChecked() ? t : f; opts["app-imageeditor-color-managed"] = d->colorManaged->isChecked() ? t : f; } -void ImageEditorPrintDialogPage::setOptions( const QMap<QString,QString>& opts ) +void ImageEditorPrintDialogPage::setOptions( const TQMap<TQString,TQString>& opts ) { - QString t = "true"; - QString f = "false"; - QString stVal; + TQString t = "true"; + TQString f = "false"; + TQString stVal; bool ok; double dVal; int iVal; - iVal = opts["app-imageeditor-alignment"].toInt( &ok ); + iVal = opts["app-imageeditor-tqalignment"].toInt( &ok ); if (ok) { stVal = setPosition(iVal); @@ -561,94 +561,94 @@ void ImageEditorPrintDialogPage::setOptions( const QMap<QString,QString>& opts ) d->keepRatio->setChecked( opts["app-imageeditor-scale-KeepRatio"] == t ); } -int ImageEditorPrintDialogPage::getPosition(const QString& align) +int ImageEditorPrintDialogPage::getPosition(const TQString& align) { - int alignment; + int tqalignment; if (align == i18n("Central-Left")) { - alignment = Qt::AlignLeft | Qt::AlignVCenter; + tqalignment = TQt::AlignLeft | TQt::AlignVCenter; } else if (align == i18n("Central-Right")) { - alignment = Qt::AlignRight | Qt::AlignVCenter; + tqalignment = TQt::AlignRight | TQt::AlignVCenter; } else if (align == i18n("Top-Left")) { - alignment = Qt::AlignTop | Qt::AlignLeft; + tqalignment = TQt::AlignTop | TQt::AlignLeft; } else if (align == i18n("Top-Right")) { - alignment = Qt::AlignTop | Qt::AlignRight; + tqalignment = TQt::AlignTop | TQt::AlignRight; } else if (align == i18n("Bottom-Left")) { - alignment = Qt::AlignBottom | Qt::AlignLeft; + tqalignment = TQt::AlignBottom | TQt::AlignLeft; } else if (align == i18n("Bottom-Right")) { - alignment = Qt::AlignBottom | Qt::AlignRight; + tqalignment = TQt::AlignBottom | TQt::AlignRight; } else if (align == i18n("Top-Central")) { - alignment = Qt::AlignTop | Qt::AlignHCenter; + tqalignment = TQt::AlignTop | TQt::AlignHCenter; } else if (align == i18n("Bottom-Central")) { - alignment = Qt::AlignBottom | Qt::AlignHCenter; + tqalignment = TQt::AlignBottom | TQt::AlignHCenter; } else { // Central - alignment = Qt::AlignCenter; // Qt::AlignHCenter || Qt::AlignVCenter + tqalignment = TQt::AlignCenter; // TQt::AlignHCenter || TQt::AlignVCenter } - return alignment; + return tqalignment; } -QString ImageEditorPrintDialogPage::setPosition(int align) +TQString ImageEditorPrintDialogPage::setPosition(int align) { - QString alignment; + TQString tqalignment; - if (align == (Qt::AlignLeft | Qt::AlignVCenter)) + if (align == (TQt::AlignLeft | TQt::AlignVCenter)) { - alignment = i18n("Central-Left"); + tqalignment = i18n("Central-Left"); } - else if (align == (Qt::AlignRight | Qt::AlignVCenter)) + else if (align == (TQt::AlignRight | TQt::AlignVCenter)) { - alignment = i18n("Central-Right"); + tqalignment = i18n("Central-Right"); } - else if (align == (Qt::AlignTop | Qt::AlignLeft)) + else if (align == (TQt::AlignTop | TQt::AlignLeft)) { - alignment = i18n("Top-Left"); + tqalignment = i18n("Top-Left"); } - else if (align == (Qt::AlignTop | Qt::AlignRight)) + else if (align == (TQt::AlignTop | TQt::AlignRight)) { - alignment = i18n("Top-Right"); + tqalignment = i18n("Top-Right"); } - else if (align == (Qt::AlignBottom | Qt::AlignLeft)) + else if (align == (TQt::AlignBottom | TQt::AlignLeft)) { - alignment = i18n("Bottom-Left"); + tqalignment = i18n("Bottom-Left"); } - else if (align == (Qt::AlignBottom | Qt::AlignRight)) + else if (align == (TQt::AlignBottom | TQt::AlignRight)) { - alignment = i18n("Bottom-Right"); + tqalignment = i18n("Bottom-Right"); } - else if (align == (Qt::AlignTop | Qt::AlignHCenter)) + else if (align == (TQt::AlignTop | TQt::AlignHCenter)) { - alignment = i18n("Top-Central"); + tqalignment = i18n("Top-Central"); } - else if (align == (Qt::AlignBottom | Qt::AlignHCenter)) + else if (align == (TQt::AlignBottom | TQt::AlignHCenter)) { - alignment = i18n("Bottom-Central"); + tqalignment = i18n("Bottom-Central"); } else { - // Central: Qt::AlignCenter or (Qt::AlignHCenter || Qt::AlignVCenter) - alignment = i18n("Central"); + // Central: TQt::AlignCenter or (TQt::AlignHCenter || TQt::AlignVCenter) + tqalignment = i18n("Central"); } - return alignment; + return tqalignment; } void ImageEditorPrintDialogPage::toggleScaling( bool enable ) @@ -721,7 +721,7 @@ void ImageEditorPrintDialogPage::toggleRatio( bool enable ) d->height->blockSignals(false); } -void ImageEditorPrintDialogPage::slotUnitChanged(const QString& string) +void ImageEditorPrintDialogPage::slotUnitChanged(const TQString& string) { Unit newUnit = stringToUnit(string); double ratio = unitToMM(d->previousUnit) / unitToMM(newUnit); @@ -747,7 +747,7 @@ void ImageEditorPrintDialogPage::readSettings() void ImageEditorPrintDialogPage::slotSetupDlg() { - EditorWindow* editor = dynamic_cast<EditorWindow*>(d->parent); + EditorWindow* editor = dynamic_cast<EditorWindow*>(d->tqparent); editor->setup(true); } @@ -755,7 +755,7 @@ void ImageEditorPrintDialogPage::slotAlertSettings( bool t) { if (t && !d->cmEnabled) { - QString message = i18n("<p>Color Management is disabled.</p> \ + TQString message = i18n("<p>Color Management is disabled.</p> \ <p>You can enable it now by clicking on the \"Settings\" button.</p>"); KMessageBox::information(this, message); d->colorManaged->setChecked(!t); @@ -778,7 +778,7 @@ double ImageEditorPrintDialogPage::unitToMM(Unit unit) } } -ImageEditorPrintDialogPage::Unit ImageEditorPrintDialogPage::stringToUnit(const QString& unit) +ImageEditorPrintDialogPage::Unit ImageEditorPrintDialogPage::stringToUnit(const TQString& unit) { if (unit == i18n("Millimeters")) { @@ -794,7 +794,7 @@ ImageEditorPrintDialogPage::Unit ImageEditorPrintDialogPage::stringToUnit(const } } -QString ImageEditorPrintDialogPage::unitToString(Unit unit) +TQString ImageEditorPrintDialogPage::unitToString(Unit unit) { if (unit == DK_MILLIMETERS) { diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/digikam/utilities/imageeditor/tools/imageprint.h index 905f6b6..aa1abf3 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.h +++ b/digikam/utilities/imageeditor/tools/imageprint.h @@ -25,10 +25,10 @@ #ifndef IMAGEPRINT_H #define IMAGEPRINT_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qstring.h> +#include <tqwidget.h> +#include <tqstring.h> // KDE includes. @@ -49,14 +49,14 @@ class DIGIKAM_EXPORT ImagePrint { public: - ImagePrint(DImg& image, KPrinter& printer, const QString& fileName); + ImagePrint(DImg& image, KPrinter& printer, const TQString& fileName); ~ImagePrint(); - bool printImageWithQt(); + bool printImageWithTQt(); private: - QString minimizeString(QString text, const QFontMetrics& metrics, int maxWidth); + TQString minimizeString(TQString text, const TQFontMetrics& metrics, int maxWidth); void readSettings(); private: @@ -73,6 +73,7 @@ class ImageEditorPrintDialogPagePrivate; class DIGIKAM_EXPORT ImageEditorPrintDialogPage : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: @@ -84,22 +85,22 @@ public: }; static inline double unitToMM(Unit unit); - static inline Unit stringToUnit(const QString& unit); - static inline QString unitToString(Unit unit); + static inline Unit stringToUnit(const TQString& unit); + static inline TQString unitToString(Unit unit); public: - ImageEditorPrintDialogPage(DImg& image, QWidget *parent=0L, const char *name=0); + ImageEditorPrintDialogPage(DImg& image, TQWidget *tqparent=0L, const char *name=0); ~ImageEditorPrintDialogPage(); - virtual void getOptions(QMap<QString,QString>& opts, bool incldef = false); - virtual void setOptions(const QMap<QString,QString>& opts); + virtual void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); + virtual void setOptions(const TQMap<TQString,TQString>& opts); private slots: void toggleScaling( bool enable ); void toggleRatio( bool enable ); - void slotUnitChanged(const QString& string); + void slotUnitChanged(const TQString& string); void slotHeightChanged(double value); void slotWidthChanged(double value); void slotSetupDlg(); @@ -108,8 +109,8 @@ private slots: private: void readSettings(); - int getPosition(const QString& align); - QString setPosition(int align); + int getPosition(const TQString& align); + TQString setPosition(int align); private: diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 57ccc72..12f4e54 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -25,24 +25,24 @@ #include <cmath> -// Qt includes. - -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qtimer.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qbrush.h> -#include <qfile.h> -#include <qimage.h> +// TQt includes. + +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqtimer.h> +#include <tqevent.h> +#include <tqpixmap.h> +#include <tqbrush.h> +#include <tqfile.h> +#include <tqimage.h> // KDE includes. @@ -96,7 +96,7 @@ public: ImageResizePriv() { currentRenderingMode = NoneRendering; - parent = 0; + tqparent = 0; preserveRatioBox = 0; useGreycstorationBox = 0; mainTab = 0; @@ -120,14 +120,14 @@ public: double prevWP; double prevHP; - QWidget *parent; + TQWidget *tqparent; - QLabel *restorationTips; + TQLabel *restorationTips; - QCheckBox *preserveRatioBox; - QCheckBox *useGreycstorationBox; + TQCheckBox *preserveRatioBox; + TQCheckBox *useGreycstorationBox; - QTabWidget *mainTab; + TQTabWidget *mainTab; RIntNumInput *wInput; RIntNumInput *hInput; @@ -143,18 +143,18 @@ public: GreycstorationWidget *settingsWidget; }; -ImageResize::ImageResize(QWidget* parent) +ImageResize::ImageResize(TQWidget* tqparent) : KDialogBase(Plain, i18n("Resize Image"), Help|Default|User2|User3|Ok|Cancel, Ok, - parent, 0, true, false, - QString(), + tqparent, 0, true, false, + TQString(), i18n("&Save As..."), i18n("&Load...")) { d = new ImageResizePriv; - d->parent = parent; + d->tqparent = tqparent; setHelp("resizetool.anchor", "digikam"); - QString whatsThis; + TQString whatsThis; setButtonWhatsThis( Default, i18n("<p>Reset all filter parameters to their default values.") ); setButtonWhatsThis( User3, i18n("<p>Load all filter parameters from settings text file.") ); setButtonWhatsThis( User2, i18n("<p>Save all filter parameters to settings text file.") ); @@ -170,65 +170,65 @@ ImageResize::ImageResize(QWidget* parent) // ------------------------------------------------------------- - QVBoxLayout *vlay = new QVBoxLayout(plainPage(), 0, spacingHint()); - d->mainTab = new QTabWidget( plainPage() ); + TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, spacingHint()); + d->mainTab = new TQTabWidget( plainPage() ); - QWidget* firstPage = new QWidget( d->mainTab ); - QGridLayout* grid = new QGridLayout( firstPage, 8, 2, spacingHint()); + TQWidget* firstPage = new TQWidget( d->mainTab ); + TQGridLayout* grid = new TQGridLayout( firstPage, 8, 2, spacingHint()); d->mainTab->addTab( firstPage, i18n("New Size") ); - QLabel *label1 = new QLabel(i18n("Width:"), firstPage); + TQLabel *label1 = new TQLabel(i18n("Width:"), firstPage); d->wInput = new RIntNumInput(firstPage); - d->wInput->setRange(1, QMAX(d->orgWidth * 10, 9999), 1); + d->wInput->setRange(1, TQMAX(d->orgWidth * 10, 9999), 1); d->wInput->setName("d->wInput"); d->wInput->setDefaultValue(d->orgWidth); - QWhatsThis::add( d->wInput, i18n("<p>Set here the new image width in pixels.")); + TQWhatsThis::add( d->wInput, i18n("<p>Set here the new image width in pixels.")); - QLabel *label2 = new QLabel(i18n("Height:"), firstPage); + TQLabel *label2 = new TQLabel(i18n("Height:"), firstPage); d->hInput = new RIntNumInput(firstPage); - d->hInput->setRange(1, QMAX(d->orgHeight * 10, 9999), 1); + d->hInput->setRange(1, TQMAX(d->orgHeight * 10, 9999), 1); d->hInput->setName("d->hInput"); d->hInput->setDefaultValue(d->orgHeight); - QWhatsThis::add( d->hInput, i18n("<p>Set here the new image height in pixels.")); + TQWhatsThis::add( d->hInput, i18n("<p>Set here the new image height in pixels.")); - QLabel *label3 = new QLabel(i18n("Width (%):"), firstPage); + TQLabel *label3 = new TQLabel(i18n("Width (%):"), firstPage); d->wpInput = new RDoubleNumInput(firstPage); d->wpInput->setRange(1.0, 999.0, 1.0); d->wpInput->setName("d->wpInput"); d->wpInput->setDefaultValue(100.0); - QWhatsThis::add( d->wpInput, i18n("<p>Set here the new image width in percent.")); + TQWhatsThis::add( d->wpInput, i18n("<p>Set here the new image width in percent.")); - QLabel *label4 = new QLabel(i18n("Height (%):"), firstPage); + TQLabel *label4 = new TQLabel(i18n("Height (%):"), firstPage); d->hpInput = new RDoubleNumInput(firstPage); d->hpInput->setRange(1.0, 999.0, 1.0); d->hpInput->setName("d->hpInput"); d->hpInput->setDefaultValue(100.0); - QWhatsThis::add( d->hpInput, i18n("<p>Set here the new image height in percent.")); + TQWhatsThis::add( d->hpInput, i18n("<p>Set here the new image height in percent.")); - d->preserveRatioBox = new QCheckBox(i18n("Maintain aspect ratio"), firstPage); - QWhatsThis::add( d->preserveRatioBox, i18n("<p>Enable this option to maintain aspect " + d->preserveRatioBox = new TQCheckBox(i18n("Maintain aspect ratio"), firstPage); + TQWhatsThis::add( d->preserveRatioBox, i18n("<p>Enable this option to maintain aspect " "ratio with new image sizes.")); d->cimgLogoLabel = new KURLLabel(firstPage); - d->cimgLogoLabel->setText(QString()); + d->cimgLogoLabel->setText(TQString()); d->cimgLogoLabel->setURL("http://cimg.sourceforge.net"); KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); - d->cimgLogoLabel->setPixmap( QPixmap( directory + "logo-cimg.png" ) ); - QToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + d->cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); + TQToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website")); - d->useGreycstorationBox = new QCheckBox(i18n("Restore photograph"), firstPage); - QWhatsThis::add( d->useGreycstorationBox, i18n("<p>Enable this option to restore photograph content. " + d->useGreycstorationBox = new TQCheckBox(i18n("Restore photograph"), firstPage); + TQWhatsThis::add( d->useGreycstorationBox, i18n("<p>Enable this option to restore photograph content. " "This way is usefull to scale-up an image to an huge size. " "Warning: this process can take a while.")); - d->restorationTips = new QLabel(i18n("<b>Note: use Restoration Mode to only scale-up an image to huge size. " + d->restorationTips = new TQLabel(i18n("<b>Note: use Restoration Mode to only scale-up an image to huge size. " "Warning, this process can take a while.</b>"), firstPage); d->progressBar = new KProgress(100, firstPage); d->progressBar->setValue(0); - QWhatsThis::add(d->progressBar, i18n("<p>This shows the current progress when you use Restoration mode.")); + TQWhatsThis::add(d->progressBar, i18n("<p>This shows the current progress when you use Restoration mode.")); grid->addMultiCellWidget(d->preserveRatioBox, 0, 0, 0, 2); grid->addMultiCellWidget(label1, 1, 1, 0, 0); @@ -255,27 +255,27 @@ ImageResize::ImageResize(QWidget* parent) adjustSize(); disableResize(); - QTimer::singleShot(0, this, SLOT(readUserSettings())); + TQTimer::singleShot(0, this, TQT_SLOT(readUserSettings())); // ------------------------------------------------------------- - connect(d->cimgLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processCImgURL(const QString&))); + connect(d->cimgLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processCImgURL(const TQString&))); - connect(d->wInput, SIGNAL(valueChanged(int)), - this, SLOT(slotValuesChanged())); + connect(d->wInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotValuesChanged())); - connect(d->hInput, SIGNAL(valueChanged(int)), - this, SLOT(slotValuesChanged())); + connect(d->hInput, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotValuesChanged())); - connect(d->wpInput, SIGNAL(valueChanged(double)), - this, SLOT(slotValuesChanged())); + connect(d->wpInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotValuesChanged())); - connect(d->hpInput, SIGNAL(valueChanged(double)), - this, SLOT(slotValuesChanged())); + connect(d->hpInput, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotValuesChanged())); - connect(d->useGreycstorationBox, SIGNAL(toggled(bool)), - this, SLOT(slotRestorationToggled(bool)) ); + connect(d->useGreycstorationBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotRestorationToggled(bool)) ); // ------------------------------------------------------------- @@ -403,7 +403,7 @@ void ImageResize::slotValuesChanged() d->wpInput->blockSignals(true); d->hpInput->blockSignals(true); - QString s(sender()->name()); + TQString s(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if (s == "d->wInput") { @@ -474,23 +474,23 @@ void ImageResize::slotCancel() if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->parent->unsetCursor(); + d->tqparent->unsetCursor(); } done(Cancel); } -void ImageResize::processCImgURL(const QString& url) +void ImageResize::processCImgURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } -void ImageResize::closeEvent(QCloseEvent *e) +void ImageResize::closeEvent(TQCloseEvent *e) { if (d->currentRenderingMode != ImageResizePriv::NoneRendering) { d->greycstorationIface->stopComputation(); - d->parent->unsetCursor(); + d->tqparent->unsetCursor(); } e->accept(); @@ -516,7 +516,7 @@ void ImageResize::slotOk() enableButton(User2, false); enableButton(User3, false); - d->parent->setCursor( KCursor::waitCursor() ); + d->tqparent->setCursor( KCursor::waitCursor() ); writeUserSettings(); ImageIface iface(0, 0); uchar *data = iface.getOriginalImage(); @@ -540,7 +540,7 @@ void ImageResize::slotOk() GreycstorationIface::Resize, d->wInput->value(), d->hInput->value(), - 0, this); + 0, TQT_TQOBJECT(this)); } else { @@ -550,12 +550,12 @@ void ImageResize::slotOk() image.resize(d->wInput->value(), d->hInput->value()); iface.putOriginalImage(i18n("Resize"), image.bits(), image.width(), image.height()); - d->parent->unsetCursor(); + d->tqparent->unsetCursor(); accept(); } } -void ImageResize::customEvent(QCustomEvent *event) +void ImageResize::customEvent(TQCustomEvent *event) { if (!event) return; @@ -582,7 +582,7 @@ void ImageResize::customEvent(QCustomEvent *event) iface.putOriginalImage(i18n("Resize"), resizedImage.bits(), resizedImage.width(), resizedImage.height()); - d->parent->unsetCursor(); + d->tqparent->unsetCursor(); accept(); break; } @@ -604,20 +604,20 @@ void ImageResize::customEvent(QCustomEvent *event) void ImageResize::slotUser3() { KURL loadBlowupFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Resizing Settings File to Load")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Resizing Settings File to Load")) ); if( loadBlowupFile.isEmpty() ) return; - QFile file(loadBlowupFile.path()); + TQFile file(loadBlowupFile.path()); if ( file.open(IO_ReadOnly) ) { - if (!d->settingsWidget->loadSettings(file, QString("# Photograph Resizing Configuration File"))) + if (!d->settingsWidget->loadSettings(file, TQString("# Photograph Resizing Configuration File"))) { KMessageBox::error(this, i18n("\"%1\" is not a Photograph Resizing settings text file.") - .arg(loadBlowupFile.fileName())); + .tqarg(loadBlowupFile.fileName())); file.close(); return; } @@ -631,15 +631,15 @@ void ImageResize::slotUser3() void ImageResize::slotUser2() { KURL saveBlowupFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), - QString( "*" ), this, - QString( i18n("Photograph Resizing Settings File to Save")) ); + TQString( "*" ), this, + TQString( i18n("Photograph Resizing Settings File to Save")) ); if( saveBlowupFile.isEmpty() ) return; - QFile file(saveBlowupFile.path()); + TQFile file(saveBlowupFile.path()); if ( file.open(IO_WriteOnly) ) - d->settingsWidget->saveSettings(file, QString("# Photograph Resizing Configuration File")); + d->settingsWidget->saveSettings(file, TQString("# Photograph Resizing Configuration File")); else KMessageBox::error(this, i18n("Cannot save settings to the Photograph Resizing text file.")); diff --git a/digikam/utilities/imageeditor/tools/imageresize.h b/digikam/utilities/imageeditor/tools/imageresize.h index 4ea9d88..d4383fa 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.h +++ b/digikam/utilities/imageeditor/tools/imageresize.h @@ -24,9 +24,9 @@ #ifndef IMAGE_RESIZE_H #define IMAGE_RESIZE_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -44,19 +44,20 @@ class ImageResizePriv; class DIGIKAM_EXPORT ImageResize : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImageResize(QWidget* parent); + ImageResize(TQWidget* tqparent); ~ImageResize(); protected: - void closeEvent(QCloseEvent *e); + void closeEvent(TQCloseEvent *e); private: - void customEvent(QCustomEvent *event); + void customEvent(TQCustomEvent *event); void writeUserSettings(); private slots: @@ -66,7 +67,7 @@ private slots: void slotDefault(); void slotUser2(); void slotUser3(); - void processCImgURL(const QString&); + void processCImgURL(const TQString&); void slotValuesChanged(); void readUserSettings(); void slotRestorationToggled(bool); diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp index 6dd6e93..2bdf8bd 100644 --- a/digikam/utilities/lighttable/lighttablebar.cpp +++ b/digikam/utilities/lighttable/lighttablebar.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpainter.h> -#include <qimage.h> -#include <qcursor.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqcursor.h> // KDE includes. @@ -67,7 +67,7 @@ public: bool navigateByPair; - QPixmap ratingPixmap; + TQPixmap ratingPixmap; LightTableBarToolTip *toolTip; }; @@ -90,8 +90,8 @@ public: ImageInfo *info; }; -LightTableBar::LightTableBar(QWidget* parent, int orientation, bool exifRotate) - : ThumbBarView(parent, orientation, exifRotate) +LightTableBar::LightTableBar(TQWidget* tqparent, int orientation, bool exifRotate) + : ThumbBarView(tqparent, orientation, exifRotate) { d = new LightTableBarPriv; setMouseTracking(true); @@ -102,16 +102,16 @@ LightTableBar::LightTableBar(QWidget* parent, int orientation, bool exifRotate) KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; - d->ratingPixmap = QPixmap(ratingPixPath); + d->ratingPixmap = TQPixmap(ratingPixPath); - QPainter painter(&d->ratingPixmap); + TQPainter painter(&d->ratingPixmap); painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(), ThemeEngine::instance()->textSpecialRegColor()); painter.end(); - if (orientation == Vertical) + if (orientation ==Qt::Vertical) setMinimumWidth(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); else setMinimumHeight(d->ratingPixmap.width()*5 + 6 + 2*getMargin()); @@ -120,14 +120,14 @@ LightTableBar::LightTableBar(QWidget* parent, int orientation, bool exifRotate) ImageAttributesWatch *watch = ImageAttributesWatch::instance(); - connect(watch, SIGNAL(signalImageRatingChanged(Q_LLONG)), - this, SLOT(slotImageRatingChanged(Q_LLONG))); + connect(watch, TQT_SIGNAL(signalImageRatingChanged(TQ_LLONG)), + this, TQT_SLOT(slotImageRatingChanged(TQ_LLONG))); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); - connect(this, SIGNAL(signalItemSelected(ThumbBarItem*)), - this, SLOT(slotItemSelected(ThumbBarItem*))); + connect(this, TQT_SIGNAL(signalItemSelected(ThumbBarItem*)), + this, TQT_SLOT(slotItemSelected(ThumbBarItem*))); } LightTableBar::~LightTableBar() @@ -141,7 +141,7 @@ void LightTableBar::setNavigateByPair(bool b) d->navigateByPair = b; } -void LightTableBar::slotImageRatingChanged(Q_LLONG imageId) +void LightTableBar::slotImageRatingChanged(TQ_LLONG imageId) { for (ThumbBarItem *item = firstItem(); item; item = item->next()) { @@ -154,13 +154,13 @@ void LightTableBar::slotImageRatingChanged(Q_LLONG imageId) } } -void LightTableBar::contentsMouseReleaseEvent(QMouseEvent *e) +void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e) { if (!e) return; ThumbBarView::contentsMouseReleaseEvent(e); - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); LightTableBarItem *item = findItemByPos(e->pos()); RatingPopupMenu *ratingMenu = 0; @@ -197,8 +197,8 @@ void LightTableBar::contentsMouseReleaseEvent(QMouseEvent *e) ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, SIGNAL(activated(int)), - this, SLOT(slotAssignRating(int))); + connect(ratingMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); } @@ -240,7 +240,7 @@ void LightTableBar::contentsMouseReleaseEvent(QMouseEvent *e) void LightTableBar::slotAssignRating(int rating) { - rating = QMIN(5, QMAX(0, rating)); + rating = TQMIN(5, TQMAX(0, rating)); ImageInfo *info = currentItemImageInfo(); if (info) { @@ -294,18 +294,18 @@ void LightTableBar::setOnLeftPanel(const ImageInfo* info) if (ltItem->info()->id() == info->id()) { ltItem->setOnLeftPanel(true); - repaintItem(item); + tqrepaintItem(item); } else if (ltItem->isOnLeftPanel() == true) { ltItem->setOnLeftPanel(false); - repaintItem(item); + tqrepaintItem(item); } } else if (ltItem->isOnLeftPanel() == true) { ltItem->setOnLeftPanel(false); - repaintItem(item); + tqrepaintItem(item); } } } @@ -323,18 +323,18 @@ void LightTableBar::setOnRightPanel(const ImageInfo* info) if (ltItem->info()->id() == info->id()) { ltItem->setOnRightPanel(true); - repaintItem(item); + tqrepaintItem(item); } else if (ltItem->isOnRightPanel() == true) { ltItem->setOnRightPanel(false); - repaintItem(item); + tqrepaintItem(item); } } else if (ltItem->isOnRightPanel() == true) { ltItem->setOnRightPanel(false); - repaintItem(item); + tqrepaintItem(item); } } } @@ -415,7 +415,7 @@ LightTableBarItem* LightTableBar::findItemByInfo(const ImageInfo* info) const return 0; } -LightTableBarItem* LightTableBar::findItemByPos(const QPoint& pos) const +LightTableBarItem* LightTableBar::findItemByPos(const TQPoint& pos) const { ThumbBarItem *item = findItem(pos); if (item) @@ -449,18 +449,18 @@ void LightTableBar::readToolTipSettings() setToolTipSettings(settings); } -void LightTableBar::viewportPaintEvent(QPaintEvent* e) +void LightTableBar::viewportPaintEvent(TQPaintEvent* e) { ThemeEngine* te = ThemeEngine::instance(); - QRect er(e->rect()); - QPixmap bgPix; + TQRect er(e->rect()); + TQPixmap bgPix; if (countItems() > 0) { int cy, cx, ts, y1, y2, x1, x2; - QPixmap tile; + TQPixmap tile; - if (getOrientation() == Vertical) + if (getOrientation() ==Qt::Vertical) { cy = viewportToContents(er.topLeft()).y(); @@ -489,7 +489,7 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) for (ThumbBarItem *item = firstItem(); item; item = item->next()) { - if (getOrientation() == Vertical) + if (getOrientation() ==Qt::Vertical) { if (y1 <= item->position() && item->position() <= y2) { @@ -498,24 +498,24 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) else tile = te->thumbRegPixmap(tile.width(), tile.height()); - QPainter p(&tile); + TQPainter p(&tile); if (item == currentItem()) { - p.setPen(QPen(te->textSelColor(), 3)); + p.setPen(TQPen(te->textSelColor(), 3)); p.drawRect(2, 2, tile.width()-2, tile.height()-2); } else { - p.setPen(QPen(te->textRegColor(), 1)); + p.setPen(TQPen(te->textRegColor(), 1)); p.drawRect(0, 0, tile.width(), tile.height()); } p.end(); if (item->pixmap()) { - QPixmap pix; - pix.convertFromImage(QImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), QImage::ScaleMin)); + TQPixmap pix; + pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). + smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height() - pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -524,21 +524,21 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) if (ltItem->isOnLeftPanel()) { - QPixmap lPix = SmallIcon("previous"); + TQPixmap lPix = SmallIcon("previous"); bitBlt(&tile, getMargin(), getMargin(), &lPix); } if (ltItem->isOnRightPanel()) { - QPixmap rPix = SmallIcon("next"); + TQPixmap rPix = SmallIcon("next"); bitBlt(&tile, tile.width() - getMargin() - rPix.width(), getMargin(), &rPix); } - QRect r(0, tile.height()-getMargin()-d->ratingPixmap.height(), + TQRect r(0, tile.height()-getMargin()-d->ratingPixmap.height(), tile.width(), d->ratingPixmap.height()); int rating = ltItem->info()->rating(); int xr = (r.width() - rating * d->ratingPixmap.width())/2; int wr = rating * d->ratingPixmap.width(); - QPainter p(&tile); + TQPainter p(&tile); p.drawTiledPixmap(xr, r.y(), wr, r.height(), d->ratingPixmap); } @@ -554,24 +554,24 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) else tile = te->thumbRegPixmap(tile.width(), tile.height()); - QPainter p(&tile); + TQPainter p(&tile); if (item == currentItem()) { - p.setPen(QPen(te->textSelColor(), 2)); + p.setPen(TQPen(te->textSelColor(), 2)); p.drawRect(1, 1, tile.width()-1, tile.height()-1); } else { - p.setPen(QPen(te->textRegColor(), 1)); + p.setPen(TQPen(te->textRegColor(), 1)); p.drawRect(0, 0, tile.width(), tile.height()); } p.end(); if (item->pixmap()) { - QPixmap pix; - pix.convertFromImage(QImage(item->pixmap()->convertToImage()). - smoothScale(getTileSize(), getTileSize(), QImage::ScaleMin)); + TQPixmap pix; + pix.convertFromImage(TQImage(item->pixmap()->convertToImage()). + smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin)); int x = (tile.width() - pix.width())/2; int y = (tile.height()- pix.height())/2; bitBlt(&tile, x, y, &pix); @@ -580,21 +580,21 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) if (ltItem->isOnLeftPanel()) { - QPixmap lPix = SmallIcon("previous"); + TQPixmap lPix = SmallIcon("previous"); bitBlt(&tile, getMargin(), getMargin(), &lPix); } if (ltItem->isOnRightPanel()) { - QPixmap rPix = SmallIcon("next"); + TQPixmap rPix = SmallIcon("next"); bitBlt(&tile, tile.width() - getMargin() - rPix.width(), getMargin(), &rPix); } - QRect r(0, tile.height()-getMargin()-d->ratingPixmap.height(), + TQRect r(0, tile.height()-getMargin()-d->ratingPixmap.height(), tile.width(), d->ratingPixmap.height()); int rating = ltItem->info()->rating(); int xr = (r.width() - rating * d->ratingPixmap.width())/2; int wr = rating * d->ratingPixmap.width(); - QPainter p(&tile); + TQPainter p(&tile); p.drawTiledPixmap(xr, r.y(), wr, r.height(), d->ratingPixmap); } @@ -603,7 +603,7 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) } } - if (getOrientation() == Vertical) + if (getOrientation() ==Qt::Vertical) bitBlt(viewport(), 0, er.y(), &bgPix); else bitBlt(viewport(), er.x(), 0, &bgPix); @@ -612,10 +612,10 @@ void LightTableBar::viewportPaintEvent(QPaintEvent* e) { bgPix.resize(contentsRect().width(), contentsRect().height()); bgPix.fill(te->baseColor()); - QPainter p(&bgPix); - p.setPen(QPen(te->textRegColor())); + TQPainter p(&bgPix); + p.setPen(TQPen(te->textRegColor())); p.drawText(0, 0, bgPix.width(), bgPix.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Drag and drop images here")); p.end(); bitBlt(viewport(), 0, 0, &bgPix); @@ -628,8 +628,8 @@ void LightTableBar::startDrag() KURL::List urls; KURL::List kioURLs; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; LightTableBarItem *item = dynamic_cast<LightTableBarItem*>(currentItem()); @@ -638,19 +638,19 @@ void LightTableBar::startDrag() imageIDs.append(item->info()->id()); albumIDs.append(item->info()->albumID()); - QPixmap icon(DesktopIcon("image", 48)); + TQPixmap icon(DesktopIcon("image", 48)); int w = icon.width(); int h = icon.height(); - QPixmap pix(w+4,h+4); - QPainter p(&pix); - p.fillRect(0, 0, w+4, h+4, QColor(Qt::white)); - p.setPen(QPen(Qt::black, 1)); + TQPixmap pix(w+4,h+4); + TQPainter p(&pix); + p.fillRect(0, 0, w+4, h+4, TQColor(TQt::white)); + p.setPen(TQPen(TQt::black, 1)); p.drawRect(0, 0, w+4, h+4); p.drawPixmap(2, 2, icon); p.end(); - QDragObject* drag = 0; + TQDragObject* drag = 0; drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this); if (drag) @@ -660,11 +660,11 @@ void LightTableBar::startDrag() } } -void LightTableBar::contentsDragMoveEvent(QDragMoveEvent *e) +void LightTableBar::contentsDragMoveEvent(TQDragMoveEvent *e) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; @@ -679,11 +679,11 @@ void LightTableBar::contentsDragMoveEvent(QDragMoveEvent *e) e->ignore(); } -void LightTableBar::contentsDropEvent(QDropEvent *e) +void LightTableBar::contentsDropEvent(TQDropEvent *e) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; @@ -691,7 +691,7 @@ void LightTableBar::contentsDropEvent(QDropEvent *e) { ImageInfoList imageInfoList; - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -710,10 +710,10 @@ void LightTableBar::contentsDropEvent(QDropEvent *e) } else if (AlbumDrag::decode(e, urls, albumID)) { - QValueList<Q_LLONG> itemIDs = AlbumManager::instance()->albumDB()->getItemIDsInAlbum(albumID); + TQValueList<TQ_LLONG> itemIDs = AlbumManager::instance()->albumDB()->getItemIDsInAlbum(albumID); ImageInfoList imageInfoList; - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -732,16 +732,16 @@ void LightTableBar::contentsDropEvent(QDropEvent *e) } else if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; AlbumManager* man = AlbumManager::instance(); - QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); + TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); ImageInfoList imageInfoList; - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { ImageInfo *info = new ImageInfo(*it); @@ -768,11 +768,11 @@ void LightTableBar::slotThemeChanged() { KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); + TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png"); ratingPixPath += "/rating.png"; - d->ratingPixmap = QPixmap(ratingPixPath); + d->ratingPixmap = TQPixmap(ratingPixPath); - QPainter painter(&d->ratingPixmap); + TQPainter painter(&d->ratingPixmap); painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(), ThemeEngine::instance()->textSpecialRegColor()); painter.end(); @@ -821,14 +821,14 @@ bool LightTableBarItem::isOnRightPanel() const // ------------------------------------------------------------------------- -LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *parent) - : ThumbBarToolTip(parent) +LightTableBarToolTip::LightTableBarToolTip(ThumbBarView *tqparent) + : ThumbBarToolTip(tqparent) { } -QString LightTableBarToolTip::tipContentExtraData(ThumbBarItem *item) +TQString LightTableBarToolTip::tipContentExtraData(ThumbBarItem *item) { - QString tip, str; + TQString tip, str; AlbumSettings* settings = AlbumSettings::instance(); ImageInfo* info = static_cast<LightTableBarItem *>(item)->info(); @@ -852,16 +852,16 @@ QString LightTableBarToolTip::tipContentExtraData(ThumbBarItem *item) if (settings->getToolTipsShowComments()) { str = info->caption(); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); tip += m_cellSpecBeg + i18n("Caption:") + m_cellSpecMid + breakString(str) + m_cellSpecEnd; } if (settings->getToolTipsShowTags()) { - QStringList tagPaths = info->tagPaths(false); + TQStringList tagPaths = info->tagPaths(false); str = tagPaths.join(", "); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); if (str.length() > m_maxStringLen) str = str.left(m_maxStringLen-3) + "..."; tip += m_cellSpecBeg + i18n("Tags:") + m_cellSpecMid + str + m_cellSpecEnd; } @@ -869,7 +869,7 @@ QString LightTableBarToolTip::tipContentExtraData(ThumbBarItem *item) if (settings->getToolTipsShowRating()) { str.fill( '*', info->rating() ); - if (str.isEmpty()) str = QString("---"); + if (str.isEmpty()) str = TQString("---"); tip += m_cellSpecBeg + i18n("Rating:") + m_cellSpecMid + str + m_cellSpecEnd; } } diff --git a/digikam/utilities/lighttable/lighttablebar.h b/digikam/utilities/lighttable/lighttablebar.h index 13428a0..d43178d 100644 --- a/digikam/utilities/lighttable/lighttablebar.h +++ b/digikam/utilities/lighttable/lighttablebar.h @@ -30,10 +30,10 @@ #include "imageinfo.h" #include "digikam_export.h" -class QDragMoveEvent; -class QDropEvent; -class QMouseEvent; -class QPaintEvent; +class TQDragMoveEvent; +class TQDropEvent; +class TQMouseEvent; +class TQPaintEvent; class KURL; @@ -47,10 +47,11 @@ class LightTableBarPriv; class DIGIKAM_EXPORT LightTableBar : public ThumbBarView { Q_OBJECT + TQ_OBJECT public: - LightTableBar(QWidget* parent, int orientation=Vertical, bool exifRotate=true); + LightTableBar(TQWidget* tqparent, int orientation=Vertical, bool exifRotate=true); ~LightTableBar(); ImageInfo* currentItemImageInfo() const; @@ -59,7 +60,7 @@ public: void setSelectedItem(LightTableBarItem* ltItem); LightTableBarItem* findItemByInfo(const ImageInfo* info) const; - LightTableBarItem* findItemByPos(const QPoint& pos) const; + LightTableBarItem* findItemByPos(const TQPoint& pos) const; /** Read tool tip settings from Album Settings instance */ void readToolTipSettings(); @@ -83,15 +84,15 @@ signals: private: - void viewportPaintEvent(QPaintEvent*); - void contentsMouseReleaseEvent(QMouseEvent*); + void viewportPaintEvent(TQPaintEvent*); + void contentsMouseReleaseEvent(TQMouseEvent*); void startDrag(); - void contentsDragMoveEvent(QDragMoveEvent*); - void contentsDropEvent(QDropEvent*); + void contentsDragMoveEvent(TQDragMoveEvent*); + void contentsDropEvent(TQDropEvent*); private slots: - void slotImageRatingChanged(Q_LLONG); + void slotImageRatingChanged(TQ_LLONG); void slotItemSelected(ThumbBarItem*); void slotAssignRatingNoStar(); @@ -140,11 +141,11 @@ class DIGIKAM_EXPORT LightTableBarToolTip : public ThumbBarToolTip { public: - LightTableBarToolTip(ThumbBarView *parent); + LightTableBarToolTip(ThumbBarView *tqparent); private: - QString tipContentExtraData(ThumbBarItem *item); + TQString tipContentExtraData(ThumbBarItem *item); }; } // NameSpace Digikam diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp index f68148f..1c2c704 100644 --- a/digikam/utilities/lighttable/lighttablepreview.cpp +++ b/digikam/utilities/lighttable/lighttablepreview.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qpainter.h> -#include <qcursor.h> -#include <qstring.h> -#include <qvaluevector.h> -#include <qfileinfo.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qpixmap.h> -#include <qdrawutil.h> +// TQt includes. + +#include <tqpainter.h> +#include <tqcursor.h> +#include <tqstring.h> +#include <tqvaluevector.h> +#include <tqfileinfo.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqpixmap.h> +#include <tqdrawutil.h> // KDE includes. @@ -102,11 +102,11 @@ public: double currentFitWindowZoom; - QString path; - QString nextPath; - QString previousPath; + TQString path; + TQString nextPath; + TQString previousPath; - QToolButton *cornerButton; + TQToolButton *cornerButton; KPopupFrame *panIconPopup; @@ -120,13 +120,13 @@ public: PreviewLoadThread *previewPreloadThread; }; -LightTablePreview::LightTablePreview(QWidget *parent) - : PreviewWidget(parent) +LightTablePreview::LightTablePreview(TQWidget *tqparent) + : PreviewWidget(tqparent) { d = new LightTablePreviewPriv; - // get preview size from screen size, but limit from VGA to WQXGA - d->previewSize = QMAX(KApplication::desktop()->height(), + // get preview size from screen size, but limit from VGA to WTQXGA + d->previewSize = TQMAX(KApplication::desktop()->height(), KApplication::desktop()->width()); if (d->previewSize < 640) d->previewSize = 640; @@ -137,12 +137,12 @@ LightTablePreview::LightTablePreview(QWidget *parent) setAcceptDrops(true); slotThemeChanged(); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - d->cornerButton = new QToolButton(this); + d->cornerButton = new TQToolButton(this); d->cornerButton->setIconSet(SmallIcon("move")); d->cornerButton->hide(); - QToolTip::add(d->cornerButton, i18n("Pan the image")); + TQToolTip::add(d->cornerButton, i18n("Pan the image")); setCornerWidget(d->cornerButton); setLineWidth(5); @@ -150,14 +150,14 @@ LightTablePreview::LightTablePreview(QWidget *parent) // ------------------------------------------------------------ - connect(d->cornerButton, SIGNAL(pressed()), - this, SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(slotCornerButtonPressed())); - connect(this, SIGNAL(signalRightButtonClicked()), - this, SLOT(slotContextMenu())); + connect(this, TQT_SIGNAL(signalRightButtonClicked()), + this, TQT_SLOT(slotContextMenu())); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + this, TQT_SLOT(slotThemeChanged())); // ------------------------------------------------------------ @@ -186,12 +186,12 @@ void LightTablePreview::setDragAndDropMessage() { if (d->dragAndDropEnabled) { - QPixmap pix(visibleWidth(), visibleHeight()); + TQPixmap pix(visibleWidth(), visibleHeight()); pix.fill(ThemeEngine::instance()->baseColor()); - QPainter p(&pix); - p.setPen(QPen(ThemeEngine::instance()->textRegColor())); + TQPainter p(&pix); + p.setPen(TQPen(ThemeEngine::instance()->textRegColor())); p.drawText(0, 0, pix.width(), pix.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Drag and drop an image here")); p.end(); setImage(pix.convertToImage()); @@ -213,7 +213,7 @@ DImg& LightTablePreview::getImage() const return d->preview; } -QSize LightTablePreview::getImageSize() +TQSize LightTablePreview::getImageSize() { return d->preview.size(); } @@ -224,19 +224,19 @@ void LightTablePreview::reload() setImagePath(d->path); } -void LightTablePreview::setPreviousNextPaths(const QString& previous, const QString &next) +void LightTablePreview::setPreviousNextPaths(const TQString& previous, const TQString &next) { d->nextPath = next; d->previousPath = previous; } -void LightTablePreview::setImagePath(const QString& path) +void LightTablePreview::setImagePath(const TQString& path) { setCursor( KCursor::waitCursor() ); d->path = path; - d->nextPath = QString(); - d->previousPath = QString(); + d->nextPath = TQString(); + d->previousPath = TQString(); if (d->path.isEmpty()) { @@ -248,14 +248,14 @@ void LightTablePreview::setImagePath(const QString& path) if (!d->previewThread) { d->previewThread = new PreviewLoadThread(); - connect(d->previewThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); } if (!d->previewPreloadThread) { d->previewPreloadThread = new PreviewLoadThread(); - connect(d->previewPreloadThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, SLOT(slotNextPreload())); + connect(d->previewPreloadThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQT_SLOT(slotNextPreload())); } if (d->loadFullImageSize) @@ -271,15 +271,15 @@ void LightTablePreview::slotGotImagePreview(const LoadingDescription &descriptio if (preview.isNull()) { - QPixmap pix(visibleWidth(), visibleHeight()); + TQPixmap pix(visibleWidth(), visibleHeight()); pix.fill(ThemeEngine::instance()->baseColor()); - QPainter p(&pix); - QFileInfo info(d->path); - p.setPen(QPen(ThemeEngine::instance()->textRegColor())); + TQPainter p(&pix); + TQFileInfo info(d->path); + p.setPen(TQPen(ThemeEngine::instance()->textRegColor())); p.drawText(0, 0, pix.width(), pix.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Unable to display preview for\n\"%1\"") - .arg(info.fileName())); + .tqarg(info.fileName())); p.end(); setImage(DImg(pix.convertToImage())); @@ -300,16 +300,16 @@ void LightTablePreview::slotGotImagePreview(const LoadingDescription &descriptio void LightTablePreview::slotNextPreload() { - QString loadPath; + TQString loadPath; if (!d->nextPath.isNull()) { loadPath = d->nextPath; - d->nextPath = QString(); + d->nextPath = TQString(); } else if (!d->previousPath.isNull()) { loadPath = d->previousPath; - d->previousPath = QString(); + d->previousPath = TQString(); } else return; @@ -332,8 +332,8 @@ void LightTablePreview::setImageInfo(ImageInfo* info, ImageInfo *previous, Image setSelected(false); } - setPreviousNextPaths(previous ? previous->filePath() : QString(), - next ? next->filePath() : QString()); + setPreviousNextPaths(previous ? previous->filePath() : TQString(), + next ? next->filePath() : TQString()); } ImageInfo* LightTablePreview::getImageInfo() const @@ -355,10 +355,10 @@ void LightTablePreview::slotContextMenu() KURL url(d->imageInfo->kurl().path()); KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true); - QValueVector<KService::Ptr> serviceVector; + TQValueVector<KService::Ptr> serviceVector; KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'"); - QPopupMenu openWithMenu; + TQPopupMenu openWithMenu; KTrader::OfferList::Iterator iter; KService::Ptr ptr; @@ -393,8 +393,8 @@ void LightTablePreview::slotContextMenu() // Bulk assignment/removal of tags -------------------------- - Q_LLONG id = d->imageInfo->id(); - QValueList<Q_LLONG> idList; + TQ_LLONG id = d->imageInfo->id(); + TQValueList<TQ_LLONG> idList; idList.append(id); assignTagsMenu = new TagsPopupMenu(idList, 1000, TagsPopupMenu::ASSIGN); @@ -405,11 +405,11 @@ void LightTablePreview::slotContextMenu() popmenu.insertItem(i18n("Assign Tag"), assignTagsMenu); int i = popmenu.insertItem(i18n("Remove Tag"), removeTagsMenu); - connect(assignTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotAssignTag(int))); + connect(assignTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotAssignTag(int))); - connect(removeTagsMenu, SIGNAL(signalTagActivated(int)), - this, SLOT(slotRemoveTag(int))); + connect(removeTagsMenu, TQT_SIGNAL(signalTagActivated(int)), + this, TQT_SLOT(slotRemoveTag(int))); AlbumDB* db = AlbumManager::instance()->albumDB(); if (!db->hasTags( idList )) @@ -421,14 +421,14 @@ void LightTablePreview::slotContextMenu() ratingMenu = new RatingPopupMenu(); - connect(ratingMenu, SIGNAL(activated(int)), - this, SLOT(slotAssignRating(int))); + connect(ratingMenu, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotAssignRating(int))); popmenu.insertItem(i18n("Assign Rating"), ratingMenu); // -------------------------------------------------------- - int idm = popmenu.exec(QCursor::pos()); + int idm = popmenu.exec(TQCursor::pos()); switch(idm) { @@ -511,7 +511,7 @@ void LightTablePreview::slotRemoveTag(int tagID) void LightTablePreview::slotAssignRating(int rating) { - rating = QMIN(RatingMax, QMAX(RatingMin, rating)); + rating = TQMIN(RatingMax, TQMAX(RatingMin, rating)); if (d->imageInfo) { MetadataHub hub; @@ -542,21 +542,21 @@ void LightTablePreview::slotCornerButtonPressed() pan->setImage(180, 120, getImage()); d->panIconPopup->setMainWidget(pan); - QRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), + TQRect r((int)(contentsX() / zoomFactor()), (int)(contentsY() / zoomFactor()), (int)(visibleWidth() / zoomFactor()), (int)(visibleHeight() / zoomFactor())); pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, SIGNAL(signalSelectionMoved(const QRect&, bool)), - this, SLOT(slotPanIconSelectionMoved(const QRect&, bool))); + connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, SIGNAL(signalHiden()), - this, SLOT(slotPanIconHiden())); + connect(pan, TQT_SIGNAL(signalHiden()), + this, TQT_SLOT(slotPanIconHiden())); - QPoint g = mapToGlobal(viewport()->pos()); + TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); g.setY(g.y()+ viewport()->size().height()); - d->panIconPopup->popup(QPoint(g.x() - d->panIconPopup->width(), + d->panIconPopup->popup(TQPoint(g.x() - d->panIconPopup->width(), g.y() - d->panIconPopup->height())); pan->setCursorToLocalRegionSelectionCenter(); @@ -569,7 +569,7 @@ void LightTablePreview::slotPanIconHiden() d->cornerButton->blockSignals(false); } -void LightTablePreview::slotPanIconSelectionMoved(const QRect& r, bool b) +void LightTablePreview::slotPanIconSelectionMoved(const TQRect& r, bool b) { setContentsPos((int)(r.x()*zoomFactor()), (int)(r.y()*zoomFactor())); @@ -594,11 +594,11 @@ void LightTablePreview::zoomFactorChanged(double zoom) PreviewWidget::zoomFactorChanged(zoom); } -void LightTablePreview::resizeEvent(QResizeEvent* e) +void LightTablePreview::resizeEvent(TQResizeEvent* e) { if (!e) return; - QScrollView::resizeEvent(e); + TQScrollView::resizeEvent(e); if (!d->imageInfo) { @@ -647,7 +647,7 @@ bool LightTablePreview::previewIsNull() void LightTablePreview::resetPreview() { d->preview = DImg(); - d->path = QString(); + d->path = TQString(); d->imageInfo = 0; setDragAndDropMessage(); @@ -657,20 +657,20 @@ void LightTablePreview::resetPreview() emit signalPreviewLoaded(false); } -void LightTablePreview::paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh) +void LightTablePreview::paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh) { DImg img = d->preview.smoothScaleSection(sx, sy, sw, sh, tileSize(), tileSize()); - QPixmap pix2 = img.convertToPixmap(); + TQPixmap pix2 = img.convertToPixmap(); bitBlt(pix, 0, 0, &pix2, 0, 0); } -void LightTablePreview::contentsDragMoveEvent(QDragMoveEvent *e) +void LightTablePreview::contentsDragMoveEvent(TQDragMoveEvent *e) { if (d->dragAndDropEnabled) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; @@ -686,20 +686,20 @@ void LightTablePreview::contentsDragMoveEvent(QDragMoveEvent *e) e->ignore(); } -void LightTablePreview::contentsDropEvent(QDropEvent *e) +void LightTablePreview::contentsDropEvent(TQDropEvent *e) { if (d->dragAndDropEnabled) { int albumID; - QValueList<int> albumIDs; - QValueList<int> imageIDs; + TQValueList<int> albumIDs; + TQValueList<int> imageIDs; KURL::List urls; KURL::List kioURLs; ImageInfoList list; if (ItemDrag::decode(e, urls, kioURLs, albumIDs, imageIDs)) { - for (QValueList<int>::const_iterator it = imageIDs.begin(); + for (TQValueList<int>::const_iterator it = imageIDs.begin(); it != imageIDs.end(); ++it) { list.append(new ImageInfo(*it)); @@ -711,9 +711,9 @@ void LightTablePreview::contentsDropEvent(QDropEvent *e) } else if (AlbumDrag::decode(e, urls, albumID)) { - QValueList<Q_LLONG> itemIDs = AlbumManager::instance()->albumDB()->getItemIDsInAlbum(albumID); + TQValueList<TQ_LLONG> itemIDs = AlbumManager::instance()->albumDB()->getItemIDsInAlbum(albumID); - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { list.append(new ImageInfo(*it)); @@ -725,16 +725,16 @@ void LightTablePreview::contentsDropEvent(QDropEvent *e) } else if(TagDrag::canDecode(e)) { - QByteArray ba = e->encodedData("digikam/tag-id"); - QDataStream ds(ba, IO_ReadOnly); + TQByteArray ba = e->tqencodedData("digikam/tag-id"); + TQDataStream ds(ba, IO_ReadOnly); int tagID; ds >> tagID; AlbumManager* man = AlbumManager::instance(); - QValueList<Q_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); + TQValueList<TQ_LLONG> itemIDs = man->albumDB()->getItemIDsInTag(tagID, true); ImageInfoList imageInfoList; - for (QValueList<Q_LLONG>::const_iterator it = itemIDs.begin(); + for (TQValueList<TQ_LLONG>::const_iterator it = itemIDs.begin(); it != itemIDs.end(); ++it) { list.append(new ImageInfo(*it)); @@ -763,7 +763,7 @@ bool LightTablePreview::isSelected() return d->selected; } -void LightTablePreview::drawFrame(QPainter *p) +void LightTablePreview::drawFrame(TQPainter *p) { if (d->selected) { diff --git a/digikam/utilities/lighttable/lighttablepreview.h b/digikam/utilities/lighttable/lighttablepreview.h index 2612339..4cdc5c2 100644 --- a/digikam/utilities/lighttable/lighttablepreview.h +++ b/digikam/utilities/lighttable/lighttablepreview.h @@ -24,11 +24,11 @@ #ifndef LIGHTTABLEPREVIEW_H #define LIGHTTABLEPREVIEW_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qimage.h> -#include <qsize.h> +#include <tqstring.h> +#include <tqimage.h> +#include <tqsize.h> // Local includes. @@ -36,7 +36,7 @@ #include "previewwidget.h" #include "digikam_export.h" -class QPixmap; +class TQPixmap; namespace Digikam { @@ -49,10 +49,11 @@ class DIGIKAM_EXPORT LightTablePreview : public PreviewWidget { Q_OBJECT + TQ_OBJECT public: - LightTablePreview(QWidget *parent=0); + LightTablePreview(TQWidget *tqparent=0); ~LightTablePreview(); void setLoadFullImageSize(bool b); @@ -60,14 +61,14 @@ public: void setImage(const DImg& image); DImg& getImage() const; - QSize getImageSize(); + TQSize getImageSize(); void setImageInfo(ImageInfo* info=0, ImageInfo *previous=0, ImageInfo *next=0); ImageInfo* getImageInfo() const; void reload(); - void setImagePath(const QString& path=QString()); - void setPreviousNextPaths(const QString& previous, const QString &next); + void setImagePath(const TQString& path=TQString()); + void setPreviousNextPaths(const TQString& previous, const TQString &next); void setSelected(bool sel); bool isSelected(); @@ -85,8 +86,8 @@ signals: protected: - void resizeEvent(QResizeEvent* e); - void drawFrame(QPainter *p); + void resizeEvent(TQResizeEvent* e); + void drawFrame(TQPainter *p); private slots: @@ -98,7 +99,7 @@ private slots: void slotAssignRating(int rating); void slotThemeChanged(); void slotCornerButtonPressed(); - void slotPanIconSelectionMoved(const QRect&, bool); + void slotPanIconSelectionMoved(const TQRect&, bool); void slotPanIconHiden(); private: @@ -109,10 +110,10 @@ private: void resetPreview(); void zoomFactorChanged(double zoom); void updateZoomAndSize(bool alwaysFitToWindow); - inline void paintPreview(QPixmap *pix, int sx, int sy, int sw, int sh); + inline void paintPreview(TQPixmap *pix, int sx, int sy, int sw, int sh); - void contentsDragMoveEvent(QDragMoveEvent*); - void contentsDropEvent(QDropEvent*); + void contentsDragMoveEvent(TQDragMoveEvent*); + void contentsDropEvent(TQDropEvent*); private: diff --git a/digikam/utilities/lighttable/lighttableview.cpp b/digikam/utilities/lighttable/lighttableview.cpp index 2ee9633..d23c356 100644 --- a/digikam/utilities/lighttable/lighttableview.cpp +++ b/digikam/utilities/lighttable/lighttableview.cpp @@ -22,9 +22,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> +#include <tqlayout.h> // KDE includes. @@ -59,22 +59,22 @@ public: bool leftLoading; // To not sync right panel during left loading. bool rightLoading; // To not sync left panel during right loading. - QGridLayout *grid; + TQGridLayout *grid; LightTablePreview *leftPreview; LightTablePreview *rightPreview; }; -LightTableView::LightTableView(QWidget *parent) - : QFrame(parent, 0, Qt::WDestructiveClose) +LightTableView::LightTableView(TQWidget *tqparent) + : TQFrame(tqparent, 0, TQt::WDestructiveClose) { d = new LightTableViewPriv; - setFrameStyle(QFrame::NoFrame); + setFrameStyle(TQFrame::NoFrame); setMargin(0); setLineWidth(0); - d->grid = new QGridLayout(this, 1, 1, 0, 1); + d->grid = new TQGridLayout(this, 1, 1, 0, 1); d->leftPreview = new LightTablePreview(this); d->rightPreview = new LightTablePreview(this); @@ -87,55 +87,55 @@ LightTableView::LightTableView(QWidget *parent) // Left panel connections ------------------------------------------------ - connect(d->leftPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotLeftContentsMoved(int, int))); - connect(d->leftPreview, SIGNAL(signalSlideShow()), - this, SIGNAL(signalSlideShow())); + connect(d->leftPreview, TQT_SIGNAL(signalSlideShow()), + this, TQT_SIGNAL(signalSlideShow())); - connect(d->leftPreview, SIGNAL(signalDeleteItem(ImageInfo*)), - this, SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->leftPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->leftPreview, SIGNAL(signalEditItem(ImageInfo*)), - this, SIGNAL(signalEditItem(ImageInfo*))); + connect(d->leftPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), + this, TQT_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->leftPreview, SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); + connect(d->leftPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&))); - connect(d->leftPreview, SIGNAL(signalPreviewLoaded(bool)), - this, SLOT(slotLeftPreviewLoaded(bool))); + connect(d->leftPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), + this, TQT_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->leftPreview, SIGNAL(signalLeftButtonClicked()), - this, SIGNAL(signalLeftPanelLeftButtonClicked())); + connect(d->leftPreview, TQT_SIGNAL(signalLeftButtonClicked()), + this, TQT_SIGNAL(signalLeftPanelLeftButtonClicked())); // Right panel connections ------------------------------------------------ - connect(d->rightPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotRightContentsMoved(int, int))); - connect(d->rightPreview, SIGNAL(signalDeleteItem(ImageInfo*)), - this, SIGNAL(signalDeleteItem(ImageInfo*))); + connect(d->rightPreview, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), + this, TQT_SIGNAL(signalDeleteItem(ImageInfo*))); - connect(d->rightPreview, SIGNAL(signalEditItem(ImageInfo*)), - this, SIGNAL(signalEditItem(ImageInfo*))); + connect(d->rightPreview, TQT_SIGNAL(signalEditItem(ImageInfo*)), + this, TQT_SIGNAL(signalEditItem(ImageInfo*))); - connect(d->rightPreview, SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, SIGNAL(signalRightDroppedItems(const ImageInfoList&))); + connect(d->rightPreview, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), + this, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&))); - connect(d->rightPreview, SIGNAL(signalSlideShow()), - this, SIGNAL(signalSlideShow())); + connect(d->rightPreview, TQT_SIGNAL(signalSlideShow()), + this, TQT_SIGNAL(signalSlideShow())); - connect(d->rightPreview, SIGNAL(signalPreviewLoaded(bool)), - this, SLOT(slotRightPreviewLoaded(bool))); + connect(d->rightPreview, TQT_SIGNAL(signalPreviewLoaded(bool)), + this, TQT_SLOT(slotRightPreviewLoaded(bool))); - connect(d->rightPreview, SIGNAL(signalLeftButtonClicked()), - this, SIGNAL(signalRightPanelLeftButtonClicked())); + connect(d->rightPreview, TQT_SIGNAL(signalLeftButtonClicked()), + this, TQT_SIGNAL(signalRightPanelLeftButtonClicked())); } LightTableView::~LightTableView() @@ -324,21 +324,21 @@ void LightTableView::slotLeftContentsMoved(int x, int y) { if (d->syncPreview && !d->leftLoading) { - disconnect(d->rightPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalRightZoomFactorChanged(double))); + disconnect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); - disconnect(d->rightPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotRightContentsMoved(int, int))); + disconnect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotRightContentsMoved(int, int))); setRightZoomFactor(d->leftPreview->zoomFactor()); emit signalRightZoomFactorChanged(d->leftPreview->zoomFactor()); d->rightPreview->setContentsPos(x, y); - connect(d->rightPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalRightZoomFactorChanged(double))); + connect(d->rightPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalRightZoomFactorChanged(double))); - connect(d->rightPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotRightContentsMoved(int, int))); + connect(d->rightPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotRightContentsMoved(int, int))); } } @@ -346,22 +346,22 @@ void LightTableView::slotRightContentsMoved(int x, int y) { if (d->syncPreview && !d->rightLoading) { - disconnect(d->leftPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalLeftZoomFactorChanged(double))); + disconnect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); - disconnect(d->leftPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotLeftContentsMoved(int, int))); + disconnect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotLeftContentsMoved(int, int))); setLeftZoomFactor(d->rightPreview->zoomFactor()); emit signalLeftZoomFactorChanged(d->rightPreview->zoomFactor()); d->leftPreview->setContentsPos(x, y); - connect(d->leftPreview, SIGNAL(signalZoomFactorChanged(double)), - this, SIGNAL(signalLeftZoomFactorChanged(double))); + connect(d->leftPreview, TQT_SIGNAL(signalZoomFactorChanged(double)), + this, TQT_SIGNAL(signalLeftZoomFactorChanged(double))); - connect(d->leftPreview, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotLeftContentsMoved(int, int))); + connect(d->leftPreview, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotLeftContentsMoved(int, int))); } } diff --git a/digikam/utilities/lighttable/lighttableview.h b/digikam/utilities/lighttable/lighttableview.h index 92b6055..2b0fe50 100644 --- a/digikam/utilities/lighttable/lighttableview.h +++ b/digikam/utilities/lighttable/lighttableview.h @@ -25,10 +25,10 @@ #ifndef LIGHTTABLEVIEW_H #define LIGHTTABLEVIEW_H -// Qt includes. +// TQt includes. -#include <qframe.h> -#include <qstring.h> +#include <tqframe.h> +#include <tqstring.h> // Local includes. @@ -40,14 +40,15 @@ namespace Digikam class LightTableViewPriv; -class DIGIKAM_EXPORT LightTableView : public QFrame +class DIGIKAM_EXPORT LightTableView : public TQFrame { Q_OBJECT + TQ_OBJECT public: - LightTableView(QWidget *parent=0); + LightTableView(TQWidget *tqparent=0); ~LightTableView(); void setSyncPreview(bool sync); diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index d760c40..37147bf 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qdockarea.h> +#include <tqdockarea.h> // KDE includes. @@ -170,7 +170,7 @@ void LightTableWindow::refreshView() d->rightSidebar->refreshTagsView(); } -void LightTableWindow::closeEvent(QCloseEvent* e) +void LightTableWindow::closeEvent(TQCloseEvent* e) { if (!e) return; @@ -181,16 +181,16 @@ void LightTableWindow::closeEvent(QCloseEvent* e) void LightTableWindow::setupUserArea() { - QWidget* mainW = new QWidget(this); - d->hSplitter = new QSplitter(Qt::Horizontal, mainW); - QHBoxLayout *hlay = new QHBoxLayout(mainW); + TQWidget* mainW = new TQWidget(this); + d->hSplitter = new TQSplitter(Qt::Horizontal, mainW); + TQHBoxLayout *hlay = new TQHBoxLayout(mainW); d->leftSidebar = new ImagePropertiesSideBarDB(mainW, "LightTable Left Sidebar", d->hSplitter, Sidebar::Left, true); - QWidget* centralW = new QWidget(d->hSplitter); - QVBoxLayout *vlay = new QVBoxLayout(centralW); - d->vSplitter = new QSplitter(Qt::Vertical, centralW); + TQWidget* centralW = new TQWidget(d->hSplitter); + TQVBoxLayout *vlay = new TQVBoxLayout(centralW); + d->vSplitter = new TQSplitter(Qt::Vertical, centralW); d->barView = new LightTableBar(d->vSplitter, ThumbBarView::Horizontal, AlbumSettings::instance()->getExifRotate()); d->previewView = new LightTableView(d->vSplitter); @@ -204,13 +204,13 @@ void LightTableWindow::setupUserArea() hlay->addWidget(d->hSplitter); hlay->addWidget(d->rightSidebar); - d->hSplitter->setFrameStyle( QFrame::NoFrame ); - d->hSplitter->setFrameShadow( QFrame::Plain ); - d->hSplitter->setFrameShape( QFrame::NoFrame ); + d->hSplitter->setFrameStyle( TQFrame::NoFrame ); + d->hSplitter->setFrameShadow( TQFrame::Plain ); + d->hSplitter->setFrameShape( TQFrame::NoFrame ); d->hSplitter->setOpaqueResize(false); - d->vSplitter->setFrameStyle( QFrame::NoFrame ); - d->vSplitter->setFrameShadow( QFrame::Plain ); - d->vSplitter->setFrameShape( QFrame::NoFrame ); + d->vSplitter->setFrameStyle( TQFrame::NoFrame ); + d->vSplitter->setFrameShadow( TQFrame::Plain ); + d->vSplitter->setFrameShape( TQFrame::NoFrame ); d->vSplitter->setOpaqueResize(false); setCentralWidget(mainW); @@ -224,7 +224,7 @@ void LightTableWindow::setupStatusBar() d->leftZoomBar->setEnabled(false); d->statusProgressBar = new StatusProgressBar(statusBar()); - d->statusProgressBar->setAlignment(Qt::AlignCenter); + d->statusProgressBar->tqsetAlignment(TQt::AlignCenter); d->statusProgressBar->setMaximumHeight(fontMetrics().height()+2); statusBar()->addWidget(d->statusProgressBar, 100); @@ -236,210 +236,210 @@ void LightTableWindow::setupStatusBar() void LightTableWindow::setupConnections() { - connect(d->statusProgressBar, SIGNAL(signalCancelButtonPressed()), - this, SLOT(slotProgressBarCancelButtonPressed())); + connect(d->statusProgressBar, TQT_SIGNAL(signalCancelButtonPressed()), + TQT_TQOBJECT(this), TQT_SLOT(slotProgressBarCancelButtonPressed())); - connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()), - this, SLOT(slotThemeChanged())); + connect(ThemeEngine::instance(), TQT_SIGNAL(signalThemeChanged()), + TQT_TQOBJECT(this), TQT_SLOT(slotThemeChanged())); // Thumbs bar connections --------------------------------------- - connect(d->barView, SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), - this, SLOT(slotSetItemOnLeftPanel(ImageInfo*))); + connect(d->barView, TQT_SIGNAL(signalSetItemOnLeftPanel(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnLeftPanel(ImageInfo*))); - connect(d->barView, SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), - this, SLOT(slotSetItemOnRightPanel(ImageInfo*))); + connect(d->barView, TQT_SIGNAL(signalSetItemOnRightPanel(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotSetItemOnRightPanel(ImageInfo*))); - connect(d->barView, SIGNAL(signalRemoveItem(ImageInfo*)), - this, SLOT(slotRemoveItem(ImageInfo*))); + connect(d->barView, TQT_SIGNAL(signalRemoveItem(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem(ImageInfo*))); - connect(d->barView, SIGNAL(signalEditItem(ImageInfo*)), - this, SLOT(slotEditItem(ImageInfo*))); + connect(d->barView, TQT_SIGNAL(signalEditItem(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); - connect(d->barView, SIGNAL(signalClearAll()), - this, SLOT(slotClearItemsList())); + connect(d->barView, TQT_SIGNAL(signalClearAll()), + TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList())); - connect(d->barView, SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), - this, SLOT(slotItemSelected(ImageInfo*))); + connect(d->barView, TQT_SIGNAL(signalLightTableBarItemSelected(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotItemSelected(ImageInfo*))); - connect(d->barView, SIGNAL(signalDroppedItems(const ImageInfoList&)), - this, SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); + connect(d->barView, TQT_SIGNAL(signalDroppedItems(const ImageInfoList&)), + TQT_TQOBJECT(this), TQT_SLOT(slotThumbbarDroppedItems(const ImageInfoList&))); // Zoom bars connections ----------------------------------------- - connect(d->leftZoomBar, SIGNAL(signalZoomMinusClicked()), - d->previewView, SLOT(slotDecreaseLeftZoom())); + connect(d->leftZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQT_SLOT(slotDecreaseLeftZoom())); - connect(d->leftZoomBar, SIGNAL(signalZoomPlusClicked()), - d->previewView, SLOT(slotIncreaseLeftZoom())); + connect(d->leftZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQT_SLOT(slotIncreaseLeftZoom())); - connect(d->leftZoomBar, SIGNAL(signalZoomSliderChanged(int)), - d->previewView, SLOT(slotLeftZoomSliderChanged(int))); + connect(d->leftZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQT_SLOT(slotLeftZoomSliderChanged(int))); - connect(d->rightZoomBar, SIGNAL(signalZoomMinusClicked()), - d->previewView, SLOT(slotDecreaseRightZoom())); + connect(d->rightZoomBar, TQT_SIGNAL(signalZoomMinusClicked()), + d->previewView, TQT_SLOT(slotDecreaseRightZoom())); - connect(d->rightZoomBar, SIGNAL(signalZoomPlusClicked()), - d->previewView, SLOT(slotIncreaseRightZoom())); + connect(d->rightZoomBar, TQT_SIGNAL(signalZoomPlusClicked()), + d->previewView, TQT_SLOT(slotIncreaseRightZoom())); - connect(d->rightZoomBar, SIGNAL(signalZoomSliderChanged(int)), - d->previewView, SLOT(slotRightZoomSliderChanged(int))); + connect(d->rightZoomBar, TQT_SIGNAL(signalZoomSliderChanged(int)), + d->previewView, TQT_SLOT(slotRightZoomSliderChanged(int))); // View connections --------------------------------------------- - connect(d->previewView, SIGNAL(signalLeftZoomFactorChanged(double)), - this, SLOT(slotLeftZoomFactorChanged(double))); + connect(d->previewView, TQT_SIGNAL(signalLeftZoomFactorChanged(double)), + TQT_TQOBJECT(this), TQT_SLOT(slotLeftZoomFactorChanged(double))); - connect(d->previewView, SIGNAL(signalRightZoomFactorChanged(double)), - this, SLOT(slotRightZoomFactorChanged(double))); + connect(d->previewView, TQT_SIGNAL(signalRightZoomFactorChanged(double)), + TQT_TQOBJECT(this), TQT_SLOT(slotRightZoomFactorChanged(double))); - connect(d->previewView, SIGNAL(signalEditItem(ImageInfo*)), - this, SLOT(slotEditItem(ImageInfo*))); + connect(d->previewView, TQT_SIGNAL(signalEditItem(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotEditItem(ImageInfo*))); - connect(d->previewView, SIGNAL(signalDeleteItem(ImageInfo*)), - this, SLOT(slotDeleteItem(ImageInfo*))); + connect(d->previewView, TQT_SIGNAL(signalDeleteItem(ImageInfo*)), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem(ImageInfo*))); - connect(d->previewView, SIGNAL(signalSlideShow()), - this, SLOT(slotToggleSlideShow())); + connect(d->previewView, TQT_SIGNAL(signalSlideShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow())); - connect(d->previewView, SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), - this, SLOT(slotLeftDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQT_SIGNAL(signalLeftDroppedItems(const ImageInfoList&)), + TQT_TQOBJECT(this), TQT_SLOT(slotLeftDroppedItems(const ImageInfoList&))); - connect(d->previewView, SIGNAL(signalRightDroppedItems(const ImageInfoList&)), - this, SLOT(slotRightDroppedItems(const ImageInfoList&))); + connect(d->previewView, TQT_SIGNAL(signalRightDroppedItems(const ImageInfoList&)), + TQT_TQOBJECT(this), TQT_SLOT(slotRightDroppedItems(const ImageInfoList&))); - connect(d->previewView, SIGNAL(signalToggleOnSyncPreview(bool)), - this, SLOT(slotToggleOnSyncPreview(bool))); + connect(d->previewView, TQT_SIGNAL(signalToggleOnSyncPreview(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleOnSyncPreview(bool))); - connect(d->previewView, SIGNAL(signalLeftPreviewLoaded(bool)), - this, SLOT(slotLeftPreviewLoaded(bool))); + connect(d->previewView, TQT_SIGNAL(signalLeftPreviewLoaded(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotLeftPreviewLoaded(bool))); - connect(d->previewView, SIGNAL(signalRightPreviewLoaded(bool)), - this, SLOT(slotRightPreviewLoaded(bool))); + connect(d->previewView, TQT_SIGNAL(signalRightPreviewLoaded(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotRightPreviewLoaded(bool))); - connect(d->previewView, SIGNAL(signalLeftPanelLeftButtonClicked()), - this, SLOT(slotLeftPanelLeftButtonClicked())); + connect(d->previewView, TQT_SIGNAL(signalLeftPanelLeftButtonClicked()), + TQT_TQOBJECT(this), TQT_SLOT(slotLeftPanelLeftButtonClicked())); - connect(d->previewView, SIGNAL(signalRightPanelLeftButtonClicked()), - this, SLOT(slotRightPanelLeftButtonClicked())); + connect(d->previewView, TQT_SIGNAL(signalRightPanelLeftButtonClicked()), + TQT_TQOBJECT(this), TQT_SLOT(slotRightPanelLeftButtonClicked())); } void LightTableWindow::setupActions() { // -- Standard 'File' menu actions --------------------------------------------- - d->backwardAction = KStdAction::back(this, SLOT(slotBackward()), + d->backwardAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), actionCollection(), "lighttable_backward"); d->backwardAction->setEnabled(false); - d->forwardAction = KStdAction::forward(this, SLOT(slotForward()), + d->forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()), actionCollection(), "lighttable_forward"); d->forwardAction->setEnabled(false); d->firstAction = new KAction(i18n("&First"), "start", KStdAccel::shortcut( KStdAccel::Home), - this, SLOT(slotFirst()), + TQT_TQOBJECT(this), TQT_SLOT(slotFirst()), actionCollection(), "lighttable_first"); d->firstAction->setEnabled(false); d->lastAction = new KAction(i18n("&Last"), "finish", KStdAccel::shortcut( KStdAccel::End), - this, SLOT(slotLast()), + TQT_TQOBJECT(this), TQT_SLOT(slotLast()), actionCollection(), "lighttable_last"); d->lastAction->setEnabled(false); d->setItemLeftAction = new KAction(i18n("On Left"), "previous", - CTRL+Key_L, this, SLOT(slotSetItemLeft()), + CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemLeft()), actionCollection(), "lighttable_setitemleft"); d->setItemLeftAction->setEnabled(false); d->setItemLeftAction->setWhatsThis(i18n("Show item on left panel")); d->setItemRightAction = new KAction(i18n("On Right"), "next", - CTRL+Key_R, this, SLOT(slotSetItemRight()), + CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemRight()), actionCollection(), "lighttable_setitemright"); d->setItemRightAction->setEnabled(false); d->setItemRightAction->setWhatsThis(i18n("Show item on right panel")); d->editItemAction = new KAction(i18n("Edit"), "editimage", - Key_F4, this, SLOT(slotEditItem()), + Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEditItem()), actionCollection(), "lighttable_edititem"); d->editItemAction->setEnabled(false); d->removeItemAction = new KAction(i18n("Remove item from LightTable"), "fileclose", - CTRL+Key_K, this, SLOT(slotRemoveItem()), + CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), actionCollection(), "lighttable_removeitem"); d->removeItemAction->setEnabled(false); d->clearListAction = new KAction(i18n("Remove all items from LightTable"), "editshred", - CTRL+SHIFT+Key_K, this, SLOT(slotClearItemsList()), + CTRL+SHIFT+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()), actionCollection(), "lighttable_clearlist"); d->clearListAction->setEnabled(false); d->fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash", Key_Delete, - this, SLOT(slotDeleteItem()), + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()), actionCollection(), "lighttable_filedelete"); d->fileDeleteAction->setEnabled(false); - KStdAction::close(this, SLOT(close()), actionCollection(), "lighttable_close"); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "lighttable_close"); // -- Standard 'View' menu actions --------------------------------------------- d->syncPreviewAction = new KToggleAction(i18n("Synchronize"), "goto", - CTRL+SHIFT+Key_Y, this, - SLOT(slotToggleSyncPreview()), + CTRL+SHIFT+Key_Y, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleSyncPreview()), actionCollection(), "lighttable_syncpreview"); d->syncPreviewAction->setEnabled(false); d->syncPreviewAction->setWhatsThis(i18n("Synchronize preview from left and right panels")); d->navigateByPairAction = new KToggleAction(i18n("By Pair"), "kcmsystem", - CTRL+SHIFT+Key_P, this, - SLOT(slotToggleNavigateByPair()), + CTRL+SHIFT+Key_P, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleNavigateByPair()), actionCollection(), "lighttable_navigatebypair"); d->navigateByPairAction->setEnabled(false); d->navigateByPairAction->setWhatsThis(i18n("Navigate by pair with all items")); - d->zoomPlusAction = KStdAction::zoomIn(d->previewView, SLOT(slotIncreaseZoom()), + d->zoomPlusAction = KStdAction::zoomIn(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()), actionCollection(), "lighttable_zoomplus"); d->zoomPlusAction->setEnabled(false); - d->zoomMinusAction = KStdAction::zoomOut(d->previewView, SLOT(slotDecreaseZoom()), + d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()), actionCollection(), "lighttable_zoomminus"); d->zoomMinusAction->setEnabled(false); d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1", ALT+CTRL+Key_0, // NOTE: Photoshop 7 use ALT+CTRL+0. - this, SLOT(slotZoomTo100Percents()), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()), actionCollection(), "lighttable_zoomto100percents"); d->zoomFitToWindowAction = new KAction(i18n("Fit to &Window"), "view_fit_window", - CTRL+SHIFT+Key_E, this, SLOT(slotFitToWindow()), + CTRL+SHIFT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotFitToWindow()), actionCollection(), "lighttable_zoomfit2window"); // Do not use std KDE action for full screen because action text is too large for app. toolbar. d->fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen", - CTRL+SHIFT+Key_F, this, - SLOT(slotToggleFullScreen()), + CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), + TQT_SLOT(slotToggleFullScreen()), actionCollection(), "lighttable_fullscreen"); d->fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode")); d->slideShowAction = new KAction(i18n("Slideshow"), "slideshow", Key_F9, - this, SLOT(slotToggleSlideShow()), + TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()), actionCollection(),"lighttable_slideshow"); // -- Standard 'Configure' menu actions ---------------------------------------- - d->showMenuBarAction = KStdAction::showMenubar(this, SLOT(slotShowMenuBar()), actionCollection()); + d->showMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(slotConfToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(slotSetup()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbars()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSetup()), actionCollection()); // ----------------------------------------------------------------------------------------- d->themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu"); - connect(d->themeMenuAction, SIGNAL(activated(const QString&)), - this, SLOT(slotChangeTheme(const QString&))); + connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&))); d->themeMenuAction->setItems(ThemeEngine::instance()->themeNames()); slotThemeChanged(); @@ -449,21 +449,21 @@ void LightTableWindow::setupActions() d->donateMoneyAction = new KAction(i18n("Donate..."), 0, 0, - this, SLOT(slotDonateMoney()), + TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()), actionCollection(), "lighttable_donatemoney"); d->contributeAction = new KAction(i18n("Contribute..."), 0, 0, - this, SLOT(slotContribute()), + TQT_TQOBJECT(this), TQT_SLOT(slotContribute()), actionCollection(), "lighttable_contribute"); d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"), "kdcraw", 0, - this, - SLOT(slotRawCameraList()), + TQT_TQOBJECT(this), + TQT_SLOT(slotRawCameraList()), actionCollection(), "lighttable_rawcameralist"); @@ -477,22 +477,22 @@ void LightTableWindow::setupActions() // -- Rating actions --------------------------------------------------------------- d->star0 = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0, - d->barView, SLOT(slotAssignRatingNoStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingNoStar()), actionCollection(), "lighttable_ratenostar"); d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1, - d->barView, SLOT(slotAssignRatingOneStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingOneStar()), actionCollection(), "lighttable_rateonestar"); d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, - d->barView, SLOT(slotAssignRatingTwoStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingTwoStar()), actionCollection(), "lighttable_ratetwostar"); d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, - d->barView, SLOT(slotAssignRatingThreeStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingThreeStar()), actionCollection(), "lighttable_ratethreestar"); d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, - d->barView, SLOT(slotAssignRatingFourStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFourStar()), actionCollection(), "lighttable_ratefourstar"); d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, - d->barView, SLOT(slotAssignRatingFiveStar()), + TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFiveStar()), actionCollection(), "lighttable_ratefivestar"); // --------------------------------------------------------------------------------- @@ -508,42 +508,42 @@ void LightTableWindow::setupAccelerators() d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"), i18n("Exit fullscreen viewing mode"), - Key_Escape, this, SLOT(slotEscapePressed()), + Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotEscapePressed()), false, true); d->accelerators->insert("Next Image Key_Space", i18n("Next Image"), i18n("Load Next Image"), - Key_Space, this, SLOT(slotForward()), + Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image SHIFT+Key_Space", i18n("Previous Image"), i18n("Load Previous Image"), - SHIFT+Key_Space, this, SLOT(slotBackward()), + SHIFT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Previous Image Key_Backspace", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Backspace, this, SLOT(slotBackward()), + Key_Backspace, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Next Image Key_Next", i18n("Next Image"), i18n("Load Next Image"), - Key_Next, this, SLOT(slotForward()), + Key_Next, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), false, true); d->accelerators->insert("Previous Image Key_Prior", i18n("Previous Image"), i18n("Load Previous Image"), - Key_Prior, this, SLOT(slotBackward()), + Key_Prior, TQT_TQOBJECT(this), TQT_SLOT(slotBackward()), false, true); d->accelerators->insert("Zoom Plus Key_Plus", i18n("Zoom in"), i18n("Zoom in on image"), - Key_Plus, d->previewView, SLOT(slotIncreaseZoom()), + Key_Plus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotIncreaseZoom()), false, true); d->accelerators->insert("Zoom Plus Key_Minus", i18n("Zoom out"), i18n("Zoom out from image"), - Key_Minus, d->previewView, SLOT(slotDecreaseZoom()), + Key_Minus, TQT_TQOBJECT(d->previewView), TQT_SLOT(slotDecreaseZoom()), false, true); } @@ -579,7 +579,7 @@ void LightTableWindow::loadImageInfos(const ImageInfoList &list, AlbumSettings *settings = AlbumSettings::instance(); if (!settings) return; - QString imagefilter = settings->getImageFileFilter().lower() + + TQString imagefilter = settings->getImageFileFilter().lower() + settings->getImageFileFilter().upper(); #if KDCRAW_VERSION < 0x000106 @@ -595,11 +595,11 @@ void LightTableWindow::loadImageInfos(const ImageInfoList &list, #endif d->barView->blockSignals(true); - for (QPtrList<ImageInfo>::const_iterator it = l.begin(); it != l.end(); ++it) + for (TQPtrList<ImageInfo>::const_iterator it = l.begin(); it != l.end(); ++it) { - QString fileExtension = (*it)->kurl().fileName().section( '.', -1 ); + TQString fileExtension = (*it)->kurl().fileName().section( '.', -1 ); - if ( imagefilter.find(fileExtension) != -1 && + if ( imagefilter.tqfind(fileExtension) != -1 && !d->barView->findItemByInfo(*it) ) { new LightTableBarItem(d->barView, *it); @@ -631,7 +631,7 @@ void LightTableWindow::refreshStatusBar() default: d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, i18n("%1 items on Light Table") - .arg(d->barView->countItems())); + .tqarg(d->barView->countItems())); break; } } @@ -989,7 +989,7 @@ void LightTableWindow::slotDeleteItem(ImageInfo* info) if (!SyncJob::del(kioURL, useTrash)) { - QString errMsg(SyncJob::lastErrorMsg()); + TQString errMsg(SyncJob::lastErrorMsg()); KMessageBox::error(this, errMsg, errMsg); return; } @@ -1019,7 +1019,7 @@ void LightTableWindow::slotRemoveItem(ImageInfo* info) ImageInfo *new_linfo = 0; ImageInfo *new_rinfo = 0; - Q_LLONG infoId = info->id(); + TQ_LLONG infoId = info->id(); // First determine the next images to the current left and right image: ImageInfo *next_linfo = 0; @@ -1312,7 +1312,7 @@ void LightTableWindow::slideShow(bool startWithCurrent, SlideShowSettings& setti kapp->processEvents(); } - d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, QString()); + d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, TQString()); refreshStatusBar(); if (!d->cancelSlideShow) @@ -1337,11 +1337,7 @@ void LightTableWindow::slotToggleFullScreen() if (d->fullScreen) // out of fullscreen { -#if QT_VERSION >= 0x030300 setWindowState( windowState() & ~WindowFullScreen ); -#else - showNormal(); -#endif menuBar()->show(); statusBar()->show(); leftDock()->show(); @@ -1349,11 +1345,11 @@ void LightTableWindow::slotToggleFullScreen() topDock()->show(); bottomDock()->show(); - QObject* obj = child("ToolBar","KToolBar"); + TQObject* obj = child("ToolBar","KToolBar"); if (obj) { - KToolBar* toolBar = static_cast<KToolBar*>(obj); + KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj)); if (d->fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton) d->fullScreenAction->unplug(toolBar); @@ -1389,11 +1385,11 @@ void LightTableWindow::slotToggleFullScreen() rightDock()->hide(); bottomDock()->hide(); - QObject* obj = child("ToolBar","KToolBar"); + TQObject* obj = child("ToolBar","KToolBar"); if (obj) { - KToolBar* toolBar = static_cast<KToolBar*>(obj); + KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj)); if (d->fullScreenHideToolBar) { @@ -1445,7 +1441,7 @@ void LightTableWindow::slotEscapePressed() void LightTableWindow::showToolBars() { - QPtrListIterator<KToolBar> it = toolBarIterator(); + TQPtrListIterator<KToolBar> it = toolBarIterator(); KToolBar* bar; for( ; it.current()!=0L ; ++it) @@ -1461,7 +1457,7 @@ void LightTableWindow::showToolBars() void LightTableWindow::hideToolBars() { - QPtrListIterator<KToolBar> it = toolBarIterator(); + TQPtrListIterator<KToolBar> it = toolBarIterator(); KToolBar* bar; for( ; it.current()!=0L ; ++it) @@ -1485,7 +1481,7 @@ void LightTableWindow::plugActionAccel(KAction* action) action->whatsThis(), action->shortcut(), action, - SLOT(activate())); + TQT_SLOT(activate())); } void LightTableWindow::unplugActionAccel(KAction* action) @@ -1515,8 +1511,8 @@ void LightTableWindow::slotConfToolbars() saveMainWindowSettings(KGlobal::config(), "LightTable Settings"); KEditToolbar dlg(factory(), this); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -1530,7 +1526,7 @@ void LightTableWindow::slotSetup() { Setup setup(this, 0); - if (setup.exec() != QDialog::Accepted) + if (setup.exec() != TQDialog::Accepted) return; kapp->config()->sync(); @@ -1549,7 +1545,7 @@ void LightTableWindow::slotLeftZoomFactorChanged(double zoom) int size = (int)((zoom - b) /a); d->leftZoomBar->setZoomSliderValue(size); - d->leftZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); + d->leftZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); d->leftZoomBar->setEnableZoomPlus(true); d->leftZoomBar->setEnableZoomMinus(true); @@ -1572,7 +1568,7 @@ void LightTableWindow::slotRightZoomFactorChanged(double zoom) int size = (int)((zoom - b) /a); d->rightZoomBar->setZoomSliderValue(size); - d->rightZoomBar->setZoomTrackerText(i18n("zoom: %1%").arg((int)(zoom*100.0))); + d->rightZoomBar->setZoomTrackerText(i18n("zoom: %1%").tqarg((int)(zoom*100.0))); d->rightZoomBar->setEnableZoomPlus(true); d->rightZoomBar->setEnableZoomMinus(true); @@ -1655,15 +1651,15 @@ void LightTableWindow::slotRawCameraList() void LightTableWindow::slotThemeChanged() { - QStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.findIndex(AlbumSettings::instance()->getCurrentTheme()); + TQStringList themes(ThemeEngine::instance()->themeNames()); + int index = themes.tqfindIndex(AlbumSettings::instance()->getCurrentTheme()); if (index == -1) - index = themes.findIndex(i18n("Default")); + index = themes.tqfindIndex(i18n("Default")); d->themeMenuAction->setCurrentItem(index); } -void LightTableWindow::slotChangeTheme(const QString& theme) +void LightTableWindow::slotChangeTheme(const TQString& theme) { AlbumSettings::instance()->setCurrentTheme(theme); ThemeEngine::instance()->slotChangeTheme(theme); diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/digikam/utilities/lighttable/lighttablewindow.h index 388d28e..4ec314e 100644 --- a/digikam/utilities/lighttable/lighttablewindow.h +++ b/digikam/utilities/lighttable/lighttablewindow.h @@ -24,9 +24,9 @@ #ifndef LIGHTTABLEWINDOW_H #define LIGHTTABLEWINDOW_H -// Qt includes. +// TQt includes. -#include <qstring.h> +#include <tqstring.h> // KDE includes. @@ -49,6 +49,7 @@ class LightTableWindowPriv; class LightTableWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -72,7 +73,7 @@ public slots: private: - void closeEvent(QCloseEvent* e); + void closeEvent(TQCloseEvent* e); void setupActions(); void setupConnections(); void setupUserArea(); @@ -147,7 +148,7 @@ private slots: void slotSetup(); void slotThemeChanged(); - void slotChangeTheme(const QString& theme); + void slotChangeTheme(const TQString& theme); private: diff --git a/digikam/utilities/lighttable/lighttablewindowprivate.h b/digikam/utilities/lighttable/lighttablewindowprivate.h index f77eacd..df69886 100644 --- a/digikam/utilities/lighttable/lighttablewindowprivate.h +++ b/digikam/utilities/lighttable/lighttablewindowprivate.h @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qsplitter.h> +#include <tqsplitter.h> // KDE includes. @@ -102,8 +102,8 @@ public: bool removeFullScreenButton; bool cancelSlideShow; - QSplitter *hSplitter; - QSplitter *vSplitter; + TQSplitter *hSplitter; + TQSplitter *vSplitter; // Rating actions. KAction *star0; diff --git a/digikam/utilities/scripts/digitaglinktree b/digikam/utilities/scripts/digitaglinktree index 8d0d12c..7fa0d4f 100644 --- a/digikam/utilities/scripts/digitaglinktree +++ b/digikam/utilities/scripts/digitaglinktree @@ -148,14 +148,14 @@ sub getTaggedImages{ $tags[$id]->{"pid"}="$pid"; } - # Now build up the path for tags having parents + # Now build up the path for tags having tqparents # Eg: a tag people might have a subtag friends: people # |->friends # We want to find out the complete path for the subtag. For friends this # would be the path "people/friends". Images with tag friends would then be # linked in the directory <tagsroot>/people/friends/ for($i=0; $i<=$#tags; $i++){ - $pid=$tags[$i]->{"pid"}; # Get parent tag id of current tag + $pid=$tags[$i]->{"pid"}; # Get tqparent tag id of current tag $tag=$tags[$i]->{"tag"}; # Start constructing tag path if( $pid == 0 ){ $tagPath{$i}=$tag; @@ -163,8 +163,8 @@ sub getTaggedImages{ } while( $pid != 0){ - $tag=$tags[$pid]->{"tag"} . "/$tag"; # add parents tag name to path - $pid=$tags[$pid]->{"pid"}; # look if parent has another parent + $tag=$tags[$pid]->{"tag"} . "/$tag"; # add tqparents tag name to path + $pid=$tags[$pid]->{"pid"}; # look if tqparent has another tqparent } # Store path constructed $tagPath{$i}=$tag; @@ -279,9 +279,9 @@ sub createLinkTree{ #$qtagPath=quotemeta($tagPath); # For tags that have subtags there is a path defined in qtagPath - # describing the parentrelationship as directory path like "friends/family/brothers" + # describing the tqparentrelationship as directory path like "friends/family/brothers" # If it is defined we want to use this path instead of the flat tag name like "brothers" - # Doing so results in a directory hirachy that maps the tags parent relationships + # Doing so results in a directory hirachy that maps the tags tqparent relationships # into the filesystem. if( $opt_flat ){ # For flat option just use the last subdirectory @@ -487,7 +487,7 @@ sub usage{ " -H Use hard links instead of symbolic links in linktree. \n", " -f If there are hierarchical tags (tags that have subtags) \n", " create a flat tag directory hierarchy. So directories for\n", - " subtags are at the same directory level like their parent tags\n", + " subtags are at the same directory level like their tqparent tags\n", " -h Print this help \n", " -v Print scripts version number \n"; diff --git a/digikam/utilities/scripts/digitaglinktree.1 b/digikam/utilities/scripts/digitaglinktree.1 index fdfe9e0..cbc10d2 100644 --- a/digikam/utilities/scripts/digitaglinktree.1 +++ b/digikam/utilities/scripts/digitaglinktree.1 @@ -130,7 +130,7 @@ will not run. In digikam photos can have hierachical tags (tags that have subtags). In this case digitaglinktree would by default add a directory for the tag and a subdirectory for each of the subtags of this tag. By setting \fB \-f \fR a subtag is treated like a -regular tag just as its parent tag so digitaglinktree will create all subdirectories +regular tag just as its tqparent tag so digitaglinktree will create all subdirectories for tags and subtags at the same level independent of the tag - subtag hierarchy. .TP diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index 1a6084d..fbff311 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -22,17 +22,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qcombobox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qlistview.h> -#include <qvbuttongroup.h> -#include <qlayout.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqcombobox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqlistview.h> +#include <tqvbuttongroup.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> // KDE includes. @@ -72,22 +72,22 @@ public: searchBar = 0; } - QVButtonGroup *portButtonGroup; + TQVButtonGroup *portButtonGroup; - QRadioButton *usbButton; - QRadioButton *serialButton; + TQRadioButton *usbButton; + TQRadioButton *serialButton; - QLabel *portPathLabel; + TQLabel *portPathLabel; - QComboBox *portPathComboBox; + TQComboBox *portPathComboBox; - QString UMSCameraNameActual; - QString UMSCameraNameShown; - QString PTPCameraNameShown; + TQString UMSCameraNameActual; + TQString UMSCameraNameShown; + TQString PTPCameraNameShown; - QStringList serialPortList; + TQStringList serialPortList; - QListView *listView; + TQListView *listView; KLineEdit *titleEdit; @@ -96,30 +96,30 @@ public: SearchTextBar *searchBar; }; -CameraSelection::CameraSelection( QWidget* parent ) +CameraSelection::CameraSelection( TQWidget* tqparent ) : KDialogBase(Plain, i18n("Camera Configuration"), - Help|Ok|Cancel, Ok, parent, 0, true, true) + Help|Ok|Cancel, Ok, tqparent, 0, true, true) { d = new CameraSelectionPriv; kapp->setOverrideCursor(KCursor::waitCursor()); setHelp("cameraselection.anchor", "digikam"); - d->UMSCameraNameActual = QString("Directory Browse"); // Don't be i18n! + d->UMSCameraNameActual = TQString("Directory Browse"); // Don't be i18n! d->UMSCameraNameShown = i18n("Mounted Camera"); - d->PTPCameraNameShown = QString("USB PTP Class Camera"); + d->PTPCameraNameShown = TQString("USB PTP Class Camera"); - QGridLayout* mainBoxLayout = new QGridLayout(plainPage(), 6, 1, 0, KDialog::spacingHint()); + TQGridLayout* mainBoxLayout = new TQGridLayout(plainPage(), 6, 1, 0, KDialog::spacingHint()); mainBoxLayout->setColStretch(0, 10); mainBoxLayout->setRowStretch(6, 10); // -------------------------------------------------------------- - d->listView = new QListView(plainPage()); + d->listView = new TQListView(plainPage()); d->listView->addColumn(i18n("Camera List")); d->listView->setAllColumnsShowFocus(true); - d->listView->setResizeMode(QListView::LastColumn); + d->listView->setResizeMode(TQListView::LastColumn); d->listView->setMinimumWidth(350); - QWhatsThis::add(d->listView, i18n("<p>Select the camera name that you want to use. All " + TQWhatsThis::add(d->listView, i18n("<p>Select the camera name that you want to use. All " "default settings on the right panel " "will be set automatically.</p><p>This list has been generated " "using the gphoto2 library installed on your computer.</p>")); @@ -128,57 +128,57 @@ CameraSelection::CameraSelection( QWidget* parent ) // -------------------------------------------------------------- - QVGroupBox* titleBox = new QVGroupBox( i18n("Camera Title"), plainPage() ); + TQVGroupBox* titleBox = new TQVGroupBox( i18n("Camera Title"), plainPage() ); d->titleEdit = new KLineEdit( titleBox ); - QWhatsThis::add(d->titleEdit, i18n("<p>Set here the name used in digiKam interface to " + TQWhatsThis::add(d->titleEdit, i18n("<p>Set here the name used in digiKam interface to " "identify this camera.</p>")); // -------------------------------------------------------------- - d->portButtonGroup = new QVButtonGroup( i18n("Camera Port Type"), plainPage() ); + d->portButtonGroup = new TQVButtonGroup( i18n("Camera Port Type"), plainPage() ); d->portButtonGroup->setRadioButtonExclusive( true ); - d->usbButton = new QRadioButton( d->portButtonGroup ); + d->usbButton = new TQRadioButton( d->portButtonGroup ); d->usbButton->setText( i18n( "USB" ) ); - QWhatsThis::add(d->usbButton, i18n("<p>Select this option if your camera is connected to your " + TQWhatsThis::add(d->usbButton, i18n("<p>Select this option if your camera is connected to your " "computer using an USB cable.</p>")); - d->serialButton = new QRadioButton( d->portButtonGroup ); + d->serialButton = new TQRadioButton( d->portButtonGroup ); d->serialButton->setText( i18n( "Serial" ) ); - QWhatsThis::add(d->serialButton, i18n("<p>Select this option if your camera is connected to your " + TQWhatsThis::add(d->serialButton, i18n("<p>Select this option if your camera is connected to your " "computer using a serial cable.</p>")); // -------------------------------------------------------------- - QVGroupBox* portPathBox = new QVGroupBox( i18n( "Camera Port Path" ), plainPage() ); - d->portPathLabel = new QLabel( portPathBox); + TQVGroupBox* portPathBox = new TQVGroupBox( i18n( "Camera Port Path" ), plainPage() ); + d->portPathLabel = new TQLabel( portPathBox); d->portPathLabel->setText( i18n( "Note: only for serial port camera" ) ); - d->portPathComboBox = new QComboBox( false, portPathBox ); + d->portPathComboBox = new TQComboBox( false, portPathBox ); d->portPathComboBox->setDuplicatesEnabled( false ); - QWhatsThis::add(d->portPathComboBox, i18n("<p>Select the serial port to use on your computer. " + TQWhatsThis::add(d->portPathComboBox, i18n("<p>Select the serial port to use on your computer. " "This option is only required if you use a serial camera.</p>")); // -------------------------------------------------------------- - QVGroupBox* umsMountBox = new QVGroupBox(i18n("Camera Mount Path"), plainPage()); + TQVGroupBox* umsMountBox = new TQVGroupBox(i18n("Camera Mount Path"), plainPage()); - QLabel* umsMountLabel = new QLabel( umsMountBox ); + TQLabel* umsMountLabel = new TQLabel( umsMountBox ); umsMountLabel->setText(i18n("Note: only for USB/IEEE mass storage camera")); - d->umsMountURL = new KURLRequester( QString("/mnt/camera"), umsMountBox); + d->umsMountURL = new KURLRequester( TQString("/mnt/camera"), umsMountBox); d->umsMountURL->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly); - QWhatsThis::add(d->umsMountURL, i18n("<p>Set here the mount path to use on your computer. This " + TQWhatsThis::add(d->umsMountURL, i18n("<p>Set here the mount path to use on your computer. This " "option is only required if you use a <b>USB Mass Storage</b> " "camera.</p>")); // -------------------------------------------------------------- - QGroupBox* box2 = new QGroupBox( 0, Qt::Vertical, plainPage() ); - box2->setFrameStyle( QFrame::NoFrame ); - QGridLayout* box2Layout = new QGridLayout( box2->layout(), 1, 5 ); + TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, plainPage() ); + box2->setFrameStyle( TQFrame::NoFrame ); + TQGridLayout* box2Layout = new TQGridLayout( box2->tqlayout(), 1, 5 ); - QLabel* logo = new QLabel( box2 ); + TQLabel* logo = new TQLabel( box2 ); KIconLoader* iconLoader = KApplication::kApplication()->iconLoader(); logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 64, @@ -188,13 +188,13 @@ CameraSelection::CameraSelection( QWidget* 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>") - .arg(d->UMSCameraNameShown)); + .tqarg(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>") - .arg(d->PTPCameraNameShown)); + .tqarg(d->PTPCameraNameShown)); KActiveLabel* explanation = new KActiveLabel(box2); explanation->setText(i18n("<p>A complete list of camera settings to use is<br>" @@ -218,29 +218,29 @@ CameraSelection::CameraSelection( QWidget* parent ) // Connections -------------------------------------------------- - disconnect(link, SIGNAL(linkClicked(const QString &)), - link, SLOT(openLink(const QString &))); + disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), + link, TQT_SLOT(openLink(const TQString &))); - connect(link, SIGNAL(linkClicked(const QString &)), - this, SLOT(slotUMSCameraLinkUsed())); + connect(link, TQT_SIGNAL(linkClicked(const TQString &)), + this, TQT_SLOT(slotUMSCameraLinkUsed())); - disconnect(link2, SIGNAL(linkClicked(const QString &)), - link2, SLOT(openLink(const QString &))); + disconnect(link2, TQT_SIGNAL(linkClicked(const TQString &)), + link2, TQT_SLOT(openLink(const TQString &))); - connect(link2, SIGNAL(linkClicked(const QString &)), - this, SLOT(slotPTPCameraLinkUsed())); + connect(link2, TQT_SIGNAL(linkClicked(const TQString &)), + this, TQT_SLOT(slotPTPCameraLinkUsed())); - connect(d->listView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(slotSelectionChanged(QListViewItem *))); + connect(d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(d->portButtonGroup, SIGNAL(clicked(int)), - this, SLOT(slotPortChanged())); + connect(d->portButtonGroup, TQT_SIGNAL(clicked(int)), + this, TQT_SLOT(slotPortChanged())); - connect(this, SIGNAL(okClicked()), - this, SLOT(slotOkClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(slotOkClicked())); - connect(d->searchBar, SIGNAL(signalTextChanged(const QString&)), - this, SLOT(slotSearchTextChanged(const QString&))); + connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), + this, TQT_SLOT(slotSearchTextChanged(const TQString&))); // Initialize -------------------------------------------------- @@ -256,7 +256,7 @@ CameraSelection::~CameraSelection() void CameraSelection::slotUMSCameraLinkUsed() { - QListViewItem *item = d->listView->findItem(d->UMSCameraNameShown, 0); + TQListViewItem *item = d->listView->tqfindItem(d->UMSCameraNameShown, 0); if (item) { d->listView->setCurrentItem(item); @@ -266,7 +266,7 @@ void CameraSelection::slotUMSCameraLinkUsed() void CameraSelection::slotPTPCameraLinkUsed() { - QListViewItem *item = d->listView->findItem(d->PTPCameraNameShown, 0); + TQListViewItem *item = d->listView->tqfindItem(d->PTPCameraNameShown, 0); if (item) { d->listView->setCurrentItem(item); @@ -274,15 +274,15 @@ void CameraSelection::slotPTPCameraLinkUsed() } } -void CameraSelection::setCamera(const QString& title, const QString& model, - const QString& port, const QString& path) +void CameraSelection::setCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path) { - QString camModel(model); + TQString camModel(model); if (camModel == d->UMSCameraNameActual) camModel = d->UMSCameraNameShown; - QListViewItem* item = d->listView->findItem(camModel, 0); + TQListViewItem* item = d->listView->tqfindItem(camModel, 0); if (!item) return; d->listView->setSelected(item, true); @@ -290,12 +290,12 @@ void CameraSelection::setCamera(const QString& title, const QString& model, d->titleEdit->setText(title); - if (port.contains("usb")) + if (port.tqcontains("usb")) { d->usbButton->setChecked(true); slotPortChanged(); } - else if (port.contains("serial")) + else if (port.tqcontains("serial")) { d->serialButton->setChecked(true); @@ -316,8 +316,8 @@ void CameraSelection::setCamera(const QString& title, const QString& model, void CameraSelection::getCameraList() { int count = 0; - QStringList clist; - QString cname; + TQStringList clist; + TQString cname; GPCamera::getSupportedCameras(count, clist); @@ -325,15 +325,15 @@ void CameraSelection::getCameraList() { cname = clist[i]; if (cname == d->UMSCameraNameActual) - new QListViewItem(d->listView, d->UMSCameraNameShown); + new TQListViewItem(d->listView, d->UMSCameraNameShown); else - new QListViewItem(d->listView, cname); + new TQListViewItem(d->listView, cname); } } void CameraSelection::getSerialPortList() { - QStringList plist; + TQStringList plist; GPCamera::getSupportedPorts(plist); @@ -346,11 +346,11 @@ void CameraSelection::getSerialPortList() } } -void CameraSelection::slotSelectionChanged(QListViewItem *item) +void CameraSelection::slotSelectionChanged(TQListViewItem *item) { if (!item) return; - QString model(item->text(0)); + TQString model(item->text(0)); if (model == d->UMSCameraNameShown) { @@ -365,28 +365,28 @@ void CameraSelection::slotSelectionChanged(QListViewItem *item) d->usbButton->setChecked(false); d->usbButton->setEnabled(false); d->portPathComboBox->setEnabled(true); - d->portPathComboBox->insertItem(QString("NONE"), 0); + d->portPathComboBox->insertItem(TQString("NONE"), 0); d->portPathComboBox->setEnabled(false); d->umsMountURL->setEnabled(true); d->umsMountURL->clear(); - d->umsMountURL->setURL(QString("/mnt/camera")); + d->umsMountURL->setURL(TQString("/mnt/camera")); return; } else { d->umsMountURL->setEnabled(true); d->umsMountURL->clear(); - d->umsMountURL->setURL(QString("/")); + d->umsMountURL->setURL(TQString("/")); d->umsMountURL->setEnabled(false); } d->titleEdit->setText(model); - QStringList plist; + TQStringList plist; GPCamera::getCameraSupportedPorts(model, plist); - if (plist.contains("serial")) + if (plist.tqcontains("serial")) { d->serialButton->setEnabled(true); d->serialButton->setChecked(true); @@ -398,7 +398,7 @@ void CameraSelection::slotSelectionChanged(QListViewItem *item) d->serialButton->setEnabled(false); } - if (plist.contains("usb")) + if (plist.tqcontains("usb")) { d->usbButton->setEnabled(true); d->usbButton->setChecked(true); @@ -419,7 +419,7 @@ void CameraSelection::slotPortChanged() { d->portPathComboBox->setEnabled(true); d->portPathComboBox->clear(); - d->portPathComboBox->insertItem( QString("usb:"), 0 ); + d->portPathComboBox->insertItem( TQString("usb:"), 0 ); d->portPathComboBox->setEnabled(false); return; } @@ -432,30 +432,30 @@ void CameraSelection::slotPortChanged() } } -QString CameraSelection::currentTitle() +TQString CameraSelection::currentTitle() { return d->titleEdit->text(); } -QString CameraSelection::currentModel() +TQString CameraSelection::currentModel() { - QListViewItem* item = d->listView->currentItem(); + TQListViewItem* item = d->listView->currentItem(); if (!item) - return QString(); + return TQString(); - QString model(item->text(0)); + TQString model(item->text(0)); if (model == d->UMSCameraNameShown) model = d->UMSCameraNameActual; return model; } -QString CameraSelection::currentPortPath() +TQString CameraSelection::currentPortPath() { return d->portPathComboBox->currentText(); } -QString CameraSelection::currentCameraPath() +TQString CameraSelection::currentCameraPath() { return d->umsMountURL->url(); } @@ -466,18 +466,18 @@ void CameraSelection::slotOkClicked() currentPortPath(), currentCameraPath()); } -void CameraSelection::slotSearchTextChanged(const QString& filter) +void CameraSelection::slotSearchTextChanged(const TQString& filter) { bool query = false; - QString search = filter.lower(); + TQString search = filter.lower(); - QListViewItemIterator it(d->listView); + TQListViewItemIterator it(d->listView); for ( ; it.current(); ++it ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); - if (item->text(0).lower().contains(search)) + if (item->text(0).lower().tqcontains(search)) { query = true; item->setVisible(true); diff --git a/digikam/utilities/setup/cameraselection.h b/digikam/utilities/setup/cameraselection.h index d090cde..0b96cbe 100644 --- a/digikam/utilities/setup/cameraselection.h +++ b/digikam/utilities/setup/cameraselection.h @@ -25,16 +25,16 @@ #ifndef CAMERASELECTION_H #define CAMERASELECTION_H -// Qt includes. +// TQt includes. -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> // KDE includes. #include <kdialogbase.h> -class QListViewItem; +class TQListViewItem; namespace Digikam { @@ -44,24 +44,25 @@ class CameraSelectionPriv; class CameraSelection : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CameraSelection(QWidget *parent=0); + CameraSelection(TQWidget *tqparent=0); ~CameraSelection(); - void setCamera(const QString& title, const QString& model, - const QString& port, const QString& path); + void setCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path); - QString currentTitle(); - QString currentModel(); - QString currentPortPath(); - QString currentCameraPath(); + TQString currentTitle(); + TQString currentModel(); + TQString currentPortPath(); + TQString currentCameraPath(); signals: - void signalOkClicked(const QString& title, const QString& model, - const QString& port, const QString& path); + void signalOkClicked(const TQString& title, const TQString& model, + const TQString& port, const TQString& path); private: @@ -72,10 +73,10 @@ private slots: void slotPTPCameraLinkUsed(); void slotUMSCameraLinkUsed(); - void slotSelectionChanged(QListViewItem *item); + void slotSelectionChanged(TQListViewItem *item); void slotPortChanged(); void slotOkClicked(); - void slotSearchTextChanged(const QString&); + void slotSearchTextChanged(const TQString&); private: diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp index 7f19419..2bfece7 100644 --- a/digikam/utilities/setup/setup.cpp +++ b/digikam/utilities/setup/setup.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtabwidget.h> -#include <qapplication.h> -#include <qframe.h> +#include <tqtabwidget.h> +#include <tqapplication.h> +#include <tqframe.h> // KDE includes. @@ -99,21 +99,21 @@ public: pluginsPage = 0; } - QFrame *page_general; - QFrame *page_tooltip; - QFrame *page_metadata; - QFrame *page_identity; - QFrame *page_collections; - QFrame *page_mime; - QFrame *page_lighttable; - QFrame *page_editor; - QFrame *page_dcraw; - QFrame *page_iofiles; - QFrame *page_slideshow; - QFrame *page_icc; - QFrame *page_plugins; - QFrame *page_camera; - QFrame *page_misc; + TQFrame *page_general; + TQFrame *page_tooltip; + TQFrame *page_metadata; + TQFrame *page_identity; + TQFrame *page_collections; + TQFrame *page_mime; + TQFrame *page_lighttable; + TQFrame *page_editor; + TQFrame *page_dcraw; + TQFrame *page_iofiles; + TQFrame *page_slideshow; + TQFrame *page_icc; + TQFrame *page_plugins; + TQFrame *page_camera; + TQFrame *page_misc; SetupGeneral *generalPage; SetupToolTip *tooltipPage; @@ -132,8 +132,8 @@ public: SetupPlugins *pluginsPage; }; -Setup::Setup(QWidget* parent, const char* name, Setup::Page page) - : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, parent, +Setup::Setup(TQWidget* tqparent, const char* name, Setup::Page page) + : KDialogBase(IconList, i18n("Configure"), Help|Ok|Cancel, Ok, tqparent, name, true, true ) { d = new SetupPrivate; @@ -199,8 +199,8 @@ Setup::Setup(QWidget* parent, const char* name, Setup::Page page) BarIcon("misc", KIcon::SizeMedium)); d->miscPage = new SetupMisc(d->page_misc); - connect(this, SIGNAL(okClicked()), - this, SLOT(slotOkClicked()) ); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(slotOkClicked()) ); if (page != LastPageUsed) showPage((int) page); @@ -242,7 +242,7 @@ void Setup::slotOkClicked() if (d->metadataPage->exifAutoRotateAsChanged()) { - QString msg = i18n("The Exif auto-rotate thumbnails option has been changed.\n" + TQString msg = i18n("The Exif auto-rotate thumbnails option has been changed.\n" "Do you want to rebuild all albums' items' thumbnails now?\n\n" "Note: thumbnail processing can take a while! You can start " "this job later from the \"Tools\" menu."); diff --git a/digikam/utilities/setup/setup.h b/digikam/utilities/setup/setup.h index a611ec4..f266e84 100644 --- a/digikam/utilities/setup/setup.h +++ b/digikam/utilities/setup/setup.h @@ -38,6 +38,7 @@ class SetupPrivate; class Setup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: @@ -61,7 +62,7 @@ public: Miscellaneous }; - Setup(QWidget* parent=0, const char* name=0, Page page=LastPageUsed); + Setup(TQWidget* tqparent=0, const char* name=0, Page page=LastPageUsed); ~Setup(); SetupPlugins *kipiPluginsPage(); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index d0ed10f..cb11f39 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -22,15 +22,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qdatetime.h> -#include <qlistview.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqdatetime.h> +#include <tqlistview.h> // KDE includes. @@ -67,38 +67,38 @@ public: autoDetectButton = 0; } - QPushButton *addButton; - QPushButton *removeButton; - QPushButton *editButton; - QPushButton *autoDetectButton; + TQPushButton *addButton; + TQPushButton *removeButton; + TQPushButton *editButton; + TQPushButton *autoDetectButton; - QListView *listView; + TQListView *listView; }; -SetupCamera::SetupCamera( QWidget* parent ) - : QWidget( parent ) +SetupCamera::SetupCamera( TQWidget* tqparent ) + : TQWidget( tqparent ) { d = new SetupCameraPriv; - QVBoxLayout *mainLayout = new QVBoxLayout(parent); - QGridLayout* groupBoxLayout = new QGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); + TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQGridLayout* groupBoxLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); - d->listView = new QListView( this ); + d->listView = new TQListView( this ); d->listView->addColumn( i18n("Title") ); d->listView->addColumn( i18n("Model") ); d->listView->addColumn( i18n("Port") ); d->listView->addColumn( i18n("Path") ); d->listView->addColumn( "Last Access Date", 0 ); // No i18n here. Hidden column with the last access date. d->listView->setAllColumnsShowFocus(true); - QWhatsThis::add( d->listView, i18n("<p>Here you can see the digital camera list used by digiKam " + TQWhatsThis::add( d->listView, i18n("<p>Here you can see the digital camera list used by digiKam " "via the Gphoto interface.")); // ------------------------------------------------------------- - d->addButton = new QPushButton( this ); - d->removeButton = new QPushButton( this ); - d->editButton = new QPushButton( this ); - d->autoDetectButton = new QPushButton( this ); + d->addButton = new TQPushButton( this ); + d->removeButton = new TQPushButton( this ); + d->editButton = new TQPushButton( this ); + d->autoDetectButton = new TQPushButton( this ); d->addButton->setText( i18n( "&Add..." ) ); d->addButton->setIconSet(SmallIcon("add")); @@ -107,21 +107,21 @@ SetupCamera::SetupCamera( QWidget* parent ) d->editButton->setText( i18n( "&Edit..." ) ); d->editButton->setIconSet(SmallIcon("configure")); d->autoDetectButton->setText( i18n( "Auto-&Detect" ) ); - d->autoDetectButton->setIconSet(SmallIcon("find")); + d->autoDetectButton->setIconSet(SmallIcon("tqfind")); d->removeButton->setEnabled(false); d->editButton->setEnabled(false); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); KURLLabel *gphotoLogoLabel = new KURLLabel(this); - gphotoLogoLabel->setText(QString()); + gphotoLogoLabel->setText(TQString()); gphotoLogoLabel->setURL("http://www.gphoto.org"); KGlobal::dirs()->addResourceType("logo-gphoto", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png"); - gphotoLogoLabel->setPixmap( QPixmap( directory + "logo-gphoto.png" ) ); - QToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png"); + gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) ); + TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website")); - groupBoxLayout->setAlignment( Qt::AlignTop ); + groupBoxLayout->tqsetAlignment( TQt::AlignTop ); groupBoxLayout->addMultiCellWidget( d->listView, 0, 5, 0, 0 ); groupBoxLayout->addWidget( d->addButton, 0, 1 ); groupBoxLayout->addWidget( d->removeButton, 1, 1 ); @@ -135,23 +135,23 @@ SetupCamera::SetupCamera( QWidget* parent ) // ------------------------------------------------------------- - connect(gphotoLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processGphotoURL(const QString&))); + connect(gphotoLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processGphotoURL(const TQString&))); - connect(d->listView, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged())); + connect(d->listView, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged())); - connect(d->addButton, SIGNAL(clicked()), - this, SLOT(slotAddCamera())); + connect(d->addButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddCamera())); - connect(d->removeButton, SIGNAL(clicked()), - this, SLOT(slotRemoveCamera())); + connect(d->removeButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveCamera())); - connect(d->editButton, SIGNAL(clicked()), - this, SLOT(slotEditCamera())); + connect(d->editButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEditCamera())); - connect(d->autoDetectButton, SIGNAL(clicked()), - this, SLOT(slotAutoDetectCamera())); + connect(d->autoDetectButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAutoDetectCamera())); // Add cameras -------------------------------------- @@ -159,12 +159,12 @@ SetupCamera::SetupCamera( QWidget* parent ) if (clist) { - QPtrList<CameraType>* cl = clist->cameraList(); + TQPtrList<CameraType>* cl = clist->cameraList(); for (CameraType *ctype = cl->first(); ctype; ctype = cl->next()) { - new QListViewItem(d->listView, ctype->title(), ctype->model(), + new TQListViewItem(d->listView, ctype->title(), ctype->model(), ctype->port(), ctype->path(), ctype->lastAccess().toString(Qt::ISODate)); } @@ -176,14 +176,14 @@ SetupCamera::~SetupCamera() delete d; } -void SetupCamera::processGphotoURL(const QString& url) +void SetupCamera::processGphotoURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } void SetupCamera::slotSelectionChanged() { - QListViewItem *item = d->listView->selectedItem(); + TQListViewItem *item = d->listView->selectedItem(); if (!item) { @@ -200,17 +200,17 @@ void SetupCamera::slotAddCamera() { CameraSelection *select = new CameraSelection; - connect(select, SIGNAL(signalOkClicked(const QString&, const QString&, - const QString&, const QString&)), - this, SLOT(slotAddedCamera(const QString&, const QString&, - const QString&, const QString&))); + connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + const TQString&, const TQString&)), + this, TQT_SLOT(slotAddedCamera(const TQString&, const TQString&, + const TQString&, const TQString&))); select->show(); } void SetupCamera::slotRemoveCamera() { - QListViewItem *item = d->listView->currentItem(); + TQListViewItem *item = d->listView->currentItem(); if (!item) return; delete item; @@ -218,23 +218,23 @@ void SetupCamera::slotRemoveCamera() void SetupCamera::slotEditCamera() { - QListViewItem *item = d->listView->currentItem(); + TQListViewItem *item = d->listView->currentItem(); if (!item) return; CameraSelection *select = new CameraSelection; select->setCamera(item->text(0), item->text(1), item->text(2), item->text(3)); - connect(select, SIGNAL(signalOkClicked(const QString&, const QString&, - const QString&, const QString&)), - this, SLOT(slotEditedCamera(const QString&, const QString&, - const QString&, const QString&))); + connect(select, TQT_SIGNAL(signalOkClicked(const TQString&, const TQString&, + const TQString&, const TQString&)), + this, TQT_SLOT(slotEditedCamera(const TQString&, const TQString&, + const TQString&, const TQString&))); select->show(); } void SetupCamera::slotAutoDetectCamera() { - QString model, port; + TQString model, port; kapp->setOverrideCursor( KCursor::waitCursor() ); int ret = GPCamera::autoDetect(model, port); @@ -252,30 +252,30 @@ void SetupCamera::slotAutoDetectCamera() if (port.startsWith("usb:")) port = "usb:"; - if (d->listView->findItem(model, 1)) + if (d->listView->tqfindItem(model, 1)) { - KMessageBox::information(this, i18n("Camera '%1' (%2) is already in list.").arg(model).arg(port)); + KMessageBox::information(this, i18n("Camera '%1' (%2) is already in list.").tqarg(model).tqarg(port)); } else { KMessageBox::information(this, i18n("Found camera '%1' (%2) and added it to the list.") - .arg(model).arg(port)); - new QListViewItem(d->listView, model, model, port, "/", - QDateTime::currentDateTime().toString(Qt::ISODate)); + .tqarg(model).tqarg(port)); + new TQListViewItem(d->listView, model, model, port, "/", + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); } } -void SetupCamera::slotAddedCamera(const QString& title, const QString& model, - const QString& port, const QString& path) +void SetupCamera::slotAddedCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path) { - new QListViewItem(d->listView, title, model, port, path, - QDateTime::currentDateTime().toString(Qt::ISODate)); + new TQListViewItem(d->listView, title, model, port, path, + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)); } -void SetupCamera::slotEditedCamera(const QString& title, const QString& model, - const QString& port, const QString& path) +void SetupCamera::slotEditedCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path) { - QListViewItem *item = d->listView->currentItem(); + TQListViewItem *item = d->listView->currentItem(); if (!item) return; item->setText(0, title); @@ -292,15 +292,15 @@ void SetupCamera::applySettings() { clist->clear(); - QListViewItemIterator it(d->listView); + TQListViewItemIterator it(d->listView); for ( ; it.current(); ++it ) { - QListViewItem *item = it.current(); - QDateTime lastAccess = QDateTime::currentDateTime(); + TQListViewItem *item = it.current(); + TQDateTime lastAccess = TQDateTime::tqcurrentDateTime(); if (!item->text(4).isEmpty()) - lastAccess = QDateTime::fromString(item->text(4), Qt::ISODate); + lastAccess = TQDateTime::fromString(item->text(4), Qt::ISODate); CameraType *ctype = new CameraType(item->text(0), item->text(1), item->text(2), item->text(3), lastAccess); diff --git a/digikam/utilities/setup/setupcamera.h b/digikam/utilities/setup/setupcamera.h index e1cc432..7ad3fef 100644 --- a/digikam/utilities/setup/setupcamera.h +++ b/digikam/utilities/setup/setupcamera.h @@ -25,29 +25,30 @@ #ifndef SETUPCAMERA_H #define SETUPCAMERA_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupCameraPriv; -class SetupCamera : public QWidget +class SetupCamera : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupCamera( QWidget* parent = 0 ); + SetupCamera( TQWidget* tqparent = 0 ); ~SetupCamera(); void applySettings(); private slots: - void processGphotoURL(const QString& url); + void processGphotoURL(const TQString& url); void slotSelectionChanged(); @@ -56,10 +57,10 @@ private slots: void slotEditCamera(); void slotAutoDetectCamera(); - void slotAddedCamera(const QString& title, const QString& model, - const QString& port, const QString& path); - void slotEditedCamera(const QString& title, const QString& model, - const QString& port, const QString& path); + void slotAddedCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path); + void slotEditedCamera(const TQString& title, const TQString& model, + const TQString& port, const TQString& path); private: diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp index 7ae7800..7b9554e 100644 --- a/digikam/utilities/setup/setupcollections.cpp +++ b/digikam/utilities/setup/setupcollections.cpp @@ -21,20 +21,20 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qwhatsthis.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqdir.h> +#include <tqwhatsthis.h> // KDE includes. @@ -74,39 +74,39 @@ public: delCollectionButton = 0; } - QListBox *albumCollectionBox; + TQListBox *albumCollectionBox; - QPushButton *addCollectionButton; - QPushButton *delCollectionButton; + TQPushButton *addCollectionButton; + TQPushButton *delCollectionButton; }; -SetupCollections::SetupCollections(QWidget* parent ) - : QWidget(parent) +SetupCollections::SetupCollections(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupCollectionsPriv; - QVBoxLayout *mainLayout = new QVBoxLayout(parent); - QGridLayout *collectionGroupLayout = new QGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); + TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQGridLayout *collectionGroupLayout = new TQGridLayout( this, 2, 5, 0, KDialog::spacingHint() ); // -------------------------------------------------------- d->albumCollectionBox = new KListBox(this); - QWhatsThis::add( d->albumCollectionBox, i18n("<p>You can add or remove Album " + TQWhatsThis::add( d->albumCollectionBox, i18n("<p>You can add or remove Album " "collection types here to improve how " "your Albums are sorted in digiKam.")); - d->albumCollectionBox->setVScrollBarMode(QScrollView::AlwaysOn); + d->albumCollectionBox->setVScrollBarMode(TQScrollView::AlwaysOn); - d->addCollectionButton = new QPushButton( i18n("&Add..."), this); - d->delCollectionButton = new QPushButton( i18n("&Delete"), this); + d->addCollectionButton = new TQPushButton( i18n("&Add..."), this); + d->delCollectionButton = new TQPushButton( i18n("&Delete"), this); d->addCollectionButton->setIconSet(SmallIcon("add")); d->delCollectionButton->setIconSet(SmallIcon("remove")); d->delCollectionButton->setEnabled(false); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - collectionGroupLayout->setAlignment( Qt::AlignTop ); + collectionGroupLayout->tqsetAlignment( TQt::AlignTop ); collectionGroupLayout->addMultiCellWidget( d->albumCollectionBox, 0, 4, 0, 0 ); collectionGroupLayout->addWidget( d->addCollectionButton, 0, 1); collectionGroupLayout->addWidget( d->delCollectionButton, 1, 1); @@ -114,14 +114,14 @@ SetupCollections::SetupCollections(QWidget* parent ) // -------------------------------------------------------- - connect(d->albumCollectionBox, SIGNAL(selectionChanged()), - this, SLOT(slotCollectionSelectionChanged())); + connect(d->albumCollectionBox, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotCollectionSelectionChanged())); - connect(d->addCollectionButton, SIGNAL(clicked()), - this, SLOT(slotAddCollection())); + connect(d->addCollectionButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotAddCollection())); - connect(d->delCollectionButton, SIGNAL(clicked()), - this, SLOT(slotDelCollection())); + connect(d->delCollectionButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDelCollection())); // -------------------------------------------------------- @@ -141,9 +141,9 @@ void SetupCollections::applySettings() if (!settings) return; - QStringList collectionList; + TQStringList collectionList; - for (QListBoxItem *item = d->albumCollectionBox->firstItem(); + for (TQListBoxItem *item = d->albumCollectionBox->firstItem(); item; item = item->next()) { collectionList.append(item->text()); @@ -176,21 +176,21 @@ void SetupCollections::slotAddCollection() bool ok; #if KDE_IS_VERSION(3,2,0) - QString newCollection = + TQString newCollection = KInputDialog::getText(i18n("New Collection Name"), i18n("Enter new collection name:"), - QString(), &ok, this); + TQString(), &ok, this); #else - QString newCollection = + TQString newCollection = KLineEditDlg::getText(i18n("New Collection Name"), i18n("Enter new collection name:"), - QString(), &ok, this); + TQString(), &ok, this); #endif if (!ok) return; bool found = false; - for (QListBoxItem *item = d->albumCollectionBox->firstItem(); + for (TQListBoxItem *item = d->albumCollectionBox->firstItem(); item; item = item->next()) { if (newCollection == item->text()) @@ -210,7 +210,7 @@ void SetupCollections::slotDelCollection() if (index == -1) return; - QListBoxItem* item = d->albumCollectionBox->item(index); + TQListBoxItem* item = d->albumCollectionBox->item(index); if (!item) return; delete item; } diff --git a/digikam/utilities/setup/setupcollections.h b/digikam/utilities/setup/setupcollections.h index de00da2..4c9b33b 100644 --- a/digikam/utilities/setup/setupcollections.h +++ b/digikam/utilities/setup/setupcollections.h @@ -24,22 +24,23 @@ #ifndef SETUPCOLLECTIONS_H #define SETUPCOLLECTIONS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupCollectionsPriv; -class SetupCollections : public QWidget +class SetupCollections : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupCollections(QWidget* parent = 0); + SetupCollections(TQWidget* tqparent = 0); ~SetupCollections(); void applySettings(); diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp index 0ee5987..ebb37f1 100644 --- a/digikam/utilities/setup/setupdcraw.cpp +++ b/digikam/utilities/setup/setupdcraw.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qlabel.h> -#include <qcolor.h> -#include <qhbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qcombobox.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> // KDE includes. @@ -70,20 +70,20 @@ public: KDcrawIface::DcrawSettingsWidget *dcrawSettings; }; -SetupDcraw::SetupDcraw(QWidget* parent ) - : QWidget(parent) +SetupDcraw::SetupDcraw(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupDcrawPriv; - QVBoxLayout *layout = new QVBoxLayout(parent, 0, KDialog::spacingHint()); - d->dcrawSettings = new DcrawSettingsWidget(parent, DcrawSettingsWidget::SIXTEENBITS); + TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); + d->dcrawSettings = new DcrawSettingsWidget(tqparent, DcrawSettingsWidget::SIXTEENBITS); d->dcrawSettings->setItemIconSet(0, SmallIconSet("kdcraw")); d->dcrawSettings->setItemIconSet(1, SmallIconSet("whitebalance")); d->dcrawSettings->setItemIconSet(2, SmallIconSet("lensdistortion")); - layout->addWidget(d->dcrawSettings); - layout->addStretch(); + tqlayout->addWidget(d->dcrawSettings); + tqlayout->addStretch(); - connect(d->dcrawSettings, SIGNAL(signalSixteenBitsImageToggled(bool)), - this, SLOT(slotSixteenBitsImageToggled(bool))); + connect(d->dcrawSettings, TQT_SIGNAL(signalSixteenBitsImageToggled(bool)), + this, TQT_SLOT(slotSixteenBitsImageToggled(bool))); readSettings(); } diff --git a/digikam/utilities/setup/setupdcraw.h b/digikam/utilities/setup/setupdcraw.h index fdc5e0f..d8f166a 100644 --- a/digikam/utilities/setup/setupdcraw.h +++ b/digikam/utilities/setup/setupdcraw.h @@ -24,9 +24,9 @@ #ifndef SETUPDCRAW_H #define SETUPDCRAW_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class SetupDcrawPriv; -class DIGIKAM_EXPORT SetupDcraw : public QWidget +class DIGIKAM_EXPORT SetupDcraw : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupDcraw(QWidget* parent = 0); + SetupDcraw(TQWidget* tqparent = 0); ~SetupDcraw(); void applySettings(); diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp index c942aaa..c6e2df8 100644 --- a/digikam/utilities/setup/setupeditor.cpp +++ b/digikam/utilities/setup/setupeditor.cpp @@ -21,15 +21,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qcolor.h> -#include <qhbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> // KDE includes. @@ -62,76 +62,76 @@ public: useRawImportTool = 0; } - QHBox *colorBox; + TQHBox *colorBox; - QCheckBox *hideToolBar; - QCheckBox *themebackgroundColor; - QCheckBox *useRawImportTool; + TQCheckBox *hideToolBar; + TQCheckBox *themebackgroundColor; + TQCheckBox *useRawImportTool; KColorButton *backgroundColor; KColorButton *underExposureColor; KColorButton *overExposureColor; }; -SetupEditor::SetupEditor(QWidget* parent ) - : QWidget(parent) +SetupEditor::SetupEditor(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupEditorPriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - QVGroupBox *interfaceOptionsGroup = new QVGroupBox(i18n("Interface Options"), parent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); - d->themebackgroundColor = new QCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); + d->themebackgroundColor = new TQCheckBox(i18n("&Use theme background color"), interfaceOptionsGroup); - QWhatsThis::add(d->themebackgroundColor, i18n("<p>Enable this option to use background theme " + TQWhatsThis::add(d->themebackgroundColor, i18n("<p>Enable this option to use background theme " "color in image editor area")); - d->colorBox = new QHBox(interfaceOptionsGroup); + d->colorBox = new TQHBox(interfaceOptionsGroup); - QLabel *backgroundColorlabel = new QLabel(i18n("&Background color:"), d->colorBox); + TQLabel *backgroundColorlabel = new TQLabel(i18n("&Background color:"), d->colorBox); d->backgroundColor = new KColorButton(d->colorBox); backgroundColorlabel->setBuddy(d->backgroundColor); - QWhatsThis::add(d->backgroundColor, i18n("<p>Customize background color to use " + TQWhatsThis::add(d->backgroundColor, i18n("<p>Customize background color to use " "in image editor area.")); - d->hideToolBar = new QCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); + d->hideToolBar = new TQCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); - d->useRawImportTool = new QCheckBox(i18n("Use Raw Import Tool to handle Raw image"), interfaceOptionsGroup); - QWhatsThis::add(d->useRawImportTool, i18n("<p>Set on this option to use Raw Import " + d->useRawImportTool = new TQCheckBox(i18n("Use Raw Import Tool to handle Raw image"), interfaceOptionsGroup); + TQWhatsThis::add(d->useRawImportTool, i18n("<p>Set on this option to use Raw Import " "tool before to load a Raw image, " "to customize indeep decoding settings.")); // -------------------------------------------------------- - QVGroupBox *exposureOptionsGroup = new QVGroupBox(i18n("Exposure Indicators"), parent); + TQVGroupBox *exposureOptionsGroup = new TQVGroupBox(i18n("Exposure Indicators"), tqparent); - QHBox *underExpoBox = new QHBox(exposureOptionsGroup); - QLabel *underExpoColorlabel = new QLabel( i18n("&Under-exposure color:"), underExpoBox); + TQHBox *underExpoBox = new TQHBox(exposureOptionsGroup); + TQLabel *underExpoColorlabel = new TQLabel( i18n("&Under-exposure color:"), underExpoBox); d->underExposureColor = new KColorButton(underExpoBox); underExpoColorlabel->setBuddy(d->underExposureColor); - QWhatsThis::add(d->underExposureColor, i18n("<p>Customize the color used in image editor to identify " + TQWhatsThis::add(d->underExposureColor, i18n("<p>Customize the color used in image editor to identify " "under-exposed pixels.")); - QHBox *overExpoBox = new QHBox(exposureOptionsGroup); - QLabel *overExpoColorlabel = new QLabel( i18n("&Over-exposure color:"), overExpoBox); + TQHBox *overExpoBox = new TQHBox(exposureOptionsGroup); + TQLabel *overExpoColorlabel = new TQLabel( i18n("&Over-exposure color:"), overExpoBox); d->overExposureColor = new KColorButton(overExpoBox); overExpoColorlabel->setBuddy(d->overExposureColor); - QWhatsThis::add(d->overExposureColor, i18n("<p>Customize the color used in image editor to identify " + TQWhatsThis::add(d->overExposureColor, i18n("<p>Customize the color used in image editor to identify " "over-exposed pixels.")); // -------------------------------------------------------- - layout->addWidget(interfaceOptionsGroup); - layout->addWidget(exposureOptionsGroup); - layout->addStretch(); + tqlayout->addWidget(interfaceOptionsGroup); + tqlayout->addWidget(exposureOptionsGroup); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->themebackgroundColor, SIGNAL(toggled(bool)), - this, SLOT(slotThemeBackgroundColor(bool))); + connect(d->themebackgroundColor, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotThemeBackgroundColor(bool))); readSettings(); } @@ -149,8 +149,8 @@ void SetupEditor::slotThemeBackgroundColor(bool e) void SetupEditor::readSettings() { KConfig* config = kapp->config(); - QColor Black(Qt::black); - QColor White(Qt::white); + TQColor Black(TQt::black); + TQColor White(TQt::white); config->setGroup("ImageViewer Settings"); d->themebackgroundColor->setChecked(config->readBoolEntry("UseThemeBackgroundColor", true)); d->backgroundColor->setColor(config->readColorEntry("BackgroundColor", &Black)); diff --git a/digikam/utilities/setup/setupeditor.h b/digikam/utilities/setup/setupeditor.h index 0fa9d3c..1d3ab10 100644 --- a/digikam/utilities/setup/setupeditor.h +++ b/digikam/utilities/setup/setupeditor.h @@ -24,22 +24,23 @@ #ifndef SETUPEDITOR_H #define SETUPEDITOR_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupEditorPriv; -class SetupEditor : public QWidget +class SetupEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupEditor(QWidget* parent = 0); + SetupEditor(TQWidget* tqparent = 0); ~SetupEditor(); void applySettings(); diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp index 45cfff4..9ff04fd 100644 --- a/digikam/utilities/setup/setupgeneral.cpp +++ b/digikam/utilities/setup/setupgeneral.cpp @@ -22,22 +22,22 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qcombobox.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qdir.h> -#include <qlistbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qfileinfo.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqdir.h> +#include <tqlistbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqfileinfo.h> // KDE includes. @@ -79,134 +79,134 @@ public: showFolderTreeViewItemsCount = 0; } - QLabel *iconTreeThumbLabel; + TQLabel *iconTreeThumbLabel; - QCheckBox *iconShowNameBox; - QCheckBox *iconShowSizeBox; - QCheckBox *iconShowDateBox; - QCheckBox *iconShowModDateBox; - QCheckBox *iconShowResolutionBox; - QCheckBox *iconShowCommentsBox; - QCheckBox *iconShowTagsBox; - QCheckBox *iconShowRatingBox; - QCheckBox *previewLoadFullImageSize; - QCheckBox *showFolderTreeViewItemsCount; + TQCheckBox *iconShowNameBox; + TQCheckBox *iconShowSizeBox; + TQCheckBox *iconShowDateBox; + TQCheckBox *iconShowModDateBox; + TQCheckBox *iconShowResolutionBox; + TQCheckBox *iconShowCommentsBox; + TQCheckBox *iconShowTagsBox; + TQCheckBox *iconShowRatingBox; + TQCheckBox *previewLoadFullImageSize; + TQCheckBox *showFolderTreeViewItemsCount; - QComboBox *iconTreeThumbSize; - QComboBox *rightClickActionComboBox; + TQComboBox *iconTreeThumbSize; + TQComboBox *rightClickActionComboBox; KURLRequester *albumPathEdit; KDialogBase *mainDialog; }; -SetupGeneral::SetupGeneral(QWidget* parent, KDialogBase* dialog ) - : QWidget(parent) +SetupGeneral::SetupGeneral(TQWidget* tqparent, KDialogBase* dialog ) + : TQWidget(tqparent) { d = new SetupGeneralPriv; d->mainDialog = dialog; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - QHGroupBox *albumPathBox = new QHGroupBox(parent); + TQHGroupBox *albumPathBox = new TQHGroupBox(tqparent); albumPathBox->setTitle(i18n("Album &Library Path")); d->albumPathEdit = new KURLRequester(albumPathBox); d->albumPathEdit->setMode(KFile::Directory | KFile::LocalOnly | KFile::ExistingOnly); - QToolTip::add( d->albumPathEdit, i18n("<p>Here you can set the main path to the digiKam album " + TQToolTip::add( d->albumPathEdit, i18n("<p>Here you can set the main path to the digiKam album " "library in your computer." "<p>Write access is required for this path and do not use a " "remote path here, like an NFS mounted file system.")); - connect(d->albumPathEdit, SIGNAL(urlSelected(const QString &)), - this, SLOT(slotChangeAlbumPath(const QString &))); + connect(d->albumPathEdit, TQT_SIGNAL(urlSelected(const TQString &)), + this, TQT_SLOT(slotChangeAlbumPath(const TQString &))); - connect(d->albumPathEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(slotPathEdited(const QString&)) ); + connect(d->albumPathEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotPathEdited(const TQString&)) ); - layout->addWidget(albumPathBox); + tqlayout->addWidget(albumPathBox); // -------------------------------------------------------- - QVGroupBox *iconTextGroup = new QVGroupBox(i18n("Thumbnail Information"), parent); + TQVGroupBox *iconTextGroup = new TQVGroupBox(i18n("Thumbnail Information"), tqparent); - d->iconShowNameBox = new QCheckBox(i18n("Show file &name"), iconTextGroup); - QWhatsThis::add( d->iconShowNameBox, i18n("<p>Set this option to show the file name below the image thumbnail.")); + d->iconShowNameBox = new TQCheckBox(i18n("Show file &name"), iconTextGroup); + TQWhatsThis::add( d->iconShowNameBox, i18n("<p>Set this option to show the file name below the image thumbnail.")); - d->iconShowSizeBox = new QCheckBox(i18n("Show file si&ze"), iconTextGroup); - QWhatsThis::add( d->iconShowSizeBox, i18n("<p>Set this option to show the file size below the image thumbnail.")); + d->iconShowSizeBox = new TQCheckBox(i18n("Show file si&ze"), iconTextGroup); + TQWhatsThis::add( d->iconShowSizeBox, i18n("<p>Set this option to show the file size below the image thumbnail.")); - d->iconShowDateBox = new QCheckBox(i18n("Show camera creation &date"), iconTextGroup); - QWhatsThis::add( d->iconShowDateBox, i18n("<p>Set this option to show the camera creation date " + d->iconShowDateBox = new TQCheckBox(i18n("Show camera creation &date"), iconTextGroup); + TQWhatsThis::add( d->iconShowDateBox, i18n("<p>Set this option to show the camera creation date " "below the image thumbnail.")); - d->iconShowModDateBox = new QCheckBox(i18n("Show file &modification date"), iconTextGroup); - QWhatsThis::add( d->iconShowModDateBox, i18n("<p>Set this option to show the file modification date " + d->iconShowModDateBox = new TQCheckBox(i18n("Show file &modification date"), iconTextGroup); + TQWhatsThis::add( d->iconShowModDateBox, i18n("<p>Set this option to show the file modification date " "below the image thumbnail.")); - d->iconShowCommentsBox = new QCheckBox(i18n("Show digiKam &captions"), iconTextGroup); - QWhatsThis::add( d->iconShowCommentsBox, i18n("<p>Set this option to show the digiKam captions " + d->iconShowCommentsBox = new TQCheckBox(i18n("Show digiKam &captions"), iconTextGroup); + TQWhatsThis::add( d->iconShowCommentsBox, i18n("<p>Set this option to show the digiKam captions " "below the image thumbnail.")); - d->iconShowTagsBox = new QCheckBox(i18n("Show digiKam &tags"), iconTextGroup); - QWhatsThis::add( d->iconShowTagsBox, i18n("<p>Set this option to show the digiKam tags " + d->iconShowTagsBox = new TQCheckBox(i18n("Show digiKam &tags"), iconTextGroup); + TQWhatsThis::add( d->iconShowTagsBox, i18n("<p>Set this option to show the digiKam tags " "below the image thumbnail.")); - d->iconShowRatingBox = new QCheckBox(i18n("Show digiKam &rating"), iconTextGroup); - QWhatsThis::add( d->iconShowRatingBox, i18n("<p>Set this option to show the digiKam rating " + d->iconShowRatingBox = new TQCheckBox(i18n("Show digiKam &rating"), iconTextGroup); + TQWhatsThis::add( d->iconShowRatingBox, i18n("<p>Set this option to show the digiKam rating " "below the image thumbnail.")); - d->iconShowResolutionBox = new QCheckBox(i18n("Show ima&ge dimensions (warning: slow)"), iconTextGroup); - QWhatsThis::add( d->iconShowResolutionBox, i18n("<p>Set this option to show the image size in pixels " + d->iconShowResolutionBox = new TQCheckBox(i18n("Show ima&ge dimensions (warning: slow)"), iconTextGroup); + TQWhatsThis::add( d->iconShowResolutionBox, i18n("<p>Set this option to show the image size in pixels " "below the image thumbnail.")); - layout->addWidget(iconTextGroup); + tqlayout->addWidget(iconTextGroup); // -------------------------------------------------------- - QVGroupBox *interfaceOptionsGroup = new QVGroupBox(i18n("Interface Options"), parent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); interfaceOptionsGroup->setColumnLayout(0, Qt::Vertical ); - interfaceOptionsGroup->layout()->setMargin(KDialog::marginHint()); - QGridLayout* ifaceSettingsLayout = new QGridLayout(interfaceOptionsGroup->layout(), 3, 4, KDialog::spacingHint()); + interfaceOptionsGroup->tqlayout()->setMargin(KDialog::marginHint()); + TQGridLayout* ifaceSettingsLayout = new TQGridLayout(interfaceOptionsGroup->tqlayout(), 3, 4, KDialog::spacingHint()); - d->iconTreeThumbLabel = new QLabel(i18n("Sidebar thumbnail size:"), interfaceOptionsGroup); - d->iconTreeThumbSize = new QComboBox(false, interfaceOptionsGroup); + d->iconTreeThumbLabel = new TQLabel(i18n("Sidebar thumbnail size:"), interfaceOptionsGroup); + d->iconTreeThumbSize = new TQComboBox(false, interfaceOptionsGroup); d->iconTreeThumbSize->insertItem("16"); d->iconTreeThumbSize->insertItem("22"); d->iconTreeThumbSize->insertItem("32"); d->iconTreeThumbSize->insertItem("48"); - QToolTip::add( d->iconTreeThumbSize, i18n("<p>Set this option to configure the size " + TQToolTip::add( d->iconTreeThumbSize, i18n("<p>Set this option to configure the size " "in pixels of the thumbnails in digiKam's sidebars. " "This option will take effect when you restart " "digiKam.")); ifaceSettingsLayout->addMultiCellWidget(d->iconTreeThumbLabel, 0, 0, 0, 0); ifaceSettingsLayout->addMultiCellWidget(d->iconTreeThumbSize, 0, 0, 1, 1); - d->showFolderTreeViewItemsCount = new QCheckBox(i18n("Show count of items in all tree-view"), interfaceOptionsGroup); + d->showFolderTreeViewItemsCount = new TQCheckBox(i18n("Show count of items in all tree-view"), interfaceOptionsGroup); ifaceSettingsLayout->addMultiCellWidget(d->showFolderTreeViewItemsCount, 1, 1, 0, 4); - QLabel *rightClickLabel = new QLabel(i18n("Thumbnail click action:"), interfaceOptionsGroup); - d->rightClickActionComboBox = new QComboBox(false, interfaceOptionsGroup); + TQLabel *rightClickLabel = new TQLabel(i18n("Thumbnail click action:"), interfaceOptionsGroup); + d->rightClickActionComboBox = new TQComboBox(false, interfaceOptionsGroup); d->rightClickActionComboBox->insertItem(i18n("Show embedded preview"), AlbumSettings::ShowPreview); d->rightClickActionComboBox->insertItem(i18n("Start image editor"), AlbumSettings::StartEditor); - QToolTip::add( d->rightClickActionComboBox, i18n("<p>Here, choose what should happen when you " + TQToolTip::add( d->rightClickActionComboBox, i18n("<p>Here, choose what should happen when you " "click on a thumbnail.")); ifaceSettingsLayout->addMultiCellWidget(rightClickLabel, 2 ,2, 0, 0); ifaceSettingsLayout->addMultiCellWidget(d->rightClickActionComboBox, 2, 2, 1, 4); - d->previewLoadFullImageSize = new QCheckBox(i18n("Embedded preview loads full image size"), interfaceOptionsGroup); - QWhatsThis::add( d->previewLoadFullImageSize, i18n("<p>Set this option to load the full image size " + d->previewLoadFullImageSize = new TQCheckBox(i18n("Embedded preview loads full image size"), interfaceOptionsGroup); + TQWhatsThis::add( d->previewLoadFullImageSize, i18n("<p>Set this option to load the full image size " "with an embedded preview, instead a reduced one. Because this option will take more time " "to load images, use it only if you have a fast computer.")); ifaceSettingsLayout->addMultiCellWidget(d->previewLoadFullImageSize, 3, 3, 0, 4); - layout->addWidget(interfaceOptionsGroup); + tqlayout->addWidget(interfaceOptionsGroup); // -------------------------------------------------------- - layout->addStretch(); + tqlayout->addStretch(); readSettings(); adjustSize(); @@ -274,15 +274,15 @@ void SetupGeneral::readSettings() d->showFolderTreeViewItemsCount->setChecked(settings->getShowFolderTreeViewItemsCount()); } -void SetupGeneral::slotChangeAlbumPath(const QString &result) +void SetupGeneral::slotChangeAlbumPath(const TQString &result) { - if (KURL(result).equals(KURL(QDir::homeDirPath()), true)) + if (KURL(result).equals(KURL(TQDir::homeDirPath()), true)) { KMessageBox::sorry(0, i18n("Sorry you can't use your home directory as album library.")); return; } - QFileInfo targetPath(result); + TQFileInfo targetPath(result); if (!result.isEmpty() && !targetPath.isWritable()) { @@ -291,7 +291,7 @@ void SetupGeneral::slotChangeAlbumPath(const QString &result) } } -void SetupGeneral::slotPathEdited(const QString& newPath) +void SetupGeneral::slotPathEdited(const TQString& newPath) { if (newPath.isEmpty()) { @@ -301,12 +301,12 @@ void SetupGeneral::slotPathEdited(const QString& newPath) if (!newPath.startsWith("/")) { - d->albumPathEdit->setURL(QDir::homeDirPath() + '/' + newPath); + d->albumPathEdit->setURL(TQDir::homeDirPath() + '/' + newPath); } - QFileInfo targetPath(newPath); - QDir dir(newPath); - d->mainDialog->enableButtonOK(dir.exists() && dir.path() != QDir::homeDirPath()); + TQFileInfo targetPath(newPath); + TQDir dir(newPath); + d->mainDialog->enableButtonOK(dir.exists() && dir.path() != TQDir::homeDirPath()); } } // namespace Digikam diff --git a/digikam/utilities/setup/setupgeneral.h b/digikam/utilities/setup/setupgeneral.h index 3c3a5d0..f3a4b43 100644 --- a/digikam/utilities/setup/setupgeneral.h +++ b/digikam/utilities/setup/setupgeneral.h @@ -25,9 +25,9 @@ #ifndef SETUPGENERAL_H #define SETUPGENERAL_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> class KDialogBase; @@ -36,13 +36,14 @@ namespace Digikam class SetupGeneralPriv; -class SetupGeneral : public QWidget +class SetupGeneral : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupGeneral(QWidget* parent = 0, KDialogBase* dialog = 0); + SetupGeneral(TQWidget* tqparent = 0, KDialogBase* dialog = 0); ~SetupGeneral(); void applySettings(); @@ -53,8 +54,8 @@ private: private slots: - void slotChangeAlbumPath(const QString &); - void slotPathEdited(const QString&); + void slotChangeAlbumPath(const TQString &); + void slotPathEdited(const TQString&); private: diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 6411d09..8e89f68 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -24,24 +24,24 @@ #include <config.h> -// Qt includes. - -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qiconset.h> -#include <qpixmap.h> -#include <qpushbutton.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qdir.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqiconset.h> +#include <tqpixmap.h> +#include <tqpushbutton.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqdir.h> +#include <tqtooltip.h> // KDE includes. @@ -107,31 +107,31 @@ public: monitorProfiles = 0; } - QLabel *monitorIcon; - QLabel *monitorProfiles; + TQLabel *monitorIcon; + TQLabel *monitorProfiles; - QCheckBox *enableColorManagement; - QCheckBox *bpcAlgorithm; - QCheckBox *managedView; + TQCheckBox *enableColorManagement; + TQCheckBox *bpcAlgorithm; + TQCheckBox *managedView; - QRadioButton *defaultApplyICC; - QRadioButton *defaultAskICC; + TQRadioButton *defaultApplyICC; + TQRadioButton *defaultAskICC; - QPushButton *infoWorkProfiles; - QPushButton *infoMonitorProfiles; - QPushButton *infoInProfiles; - QPushButton *infoProofProfiles; + TQPushButton *infoWorkProfiles; + TQPushButton *infoMonitorProfiles; + TQPushButton *infoInProfiles; + TQPushButton *infoProofProfiles; - QVGroupBox *behaviourGB; - QHGroupBox *defaultPathGB; - QGroupBox *profilesGB; - QVGroupBox *advancedSettingsGB; + TQVGroupBox *behaviourGB; + TQHGroupBox *defaultPathGB; + TQGroupBox *profilesGB; + TQVGroupBox *advancedSettingsGB; // Maps to store profile descriptions and profile file path - QMap<QString, QString> inICCPath; - QMap<QString, QString> workICCPath; - QMap<QString, QString> proofICCPath; - QMap<QString, QString> monitorICCPath; + TQMap<TQString, TQString> inICCPath; + TQMap<TQString, TQString> workICCPath; + TQMap<TQString, TQString> proofICCPath; + TQMap<TQString, TQString> monitorICCPath; KURLRequester *defaultPathKU; @@ -145,45 +145,45 @@ public: SqueezedComboBox *monitorProfilesKC; }; -SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) - : QWidget(parent) +SetupICC::SetupICC(TQWidget* tqparent, KDialogBase* dialog ) + : TQWidget(tqparent) { d = new SetupICCPriv(); d->mainDialog = dialog; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - QGroupBox *colorPolicy = new QGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), parent); - QGridLayout* grid = new QGridLayout( colorPolicy->layout(), 1, 2, KDialog::spacingHint()); + TQGroupBox *colorPolicy = new TQGroupBox(0, Qt::Horizontal, i18n("Color Management Policy"), tqparent); + TQGridLayout* grid = new TQGridLayout( colorPolicy->tqlayout(), 1, 2, KDialog::spacingHint()); - d->enableColorManagement = new QCheckBox(colorPolicy); + d->enableColorManagement = new TQCheckBox(colorPolicy); d->enableColorManagement->setText(i18n("Enable Color Management")); - QWhatsThis::add( d->enableColorManagement, i18n("<ul><li>Checked: Color Management is enabled</li>" + TQWhatsThis::add( d->enableColorManagement, i18n("<ul><li>Checked: Color Management is enabled</li>" "<li>Unchecked: Color Management is disabled</li></ul>")); KURLLabel *lcmsLogoLabel = new KURLLabel(colorPolicy); - lcmsLogoLabel->setText(QString()); + lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); - lcmsLogoLabel->setPixmap( QPixmap( directory + "logo-lcms.png" ) ); - QToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) ); + TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website")); - d->behaviourGB = new QVGroupBox(i18n("Behavior"), colorPolicy); - QButtonGroup *behaviourOptions = new QButtonGroup(2, Qt::Vertical, d->behaviourGB); - behaviourOptions->setFrameStyle( QFrame::NoFrame ); + d->behaviourGB = new TQVGroupBox(i18n("Behavior"), colorPolicy); + TQButtonGroup *behaviourOptions = new TQButtonGroup(2, Qt::Vertical, d->behaviourGB); + behaviourOptions->setFrameStyle( TQFrame::NoFrame ); behaviourOptions->setInsideMargin(0); - d->defaultApplyICC = new QRadioButton(behaviourOptions); + d->defaultApplyICC = new TQRadioButton(behaviourOptions); d->defaultApplyICC->setText(i18n("Apply when opening an image in the Image Editor")); - QWhatsThis::add( d->defaultApplyICC, i18n("<p>If this option is enabled, digiKam applies the " + TQWhatsThis::add( d->defaultApplyICC, i18n("<p>If this option is enabled, digiKam applies the " "Workspace default color profile to an image, without prompting you about missing " "embedded profiles or embedded profiles different from the workspace profile.</p>")); - d->defaultAskICC = new QRadioButton(behaviourOptions); + d->defaultAskICC = new TQRadioButton(behaviourOptions); d->defaultAskICC->setText(i18n("Ask when opening an image in the Image Editor")); - QWhatsThis::add( d->defaultAskICC, i18n("<p>If this option is enabled, digiKam asks to user " + TQWhatsThis::add( d->defaultAskICC, i18n("<p>If this option is enabled, digiKam asks to user " "before it applies the Workspace default color profile to an image which has no " "embedded profile or, if the image has an embedded profile, when it's not the same " "as the workspace profile.</p>")); @@ -193,44 +193,44 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) grid->addMultiCellWidget(d->behaviourGB, 1, 1, 0, 2); grid->setColStretch(1, 10); - layout->addWidget(colorPolicy); + tqlayout->addWidget(colorPolicy); // -------------------------------------------------------- - d->defaultPathGB = new QHGroupBox(parent); + d->defaultPathGB = new TQHGroupBox(tqparent); d->defaultPathGB->setTitle(i18n("Color Profiles Directory")); d->defaultPathKU = new KURLRequester(d->defaultPathGB); d->defaultPathKU->lineEdit()->setReadOnly(true); d->defaultPathKU->setMode(KFile::Directory | KFile::LocalOnly | KFile::ExistingOnly); - QWhatsThis::add( d->defaultPathKU, i18n("<p>Default path to the color profiles folder. " + TQWhatsThis::add( d->defaultPathKU, i18n("<p>Default path to the color profiles folder. " "You must store all your color profiles in this directory.</p>")); - layout->addWidget(d->defaultPathGB); + tqlayout->addWidget(d->defaultPathGB); // -------------------------------------------------------- - d->profilesGB = new QGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), parent); - QGridLayout* grid2 = new QGridLayout( d->profilesGB->layout(), 4, 3, KDialog::spacingHint()); + d->profilesGB = new TQGroupBox(0, Qt::Horizontal, i18n("ICC Profiles Settings"), tqparent); + TQGridLayout* grid2 = new TQGridLayout( d->profilesGB->tqlayout(), 4, 3, KDialog::spacingHint()); grid2->setColStretch(2, 10); - d->managedView = new QCheckBox(d->profilesGB); + d->managedView = new TQCheckBox(d->profilesGB); d->managedView->setText(i18n("Use color managed view (warning: slow)")); - QWhatsThis::add( d->managedView, i18n("<p>Turn on this option if " + TQWhatsThis::add( d->managedView, i18n("<p>Turn on this option if " "you want to use your <b>Monitor Color Profile</b> to show your pictures in " "the Image Editor window with a color correction adapted to your monitor. " "Warning: this option can take a while to render " "pictures on the screen, especially with a slow computer.</p>")); - d->monitorIcon = new QLabel(d->profilesGB); + d->monitorIcon = new TQLabel(d->profilesGB); d->monitorIcon->setPixmap(SmallIcon("tv")); - d->monitorProfiles = new QLabel(i18n("Monitor:"), d->profilesGB); + d->monitorProfiles = new TQLabel(i18n("Monitor:"), d->profilesGB); d->monitorProfilesKC = new SqueezedComboBox(d->profilesGB); d->monitorProfiles->setBuddy(d->monitorProfilesKC); - QWhatsThis::add( d->monitorProfilesKC, i18n("<p>Select the color profile for your monitor. " + TQWhatsThis::add( d->monitorProfilesKC, i18n("<p>Select the color profile for your monitor. " "You need to enable the <b>Use color managed view</b> option to use this profile.</p>")); - d->infoMonitorProfiles = new QPushButton(i18n("Info..."), d->profilesGB); - QWhatsThis::add( d->infoMonitorProfiles, i18n("<p>You can use this button to get more detailed " + d->infoMonitorProfiles = new TQPushButton(i18n("Info..."), d->profilesGB); + TQWhatsThis::add( d->infoMonitorProfiles, i18n("<p>You can use this button to get more detailed " "information about the selected monitor profile.</p>")); grid2->addMultiCellWidget(d->managedView, 0, 0, 0, 3); @@ -239,16 +239,16 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) grid2->addMultiCellWidget(d->monitorProfilesKC, 1, 1, 2, 2); grid2->addMultiCellWidget(d->infoMonitorProfiles, 1, 1, 3, 3); - QLabel *workIcon = new QLabel(d->profilesGB); + TQLabel *workIcon = new TQLabel(d->profilesGB); workIcon->setPixmap(SmallIcon("tablet")); - QLabel *workProfiles = new QLabel(i18n("Workspace:"), d->profilesGB); + TQLabel *workProfiles = new TQLabel(i18n("Workspace:"), d->profilesGB); d->workProfilesKC = new SqueezedComboBox(d->profilesGB); workProfiles->setBuddy(d->workProfilesKC); - QWhatsThis::add( d->workProfilesKC, i18n("<p>All the images will be converted to the color " + TQWhatsThis::add( d->workProfilesKC, i18n("<p>All the images will be converted to the color " "space of this profile, so you must select a profile appropriate for editing.</p>" "<p>These color profiles are device independent.</p>")); - d->infoWorkProfiles = new QPushButton(i18n("Info..."), d->profilesGB); - QWhatsThis::add( d->infoWorkProfiles, i18n("<p>You can use this button to get more detailed " + d->infoWorkProfiles = new TQPushButton(i18n("Info..."), d->profilesGB); + TQWhatsThis::add( d->infoWorkProfiles, i18n("<p>You can use this button to get more detailed " "information about the selected workspace profile.</p>")); grid2->addMultiCellWidget(workIcon, 2, 2, 0, 0); @@ -256,15 +256,15 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) grid2->addMultiCellWidget(d->workProfilesKC, 2, 2, 2, 2); grid2->addMultiCellWidget(d->infoWorkProfiles, 2, 2, 3, 3); - QLabel *inIcon = new QLabel(d->profilesGB); + TQLabel *inIcon = new TQLabel(d->profilesGB); inIcon->setPixmap(SmallIcon("camera")); - QLabel *inProfiles = new QLabel(i18n("Input:"), d->profilesGB); + TQLabel *inProfiles = new TQLabel(i18n("Input:"), d->profilesGB); d->inProfilesKC = new SqueezedComboBox(d->profilesGB); inProfiles->setBuddy(d->inProfilesKC); - QWhatsThis::add( d->inProfilesKC, i18n("<p>You must select the profile for your input device " + TQWhatsThis::add( d->inProfilesKC, i18n("<p>You must select the profile for your input device " "(usually, your camera, scanner...)</p>")); - d->infoInProfiles = new QPushButton(i18n("Info..."), d->profilesGB); - QWhatsThis::add( d->infoInProfiles, i18n("<p>You can use this button to get more detailed " + d->infoInProfiles = new TQPushButton(i18n("Info..."), d->profilesGB); + TQWhatsThis::add( d->infoInProfiles, i18n("<p>You can use this button to get more detailed " "information about the selected input profile.</p>")); grid2->addMultiCellWidget(inIcon, 3, 3, 0, 0); @@ -272,16 +272,16 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) grid2->addMultiCellWidget(d->inProfilesKC, 3, 3, 2, 2); grid2->addMultiCellWidget(d->infoInProfiles, 3, 3, 3, 3); - QLabel *proofIcon = new QLabel(d->profilesGB); + TQLabel *proofIcon = new TQLabel(d->profilesGB); proofIcon->setPixmap(SmallIcon("printer1")); - QLabel *proofProfiles = new QLabel(i18n("Soft proof:"), d->profilesGB); + TQLabel *proofProfiles = new TQLabel(i18n("Soft proof:"), d->profilesGB); d->proofProfilesKC = new SqueezedComboBox(d->profilesGB); proofProfiles->setBuddy(d->proofProfilesKC); - QWhatsThis::add( d->proofProfilesKC, i18n("<p>You must select the profile for your output device " + TQWhatsThis::add( d->proofProfilesKC, i18n("<p>You must select the profile for your output device " "(usually, your printer). This profile will be used to do a soft proof, so you will " "be able to preview how an image will be rendered via an output device.</p>")); - d->infoProofProfiles = new QPushButton(i18n("Info..."), d->profilesGB); - QWhatsThis::add( d->infoProofProfiles, i18n("<p>You can use this button to get more detailed " + d->infoProofProfiles = new TQPushButton(i18n("Info..."), d->profilesGB); + TQWhatsThis::add( d->infoProofProfiles, i18n("<p>You can use this button to get more detailed " "information about the selected soft proof profile.</p>")); grid2->addMultiCellWidget(proofIcon, 4, 4, 0, 0); @@ -289,21 +289,21 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) grid2->addMultiCellWidget(d->proofProfilesKC, 4, 4, 2, 2); grid2->addMultiCellWidget(d->infoProofProfiles, 4, 4, 3, 3); - layout->addWidget(d->profilesGB); + tqlayout->addWidget(d->profilesGB); // -------------------------------------------------------- - d->advancedSettingsGB = new QVGroupBox(i18n("Advanced Settings"), parent); + d->advancedSettingsGB = new TQVGroupBox(i18n("Advanced Settings"), tqparent); - d->bpcAlgorithm = new QCheckBox(d->advancedSettingsGB); + d->bpcAlgorithm = new TQCheckBox(d->advancedSettingsGB); d->bpcAlgorithm->setText(i18n("Use black point compensation")); - QWhatsThis::add( d->bpcAlgorithm, i18n("<p><b>Black Point Compensation</b> is a way to make " + TQWhatsThis::add( d->bpcAlgorithm, i18n("<p><b>Black Point Compensation</b> is a way to make " "adjustments between the maximum " "black levels of digital files and the black capabilities of various " "digital devices.</p>")); - QHBox *hbox2 = new QHBox(d->advancedSettingsGB); - QLabel *lablel = new QLabel(hbox2); + TQHBox *hbox2 = new TQHBox(d->advancedSettingsGB); + TQLabel *lablel = new TQLabel(hbox2); lablel->setText(i18n("Rendering Intents:")); d->renderingIntentKC = new KComboBox(false, hbox2); @@ -311,7 +311,7 @@ SetupICC::SetupICC(QWidget* parent, KDialogBase* dialog ) d->renderingIntentKC->insertItem("Relative Colorimetric"); d->renderingIntentKC->insertItem("Saturation"); d->renderingIntentKC->insertItem("Absolute Colorimetric"); - QWhatsThis::add( d->renderingIntentKC, i18n("<ul><li><p><b>Perceptual intent</b> causes the full gamut of the image to be " + TQWhatsThis::add( d->renderingIntentKC, i18n("<ul><li><p><b>Perceptual intent</b> causes the full gamut of the image to be " "compressed or expanded to fill the gamut of the destination device, so that gray balance is " "preserved but colorimetric accuracy may not be preserved.</p>" "<p>In other words, if certain colors in an image fall outside of the range of colors that the output " @@ -334,34 +334,34 @@ SetupICC::SetupICC(QWidget* 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>")); - layout->addWidget(d->advancedSettingsGB); - layout->addStretch(); + tqlayout->addWidget(d->advancedSettingsGB); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->managedView, SIGNAL(toggled(bool)), - this, SLOT(slotToggleManagedView(bool))); + connect(d->managedView, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggleManagedView(bool))); - connect(lcmsLogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processLCMSURL(const QString&))); + connect(lcmsLogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processLCMSURL(const TQString&))); - connect(d->enableColorManagement, SIGNAL(toggled(bool)), - this, SLOT(slotToggledWidgets(bool))); + connect(d->enableColorManagement, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotToggledWidgets(bool))); - connect(d->infoProofProfiles, SIGNAL(clicked()), - this, SLOT(slotClickedProof()) ); + connect(d->infoProofProfiles, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotClickedProof()) ); - connect(d->infoInProfiles, SIGNAL(clicked()), - this, SLOT(slotClickedIn()) ); + connect(d->infoInProfiles, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotClickedIn()) ); - connect(d->infoMonitorProfiles, SIGNAL(clicked()), - this, SLOT(slotClickedMonitor()) ); + connect(d->infoMonitorProfiles, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotClickedMonitor()) ); - connect(d->infoWorkProfiles, SIGNAL(clicked()), - this, SLOT(slotClickedWork())); + connect(d->infoWorkProfiles, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotClickedWork())); - connect(d->defaultPathKU, SIGNAL(urlSelected(const QString&)), - this, SLOT(slotFillCombos(const QString&))); + connect(d->defaultPathKU, TQT_SIGNAL(urlSelected(const TQString&)), + this, TQT_SLOT(slotFillCombos(const TQString&))); // -------------------------------------------------------- @@ -376,7 +376,7 @@ SetupICC::~SetupICC() delete d; } -void SetupICC::processLCMSURL(const QString& url) +void SetupICC::processLCMSURL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } @@ -406,13 +406,13 @@ void SetupICC::applySettings() config->writeEntry("ManagedView", d->managedView->isChecked()); config->writePathEntry("InProfileFile", - *(d->inICCPath.find(d->inProfilesKC->itemHighlighted()))); + *(d->inICCPath.tqfind(d->inProfilesKC->itemHighlighted()))); config->writePathEntry("WorkProfileFile", - *(d->workICCPath.find(d->workProfilesKC->itemHighlighted()))); + *(d->workICCPath.tqfind(d->workProfilesKC->itemHighlighted()))); config->writePathEntry("MonitorProfileFile", - *(d->monitorICCPath.find(d->monitorProfilesKC->itemHighlighted()))); + *(d->monitorICCPath.tqfind(d->monitorProfilesKC->itemHighlighted()))); config->writePathEntry("ProofProfileFile", - *(d->proofICCPath.find(d->proofProfilesKC->itemHighlighted()))); + *(d->proofICCPath.tqfind(d->proofProfilesKC->itemHighlighted()))); } void SetupICC::readSettings(bool restore) @@ -423,7 +423,7 @@ void SetupICC::readSettings(bool restore) if (!restore) d->enableColorManagement->setChecked(config->readBoolEntry("EnableCM", false)); - d->defaultPathKU->setURL(config->readPathEntry("DefaultPath", QString())); + d->defaultPathKU->setURL(config->readPathEntry("DefaultPath", TQString())); d->bpcAlgorithm->setChecked(config->readBoolEntry("BPCAlgorithm", false)); d->renderingIntentKC->setCurrentItem(config->readNumEntry("RenderingIntent", 0)); d->managedView->setChecked(config->readBoolEntry("ManagedView", false)); @@ -441,12 +441,12 @@ void SetupICC::readSettings(bool restore) d->proofProfilesKC->setCurrentItem(config->readNumEntry("ProofProfile", 0)); } -void SetupICC::slotFillCombos(const QString& path) +void SetupICC::slotFillCombos(const TQString& path) { fillCombos(path, true); } -void SetupICC::fillCombos(const QString& path, bool report) +void SetupICC::fillCombos(const TQString& path, bool report) { if (!d->enableColorManagement->isChecked()) return; @@ -459,7 +459,7 @@ void SetupICC::fillCombos(const QString& path, bool report) d->workICCPath.clear(); d->proofICCPath.clear(); d->monitorICCPath.clear(); - QDir dir(path); + TQDir dir(path); if (path.isEmpty() || !dir.exists() || !dir.isReadable()) { @@ -473,15 +473,15 @@ void SetupICC::fillCombos(const QString& path, bool report) d->mainDialog->enableButtonOK(true); // Look the ICC profile path repository set by user. - QDir userProfilesDir(path, "*.icc;*.icm", QDir::Files); - const QFileInfoList* usersFiles = userProfilesDir.entryInfoList(); + TQDir userProfilesDir(path, "*.icc;*.icm", TQDir::Files); + const TQFileInfoList* usersFiles = userProfilesDir.entryInfoList(); DDebug() << "Scanning ICC profiles from user repository: " << path << endl; if ( !parseProfilesfromDir(usersFiles) ) { if (report) { - QString message = i18n("<p>Sorry, there are no ICC profiles files in "); + TQString message = i18n("<p>Sorry, there are no ICC profiles files in "); message.append(path); message.append(i18n("</p>")); KMessageBox::sorry(this, message); @@ -494,9 +494,9 @@ void SetupICC::fillCombos(const QString& path, bool report) // Look the ICC color-space profile path include with digiKam dist. KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles"); - QString digiKamProfilesPath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); - QDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", QDir::Files); - const QFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList(); + TQString digiKamProfilesPath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); + TQDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", TQDir::Files); + const TQFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList(); DDebug() << "Scanning ICC profiles included with digiKam: " << digiKamProfilesPath << endl; parseProfilesfromDir(digiKamFiles); @@ -526,35 +526,35 @@ void SetupICC::fillCombos(const QString& path, bool report) d->mainDialog->enableButtonOK(true); } -bool SetupICC::parseProfilesfromDir(const QFileInfoList* files) +bool SetupICC::parseProfilesfromDir(const TQFileInfoList* files) { cmsHPROFILE tmpProfile=0; bool findIccFiles=false; if (files) { - QFileInfoListIterator it(*files); - QFileInfo *fileInfo=0; + TQFileInfoListIterator it(*files); + TQFileInfo *fileInfo=0; while ((fileInfo = it.current()) != 0) { if (fileInfo->isFile() && fileInfo->isReadable()) { - QString fileName = fileInfo->filePath(); - tmpProfile = cmsOpenProfileFromFile(QFile::encodeName(fileName), "r"); + TQString fileName = fileInfo->filePath(); + tmpProfile = cmsOpenProfileFromFile(TQFile::encodeName(fileName), "r"); if (tmpProfile == NULL) { DDebug() << "Error: Parsed profile is NULL (invalid profile); " << fileName << endl; cmsCloseProfile(tmpProfile); ++it; - QString message = i18n("<p>The following profile is invalid:</p><p><b>"); + TQString message = i18n("<p>The following profile is invalid:</p><p><b>"); message.append(fileName); message.append("</b></p><p>To avoid this message remove it from color profiles repository</p>"); message.append("<p>Do you want digiKam do it for you?</p>"); if (KMessageBox::warningYesNo(this, message, i18n("Invalid Profile")) == 3) { - if (QFile::remove(fileName)) + if (TQFile::remove(fileName)) { KMessageBox::information(this, i18n("Invalid color profile has been removed")); } @@ -567,16 +567,16 @@ bool SetupICC::parseProfilesfromDir(const QFileInfoList* files) continue; } - QString profileDescription = QString((cmsTakeProductDesc(tmpProfile))); + TQString profileDescription = TQString((cmsTakeProductDesc(tmpProfile))); switch ((int)cmsGetDeviceClass(tmpProfile)) { case icSigInputClass: { - if (QString(cmsTakeProductDesc(tmpProfile)).isEmpty()) + if (TQString(cmsTakeProductDesc(tmpProfile)).isEmpty()) d->inICCPath.insert(fileName, fileName); else - d->inICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); + d->inICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); DDebug() << "ICC file: " << fileName << " ==> Input device class (" << cmsGetDeviceClass(tmpProfile) << ")" << endl; @@ -585,15 +585,15 @@ bool SetupICC::parseProfilesfromDir(const QFileInfoList* files) } case icSigDisplayClass: { - if (QString(cmsTakeProductDesc(tmpProfile)).isEmpty()) + if (TQString(cmsTakeProductDesc(tmpProfile)).isEmpty()) { d->monitorICCPath.insert(fileName, fileName); d->workICCPath.insert(fileName, fileName); } else { - d->monitorICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); - d->workICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); + d->monitorICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); + d->workICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); } DDebug() << "ICC file: " << fileName << " ==> Monitor device class (" @@ -603,10 +603,10 @@ bool SetupICC::parseProfilesfromDir(const QFileInfoList* files) } case icSigOutputClass: { - if (QString(cmsTakeProductDesc(tmpProfile)).isEmpty()) + if (TQString(cmsTakeProductDesc(tmpProfile)).isEmpty()) d->proofICCPath.insert(fileName, fileName); else - d->proofICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); + d->proofICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); DDebug() << "ICC file: " << fileName << " ==> Output device class (" << cmsGetDeviceClass(tmpProfile) << ")" << endl; @@ -615,15 +615,15 @@ bool SetupICC::parseProfilesfromDir(const QFileInfoList* files) } case icSigColorSpaceClass: { - if (QString(cmsTakeProductDesc(tmpProfile)).isEmpty()) + if (TQString(cmsTakeProductDesc(tmpProfile)).isEmpty()) { d->inICCPath.insert(fileName, fileName); d->workICCPath.insert(fileName, fileName); } else { - d->inICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); - d->workICCPath.insert(QString(cmsTakeProductDesc(tmpProfile)), fileName); + d->inICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); + d->workICCPath.insert(TQString(cmsTakeProductDesc(tmpProfile)), fileName); } DDebug() << "ICC file: " << fileName << " ==> WorkingSpace device class (" @@ -666,25 +666,25 @@ void SetupICC::slotToggledWidgets(bool t) void SetupICC::slotClickedWork() { - profileInfo(*(d->workICCPath.find(d->workProfilesKC->itemHighlighted()))); + profileInfo(*(d->workICCPath.tqfind(d->workProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedIn() { - profileInfo(*(d->inICCPath.find(d->inProfilesKC->itemHighlighted()))); + profileInfo(*(d->inICCPath.tqfind(d->inProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedMonitor() { - profileInfo(*(d->monitorICCPath.find(d->monitorProfilesKC->itemHighlighted()))); + profileInfo(*(d->monitorICCPath.tqfind(d->monitorProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedProof() { - profileInfo(*(d->proofICCPath.find(d->proofProfilesKC->itemHighlighted()))); + profileInfo(*(d->proofICCPath.tqfind(d->proofProfilesKC->itemHighlighted()))); } -void SetupICC::profileInfo(const QString& profile) +void SetupICC::profileInfo(const TQString& profile) { if (profile.isEmpty()) { @@ -715,7 +715,7 @@ bool SetupICC::iccRepositoryIsValid() // To be valid, the ICC profiles repository must exist and be readable. - QDir tmpPath(config->readPathEntry("DefaultPath", QString())); + TQDir tmpPath(config->readPathEntry("DefaultPath", TQString())); DDebug() << "ICC profiles repository is: " << tmpPath.dirName() << endl; if ( tmpPath.exists() && tmpPath.isReadable() ) diff --git a/digikam/utilities/setup/setupicc.h b/digikam/utilities/setup/setupicc.h index 2182f58..7942240 100644 --- a/digikam/utilities/setup/setupicc.h +++ b/digikam/utilities/setup/setupicc.h @@ -25,11 +25,11 @@ #ifndef SETUPICC_H #define SETUPICC_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qmap.h> -#include <qdir.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqdir.h> // Local includes. @@ -42,13 +42,14 @@ namespace Digikam class SetupICCPriv; -class DIGIKAM_EXPORT SetupICC : public QWidget +class DIGIKAM_EXPORT SetupICC : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupICC(QWidget* parent = 0, KDialogBase* dialog = 0); + SetupICC(TQWidget* tqparent = 0, KDialogBase* dialog = 0); ~SetupICC(); void applySettings(); @@ -58,18 +59,18 @@ public: private: void readSettings(bool restore=false); - void fillCombos(const QString& path, bool report); + void fillCombos(const TQString& path, bool report); void enableWidgets(); void disableWidgets(); - void profileInfo(const QString&); - bool parseProfilesfromDir(const QFileInfoList* files); + void profileInfo(const TQString&); + bool parseProfilesfromDir(const TQFileInfoList* files); private slots: - void processLCMSURL(const QString&); + void processLCMSURL(const TQString&); void slotToggledWidgets(bool); void slotToggleManagedView(bool); - void slotFillCombos(const QString&); + void slotFillCombos(const TQString&); void slotClickedIn(); void slotClickedWork(); void slotClickedMonitor(); diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp index 2076044..2450d1e 100644 --- a/digikam/utilities/setup/setupidentity.cpp +++ b/digikam/utilities/setup/setupidentity.cpp @@ -21,14 +21,14 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qvalidator.h> +#include <tqlayout.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqvalidator.h> // KDE includes. @@ -66,73 +66,73 @@ public: KLineEdit *copyrightEdit; }; -SetupIdentity::SetupIdentity(QWidget* parent ) - : QWidget(parent) +SetupIdentity::SetupIdentity(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupIdentityPriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- // IPTC only accept printable Ascii char. - QRegExp asciiRx("[\x20-\x7F]+$"); - QValidator *asciiValidator = new QRegExpValidator(asciiRx, this); + TQRegExp asciiRx("[\x20-\x7F]+$"); + TQValidator *asciiValidator = new TQRegExpValidator(asciiRx, TQT_TQOBJECT(this)); - QGroupBox *photographerIdGroup = new QGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), parent); - QGridLayout* grid = new QGridLayout( photographerIdGroup->layout(), 1, 1, KDialog::spacingHint()); + TQGroupBox *photographerIdGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Photographer and Copyright Information"), tqparent); + TQGridLayout* grid = new TQGridLayout( photographerIdGroup->tqlayout(), 1, 1, KDialog::spacingHint()); - QLabel *label1 = new QLabel(i18n("Author:"), photographerIdGroup); + TQLabel *label1 = new TQLabel(i18n("Author:"), photographerIdGroup); d->authorEdit = new KLineEdit(photographerIdGroup); d->authorEdit->setValidator(asciiValidator); d->authorEdit->setMaxLength(32); label1->setBuddy(d->authorEdit); grid->addMultiCellWidget(label1, 0, 0, 0, 0); grid->addMultiCellWidget(d->authorEdit, 0, 0, 1, 1); - QWhatsThis::add( d->authorEdit, i18n("<p>This field should contain your name, or the name of the person who created the photograph. " + TQWhatsThis::add( d->authorEdit, i18n("<p>This field should contain your name, or the name of the person who created the photograph. " "If it is not appropriate to add the name of the photographer (for example, if the identify of " "the photographer needs to be protected) the name of a company or organization can also be used. " "Once saved, this field should not be changed by anyone. This field does not support the use of " "commas or semi-colons as separator. \nThis field is limited to 32 ASCII characters.</p>")); - QLabel *label2 = new QLabel(i18n("Author Title:"), photographerIdGroup); + TQLabel *label2 = new TQLabel(i18n("Author Title:"), photographerIdGroup); d->authorTitleEdit = new KLineEdit(photographerIdGroup); d->authorTitleEdit->setValidator(asciiValidator); d->authorTitleEdit->setMaxLength(32); label2->setBuddy(d->authorTitleEdit); grid->addMultiCellWidget(label2, 1, 1, 0, 0); grid->addMultiCellWidget(d->authorTitleEdit, 1, 1, 1, 1); - QWhatsThis::add( d->authorTitleEdit, i18n("<p>This field should contain the job title of the photographer. Examples might include " + TQWhatsThis::add( d->authorTitleEdit, i18n("<p>This field should contain the job title of the photographer. Examples might include " "titles such as: Staff Photographer, Freelance Photographer, or Independent Commercial " "Photographer. Since this is a qualifier for the Author field, the Author field must also " "be filled out. \nThis field is limited to 32 ASCII characters.</p>")); // -------------------------------------------------------- - QGroupBox *creditsGroup = new QGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), parent); - QGridLayout* grid2 = new QGridLayout( creditsGroup->layout(), 2, 1, KDialog::spacingHint()); + TQGroupBox *creditsGroup = new TQGroupBox(0, Qt::Horizontal, i18n("Credit and Copyright"), tqparent); + TQGridLayout* grid2 = new TQGridLayout( creditsGroup->tqlayout(), 2, 1, KDialog::spacingHint()); - QLabel *label3 = new QLabel(i18n("Credit:"), creditsGroup); + TQLabel *label3 = new TQLabel(i18n("Credit:"), creditsGroup); d->creditEdit = new KLineEdit(creditsGroup); d->creditEdit->setValidator(asciiValidator); d->creditEdit->setMaxLength(32); label3->setBuddy(d->creditEdit); grid2->addMultiCellWidget(label3, 0, 0, 0, 0); grid2->addMultiCellWidget(d->creditEdit, 0, 0, 1, 1); - QWhatsThis::add( d->creditEdit, i18n("<p>(synonymous to Provider): Use the Provider field to identify who is providing the photograph. " + TQWhatsThis::add( d->creditEdit, i18n("<p>(synonymous to Provider): Use the Provider field to identify who is providing the photograph. " "This does not necessarily have to be the author. If a photographer is working for a news agency " "such as Reuters or the Associated Press, these organizations could be listed here as they are " "\"providing\" the image for use by others. If the image is a stock photograph, then the group " "(agency) involved in supplying the image should be listed here. " "\nThis field is limited to 32 ASCII characters.</p>")); - QLabel *label4 = new QLabel(i18n("Source:"), creditsGroup); + TQLabel *label4 = new TQLabel(i18n("Source:"), creditsGroup); d->sourceEdit = new KLineEdit(creditsGroup); d->sourceEdit->setValidator(asciiValidator); d->sourceEdit->setMaxLength(32); label4->setBuddy(d->sourceEdit); grid2->addMultiCellWidget(label4, 1, 1, 0, 0); grid2->addMultiCellWidget(d->sourceEdit, 1, 1, 1, 1); - QWhatsThis::add( d->sourceEdit, i18n("<p>The Source field should be used to identify the original owner or copyright holder of the " + TQWhatsThis::add( d->sourceEdit, i18n("<p>The Source field should be used to identify the original owner or copyright holder of the " "photograph. The value of this field should never be changed after the information is entered " "following the image's creation. While not yet enforced by the custom panels, you should consider " "this to be a \"write-once\" field. The source could be an individual, an agency, or a " @@ -141,14 +141,14 @@ SetupIdentity::SetupIdentity(QWidget* parent ) "\"photographer/agency.\" Source may also be different from Creator and from the names " "listed in the Copyright Notice.\nThis field is limited to 32 ASCII characters.</p>")); - QLabel *label5 = new QLabel(i18n("Copyright:"), creditsGroup); + TQLabel *label5 = new TQLabel(i18n("Copyright:"), creditsGroup); d->copyrightEdit = new KLineEdit(creditsGroup); d->copyrightEdit->setValidator(asciiValidator); d->copyrightEdit->setMaxLength(128); label5->setBuddy(d->copyrightEdit); grid2->addMultiCellWidget(label5, 2, 2, 0, 0); grid2->addMultiCellWidget(d->copyrightEdit, 2, 2, 1, 1); - QWhatsThis::add( d->copyrightEdit, i18n("<p>The Copyright Notice should contain any necessary copyright notice for claiming the intellectual " + TQWhatsThis::add( d->copyrightEdit, i18n("<p>The Copyright Notice should contain any necessary copyright notice for claiming the intellectual " "property, and should identify the current owner(s) of the copyright for the photograph. Usually, " "this would be the photographer, but if the image was done by an employee or as work-for-hire, " "then the agency or company should be listed. Use the form appropriate to your country. USA: " @@ -156,7 +156,7 @@ SetupIdentity::SetupIdentity(QWidget* parent ) "Note, the word \"copyright\" or the abbreviation \"copr\" may be used in place of the © symbol. " "In some foreign countries only the copyright symbol is recognized and the abbreviation does not work. " "Furthermore the copyright symbol must be a full circle with a \"c\" inside; using something like (c) " - "where the parentheses form a partial circle is not sufficient. For additional protection worldwide, " + "where the tqparentheses form a partial circle is not sufficient. For additional protection worldwide, " "use of the phrase, \"all rights reserved\" following the notice above is encouraged. \nIn Europe " "you would use: Copyright {Year} {Copyright owner}, all rights reserved. \nIn Japan, for maximum " "protection, the following three items should appear in the copyright field of the IPTC Core: " @@ -171,14 +171,14 @@ SetupIdentity::SetupIdentity(QWidget* parent ) "IPTC text tags only support the printable " "<b><a href='http://en.wikipedia.org/wiki/Ascii'>ASCII</a></b> " "characters set and limit strings size. " - "Use contextual help for details.</b>"), parent); + "Use contextual help for details.</b>"), tqparent); // -------------------------------------------------------- - layout->addWidget(photographerIdGroup); - layout->addWidget(creditsGroup); - layout->addWidget(note); - layout->addStretch(); + tqlayout->addWidget(photographerIdGroup); + tqlayout->addWidget(creditsGroup); + tqlayout->addWidget(note); + tqlayout->addStretch(); readSettings(); } diff --git a/digikam/utilities/setup/setupidentity.h b/digikam/utilities/setup/setupidentity.h index add330b..260f2e5 100644 --- a/digikam/utilities/setup/setupidentity.h +++ b/digikam/utilities/setup/setupidentity.h @@ -24,22 +24,23 @@ #ifndef SETUP_IDENTITY_H #define SETUP_IDENTITY_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupIdentityPriv; -class SetupIdentity : public QWidget +class SetupIdentity : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupIdentity(QWidget* parent = 0); + SetupIdentity(TQWidget* tqparent = 0); ~SetupIdentity(); void applySettings(); diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp index f728bc2..ecc13d4 100644 --- a/digikam/utilities/setup/setupiofiles.cpp +++ b/digikam/utilities/setup/setupiofiles.cpp @@ -21,9 +21,9 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> +#include <tqlayout.h> // KDE includes. @@ -67,37 +67,37 @@ public: JP2KSettings *JPEG2000Options; }; -SetupIOFiles::SetupIOFiles(QWidget* parent ) - : QWidget(parent) +SetupIOFiles::SetupIOFiles(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupIOFilesPriv; - QVBoxLayout* vbox = new QVBoxLayout(parent); + TQVBoxLayout* vbox = new TQVBoxLayout(tqparent); //-- JPEG Settings ------------------------------------------------------ - d->JPEGOptions = new JPEGSettings(parent); - KSeparator *line1 = new KSeparator(Horizontal, parent); + d->JPEGOptions = new JPEGSettings(tqparent); + KSeparator *line1 = new KSeparator(Qt::Horizontal, tqparent); vbox->addWidget(d->JPEGOptions); vbox->addWidget(line1); //-- PNG Settings ------------------------------------------------------- - d->PNGOptions = new PNGSettings(parent); - KSeparator *line2 = new KSeparator(Horizontal, parent); + d->PNGOptions = new PNGSettings(tqparent); + KSeparator *line2 = new KSeparator(Qt::Horizontal, tqparent); vbox->addWidget(d->PNGOptions); vbox->addWidget(line2); //-- TIFF Settings ------------------------------------------------------ - d->TIFFOptions = new TIFFSettings(parent); - KSeparator *line3 = new KSeparator(Horizontal, parent); + d->TIFFOptions = new TIFFSettings(tqparent); + KSeparator *line3 = new KSeparator(Qt::Horizontal, tqparent); vbox->addWidget(d->TIFFOptions); vbox->addWidget(line3); //-- JPEG 2000 Settings ------------------------------------------------- - d->JPEG2000Options = new JP2KSettings(parent); + d->JPEG2000Options = new JP2KSettings(tqparent); vbox->addWidget(d->JPEG2000Options); vbox->addStretch(10); diff --git a/digikam/utilities/setup/setupiofiles.h b/digikam/utilities/setup/setupiofiles.h index 8b4940c..53ceeff 100644 --- a/digikam/utilities/setup/setupiofiles.h +++ b/digikam/utilities/setup/setupiofiles.h @@ -24,9 +24,9 @@ #ifndef SETUPIOFILES_H #define SETUPIOFILES_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class SetupIOFilesPriv; -class DIGIKAM_EXPORT SetupIOFiles : public QWidget +class DIGIKAM_EXPORT SetupIOFiles : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupIOFiles(QWidget* parent = 0); + SetupIOFiles(TQWidget* tqparent = 0); ~SetupIOFiles(); void applySettings(); diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp index bb4eb37..7089c76 100644 --- a/digikam/utilities/setup/setuplighttable.cpp +++ b/digikam/utilities/setup/setuplighttable.cpp @@ -21,15 +21,15 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qcolor.h> -#include <qhbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqhbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> // KDE includes. @@ -57,44 +57,44 @@ public: loadFullImageSize = 0; } - QCheckBox *hideToolBar; - QCheckBox *autoSyncPreview; - QCheckBox *autoLoadOnRightPanel; - QCheckBox *loadFullImageSize; + TQCheckBox *hideToolBar; + TQCheckBox *autoSyncPreview; + TQCheckBox *autoLoadOnRightPanel; + TQCheckBox *loadFullImageSize; }; -SetupLightTable::SetupLightTable(QWidget* parent ) - : QWidget(parent) +SetupLightTable::SetupLightTable(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupLightTablePriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - QVGroupBox *interfaceOptionsGroup = new QVGroupBox(i18n("Interface Options"), parent); + TQVGroupBox *interfaceOptionsGroup = new TQVGroupBox(i18n("Interface Options"), tqparent); - d->autoSyncPreview = new QCheckBox(i18n("Synchronize panels automatically"), interfaceOptionsGroup); - QWhatsThis::add( d->autoSyncPreview, i18n("<p>Set this option to automatically synchronize " + d->autoSyncPreview = new TQCheckBox(i18n("Synchronize panels automatically"), interfaceOptionsGroup); + TQWhatsThis::add( d->autoSyncPreview, i18n("<p>Set this option to automatically synchronize " "zooming and panning between left and right panels if the images have " "the same size.")); - d->autoLoadOnRightPanel = new QCheckBox(i18n("Selecting a thumbbar item loads image to the right panel"), + d->autoLoadOnRightPanel = new TQCheckBox(i18n("Selecting a thumbbar item loads image to the right panel"), interfaceOptionsGroup); - QWhatsThis::add( d->autoLoadOnRightPanel, i18n("<p>Set this option to automatically load an image " + TQWhatsThis::add( d->autoLoadOnRightPanel, i18n("<p>Set this option to automatically load an image " "into the right panel when the corresponding item is selected on the thumbbar.")); - d->loadFullImageSize = new QCheckBox(i18n("Load full image size"), interfaceOptionsGroup); - QWhatsThis::add( d->loadFullImageSize, i18n("<p>Set this option to load full image size " + d->loadFullImageSize = new TQCheckBox(i18n("Load full image size"), interfaceOptionsGroup); + TQWhatsThis::add( d->loadFullImageSize, i18n("<p>Set this option to load full image size " "into the preview panel instead of a reduced size. Because this option will take more time " "to load images, use it only if you have a fast computer.")); - d->hideToolBar = new QCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); + d->hideToolBar = new TQCheckBox(i18n("H&ide toolbar in fullscreen mode"), interfaceOptionsGroup); // -------------------------------------------------------- - layout->addWidget(interfaceOptionsGroup); - layout->addStretch(); + tqlayout->addWidget(interfaceOptionsGroup); + tqlayout->addStretch(); // -------------------------------------------------------- @@ -109,8 +109,8 @@ SetupLightTable::~SetupLightTable() void SetupLightTable::readSettings() { KConfig* config = kapp->config(); - QColor Black(Qt::black); - QColor White(Qt::white); + TQColor Black(TQt::black); + TQColor White(TQt::white); config->setGroup("LightTable Settings"); d->hideToolBar->setChecked(config->readBoolEntry("FullScreen Hide ToolBar", false)); d->autoSyncPreview->setChecked(config->readBoolEntry("Auto Sync Preview", true)); diff --git a/digikam/utilities/setup/setuplighttable.h b/digikam/utilities/setup/setuplighttable.h index 1b30d6a..015172a 100644 --- a/digikam/utilities/setup/setuplighttable.h +++ b/digikam/utilities/setup/setuplighttable.h @@ -24,22 +24,23 @@ #ifndef SETUPLIGHTTABLE_H #define SETUPLIGHTTABLE_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupLightTablePriv; -class SetupLightTable : public QWidget +class SetupLightTable : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupLightTable(QWidget* parent = 0); + SetupLightTable(TQWidget* tqparent = 0); ~SetupLightTable(); void applySettings(); diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp index 0060b1a..f342435 100644 --- a/digikam/utilities/setup/setupmetadata.cpp +++ b/digikam/utilities/setup/setupmetadata.cpp @@ -22,18 +22,18 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qvgroupbox.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qhbox.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqvbuttongroup.h> +#include <tqvgroupbox.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> +#include <tqhbox.h> // KDE includes. @@ -75,83 +75,83 @@ public: bool ExifAutoRotateAsChanged; bool ExifAutoRotateOrg; - QCheckBox *saveCommentsBox; - QCheckBox *ExifRotateBox; - QCheckBox *ExifSetOrientationBox; - QCheckBox *saveRatingBox; - QCheckBox *saveTagsIptcBox; - QCheckBox *saveDateTimeBox; - QCheckBox *savePhotographerIdIptcBox; - QCheckBox *saveCreditsIptcBox; + TQCheckBox *saveCommentsBox; + TQCheckBox *ExifRotateBox; + TQCheckBox *ExifSetOrientationBox; + TQCheckBox *saveRatingBox; + TQCheckBox *saveTagsIptcBox; + TQCheckBox *saveDateTimeBox; + TQCheckBox *savePhotographerIdIptcBox; + TQCheckBox *saveCreditsIptcBox; }; -SetupMetadata::SetupMetadata(QWidget* parent ) - : QWidget(parent) +SetupMetadata::SetupMetadata(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupMetadataPriv; - QVBoxLayout *mainLayout = new QVBoxLayout(parent, 0, KDialog::spacingHint()); + TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - QGroupBox *ExifGroup = new QGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), parent); + TQGroupBox *ExifGroup = new TQGroupBox(1, Qt::Horizontal, i18n("EXIF Actions"), tqparent); - d->ExifRotateBox = new QCheckBox(ExifGroup); + d->ExifRotateBox = new TQCheckBox(ExifGroup); d->ExifRotateBox->setText(i18n("Show images/thumbs &rotated according to orientation tag")); - d->ExifSetOrientationBox = new QCheckBox(ExifGroup); + d->ExifSetOrientationBox = new TQCheckBox(ExifGroup); d->ExifSetOrientationBox->setText(i18n("Set orientation tag to normal after rotate/flip")); // -------------------------------------------------------- - QGroupBox *IptcGroup = new QGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), parent); + TQGroupBox *IptcGroup = new TQGroupBox(1, Qt::Horizontal, i18n("IPTC Actions"), tqparent); - d->saveTagsIptcBox = new QCheckBox(IptcGroup); + d->saveTagsIptcBox = new TQCheckBox(IptcGroup); d->saveTagsIptcBox->setText(i18n("&Save image tags as \"Keywords\" tag")); - QWhatsThis::add( d->saveTagsIptcBox, i18n("<p>Turn this option on to store the image tags " + TQWhatsThis::add( d->saveTagsIptcBox, i18n("<p>Turn this option on to store the image tags " "in the IPTC <i>Keywords</i> tag.")); - d->savePhotographerIdIptcBox = new QCheckBox(IptcGroup); + d->savePhotographerIdIptcBox = new TQCheckBox(IptcGroup); d->savePhotographerIdIptcBox->setText(i18n("&Save default photographer identity as tags")); - QWhatsThis::add( d->savePhotographerIdIptcBox, i18n("<p>Turn this option on to store the default " + TQWhatsThis::add( d->savePhotographerIdIptcBox, i18n("<p>Turn this option on to store the default " "photographer identity in the IPTC tags. You can set this " "value in the Identity setup page.")); - d->saveCreditsIptcBox = new QCheckBox(IptcGroup); + d->saveCreditsIptcBox = new TQCheckBox(IptcGroup); d->saveCreditsIptcBox->setText(i18n("&Save default credit and copyright identity as tags")); - QWhatsThis::add( d->saveCreditsIptcBox, i18n("<p>Turn this option on to store the default " + TQWhatsThis::add( d->saveCreditsIptcBox, i18n("<p>Turn this option on to store the default " "credit and copyright identity in the IPTC tags. " "You can set this value in the Identity setup page.")); // -------------------------------------------------------- - QGroupBox *commonGroup = new QGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), parent); + TQGroupBox *commonGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Common Metadata Actions"), tqparent); - d->saveCommentsBox = new QCheckBox(commonGroup); + d->saveCommentsBox = new TQCheckBox(commonGroup); d->saveCommentsBox->setText(i18n("&Save image captions as embedded text")); - QWhatsThis::add( d->saveCommentsBox, i18n("<p>Turn this option on to store image captions " + TQWhatsThis::add( d->saveCommentsBox, i18n("<p>Turn this option on to store image captions " "in the JFIF section, EXIF tag, and IPTC tag.")); - d->saveDateTimeBox = new QCheckBox(commonGroup); + d->saveDateTimeBox = new TQCheckBox(commonGroup); d->saveDateTimeBox->setText(i18n("&Save image timestamps as tags")); - QWhatsThis::add( d->saveDateTimeBox, i18n("<p>Turn this option on to store the image date and time " + TQWhatsThis::add( d->saveDateTimeBox, i18n("<p>Turn this option on to store the image date and time " "in the EXIF and IPTC tags.")); - d->saveRatingBox = new QCheckBox(commonGroup); + d->saveRatingBox = new TQCheckBox(commonGroup); d->saveRatingBox->setText(i18n("&Save image rating as tags")); - QWhatsThis::add( d->saveRatingBox, i18n("<p>Turn this option on to store the image rating " + TQWhatsThis::add( d->saveRatingBox, i18n("<p>Turn this option on to store the image rating " "in the EXIF tag and IPTC <i>Urgency</i> tag.")); // -------------------------------------------------------- - QHBox *hbox = new QHBox(parent); + TQHBox *hbox = new TQHBox(tqparent); KURLLabel *exiv2LogoLabel = new KURLLabel(hbox); - exiv2LogoLabel->setText(QString()); + exiv2LogoLabel->setText(TQString()); exiv2LogoLabel->setURL("http://www.exiv2.org"); KGlobal::dirs()->addResourceType("logo-exiv2", KGlobal::dirs()->kde_default("data") + "digikam/data"); - QString directory = KGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png"); - exiv2LogoLabel->setPixmap( QPixmap( directory + "logo-exiv2.png" ) ); - QToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website")); + TQString directory = KGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png"); + exiv2LogoLabel->setPixmap( TQPixmap( directory + "logo-exiv2.png" ) ); + TQToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website")); KActiveLabel* explanation = new KActiveLabel(hbox); explanation->setText(i18n("<p><b><a href='http://en.wikipedia.org/wiki/Exif'>EXIF</a></b> is " @@ -172,11 +172,11 @@ SetupMetadata::SetupMetadata(QWidget* parent ) // -------------------------------------------------------- - connect(exiv2LogoLabel, SIGNAL(leftClickedURL(const QString&)), - this, SLOT(processExiv2URL(const QString&))); + connect(exiv2LogoLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), + this, TQT_SLOT(processExiv2URL(const TQString&))); - connect(d->ExifRotateBox, SIGNAL(toggled(bool)), - this, SLOT(slotExifAutoRotateToggled(bool))); + connect(d->ExifRotateBox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotExifAutoRotateToggled(bool))); } SetupMetadata::~SetupMetadata() @@ -184,7 +184,7 @@ SetupMetadata::~SetupMetadata() delete d; } -void SetupMetadata::processExiv2URL(const QString& url) +void SetupMetadata::processExiv2URL(const TQString& url) { KApplication::kApplication()->invokeBrowser(url); } diff --git a/digikam/utilities/setup/setupmetadata.h b/digikam/utilities/setup/setupmetadata.h index ad38621..3a474d0 100644 --- a/digikam/utilities/setup/setupmetadata.h +++ b/digikam/utilities/setup/setupmetadata.h @@ -25,22 +25,23 @@ #ifndef SETUPMETADATA_H #define SETUPMETADATA_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupMetadataPriv; -class SetupMetadata : public QWidget +class SetupMetadata : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupMetadata(QWidget* parent = 0); + SetupMetadata(TQWidget* tqparent = 0); ~SetupMetadata(); void applySettings(); @@ -53,7 +54,7 @@ private: private slots: - void processExiv2URL(const QString&); + void processExiv2URL(const TQString&); void slotExifAutoRotateToggled(bool); private: diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp index bf1acf1..b86a27d 100644 --- a/digikam/utilities/setup/setupmime.cpp +++ b/digikam/utilities/setup/setupmime.cpp @@ -21,17 +21,17 @@ * * ============================================================ */ -// Qt includes. - -#include <qlayout.h> -#include <qhbox.h> -#include <qhgroupbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qwhatsthis.h> -#include <qtoolbutton.h> -#include <qtooltip.h> +// TQt includes. + +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqhgroupbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqwhatsthis.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> // KDE includes. @@ -65,160 +65,160 @@ public: revertRawFileFilterBtn = 0; } - QToolButton *revertImageFileFilterBtn; - QToolButton *revertMovieFileFilterBtn; - QToolButton *revertAudioFileFilterBtn; - QToolButton *revertRawFileFilterBtn; + TQToolButton *revertImageFileFilterBtn; + TQToolButton *revertMovieFileFilterBtn; + TQToolButton *revertAudioFileFilterBtn; + TQToolButton *revertRawFileFilterBtn; - QLineEdit *imageFileFilterEdit; - QLineEdit *movieFileFilterEdit; - QLineEdit *audioFileFilterEdit; - QLineEdit *rawFileFilterEdit; + TQLineEdit *imageFileFilterEdit; + TQLineEdit *movieFileFilterEdit; + TQLineEdit *audioFileFilterEdit; + TQLineEdit *rawFileFilterEdit; }; -SetupMime::SetupMime(QWidget* parent ) - : QWidget(parent) +SetupMime::SetupMime(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupMimePriv; - QVBoxLayout *layout = new QVBoxLayout(parent, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint()); // -------------------------------------------------------- - QGroupBox *imageFileFilterBox = new QGroupBox(0, Qt::Horizontal, i18n("Image Files"), parent); - QGridLayout* grid1 = new QGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); + TQGroupBox *imageFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Image Files"), tqparent); + TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); - QLabel *logoLabel1 = new QLabel(imageFileFilterBox); + TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); logoLabel1->setPixmap(DesktopIcon("image")); - QLabel *imageFileFilterLabel = new QLabel(imageFileFilterBox); + TQLabel *imageFileFilterLabel = new TQLabel(imageFileFilterBox); imageFileFilterLabel->setText(i18n("Show only &image files with extensions:")); - QHBox *hbox1 = new QHBox(imageFileFilterBox); - d->imageFileFilterEdit = new QLineEdit(hbox1); - QWhatsThis::add( d->imageFileFilterEdit, i18n("<p>Here you can set the extensions of image files " + TQHBox *hbox1 = new TQHBox(imageFileFilterBox); + d->imageFileFilterEdit = new TQLineEdit(hbox1); + TQWhatsThis::add( d->imageFileFilterEdit, i18n("<p>Here you can set the extensions of image files " "to be displayed in Albums (such as JPEG or TIFF); " "clicking on these files will " "open them in the digiKam Image Editor.")); imageFileFilterLabel->setBuddy(d->imageFileFilterEdit); hbox1->setStretchFactor(d->imageFileFilterEdit, 10); - d->revertImageFileFilterBtn = new QToolButton(hbox1); + d->revertImageFileFilterBtn = new TQToolButton(hbox1); d->revertImageFileFilterBtn->setIconSet(SmallIcon("reload_page")); - QToolTip::add(d->revertImageFileFilterBtn, i18n("Revert to default settings")); + TQToolTip::add(d->revertImageFileFilterBtn, i18n("Revert to default settings")); grid1->addMultiCellWidget(logoLabel1, 0, 1, 0, 0); grid1->addMultiCellWidget(imageFileFilterLabel, 0, 0, 1, 1); grid1->addMultiCellWidget(hbox1, 1, 1, 1, 1); grid1->setColStretch(1, 10); - layout->addWidget(imageFileFilterBox); + tqlayout->addWidget(imageFileFilterBox); // -------------------------------------------------------- - QGroupBox *movieFileFilterBox = new QGroupBox(0, Qt::Horizontal, i18n("Movie Files"), parent); - QGridLayout* grid2 = new QGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); + TQGroupBox *movieFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Movie Files"), tqparent); + TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); - QLabel *logoLabel2 = new QLabel(movieFileFilterBox); + TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); logoLabel2->setPixmap(DesktopIcon("video")); - QLabel *movieFileFilterLabel = new QLabel(movieFileFilterBox); + TQLabel *movieFileFilterLabel = new TQLabel(movieFileFilterBox); movieFileFilterLabel->setText(i18n("Show only &movie files with extensions:")); - QHBox *hbox2 = new QHBox(movieFileFilterBox); - d->movieFileFilterEdit = new QLineEdit(hbox2); - QWhatsThis::add( d->movieFileFilterEdit, i18n("<p>Here you can set the extensions of movie files " + TQHBox *hbox2 = new TQHBox(movieFileFilterBox); + d->movieFileFilterEdit = new TQLineEdit(hbox2); + TQWhatsThis::add( d->movieFileFilterEdit, i18n("<p>Here you can set the extensions of movie files " "to be displayed in Albums (such as MPEG or AVI); " "clicking on these files will " "open them with the default KDE movie player.")); movieFileFilterLabel->setBuddy(d->movieFileFilterEdit); hbox2->setStretchFactor(d->movieFileFilterEdit, 10); - d->revertMovieFileFilterBtn = new QToolButton(hbox2); + d->revertMovieFileFilterBtn = new TQToolButton(hbox2); d->revertMovieFileFilterBtn->setIconSet(SmallIcon("reload_page")); - QToolTip::add(d->revertMovieFileFilterBtn, i18n("Revert to default settings")); + TQToolTip::add(d->revertMovieFileFilterBtn, i18n("Revert to default settings")); grid2->addMultiCellWidget(logoLabel2, 0, 1, 0, 0); grid2->addMultiCellWidget(movieFileFilterLabel, 0, 0, 1, 1); grid2->addMultiCellWidget(hbox2, 1, 1, 1, 1); grid2->setColStretch(1, 10); - layout->addWidget(movieFileFilterBox); + tqlayout->addWidget(movieFileFilterBox); // -------------------------------------------------------- - QGroupBox *audioFileFilterBox = new QGroupBox(0, Qt::Horizontal, i18n("Audio Files"), parent); - QGridLayout* grid3 = new QGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); + TQGroupBox *audioFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("Audio Files"), tqparent); + TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); - QLabel *logoLabel3 = new QLabel(audioFileFilterBox); + TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); logoLabel3->setPixmap(DesktopIcon("sound")); - QLabel *audioFileFilterLabel = new QLabel(audioFileFilterBox); + TQLabel *audioFileFilterLabel = new TQLabel(audioFileFilterBox); audioFileFilterLabel->setText(i18n("Show only &audio files with extensions:")); - QHBox *hbox3 = new QHBox(audioFileFilterBox); - d->audioFileFilterEdit = new QLineEdit(hbox3); - QWhatsThis::add( d->audioFileFilterEdit, i18n("<p>Here you can set the extensions of audio files " + TQHBox *hbox3 = new TQHBox(audioFileFilterBox); + d->audioFileFilterEdit = new TQLineEdit(hbox3); + TQWhatsThis::add( d->audioFileFilterEdit, i18n("<p>Here you can set the extensions of audio files " "to be displayed in Albums (such as MP3 or OGG); " "clicking on these files will " "open them with the default KDE audio player.")); audioFileFilterLabel->setBuddy(d->audioFileFilterEdit); hbox3->setStretchFactor(d->audioFileFilterEdit, 10); - d->revertAudioFileFilterBtn = new QToolButton(hbox3); + d->revertAudioFileFilterBtn = new TQToolButton(hbox3); d->revertAudioFileFilterBtn->setIconSet(SmallIcon("reload_page")); - QToolTip::add(d->revertAudioFileFilterBtn, i18n("Revert to default settings")); + TQToolTip::add(d->revertAudioFileFilterBtn, i18n("Revert to default settings")); grid3->addMultiCellWidget(logoLabel3, 0, 1, 0, 0); grid3->addMultiCellWidget(audioFileFilterLabel, 0, 0, 1, 1); grid3->addMultiCellWidget(hbox3, 1, 1, 1, 1); grid3->setColStretch(1, 10); - layout->addWidget(audioFileFilterBox); + tqlayout->addWidget(audioFileFilterBox); // -------------------------------------------------------- - QGroupBox *rawFileFilterBox = new QGroupBox(0, Qt::Horizontal, i18n("RAW Files"), parent); - QGridLayout* grid4 = new QGridLayout(rawFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); + TQGroupBox *rawFileFilterBox = new TQGroupBox(0, Qt::Horizontal, i18n("RAW Files"), tqparent); + TQGridLayout* grid4 = new TQGridLayout(rawFileFilterBox->tqlayout(), 1, 1, KDialog::spacingHint()); - QLabel *logoLabel4 = new QLabel(rawFileFilterBox); + TQLabel *logoLabel4 = new TQLabel(rawFileFilterBox); logoLabel4->setPixmap(DesktopIcon("kdcraw")); - QLabel *rawFileFilterLabel = new QLabel(rawFileFilterBox); + TQLabel *rawFileFilterLabel = new TQLabel(rawFileFilterBox); rawFileFilterLabel->setText(i18n("Show only &RAW files with extensions:")); - QHBox *hbox4 = new QHBox(rawFileFilterBox); - d->rawFileFilterEdit = new QLineEdit(hbox4); - QWhatsThis::add( d->rawFileFilterEdit, i18n("<p>Here you can set the extensions of RAW image files " + TQHBox *hbox4 = new TQHBox(rawFileFilterBox); + d->rawFileFilterEdit = new TQLineEdit(hbox4); + TQWhatsThis::add( d->rawFileFilterEdit, i18n("<p>Here you can set the extensions of RAW image files " "to be displayed in Albums (such as CRW, for Canon cameras, " "or NEF, for Nikon cameras).")); rawFileFilterLabel->setBuddy(d->rawFileFilterEdit); hbox4->setStretchFactor(d->rawFileFilterEdit, 10); - d->revertRawFileFilterBtn = new QToolButton(hbox4); + d->revertRawFileFilterBtn = new TQToolButton(hbox4); d->revertRawFileFilterBtn->setIconSet(SmallIcon("reload_page")); - QToolTip::add(d->revertRawFileFilterBtn, i18n("Revert to default settings")); + TQToolTip::add(d->revertRawFileFilterBtn, i18n("Revert to default settings")); grid4->addMultiCellWidget(logoLabel4, 0, 1, 0, 0); grid4->addMultiCellWidget(rawFileFilterLabel, 0, 0, 1, 1); grid4->addMultiCellWidget(hbox4, 1, 1, 1, 1); grid4->setColStretch(1, 10); - layout->addWidget(rawFileFilterBox); - layout->addStretch(); + tqlayout->addWidget(rawFileFilterBox); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->revertImageFileFilterBtn, SIGNAL(clicked()), - this, SLOT(slotRevertImageFileFilter())); + connect(d->revertImageFileFilterBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRevertImageFileFilter())); - connect(d->revertMovieFileFilterBtn, SIGNAL(clicked()), - this, SLOT(slotRevertMovieFileFilter())); + connect(d->revertMovieFileFilterBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRevertMovieFileFilter())); - connect(d->revertAudioFileFilterBtn, SIGNAL(clicked()), - this, SLOT(slotRevertAudioFileFilter())); + connect(d->revertAudioFileFilterBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRevertAudioFileFilter())); - connect(d->revertRawFileFilterBtn, SIGNAL(clicked()), - this, SLOT(slotRevertRawFileFilter())); + connect(d->revertRawFileFilterBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRevertRawFileFilter())); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setupmime.h b/digikam/utilities/setup/setupmime.h index e078d99..190ef55 100644 --- a/digikam/utilities/setup/setupmime.h +++ b/digikam/utilities/setup/setupmime.h @@ -24,22 +24,23 @@ #ifndef SETUPMIME_H #define SETUPMIME_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupMimePriv; -class SetupMime : public QWidget +class SetupMime : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupMime(QWidget* parent = 0); + SetupMime(TQWidget* tqparent = 0); ~SetupMime(); void applySettings(); diff --git a/digikam/utilities/setup/setupmisc.cpp b/digikam/utilities/setup/setupmisc.cpp index 4bd7554..6981bb2 100644 --- a/digikam/utilities/setup/setupmisc.cpp +++ b/digikam/utilities/setup/setupmisc.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqcheckbox.h> // KDE includes. @@ -53,43 +53,43 @@ public: scanAtStart = 0; } - QCheckBox* showSplashCheck; - QCheckBox* showTrashDeleteDialogCheck; - QCheckBox* sidebarApplyDirectlyCheck; - QCheckBox* scanAtStart; + TQCheckBox* showSplashCheck; + TQCheckBox* showTrashDeleteDialogCheck; + TQCheckBox* sidebarApplyDirectlyCheck; + TQCheckBox* scanAtStart; }; -SetupMisc::SetupMisc(QWidget* parent) - : QWidget( parent ) +SetupMisc::SetupMisc(TQWidget* tqparent) + : TQWidget( tqparent ) { d = new SetupMiscPriv; - QVBoxLayout *mainLayout = new QVBoxLayout(parent); - QVBoxLayout *layout = new QVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *mainLayout = new TQVBoxLayout(tqparent); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); // -------------------------------------------------------- - d->showTrashDeleteDialogCheck = new QCheckBox(i18n("Show confirmation dialog when moving items to the &trash"), this); - layout->addWidget(d->showTrashDeleteDialogCheck); + d->showTrashDeleteDialogCheck = new TQCheckBox(i18n("Show confirmation dialog when moving items to the &trash"), this); + tqlayout->addWidget(d->showTrashDeleteDialogCheck); // -------------------------------------------------------- - d->sidebarApplyDirectlyCheck = new QCheckBox(i18n("Apply changes in the &right sidebar without confirmation"), this); - layout->addWidget(d->sidebarApplyDirectlyCheck); + d->sidebarApplyDirectlyCheck = new TQCheckBox(i18n("Apply changes in the &right sidebar without confirmation"), this); + tqlayout->addWidget(d->sidebarApplyDirectlyCheck); // -------------------------------------------------------- - d->showSplashCheck = new QCheckBox(i18n("&Show splash screen at startup"), this); - layout->addWidget(d->showSplashCheck); + d->showSplashCheck = new TQCheckBox(i18n("&Show splash screen at startup"), this); + tqlayout->addWidget(d->showSplashCheck); // -------------------------------------------------------- - d->scanAtStart = new QCheckBox(i18n("&Scan for new items on startup (slows down startup)"), this); - layout->addWidget(d->scanAtStart); + d->scanAtStart = new TQCheckBox(i18n("&Scan for new items on startup (slows down startup)"), this); + tqlayout->addWidget(d->scanAtStart); // -------------------------------------------------------- - layout->addStretch(); + tqlayout->addStretch(); readSettings(); adjustSize(); mainLayout->addWidget(this); diff --git a/digikam/utilities/setup/setupmisc.h b/digikam/utilities/setup/setupmisc.h index ff0934a..38b15f6 100644 --- a/digikam/utilities/setup/setupmisc.h +++ b/digikam/utilities/setup/setupmisc.h @@ -25,20 +25,20 @@ #ifndef SETUPMISC_H #define SETUPMISC_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupMiscPriv; -class SetupMisc : public QWidget +class SetupMisc : public TQWidget { public: - SetupMisc(QWidget* parent); + SetupMisc(TQWidget* tqparent); ~SetupMisc(); void applySettings(); diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp index c4f4244..53e6e90 100644 --- a/digikam/utilities/setup/setupplugins.cpp +++ b/digikam/utilities/setup/setupplugins.cpp @@ -25,13 +25,13 @@ #include <config.h> #endif -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qstring.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> // KDE includes. @@ -61,27 +61,27 @@ public: kipiConfig = 0; } - QLabel* pluginsNumber; + TQLabel* pluginsNumber; KIPI::ConfigWidget* kipiConfig; }; -SetupPlugins::SetupPlugins(QWidget* parent ) - : QWidget(parent) +SetupPlugins::SetupPlugins(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupPluginsPriv; - QVBoxLayout *layout = new QVBoxLayout(parent); - d->pluginsNumber = new QLabel(parent); - d->pluginsNumber->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); - - d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( parent ); - QString pluginsListHelp = i18n("<p>A list of available Kipi plugins appears below."); - QWhatsThis::add(d->kipiConfig, pluginsListHelp); - - layout->addWidget(d->pluginsNumber); - layout->addWidget(d->kipiConfig); - layout->setMargin(0); - layout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent); + d->pluginsNumber = new TQLabel(tqparent); + d->pluginsNumber->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter); + + d->kipiConfig = KIPI::PluginLoader::instance()->configWidget( tqparent ); + 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()); } SetupPlugins::~SetupPlugins() diff --git a/digikam/utilities/setup/setupplugins.h b/digikam/utilities/setup/setupplugins.h index 88411dd..667872e 100644 --- a/digikam/utilities/setup/setupplugins.h +++ b/digikam/utilities/setup/setupplugins.h @@ -24,22 +24,23 @@ #ifndef SETUPPLUGINS_H #define SETUPPLUGINS_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupPluginsPriv; -class SetupPlugins : public QWidget +class SetupPlugins : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupPlugins(QWidget* parent = 0); + SetupPlugins(TQWidget* tqparent = 0); ~SetupPlugins(); void initPlugins(int kipiPluginsNumber); diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp index 88929f5..c0416fb 100644 --- a/digikam/utilities/setup/setupslideshow.cpp +++ b/digikam/utilities/setup/setupslideshow.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> // KDE includes. @@ -61,64 +61,64 @@ public: printComment = 0; } - QCheckBox *startWithCurrent; - QCheckBox *loopMode; - QCheckBox *printName; - QCheckBox *printDate; - QCheckBox *printApertureFocal; - QCheckBox *printExpoSensitivity; - QCheckBox *printMakeModel; - QCheckBox *printComment; + TQCheckBox *startWithCurrent; + TQCheckBox *loopMode; + TQCheckBox *printName; + TQCheckBox *printDate; + TQCheckBox *printApertureFocal; + TQCheckBox *printExpoSensitivity; + TQCheckBox *printMakeModel; + TQCheckBox *printComment; KIntNumInput *delayInput; }; -SetupSlideShow::SetupSlideShow(QWidget* parent ) - : QWidget(parent) +SetupSlideShow::SetupSlideShow(TQWidget* tqparent ) + : TQWidget(tqparent) { d = new SetupSlideShowPriv; - QVBoxLayout *layout = new QVBoxLayout( parent ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent ); - d->delayInput = new KIntNumInput(5, parent); + d->delayInput = new KIntNumInput(5, tqparent); d->delayInput->setRange(1, 3600, 1, true ); d->delayInput->setLabel( i18n("&Delay between images:"), AlignLeft|AlignTop ); - QWhatsThis::add( d->delayInput, i18n("<p>The delay, in seconds, between images.")); + TQWhatsThis::add( d->delayInput, i18n("<p>The delay, in seconds, between images.")); - d->startWithCurrent = new QCheckBox(i18n("Start with current image"), parent); - QWhatsThis::add( d->startWithCurrent, i18n("<p>If this option is enabled, slideshow will be started " + d->startWithCurrent = new TQCheckBox(i18n("Start with current image"), tqparent); + TQWhatsThis::add( d->startWithCurrent, i18n("<p>If this option is enabled, slideshow will be started " "with currently selected image.")); - d->loopMode = new QCheckBox(i18n("Display in a loop"), parent); - QWhatsThis::add( d->loopMode, i18n("<p>Run the slideshow in endless repetition.")); + d->loopMode = new TQCheckBox(i18n("Display in a loop"), tqparent); + TQWhatsThis::add( d->loopMode, i18n("<p>Run the slideshow in endless repetition.")); - d->printName = new QCheckBox(i18n("Print image file name"), parent); - QWhatsThis::add( d->printName, i18n("<p>Print the image file name at the bottom of the screen.")); + d->printName = new TQCheckBox(i18n("Print image file name"), tqparent); + TQWhatsThis::add( d->printName, i18n("<p>Print the image file name at the bottom of the screen.")); - d->printDate = new QCheckBox(i18n("Print image creation date"), parent); - QWhatsThis::add( d->printDate, i18n("<p>Print the image creation time/date at the bottom of the screen.")); + d->printDate = new TQCheckBox(i18n("Print image creation date"), tqparent); + TQWhatsThis::add( d->printDate, i18n("<p>Print the image creation time/date at the bottom of the screen.")); - d->printApertureFocal = new QCheckBox(i18n("Print camera aperture and focal length"), parent); - QWhatsThis::add( d->printApertureFocal, i18n("<p>Print the camera aperture and focal length at the bottom of the screen.")); + d->printApertureFocal = new TQCheckBox(i18n("Print camera aperture and focal length"), tqparent); + TQWhatsThis::add( d->printApertureFocal, i18n("<p>Print the camera aperture and focal length at the bottom of the screen.")); - d->printExpoSensitivity = new QCheckBox(i18n("Print camera exposure and sensitivity"), parent); - QWhatsThis::add( d->printExpoSensitivity, i18n("<p>Print the camera exposure and sensitivity at the bottom of the screen.")); + d->printExpoSensitivity = new TQCheckBox(i18n("Print camera exposure and sensitivity"), tqparent); + TQWhatsThis::add( d->printExpoSensitivity, i18n("<p>Print the camera exposure and sensitivity at the bottom of the screen.")); - d->printMakeModel = new QCheckBox(i18n("Print camera make and model"), parent); - QWhatsThis::add( d->printMakeModel, i18n("<p>Print the camera make and model at the bottom of the screen.")); + d->printMakeModel = new TQCheckBox(i18n("Print camera make and model"), tqparent); + TQWhatsThis::add( d->printMakeModel, i18n("<p>Print the camera make and model at the bottom of the screen.")); - d->printComment = new QCheckBox(i18n("Print image caption"), parent); - QWhatsThis::add( d->printComment, i18n("<p>Print the image caption at the bottom of the screen.")); + d->printComment = new TQCheckBox(i18n("Print image caption"), tqparent); + TQWhatsThis::add( d->printComment, i18n("<p>Print the image caption at the bottom of the screen.")); - 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(); + 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(); readSettings(); } diff --git a/digikam/utilities/setup/setupslideshow.h b/digikam/utilities/setup/setupslideshow.h index 70fc777..14db3be 100644 --- a/digikam/utilities/setup/setupslideshow.h +++ b/digikam/utilities/setup/setupslideshow.h @@ -24,9 +24,9 @@ #ifndef SETUPSLIDESHOW_H #define SETUPSLIDESHOW_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -37,13 +37,14 @@ namespace Digikam class SetupSlideShowPriv; -class DIGIKAM_EXPORT SetupSlideShow : public QWidget +class DIGIKAM_EXPORT SetupSlideShow : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupSlideShow(QWidget* parent = 0); + SetupSlideShow(TQWidget* tqparent = 0); ~SetupSlideShow(); void applySettings(); diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp index 2dd343b..7070bcd 100644 --- a/digikam/utilities/setup/setuptooltip.cpp +++ b/digikam/utilities/setup/setuptooltip.cpp @@ -21,12 +21,12 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> // KDE includes. @@ -74,127 +74,127 @@ public: digikamSettingBox = 0; } - QCheckBox *showToolTipsBox; - - QCheckBox *showFileNameBox; - QCheckBox *showFileDateBox; - QCheckBox *showFileSizeBox; - QCheckBox *showImageTypeBox; - QCheckBox *showImageDimBox; - - QCheckBox *showPhotoMakeBox; - QCheckBox *showPhotoDateBox; - QCheckBox *showPhotoFocalBox; - QCheckBox *showPhotoExpoBox; - QCheckBox *showPhotoModeBox; - QCheckBox *showPhotoFlashBox; - QCheckBox *showPhotoWbBox; - - QCheckBox *showAlbumNameBox; - QCheckBox *showCommentsBox; - QCheckBox *showTagsBox; - QCheckBox *showRatingBox; - - QVGroupBox *fileSettingBox; - QVGroupBox *photoSettingBox; - QVGroupBox *digikamSettingBox; + TQCheckBox *showToolTipsBox; + + TQCheckBox *showFileNameBox; + TQCheckBox *showFileDateBox; + TQCheckBox *showFileSizeBox; + TQCheckBox *showImageTypeBox; + TQCheckBox *showImageDimBox; + + TQCheckBox *showPhotoMakeBox; + TQCheckBox *showPhotoDateBox; + TQCheckBox *showPhotoFocalBox; + TQCheckBox *showPhotoExpoBox; + TQCheckBox *showPhotoModeBox; + TQCheckBox *showPhotoFlashBox; + TQCheckBox *showPhotoWbBox; + + TQCheckBox *showAlbumNameBox; + TQCheckBox *showCommentsBox; + TQCheckBox *showTagsBox; + TQCheckBox *showRatingBox; + + TQVGroupBox *fileSettingBox; + TQVGroupBox *photoSettingBox; + TQVGroupBox *digikamSettingBox; }; -SetupToolTip::SetupToolTip(QWidget* parent) - : QWidget(parent) +SetupToolTip::SetupToolTip(TQWidget* tqparent) + : TQWidget(tqparent) { d = new SetupToolTipPriv; - QVBoxLayout *layout = new QVBoxLayout( parent, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( tqparent, 0, KDialog::spacingHint() ); - d->showToolTipsBox = new QCheckBox(i18n("Show album items toolti&ps"), parent); - QWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when " + d->showToolTipsBox = new TQCheckBox(i18n("Show album items toolti&ps"), tqparent); + TQWhatsThis::add( d->showToolTipsBox, i18n("<p>Set this option to display image information when " "the mouse hovers over an album item.")); - layout->addWidget(d->showToolTipsBox); + tqlayout->addWidget(d->showToolTipsBox); // -------------------------------------------------------- - d->fileSettingBox = new QVGroupBox(i18n("File/Image Information"), parent); + d->fileSettingBox = new TQVGroupBox(i18n("File/Image Information"), tqparent); - d->showFileNameBox = new QCheckBox(i18n("Show file name"), d->fileSettingBox); - QWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name.")); + d->showFileNameBox = new TQCheckBox(i18n("Show file name"), d->fileSettingBox); + TQWhatsThis::add( d->showFileNameBox, i18n("<p>Set this option to display the image file name.")); - d->showFileDateBox = new QCheckBox(i18n("Show file date"), d->fileSettingBox); - QWhatsThis::add( d->showFileDateBox, i18n("<p>Set this option to display the image file date.")); + d->showFileDateBox = new TQCheckBox(i18n("Show file date"), d->fileSettingBox); + TQWhatsThis::add( d->showFileDateBox, i18n("<p>Set this option to display the image file date.")); - d->showFileSizeBox = new QCheckBox(i18n("Show file size"), d->fileSettingBox); - QWhatsThis::add( d->showFileSizeBox, i18n("<p>Set this option to display the image file size.")); + d->showFileSizeBox = new TQCheckBox(i18n("Show file size"), d->fileSettingBox); + TQWhatsThis::add( d->showFileSizeBox, i18n("<p>Set this option to display the image file size.")); - d->showImageTypeBox = new QCheckBox(i18n("Show image type"), d->fileSettingBox); - QWhatsThis::add( d->showImageTypeBox, i18n("<p>Set this option to display the image type.")); + d->showImageTypeBox = new TQCheckBox(i18n("Show image type"), d->fileSettingBox); + TQWhatsThis::add( d->showImageTypeBox, i18n("<p>Set this option to display the image type.")); - d->showImageDimBox = new QCheckBox(i18n("Show image dimensions"), d->fileSettingBox); - QWhatsThis::add( d->showImageDimBox, i18n("<p>Set this option to display the image dimensions in pixels.")); + 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.")); - layout->addWidget(d->fileSettingBox); + tqlayout->addWidget(d->fileSettingBox); // -------------------------------------------------------- - d->photoSettingBox = new QVGroupBox(i18n("Photograph Information"), parent); + d->photoSettingBox = new TQVGroupBox(i18n("Photograph Information"), tqparent); - d->showPhotoMakeBox = new QCheckBox(i18n("Show camera make and model"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the " + d->showPhotoMakeBox = new TQCheckBox(i18n("Show camera make and model"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoMakeBox, i18n("<p>Set this option to display the make and model of the " "camera with which the image has been taken.")); - d->showPhotoDateBox = new QCheckBox(i18n("Show camera date"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoDateBox, i18n("<p>Set this option to display the date when the image was taken.")); + d->showPhotoDateBox = new TQCheckBox(i18n("Show camera date"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoDateBox, i18n("<p>Set this option to display the date when the image was taken.")); - d->showPhotoFocalBox = new QCheckBox(i18n("Show camera aperture and focal"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoFocalBox, i18n("<p>Set this option to display the camera aperture and focal settings " + d->showPhotoFocalBox = new TQCheckBox(i18n("Show camera aperture and focal"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoFocalBox, i18n("<p>Set this option to display the camera aperture and focal settings " "used to take the image.")); - d->showPhotoExpoBox = new QCheckBox(i18n("Show camera exposure and sensitivity"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoExpoBox, i18n("<p>Set this option to display the camera exposure and sensitivity " + d->showPhotoExpoBox = new TQCheckBox(i18n("Show camera exposure and sensitivity"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoExpoBox, i18n("<p>Set this option to display the camera exposure and sensitivity " "used to take the image.")); - d->showPhotoModeBox = new QCheckBox(i18n("Show camera mode and program"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoModeBox, i18n("<p>Set this option to display the camera mode and program " + d->showPhotoModeBox = new TQCheckBox(i18n("Show camera mode and program"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoModeBox, i18n("<p>Set this option to display the camera mode and program " "used to take the image.")); - d->showPhotoFlashBox = new QCheckBox(i18n("Show camera flash settings"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoFlashBox, i18n("<p>Set this option to display the camera flash settings " + d->showPhotoFlashBox = new TQCheckBox(i18n("Show camera flash settings"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoFlashBox, i18n("<p>Set this option to display the camera flash settings " "used to take the image.")); - d->showPhotoWbBox = new QCheckBox(i18n("Show camera white balance settings"), d->photoSettingBox); - QWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings " + d->showPhotoWbBox = new TQCheckBox(i18n("Show camera white balance settings"), d->photoSettingBox); + TQWhatsThis::add( d->showPhotoWbBox, i18n("<p>Set this option to display the camera white balance settings " "used to take the image.")); - layout->addWidget(d->photoSettingBox); + tqlayout->addWidget(d->photoSettingBox); // -------------------------------------------------------- - d->digikamSettingBox = new QVGroupBox(i18n("digiKam Information"), parent); + d->digikamSettingBox = new TQVGroupBox(i18n("digiKam Information"), tqparent); - d->showAlbumNameBox = new QCheckBox(i18n("Show album name"), d->digikamSettingBox); - QWhatsThis::add( d->showAlbumNameBox, i18n("<p>Set this option to display the album name.")); + d->showAlbumNameBox = new TQCheckBox(i18n("Show album name"), d->digikamSettingBox); + TQWhatsThis::add( d->showAlbumNameBox, i18n("<p>Set this option to display the album name.")); - d->showCommentsBox = new QCheckBox(i18n("Show image caption"), d->digikamSettingBox); - QWhatsThis::add( d->showCommentsBox, i18n("<p>Set this option to display the image captions.")); + d->showCommentsBox = new TQCheckBox(i18n("Show image caption"), d->digikamSettingBox); + TQWhatsThis::add( d->showCommentsBox, i18n("<p>Set this option to display the image captions.")); - d->showTagsBox = new QCheckBox(i18n("Show image tags"), d->digikamSettingBox); - QWhatsThis::add( d->showTagsBox, i18n("<p>Set this option to display the image tags.")); + d->showTagsBox = new TQCheckBox(i18n("Show image tags"), d->digikamSettingBox); + TQWhatsThis::add( d->showTagsBox, i18n("<p>Set this option to display the image tags.")); - d->showRatingBox = new QCheckBox(i18n("Show image rating"), d->digikamSettingBox); - QWhatsThis::add( d->showRatingBox, i18n("<p>Set this option to display the image rating.")); + d->showRatingBox = new TQCheckBox(i18n("Show image rating"), d->digikamSettingBox); + TQWhatsThis::add( d->showRatingBox, i18n("<p>Set this option to display the image rating.")); - layout->addWidget(d->digikamSettingBox); - layout->addStretch(); + tqlayout->addWidget(d->digikamSettingBox); + tqlayout->addStretch(); // -------------------------------------------------------- - connect(d->showToolTipsBox, SIGNAL(toggled(bool)), - d->fileSettingBox, SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), + d->fileSettingBox, TQT_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, SIGNAL(toggled(bool)), - d->photoSettingBox, SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), + d->photoSettingBox, TQT_SLOT(setEnabled(bool))); - connect(d->showToolTipsBox, SIGNAL(toggled(bool)), - d->digikamSettingBox, SLOT(setEnabled(bool))); + connect(d->showToolTipsBox, TQT_SIGNAL(toggled(bool)), + d->digikamSettingBox, TQT_SLOT(setEnabled(bool))); // -------------------------------------------------------- diff --git a/digikam/utilities/setup/setuptooltip.h b/digikam/utilities/setup/setuptooltip.h index 30dd005..094d3af 100644 --- a/digikam/utilities/setup/setuptooltip.h +++ b/digikam/utilities/setup/setuptooltip.h @@ -24,22 +24,23 @@ #ifndef SETUPTOOLTIP_H #define SETUPTOOLTIP_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> namespace Digikam { class SetupToolTipPriv; -class SetupToolTip : public QWidget +class SetupToolTip : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SetupToolTip(QWidget* parent = 0); + SetupToolTip(TQWidget* tqparent = 0); ~SetupToolTip(); void applySettings(); diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 3929c72..a6e8064 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -23,15 +23,15 @@ #define MAXSTRINGLEN 80 -// Qt includes. +// TQt includes. -#include <qtimer.h> -#include <qpixmap.h> -#include <qdesktopwidget.h> -#include <qevent.h> -#include <qcursor.h> -#include <qpainter.h> -#include <qfont.h> +#include <tqtimer.h> +#include <tqpixmap.h> +#include <tqdesktopwidget.h> +#include <tqevent.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqfont.h> // KDE includes. @@ -77,10 +77,10 @@ public: int deskHeight; int fileIndex; - QTimer *mouseMoveTimer; // To hide cursor when not moved. - QTimer *timer; + TQTimer *mouseMoveTimer; // To hide cursor when not moved. + TQTimer *timer; - QPixmap pixmap; + TQPixmap pixmap; DImg preview; @@ -95,7 +95,7 @@ public: }; SlideShow::SlideShow(const SlideShowSettings& settings) - : QWidget(0, 0, WStyle_StaysOnTop | WType_Popup | + : TQWidget(0, 0, WStyle_StaysOnTop | WType_Popup | WX11BypassWM | WDestructiveClose) { d = new SlideShowPriv; @@ -104,13 +104,13 @@ SlideShow::SlideShow(const SlideShowSettings& settings) // --------------------------------------------------------------- #if KDE_IS_VERSION(3,2,0) - QRect deskRect = KGlobalSettings::desktopGeometry(this); + TQRect deskRect = KGlobalSettings::desktopGeometry(this); d->deskX = deskRect.x(); d->deskY = deskRect.y(); d->deskWidth = deskRect.width(); d->deskHeight = deskRect.height(); #else - QRect deskRect = QApplication::desktop()->screenGeometry(this); + TQRect deskRect = TQApplication::desktop()->screenGeometry(this); d->deskX = deskRect.x(); d->deskY = deskRect.y(); d->deskWidth = deskRect.width(); @@ -119,7 +119,7 @@ SlideShow::SlideShow(const SlideShowSettings& settings) move(d->deskX, d->deskY); resize(d->deskWidth, d->deskHeight); - setPaletteBackgroundColor(Qt::black); + setPaletteBackgroundColor(TQt::black); // --------------------------------------------------------------- @@ -128,36 +128,36 @@ SlideShow::SlideShow(const SlideShowSettings& settings) if (!d->settings.loop) d->toolBar->setEnabledPrev(false); - connect(d->toolBar, SIGNAL(signalPause()), - this, SLOT(slotPause())); + connect(d->toolBar, TQT_SIGNAL(signalPause()), + this, TQT_SLOT(slotPause())); - connect(d->toolBar, SIGNAL(signalPlay()), - this, SLOT(slotPlay())); + connect(d->toolBar, TQT_SIGNAL(signalPlay()), + this, TQT_SLOT(slotPlay())); - connect(d->toolBar, SIGNAL(signalNext()), - this, SLOT(slotNext())); + connect(d->toolBar, TQT_SIGNAL(signalNext()), + this, TQT_SLOT(slotNext())); - connect(d->toolBar, SIGNAL(signalPrev()), - this, SLOT(slotPrev())); + connect(d->toolBar, TQT_SIGNAL(signalPrev()), + this, TQT_SLOT(slotPrev())); - connect(d->toolBar, SIGNAL(signalClose()), - this, SLOT(slotClose())); + connect(d->toolBar, TQT_SIGNAL(signalClose()), + this, TQT_SLOT(slotClose())); // --------------------------------------------------------------- d->previewThread = new PreviewLoadThread(); d->previewPreloadThread = new PreviewLoadThread(); - d->timer = new QTimer(this); - d->mouseMoveTimer = new QTimer(this); + d->timer = new TQTimer(this); + d->mouseMoveTimer = new TQTimer(this); - connect(d->previewThread, SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), - this, SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); + connect(d->previewThread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg &)), + this, TQT_SLOT(slotGotImagePreview(const LoadingDescription &, const DImg&))); - connect(d->mouseMoveTimer, SIGNAL(timeout()), - this, SLOT(slotMouseMoveTimeOut())); + connect(d->mouseMoveTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotMouseMoveTimeOut())); - connect(d->timer, SIGNAL(timeout()), - this, SLOT(slotTimeOut())); + connect(d->timer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotTimeOut())); d->timer->start(10, true); @@ -181,7 +181,7 @@ SlideShow::~SlideShow() void SlideShow::setCurrent(const KURL& url) { - int index = d->settings.fileList.findIndex(url); + int index = d->settings.fileList.tqfindIndex(url); if (index != -1) { d->currentImage = url; @@ -217,7 +217,7 @@ void SlideShow::loadNextImage() { d->currentImage = d->settings.fileList[d->fileIndex]; d->previewThread->load(LoadingDescription(d->currentImage.path(), - QMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); + TQMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); } else { @@ -252,7 +252,7 @@ void SlideShow::loadPrevImage() { d->currentImage = d->settings.fileList[d->fileIndex]; d->previewThread->load(LoadingDescription(d->currentImage.path(), - QMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); + TQMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); } else { @@ -295,15 +295,15 @@ void SlideShow::preloadNextImage() if (index < num) { d->previewPreloadThread->load(LoadingDescription(d->settings.fileList[index].path(), - QMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); + TQMAX(d->deskWidth, d->deskHeight), d->settings.exifRotate)); } } void SlideShow::updatePixmap() { - d->pixmap = QPixmap(size()); - d->pixmap.fill(Qt::black); - QPainter p(&(d->pixmap)); + d->pixmap = TQPixmap(size()); + d->pixmap.fill(TQt::black); + TQPainter p(&(d->pixmap)); if (!d->currentImage.path().isEmpty()) { @@ -311,12 +311,12 @@ void SlideShow::updatePixmap() { // Preview extraction is complete... Draw the image. - QPixmap pix(d->preview.smoothScale(width(), height(), QSize::ScaleMin).convertToPixmap()); + TQPixmap pix(d->preview.smoothScale(width(), height(), TQSize::ScaleMin).convertToPixmap()); p.drawPixmap((width()-pix.width())/2, (height()-pix.height())/2, pix, 0, 0, pix.width(), pix.height()); - QString str; + TQString str; PhotoInfoContainer photoInfo = d->settings.pictInfoMap[d->currentImage].photoInfo; int offset = 0; @@ -332,7 +332,7 @@ void SlideShow::updatePixmap() if (d->settings.printMakeModel) { - str = QString(); + str = TQString(); if (!photoInfo.make.isEmpty()) str = photoInfo.make; @@ -340,7 +340,7 @@ void SlideShow::updatePixmap() if (!photoInfo.model.isEmpty()) { if (!photoInfo.make.isEmpty()) - str += QString(" / "); + str += TQString(" / "); str += photoInfo.model; } @@ -352,7 +352,7 @@ void SlideShow::updatePixmap() if (d->settings.printExpoSensitivity) { - str = QString(); + str = TQString(); if (!photoInfo.exposureTime.isEmpty()) str = photoInfo.exposureTime; @@ -360,9 +360,9 @@ void SlideShow::updatePixmap() if (!photoInfo.sensitivity.isEmpty()) { if (!photoInfo.exposureTime.isEmpty()) - str += QString(" / "); + str += TQString(" / "); - str += i18n("%1 ISO").arg(photoInfo.sensitivity); + str += i18n("%1 ISO").tqarg(photoInfo.sensitivity); } printInfoText(p, offset, str); @@ -372,7 +372,7 @@ void SlideShow::updatePixmap() if (d->settings.printApertureFocal) { - str = QString(); + str = TQString(); if (!photoInfo.aperture.isEmpty()) str = photoInfo.aperture; @@ -382,7 +382,7 @@ void SlideShow::updatePixmap() if (!photoInfo.focalLength.isEmpty()) { if (!photoInfo.aperture.isEmpty()) - str += QString(" / "); + str += TQString(" / "); str += photoInfo.focalLength; } @@ -390,12 +390,12 @@ void SlideShow::updatePixmap() else { if (!photoInfo.aperture.isEmpty()) - str += QString(" / "); + str += TQString(" / "); if (!photoInfo.focalLength.isEmpty()) - str += QString("%1 (35mm: %2)").arg(photoInfo.focalLength).arg(photoInfo.focalLength35mm); + str += TQString("%1 (35mm: %2)").tqarg(photoInfo.focalLength).tqarg(photoInfo.focalLength35mm); else - str += QString("35mm: %1)").arg(photoInfo.focalLength35mm); + str += TQString("35mm: %1)").tqarg(photoInfo.focalLength35mm); } printInfoText(p, offset, str); @@ -416,9 +416,9 @@ void SlideShow::updatePixmap() if (d->settings.printName) { - str = QString("%1 (%2/%3)").arg(d->currentImage.filename()) - .arg(QString::number(d->fileIndex + 1)) - .arg(QString::number(d->settings.fileList.count())); + str = TQString("%1 (%2/%3)").tqarg(d->currentImage.filename()) + .tqarg(TQString::number(d->fileIndex + 1)) + .tqarg(TQString::number(d->settings.fileList.count())); printInfoText(p, offset, str); } @@ -427,26 +427,26 @@ void SlideShow::updatePixmap() { // ...or preview extraction is failed. - p.setPen(Qt::white); + p.setPen(TQt::white); p.drawText(0, 0, d->pixmap.width(), d->pixmap.height(), - Qt::AlignCenter|Qt::WordBreak, + TQt::AlignCenter|TQt::WordBreak, i18n("Cannot display image\n\"%1\"") - .arg(d->currentImage.fileName())); + .tqarg(d->currentImage.fileName())); } } else { // End of Slide Show. - QPixmap logo = kapp->iconLoader()->loadIcon("digikam", KIcon::NoGroup, 128, + TQPixmap logo = kapp->iconLoader()->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true); - QFont fn(font()); + TQFont fn(font()); fn.setPointSize(fn.pointSize()+10); fn.setBold(true); p.setFont(fn); - p.setPen(Qt::white); + p.setPen(TQt::white); p.drawPixmap(50, 100, logo); p.drawText(60 + logo.width(), 100 + logo.height()/3, i18n("SlideShow Completed.")); p.drawText(60 + logo.width(), 100 + 2*logo.height()/3, i18n("Click To Exit...")); @@ -458,32 +458,32 @@ void SlideShow::updatePixmap() } } -void SlideShow::printInfoText(QPainter &p, int &offset, const QString& str) +void SlideShow::printInfoText(TQPainter &p, int &offset, const TQString& str) { if (!str.isEmpty()) { offset += 20; - p.setPen(Qt::black); + p.setPen(TQt::black); for (int x=9; x<=11; x++) for (int y=offset+1; y>=offset-1; y--) p.drawText(x, height()-y, str); - p.setPen(Qt::white); + p.setPen(TQt::white); p.drawText(10, height()-offset, str); } } -void SlideShow::printComments(QPainter &p, int &offset, const QString& comments) +void SlideShow::printComments(TQPainter &p, int &offset, const TQString& comments) { - QStringList commentsByLines; + TQStringList commentsByLines; - uint commentsIndex = 0; // Comments QString index + uint commentsIndex = 0; // Comments TQString index while (commentsIndex < comments.length()) { - QString newLine; + TQString newLine; bool breakLine = false; // End Of Line found - uint currIndex; // Comments QString current index + uint currIndex; // Comments TQString current index // Check miminal lines dimension @@ -491,7 +491,7 @@ void SlideShow::printComments(QPainter &p, int &offset, const QString& comments) for (currIndex = commentsIndex; currIndex < comments.length() && !breakLine; currIndex++ ) { - if( comments[currIndex] == QChar('\n') || comments[currIndex].isSpace() ) + if( comments[currIndex] == TQChar('\n') || comments[currIndex].isSpace() ) breakLine = true; } @@ -504,10 +504,10 @@ void SlideShow::printComments(QPainter &p, int &offset, const QString& comments) currIndex < comments.length() && !breakLine ; currIndex++ ) { - breakLine = (comments[currIndex] == QChar('\n')) ? true : false; + breakLine = (comments[currIndex] == TQChar('\n')) ? true : false; if (breakLine) - newLine.append(QString(" ")); + newLine.append(TQString(" ")); else newLine.append(comments[currIndex]); } @@ -532,11 +532,11 @@ void SlideShow::printComments(QPainter &p, int &offset, const QString& comments) } } -void SlideShow::paintEvent(QPaintEvent *) +void SlideShow::paintEvent(TQPaintEvent *) { - bitBlt(this, 0, 0, &d->pixmap, + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&d->pixmap), 0, 0, d->pixmap.width(), - d->pixmap.height(), Qt::CopyROP, true); + d->pixmap.height(), TQt::CopyROP, true); } void SlideShow::slotPause() @@ -574,7 +574,7 @@ void SlideShow::slotClose() close(); } -void SlideShow::wheelEvent(QWheelEvent * e) +void SlideShow::wheelEvent(TQWheelEvent * e) { if (e->delta() < 0) { @@ -593,7 +593,7 @@ void SlideShow::wheelEvent(QWheelEvent * e) } } -void SlideShow::mousePressEvent(QMouseEvent *e) +void SlideShow::mousePressEvent(TQMouseEvent *e) { if (d->endOfShow) close(); @@ -614,7 +614,7 @@ void SlideShow::mousePressEvent(QMouseEvent *e) } } -void SlideShow::keyPressEvent(QKeyEvent *event) +void SlideShow::keyPressEvent(TQKeyEvent *event) { if (!event) return; @@ -622,15 +622,15 @@ void SlideShow::keyPressEvent(QKeyEvent *event) d->toolBar->keyPressEvent(event); } -void SlideShow::mouseMoveEvent(QMouseEvent *e) +void SlideShow::mouseMoveEvent(TQMouseEvent *e) { - setCursor(QCursor(Qt::ArrowCursor)); + setCursor(TQCursor(TQt::ArrowCursor)); d->mouseMoveTimer->start(1000, true); if (!d->toolBar->canHide()) return; - QPoint pos(e->pos()); + TQPoint pos(e->pos()); if ((pos.y() > (d->deskY+20)) && (pos.y() < (d->deskY+d->deskHeight-20-1))) @@ -668,12 +668,12 @@ void SlideShow::mouseMoveEvent(QMouseEvent *e) void SlideShow::slotMouseMoveTimeOut() { - QPoint pos(QCursor::pos()); + TQPoint pos(TQCursor::pos()); if ((pos.y() < (d->deskY+20)) || (pos.y() > (d->deskY+d->deskHeight-20-1))) return; - setCursor(QCursor(Qt::BlankCursor)); + setCursor(TQCursor(TQt::BlankCursor)); } } // NameSpace Digikam diff --git a/digikam/utilities/slideshow/slideshow.h b/digikam/utilities/slideshow/slideshow.h index 03834e1..5805e6a 100644 --- a/digikam/utilities/slideshow/slideshow.h +++ b/digikam/utilities/slideshow/slideshow.h @@ -24,9 +24,9 @@ #ifndef SLIDE_SHOW_H #define SLIDE_SHOW_H -// Qt includes. +// TQt includes. -#include <qwidget.h> +#include <tqwidget.h> // Local includes. @@ -40,9 +40,10 @@ namespace Digikam class DImg; class SlideShowPriv; -class DIGIKAM_EXPORT SlideShow : public QWidget +class DIGIKAM_EXPORT SlideShow : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -53,11 +54,11 @@ public: protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void keyPressEvent(QKeyEvent *); - void wheelEvent(QWheelEvent *); + void paintEvent(TQPaintEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); + void keyPressEvent(TQKeyEvent *); + void wheelEvent(TQWheelEvent *); private slots: @@ -77,8 +78,8 @@ private: void loadPrevImage(); void preloadNextImage(); void updatePixmap(); - void printInfoText(QPainter &p, int &offset, const QString& str); - void printComments(QPainter &p, int &offset, const QString& comments); + void printInfoText(TQPainter &p, int &offset, const TQString& str); + void printComments(TQPainter &p, int &offset, const TQString& comments); private: diff --git a/digikam/utilities/slideshow/slideshowsettings.h b/digikam/utilities/slideshow/slideshowsettings.h index 74b9661..85057f2 100644 --- a/digikam/utilities/slideshow/slideshowsettings.h +++ b/digikam/utilities/slideshow/slideshowsettings.h @@ -24,9 +24,9 @@ #ifndef SLIDESHOWSETTINGSCONTAINER_H #define SLIDESHOWSETTINGSCONTAINER_H -// Qt includes. +// TQt includes. -#include <qmap.h> +#include <tqmap.h> // KDE includes. @@ -53,7 +53,7 @@ public: public: /** Image Comment */ - QString comment; + TQString comment; /** Exif photo info of picture */ PhotoInfoContainer photoInfo; @@ -117,7 +117,7 @@ public: KURL::List fileList; /** Map of pictures information to slide */ - QMap<KURL, SlidePictureInfo> pictInfoMap; + TQMap<KURL, SlidePictureInfo> pictInfoMap; }; } // namespace Digikam diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp index 7b3f8f3..a90166c 100644 --- a/digikam/utilities/slideshow/toolbar.cpp +++ b/digikam/utilities/slideshow/toolbar.cpp @@ -22,11 +22,11 @@ * * ============================================================ */ -// Qt includes. +// TQt includes. -#include <qtoolbutton.h> -#include <qlayout.h> -#include <qpixmap.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> +#include <tqpixmap.h> // KDE includes. @@ -57,22 +57,22 @@ public: bool canHide; - QToolButton *playBtn; - QToolButton *stopBtn; - QToolButton *nextBtn; - QToolButton *prevBtn; + TQToolButton *playBtn; + TQToolButton *stopBtn; + TQToolButton *nextBtn; + TQToolButton *prevBtn; }; -ToolBar::ToolBar(QWidget* parent) - : QWidget(parent) +ToolBar::ToolBar(TQWidget* tqparent) + : TQWidget(tqparent) { d = new ToolBarPriv; - QHBoxLayout* lay = new QHBoxLayout(this); - d->playBtn = new QToolButton(this); - d->prevBtn = new QToolButton(this); - d->nextBtn = new QToolButton(this); - d->stopBtn = new QToolButton(this); + TQHBoxLayout* lay = new TQHBoxLayout(this); + d->playBtn = new TQToolButton(this); + d->prevBtn = new TQToolButton(this); + d->nextBtn = new TQToolButton(this); + d->stopBtn = new TQToolButton(this); d->playBtn->setToggleButton(true); KIconLoader* loader = kapp->iconLoader(); @@ -86,27 +86,27 @@ ToolBar::ToolBar(QWidget* parent) lay->addWidget(d->nextBtn); lay->addWidget(d->stopBtn); - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); adjustSize(); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); - connect(d->playBtn, SIGNAL(toggled(bool)), - this, SLOT(slotPlayBtnToggled())); + connect(d->playBtn, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotPlayBtnToggled())); - connect(d->nextBtn, SIGNAL(clicked()), - this, SLOT(slotNexPrevClicked())); + connect(d->nextBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNexPrevClicked())); - connect(d->prevBtn, SIGNAL(clicked()), - this, SLOT(slotNexPrevClicked())); + connect(d->prevBtn, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNexPrevClicked())); - connect(d->nextBtn, SIGNAL(clicked()), - this, SIGNAL(signalNext())); + connect(d->nextBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalNext())); - connect(d->prevBtn, SIGNAL(clicked()), - this, SIGNAL(signalPrev())); + connect(d->prevBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalPrev())); - connect(d->stopBtn, SIGNAL(clicked()), - this, SIGNAL(signalClose())); + connect(d->stopBtn, TQT_SIGNAL(clicked()), + this, TQT_SIGNAL(signalClose())); } ToolBar::~ToolBar() @@ -178,29 +178,29 @@ void ToolBar::slotNexPrevClicked() } } -void ToolBar::keyPressEvent(QKeyEvent *event) +void ToolBar::keyPressEvent(TQKeyEvent *event) { switch(event->key()) { - case(Qt::Key_Space): + case(TQt::Key_Space): { if (d->playBtn->isEnabled()) d->playBtn->animateClick(); break; } - case(Qt::Key_Prior): + case(TQt::Key_Prior): { if (d->prevBtn->isEnabled()) d->prevBtn->animateClick(); break; } - case(Qt::Key_Next): + case(TQt::Key_Next): { if (d->nextBtn->isEnabled()) d->nextBtn->animateClick(); break; } - case(Qt::Key_Escape): + case(TQt::Key_Escape): { if (d->stopBtn->isEnabled()) d->stopBtn->animateClick(); diff --git a/digikam/utilities/slideshow/toolbar.h b/digikam/utilities/slideshow/toolbar.h index 25b15ba..82c5442 100644 --- a/digikam/utilities/slideshow/toolbar.h +++ b/digikam/utilities/slideshow/toolbar.h @@ -25,26 +25,27 @@ #ifndef TOOL_BAR_H #define TOOL_BAR_H -#include <qwidget.h> +#include <tqwidget.h> // Local includes. #include "digikam_export.h" -class QToolButton; +class TQToolButton; namespace Digikam { class ToolBarPriv; -class DIGIKAM_EXPORT ToolBar : public QWidget +class DIGIKAM_EXPORT ToolBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ToolBar(QWidget* parent); + ToolBar(TQWidget* tqparent); ~ToolBar(); bool canHide() const; @@ -57,7 +58,7 @@ public: protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(TQKeyEvent *event); signals: |