diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:02 -0600 |
| commit | fd3ee3bab00031a5838b7500129993e2a0d714a3 (patch) | |
| tree | c81234ee4e07f307392e5fe869d2bafbef46bd13 /src/bookreader.cpp | |
| parent | e28fc401dc7e690b21e6669dd6d75920331f9ffe (diff) | |
| download | kbookreader-fd3ee3bab00031a5838b7500129993e2a0d714a3.tar.gz kbookreader-fd3ee3bab00031a5838b7500129993e2a0d714a3.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/bookreader.cpp')
| -rw-r--r-- | src/bookreader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bookreader.cpp b/src/bookreader.cpp index dfff482..c61bc96 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -57,12 +57,12 @@ namespace { TQStringList listEncodings() { - const TQStringList encodings(KGlobal::charsets()->availableEncodingNames()); + const TQStringList encodings(TDEGlobal::charsets()->availableEncodingNames()); TQStringList availEncodings; for (unsigned int i=0; i < encodings.count(); ++i) { bool found = false; - KGlobal::charsets()->codecForName(encodings[i], found); + TDEGlobal::charsets()->codecForName(encodings[i], found); if (found) availEncodings << encodings[i]; } @@ -79,7 +79,7 @@ BookReader::BookReader() m_printer(0) { - TQPixmap splash(KGlobal::dirs()->findResource("appdata", + TQPixmap splash(TDEGlobal::dirs()->findResource("appdata", "themes/default/splash.png")); m_splash = new KSplashScreen(splash); m_splash->show(); @@ -304,7 +304,7 @@ void BookReader::optionsPreferences() TQString curEncoding(encodings[Settings::defaultEncoding()]); if (curEncoding.isEmpty()) - curEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + curEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); general->kcfg_DefaultEncoding->clear(); general->kcfg_DefaultEncoding->insertStringList(encodings); @@ -353,12 +353,12 @@ void BookReader::writeSettings() config->writeEntry("size", m_view->size()); config->writeEntry("lastURL", m_view->currentURL()); config->writeEntry("lastURLPage", m_view->currentPage()); - recentFilesAction->saveEntries(KGlobal::config()); + recentFilesAction->saveEntries(TDEGlobal::config()); } void BookReader::readSettings() { - recentFilesAction->loadEntries(KGlobal::config()); + recentFilesAction->loadEntries(TDEGlobal::config()); recentFilesAction->setEnabled(true); // force enabling m_view->setParaOffset(Settings::paraOffset()); |