Commit 4bbf4140 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Move trk stuff to src/shared.

parent c17edee6
include(../../shared/trk/trk.pri)
HEADERS += \
$$PWD/abstractgdbadapter.h \
$$PWD/gdbmi.h \
$$PWD/gdbengine.h \
$$PWD/gdboptionspage.h \
$$PWD/callback.h \
$$PWD/trkutils.h \
$$PWD/trkclient.h \
$$PWD/trkgdbadapter.h \
#$$PWD/gdboptionspage.h \
......@@ -13,10 +12,7 @@ SOURCES += \
$$PWD/gdbmi.cpp \
$$PWD/gdbengine.cpp \
$$PWD/gdboptionspage.cpp \
$$PWD/trkutils.cpp \
$$PWD/trkclient.cpp \
$$PWD/trkgdbadapter.cpp \
#$$PWD/gdboptionspage.cpp \
$$PWD/trkgdbadapter.cpp
FORMS += $$PWD/gdboptionspage.ui
......
......@@ -31,7 +31,7 @@
#define DEBUGGER_TRKGDBADAPTER_H
#include "trkutils.h"
#include "trkclient.h"
#include "trkdevice.h"
#include "abstractgdbadapter.h"
#include <QtCore/QDebug>
......@@ -79,8 +79,8 @@ class TrkGdbAdapter : public AbstractGdbAdapter
public:
typedef trk::TrkResult TrkResult;
typedef Callback<const TrkResult &> TrkCallback;
typedef Callback<const GdbResult &> GdbCallback;
typedef trk::Callback<const TrkResult &> TrkCallback;
typedef trk::Callback<const GdbResult &> GdbCallback;
TrkGdbAdapter();
~TrkGdbAdapter();
......
......@@ -30,9 +30,9 @@
#ifndef DEBUGGER_CALLBACK_H
#define DEBUGGER_CALLBACK_H
#include <QtGlobal>
#include <QtCore/QtGlobal>
namespace Debugger {
namespace trk {
namespace Internal {
/* Helper class for the 1-argument functor:
......@@ -143,6 +143,6 @@ private:
Internal::CallbackImplBase<Argument> *m_impl;
};
} // namespace Debugger
} // namespace trk
#endif // DEBUGGER_CALLBACK_H
INCLUDEPATH *= $$PWD
# Input
HEADERS += \
$$PWD/callback.h \
$$PWD/trkutils.h \
$$PWD/trkdevice.h
SOURCES += \
$$PWD/trkutils.cpp \
$$PWD/trkdevice.cpp
......@@ -27,7 +27,7 @@
**
**************************************************************************/
#include "trkclient.h"
#include "trkdevice.h"
#include "trkutils.h"
#include <QtCore/QString>
......
......@@ -60,7 +60,7 @@ struct TrkDevicePrivate;
enum { TRK_WRITE_QUEUE_NOOP_CODE = 0x7f };
typedef Debugger::Callback<const TrkResult &> TrkCallback;
typedef trk::Callback<const TrkResult &> TrkCallback;
class TrkDevice : public QObject
{
......
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