diff options
Diffstat (limited to 'kanagram')
-rw-r--r-- | kanagram/src/kanagram.cpp | 4 | ||||
-rw-r--r-- | kanagram/src/kanagramgame.cpp | 2 | ||||
-rw-r--r-- | kanagram/src/leitnersystemview.cpp | 4 | ||||
-rw-r--r-- | kanagram/src/main.cpp | 4 | ||||
-rw-r--r-- | kanagram/src/mainsettings.cpp | 2 | ||||
-rw-r--r-- | kanagram/src/newstuffdialog.cpp | 2 | ||||
-rw-r--r-- | kanagram/src/vocabedit.cpp | 2 | ||||
-rw-r--r-- | kanagram/src/vocabsettings.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index bc3c8f21..4e762921 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -128,7 +128,7 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex m_inputBox->setFont(f); m_inputBox->show(); - m_font = KGlobalSettings::generalFont(); + m_font = TDEGlobalSettings::generalFont(); //Initialize the sound server #ifndef WITHOUT_ARTS @@ -155,7 +155,7 @@ void Kanagram::loadSettings() if(m_useStandardFonts) { - m_blackboardFont = KGlobalSettings::generalFont(); + m_blackboardFont = TDEGlobalSettings::generalFont(); m_arrow = new TQPixmap(locate("appdata", "images/basicarrow.png")); m_arrowOver = new TQPixmap(locate("appdata", "images/basicarrowover.png")); } diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp index 67212168..d922dc30 100644 --- a/kanagram/src/kanagramgame.cpp +++ b/kanagram/src/kanagramgame.cpp @@ -78,7 +78,7 @@ void KanagramGame::loadDefaultVocab() void KanagramGame::refreshVocabList() { - m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/*.kvtml"); + m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/*.kvtml"); //nextVocab(); m_index = findIndex(); } diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp index cbbb0400..847d6312 100644 --- a/kanagram/src/leitnersystemview.cpp +++ b/kanagram/src/leitnersystemview.cpp @@ -45,13 +45,13 @@ void LeitnerSystemView::drawSystem(TQPainter* p) { if(i == m_highlightedBox) { - //p->drawPixmap(12 + i * 64 + i*10, m_imageY, KGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); + //p->drawPixmap(12 + i * 64 + i*10, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); p->drawRect(12 + i * 64 + i*10, m_imageY,64,64); p->fillRect(12 + i * 64 + i*10, m_imageY,64,64, TQBrush(red)); } else { //for each box 74 = 64(pixmap) + 10(distance between two boxes) - //p->drawPixmap(12 + i * 74, m_imageY, KGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); + //p->drawPixmap(12 + i * 74, m_imageY, TDEGlobal::iconLoader()->loadIcon("leitnerbox", KIcon::Panel)); p->drawRect(12 + i * 64 + i*10, m_imageY,64,64); } } diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp index 07fdd0ff..00da5276 100644 --- a/kanagram/src/main.cpp +++ b/kanagram/src/main.cpp @@ -45,12 +45,12 @@ int main(int argc, char *argv[]) } if (KanagramSettings::dataLanguage().isEmpty()) { - TQStringList userLanguagesCode = KGlobal::locale()->languageList(); + TQStringList userLanguagesCode = TDEGlobal::locale()->languageList(); TQStringList::const_iterator itEnd = userLanguagesCode.end(); TQStringList::const_iterator it = userLanguagesCode.begin(); for ( ; it != itEnd; ++it) { - TQStringList mdirs = KGlobal::dirs()->findDirs("appdata", "data/" + *it); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("appdata", "data/" + *it); if (!mdirs.isEmpty()) break; } if (it == itEnd) KanagramSettings::setDataLanguage("en"); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 1e026758..eb3a83d3 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -97,7 +97,7 @@ void MainSettings::setupTranslations() TQStringList languages, temp_languages; //the program scans in kdereview/data/ to see what languages data is found - TQStringList mdirs = KGlobal::dirs()->findDirs("appdata", "data/"); + TQStringList mdirs = TDEGlobal::dirs()->findDirs("appdata", "data/"); if (mdirs.isEmpty()) return; diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index 302059df..a9558de1 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -26,7 +26,7 @@ TQString NewStuffDialog::downloadDestination(KNS::Entry *entry) { TQString fileName = entry->payload().path(); fileName = fileName.section('/', -1); - return KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + fileName; + return TDEGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + fileName; } bool NewStuffDialog::createUploadFile(const TQString &fileName) diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index 2e964065..df3bee35 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -94,7 +94,7 @@ void VocabEdit::slotSave() TQString fileName; if(m_fileName == "") { - fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; + fileName = TDEGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; } else { diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp index fd66b194..77b21966 100644 --- a/kanagram/src/vocabsettings.cpp +++ b/kanagram/src/vocabsettings.cpp @@ -34,7 +34,7 @@ void VocabSettings::refreshView() { lviewVocab->clear(); - m_fileList = KGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); + m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); for(uint i = 0; i < m_fileList.size(); i++) { KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); |