From 2371d4516577c2887fbe1a735b2293e75597a989 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Tue, 19 Oct 2010 16:39:03 +0000
Subject: merged egns's patch to enable painless msvc compilation, thank you!

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5091 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/classeditor/classeditor.cpp        |  2 +-
 src/modules/editor/scripteditor.cpp            | 10 +++++-----
 src/modules/mediaplayer/winamp.cpp             |  4 ++--
 src/modules/options/optw_interfacelookglobal.h |  2 +-
 src/modules/reguser/edituser.cpp               |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 48d750dfa..3f34c0b9e 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -1562,7 +1562,7 @@ void KviClassEditor::newClass()
 	KviQString::escapeKvs(&szClassName, KviQString::EscapeSpace);
 	KviQString::escapeKvs(&szinheritsClassName, KviQString::EscapeSpace);
 
-	QString szClass = "class\(";
+	QString szClass = "class(";
 	szClass += szClassName + "," + szinheritsClassName;
 	szClass += "){}\n";
 	pItem->setInheritsClass(szinheritsClassName);
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 6a1b4a56d..2d5a47ea0 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -63,14 +63,14 @@ extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList
 extern KviModule                                     * g_pEditorModulePointer;
 
 static QColor g_clrBackground(0,0,0);
-static QColor g_clrNormalText(100,100,100);
+static QColor g_clrNormalText(100,255,0);
 static QColor g_clrBracket(255,0,0);
 static QColor g_clrComment(0,120,0);
-static QColor g_clrFunction(0,17,255);
-static QColor g_clrKeyword(85,85,255);
-static QColor g_clrVariable(255,0,0);
+static QColor g_clrFunction(255,255,0);
+static QColor g_clrKeyword(120,120,150);
+static QColor g_clrVariable(200,200,200);
 static QColor g_clrPunctuation(180,180,0);
-static QColor g_clrFind(0,0,0);
+static QColor g_clrFind(255,0,0);
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#define KVI_SCRIPTEDITOR_DEFAULT_FONT "Courier New"
diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp
index 60bcb29e7..561c01cd3 100644
--- a/src/modules/mediaplayer/winamp.cpp
+++ b/src/modules/mediaplayer/winamp.cpp
@@ -126,8 +126,8 @@ LRESULT CALLBACK WndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)
 
 int init()
 {
-	lpWndProcOld = (void *) GetWindowLong(plugin.hwndParent,GWL_WNDPROC);
-	SetWindowLong(plugin.hwndParent,GWL_WNDPROC,(long)WndProc);
+	lpWndProcOld = (void *) GetWindowLong(plugin.hwndParent,GWLP_WNDPROC);
+	SetWindowLongPtr(plugin.hwndParent,GWLP_WNDPROC,(long)WndProc);
 	return 0;
 }
 
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index da19fc819..d41734401 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -62,7 +62,7 @@ protected:
 	KviBoolSelector * m_pUseTransparencyBoolSelector;
 	#ifdef COMPILE_X11_SUPPORT
 		KviBoolSelector * m_pUseCompositingForTransparencyBoolSelector;
-	#elif defined(COMPILE_ON_MINGW) // || defined(COMPILE_ON_WINDOWS)
+	#elif defined(COMPILE_ON_WINDOWS)
 		KviBoolSelector * m_pUseWindowsFakeDesktopTransparencyBoolSelector;
 	#endif
 #endif
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 640b7ff06..25ee40f42 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -540,7 +540,7 @@ void KviRegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
 {
 	m_pNotifyNick->setEnabled(bChecked);
 	m_pNotifyLabel->setEnabled(bChecked);
-	if(bChecked and m_pNotifyNick->text().isEmpty())
+	if(bChecked && m_pNotifyNick->text().isEmpty())
 	{
 		QString szMask;
 		if(m_pUser)
-- 
cgit v1.3.1-10-gc9f91