OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3752 CAF code changes to build on both Qt4 and Qt5

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-26 09:53:12 +01:00
parent 398a59d0a6
commit cc7269c717
17 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fwk/AppFwk/CommonCode/cafLog.cpp
View File

@ -95,10 +95,10 @@ void Log::infoMultiLine(const QString& line1, const QString& line2Etc)
if (generateTrace) if (generateTrace)
{ {
cvf::Trace::show("INF: %s", (const char*)line1.toAscii()); cvf::Trace::show("INF: %s", (const char*)line1.toLatin1());
if (!line2Etc.isEmpty()) if (!line2Etc.isEmpty())
{ {
cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toAscii()); cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toLatin1());
} }
} }
} }
@ -127,10 +127,10 @@ void Log::warningMultiLine(const QString& line1, const QString& line2Etc)
if (generateTrace) if (generateTrace)
{ {
cvf::Trace::show("WRN: %s", (const char*)line1.toAscii()); cvf::Trace::show("WRN: %s", (const char*)line1.toLatin1());
if (!line2Etc.isEmpty()) if (!line2Etc.isEmpty())
{ {
cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toAscii()); cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toLatin1());
} }
} }
} }
@ -186,10 +186,10 @@ bool Log::errorMultiLine(const QString& line1, const QString& line2Etc)
if (generateTrace) if (generateTrace)
{ {
cvf::Trace::show("\nERR: %s", (const char*)line1.toAscii()); cvf::Trace::show("\nERR: %s", (const char*)line1.toLatin1());
if (!line2Etc.isEmpty()) if (!line2Etc.isEmpty())
{ {
cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toAscii()); cvf::Trace::show((const char*)Utils::indentString(5, line2Etc).toLatin1());
} }
} }

8
Fwk/AppFwk/CommonCode/cafMessagePanel.cpp
View File

@ -37,10 +37,10 @@
#include "cafMessagePanel.h" #include "cafMessagePanel.h"
#include <QtGui/QWidget> #include <QWidget>
#include <QtGui/QDockWidget> #include <QDockWidget>
#include <QtGui/QTextEdit> #include <QTextEdit>
#include <QtGui/QBoxLayout> #include <QBoxLayout>
namespace caf { namespace caf {

2
Fwk/AppFwk/CommonCode/cafMessagePanel.h
View File

@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtGui/QWidget> #include <QWidget>
class QDockWidget; class QDockWidget;
class QTextEdit; class QTextEdit;

2
Fwk/AppFwk/CommonCode/cafUtils.cpp
View File

@ -40,7 +40,7 @@
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtGui/QLineEdit> #include <QLineEdit>
#include <QtOpenGL/QGLContext> #include <QtOpenGL/QGLContext>

1
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafFilePath.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <QMetaType> #include <QMetaType>
#include <QString>
class QTextStream; class QTextStream;

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp
View File

@ -129,7 +129,7 @@ TEST(PdmReferenceHelperTest, ReferenceFrommRootToField)
QString refString = caf::PdmReferenceHelper::referenceFromRootToField(ihd1, &s3->m_dir); QString refString = caf::PdmReferenceHelper::referenceFromRootToField(ihd1, &s3->m_dir);
QString expectedString = "m_dir m_simpleObjPtrField 2"; QString expectedString = "m_dir m_simpleObjPtrField 2";
EXPECT_STREQ(expectedString.toAscii(), refString.toAscii()); EXPECT_STREQ(expectedString.toLatin1(), refString.toLatin1());
delete ihd1; delete ihd1;
} }
@ -160,7 +160,7 @@ TEST(PdmReferenceHelperTest, ReferenceFrommRootToObject)
QString refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3); QString refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3);
QString expectedString = "m_simpleObjPtrField 2"; QString expectedString = "m_simpleObjPtrField 2";
EXPECT_STREQ(expectedString.toAscii(), refString.toAscii()); EXPECT_STREQ(expectedString.toLatin1(), refString.toLatin1());
ReferenceSimpleObj* ihd2 = new ReferenceSimpleObj; ReferenceSimpleObj* ihd2 = new ReferenceSimpleObj;
SimpleObj* s4 = new SimpleObj; SimpleObj* s4 = new SimpleObj;

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp
View File

@ -266,7 +266,7 @@ TEST(BaseTest, PdmReferenceHelper)
{ {
QString refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3); QString refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3);
QString expectedString = ihd1->m_childArrayField.keyword() + " 3"; QString expectedString = ihd1->m_childArrayField.keyword() + " 3";
EXPECT_STREQ(refString.toAscii(), expectedString.toAscii()); EXPECT_STREQ(refString.toLatin1(), expectedString.toLatin1());
caf::PdmObjectHandle* fromRef = caf::PdmReferenceHelper::objectFromReference(ihd1, refString); caf::PdmObjectHandle* fromRef = caf::PdmReferenceHelper::objectFromReference(ihd1, refString);
EXPECT_TRUE(fromRef == s3); EXPECT_TRUE(fromRef == s3);

2
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp
View File

@ -968,7 +968,7 @@ TEST(BaseTest, PdmReferenceHelper)
refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3); refString = caf::PdmReferenceHelper::referenceFromRootToObject(ihd1, s3);
QString expectedString = ihd1->m_simpleObjectsField.keyword() + " 3"; QString expectedString = ihd1->m_simpleObjectsField.keyword() + " 3";
EXPECT_STREQ(refString.toAscii(), expectedString.toAscii()); EXPECT_STREQ(refString.toLatin1(), expectedString.toLatin1());
caf::PdmObjectHandle* fromRef = caf::PdmReferenceHelper::objectFromReference(ihd1, refString); caf::PdmObjectHandle* fromRef = caf::PdmReferenceHelper::objectFromReference(ihd1, refString);
EXPECT_TRUE(fromRef == s3); EXPECT_TRUE(fromRef == s3);

2
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QItemSelection> #include <QItemSelection>

2
Fwk/AppFwk/cafTests/cafTestApplication/WidgetLayoutTest.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <QtGui/QWidget> #include <QWidget>
class QGridLayout; class QGridLayout;

2
Fwk/AppFwk/cafTests/cafTestCvfApplication/WidgetLayoutTest.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <QtGui/QWidget> #include <QWidget>
class QGridLayout; class QGridLayout;

8
Fwk/AppFwk/cafUserInterface/cafAboutDialog.cpp
View File

@ -38,10 +38,10 @@
#include "cafAboutDialog.h" #include "cafAboutDialog.h"
#include "cafAssert.h" #include "cafAssert.h"
#include <QtCore/QVariant> #include <QVariant>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QLabel> #include <QLabel>
#include <QtGui/QPushButton> #include <QPushButton>
#include <QtOpenGL/QGLFormat> #include <QtOpenGL/QGLFormat>
namespace caf { namespace caf {

2
Fwk/AppFwk/cafUserInterface/cafAboutDialog.h
View File

@ -37,7 +37,7 @@
#pragma once #pragma once
#include <QtGui/QDialog> #include <QDialog>
class QGridLayout; class QGridLayout;

4
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
View File

@ -200,8 +200,8 @@ void caf::UiListViewModelPdm::setPdmData(PdmObjectCollection* objectGroup, const
} }
computeColumnCount(); computeColumnCount();
beginResetModel();
reset(); endResetModel();
} }

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -231,7 +231,11 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
} }
else if (editorAttrib.resizePolicy == PdmUiTableViewEditorAttribute::RESIZE_TO_FILL_CONTAINER) else if (editorAttrib.resizePolicy == PdmUiTableViewEditorAttribute::RESIZE_TO_FILL_CONTAINER)
{ {
#if QT_VERSION >= 0x050000
m_tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
#else
m_tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch); m_tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
#endif
} }
} }

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
View File

@ -195,7 +195,7 @@ QVariant PdmUiTableViewQModel::data(const QModelIndex &index, int role /*= Qt::D
} }
else else
{ {
return Qt::lightGray; return QColor(Qt::lightGray);
} }
} }
else if (textColor.isValid()) else if (textColor.isValid())

4
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeSelectionQModelTest.cpp
View File

@ -85,13 +85,13 @@ TEST(PdmUiTreeSelectionQModelTest, ParentBehaviour)
{ {
QModelIndex firstChildIndex = myModel.index(0, 0, parentIndex); QModelIndex firstChildIndex = myModel.index(0, 0, parentIndex);
EXPECT_STREQ("Second_a", myModel.data(firstChildIndex).toString().toAscii()); EXPECT_STREQ("Second_a", myModel.data(firstChildIndex).toString().toLatin1());
EXPECT_TRUE(parentIndex == myModel.parent(firstChildIndex)); EXPECT_TRUE(parentIndex == myModel.parent(firstChildIndex));
} }
{ {
QModelIndex secondChildIndex = myModel.index(1, 0, parentIndex); QModelIndex secondChildIndex = myModel.index(1, 0, parentIndex);
EXPECT_STREQ("Second_b", myModel.data(secondChildIndex).toString().toAscii()); EXPECT_STREQ("Second_b", myModel.data(secondChildIndex).toString().toLatin1());
EXPECT_TRUE(parentIndex == myModel.parent(secondChildIndex)); EXPECT_TRUE(parentIndex == myModel.parent(secondChildIndex));
} }
} }