Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SDK
KDiff3
Commits
26129834
Commit
26129834
authored
Mar 04, 2017
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Scrat pointless change in seperator.
This is defined and used sololy by our code. Not KDE/QT.
parent
81e82167
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
src/kreplacements/kreplacements.cpp
src/kreplacements/kreplacements.cpp
+1
-1
src/kreplacements/kreplacements.h
src/kreplacements/kreplacements.h
+1
-1
src/main.cpp
src/main.cpp
+2
-5
No files found.
src/kreplacements/kreplacements.cpp
View file @
26129834
...
...
@@ -1062,7 +1062,7 @@ KApplication::KApplication()
}
m_config
.
readConfigFile
(
configFileName
);
QStringList
ignorableCmdLineOptionsList
=
m_config
.
readEntry
(
"IgnorableCmdLineOptions"
,
QStringList
(
"-u;-query;-html;-abort"
),
'
|
'
);
QStringList
ignorableCmdLineOptionsList
=
m_config
.
readEntry
(
"IgnorableCmdLineOptions"
,
QStringList
(
"-u;-query;-html;-abort"
),
'
,
'
);
QString
ignorableCmdLineOptions
;
if
(
!
ignorableCmdLineOptionsList
.
isEmpty
()
)
ignorableCmdLineOptions
=
ignorableCmdLineOptionsList
.
front
()
+
";"
;
...
...
src/kreplacements/kreplacements.h
View file @
26129834
...
...
@@ -301,7 +301,7 @@ public:
template
<
class
T
>
T
readEntry
(
const
QString
&
s
,
const
T
&
defaultVal
){
return
d
->
readEntry
(
s
,
defaultVal
);
}
QString
readEntry
(
const
QString
&
s
,
const
char
*
defaultVal
){
return
d
->
readEntry
(
s
,
defaultVal
);
}
QStringList
readEntry
(
const
QString
&
s
,
const
QStringList
&
defaultVal
,
char
separator
=
'
|
'
){
return
d
->
readEntry
(
s
,
defaultVal
,
separator
);
}
QStringList
readEntry
(
const
QString
&
s
,
const
QStringList
&
defaultVal
,
char
separator
=
'
,
'
){
return
d
->
readEntry
(
s
,
defaultVal
,
separator
);
}
};
typedef
KConfigGroup
*
KSharedConfigPtr
;
...
...
src/main.cpp
View file @
26129834
...
...
@@ -58,12 +58,9 @@ void initialiseCmdLineArgs( ) {
}
}
}
#ifdef KREPLACEMENTS_H
QStringList
sl
=
ignorableOptionsLine
.
split
(
'|'
);
#else
QStringList
sl
=
ignorableOptionsLine
.
split
(
','
);
#endif
if
(
!
sl
.
isEmpty
()
)
{
QStringList
ignorableOptions
=
sl
.
front
().
split
(
';'
);
for
(
QStringList
::
iterator
i
=
ignorableOptions
.
begin
();
i
!=
ignorableOptions
.
end
();
++
i
)
{
...
...
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