Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 10 insertions, 10 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());
diff --git a/src/bookreader.kcfg b/src/bookreader.kcfg
index efec977..f140ac2 100644
--- a/src/bookreader.kcfg
+++ b/src/bookreader.kcfg
@@ -7,7 +7,7 @@
   <group name="Preferences">
     <entry name="Font" type="Font"> 
       <label>The font used to display the contents of books.</label> 
-      <default code="true">KGlobalSettings::generalFont()</default> 
+      <default code="true">TDEGlobalSettings::generalFont()</default> 
     </entry> 
     <entry name="ParaOffset" type="Int"> 
       <label>This is an offset of paragraph's first line in pixels</label> 
diff --git a/src/bookwidget.cpp b/src/bookwidget.cpp
index 099b287..7f27f37 100644
--- a/src/bookwidget.cpp
+++ b/src/bookwidget.cpp
@@ -424,7 +424,7 @@ void BookWidget::addBookmark(const TQString& name)
 void BookWidget::saveBookmarks( )
 {
 	const TQString fileName = "bookreader/" + m_url.fileName();
-	TQFile::remove(KGlobal::dirs()->findResource("appdata", m_url.fileName()));
+	TQFile::remove(TDEGlobal::dirs()->findResource("appdata", m_url.fileName()));
 	KConfig config(fileName, false, false, "data");
 	for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i)
 	{
diff --git a/src/theme.cpp b/src/theme.cpp
index 9bfd824..6188720 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -40,8 +40,8 @@ Theme * Theme::self()
 void Theme::loadTheme(const TQString& name)
 {
 	const TQString themePath = "themes/" + name; //FIXME: Add 'name' check. Could be a hole.
-	TQString bgPath = KGlobal::dirs()->findResource("appdata", themePath + "/bg.png");
-	TQString bookmarkPath = KGlobal::dirs()->findResource("appdata", themePath + "/bookmark.png");
+	TQString bgPath = TDEGlobal::dirs()->findResource("appdata", themePath + "/bg.png");
+	TQString bookmarkPath = TDEGlobal::dirs()->findResource("appdata", themePath + "/bookmark.png");
 	m_bgPixmap = TQPixmap(bgPath);
 	m_bgResizedPixmap = m_bgPixmap;
 	m_bookmarkPixmap = TQPixmap(bookmarkPath);