diff options
author | Vas Crabb <vas@vastheman.com> | 2015-02-17 16:17:01 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-02-17 17:31:50 +1100 |
commit | 1be009a431dc0b7fd98f6a5ecc3cb76d20588328 (patch) | |
tree | cbdcc5d5854ecb9e76c4cd10c8cf1d3d1ef6d430 | |
parent | fe5ebce6a34a79c9c46b3f3cf6cf704bb18f6a65 (diff) |
Make QT debugger file names match class names without redundant prefix
-rw-r--r-- | src/osd/modules/debugger/debugqt.c | 14 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.c (renamed from src/osd/modules/debugger/qt/debugqtbreakpointswindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.h (renamed from src/osd/modules/debugger/qt/debugqtbreakpointswindow.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.c (renamed from src/osd/modules/debugger/qt/debugqtdasmwindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.h (renamed from src/osd/modules/debugger/qt/debugqtdasmwindow.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/debuggerview.c (renamed from src/osd/modules/debugger/qt/debugqtview.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/debuggerview.h (renamed from src/osd/modules/debugger/qt/debugqtview.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceinformationwindow.c (renamed from src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceinformationwindow.h (renamed from src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.h) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceswindow.c (renamed from src/osd/modules/debugger/qt/debugqtdeviceswindow.c) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceswindow.h (renamed from src/osd/modules/debugger/qt/debugqtdeviceswindow.h) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/logwindow.c (renamed from src/osd/modules/debugger/qt/debugqtlogwindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/logwindow.h (renamed from src/osd/modules/debugger/qt/debugqtlogwindow.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.c (renamed from src/osd/modules/debugger/qt/debugqtmainwindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.h (renamed from src/osd/modules/debugger/qt/debugqtmainwindow.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.c (renamed from src/osd/modules/debugger/qt/debugqtmemorywindow.c) | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.h (renamed from src/osd/modules/debugger/qt/debugqtmemorywindow.h) | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.c (renamed from src/osd/modules/debugger/qt/debugqtwindow.c) | 12 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.h (renamed from src/osd/modules/debugger/qt/debugqtwindow.h) | 4 | ||||
-rw-r--r-- | src/osd/sdl/sdl.mak | 36 |
20 files changed, 56 insertions, 56 deletions
diff --git a/src/osd/modules/debugger/debugqt.c b/src/osd/modules/debugger/debugqt.c index ce675a0180d..22614949735 100644 --- a/src/osd/modules/debugger/debugqt.c +++ b/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 { diff --git a/src/osd/modules/debugger/qt/debugqtbreakpointswindow.c b/src/osd/modules/debugger/qt/breakpointswindow.c index 31000e26c51..ff14fdfb67c 100644 --- a/src/osd/modules/debugger/qt/debugqtbreakpointswindow.c +++ b/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" diff --git a/src/osd/modules/debugger/qt/debugqtbreakpointswindow.h b/src/osd/modules/debugger/qt/breakpointswindow.h index 0506ca37abb..fedad23b84a 100644 --- a/src/osd/modules/debugger/qt/debugqtbreakpointswindow.h +++ b/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" //============================================================ diff --git a/src/osd/modules/debugger/qt/debugqtdasmwindow.c b/src/osd/modules/debugger/qt/dasmwindow.c index ca9a5045d69..b88ace8613a 100644 --- a/src/osd/modules/debugger/qt/debugqtdasmwindow.c +++ b/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" diff --git a/src/osd/modules/debugger/qt/debugqtdasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h index 7b31b676678..0954f80d61f 100644 --- a/src/osd/modules/debugger/qt/debugqtdasmwindow.h +++ b/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" //============================================================ diff --git a/src/osd/modules/debugger/qt/debugqtview.c b/src/osd/modules/debugger/qt/debuggerview.c index 971bd44d17a..7befa5978f8 100644 --- a/src/osd/modules/debugger/qt/debugqtview.c +++ b/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, diff --git a/src/osd/modules/debugger/qt/debugqtview.h b/src/osd/modules/debugger/qt/debuggerview.h index 16ce1f48fbd..2e4e8d9603a 100644 --- a/src/osd/modules/debugger/qt/debugqtview.h +++ b/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> diff --git a/src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.c b/src/osd/modules/debugger/qt/deviceinformationwindow.c index 66baf08bdfa..cc2945b7613 100644 --- a/src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.c +++ b/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) : diff --git a/src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.h b/src/osd/modules/debugger/qt/deviceinformationwindow.h index cb7ade44c00..eb32398e9b3 100644 --- a/src/osd/modules/debugger/qt/debugqtdeviceinformationwindow.h +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.h @@ -3,7 +3,7 @@ #include <QtGui/QtGui> -#include "debugqtwindow.h" +#include "windowqt.h" //============================================================ // The Device Information Window. diff --git a/src/osd/modules/debugger/qt/debugqtdeviceswindow.c b/src/osd/modules/debugger/qt/deviceswindow.c index 09b2fa8d7a5..ac1f46e347f 100644 --- a/src/osd/modules/debugger/qt/debugqtdeviceswindow.c +++ b/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) { diff --git a/src/osd/modules/debugger/qt/debugqtdeviceswindow.h b/src/osd/modules/debugger/qt/deviceswindow.h index f541f303efd..bf647b27ec5 100644 --- a/src/osd/modules/debugger/qt/debugqtdeviceswindow.h +++ b/src/osd/modules/debugger/qt/deviceswindow.h @@ -3,7 +3,7 @@ #include <QtGui/QtGui> -#include "debugqtwindow.h" +#include "windowqt.h" //============================================================ diff --git a/src/osd/modules/debugger/qt/debugqtlogwindow.c b/src/osd/modules/debugger/qt/logwindow.c index d9bc1e12b51..ac6fbd6fc12 100644 --- a/src/osd/modules/debugger/qt/debugqtlogwindow.c +++ b/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" diff --git a/src/osd/modules/debugger/qt/debugqtlogwindow.h b/src/osd/modules/debugger/qt/logwindow.h index e936a5ae647..4179132dc1e 100644 --- a/src/osd/modules/debugger/qt/debugqtlogwindow.h +++ b/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" //============================================================ diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.c b/src/osd/modules/debugger/qt/mainwindow.c index 4a5b9594636..f493741aced 100644 --- a/src/osd/modules/debugger/qt/debugqtmainwindow.c +++ b/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" diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.h b/src/osd/modules/debugger/qt/mainwindow.h index 864f1c0f662..d3a6a6b33fc 100644 --- a/src/osd/modules/debugger/qt/debugqtmainwindow.h +++ b/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; diff --git a/src/osd/modules/debugger/qt/debugqtmemorywindow.c b/src/osd/modules/debugger/qt/memorywindow.c index 9c3c0c20881..d04fa1071af 100644 --- a/src/osd/modules/debugger/qt/debugqtmemorywindow.c +++ b/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" diff --git a/src/osd/modules/debugger/qt/debugqtmemorywindow.h b/src/osd/modules/debugger/qt/memorywindow.h index 1f97c414eee..2dc731f4006 100644 --- a/src/osd/modules/debugger/qt/debugqtmemorywindow.h +++ b/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; diff --git a/src/osd/modules/debugger/qt/debugqtwindow.c b/src/osd/modules/debugger/qt/windowqt.c index 9570ad83d5e..851a73a359f 100644 --- a/src/osd/modules/debugger/qt/debugqtwindow.c +++ b/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; diff --git a/src/osd/modules/debugger/qt/debugqtwindow.h b/src/osd/modules/debugger/qt/windowqt.h index ecaf1c24217..6bb7f646522 100644 --- a/src/osd/modules/debugger/qt/debugqtwindow.h +++ b/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> diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index f44cdd76c08..41e945b728d 100644 --- a/src/osd/sdl/sdl.mak +++ b/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 |