mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
Fix indentation
This commit is contained in:
Nyall Dawson
parent
07e4c57291
commit
f8d839519f
@ -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
Executable file → Normal file
0
src/app/qgsdxfexportdialog.h
Executable file → Normal file
@ -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
|
||||
|
||||
@ -1,101 +1,101 @@
|
||||
/***************************************************************************
|
||||
qgscrashreport.h - QgsCrashReport
|
||||
|
||||
---------------------
|
||||
begin : 16.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 QGSCRASHREPORT_H
|
||||
#define QGSCRASHREPORT_H
|
||||
|
||||
#include "qgsstacktrace.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
|
||||
|
||||
/**
|
||||
* Include information to generate user friendly crash report for QGIS.
|
||||
*/
|
||||
class QgsCrashReport
|
||||
{
|
||||
public:
|
||||
|
||||
/**
|
||||
* Include information to generate user friendly crash report for QGIS.
|
||||
*/
|
||||
QgsCrashReport();
|
||||
|
||||
public:
|
||||
enum Flag
|
||||
{
|
||||
Stack = 1 << 0,
|
||||
Plugins = 1 << 1,
|
||||
ProjectDetails = 1 << 2,
|
||||
SystemInfo = 1 << 3,
|
||||
QgisInfo = 1 << 4,
|
||||
All = Stack | Plugins | ProjectDetails | SystemInfo | QgisInfo
|
||||
};
|
||||
Q_DECLARE_FLAGS( Flags, Flag )
|
||||
|
||||
/**
|
||||
* Sets the stack trace for the crash report.
|
||||
* \param value A string list for each line in the stack trace.
|
||||
*/
|
||||
void setStackTrace( QgsStackTrace *value ) { mStackTrace = value; }
|
||||
|
||||
/**
|
||||
* Returns the stack trace for this report.
|
||||
* \return A string list for each line in the stack trace.
|
||||
*/
|
||||
QgsStackTrace *StackTrace() const { return mStackTrace; }
|
||||
|
||||
/**
|
||||
* Set the flags to mark which features are included in this crash report.
|
||||
* \param flags The flag for each feature.
|
||||
*/
|
||||
void setFlags( QgsCrashReport::Flags flags );
|
||||
|
||||
/**
|
||||
* Returns the include flags that have been set for this report.
|
||||
* \return The flags marking what details are included in this report.
|
||||
*/
|
||||
Flags flags() const { return mFlags; }
|
||||
|
||||
const QString toMarkdown();
|
||||
|
||||
/**
|
||||
* Generate a string version of the report.
|
||||
* \return A formatted string including all the information from the report.
|
||||
*/
|
||||
const QString toHtml() const;
|
||||
|
||||
/**
|
||||
* Generates a crash ID for the crash report.
|
||||
* \return
|
||||
*/
|
||||
const QString crashID() const;
|
||||
|
||||
void exportToCrashFolder();
|
||||
|
||||
QString crashReportFolder();
|
||||
|
||||
void setVersionInfo( const QStringList &versionInfo ) { mVersionInfo = versionInfo; }
|
||||
|
||||
private:
|
||||
Flags mFlags;
|
||||
QgsStackTrace *mStackTrace;
|
||||
QStringList mVersionInfo;
|
||||
};
|
||||
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS( QgsCrashReport::Flags )
|
||||
|
||||
#endif // QGSCRASHREPORT_H
|
||||
/***************************************************************************
|
||||
qgscrashreport.h - QgsCrashReport
|
||||
|
||||
---------------------
|
||||
begin : 16.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 QGSCRASHREPORT_H
|
||||
#define QGSCRASHREPORT_H
|
||||
|
||||
#include "qgsstacktrace.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
|
||||
|
||||
/**
|
||||
* Include information to generate user friendly crash report for QGIS.
|
||||
*/
|
||||
class QgsCrashReport
|
||||
{
|
||||
public:
|
||||
|
||||
/**
|
||||
* Include information to generate user friendly crash report for QGIS.
|
||||
*/
|
||||
QgsCrashReport();
|
||||
|
||||
public:
|
||||
enum Flag
|
||||
{
|
||||
Stack = 1 << 0,
|
||||
Plugins = 1 << 1,
|
||||
ProjectDetails = 1 << 2,
|
||||
SystemInfo = 1 << 3,
|
||||
QgisInfo = 1 << 4,
|
||||
All = Stack | Plugins | ProjectDetails | SystemInfo | QgisInfo
|
||||
};
|
||||
Q_DECLARE_FLAGS( Flags, Flag )
|
||||
|
||||
/**
|
||||
* Sets the stack trace for the crash report.
|
||||
* \param value A string list for each line in the stack trace.
|
||||
*/
|
||||
void setStackTrace( QgsStackTrace *value ) { mStackTrace = value; }
|
||||
|
||||
/**
|
||||
* Returns the stack trace for this report.
|
||||
* \return A string list for each line in the stack trace.
|
||||
*/
|
||||
QgsStackTrace *StackTrace() const { return mStackTrace; }
|
||||
|
||||
/**
|
||||
* Set the flags to mark which features are included in this crash report.
|
||||
* \param flags The flag for each feature.
|
||||
*/
|
||||
void setFlags( QgsCrashReport::Flags flags );
|
||||
|
||||
/**
|
||||
* Returns the include flags that have been set for this report.
|
||||
* \return The flags marking what details are included in this report.
|
||||
*/
|
||||
Flags flags() const { return mFlags; }
|
||||
|
||||
const QString toMarkdown();
|
||||
|
||||
/**
|
||||
* Generate a string version of the report.
|
||||
* \return A formatted string including all the information from the report.
|
||||
*/
|
||||
const QString toHtml() const;
|
||||
|
||||
/**
|
||||
* Generates a crash ID for the crash report.
|
||||
* \return
|
||||
*/
|
||||
const QString crashID() const;
|
||||
|
||||
void exportToCrashFolder();
|
||||
|
||||
QString crashReportFolder();
|
||||
|
||||
void setVersionInfo( const QStringList &versionInfo ) { mVersionInfo = versionInfo; }
|
||||
|
||||
private:
|
||||
Flags mFlags;
|
||||
QgsStackTrace *mStackTrace;
|
||||
QStringList mVersionInfo;
|
||||
};
|
||||
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS( QgsCrashReport::Flags )
|
||||
|
||||
#endif // QGSCRASHREPORT_H
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user