diff options
Diffstat (limited to 'noatun/modules/winskin')
-rw-r--r-- | noatun/modules/winskin/waButton.cpp | 2 | ||||
-rw-r--r-- | noatun/modules/winskin/waSkinManager.cpp | 2 | ||||
-rw-r--r-- | noatun/modules/winskin/waSkinModel.cpp | 20 | ||||
-rw-r--r-- | noatun/modules/winskin/winSkinConfig.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp index 4946d548..8dfa7bfb 100644 --- a/noatun/modules/winskin/waButton.cpp +++ b/noatun/modules/winskin/waButton.cpp @@ -68,7 +68,7 @@ void WaButton::mouseReleaseEvent(TQMouseEvent* e) { else { pressed = false; - if (TQT_TQRECT_OBJECT(this->rect()).tqcontains(e->pos())){ + if (TQT_TQRECT_OBJECT(this->rect()).contains(e->pos())){ if (_togglable) { _toggled = !_toggled; emit(toggleEvent(_toggled)); diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index de7a4d0f..08804885 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) { return false; TQString base_path; - base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " "); + base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); KIO::Job *job = KIO::copy("zip:" + url.path(), base_path); connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList())); diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index b2cdb0c2..e7562c04 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -419,37 +419,37 @@ void WaSkinModel::resetSkinModel() { TQChar WaSkinModel::deaccent(TQChar input) { - if (TQString("Á").tqcontains(input)) + if (TQString("Á").contains(input)) return 'A'; - if (TQString("ÉË").tqcontains(input)) + if (TQString("ÉË").contains(input)) return 'E'; - if (TQString("ÍÎ").tqcontains(input)) + if (TQString("ÍÎ").contains(input)) return 'I'; - if (TQString("ÔÓ").tqcontains(input)) + if (TQString("ÔÓ").contains(input)) return 'O'; - if (TQString("ÚÜ").tqcontains(input)) + if (TQString("ÚÜ").contains(input)) return 'U'; if (input == 'Ý') return 'Y'; - if (TQString("áâ").tqcontains(input)) + if (TQString("áâ").contains(input)) return 'a'; - if (TQString("éë").tqcontains(input)) + if (TQString("éë").contains(input)) return 'e'; - if (TQString("îí").tqcontains(input)) + if (TQString("îí").contains(input)) return 'i'; - if (TQString("ôó").tqcontains(input)) + if (TQString("ôó").contains(input)) return 'o'; - if (TQString("úü").tqcontains(input)) + if (TQString("úü").contains(input)) return 'u'; return input; diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 0f2067de..06573c7f 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -111,7 +111,7 @@ void WinSkinConfig::reopen() { TQString orig_skin = mWaSkinManager->currentSkin(); // Where is that skin in our big-list-o-skins? - TQListBoxItem *item = skin_list->tqfindItem(orig_skin); + TQListBoxItem *item = skin_list->findItem(orig_skin); if (item) { // Aha, found it... make it the currently selected skin |