Commit ecc29fff authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧
Browse files

Crude KF5 porting to KDE4Support

I followed the same constraints as from kdevplatform.
Plugin infrastructure still not ported, tried to make it as 1 to 1 porting
as it gets.
KIcon is gone here too.
parent 5038560a
......@@ -30,7 +30,7 @@ include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Concurrent Declarative Test)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Concurrent Declarative WebKitWidgets Test)
find_package(KF5 CONFIG REQUIRED COMPONENTS
Archive
Config
......
......@@ -28,7 +28,7 @@
#include <config.h>
#include <kaboutdata.h>
#include <k4aboutdata.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <klocale.h>
......@@ -179,7 +179,7 @@ static int getRunningSessionPid()
int main( int argc, char *argv[] )
{
static const char description[] = I18N_NOOP( "The KDevelop Integrated Development Environment" );
KAboutData aboutData( "kdevelop", 0, ki18n( "KDevelop" ), QByteArray(VERSION), ki18n(description), KAboutData::License_GPL,
K4AboutData aboutData( "kdevelop", 0, ki18n( "KDevelop" ), QByteArray(VERSION), ki18n(description), K4AboutData::License_GPL,
ki18n( "Copyright 1999-2013, The KDevelop developers" ), KLocalizedString(), "http://www.kdevelop.org/" );
aboutData.addAuthor( ki18n("Andreas Pakulat"), ki18n( "Architecture, VCS Support, Project Management Support, QMake Projectmanager" ), "apaku@gmx.de" );
aboutData.addAuthor( ki18n("Alexander Dymo"), ki18n( "Architecture, Sublime UI, Ruby support" ), "adymo@kdevelop.org" );
......@@ -417,7 +417,7 @@ int main( int argc, char *argv[] )
QString fn(k.fileName());
fn = fn.left(fn.indexOf('.'));
if ( session == fn )
projectAsSession = si.uuid;
projectAsSession = si.uuid.toString();
}
}
}
......@@ -465,7 +465,8 @@ int main( int argc, char *argv[] )
if(!Core::initialize(splash, Core::Default, session))
return 5;
KGlobal::locale()->insertCatalog( Core::self()->componentData().catalogName() );
// TODO: port to kf5
// KGlobal::locale()->insertCatalog( Core::self()->componentData().catalogName() );
Core* core = Core::self();
QStringList projectNames = args->getOptionList("project");
......
add_subdirectory(dataengine)
add_subdirectory(applet)
add_subdirectory(runner)
# add_subdirectory(runner) #KF5 disabled the runner until we know what's the equivalent for Plasma2
......@@ -18,30 +18,34 @@
*/
#include "kdevelopsessions.h"
#include <QtCore/QCollator>
#include <QtCore/QStandardPaths>
#include <QtCore/QDir>
#include <KI18n/KLocalizedString>
#include <KDebug>
#include <QDebug>
#include <QIcon>
#include <QFile>
#include <KDirWatch>
#include <KStandardDirs>
#include <KToolInvocation>
#include <KIcon>
#include <KConfig>
#include <KConfigGroup>
#include <KUrl>
#include <KStringHandler>
#include <QFile>
bool kdevelopsessions_runner_compare_sessions(const Session &s1, const Session &s2) {
return KStringHandler::naturalCompare(s1.name, s2.name) == -1;
QCollator c;
return c.compare(s1.name, s2.name) < 0;
}
KDevelopSessions::KDevelopSessions(QObject *parent, const QVariantList& args)
: Plasma::AbstractRunner(parent, args)
{
kWarning() << "INIT KDEV";
setObjectName(QLatin1String("KDevelop Sessions"));
setIgnoredTypes(Plasma::RunnerContext::File | Plasma::RunnerContext::Directory | Plasma::RunnerContext::NetworkLocation);
m_icon = KIcon(QLatin1String("kdevelop"));
m_icon = QIcon::fromTheme("kdevelop");
loadSessions();
......@@ -173,7 +177,7 @@ void KDevelopSessions::run(const Plasma::RunnerContext &context, const Plasma::Q
Q_UNUSED(context)
QString sessionId = match.data().toString();
if (sessionId.isEmpty()) {
kWarning() << "No KDevelop session id in match!";
qWarning() << "No KDevelop session id in match!";
return;
}
kDebug() << "Open KDevelop session" << sessionId;
......
......@@ -22,7 +22,7 @@
#include <plasma/abstractrunner.h>
#include <KIcon>
#include <QIcon>
struct Session
{
......@@ -46,7 +46,7 @@ class KDevelopSessions : public Plasma::AbstractRunner {
void loadSessions();
private:
KIcon m_icon;
QIcon m_icon;
QVector<Session> m_sessions;
};
......
......@@ -18,6 +18,7 @@
#include "sessionsmodel.h"
#include <shell/core.h>
#include <shell/sessioncontroller.h>
SessionsModel::SessionsModel(QObject* parent)
: QAbstractListModel(parent)
......
......@@ -20,7 +20,6 @@
#define SESSIONSMODEL_H
#include <QModelIndex>
#include <shell/sessioncontroller.h>
class SessionsModel : public QAbstractListModel
{
......
#include "%{APPNAME}.h"
#include <QtGui/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QAction>
#include <QLabel>
#include <QMenu>
#include <QMenuBar>
#include <QAction>
%{APPNAMEID}::%{APPNAMEID}()
{
......
#ifndef %{APPNAMEID}_H
#define %{APPNAMEID}_H
#include <QtGui/QMainWindow>
#include <QMainWindow>
class %{APPNAMEID} : public QMainWindow
{
......
#include <QtGui/QApplication>
#include <QApplication>
#include "%{APPNAME}.h"
......
......@@ -30,15 +30,14 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
set(kdevgdb_PART_SRCS
gdb.cpp
set(kdevgdb_SRCS
debuggerplugin.cpp
gdb.cpp
gdbcommandqueue.cpp
gdbcommand.cpp
gdbparser.cpp
stty.cpp
disassemblewidget.cpp
memviewdlg.cpp
gdboutputwidget.cpp
# debuggertracingdialog.cpp
breakpointcontroller.cpp
......@@ -62,14 +61,20 @@ set(kdevgdb_PART_SRCS
registers/converters.cpp
)
if(OKTETA_FOUND)
list(APPEND kdevgdb_SRCS
memviewdlg.cpp)
endif()
if(KDE4WORKSPACE_FOUND)
set(kdevgdb_PART_SRCS
${kdevgdb_PART_SRCS}
set(kdevgdb_SRCS
${kdevgdb_SRCS}
processselection.cpp
)
endif(KDE4WORKSPACE_FOUND)
set(kdevgdb_PART_UI
set(kdevgdb_UI
debuggertracingdialog.ui
debuggerconfigwidget.ui
selectcore.ui
......@@ -77,15 +82,15 @@ set(kdevgdb_PART_UI
registers/registersview.ui
)
qt5_wrap_ui(kdevgdb_PART_SRCS ${kdevgdb_PART_UI})
add_library(kdevgdb MODULE ${kdevgdb_PART_SRCS})
target_link_libraries(kdevgdb sublime
qt5_wrap_ui(kdevgdb_SRCS ${kdevgdb_UI})
add_library(kdevgdb MODULE ${kdevgdb_SRCS})
target_link_libraries(kdevgdb
${KDEVPLATFORM_SUBLIME_LIBRARIES}
${KDEVPLATFORM_INTERFACES_LIBRARIES}
${KDEVPLATFORM_LANGUAGE_LIBRARIES}
${KDEVPLATFORM_DEBUGGER_LIBRARIES}
${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES}
${KDEVPLATFORM_PROJECT_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KDEVPLATFORM_UTIL_LIBRARIES}
KF5::TextEditor
${KDE4WORKSPACE_PROCESSUI_LIBS}
......@@ -93,52 +98,7 @@ target_link_libraries(kdevgdb sublime
install(TARGETS kdevgdb DESTINATION ${PLUGIN_INSTALL_DIR})
########### next target ###############
set(gdbtest_PART_SRCS
unittests/gdbtest.cpp
gdb.cpp
gdbcommandqueue.cpp
gdbcommand.cpp
gdbparser.cpp
stty.cpp
disassemblewidget.cpp
memviewdlg.cpp
gdboutputwidget.cpp
# debuggertracingdialog.cpp
breakpointcontroller.cpp
mi/gdbmi.cpp
mi/milexer.cpp
mi/miparser.cpp
stringhelpers.cpp
debugsession.cpp
variablecontroller.cpp
gdbframestackmodel.cpp
gdbvariable.cpp
registers/registersview.cpp
registers/registercontroller.cpp
registers/registersmanager.cpp
registers/registercontroller_x86.cpp
registers/registercontroller_arm.cpp
registers/modelsmanager.cpp
registers/converters.cpp
)
if(KDE4WORKSPACE_FOUND)
set(gdbtest_PART_SRCS
${gdbtest_PART_SRCS}
processselection.cpp
)
endif(KDE4WORKSPACE_FOUND)
qt5_wrap_ui(gdbtest_PART_SRCS
debuggertracingdialog.ui
selectaddress.ui
registers/registersview.ui
)
add_executable(gdbtest ${gdbtest_PART_SRCS})
add_executable(gdbtest unittests/gdbtest.cpp ${kdevgdb_SRCS})
ecm_mark_as_test(gdbtest)
add_test(gdbtest gdbtest)
......@@ -152,7 +112,7 @@ target_link_libraries(gdbtest
${KDEVPLATFORM_UTIL_LIBRARIES}
KF5::KIOWidgets
KF5::TextEditor
${KDE4_KPARTS_LIBRARY}
KF5::Parts
${KDE4WORKSPACE_PROCESSUI_LIBS}
)
......
......@@ -90,7 +90,7 @@ namespace GDBDebugger
{
K_PLUGIN_FACTORY(CppDebuggerFactory, registerPlugin<CppDebuggerPlugin>(); )
K_EXPORT_PLUGIN(CppDebuggerFactory(KAboutData("kdevgdb","kdevgdb", ki18n("GDB Support"), "0.1", ki18n("This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more."), KAboutData::License_GPL)))
// K_EXPORT_PLUGIN(CppDebuggerFactory(KAboutData("kdevgdb","kdevgdb", ki18n("GDB Support"), "0.1", ki18n("This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more."), KAboutData::License_GPL)))
template<class T>
class DebuggerToolFactory : public KDevelop::IToolViewFactory
......@@ -136,8 +136,8 @@ private:
};
CppDebuggerPlugin::CppDebuggerPlugin( QObject *parent, const QVariantList & ) :
KDevelop::IPlugin( CppDebuggerFactory::componentData(), parent ),
m_config(KGlobal::config(), "GDB Debugger"), m_session(0)
KDevelop::IPlugin( "kdevgdb", parent ),
m_config(KSharedConfig::openConfig(), "GDB Debugger"), m_session(0)
{
KDEV_USE_EXTENSION_INTERFACE( KDevelop::IStatus )
......@@ -159,11 +159,13 @@ CppDebuggerPlugin::CppDebuggerPlugin( QObject *parent, const QVariantList & ) :
i18n("GDB"),
gdbfactory);
memoryviewerfactory = new DebuggerToolFactory<MemoryViewerWidget>(
this, "org.kdevelop.debugger.MemoryView", Qt::BottomDockWidgetArea);
core()->uiController()->addToolView(
i18n("Memory"),
memoryviewerfactory);
#warning port MemoryViewerWidget to KF5
memoryviewerfactory = 0;
// memoryviewerfactory = new DebuggerToolFactory<MemoryViewerWidget>(
// this, "org.kdevelop.debugger.MemoryView", Qt::BottomDockWidgetArea);
// core()->uiController()->addToolView(
// i18n("Memory"),
// memoryviewerfactory);
setupActions();
......@@ -197,7 +199,7 @@ void CppDebuggerPlugin::setupActions()
{
KActionCollection* ac = actionCollection();
KAction* action = new KAction(KIcon("core"), i18n("Examine Core File..."), this);
KAction* action = new KAction(QIcon::fromTheme("core"), i18n("Examine Core File..."), this);
action->setToolTip( i18n("Examine core file") );
action->setWhatsThis( i18n("<b>Examine core file</b><p>"
"This loads a core file, which is typically created "
......@@ -209,7 +211,7 @@ void CppDebuggerPlugin::setupActions()
ac->addAction("debug_core", action);
#ifdef KDEV_ENABLE_GDB_ATTACH_DIALOG
action = new KAction(KIcon("connect_creating"), i18n("Attach to Process"), this);
action = new KAction(QIcon::fromTheme("connect_creating"), i18n("Attach to Process"), this);
action->setToolTip( i18n("Attach to process...") );
action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.</p>"));
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotAttachProcess()));
......
......@@ -30,6 +30,7 @@
#include <KConfigGroup>
#include <KTextEditor/Cursor>
#include <KDE4Support/kurl.h>
#include <interfaces/iplugin.h>
#include <interfaces/istatus.h>
......
......@@ -31,7 +31,9 @@
#include <execute/iexecuteplugin.h>
#include "debugsession.h"
#include <KDebug>
#include <QFileInfo>
#include <KI18n/KLocalizedString>
using namespace GDBDebugger;
using namespace KDevelop;
......@@ -54,7 +56,7 @@ DebugJob::DebugJob( GDBDebugger::CppDebuggerPlugin* p, KDevelop::ILaunchConfigur
void DebugJob::start()
{
KConfigGroup grp = m_launchcfg->config();
KDevelop::EnvironmentGroupList l(KGlobal::config());
KDevelop::EnvironmentGroupList l(KSharedConfig::openConfig());
Q_ASSERT(m_execute);
QString err;
QString executable = m_execute->executable( m_launchcfg, err ).toLocalFile();
......
......@@ -28,9 +28,10 @@
#include <typeinfo>
#include <QtCore/QFileInfo>
#include <QtGui/QApplication>
#include <QApplication>
#include <QRegExp>
#include <KDebug>
#include <KMessageBox>
#include <KLocalizedString>
#include <KToolBar>
......@@ -66,7 +67,7 @@ DebugSession::DebugSession()
: KDevelop::IDebugSession(),
m_sessionState(NotStartedState),
justRestarted_(false),
m_config(KGlobal::config(), "GDB Debugger"),
m_config(KSharedConfig::openConfig(), "GDB Debugger"),
commandQueue_(new CommandQueue),
m_tty(0),
state_(s_dbgNotStarted|s_appNotStarted),
......@@ -433,7 +434,7 @@ bool DebugSession::restartAvaliable() const
}
void DebugSession::configure()
{
// KConfigGroup config(KGlobal::config(), "GDB Debugger");
// KConfigGroup config(KSharedConfig::openConfig(), "GDB Debugger");
//
// // A a configure.gdb script will prevent these from uncontrolled growth...
// config_configGdbScript_ = config.readEntry("Remote GDB Configure Script", "");
......@@ -909,7 +910,7 @@ bool DebugSession::startDebugger(KDevelop::ILaunchConfiguration* cfg)
{
// FIXME: this is hack, I am not sure there's any way presently
// to edit this via GUI.
KConfigGroup config(KGlobal::config(), "GDB Debugger");
KConfigGroup config(KSharedConfig::openConfig(), "GDB Debugger");
m_gdb.data()->start(config);
}
......@@ -963,7 +964,7 @@ bool DebugSession::startProgram(KDevelop::ILaunchConfiguration* cfg, IExecutePlu
KConfigGroup grp = cfg->config();
KDevelop::EnvironmentGroupList l(KGlobal::config());
KDevelop::EnvironmentGroupList l(KSharedConfig::openConfig());
if (grp.readEntry("Break on Start", false)) {
BreakpointModel* m = KDevelop::ICore::self()->debugController()->breakpointModel();
......@@ -983,10 +984,10 @@ bool DebugSession::startProgram(KDevelop::ILaunchConfiguration* cfg, IExecutePlu
// Configuration values
bool config_displayStaticMembers_ = grp.readEntry( GDBDebugger::staticMembersEntry, false );
bool config_asmDemangle_ = grp.readEntry( GDBDebugger::demangleNamesEntry, true );
KUrl config_dbgShell_ = grp.readEntry( GDBDebugger::debuggerShellEntry, KUrl() );
KUrl config_configGdbScript_ = grp.readEntry( GDBDebugger::remoteGdbConfigEntry, KUrl() );
KUrl config_runShellScript_ = grp.readEntry( GDBDebugger::remoteGdbShellEntry, KUrl() );
KUrl config_runGdbScript_ = grp.readEntry( GDBDebugger::remoteGdbRunEntry, KUrl() );
KUrl config_dbgShell_ = grp.readEntry( GDBDebugger::debuggerShellEntry, QUrl() );
KUrl config_configGdbScript_ = grp.readEntry( GDBDebugger::remoteGdbConfigEntry, QUrl() );
KUrl config_runShellScript_ = grp.readEntry( GDBDebugger::remoteGdbShellEntry, QUrl() );
KUrl config_runGdbScript_ = grp.readEntry( GDBDebugger::remoteGdbRunEntry, QUrl() );
Q_ASSERT(iface);
bool config_useExternalTerminal = iface->useTerminal( cfg );
......@@ -1430,12 +1431,12 @@ void DebugSession::handleVersion(const QStringList& s)
rx.indexIn(s.first());
if (rx.cap(1).toInt() < minVersion1
|| (rx.cap(1).toInt() == minVersion1 && (rx.cap(2).toInt() < minVersion2
|| ( rx.cap(2).toInt() == minVersion2 && minVersion3 > 0 && rx.numCaptures() == 3
|| ( rx.cap(2).toInt() == minVersion2 && minVersion3 > 0 && rx.captureCount() == 3
&& rx.cap(3).toInt() < minVersion3))))
{
if (qApp->type() == QApplication::Tty) {
if (qobject_cast<QGuiApplication*>(qApp)) {
//for unittest
qFatal("You need gdb 7.0.0 or higher.");
qFatal("You need a graphical application.");
}
KMessageBox::error(
qApp->activeWindow(),
......
......@@ -107,11 +107,11 @@ DisassembleWindow::DisassembleWindow(QWidget *parent, DisassembleWidget* widget)
m_selectAddrAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
connect(m_selectAddrAction, SIGNAL(triggered()), widget, SLOT(slotChangeAddress()));
m_jumpToLocation = new QAction(KIcon("debug-execute-to-cursor"), i18n("&Jump to Cursor"), this);
m_jumpToLocation = new QAction(QIcon::fromTheme("debug-execute-to-cursor"), i18n("&Jump to Cursor"), this);
m_jumpToLocation->setWhatsThis(i18n("Sets the execution pointer to the current cursor position."));
connect(m_jumpToLocation,SIGNAL(triggered()), widget, SLOT(jumpToCursor()));
m_runUntilCursor = new QAction(KIcon("debug-run-cursor"), i18n("&Run to Cursor"), this);
m_runUntilCursor = new QAction(QIcon::fromTheme("debug-run-cursor"), i18n("&Run to Cursor"), this);
m_runUntilCursor->setWhatsThis(i18n("Continues execution until the cursor position is reached."));
connect(m_runUntilCursor,SIGNAL(triggered()), widget, SLOT(runToCursor()));
}
......@@ -128,7 +128,7 @@ void DisassembleWindow::contextMenuEvent(QContextMenuEvent *e)
/***************************************************************************/
/***************************************************************************/
/***************************************************************************/
const KIcon DisassembleWidget::icon_=KIcon("go-next");
const QIcon DisassembleWidget::icon_ = QIcon::fromTheme("go-next");
DisassembleWidget::DisassembleWidget(CppDebuggerPlugin* plugin, QWidget *parent)
: QWidget(parent),
......@@ -173,7 +173,7 @@ DisassembleWidget::DisassembleWidget(CppDebuggerPlugin* plugin, QWidget *parent)
m_registersManager = new RegistersManager(m_splitter);
m_config = KGlobal::config()->group("Disassemble/Registers View");
m_config = KSharedConfig::openConfig()->group("Disassemble/Registers View");
QByteArray state = m_config.readEntry<QByteArray>("splitterState", QByteArray());
if (!state.isEmpty()) {
......@@ -184,7 +184,7 @@ DisassembleWidget::DisassembleWidget(CppDebuggerPlugin* plugin, QWidget *parent)
setLayout(topLayout);
setWindowIcon( KIcon("system-run") );
setWindowIcon( QIcon::fromTheme("system-run") );
setWindowTitle(i18n("Disassemble/Registers View"));
KDevelop::IDebugController* pDC=KDevelop::ICore::self()->debugController();
......
......@@ -29,7 +29,6 @@
#include <QTreeWidget>
#include <KUrl>
#include <KIcon>
#include <KDialog>
#include <KConfigGroup>
......@@ -155,7 +154,7 @@ private:
DisassembleWindow * m_disassembleWindow;
static const KIcon icon_;
static const QIcon icon_;
SelectAddrDialog* m_dlg;
KConfigGroup m_config;
......
......@@ -62,7 +62,7 @@ GDB::~GDB()
void GDB::start(KConfigGroup& config)
{
// FIXME: verify that default value leads to something sensible
KUrl gdbUrl = config.readEntry(GDBDebugger::gdbPathEntry, KUrl());
KUrl gdbUrl = config.readEntry(GDBDebugger::gdbPathEntry, QUrl());
if (gdbUrl.isEmpty()) {
gdbBinary_ = "gdb";
} else {
......@@ -85,7 +85,7 @@ void GDB::start(KConfigGroup& config)
QStringList arguments;
arguments << "--interpreter=mi2" << "-quiet";
KUrl shell = config.readEntry(GDBDebugger::debuggerShellEntry, KUrl());
KUrl shell = config.readEntry(GDBDebugger::debuggerShellEntry, QUrl());
if( !shell.isEmpty() )
{
kDebug(9012) << "have shell" << shell;
......
......@@ -25,11 +25,11 @@
#include "gdblaunchconfig.h"
#include <kconfiggroup.h>
#include <kicon.h>
#include <klocale.h>
#include <kshell.h>
#include <kmessagebox.h>
#include <kparts/mainwindow.h>
#include <KDebug>
#include <outputview/outputmodel.h>
#include <interfaces/ilaunchconfiguration.h>
......@@ -78,19 +78,19 @@ GdbConfigPage::~GdbConfigPage()
delete ui;
}
KIcon GdbConfigPage::icon() const
QIcon GdbConfigPage::icon() const
{
return KIcon();
return QIcon();
}
void GdbConfigPage::loadFromConfiguration( const KConfigGroup& cfg, KDevelop::IProject* )
{
bool block = blockSignals( true );
ui->kcfg_gdbPath->setUrl( cfg.readEntry( GDBDebugger::gdbPathEntry, KUrl() ) );
ui->kcfg_debuggingShell->setUrl( cfg.readEntry( GDBDebugger::debuggerShellEntry, KUrl() ) );
ui->kcfg_configGdbScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbConfigEntry, KUrl() ) );
ui->kcfg_runShellScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbShellEntry, KUrl() ) );
ui->kcfg_runGdbScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbRunEntry, KUrl() ) );
ui->kcfg_gdbPath->setUrl( cfg.readEntry( GDBDebugger::gdbPathEntry, QUrl() ) );
ui->kcfg_debuggingShell->setUrl( cfg.readEntry( GDBDebugger::debuggerShellEntry, QUrl() ) );
ui->kcfg_configGdbScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbConfigEntry, QUrl() ) );
ui->kcfg_runShellScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbShellEntry, QUrl() ) );
ui->kcfg_runGdbScript->setUrl( cfg.readEntry( GDBDebugger::remoteGdbRunEntry, QUrl() ) );
ui->kcfg_displayStaticMembers->setChecked( cfg.readEntry(GDBDebugger::staticMembersEntry, false) );
ui->kcfg_asmDemangle->setChecked( cfg.readEntry( GDBDebugger::demangleNamesEntry, true) );
ui->kcfg_startWith->setCurrentIndex( ui->kcfg_startWith->findData( cfg.readEntry( GDBDebugger::startWithEntry, "ApplicationOutput" ) ) );
......
......@@ -57,7 +57,7 @@ Q_OBJECT
public:
GdbConfigPage( QWidget* parent = 0 );
virtual ~GdbConfigPage();
virtual KIcon icon() const;
virtual QIcon icon() const;
virtual void loadFromConfiguration(const KConfigGroup& cfg, KDevelop::IProject* = 0);
virtual void saveToConfiguration(KConfigGroup, KDevelop::IProject* = 0 ) const;
virtual QString title() const;
......@@ -81,4 +81,4 @@ private:
IExecutePlugin* m_execute;
};
#endif
\ No newline at end of file
#endif
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