Commit 7ff4b1fe authored by Friedemann Kleint's avatar Friedemann Kleint

Debugger[New CDB]: Get rid of postfix '2' in file names/classes.

parent 46647f49
HEADERS += $$PWD/cdbengine.h \
cdb/bytearrayinputstream.h \
cdb/cdbparsehelpers.h \
cdb/cdboptions.h \
cdb/cdboptionspage.h
SOURCES += $$PWD/cdbengine.cpp \
cdb/bytearrayinputstream.cpp \
cdb/cdbparsehelpers.cpp \
cdb/cdboptions.cpp \
cdb/cdboptionspage.cpp
FORMS += cdb/cdboptionspagewidget.ui
INCLUDEPATH*=$$PWD
DEPENDPATH*=$$PWD
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
** **
**************************************************************************/ **************************************************************************/
#include "cdbengine2.h" #include "cdbengine.h"
#include "debuggerstartparameters.h" #include "debuggerstartparameters.h"
#include "disassemblerlines.h" #include "disassemblerlines.h"
#include "cdboptions2.h" #include "cdboptions.h"
#include "cdboptionspage2.h" #include "cdboptionspage.h"
#include "bytearrayinputstream.h" #include "bytearrayinputstream.h"
#include "breakpoint.h" #include "breakpoint.h"
#include "breakhandler.h" #include "breakhandler.h"
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
** **
**************************************************************************/ **************************************************************************/
#include "cdboptions2.h" #include "cdboptions.h"
#include "cdbengine2.h" #include "cdbengine.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
# include <utils/winutils.h> # include <utils/winutils.h>
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
** **
**************************************************************************/ **************************************************************************/
#include "cdboptionspage2.h" #include "cdboptionspage.h"
#include "cdboptions2.h" #include "cdboptions.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "cdbengine2.h" #include "cdbengine.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
# include <utils/winutils.h> # include <utils/winutils.h>
......
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
#ifndef CDBSETTINGSPAGE_H #ifndef CDBSETTINGSPAGE_H
#define CDBSETTINGSPAGE_H #define CDBSETTINGSPAGE_H
#include "cdboptions2.h" #include "cdboptions.h"
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include "ui_cdboptionspagewidget2.h" #include "ui_cdboptionspagewidget.h"
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QPointer> #include <QtCore/QPointer>
...@@ -98,7 +98,7 @@ private: ...@@ -98,7 +98,7 @@ private:
static bool checkInstallation(const QString &executable, bool is64Bit, static bool checkInstallation(const QString &executable, bool is64Bit,
QString *message); QString *message);
Ui::CdbOptionsPageWidget2 m_ui; Ui::CdbOptionsPageWidget m_ui;
CdbBreakEventWidget *m_breakEventWidget; CdbBreakEventWidget *m_breakEventWidget;
QTimer *m_reportTimer; QTimer *m_reportTimer;
}; };
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Debugger::Internal::CdbOptionsPageWidget2</class> <class>Debugger::Internal::CdbOptionsPageWidget</class>
<widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget2"> <widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
......
HEADERS += $$PWD/cdbengine2.h \
cdb2/bytearrayinputstream.h \
cdb2/cdbparsehelpers.h \
cdb2/cdboptions2.h \
cdb2/cdboptionspage2.h
SOURCES += $$PWD/cdbengine2.cpp \
cdb2/bytearrayinputstream.cpp \
cdb2/cdbparsehelpers.cpp \
cdb2/cdboptions2.cpp \
cdb2/cdboptionspage2.cpp
FORMS += cdb2/cdboptionspagewidget2.ui
INCLUDEPATH*=$$PWD
DEPENDPATH*=$$PWD
...@@ -127,7 +127,7 @@ SOURCES += registerpostmortemaction.cpp ...@@ -127,7 +127,7 @@ SOURCES += registerpostmortemaction.cpp
LIBS *= -lole32 \ LIBS *= -lole32 \
-lshell32 -lshell32
} }
include(cdb2/cdb2.pri) include(cdb/cdb.pri)
include(gdb/gdb.pri) include(gdb/gdb.pri)
include(script/script.pri) include(script/script.pri)
include(pdb/pdb.pri) include(pdb/pdb.pri)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "debuggerdialogs.h" #include "debuggerdialogs.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "cdb2/cdbengine2.h" #include "cdb/cdbengine.h"
#include "ui_attachcoredialog.h" #include "ui_attachcoredialog.h"
#include "ui_attachexternaldialog.h" #include "ui_attachexternaldialog.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment