From 36a07453f18ef81bf02e3b15fea6da24dee68956 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 8 Nov 2008 20:56:10 +0000
Subject: ported term module to kde4

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2842 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/term/termwindow.cpp | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'src/modules/term/termwindow.cpp')

diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 9ae21552e..171ed6353 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -25,16 +25,17 @@
 #include "termwindow.h"
 #include "termwidget.h"
 
-#ifdef COMPILE_KDE3_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
 	#include "kvi_iconmanager.h"
 	#include "kvi_options.h"
 	#include "kvi_locale.h"
 	#include "kvi_module.h"
-	
+
 	extern KviModule * g_pTermModule;
 	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
-	
+	extern KviIconManager * g_pIconManager;
+
 	KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
 	: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
 	{
@@ -44,41 +45,45 @@
 		// Ensure proper focusing
 	//	setFocusHandler(m_pTermWidget->konsoleWidget(),this);
 	}
-	
+
 	KviTermWindow::~KviTermWindow()
 	{
 		g_pTermWindowList->removeRef(this);
 		if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
 	}
-	
+
 	QPixmap * KviTermWindow::myIconPtr()
 	{
 		return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW);
 	}
-	
-	void KviTermWindow::resizeEvent(QResizeEvent *e)
+
+	void KviTermWindow::resizeEvent(QResizeEvent *)
 	{
 		if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height());
 	}
-	
+
 	QSize KviTermWindow::sizeHint() const
 	{
 		return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint();
 	}
-	
+
 	void KviTermWindow::fillCaptionBuffers()
 	{
-		m_szPlainTextCaption.sprintf(__tr("Terminal"));
-	
+		m_szPlainTextCaption = __tr("Terminal");
+
 		m_szHtmlActiveCaption.sprintf(
 			__tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().ascii());
+			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),
+			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data());
 		m_szHtmlInactiveCaption.sprintf(
 			__tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii());
+			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),
+			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data());
 	}
 
-	#include "termwindow.moc"
+
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+#include "termwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
 #endif
-- 
cgit v1.3.1-10-gc9f91