more qt4 port (renamed QT3 stuff))

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

3 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 90f46dffe..05d987d34 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -994,7 +994,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 		[b]m[/b]: Creates a window that is initially minimized.[br]
 		[b]q[/b]: Don't print warning messages during the creation.[br]
 		If <caption> is given then the new window will have it as the initial plain text <caption>.
-		You can change the caption later by calling [cmd]window.setCaption[/cmd].[br]
+		You can change the caption later by calling [cmd]window.setWindowTitle[/cmd].[br]
 		If <irc_context> is given then the new window is bound to the specified irc context
 		and will be destroyed when the attacched console closes.
 		If <irc_context> is omitted or is 0 then the window will be context free (not bound
@@ -1060,15 +1060,15 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 }
 
 /*
-	@doc: window.setCaption
+	@doc: window.setWindowTitle
 	@type:
 		command
 	@title:
-		window.setCaption
+		window.setWindowTitle
 	@short:
 		Sets the caption of an user window
 	@syntax:
-		window.setCaption [-q] <window_id> <plain_text_caption> [html_inactive_caption] [html_active_caption]
+		window.setWindowTitle [-q] <window_id> <plain_text_caption> [html_inactive_caption] [html_active_caption]
 	@switches:
 		!sw: -q | --quiet
 		Be quiet
@@ -1089,7 +1089,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	@seealso:
 */
 
-static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c)
+static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 {
 	QString szWnd;
 	QString szPlain;
@@ -1113,7 +1113,7 @@ static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c)
 
 	if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW)
 	{
-		((KviUserWindow *)pWnd)->setCaptionStrings(szPlain,szInactive,szActive);
+		((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain,szInactive,szActive);
 	} else {
 		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("The specified window is not of type \"userwnd\""));
 	}
@@ -1491,7 +1491,7 @@ static bool window_module_init(KviModule *m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"demandAttention",window_kvs_cmd_demandAttention);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"listtypes",window_kvs_cmd_listtypes);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setBackground",window_kvs_cmd_setBackground);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"setCaption",window_kvs_cmd_setCaption);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"setWindowTitle",window_kvs_cmd_setWindowTitle);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setCryptEngine",window_kvs_cmd_setCryptEngine);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setInputText",window_kvs_cmd_setInputText);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"insertInInputText",window_kvs_cmd_insertInInputText);
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index cc9187a83..7f38dd0f6 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -95,7 +95,7 @@ void KviUserWindow::fillCaptionBuffers()
 	// nothing here
 }
 
-void KviUserWindow::setCaptionStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive)
+void KviUserWindow::setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive)
 {
 	m_szPlainTextCaption = szPlainText;
 	m_szHtmlActiveCaption = szHtmlActive;
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index ec0d2d12c..42140c6fe 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -42,7 +42,7 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 public:
-	void setCaptionStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive);
+	void setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive);
 };
 
 #endif //!_USERWINDOW_H_