# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1302181514 -7200
# Node ID 0861c8648be248cec968f3dde55326907fe0ddfd
# Parent  4127a03d330946d73440e6ca8ebd0666c203ebd3
Corrected pro file.

diff -r 4127a03d3309 -r 0861c8648be2 gui//Makefile
--- a/gui//Makefile	Thu Apr 07 15:00:54 2011 +0200
+++ b/gui//Makefile	Thu Apr 07 15:05:14 2011 +0200
@@ -1,9 +1,9 @@
 #############################################################################
-# Makefile for building: Quint
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 14:53:34 2011
+# Makefile for building: bin/Quint
+# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 15:04:11 2011
 # Project:  Quint.pro
 # Template: app
-# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
+# Command: /usr/bin/qmake -o Makefile Quint.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -13,7 +13,7 @@
 DEFINES       = -DHAVE_POSIX_OPENPT -DQT_NO_DEBUG -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtWebKit -I/usr/include/qt4 -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtWebKit -I/usr/include/qt4 -Isrc -Imoc-files
 LINK          = g++
 LFLAGS        = -Wl,-O1
 LIBS          = $(SUBLIBS)  -L/usr/lib -lQtWebKit -lQtGui -lQtCore -lpthread 
@@ -43,38 +43,38 @@
 
 ####### Files
 
-SOURCES       = TerminalCharacterDecoder.cpp \
-		KeyboardTranslator.cpp \
-		Screen.cpp \
-		History.cpp \
-		BlockArray.cpp \
-		konsole_wcwidth.cpp \
-		ScreenWindow.cpp \
-		Emulation.cpp \
-		Vt102Emulation.cpp \
-		TerminalDisplay.cpp \
-		Filter.cpp \
-		Pty.cpp \
-		kpty.cpp \
-		k3process.cpp \
-		k3processcontroller.cpp \
-		Session.cpp \
-		ShellCommand.cpp \
-		QTerminalWidget.cpp \
-		TerminalMdiSubWindow.cpp \
-		MainWindow.cpp \
-		Quint.cpp moc_ScreenWindow.cpp \
-		moc_Emulation.cpp \
-		moc_Vt102Emulation.cpp \
-		moc_TerminalDisplay.cpp \
-		moc_Filter.cpp \
-		moc_Pty.cpp \
-		moc_k3process.cpp \
-		moc_k3processcontroller.cpp \
-		moc_Session.cpp \
-		moc_QTerminalWidget.cpp \
-		moc_TerminalMdiSubWindow.cpp \
-		moc_MainWindow.cpp
+SOURCES       = src/TerminalCharacterDecoder.cpp \
+		src/KeyboardTranslator.cpp \
+		src/Screen.cpp \
+		src/History.cpp \
+		src/BlockArray.cpp \
+		src/konsole_wcwidth.cpp \
+		src/ScreenWindow.cpp \
+		src/Emulation.cpp \
+		src/Vt102Emulation.cpp \
+		src/TerminalDisplay.cpp \
+		src/Filter.cpp \
+		src/Pty.cpp \
+		src/kpty.cpp \
+		src/k3process.cpp \
+		src/k3processcontroller.cpp \
+		src/Session.cpp \
+		src/ShellCommand.cpp \
+		src/QTerminalWidget.cpp \
+		src/TerminalMdiSubWindow.cpp \
+		src/MainWindow.cpp \
+		src/Quint.cpp moc-files/moc_ScreenWindow.cpp \
+		moc-files/moc_Emulation.cpp \
+		moc-files/moc_Vt102Emulation.cpp \
+		moc-files/moc_TerminalDisplay.cpp \
+		moc-files/moc_Filter.cpp \
+		moc-files/moc_Pty.cpp \
+		moc-files/moc_k3process.cpp \
+		moc-files/moc_k3processcontroller.cpp \
+		moc-files/moc_Session.cpp \
+		moc-files/moc_QTerminalWidget.cpp \
+		moc-files/moc_TerminalMdiSubWindow.cpp \
+		moc-files/moc_MainWindow.cpp
 OBJECTS       = object-files/TerminalCharacterDecoder.o \
 		object-files/KeyboardTranslator.o \
 		object-files/Screen.o \
@@ -127,11 +127,10 @@
 		/usr/share/qt4/mkspecs/features/uic.prf \
 		/usr/share/qt4/mkspecs/features/yacc.prf \
 		/usr/share/qt4/mkspecs/features/lex.prf \
-		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
 		Quint.pro
 QMAKE_TARGET  = Quint
-DESTDIR       = 
-TARGET        = Quint
+DESTDIR       = bin/
+TARGET        = bin/Quint
 
 first: all
 ####### Implicit rules
@@ -158,6 +157,7 @@
 all: Makefile $(TARGET)
 
 $(TARGET):  $(OBJECTS)  
+	@$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/ 
 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
 Makefile: Quint.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
@@ -179,11 +179,10 @@
 		/usr/share/qt4/mkspecs/features/uic.prf \
 		/usr/share/qt4/mkspecs/features/yacc.prf \
 		/usr/share/qt4/mkspecs/features/lex.prf \
-		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
 		/usr/lib/libQtWebKit.prl \
 		/usr/lib/libQtGui.prl \
 		/usr/lib/libQtCore.prl
-	$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
+	$(QMAKE) -o Makefile Quint.pro
 /usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
@@ -203,16 +202,15 @@
 /usr/share/qt4/mkspecs/features/uic.prf:
 /usr/share/qt4/mkspecs/features/yacc.prf:
 /usr/share/qt4/mkspecs/features/lex.prf:
-/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/lib/libQtWebKit.prl:
 /usr/lib/libQtGui.prl:
 /usr/lib/libQtCore.prl:
 qmake:  FORCE
-	@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
+	@$(QMAKE) -o Makefile Quint.pro
 
 dist: 
 	@$(CHK_DIR_EXISTS) object-files/Quint1.0.0 || $(MKDIR) object-files/Quint1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) object-files/Quint1.0.0/ && $(COPY_FILE) --parents TerminalCharacterDecoder.h Character.h CharacterColor.h KeyboardTranslator.h ExtendedDefaultTranslator.h Screen.h History.h BlockArray.h konsole_wcwidth.h ScreenWindow.h Emulation.h Vt102Emulation.h TerminalDisplay.h Filter.h LineFont.h Pty.h kpty.h kpty_p.h k3process.h k3processcontroller.h Session.h ShellCommand.h QTerminalWidget.h TerminalMdiSubWindow.h MainWindow.h object-files/Quint1.0.0/ && $(COPY_FILE) --parents TerminalCharacterDecoder.cpp KeyboardTranslator.cpp Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp ScreenWindow.cpp Emulation.cpp Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp Session.cpp ShellCommand.cpp QTerminalWidget.cpp TerminalMdiSubWindow.cpp MainWindow.cpp Quint.cpp object-files/Quint1.0.0/ && (cd `dirname object-files/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname object-files/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r object-files/Quint1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) object-files/Quint1.0.0/ && $(COPY_FILE) --parents src/TerminalCharacterDecoder.h src/Character.h src/CharacterColor.h src/KeyboardTranslator.h src/ExtendedDefaultTranslator.h src/Screen.h src/History.h src/BlockArray.h src/konsole_wcwidth.h src/ScreenWindow.h src/Emulation.h src/Vt102Emulation.h src/TerminalDisplay.h src/Filter.h src/LineFont.h src/Pty.h src/kpty.h src/kpty_p.h src/k3process.h src/k3processcontroller.h src/Session.h src/ShellCommand.h src/QTerminalWidget.h src/TerminalMdiSubWindow.h src/MainWindow.h object-files/Quint1.0.0/ && $(COPY_FILE) --parents src/TerminalCharacterDecoder.cpp src/KeyboardTranslator.cpp src/Screen.cpp src/History.cpp src/BlockArray.cpp src/konsole_wcwidth.cpp src/ScreenWindow.cpp src/Emulation.cpp src/Vt102Emulation.cpp src/TerminalDisplay.cpp src/Filter.cpp src/Pty.cpp src/kpty.cpp src/k3process.cpp src/k3processcontroller.cpp src/Session.cpp src/ShellCommand.cpp src/QTerminalWidget.cpp src/TerminalMdiSubWindow.cpp src/MainWindow.cpp src/Quint.cpp object-files/Quint1.0.0/ && (cd `dirname object-files/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname object-files/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r object-files/Quint1.0.0
 
 
 clean:compiler_clean 
@@ -233,71 +231,70 @@
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp moc_MainWindow.cpp
+compiler_moc_header_make_all: moc-files/moc_ScreenWindow.cpp moc-files/moc_Emulation.cpp moc-files/moc_Vt102Emulation.cpp moc-files/moc_TerminalDisplay.cpp moc-files/moc_Filter.cpp moc-files/moc_Pty.cpp moc-files/moc_k3process.cpp moc-files/moc_k3processcontroller.cpp moc-files/moc_Session.cpp moc-files/moc_QTerminalWidget.cpp moc-files/moc_TerminalMdiSubWindow.cpp moc-files/moc_MainWindow.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp moc_MainWindow.cpp
-moc_ScreenWindow.cpp: Character.h \
-		CharacterColor.h \
-		ScreenWindow.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) ScreenWindow.h -o moc_ScreenWindow.cpp
+	-$(DEL_FILE) moc-files/moc_ScreenWindow.cpp moc-files/moc_Emulation.cpp moc-files/moc_Vt102Emulation.cpp moc-files/moc_TerminalDisplay.cpp moc-files/moc_Filter.cpp moc-files/moc_Pty.cpp moc-files/moc_k3process.cpp moc-files/moc_k3processcontroller.cpp moc-files/moc_Session.cpp moc-files/moc_QTerminalWidget.cpp moc-files/moc_TerminalMdiSubWindow.cpp moc-files/moc_MainWindow.cpp
+moc-files/moc_ScreenWindow.cpp: src/Character.h \
+		src/CharacterColor.h \
+		src/ScreenWindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/ScreenWindow.h -o moc-files/moc_ScreenWindow.cpp
 
-moc_Emulation.cpp: Emulation.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) Emulation.h -o moc_Emulation.cpp
+moc-files/moc_Emulation.cpp: src/Emulation.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Emulation.h -o moc-files/moc_Emulation.cpp
 
-moc_Vt102Emulation.cpp: Emulation.h \
-		Screen.h \
-		Character.h \
-		CharacterColor.h \
-		History.h \
-		BlockArray.h \
-		Vt102Emulation.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) Vt102Emulation.h -o moc_Vt102Emulation.cpp
+moc-files/moc_Vt102Emulation.cpp: src/Emulation.h \
+		src/Screen.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/Vt102Emulation.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Vt102Emulation.h -o moc-files/moc_Vt102Emulation.cpp
 
-moc_TerminalDisplay.cpp: Filter.h \
-		Character.h \
-		CharacterColor.h \
-		ColorTables.h \
-		TerminalDisplay.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) TerminalDisplay.h -o moc_TerminalDisplay.cpp
+moc-files/moc_TerminalDisplay.cpp: src/Filter.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/ColorTables.h \
+		src/TerminalDisplay.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/TerminalDisplay.h -o moc-files/moc_TerminalDisplay.cpp
 
-moc_Filter.cpp: Character.h \
-		CharacterColor.h \
-		Filter.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) Filter.h -o moc_Filter.cpp
+moc-files/moc_Filter.cpp: src/Character.h \
+		src/CharacterColor.h \
+		src/Filter.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Filter.h -o moc-files/moc_Filter.cpp
 
-moc_Pty.cpp: k3process.h \
-		Pty.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) Pty.h -o moc_Pty.cpp
+moc-files/moc_Pty.cpp: src/k3process.h \
+		src/Pty.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Pty.h -o moc-files/moc_Pty.cpp
 
-moc_k3process.cpp: k3process.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) k3process.h -o moc_k3process.cpp
+moc-files/moc_k3process.cpp: src/k3process.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/k3process.h -o moc-files/moc_k3process.cpp
 
-moc_k3processcontroller.cpp: k3process.h \
-		k3processcontroller.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) k3processcontroller.h -o moc_k3processcontroller.cpp
+moc-files/moc_k3processcontroller.cpp: src/k3processcontroller.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/k3processcontroller.h -o moc-files/moc_k3processcontroller.cpp
 
-moc_Session.cpp: History.h \
-		BlockArray.h \
-		Character.h \
-		CharacterColor.h \
-		Session.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) Session.h -o moc_Session.cpp
+moc-files/moc_Session.cpp: src/History.h \
+		src/BlockArray.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/Session.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/Session.h -o moc-files/moc_Session.cpp
 
-moc_QTerminalWidget.cpp: QTerminalWidget.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) QTerminalWidget.h -o moc_QTerminalWidget.cpp
+moc-files/moc_QTerminalWidget.cpp: src/QTerminalWidget.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/QTerminalWidget.h -o moc-files/moc_QTerminalWidget.cpp
 
-moc_TerminalMdiSubWindow.cpp: QTerminalWidget.h \
-		TerminalMdiSubWindow.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) TerminalMdiSubWindow.h -o moc_TerminalMdiSubWindow.cpp
+moc-files/moc_TerminalMdiSubWindow.cpp: src/QTerminalWidget.h \
+		src/TerminalMdiSubWindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/TerminalMdiSubWindow.h -o moc-files/moc_TerminalMdiSubWindow.cpp
 
-moc_MainWindow.cpp: MainWindow.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) MainWindow.h -o moc_MainWindow.cpp
+moc-files/moc_MainWindow.cpp: src/MainWindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/MainWindow.h -o moc-files/moc_MainWindow.cpp
 
 compiler_rcc_make_all:
 compiler_rcc_clean:
-compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_make_all: ui-files/qmake_image_collection.cpp
 compiler_image_collection_clean:
-	-$(DEL_FILE) qmake_image_collection.cpp
+	-$(DEL_FILE) ui-files/qmake_image_collection.cpp
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
 compiler_uic_make_all:
@@ -312,177 +309,177 @@
 
 ####### Compile
 
-object-files/TerminalCharacterDecoder.o: TerminalCharacterDecoder.cpp TerminalCharacterDecoder.h \
-		Character.h \
-		CharacterColor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalCharacterDecoder.o TerminalCharacterDecoder.cpp
+object-files/TerminalCharacterDecoder.o: src/TerminalCharacterDecoder.cpp src/TerminalCharacterDecoder.h \
+		src/Character.h \
+		src/CharacterColor.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalCharacterDecoder.o src/TerminalCharacterDecoder.cpp
 
-object-files/KeyboardTranslator.o: KeyboardTranslator.cpp KeyboardTranslator.h \
-		ExtendedDefaultTranslator.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/KeyboardTranslator.o KeyboardTranslator.cpp
+object-files/KeyboardTranslator.o: src/KeyboardTranslator.cpp src/KeyboardTranslator.h \
+		src/ExtendedDefaultTranslator.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/KeyboardTranslator.o src/KeyboardTranslator.cpp
 
-object-files/Screen.o: Screen.cpp Screen.h \
-		Character.h \
-		CharacterColor.h \
-		History.h \
-		BlockArray.h \
-		konsole_wcwidth.h \
-		TerminalCharacterDecoder.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Screen.o Screen.cpp
+object-files/Screen.o: src/Screen.cpp src/Screen.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/konsole_wcwidth.h \
+		src/TerminalCharacterDecoder.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Screen.o src/Screen.cpp
 
-object-files/History.o: History.cpp History.h \
-		BlockArray.h \
-		Character.h \
-		CharacterColor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/History.o History.cpp
+object-files/History.o: src/History.cpp src/History.h \
+		src/BlockArray.h \
+		src/Character.h \
+		src/CharacterColor.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/History.o src/History.cpp
 
-object-files/BlockArray.o: BlockArray.cpp BlockArray.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/BlockArray.o BlockArray.cpp
+object-files/BlockArray.o: src/BlockArray.cpp src/BlockArray.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/BlockArray.o src/BlockArray.cpp
 
-object-files/konsole_wcwidth.o: konsole_wcwidth.cpp konsole_wcwidth.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/konsole_wcwidth.o konsole_wcwidth.cpp
+object-files/konsole_wcwidth.o: src/konsole_wcwidth.cpp src/konsole_wcwidth.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/konsole_wcwidth.o src/konsole_wcwidth.cpp
 
-object-files/ScreenWindow.o: ScreenWindow.cpp ScreenWindow.h \
-		Character.h \
-		CharacterColor.h \
-		Screen.h \
-		History.h \
-		BlockArray.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ScreenWindow.o ScreenWindow.cpp
+object-files/ScreenWindow.o: src/ScreenWindow.cpp src/ScreenWindow.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/Screen.h \
+		src/History.h \
+		src/BlockArray.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ScreenWindow.o src/ScreenWindow.cpp
 
-object-files/Emulation.o: Emulation.cpp Emulation.h \
-		KeyboardTranslator.h \
-		Screen.h \
-		Character.h \
-		CharacterColor.h \
-		History.h \
-		BlockArray.h \
-		TerminalCharacterDecoder.h \
-		ScreenWindow.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Emulation.o Emulation.cpp
+object-files/Emulation.o: src/Emulation.cpp src/Emulation.h \
+		src/KeyboardTranslator.h \
+		src/Screen.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/TerminalCharacterDecoder.h \
+		src/ScreenWindow.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Emulation.o src/Emulation.cpp
 
-object-files/Vt102Emulation.o: Vt102Emulation.cpp Vt102Emulation.h \
-		Emulation.h \
-		Screen.h \
-		Character.h \
-		CharacterColor.h \
-		History.h \
-		BlockArray.h \
-		KeyboardTranslator.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Vt102Emulation.o Vt102Emulation.cpp
+object-files/Vt102Emulation.o: src/Vt102Emulation.cpp src/Vt102Emulation.h \
+		src/Emulation.h \
+		src/Screen.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/KeyboardTranslator.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Vt102Emulation.o src/Vt102Emulation.cpp
 
-object-files/TerminalDisplay.o: TerminalDisplay.cpp TerminalDisplay.h \
-		Filter.h \
-		Character.h \
-		CharacterColor.h \
-		ColorTables.h \
-		konsole_wcwidth.h \
-		ScreenWindow.h \
-		TerminalCharacterDecoder.h \
-		LineFont.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalDisplay.o TerminalDisplay.cpp
+object-files/TerminalDisplay.o: src/TerminalDisplay.cpp src/TerminalDisplay.h \
+		src/Filter.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/ColorTables.h \
+		src/konsole_wcwidth.h \
+		src/ScreenWindow.h \
+		src/TerminalCharacterDecoder.h \
+		src/LineFont.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalDisplay.o src/TerminalDisplay.cpp
 
-object-files/Filter.o: Filter.cpp Filter.h \
-		Character.h \
-		CharacterColor.h \
-		TerminalCharacterDecoder.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Filter.o Filter.cpp
+object-files/Filter.o: src/Filter.cpp src/Filter.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/TerminalCharacterDecoder.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Filter.o src/Filter.cpp
 
-object-files/Pty.o: Pty.cpp Pty.h \
-		k3process.h \
-		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Pty.o Pty.cpp
+object-files/Pty.o: src/Pty.cpp src/Pty.h \
+		src/k3process.h \
+		src/kpty.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Pty.o src/Pty.cpp
 
-object-files/kpty.o: kpty.cpp kpty_p.h \
-		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/kpty.o kpty.cpp
+object-files/kpty.o: src/kpty.cpp src/kpty_p.h \
+		src/kpty.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/kpty.o src/kpty.cpp
 
-object-files/k3process.o: k3process.cpp k3process.h \
-		k3processcontroller.h \
-		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3process.o k3process.cpp
+object-files/k3process.o: src/k3process.cpp src/k3process.h \
+		src/k3processcontroller.h \
+		src/kpty.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3process.o src/k3process.cpp
 
-object-files/k3processcontroller.o: k3processcontroller.cpp k3processcontroller.h \
-		k3process.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3processcontroller.o k3processcontroller.cpp
+object-files/k3processcontroller.o: src/k3processcontroller.cpp src/k3processcontroller.h \
+		src/k3process.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3processcontroller.o src/k3processcontroller.cpp
 
-object-files/Session.o: Session.cpp Session.h \
-		History.h \
-		BlockArray.h \
-		Character.h \
-		CharacterColor.h \
-		Pty.h \
-		k3process.h \
-		TerminalDisplay.h \
-		Filter.h \
-		ColorTables.h \
-		ShellCommand.h \
-		Vt102Emulation.h \
-		Emulation.h \
-		Screen.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Session.o Session.cpp
+object-files/Session.o: src/Session.cpp src/Session.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/Pty.h \
+		src/k3process.h \
+		src/TerminalDisplay.h \
+		src/Filter.h \
+		src/ColorTables.h \
+		src/ShellCommand.h \
+		src/Vt102Emulation.h \
+		src/Emulation.h \
+		src/Screen.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Session.o src/Session.cpp
 
-object-files/ShellCommand.o: ShellCommand.cpp ShellCommand.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ShellCommand.o ShellCommand.cpp
+object-files/ShellCommand.o: src/ShellCommand.cpp src/ShellCommand.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ShellCommand.o src/ShellCommand.cpp
 
-object-files/QTerminalWidget.o: QTerminalWidget.cpp QTerminalWidget.h \
-		Session.h \
-		History.h \
-		BlockArray.h \
-		Character.h \
-		CharacterColor.h \
-		TerminalDisplay.h \
-		Filter.h \
-		ColorTables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/QTerminalWidget.o QTerminalWidget.cpp
+object-files/QTerminalWidget.o: src/QTerminalWidget.cpp src/QTerminalWidget.h \
+		src/Session.h \
+		src/History.h \
+		src/BlockArray.h \
+		src/Character.h \
+		src/CharacterColor.h \
+		src/TerminalDisplay.h \
+		src/Filter.h \
+		src/ColorTables.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/QTerminalWidget.o src/QTerminalWidget.cpp
 
-object-files/TerminalMdiSubWindow.o: TerminalMdiSubWindow.cpp TerminalMdiSubWindow.h \
-		QTerminalWidget.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalMdiSubWindow.o TerminalMdiSubWindow.cpp
+object-files/TerminalMdiSubWindow.o: src/TerminalMdiSubWindow.cpp src/TerminalMdiSubWindow.h \
+		src/QTerminalWidget.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalMdiSubWindow.o src/TerminalMdiSubWindow.cpp
 
-object-files/MainWindow.o: MainWindow.cpp MainWindow.h \
-		TerminalMdiSubWindow.h \
-		QTerminalWidget.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/MainWindow.o MainWindow.cpp
+object-files/MainWindow.o: src/MainWindow.cpp src/MainWindow.h \
+		src/TerminalMdiSubWindow.h \
+		src/QTerminalWidget.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/MainWindow.o src/MainWindow.cpp
 
-object-files/Quint.o: Quint.cpp MainWindow.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Quint.o Quint.cpp
+object-files/Quint.o: src/Quint.cpp src/MainWindow.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Quint.o src/Quint.cpp
 
-object-files/moc_ScreenWindow.o: moc_ScreenWindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_ScreenWindow.o moc_ScreenWindow.cpp
+object-files/moc_ScreenWindow.o: moc-files/moc_ScreenWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_ScreenWindow.o moc-files/moc_ScreenWindow.cpp
 
-object-files/moc_Emulation.o: moc_Emulation.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Emulation.o moc_Emulation.cpp
+object-files/moc_Emulation.o: moc-files/moc_Emulation.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Emulation.o moc-files/moc_Emulation.cpp
 
-object-files/moc_Vt102Emulation.o: moc_Vt102Emulation.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Vt102Emulation.o moc_Vt102Emulation.cpp
+object-files/moc_Vt102Emulation.o: moc-files/moc_Vt102Emulation.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Vt102Emulation.o moc-files/moc_Vt102Emulation.cpp
 
-object-files/moc_TerminalDisplay.o: moc_TerminalDisplay.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalDisplay.o moc_TerminalDisplay.cpp
+object-files/moc_TerminalDisplay.o: moc-files/moc_TerminalDisplay.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalDisplay.o moc-files/moc_TerminalDisplay.cpp
 
-object-files/moc_Filter.o: moc_Filter.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Filter.o moc_Filter.cpp
+object-files/moc_Filter.o: moc-files/moc_Filter.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Filter.o moc-files/moc_Filter.cpp
 
-object-files/moc_Pty.o: moc_Pty.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Pty.o moc_Pty.cpp
+object-files/moc_Pty.o: moc-files/moc_Pty.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Pty.o moc-files/moc_Pty.cpp
 
-object-files/moc_k3process.o: moc_k3process.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3process.o moc_k3process.cpp
+object-files/moc_k3process.o: moc-files/moc_k3process.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3process.o moc-files/moc_k3process.cpp
 
-object-files/moc_k3processcontroller.o: moc_k3processcontroller.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3processcontroller.o moc_k3processcontroller.cpp
+object-files/moc_k3processcontroller.o: moc-files/moc_k3processcontroller.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3processcontroller.o moc-files/moc_k3processcontroller.cpp
 
-object-files/moc_Session.o: moc_Session.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Session.o moc_Session.cpp
+object-files/moc_Session.o: moc-files/moc_Session.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Session.o moc-files/moc_Session.cpp
 
-object-files/moc_QTerminalWidget.o: moc_QTerminalWidget.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_QTerminalWidget.o moc_QTerminalWidget.cpp
+object-files/moc_QTerminalWidget.o: moc-files/moc_QTerminalWidget.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_QTerminalWidget.o moc-files/moc_QTerminalWidget.cpp
 
-object-files/moc_TerminalMdiSubWindow.o: moc_TerminalMdiSubWindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalMdiSubWindow.o moc_TerminalMdiSubWindow.cpp
+object-files/moc_TerminalMdiSubWindow.o: moc-files/moc_TerminalMdiSubWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalMdiSubWindow.o moc-files/moc_TerminalMdiSubWindow.cpp
 
-object-files/moc_MainWindow.o: moc_MainWindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_MainWindow.o moc_MainWindow.cpp
+object-files/moc_MainWindow.o: moc-files/moc_MainWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_MainWindow.o moc-files/moc_MainWindow.cpp
 
 ####### Install
 
diff -r 4127a03d3309 -r 0861c8648be2 gui//Quint
Binary file gui//Quint has changed
diff -r 4127a03d3309 -r 0861c8648be2 gui//Quint.pro
--- a/gui//Quint.pro	Thu Apr 07 15:00:54 2011 +0200
+++ b/gui//Quint.pro	Thu Apr 07 15:05:14 2011 +0200
@@ -37,28 +37,29 @@
         src/Quint.cpp
 
 HEADERS += \
-        TerminalCharacterDecoder.h \
-        Character.h \
-        CharacterColor.h \
-        KeyboardTranslator.h \
-        ExtendedDefaultTranslator.h \
-        Screen.h \
-        History.h \
-        BlockArray.h \
-        konsole_wcwidth.h \
-        ScreenWindow.h \
-        Emulation.h \
-        Vt102Emulation.h \
-        TerminalDisplay.h \
-        Filter.h \
-        LineFont.h \
-        Pty.h \
-        kpty.h \
-        kpty_p.h \
-        k3process.h \
-        k3processcontroller.h \
-        Session.h \
-        ShellCommand.h \
-        QTerminalWidget.h \
-        TerminalMdiSubWindow.h \
-    MainWindow.h
+        src/TerminalCharacterDecoder.h \
+        src/Character.h \
+        src/CharacterColor.h \
+        src/KeyboardTranslator.h \
+        src/ExtendedDefaultTranslator.h \
+        src/Screen.h \
+        src/History.h \
+        src/BlockArray.h \
+        src/konsole_wcwidth.h \
+        src/ScreenWindow.h \
+        src/Emulation.h \
+        src/Vt102Emulation.h \
+        src/TerminalDisplay.h \
+        src/Filter.h \
+        src/LineFont.h \
+        src/Pty.h \
+        src/kpty.h \
+        src/kpty_p.h \
+        src/k3process.h \
+        src/k3processcontroller.h \
+        src/Session.h \
+        src/ShellCommand.h \
+        src/QTerminalWidget.h \
+        src/TerminalMdiSubWindow.h \
+    	src/MainWindow.h
+