id3form.h, id3form.cpp are no longer generated by uic and located in .ui/

kid3/kid3.mak

 # Makefile for building kid3 using nmake, cl, link
-# id3form.ui has to be compiled with uic of Qt3/Linux
 # kid3_de.qm for German language strings has to be generated
 # with Linux using the KDE tools.
 
@@ -13,7 +12,7 @@ CC	=	cl
 CXX	=	cl
 CFLAGS	=	-nologo -W3 -MD -O1 -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG -DID3LIB_LINKOPTION=3 -GR
 CXXFLAGS	=	$(CFLAGS)
-INCPATH	=	-I"$(QTDIR)\include" -I"$(ID3INCDIR)" -I".\.ui" -I".\.moc" -I"."
+INCPATH	=	-I"$(QTDIR)\include" -I"$(ID3INCDIR)" -I".\.moc" -I"."
 LINK	=	link
 LFLAGS	=	/NOLOGO /SUBSYSTEM:windows
 LIBS	=	$(QTDIR)\lib\qt-mt230nc.lib $(QTDIR)\lib\qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib $(ID3LIBDIR)\id3lib.lib
@@ -39,14 +38,16 @@ HEADERS = filelist.h \
 		genres.h \
 		kid3.h \
 		mp3file.h \
-		standardtags.h
+		standardtags.h \
+		id3form.h
 SOURCES = filelist.cpp \
 		framelist.cpp \
 		genres.cpp \
 		kid3.cpp \
 		main.cpp \
 		mp3file.cpp \
-		standardtags.cpp
+		standardtags.cpp \
+		id3form.cpp
 OBJECTS = filelist.obj \
 		framelist.obj \
 		genres.obj \
@@ -55,9 +56,6 @@ OBJECTS = filelist.obj \
 		mp3file.obj \
 		standardtags.obj \
 		id3form.obj
-FORMS = id3form.ui
-UICDECLS = .ui\id3form.h
-UICIMPLS = .ui\id3form.cpp
 SRCMOC   = moc_framelist.cpp \
 		moc_kid3.cpp \
 		moc_id3form.cpp
@@ -93,7 +91,7 @@ all: autoconf.h $(TARGET)
 autoconf.h: config.mk
 	$(MK2H) config.mk >$@
 
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
+$(TARGET): $(OBJECTS) $(OBJMOC) 
 	$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<
 	    $(OBJECTS) $(OBJMOC) $(LIBS)
 <<
@@ -102,7 +100,7 @@ mocables: $(SRCMOC)
 
 dist: 
 	$(ZIP) kid3.zip kid3.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES)
-#	@mkdir -p kid3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) kid3\ && $(COPY_FILE) --parents id3form.ui.h kid3/ && ( cd `dirname kid3` && $(TAR) kid3.tar kid3 && $(GZIP) kid3.tar ) && $(MOVE) `dirname kid3`/kid3.tar.gz . && $(DEL_DIR) kid3
+#	@mkdir -p kid3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) kid3\ && ( cd `dirname kid3` && $(TAR) kid3.tar kid3 && $(GZIP) kid3.tar ) && $(MOVE) `dirname kid3`/kid3.tar.gz . && $(DEL_DIR) kid3
 
 mocclean:
 	-$(DEL_FILE) $(OBJMOC)
@@ -137,7 +135,7 @@ framelist.obj: framelist.cpp mp3file.h \
 genres.obj: genres.cpp genres.h
 
 kid3.obj: kid3.cpp kid3.h \
-		.ui\id3form.h \
+		id3form.h \
 		genres.h \
 		framelist.h \
 		filelist.h \
@@ -155,18 +153,11 @@ mp3file.obj: mp3file.cpp standardtags.h \
 
 standardtags.obj: standardtags.cpp standardtags.h
 
-#.ui\id3form.h: id3form.ui 
-#	$(UIC) id3form.ui -o .ui\id3form.h
-#
-#.ui\id3form.cpp: .ui\id3form.h id3form.ui 
-#	$(UIC) id3form.ui -i id3form.h -o .ui\id3form.cpp
-
-id3form.obj: .ui\id3form.cpp filelist.h \
+id3form.obj: id3form.cpp filelist.h \
 		kid3.h \
 		genres.h \
-		id3form.ui.h \
-		.ui\id3form.h autoconf.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foid3form.obj .ui\id3form.cpp
+		id3form.h autoconf.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foid3form.obj id3form.cpp
 
 moc_framelist.obj: moc_framelist.cpp framelist.h 
 
@@ -175,7 +166,7 @@ moc_kid3.obj: moc_kid3.cpp kid3.h filelist.h \
 		framelist.h \
 		mp3file.h autoconf.h
 
-moc_id3form.obj: moc_id3form.cpp .ui\id3form.h 
+moc_id3form.obj: moc_id3form.cpp id3form.h 
 
 moc_framelist.cpp: $(MOC) framelist.h
 	$(MOC) framelist.h -o moc_framelist.cpp
@@ -183,8 +174,8 @@ moc_framelist.cpp: $(MOC) framelist.h
 moc_kid3.cpp: $(MOC) kid3.h
 	$(MOC) kid3.h -o moc_kid3.cpp
 
-moc_id3form.cpp: $(MOC) .ui\id3form.h
-	$(MOC) .ui\id3form.h -o moc_id3form.cpp
+moc_id3form.cpp: $(MOC) id3form.h
+	$(MOC) id3form.h -o moc_id3form.cpp
 
 # Install