Make QT debugger file names match class names without redundant prefix

src/osd/modules/debugger/debugqt.c

@@ -26,13 +26,13 @@
 #include "debugger.h"
 #include "modules/lib/osdobj_common.h"
 
-#include "qt/debugqtlogwindow.h"
-#include "qt/debugqtmainwindow.h"
-#include "qt/debugqtdasmwindow.h"
-#include "qt/debugqtmemorywindow.h"
-#include "qt/debugqtbreakpointswindow.h"
-#include "qt/debugqtdeviceswindow.h"
-#include "qt/debugqtdeviceinformationwindow.h"
+#include "qt/logwindow.h"
+#include "qt/mainwindow.h"
+#include "qt/dasmwindow.h"
+#include "qt/memorywindow.h"
+#include "qt/breakpointswindow.h"
+#include "qt/deviceswindow.h"
+#include "qt/deviceinformationwindow.h"
 
 class debug_qt : public osd_module, public debug_module
 {

src/osd/modules/debugger/qt/breakpointswindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtbreakpointswindow.h"
+#include "breakpointswindow.h"
 
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"

src/osd/modules/debugger/qt/breakpointswindow.h

@@ -3,8 +3,8 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtview.h"
-#include "debugqtwindow.h"
+#include "debuggerview.h"
+#include "windowqt.h"
 
 
 //============================================================

src/osd/modules/debugger/qt/dasmwindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtdasmwindow.h"
+#include "dasmwindow.h"
 
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"

src/osd/modules/debugger/qt/dasmwindow.h

@@ -3,8 +3,8 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtview.h"
-#include "debugqtwindow.h"
+#include "debuggerview.h"
+#include "windowqt.h"
 
 
 //============================================================

src/osd/modules/debugger/qt/debuggerview.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtview.h"
+#include "debuggerview.h"
 
 DebuggerView::DebuggerView(const debug_view_type& type,
 							running_machine* machine,

src/osd/modules/debugger/qt/debuggerview.h

@@ -1,5 +1,5 @@
-#ifndef __DEBUG_QT_VIEW_H__
-#define __DEBUG_QT_VIEW_H__
+#ifndef __DEBUG_QT_DEBUGGER_VIEW_H__
+#define __DEBUG_QT_DEBUGGER_VIEW_H__
 
 #include <QtGui/QtGui>
 

src/osd/modules/debugger/qt/deviceinformationwindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtdeviceinformationwindow.h"
+#include "deviceinformationwindow.h"
 
 
 DeviceInformationWindow::DeviceInformationWindow(running_machine* machine, device_t* device, QWidget* parent) :

src/osd/modules/debugger/qt/deviceinformationwindow.h

@@ -3,7 +3,7 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtwindow.h"
+#include "windowqt.h"
 
 //============================================================
 //  The Device Information Window.

src/osd/modules/debugger/qt/deviceswindow.c

@@ -1,7 +1,7 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtdeviceswindow.h"
-#include "debugqtdeviceinformationwindow.h"
+#include "deviceswindow.h"
+#include "deviceinformationwindow.h"
 
 DevicesWindowModel::DevicesWindowModel(running_machine *machine, QObject *parent)
 {

src/osd/modules/debugger/qt/deviceswindow.h

@@ -3,7 +3,7 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtwindow.h"
+#include "windowqt.h"
 
 
 //============================================================

src/osd/modules/debugger/qt/logwindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtlogwindow.h"
+#include "logwindow.h"
 
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"

src/osd/modules/debugger/qt/logwindow.h

@@ -3,8 +3,8 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtview.h"
-#include "debugqtwindow.h"
+#include "debuggerview.h"
+#include "windowqt.h"
 
 
 //============================================================

src/osd/modules/debugger/qt/mainwindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtmainwindow.h"
+#include "mainwindow.h"
 
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"

src/osd/modules/debugger/qt/mainwindow.h

@@ -6,8 +6,8 @@
 
 #include "debug/dvdisasm.h"
 
-#include "debugqtview.h"
-#include "debugqtwindow.h"
+#include "debuggerview.h"
+#include "windowqt.h"
 
 class DasmDockWidget;
 class ProcessorDockWidget;

src/osd/modules/debugger/qt/memorywindow.c

@@ -1,6 +1,6 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtmemorywindow.h"
+#include "memorywindow.h"
 
 #include "debug/dvmemory.h"
 #include "debug/debugcon.h"

src/osd/modules/debugger/qt/memorywindow.h

@@ -3,8 +3,8 @@
 
 #include <QtGui/QtGui>
 
-#include "debugqtview.h"
-#include "debugqtwindow.h"
+#include "debuggerview.h"
+#include "windowqt.h"
 
 class DebuggerMemView;
 

src/osd/modules/debugger/qt/windowqt.c

@@ -1,11 +1,11 @@
 #define NO_MEM_TRACKING
 
-#include "debugqtwindow.h"
-#include "debugqtlogwindow.h"
-#include "debugqtdasmwindow.h"
-#include "debugqtmemorywindow.h"
-#include "debugqtbreakpointswindow.h"
-#include "debugqtdeviceswindow.h"
+#include "windowqt.h"
+#include "logwindow.h"
+#include "dasmwindow.h"
+#include "memorywindow.h"
+#include "breakpointswindow.h"
+#include "deviceswindow.h"
 
 bool WindowQt::s_refreshAll = false;
 bool WindowQt::s_hideAll = false;

src/osd/modules/debugger/qt/windowqt.h

@@ -1,5 +1,5 @@
-#ifndef __DEBUG_QT_WINDOW_H__
-#define __DEBUG_QT_WINDOW_H__
+#ifndef __DEBUG_QT_WINDOW_QT_H__
+#define __DEBUG_QT_WINDOW_QT_H__
 
 #include <QtGui/QtGui>
 

src/osd/sdl/sdl.mak

@@ -728,24 +728,24 @@ $(OSDOBJ)/%.moc.c: $(OSDSRC)/%.h
 	$(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
 
 DEBUGOBJS = \
-	$(OSDOBJ)/modules/debugger/qt/debugqtview.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtwindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtlogwindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdasmwindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtmainwindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtmemorywindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtbreakpointswindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdeviceswindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdeviceinformationwindow.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtview.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtwindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtlogwindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdasmwindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtmainwindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtmemorywindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtbreakpointswindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdeviceswindow.moc.o \
-	$(OSDOBJ)/modules/debugger/qt/debugqtdeviceinformationwindow.moc.o
+	$(OSDOBJ)/modules/debugger/qt/debuggerview.o \
+	$(OSDOBJ)/modules/debugger/qt/windowqt.o \
+	$(OSDOBJ)/modules/debugger/qt/logwindow.o \
+	$(OSDOBJ)/modules/debugger/qt/dasmwindow.o \
+	$(OSDOBJ)/modules/debugger/qt/mainwindow.o \
+	$(OSDOBJ)/modules/debugger/qt/memorywindow.o \
+	$(OSDOBJ)/modules/debugger/qt/breakpointswindow.o \
+	$(OSDOBJ)/modules/debugger/qt/deviceswindow.o \
+	$(OSDOBJ)/modules/debugger/qt/deviceinformationwindow.o \
+	$(OSDOBJ)/modules/debugger/qt/debuggerview.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/windowqt.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/logwindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/dasmwindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/mainwindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/memorywindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/breakpointswindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/deviceswindow.moc.o \
+	$(OSDOBJ)/modules/debugger/qt/deviceinformationwindow.moc.o
 
 DEFS += -DUSE_QTDEBUG=1