From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:43:15 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/winskin/waSkinModel.cpp | 106 ++++++++++++++++----------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'noatun/modules/winskin/waSkinModel.cpp') diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index ff53b4e6..bbe20a39 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -13,9 +13,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -39,7 +39,7 @@ int digit_height; struct WaPixmapEntry { const char *filename; - QPixmap *pixmap; + TQPixmap *pixmap; }; WaPixmapEntry waPixmapEntries[11] = { @@ -74,15 +74,15 @@ WaSkinModel::~WaSkinModel() delete colorScheme; } -bool WaSkinModel::load(QString skinDir) +bool WaSkinModel::load(TQString skinDir) { bool success = true; - QDir dir(skinDir); + TQDir dir(skinDir); if (findFile(dir, "main.bmp").isEmpty()) { // Ack, our skin dir doesn't exist, fall back to the default - dir = QDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); + dir = TQDir(KGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + WaSkin::defaultSkin())[0]); success = false; } @@ -105,27 +105,27 @@ bool WaSkinModel::load(QString skinDir) // Filename -must- be lowercase, which is an nice optimization, since // this is a private API, and all our filenames are internally lowercase // anyway -QString WaSkinModel::findFile(const QDir &dir, const QString &filename) { - QFileInfo fileInfo; - QString ret = ""; +TQString WaSkinModel::findFile(const TQDir &dir, const TQString &filename) { + TQFileInfo fileInfo; + TQString ret = ""; - QStringList strList = dir.entryList(); + TQStringList strList = dir.entryList(); - for (QStringList::iterator file = strList.begin(); file != strList.end(); file++) { - QFileInfo fileInfo(*file); + for (TQStringList::iterator file = strList.begin(); file != strList.end(); file++) { + TQFileInfo fileInfo(*file); if (fileInfo.isDir()) continue; if (fileInfo.filePath().lower() == filename) - return dir.absPath() + "/" + QString(fileInfo.filePath()); + return dir.absPath() + "/" + TQString(fileInfo.filePath()); } return ""; } -void WaSkinModel::loadColors(const QDir &dir) { - QString colorFile = findFile(dir, "viscolor.txt"); +void WaSkinModel::loadColors(const TQDir &dir) { + TQString colorFile = findFile(dir, "viscolor.txt"); if (colorScheme) { delete colorScheme; @@ -134,8 +134,8 @@ void WaSkinModel::loadColors(const QDir &dir) { colorScheme = new WaColor(colorFile); } -void WaSkinModel::loadRegion(const QDir &dir) { - QString regionFile = findFile(dir, "region.txt"); +void WaSkinModel::loadRegion(const TQDir &dir) { + TQString regionFile = findFile(dir, "region.txt"); if (windowRegion) { delete windowRegion; @@ -145,12 +145,12 @@ void WaSkinModel::loadRegion(const QDir &dir) { windowRegion = new WaRegion(regionFile); } -int WaSkinModel::getPixmap(const QDir &dir, QString fname, - QPixmap *target) +int WaSkinModel::getPixmap(const TQDir &dir, TQString fname, + TQPixmap *target) { - QFileInfo fileInfo; - QStringList strList = dir.entryList(); - QString abspath; + TQFileInfo fileInfo; + TQStringList strList = dir.entryList(); + TQString abspath; abspath = findFile(dir, fname); @@ -161,46 +161,46 @@ int WaSkinModel::getPixmap(const QDir &dir, QString fname, // now the filename mapping 1.8x -> 2.0 if (fname == "volume.bmp") - return WaSkinModel::getPixmap(dir, QString("volbar.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volbar.bmp"), target); if (fname == "numbers.bmp") - return WaSkinModel::getPixmap(dir, QString("nums_ex.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("nums_ex.bmp"), target); // Even 2.x themes can omit BALANCE, in which case we use VOLUME if (fname == "balance.bmp") - return WaSkinModel::getPixmap(dir, QString("volume.bmp"), target); + return WaSkinModel::getPixmap(dir, TQString("volume.bmp"), target); return false; } -QRect WaSkinModel::getGeometry(int id) { +TQRect WaSkinModel::getGeometry(int id) { if ( (id < 0) || (id >= _WA_SKIN_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getGeometry"<= _WA_MAPPING_ENTRIES) ) { kdDebug() << "Array index out of range. WaSkinModel::getMapGeometry"<