more code cleanups, deprecated functions removal, inline optimizations

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2172 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 5 insertions, 5 deletions

diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 66acf411e..947dde9b8 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -799,7 +799,7 @@ static bool window_kvs_fnc_context(KviKvsModuleFunctionCall * c)
 	GET_KVS_FNC_WINDOW_ID
 	if(pWnd)
 	{
-		c->returnValue()->setInteger(pWnd->console() ? pWnd->console()->ircContextId() : 0);
+		c->returnValue()->setInteger(pWnd->context() ? pWnd->context()->id() : 0);
 	}
 	return true;
 }
@@ -1034,7 +1034,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 			{
 				return true;
 			}
-			uId = c->window()->console()->ircContextId();
+			uId = c->window()->context()->id();
 		}
 
 		bool bAllWindows = KviQString::equalCI(szType.toLower(),"all");
@@ -1042,9 +1042,9 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 
 		while(KviWindow * wnd = it.current())
 		{
-			if(wnd->console())
+			if(wnd->context())
 			{
-				if(wnd->console()->ircContextId() == uId)
+				if(wnd->context()->id() == uId)
 				{
 					if(bAllWindows)
 					{
@@ -1391,7 +1391,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c)
 	if(pWnd)
 		pWnd->view()->setPrivateBackgroundPixmap(*pix);
 	*/
-	
+
 	//FIXME: This is broken
 
 	return true;