From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- languages/lib/debugger/CMakeLists.txt | 4 +- languages/lib/debugger/Makefile.am | 10 +- languages/lib/debugger/debugger.cpp | 4 +- languages/lib/debugger/debugger.h | 10 +- languages/lib/debugger/kdevdebugger.cpp | 182 ++++++++++++++++++++++++++++++++ languages/lib/debugger/kdevdebugger.h | 89 ++++++++++++++++ languages/lib/debugger/tdevdebugger.cpp | 182 -------------------------------- languages/lib/debugger/tdevdebugger.h | 89 ---------------- 8 files changed, 285 insertions(+), 285 deletions(-) create mode 100644 languages/lib/debugger/kdevdebugger.cpp create mode 100644 languages/lib/debugger/kdevdebugger.h delete mode 100644 languages/lib/debugger/tdevdebugger.cpp delete mode 100644 languages/lib/debugger/tdevdebugger.h (limited to 'languages/lib/debugger') diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt index fbd121e4..c159528b 100644 --- a/languages/lib/debugger/CMakeLists.txt +++ b/languages/lib/debugger/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### headers ################################### install( FILES - debugger.h tdevdebugger.h + debugger.h kdevdebugger.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/debugger ) ##### lang_debugger (shared) #################### tde_add_library( lang_debugger SHARED AUTOMOC - SOURCES tdevdebugger.cpp debugger.cpp + SOURCES kdevdebugger.cpp debugger.cpp VERSION 0.0.0 LINK tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 3ca4e3a8..fc8923aa 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor -liblang_debugger_la_SOURCES = tdevdebugger.cpp debugger.cpp +liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger -langincludedir_HEADERS = debugger.h tdevdebugger.h +langincludedir_HEADERS = debugger.h kdevdebugger.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Debugger Support Library -DOXYGEN_DOCDIRPREFIX = tdevlang +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library +DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 341abecd..bc8356b7 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -6,14 +6,14 @@ #include // #include "editorproxy.h" -#include +#include using namespace KTextEditor; Debugger *Debugger::s_instance = 0; -Debugger::Debugger(TDevPartController *partController) +Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index 1f5cbae8..d4112490 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -3,7 +3,7 @@ #include -#include "tdevdebugger.h" +#include "kdevdebugger.h" #include #include @@ -11,7 +11,7 @@ #include #include -class TDevPartController; +class KDevPartController; /** * Describes a single breakpoint in the system @@ -54,7 +54,7 @@ private: * point of the debugger. * We may change, add or remove breakpoints in this class. */ -class Debugger : public TDevDebugger +class Debugger : public KDevDebugger { Q_OBJECT @@ -94,7 +94,7 @@ public: // protected: - Debugger(TDevPartController *partController); + Debugger(KDevPartController *partController); ~Debugger(); private slots: @@ -126,7 +126,7 @@ private: }; static Debugger *s_instance; - TDevPartController *m_partController; + KDevPartController *m_partController; TQValueList BPList; }; diff --git a/languages/lib/debugger/kdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp new file mode 100644 index 00000000..b9ee4a05 --- /dev/null +++ b/languages/lib/debugger/kdevdebugger.cpp @@ -0,0 +1,182 @@ +/* This file is part of the KDE project + Copyright (C) 2002 Matthias Hoelzer-Kluepfel + Copyright (C) 2002 John Firebaugh + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#include "kdevdebugger.h" + +KDevDebugger::KDevDebugger(TQObject *parent, const char *name) + : TQObject(parent, name) +{ +} + + +KDevDebugger::~KDevDebugger() +{ +} + +const TQPixmap* KDevDebugger::inactiveBreakpointPixmap() +{ + const char*breakpoint_gr_xpm[]={ + "11 16 6 1", + "c c #c6c6c6", + "d c #2c2c2c", + "# c #000000", + ". c None", + "a c #ffffff", + "b c #555555", + "...........", + "...........", + "...#####...", + "..#aaaaa#..", + ".#abbbbbb#.", + "#abbbbbbbb#", + "#abcacacbd#", + "#abbbbbbbb#", + "#abcacacbd#", + "#abbbbbbbb#", + ".#bbbbbbb#.", + "..#bdbdb#..", + "...#####...", + "...........", + "...........", + "..........."}; + static TQPixmap pixmap( breakpoint_gr_xpm ); + return &pixmap; +} + +const TQPixmap* KDevDebugger::activeBreakpointPixmap() +{ + const char* breakpoint_xpm[]={ + "11 16 6 1", + "c c #c6c6c6", + ". c None", + "# c #000000", + "d c #840000", + "a c #ffffff", + "b c #ff0000", + "...........", + "...........", + "...#####...", + "..#aaaaa#..", + ".#abbbbbb#.", + "#abbbbbbbb#", + "#abcacacbd#", + "#abbbbbbbb#", + "#abcacacbd#", + "#abbbbbbbb#", + ".#bbbbbbb#.", + "..#bdbdb#..", + "...#####...", + "...........", + "...........", + "..........."}; + static TQPixmap pixmap( breakpoint_xpm ); + return &pixmap; +} + +const TQPixmap* KDevDebugger::reachedBreakpointPixmap() +{ + const char*breakpoint_bl_xpm[]={ + "11 16 7 1", + "a c #c0c0ff", + "# c #000000", + "c c #0000c0", + "e c #0000ff", + "b c #dcdcdc", + "d c #ffffff", + ". c None", + "...........", + "...........", + "...#####...", + "..#ababa#..", + ".#bcccccc#.", + "#acccccccc#", + "#bcadadace#", + "#acccccccc#", + "#bcadadace#", + "#acccccccc#", + ".#ccccccc#.", + "..#cecec#..", + "...#####...", + "...........", + "...........", + "..........."}; + static TQPixmap pixmap( breakpoint_bl_xpm ); + return &pixmap; +} + +const TQPixmap* KDevDebugger::disabledBreakpointPixmap() +{ + const char*breakpoint_wh_xpm[]={ + "11 16 7 1", + "a c #c0c0ff", + "# c #000000", + "c c #0000c0", + "e c #0000ff", + "b c #dcdcdc", + "d c #ffffff", + ". c None", + "...........", + "...........", + "...#####...", + "..#ddddd#..", + ".#ddddddd#.", + "#ddddddddd#", + "#ddddddddd#", + "#ddddddddd#", + "#ddddddddd#", + "#ddddddddd#", + ".#ddddddd#.", + "..#ddddd#..", + "...#####...", + "...........", + "...........", + "..........."}; + static TQPixmap pixmap( breakpoint_wh_xpm ); + return &pixmap; +} + +const TQPixmap* KDevDebugger::executionPointPixmap() +{ + const char*exec_xpm[]={ + "11 16 4 1", + "a c #00ff00", + "b c #000000", + ". c None", + "# c #00c000", + "...........", + "...........", + "...........", + "#a.........", + "#aaa.......", + "#aaaaa.....", + "#aaaaaaa...", + "#aaaaaaaaa.", + "#aaaaaaa#b.", + "#aaaaa#b...", + "#aaa#b.....", + "#a#b.......", + "#b.........", + "...........", + "...........", + "..........."}; + static TQPixmap pixmap( exec_xpm ); + return &pixmap; +} + +#include "kdevdebugger.moc" diff --git a/languages/lib/debugger/kdevdebugger.h b/languages/lib/debugger/kdevdebugger.h new file mode 100644 index 00000000..4cb7df3f --- /dev/null +++ b/languages/lib/debugger/kdevdebugger.h @@ -0,0 +1,89 @@ +/* This file is part of the KDE project + Copyright (C) 2002 Matthias Hoelzer-Kluepfel + Copyright (C) 2002 John Firebaugh + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +#ifndef _KDEVDEBUGGER_H_ +#define _KDEVDEBUGGER_H_ + + +#include +#include + + +#include + +/** +* Base class to handle signals from the editor that relate to breakpoints +* and the execution point of the debugger. +*/ +class KDevDebugger : public TQObject +{ + Q_OBJECT + + +public: + + KDevDebugger(TQObject *parent=0, const char *name=0); + ~KDevDebugger(); + + /** + * Sets a breakpoint in the editor document belong to fileName. + * If id==-1, the breakpoint is deleted. + */ + virtual void setBreakpoint(const TQString &fileName, int lineNum, + int id, bool enabled, bool pending) = 0; + + /** + * Goes to a given location in a source file and marks the line. + * This is used by the debugger to mark the location where the + * the debugger has stopped. + */ + virtual void gotoExecutionPoint(const KURL &url, int lineNum=0) = 0; + + /** + * Clear the execution point. Usefull if debugging has ended. + */ + virtual void clearExecutionPoint() = 0; + + static const TQPixmap* inactiveBreakpointPixmap(); + static const TQPixmap* activeBreakpointPixmap(); + static const TQPixmap* reachedBreakpointPixmap(); + static const TQPixmap* disabledBreakpointPixmap(); + static const TQPixmap* executionPointPixmap(); + +signals: + + /** + * The user has toggled a breakpoint. + */ + void toggledBreakpoint(const TQString &fileName, int lineNum); + + /* + * The user wants to edit the properties of a breakpoint. + */ + void editedBreakpoint(const TQString &fileName, int lineNum); + + /** + * The user wants to enable/disable a breakpoint. + */ + void toggledBreakpointEnabled(const TQString &fileName, int lineNum); + +}; + + +#endif diff --git a/languages/lib/debugger/tdevdebugger.cpp b/languages/lib/debugger/tdevdebugger.cpp deleted file mode 100644 index e005491f..00000000 --- a/languages/lib/debugger/tdevdebugger.cpp +++ /dev/null @@ -1,182 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Matthias Hoelzer-Kluepfel - Copyright (C) 2002 John Firebaugh - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#include "tdevdebugger.h" - -TDevDebugger::TDevDebugger(TQObject *parent, const char *name) - : TQObject(parent, name) -{ -} - - -TDevDebugger::~TDevDebugger() -{ -} - -const TQPixmap* TDevDebugger::inactiveBreakpointPixmap() -{ - const char*breakpoint_gr_xpm[]={ - "11 16 6 1", - "c c #c6c6c6", - "d c #2c2c2c", - "# c #000000", - ". c None", - "a c #ffffff", - "b c #555555", - "...........", - "...........", - "...#####...", - "..#aaaaa#..", - ".#abbbbbb#.", - "#abbbbbbbb#", - "#abcacacbd#", - "#abbbbbbbb#", - "#abcacacbd#", - "#abbbbbbbb#", - ".#bbbbbbb#.", - "..#bdbdb#..", - "...#####...", - "...........", - "...........", - "..........."}; - static TQPixmap pixmap( breakpoint_gr_xpm ); - return &pixmap; -} - -const TQPixmap* TDevDebugger::activeBreakpointPixmap() -{ - const char* breakpoint_xpm[]={ - "11 16 6 1", - "c c #c6c6c6", - ". c None", - "# c #000000", - "d c #840000", - "a c #ffffff", - "b c #ff0000", - "...........", - "...........", - "...#####...", - "..#aaaaa#..", - ".#abbbbbb#.", - "#abbbbbbbb#", - "#abcacacbd#", - "#abbbbbbbb#", - "#abcacacbd#", - "#abbbbbbbb#", - ".#bbbbbbb#.", - "..#bdbdb#..", - "...#####...", - "...........", - "...........", - "..........."}; - static TQPixmap pixmap( breakpoint_xpm ); - return &pixmap; -} - -const TQPixmap* TDevDebugger::reachedBreakpointPixmap() -{ - const char*breakpoint_bl_xpm[]={ - "11 16 7 1", - "a c #c0c0ff", - "# c #000000", - "c c #0000c0", - "e c #0000ff", - "b c #dcdcdc", - "d c #ffffff", - ". c None", - "...........", - "...........", - "...#####...", - "..#ababa#..", - ".#bcccccc#.", - "#acccccccc#", - "#bcadadace#", - "#acccccccc#", - "#bcadadace#", - "#acccccccc#", - ".#ccccccc#.", - "..#cecec#..", - "...#####...", - "...........", - "...........", - "..........."}; - static TQPixmap pixmap( breakpoint_bl_xpm ); - return &pixmap; -} - -const TQPixmap* TDevDebugger::disabledBreakpointPixmap() -{ - const char*breakpoint_wh_xpm[]={ - "11 16 7 1", - "a c #c0c0ff", - "# c #000000", - "c c #0000c0", - "e c #0000ff", - "b c #dcdcdc", - "d c #ffffff", - ". c None", - "...........", - "...........", - "...#####...", - "..#ddddd#..", - ".#ddddddd#.", - "#ddddddddd#", - "#ddddddddd#", - "#ddddddddd#", - "#ddddddddd#", - "#ddddddddd#", - ".#ddddddd#.", - "..#ddddd#..", - "...#####...", - "...........", - "...........", - "..........."}; - static TQPixmap pixmap( breakpoint_wh_xpm ); - return &pixmap; -} - -const TQPixmap* TDevDebugger::executionPointPixmap() -{ - const char*exec_xpm[]={ - "11 16 4 1", - "a c #00ff00", - "b c #000000", - ". c None", - "# c #00c000", - "...........", - "...........", - "...........", - "#a.........", - "#aaa.......", - "#aaaaa.....", - "#aaaaaaa...", - "#aaaaaaaaa.", - "#aaaaaaa#b.", - "#aaaaa#b...", - "#aaa#b.....", - "#a#b.......", - "#b.........", - "...........", - "...........", - "..........."}; - static TQPixmap pixmap( exec_xpm ); - return &pixmap; -} - -#include "tdevdebugger.moc" diff --git a/languages/lib/debugger/tdevdebugger.h b/languages/lib/debugger/tdevdebugger.h deleted file mode 100644 index 3cfcd5de..00000000 --- a/languages/lib/debugger/tdevdebugger.h +++ /dev/null @@ -1,89 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2002 Matthias Hoelzer-Kluepfel - Copyright (C) 2002 John Firebaugh - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef _TDEVDEBUGGER_H_ -#define _TDEVDEBUGGER_H_ - - -#include -#include - - -#include - -/** -* Base class to handle signals from the editor that relate to breakpoints -* and the execution point of the debugger. -*/ -class TDevDebugger : public TQObject -{ - Q_OBJECT - - -public: - - TDevDebugger(TQObject *parent=0, const char *name=0); - ~TDevDebugger(); - - /** - * Sets a breakpoint in the editor document belong to fileName. - * If id==-1, the breakpoint is deleted. - */ - virtual void setBreakpoint(const TQString &fileName, int lineNum, - int id, bool enabled, bool pending) = 0; - - /** - * Goes to a given location in a source file and marks the line. - * This is used by the debugger to mark the location where the - * the debugger has stopped. - */ - virtual void gotoExecutionPoint(const KURL &url, int lineNum=0) = 0; - - /** - * Clear the execution point. Usefull if debugging has ended. - */ - virtual void clearExecutionPoint() = 0; - - static const TQPixmap* inactiveBreakpointPixmap(); - static const TQPixmap* activeBreakpointPixmap(); - static const TQPixmap* reachedBreakpointPixmap(); - static const TQPixmap* disabledBreakpointPixmap(); - static const TQPixmap* executionPointPixmap(); - -signals: - - /** - * The user has toggled a breakpoint. - */ - void toggledBreakpoint(const TQString &fileName, int lineNum); - - /* - * The user wants to edit the properties of a breakpoint. - */ - void editedBreakpoint(const TQString &fileName, int lineNum); - - /** - * The user wants to enable/disable a breakpoint. - */ - void toggledBreakpointEnabled(const TQString &fileName, int lineNum); - -}; - - -#endif -- cgit v1.2.3