From b446a2cc37b2e40cec52223103e0efa978a85533 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Sun, 30 Dec 2007 15:00:01 +0000
Subject: [PATCH] Move application icon setup to Application class constructor.
  Fix a missed qWarning() -> kWarning() in main.cpp

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=754691
---
 src/Application.cpp | 3 +++
 src/main.cpp        | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index 7a4ec91b7..c4b23bbb5 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -32,6 +32,7 @@
 // KDE
 #include <KAction>
 #include <KCmdLineArgs>
+#include <KIcon>
 #include <KWindowSystem>
 
 // Konsole
@@ -66,6 +67,8 @@ void Application::init()
 
     // check for compositing functionality
     TerminalDisplay::setTransparencyEnabled( KWindowSystem::compositingActive() );
+
+    setWindowIcon(KIcon("utilities-terminal"));
 }
 
 Application* Application::self()
diff --git a/src/main.cpp b/src/main.cpp
index c5c8faef9..09cf36a22 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,6 @@
 // KDE
 #include <KAboutData>
 #include <KCmdLineArgs>
-#include <KIcon>
 #include <KLocale>
 #include <KWindowSystem>
 
@@ -90,14 +89,12 @@ extern "C" int KDE_EXPORT kdemain(int argc,char** argv)
 		getDisplayInformation(display,visual,colormap);
 
 		Application app(display,(Qt::HANDLE)visual,(Qt::HANDLE)colormap);
-		QApplication::setWindowIcon(KIcon("utilities-terminal"));
 		return app.exec();
 	}
 	else
 #endif 
 	{
     	Application app;
-    	QApplication::setWindowIcon(KIcon("utilities-terminal"));
     	return app.exec();
 	}   
 }
@@ -193,7 +190,7 @@ void getDisplayInformation(Display*& display , Visual*& visual , Colormap& color
 {
     display = XOpenDisplay(0); // open default display
     if (!display) {
-        qWarning("Cannot connect to the X server");
+        kWarning("Cannot connect to the X server");
         exit(1);
     }