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

2 files changed, 9 insertions, 9 deletions

diff --git a/src/app/main.cpp b/src/app/main.cpp
index b6734ab..038c5c3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -78,7 +78,7 @@ void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
 	bool ok = false;
 	TQDate date;
 	if (!filterFrom.isEmpty()) {
-		date = KGlobal::locale()->readDate(filterFrom, &ok);
+		date = TDEGlobal::locale()->readDate(filterFrom, &ok);
 		if (!ok) {
 			kdWarning() << "Invalid value for filter-from option\n";
 		}
@@ -87,7 +87,7 @@ void applyFilterArgs(TDECmdLineArgs* args, FileViewController* controller) {
 
 	date=TQDate();
 	if (!filterTo.isEmpty()) {
-		date = KGlobal::locale()->readDate(filterTo, &ok);
+		date = TDEGlobal::locale()->readDate(filterTo, &ok);
 		if (!ok) {
 			kdWarning() << "Invalid value for filter-to option\n";
 		}
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index f2ebcdc..485a946 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -183,7 +183,7 @@ MainWindow::MainWindow()
 	createConnections();
 	mWindowListActions.setAutoDelete(true);
 	updateWindowActions();
-	KMainWindow::applyMainWindowSettings(KGlobal::config(), "MainWindow");
+	KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
 }
 
 
@@ -197,7 +197,7 @@ void MainWindow::setFullScreen(bool value) {
 bool MainWindow::queryClose() {
 	mDocument->saveBeforeClosing();
 
-	KConfig* config=KGlobal::config();
+	KConfig* config=TDEGlobal::config();
 
 	// Don't store dock layout if only the image dock is visible. This avoid
 	// saving layout when in "fullscreen" or "image only" mode.
@@ -216,7 +216,7 @@ bool MainWindow::queryClose() {
 	}
 	
 	if (!mToggleFullScreen->isChecked()) {
-		saveMainWindowSettings(KGlobal::config(), "MainWindow");
+		saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 	}
 	MiscConfig::setHistory( mURLEdit->historyItems() );
 	MiscConfig::writeConfig();
@@ -570,7 +570,7 @@ void MainWindow::showToolBars() {
 
 void MainWindow::toggleFullScreen() {
 	if (mToggleFullScreen->isChecked()) {
-		saveMainWindowSettings(KGlobal::config(), "MainWindow");
+		saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 
 		showFullScreen();
 		menuBar()->hide();
@@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() {
 
 
 void MainWindow::showToolBarDialog() {
-	saveMainWindowSettings(KGlobal::config(), "MainWindow");
+	saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 	KEditToolbar dlg(actionCollection());
 	connect(&dlg,TQT_SIGNAL(newToolbarConfig()),TQT_TQOBJECT(this),TQT_SLOT(applyMainWindowSettings()));
 	dlg.exec();
@@ -698,7 +698,7 @@ void MainWindow::showToolBarDialog() {
 
 void MainWindow::applyMainWindowSettings() {
 	createGUI();
-	KMainWindow::applyMainWindowSettings(KGlobal::config(), "MainWindow");
+	KMainWindow::applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
 }
 
 
@@ -856,7 +856,7 @@ void MainWindow::updateImageActions() {
  * actions are created in createObjectInteractions
  */
 void MainWindow::createWidgets() {
-	KConfig* config=KGlobal::config();
+	KConfig* config=TDEGlobal::config();
 
 	mCentralStack=new TQWidgetStack(this);
 	setCentralWidget(mCentralStack);