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
kdevelop
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
Thomas Schöps
kdevelop
Commits
bdbc4d16
Commit
bdbc4d16
authored
Aug 26, 2019
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use QLatin1String overload for QString::contains
GIT_SILENT
parent
fcb90dcd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
kdevplatform/outputview/outputfilteringstrategies.cpp
kdevplatform/outputview/outputfilteringstrategies.cpp
+1
-1
kdevplatform/project/helper.cpp
kdevplatform/project/helper.cpp
+1
-1
plugins/clang/clangsettings/clangsettingsmanager.cpp
plugins/clang/clangsettings/clangsettingsmanager.cpp
+1
-1
plugins/externalscript/externalscriptplugin.cpp
plugins/externalscript/externalscriptplugin.cpp
+7
-7
plugins/ghprovider/ghresource.cpp
plugins/ghprovider/ghresource.cpp
+1
-1
plugins/git/gitplugin.cpp
plugins/git/gitplugin.cpp
+3
-3
No files found.
kdevplatform/outputview/outputfilteringstrategies.cpp
View file @
bdbc4d16
...
...
@@ -224,7 +224,7 @@ FilteredItem CompilerFilterStrategy::actionInLine(const QString& line)
// They are later searched by pathForFile to find source files corresponding to
// compiler errors.
// Note: CMake objectfile has the format: "/path/to/four/CMakeFiles/file.o"
if
(
curActFilter
.
fileGroup
!=
-
1
&&
curActFilter
.
tool
==
QLatin1String
(
"cmake"
)
&&
line
.
contains
(
Q
StringLiteral
(
"Building"
)))
{
if
(
curActFilter
.
fileGroup
!=
-
1
&&
curActFilter
.
tool
==
QLatin1String
(
"cmake"
)
&&
line
.
contains
(
Q
Latin1String
(
"Building"
)))
{
const
auto
objectFile
=
match
.
captured
(
curActFilter
.
fileGroup
);
const
auto
dir
=
objectFile
.
section
(
QStringLiteral
(
"CMakeFiles/"
),
0
,
0
);
d
->
putDirAtEnd
(
Path
(
d
->
m_buildDir
,
dir
));
...
...
kdevplatform/project/helper.cpp
View file @
bdbc4d16
...
...
@@ -221,7 +221,7 @@ bool KDevelop::copyPath(const KDevelop::IProject* project, const KDevelop::Path&
Path
KDevelop
::
proposedBuildFolder
(
const
Path
&
sourceFolder
)
{
Path
proposedBuildFolder
;
if
(
sourceFolder
.
path
().
contains
(
Q
StringLiteral
(
"/src/"
)))
{
if
(
sourceFolder
.
path
().
contains
(
Q
Latin1String
(
"/src/"
)))
{
const
QString
srcBuildPath
=
sourceFolder
.
path
().
replace
(
QStringLiteral
(
"/src/"
),
QStringLiteral
(
"/build/"
));
Q_ASSERT
(
!
srcBuildPath
.
isEmpty
());
if
(
QDir
(
srcBuildPath
).
exists
())
{
...
...
plugins/clang/clangsettings/clangsettingsmanager.cpp
View file @
bdbc4d16
...
...
@@ -107,7 +107,7 @@ ClangSettingsManager::ClangSettingsManager()
bool
ParserSettings
::
isCpp
()
const
{
return
parserOptions
.
contains
(
Q
StringLiteral
(
"-std=c++"
))
||
parserOptions
.
contains
(
QStringLiteral
(
"-std=gnu++"
));
return
parserOptions
.
contains
(
Q
Latin1String
(
"-std=c++"
))
||
parserOptions
.
contains
(
QLatin1String
(
"-std=gnu++"
));
}
QVector
<
QByteArray
>
ParserSettings
::
toClangAPI
()
const
...
...
plugins/externalscript/externalscriptplugin.cpp
View file @
bdbc4d16
...
...
@@ -227,7 +227,7 @@ KDevelop::ContextMenuExtension ExternalScriptPlugin::contextMenuExtension(KDevel
if
(
context
->
type
()
!=
KDevelop
::
Context
::
EditorContext
)
{
// filter scripts that depend on an opened document
// if the context menu was not requested inside the editor
if
(
item
->
performParameterReplacement
()
&&
item
->
command
().
contains
(
Q
StringLiteral
(
"%s"
)))
{
if
(
item
->
performParameterReplacement
()
&&
item
->
command
().
contains
(
Q
Latin1String
(
"%s"
)))
{
continue
;
}
else
if
(
item
->
inputMode
()
==
ExternalScriptItem
::
InputSelectionOrNone
)
{
continue
;
...
...
@@ -237,12 +237,12 @@ KDevelop::ContextMenuExtension ExternalScriptPlugin::contextMenuExtension(KDevel
if
(
folderCount
==
m_urls
.
count
())
{
// when only folders filter items that don't have %d parameter (or another parameter)
if
(
item
->
performParameterReplacement
()
&&
(
!
item
->
command
().
contains
(
Q
StringLiteral
(
"%d"
))
||
item
->
command
().
contains
(
Q
StringLiteral
(
"%s"
))
||
item
->
command
().
contains
(
Q
StringLiteral
(
"%u"
))
||
item
->
command
().
contains
(
Q
StringLiteral
(
"%f"
))
||
item
->
command
().
contains
(
Q
StringLiteral
(
"%b"
))
||
item
->
command
().
contains
(
Q
StringLiteral
(
"%n"
))
(
!
item
->
command
().
contains
(
Q
Latin1String
(
"%d"
))
||
item
->
command
().
contains
(
Q
Latin1String
(
"%s"
))
||
item
->
command
().
contains
(
Q
Latin1String
(
"%u"
))
||
item
->
command
().
contains
(
Q
Latin1String
(
"%f"
))
||
item
->
command
().
contains
(
Q
Latin1String
(
"%b"
))
||
item
->
command
().
contains
(
Q
Latin1String
(
"%n"
))
)
)
{
continue
;
...
...
plugins/ghprovider/ghresource.cpp
View file @
bdbc4d16
...
...
@@ -170,7 +170,7 @@ void Resource::slotAuthenticate(KJob *job)
const
auto
metaData
=
qobject_cast
<
KIO
::
StoredTransferJob
*>
(
job
)
->
metaData
();
if
(
metaData
[
QStringLiteral
(
"responsecode"
)]
==
QLatin1String
(
"401"
))
{
const
auto
&
header
=
metaData
[
QStringLiteral
(
"HTTP-Headers"
)];
if
(
header
.
contains
(
Q
StringLiteral
(
"X-GitHub-OTP: required;"
),
Qt
::
CaseInsensitive
))
{
if
(
header
.
contains
(
Q
Latin1String
(
"X-GitHub-OTP: required;"
),
Qt
::
CaseInsensitive
))
{
emit
twoFactorAuthRequested
(
qobject_cast
<
KIO
::
StoredTransferJob
*>
(
job
)
->
outgoingMetaData
()[
QStringLiteral
(
"customHTTPHeader"
)]);
return
;
}
...
...
plugins/git/gitplugin.cpp
View file @
bdbc4d16
...
...
@@ -801,11 +801,11 @@ void GitPlugin::parseGitBranchOutput(DVcsJob* job)
for
(
const
auto
&
branch
:
branchListDirty
)
{
// Skip pointers to another branches (one example of this is "origin/HEAD -> origin/master");
// "git rev-list" chokes on these entries and we do not need duplicate branches altogether.
if
(
branch
.
contains
(
Q
StringLiteral
(
"->"
)))
if
(
branch
.
contains
(
Q
Latin1String
(
"->"
)))
continue
;
// Skip entries such as '(no branch)'
if
(
branch
.
contains
(
Q
StringLiteral
(
"(no branch)"
)))
if
(
branch
.
contains
(
Q
Latin1String
(
"(no branch)"
)))
continue
;
QStringRef
name
=
branch
;
...
...
@@ -886,7 +886,7 @@ QVector<DVcsEvent> GitPlugin::allCommits(const QString& repo)
item
.
setParents
(
parents
);
//Avoid Merge string
while
(
!
commits
[
i
].
contains
(
Q
StringLiteral
(
"Author: "
)))
while
(
!
commits
[
i
].
contains
(
Q
Latin1String
(
"Author: "
)))
++
i
;
item
.
setAuthor
(
commits
[
i
].
section
(
QStringLiteral
(
"Author: "
),
1
).
trimmed
());
...
...
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