Skip to content
Permalink
Browse files

Fix indentation

  • Loading branch information
nyalldawson committed Nov 23, 2017
1 parent 07e4c57 commit f8d839519f95f179f37e0848c9c78e0137d6e25a
@@ -31,6 +31,7 @@ class APP_EXPORT QgsCrashHandler
{

public:

/**
* This class doesn't need to be created by anyone as is only used to handle
* crashes in the application.
@@ -609,12 +609,12 @@ bool QgsDxfExportDialog::layerTitleAsName() const

bool QgsDxfExportDialog::force2d() const
{
return mForce2d->isChecked();
return mForce2d->isChecked();
}

bool QgsDxfExportDialog::useMText() const
{
return mMTextCheckBox->isChecked();
return mMTextCheckBox->isChecked();
}

void QgsDxfExportDialog::saveSettings()
0 src/app/qgsdxfexportdialog.h 100755 → 100644
No changes.
@@ -1,32 +1,32 @@
INCLUDE_DIRECTORIES(SYSTEM
${CMAKE_CURRENT_BINARY_DIR}
)

QT5_WRAP_UI(CRASH_UIS_H qgscrashdialog.ui)
QT5_WRAP_CPP(CRASH_HDR_MOC qgscrashdialog.h)

SET(IMAGE_RCCS ../../images/images.qrc)
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})

# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in DbgHelp.h
SET_SOURCE_FILES_PROPERTIES(qgsstacktrace.cpp PROPERTIES COMPILE_FLAGS -wd4091)

ADD_EXECUTABLE(qgiscrashhandler WIN32
main.cpp
${CRASH_UIS_H}
${CRASH_HDR_MOC}
${IMAGE_RCC_SRCS}
qgscrashdialog.cpp
qgsstacktrace.cpp
qgscrashreport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc
)

TARGET_LINK_LIBRARIES(qgiscrashhandler
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
DbgHelp
)

INSTALL(CODE "MESSAGE(\"Installing crashhandler ...\")")
INSTALL(TARGETS qgiscrashhandler RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
INCLUDE_DIRECTORIES(SYSTEM
${CMAKE_CURRENT_BINARY_DIR}
)

QT5_WRAP_UI(CRASH_UIS_H qgscrashdialog.ui)
QT5_WRAP_CPP(CRASH_HDR_MOC qgscrashdialog.h)

SET(IMAGE_RCCS ../../images/images.qrc)
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})

# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in DbgHelp.h
SET_SOURCE_FILES_PROPERTIES(qgsstacktrace.cpp PROPERTIES COMPILE_FLAGS -wd4091)

ADD_EXECUTABLE(qgiscrashhandler WIN32
main.cpp
${CRASH_UIS_H}
${CRASH_HDR_MOC}
${IMAGE_RCC_SRCS}
qgscrashdialog.cpp
qgsstacktrace.cpp
qgscrashreport.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc
)

TARGET_LINK_LIBRARIES(qgiscrashhandler
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
DbgHelp
)

INSTALL(CODE "MESSAGE(\"Installing crashhandler ...\")")
INSTALL(TARGETS qgiscrashhandler RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
@@ -1,55 +1,55 @@
/***************************************************************************
qgscrashdialog.h - QgsCrashDialog
---------------------
begin : 11.4.2017
copyright : (C) 2017 by Nathan Woodrow
email : woodrow.nathan@gmail.com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSCRASHDIALOG_H
#define QGSCRASHDIALOG_H

#include <QDialog>
#include <QFormLayout>
#include <QPlainTextEdit>
#include <QPushButton>

#include "ui_qgscrashdialog.h"

/**
* A dialog to show a nicer crash dialog to the user.
*/
class QgsCrashDialog : public QDialog, private Ui::QgsCrashDialog
{
Q_OBJECT
public:

/**
* A dialog to show a nicer crash dialog to the user.
*/
QgsCrashDialog( QWidget *parent = nullptr );

void setBugReport( const QString &reportData );
void setReloadArgs( const QString &reloadArgs );

static QString htmlToMarkdown( const QString &html );

private slots:
void showReportWidget();
void createBugReport();
void reloadQGIS();

private:
QString mReportData;
QString mReloadArgs;
};

#endif // QGSCRASHDIALOG_H
/***************************************************************************
qgscrashdialog.h - QgsCrashDialog
---------------------
begin : 11.4.2017
copyright : (C) 2017 by Nathan Woodrow
email : woodrow.nathan@gmail.com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSCRASHDIALOG_H
#define QGSCRASHDIALOG_H

#include <QDialog>
#include <QFormLayout>
#include <QPlainTextEdit>
#include <QPushButton>

#include "ui_qgscrashdialog.h"

/**
* A dialog to show a nicer crash dialog to the user.
*/
class QgsCrashDialog : public QDialog, private Ui::QgsCrashDialog
{
Q_OBJECT
public:

/**
* A dialog to show a nicer crash dialog to the user.
*/
QgsCrashDialog( QWidget *parent = nullptr );

void setBugReport( const QString &reportData );
void setReloadArgs( const QString &reloadArgs );

static QString htmlToMarkdown( const QString &html );

private slots:
void showReportWidget();
void createBugReport();
void reloadQGIS();

private:
QString mReportData;
QString mReloadArgs;
};

#endif // QGSCRASHDIALOG_H

0 comments on commit f8d8395

Please sign in to comment.
You can’t perform that action at this time.