Index: proxy/proxy.c
===================================================================
--- proxy/proxy.c	(revision 52)
+++ proxy/proxy.c	(working copy)
@@ -6,7 +6,8 @@
 #include "proxy.h"
 #include "checkwps.h"
 #include "api.h"
-
+#include <string.h>
+
 struct screen screens[NB_SCREENS];
 struct wps_data wpsdata;
 struct gui_wps gwps;
Index: proxy/Makefile
===================================================================
--- proxy/Makefile	(revision 52)
+++ proxy/Makefile	(working copy)
@@ -8,7 +8,7 @@
 #
 ROOT=../../..
 
-CC = mingw32-gcc.exe
+CC = gcc
 COPY = cp
 
 COMMON= \
Index: gui/gui.pro
===================================================================
--- gui/gui.pro	(revision 52)
+++ gui/gui.pro	(working copy)
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET =
 DEPENDPATH += . build src ui
-INCLUDEPATH += . src/qpropertyeditor ../proxy
+INCLUDEPATH += . src/QPropertyEditor ../proxy
 DESTDIR = bin
 OBJECTS_DIR = build
 MOC_DIR = build
Index: gui/src/mainwindowimpl.cpp
===================================================================
--- gui/src/mainwindowimpl.cpp	(revision 52)
+++ gui/src/mainwindowimpl.cpp	(working copy)
@@ -1,7 +1,7 @@
 #include "mainwindowimpl.h"
 #include "wpsdrawer.h"
-#include <qfiledialog>
-#include <qdebug>
+#include <QFileDialog>
+#include <QDebug>
 
 //
 MainWindowImpl::MainWindowImpl( QWidget * parent, Qt::WFlags f)
Index: gui/src/wpsdrawer.cpp
===================================================================
--- gui/src/wpsdrawer.cpp	(revision 52)
+++ gui/src/wpsdrawer.cpp	(working copy)
@@ -1,7 +1,7 @@
 #include "wpsdrawer.h"
 #include "sliderimpl.h"
-#include <qtgui>
-#include <qlibrary>
+#include <QtGui>
+#include <QLibrary>
 #include <stdarg.h>
 //
 #define DEBUGF1 qDebug
Index: gui/src/qwpsstate.h
===================================================================
--- gui/src/qwpsstate.h	(revision 52)
+++ gui/src/qwpsstate.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef __WPSSTATE_H__
 #define __WPSSTATE_H__
 
-#include <qobject>
+#include <QObject>
 #include "wpsstate.h"
 
 class QWpsState : public QObject {
Index: gui/src/wpsdrawer.h
===================================================================
--- gui/src/wpsdrawer.h	(revision 52)
+++ gui/src/wpsdrawer.h	(working copy)
@@ -3,8 +3,8 @@
 //
 #include <QWidget>
 #include <QPixmap>
-#include "..\..\proxy\api.h"
-#include "QMp3State.h"
+#include "../../proxy/api.h"
+#include "qmp3state.h"
 #include "qwpsstate.h"
 //
 
Index: gui/src/sliderimpl.cpp
===================================================================
--- gui/src/sliderimpl.cpp	(revision 52)
+++ gui/src/sliderimpl.cpp	(working copy)
@@ -1,6 +1,6 @@
 #include "sliderimpl.h"
 #include "mainwindowimpl.h"
-#include <qdebug>
+#include <QDebug>
 //
 SliderImpl::SliderImpl( QString caption, int min, int max )
 {
Index: gui/src/qmp3state.h
===================================================================
--- gui/src/qmp3state.h	(revision 52)
+++ gui/src/qmp3state.h	(working copy)
@@ -2,7 +2,7 @@
 #define __QMP3STATE_H__
 
 #include "wpsstate.h"
-#include <qobject>
+#include <QObject>
 
 class QWpsState;
 
Index: gui/src/QPropertyEditor/QPropertyEditor.pro
===================================================================
--- gui/src/QPropertyEditor/QPropertyEditor.pro	(revision 52)
+++ gui/src/QPropertyEditor/QPropertyEditor.pro	(working copy)
@@ -15,12 +15,12 @@
 UI_DIR = .
 CONFIG(debug, debug|release) {
  TARGET =  QPropertyEditord
- OBJECTS_DIR =  ../../Build/QPropertyEditor/Debug
- MOC_DIR =  ../../Build/QPropertyEditor/Debug
+ OBJECTS_DIR =  ../../build/QPropertyEditor/debug
+ MOC_DIR =  ../../build/QPropertyEditor/debug
 }
 CONFIG(release, debug|release) {
  TARGET =  QPropertyEditor
- OBJECTS_DIR =  ../../Build/QPropertyEditor/Release
- MOC_DIR =  ../../Build/QPropertyEditor/Release
+ OBJECTS_DIR =  ../../build/QPropertyEditor/release
+ MOC_DIR =  ../../build/QPropertyEditor/release
  DEFINES +=  QT_NO_DEBUG
 }
Index: gui/ui/mainwindow.ui
===================================================================
--- gui/ui/mainwindow.ui	(revision 52)
+++ gui/ui/mainwindow.ui	(working copy)
@@ -106,7 +106,7 @@
   <customwidget>
    <class>QPropertyEditorWidget</class>
    <extends>QTreeView</extends>
-   <header>qpropertyeditorwidget.h</header>
+   <header>QPropertyEditorWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>