fixed win projects and compiling errors :)

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

5 files changed, 61 insertions, 37 deletions

diff --git a/src/kvilib/kvilib_vc05.vcproj b/src/kvilib/kvilib_vc05.vcproj
index 1e9dabceb..0e7c859dc 100644
--- a/src/kvilib/kvilib_vc05.vcproj
+++ b/src/kvilib/kvilib_vc05.vcproj
@@ -391,6 +391,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\tal\kvi_tal_groupbox.cpp"

+				>

+			</File>

+			<File

 				RelativePath=".\tal\kvi_tal_hbox.cpp"

 				>

 			</File>

@@ -600,6 +604,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc"

 			>

 			<File

+				RelativePath=".\ext\kvi_accel.h"

+				>

+			</File>

+			<File

 				RelativePath="irc\kvi_avatar.h"

 				>

 			</File>

@@ -688,6 +696,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\ext\kvi_draganddrop.h"

+				>

+			</File>

+			<File

 				RelativePath="system\kvi_env.h"

 				>

 			</File>

@@ -858,6 +870,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\system\kvi_process.h"

+				>

+			</File>

+			<File

 				RelativePath="ext\kvi_proxydb.h"

 				>

 			</File>

@@ -1009,6 +1025,23 @@
 				>

 			</File>

 			<File

+				RelativePath=".\tal\kvi_tal_groupbox_qt3.h"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						Outputs="$(InputDir)\$(InputName).moc"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\tal\kvi_tal_groupbox_qt4.h"

+				>

+			</File>

+			<File

 				RelativePath=".\tal\kvi_tal_hbox.h"

 				>

 			</File>

@@ -1041,7 +1074,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

@@ -1062,7 +1095,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

@@ -1083,7 +1116,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

@@ -1101,28 +1134,23 @@
 				>

 			</File>

 			<File

-				RelativePath="tal\kvi_tal_mainwindow_qt.h"

+				RelativePath=".\tal\kvi_tal_mainwindow_qt3.h"

 				>

 				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

-						Outputs="$(InputDir)\$(InputName).moc"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\tal\kvi_tal_mainwindow_qt4.h"

+				>

+			</File>

+			<File

 				RelativePath="tal\kvi_tal_menubar.h"

 				>

 			</File>

@@ -1194,7 +1222,7 @@
 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

@@ -1212,28 +1240,23 @@
 				>

 			</File>

 			<File

-				RelativePath="tal\kvi_tal_toolbar_qt.h"

+				RelativePath=".\tal\kvi_tal_toolbar_qt3.h"

 				>

 				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

-						Outputs="$(InputDir)\$(InputName).moc"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

 					Name="Release|Win32"

 					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;&#x0D;&#x0A;"

+						CommandLine="$(QTDIR)\bin\moc -o &quot;$(InputDir)\$(InputName).moc&quot; &quot;$(InputDir)\$(InputFileName)&quot;"

 						Outputs="$(InputDir)\$(InputName).moc"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\tal\kvi_tal_toolbar_qt4.h"

+				>

+			</File>

+			<File

 				RelativePath="tal\kvi_tal_toolbardocktype.h"

 				>

 			</File>

diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
index 822281fe9..a3a13d92a 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.cpp
+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
@@ -55,7 +55,7 @@
 		{
 		}
 		
-		#include "kvi_tal_toolbar_qt.moc"
+	#include "kvi_tal_toolbar_qt3.moc"
 	#endif
 
 	KviTalToolBar::~KviTalToolBar()
diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp
index 332b98fd8..512de7fc9 100644
--- a/src/modules/dockwidget/libkvidockwidget.cpp
+++ b/src/modules/dockwidget/libkvidockwidget.cpp
@@ -327,18 +327,18 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const QPoint &pnt)
 	for(KviTaskBarItem * b = t->firstItem();b;b = t->nextItem())
 	{
 	
-		if(b->window()->view())
+		if(b->kviWindow()->view())
 		{
-			if(b->window()->view()->haveUnreadedMessages())
+			if(b->kviWindow()->view()->haveUnreadedMessages())
 			{
-				line = b->window()->lastMessageText();
+				line = b->kviWindow()->lastMessageText();
 				if(!line.isEmpty())
 				{
 					line.replace(QChar('&'),"&amp;");
 					line.replace(QChar('<'),"&lt;");
 					line.replace(QChar('>'),"&gt;");
 					tmp += "<b>";
-					tmp += b->window()->plainTextCaption();
+					tmp += b->kviWindow()->plainTextCaption();
 					tmp += "</b><br>";
 					tmp += line;
 					tmp += "<br><br>\n";
@@ -537,7 +537,7 @@ void KviDockWidget::grabActivityInfo()
 		if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification))
 		{
 			int iLevel = b->highlightLevel();
-			switch(b->window()->type())
+			switch(b->kviWindow()->type())
 			{
 				case KVI_WINDOW_TYPE_CONSOLE:
 					if(m_iConsoles < iLevel) m_iConsoles = iLevel;
@@ -554,17 +554,17 @@ void KviDockWidget::grabActivityInfo()
 			}
 		} else {
 			int iLevel=0;
-			if(b->window()->view())
+			if(b->kviWindow()->view())
 			{
-				if(b->window()->view()->haveUnreadedHighlightedMessages())
+				if(b->kviWindow()->view()->haveUnreadedHighlightedMessages())
 				{
 					iLevel=2;
-				} else if(b->window()->view()->haveUnreadedMessages())
+				} else if(b->kviWindow()->view()->haveUnreadedMessages())
 				{
 					iLevel=1;
 				}
 				if(iLevel>0)
-				switch(b->window()->type())
+				switch(b->kviWindow()->type())
 				{
 					case KVI_WINDOW_TYPE_CONSOLE:
 						if(m_iConsoles < iLevel) m_iConsoles = iLevel;
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 265faf5f5..99c2ab01d 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
 
 bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviTalGroupBox(parentScriptWidget(), name()), true);
+	setObject(new KviTalGroupBox(name(),parentScriptWidget()), true);
 	return true;
 }
 
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index b50234ac6..6d09e9840 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -26,6 +26,7 @@
 #include <qwizard.h>
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_hbox.h"
+#include "kvi_tal_groupbox.h"
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qlineedit.h>