Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Okteta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Okteta
Commits
ef3196f9
Commit
ef3196f9
authored
Jul 23, 2013
by
Alex Richardson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile using c++11
parent
4d83b71a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
27 deletions
+28
-27
CMakeLists.txt
CMakeLists.txt
+4
-0
kasten/controllers/test/primitivedatainformationtest.cpp
kasten/controllers/test/primitivedatainformationtest.cpp
+22
-23
kasten/controllers/view/structures/script/safereference.cpp
kasten/controllers/view/structures/script/safereference.cpp
+1
-1
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
+0
-2
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.h
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.h
+1
-1
No files found.
CMakeLists.txt
View file @
ef3196f9
...
...
@@ -25,6 +25,10 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
KTextWidgets XmlGui KDBusAddons KCrash KArchive ItemModels KJobWidgets Solid KWallet KJS
)
if
(
UNIX
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -std=c++0x"
)
endif
()
# needed for set_package_properties macro
find_package
(
LibAttica REQUIRED NO_MODULE
)
#somehow this is not searched for
find_package
(
KDELibs4 REQUIRED NO_MODULE
)
#needed for KDE4Support
...
...
kasten/controllers/test/primitivedatainformationtest.cpp
View file @
ef3196f9
...
...
@@ -20,7 +20,6 @@
#include <QtTest/QTest>
#include <QtGlobal>
#include <KGlobal>
#include <KLocale>
#include <limits>
#include <bytearraymodel.h>
...
...
@@ -500,52 +499,52 @@ void PrimitiveDataInformationTest::testGetAndSetValue()
QCOMPARE
(
clone
->
value
(),
expected
);
}
template
<
typename
s
,
typename
u
>
template
<
typename
s
ignedType
,
typename
unsignedType
>
void
PrimitiveDataInformationTest
::
addRowsGetAndSetSigned
(
PrimitiveDataTypeEnum
type
,
const
char
*
name
)
{
QString
msg
=
QString
::
fromUtf8
(
name
);
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"-325"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
325
)
<<
AllPrimitiveTypes
(
s
(
-
325
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
325
)
<<
AllPrimitiveTypes
(
s
ignedType
(
-
325
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"0"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
0
)
<<
AllPrimitiveTypes
(
s
(
0
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
0
)
<<
AllPrimitiveTypes
(
s
ignedType
(
0
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"-1"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
1
)
<<
AllPrimitiveTypes
(
s
(
-
1
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
1
)
<<
AllPrimitiveTypes
(
s
ignedType
(
-
1
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"357891"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
357891
)
<<
AllPrimitiveTypes
(
s
(
357891
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
357891
)
<<
AllPrimitiveTypes
(
s
ignedType
(
357891
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"max"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
>::
max
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
s
>::
max
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
ignedType
>::
max
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
signedType
>::
max
()));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"min"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
>::
min
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
s
>::
min
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
ignedType
>::
min
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
signedType
>::
min
()));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"u_max"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
u
>::
max
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
u
>::
max
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
u
nsignedType
>::
max
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
unsignedType
>::
max
()));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"u_min"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
u
>::
min
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
u
>::
min
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
u
nsignedType
>::
min
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
unsignedType
>::
min
()));
}
template
<
typename
s
>
template
<
typename
s
ignedType
>
void
PrimitiveDataInformationTest
::
addRowsGetAndSetUnsigned
(
PrimitiveDataTypeEnum
type
,
const
char
*
name
)
{
QString
msg
=
QString
::
fromUtf8
(
name
);
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"-325"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
325
)
<<
AllPrimitiveTypes
(
s
(
-
325
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
325
)
<<
AllPrimitiveTypes
(
s
ignedType
(
-
325
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"0"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
0
)
<<
AllPrimitiveTypes
(
s
(
0
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
0
)
<<
AllPrimitiveTypes
(
s
ignedType
(
0
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"-1"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
1
)
<<
AllPrimitiveTypes
(
s
(
-
1
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
-
1
)
<<
AllPrimitiveTypes
(
s
ignedType
(
-
1
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"357891"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
357891
)
<<
AllPrimitiveTypes
(
s
(
357891
));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
357891
)
<<
AllPrimitiveTypes
(
s
ignedType
(
357891
));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"max"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
>::
max
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
s
>::
max
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
ignedType
>::
max
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
signedType
>::
max
()));
QTest
::
newRow
(
msg
.
arg
(
QStringLiteral
(
"min"
)).
toUtf8
().
constData
())
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
>::
min
())
<<
AllPrimitiveTypes
(
s
(
std
::
numeric_limits
<
s
>::
min
()));
<<
basic
[
type
]
<<
AllPrimitiveTypes
(
std
::
numeric_limits
<
s
ignedType
>::
min
())
<<
AllPrimitiveTypes
(
s
ignedType
(
std
::
numeric_limits
<
signedType
>::
min
()));
}
void
PrimitiveDataInformationTest
::
testGetAndSetValue_data
()
...
...
kasten/controllers/view/structures/script/safereference.cpp
View file @
ef3196f9
...
...
@@ -25,7 +25,7 @@
#include <KDebug>
#include <cstdio>
SafeReferenceHolder
SafeReferenceHolder
::
instance
=
SafeReferenceHolder
()
;
SafeReferenceHolder
SafeReferenceHolder
::
instance
;
void
SafeReferenceHolder
::
invalidateAll
(
DataInformation
*
data
)
{
...
...
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
View file @
ef3196f9
...
...
@@ -60,8 +60,6 @@ void ByteArrayRawFileSynchronizer::setDocument( ByteArrayDocument* document )
SLOT
(
onModelModified
(
bool
))
);
}
void
ByteArrayRawFileSynchronizer
::
startOffering
(
AbstractDocument
*
document
)
{
Q_UNUSED
(
document
)
}
AbstractLoadJob
*
ByteArrayRawFileSynchronizer
::
startLoad
(
const
QUrl
&
url
)
{
return
new
ByteArrayRawFileLoadJob
(
this
,
url
);
...
...
kasten/core/io/filesystem/bytearrayrawfilesynchronizer.h
View file @
ef3196f9
...
...
@@ -45,7 +45,7 @@ class OKTETAKASTENCORE_EXPORT ByteArrayRawFileSynchronizer : public AbstractMode
ByteArrayRawFileSynchronizer
();
public:
// AbstractModelSynchronizer API
virtual
void
startOffering
(
AbstractDocument
*
document
)
Q_DECL_
OVERRID
E
;
virtual
void
startOffering
(
AbstractDocument
*
document
)
Q_DECL_
EQ_DELET
E
;
virtual
AbstractLoadJob
*
startLoad
(
const
QUrl
&
url
)
Q_DECL_OVERRIDE
;
virtual
AbstractSyncToRemoteJob
*
startSyncToRemote
()
Q_DECL_OVERRIDE
;
virtual
AbstractSyncFromRemoteJob
*
startSyncFromRemote
()
Q_DECL_OVERRIDE
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment