+ fix major flaw in Spreadsheet module: do not include precompiled header in other header files
+ fix linking errors in drawing module
This commit is contained in:
parent
1d05f9c66e
commit
da83100728
|
@ -28,13 +28,15 @@
|
|||
|
||||
// Exporting of App classes
|
||||
#ifdef FC_OS_WIN32
|
||||
# define DrawingExport __declspec(dllexport)
|
||||
# define PartExport __declspec(dllimport)
|
||||
# define MeshExport __declspec(dllimport)
|
||||
# define DrawingExport __declspec(dllexport)
|
||||
# define PartExport __declspec(dllimport)
|
||||
# define MeshExport __declspec(dllimport)
|
||||
# define SpreadsheetExport __declspec(dllimport)
|
||||
#else // for Linux
|
||||
# define DrawingExport
|
||||
# define PartExport
|
||||
# define MeshExport
|
||||
# define PartExport
|
||||
# define MeshExport
|
||||
# define SpreadsheetExport
|
||||
#endif
|
||||
|
||||
#ifdef _PreComp_
|
||||
|
|
|
@ -32,10 +32,12 @@
|
|||
# define DrawingExport __declspec(dllimport)
|
||||
# define PartExport __declspec(dllimport)
|
||||
# define DrawingGuiExport __declspec(dllexport)
|
||||
# define SpreadsheetExport __declspec(dllimport)
|
||||
#else // for Linux
|
||||
# define DrawingExport
|
||||
# define PartExport
|
||||
# define DrawingGuiExport
|
||||
# define SpreadsheetExport
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
|
|
@ -30,10 +30,8 @@
|
|||
// Importing of App classes
|
||||
#ifdef FC_OS_WIN32
|
||||
# define SpreadsheetExport __declspec(dllexport)
|
||||
# define SpreadsheetGuiExport __declspec(dllexport)
|
||||
#else // for Linux
|
||||
# define SpreadsheetExport
|
||||
# define SpreadsheetGuiExport
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <set>
|
||||
#include <memory>
|
||||
#include <Base/BaseClass.h>
|
||||
#include "PreCompiled.h"
|
||||
|
||||
namespace Spreadsheet {
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
// Importing of App classes
|
||||
#ifdef FC_OS_WIN32
|
||||
# define SpreadsheetExport __declspec(dllimport)
|
||||
# define SpreadsheetExport __declspec(dllimport)
|
||||
# define SpreadsheetGuiExport __declspec(dllexport)
|
||||
#else // for Linux
|
||||
# define SpreadsheetExport
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#include "PropertiesDialog.h"
|
||||
#include <Base/Tools.h>
|
||||
#include <Mod/Spreadsheet/App/SpreadsheetExpression.h>
|
||||
|
@ -175,7 +177,7 @@ void PropertiesDialog::styleChanged()
|
|||
|
||||
void PropertiesDialog::displayUnitChanged(const QString & text)
|
||||
{
|
||||
if (text == "") {
|
||||
if (text.isEmpty()) {
|
||||
displayUnit = DisplayUnit();
|
||||
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
|
||||
return;
|
||||
|
@ -202,7 +204,7 @@ void PropertiesDialog::aliasChanged(const QString & text)
|
|||
{
|
||||
QPalette palette = ui->alias->palette();
|
||||
|
||||
if (text.indexOf(QRegExp("^[A-Za-z][_A-Za-z0-9]*$")) >= 0) {
|
||||
if (text.indexOf(QRegExp(QString::fromLatin1("^[A-Za-z][_A-Za-z0-9]*$"))) >= 0) {
|
||||
try {
|
||||
CellAddress address(text.toUtf8().constData());
|
||||
|
||||
|
@ -217,7 +219,7 @@ void PropertiesDialog::aliasChanged(const QString & text)
|
|||
}
|
||||
}
|
||||
else {
|
||||
if (text == "") {
|
||||
if (text.isEmpty()) {
|
||||
aliasOk = true;
|
||||
palette.setColor(QPalette::Text, Qt::black);
|
||||
}
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#define PROPERTIESDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "PreCompiled.h"
|
||||
#include <Mod/Spreadsheet/App/Sheet.h>
|
||||
|
||||
namespace Ui {
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include <QHeaderView>
|
||||
#include <QKeyEvent>
|
||||
#include <boost/signals/connection.hpp>
|
||||
#include "PreCompiled.h"
|
||||
#include <Mod/Spreadsheet/App/Sheet.h>
|
||||
#include <Mod/Spreadsheet/App/Utils.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user