Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Friedrich W. H. Kossebau
kdevelop
Commits
1123dac1
Commit
1123dac1
authored
Dec 29, 2018
by
Yuri Chornoivan
Browse files
Fix minor typos
parent
a782dfc1
Changes
89
Hide whitespace changes
Inline
Side-by-side
app/main.cpp
View file @
1123dac1
...
...
@@ -224,20 +224,20 @@ static int openFilesInRunningInstance(const QVector<UrlInfo>& files, qint64 pid)
QDBusInterface
iface
(
service
,
QStringLiteral
(
"/org/kdevelop/DocumentController"
),
QStringLiteral
(
"org.kdevelop.DocumentController"
));
QStringList
urls
;
bool
errors_occured
=
false
;
bool
errors_occur
r
ed
=
false
;
for
(
const
UrlInfo
&
file
:
files
)
{
QDBusReply
<
bool
>
result
=
iface
.
call
(
QStringLiteral
(
"openDocumentSimple"
),
file
.
url
.
toString
(),
file
.
cursor
.
line
(),
file
.
cursor
.
column
());
if
(
!
result
.
value
()
)
{
QTextStream
err
(
stderr
);
err
<<
i18n
(
"Could not open file '%1'."
,
file
.
url
.
toDisplayString
(
QUrl
::
PreferLocalFile
))
<<
"
\n
"
;
errors_occured
=
true
;
errors_occur
r
ed
=
true
;
}
}
// make the window visible
QDBusMessage
makeVisible
=
QDBusMessage
::
createMethodCall
(
service
,
QStringLiteral
(
"/kdevelop/MainWindow"
),
QStringLiteral
(
"org.kdevelop.MainWindow"
),
QStringLiteral
(
"ensureVisible"
)
);
QDBusConnection
::
sessionBus
().
asyncCall
(
makeVisible
);
return
errors_occured
;
return
errors_occur
r
ed
;
}
/// Performs a DBus call to open the given @p files in the running kdev instance identified by @p pid
...
...
cmake/modules/FindSubversionLibrary.cmake
View file @
1123dac1
...
...
@@ -125,10 +125,10 @@ IF (NOT WIN32)
ENDFOREACH
(
_ARG
)
ENDIF
(
NOT APU_CONFIG
)
ELSE
(
NOT WIN32
)
#search libaries for Windows
#search lib
r
aries for Windows
#this needs more work
# search for path
e
s
# search for paths
MACRO
(
FIND_SUB_INC targetvar include pathadd
)
IF
(
SUBVERSION_INSTALL_PATH
)
...
...
kdevplatform/debugger/interfaces/iframestackmodel.h
View file @
1123dac1
...
...
@@ -76,7 +76,7 @@ public:
virtual
void
fetchMoreFrames
()
=
0
;
Q_SIGNALS:
/* FIXME: It might make for a more con
s
cise interface if those
/* FIXME: It might make for a more concise interface if those
two were removed, and the clients react to thread_or_frame_changed
event and compare the current thread/frame in the framestack model
with the one they are displaying. */
...
...
kdevplatform/interfaces/idocumentcontroller.h
View file @
1123dac1
...
...
@@ -76,7 +76,7 @@ public:
virtual
QList
<
KDevelop
::
IDocument
*>
openDocuments
()
const
=
0
;
/**
* Returns the curently active or focused document.
* Returns the cur
r
ently active or focused document.
*
* @return The active document.
*/
...
...
kdevplatform/language/backgroundparser/backgroundparser.cpp
View file @
1123dac1
...
...
@@ -853,7 +853,7 @@ DocumentChangeTracker* BackgroundParser::trackerForUrl(const KDevelop::IndexedSt
return
nullptr
;
}
if
(
!
isValidURL
(
url
))
{
qCWarning
(
LANGUAGE
)
<<
"Tracker requested for invali
l
d URL:"
<<
url
.
toUrl
();
qCWarning
(
LANGUAGE
)
<<
"Tracker requested for invalid URL:"
<<
url
.
toUrl
();
}
Q_ASSERT
(
isValidURL
(
url
));
...
...
kdevplatform/language/backgroundparser/parsejob.h
View file @
1123dac1
...
...
@@ -163,7 +163,7 @@ public:
/// Allows statically specifying an amount of features required for an url.
/// These features will automatically be or'ed with the minimumFeatures() returned
/// by any ParseJob with the given url.
/// Since this causes some additional compl
i
xity in update-checking, minimum features should not
/// Since this causes some additional compl
e
xity in update-checking, minimum features should not
/// be set permanently.
static
void
setStaticMinimumFeatures
(
const
IndexedString
&
url
,
TopDUContext
::
Features
features
);
...
...
kdevplatform/language/classmodel/allclassesfolder.cpp
View file @
1123dac1
...
...
@@ -97,7 +97,7 @@ void FilteredAllClassesFolder::updateFilterString(const QString& a_newFilterStri
if
(
isPopulated
())
{
#if 1 // Choose speed over correctness.
// Close the node and re-open it should be quicker than reload each document
// and remove ind
e
vidual nodes (at the cost of loosing the current selection).
// and remove ind
i
vidual nodes (at the cost of loosing the current selection).
performPopulateNode
(
true
);
#else
bool
hadChanges
=
false
;
...
...
kdevplatform/language/classmodel/classmodel.h
View file @
1123dac1
...
...
@@ -71,7 +71,7 @@ public:
};
/**
* @short A model that holds a conv
i
nient representation of the defined class in the project
* @short A model that holds a conv
e
nient representation of the defined class in the project
*
* This model doesn't have much code in it, it mostly acts as a glue between the different
* nodes and the tree view.
...
...
kdevplatform/language/classmodel/projectfolder.cpp
View file @
1123dac1
...
...
@@ -62,7 +62,7 @@ void FilteredProjectFolder::updateFilterString(const QString& a_newFilterString)
if
(
isPopulated
())
{
#if 1 // Choose speed over correctness.
// Close the node and re-open it should be quicker than reload each document
// and remove ind
e
vidual nodes (at the cost of loosing the current selection).
// and remove ind
i
vidual nodes (at the cost of loosing the current selection).
performPopulateNode
(
true
);
#else
bool
hadChanges
=
false
;
...
...
kdevplatform/language/codecompletion/codecompletionmodel.h
View file @
1123dac1
...
...
@@ -87,7 +87,7 @@ public:
KDevelop
::
TopDUContextPointer
currentTopContext
()
const
;
void
setCurrentTopContext
(
const
KDevelop
::
TopDUContextPointer
&
topContext
);
///Whether the completion should be fully detailed. If false, it should be simplifed, so no argument-hints,
///Whether the completion should be fully detailed. If false, it should be simplif
i
ed, so no argument-hints,
///no expanding information, no type-information, etc.
bool
fullCompletion
()
const
;
...
...
@@ -98,7 +98,7 @@ public:
void
clear
();
///Returns the tree-element that belo
g
ns to the index, or zero
///Returns the tree-element that belon
g
s to the index, or zero
QExplicitlySharedDataPointer
<
CompletionTreeElement
>
itemForIndex
(
const
QModelIndex
&
index
)
const
;
Q_SIGNALS:
...
...
kdevplatform/language/codegen/basicrefactoring.cpp
View file @
1123dac1
...
...
@@ -236,7 +236,7 @@ void BasicRefactoring::startInteractiveRename(const KDevelop::IndexedDeclaration
QFileInfo
info
(
declaration
->
topContext
()
->
url
().
str
());
if
(
!
info
.
isWritable
())
{
KMessageBox
::
error
(
ICore
::
self
()
->
uiController
()
->
activeMainWindow
(),
i18n
(
"Declaration is located in non-writ
e
able file %1."
,
i18n
(
"Declaration is located in non-writable file %1."
,
declaration
->
topContext
()
->
url
().
str
()));
return
;
}
...
...
kdevplatform/language/codegen/utilities.cpp
View file @
1123dac1
...
...
@@ -42,7 +42,7 @@ IdentifierValidator::~IdentifierValidator()
QValidator
::
State
IdentifierValidator
::
validate
(
QString
&
input
,
int
&
)
const
{
//I can't figure out why it wouln't compile when I tried to use Identifier identifier();
//I can't figure out why it woul
d
n't compile when I tried to use Identifier identifier();
Identifier
identifier
=
Identifier
(
IndexedString
(
input
));
if
(
identifier
.
isUnique
())
...
...
kdevplatform/language/duchain/builders/abstractcontextbuilder.h
View file @
1123dac1
...
...
@@ -112,6 +112,7 @@ public:
protected:
/**
* Support another builder by tracking the current context.
* @param node the given node.
* @param context the context to use. Must be set when the given node has no context. When it has one attached, this parameter is not needed.
*/
virtual
void
supportBuild
(
T
*
node
,
DUContext
*
context
=
nullptr
)
...
...
kdevplatform/language/duchain/declaration.h
View file @
1123dac1
...
...
@@ -194,7 +194,7 @@ public:
/**
* Changes whether this declaration is explicitly typed.
*
* Explicitly typed declaration has the type writen as part of the
* Explicitly typed declaration has the type writ
t
en as part of the
* declaration. The opposite, implicitly typed declaration, has the type
* deduced by the compiler.
*
...
...
@@ -327,7 +327,7 @@ public:
/**
* Return an indexed form of this declaration's type.
* Should be preferred, this is the fastest way, and the correct way for doing equality-compar
s
ion.
* Should be preferred, this is the fastest way, and the correct way for doing equality-compari
s
on.
*
* \returns the declaration's type.
*/
...
...
@@ -439,7 +439,7 @@ public:
* \note The ranges are in the documents local revision,
* use \c DUChainUtils::transformFromRevision or \c usesCurrentRevision()
*
* \note The uses are unique, no 2 uses are retur
e
nd that have the same range within the same file.
* \note The uses are unique, no 2 uses are return
e
d that have the same range within the same file.
*
* \note This is a non-trivial operation and hence expensive.
*/
...
...
@@ -458,7 +458,7 @@ public:
* The key of the returned map is an url of a file. The value
* is a list with all use-ranges of this declaration in that file.
*
* \note The uses are unique, no 2 uses are retur
e
nd that have the same range within the same file.
* \note The uses are unique, no 2 uses are return
e
d that have the same range within the same file.
*
* \warning This must be called only from within the foreground, or with the foreground lock locked.
*
...
...
kdevplatform/language/duchain/duchain.cpp
View file @
1123dac1
...
...
@@ -547,7 +547,7 @@ public:
KDevVarLengthArray
<
uint
>
topContextIndices
;
{
//First store all the possible in
t
ices into the KDevVarLengthArray, so we can unlock the mutex before processing them.
//First store all the possible in
d
ices into the KDevVarLengthArray, so we can unlock the mutex before processing them.
QMutexLocker
lock
(
m_environmentListInfo
.
mutex
());
//Lock the mutex to make sure the item isn't changed while it's being iterated
const
EnvironmentInformationListItem
*
item
=
m_environmentListInfo
.
itemFromIndex
(
listIndex
);
...
...
@@ -563,7 +563,7 @@ public:
if
(
p
)
{
ret
<<
p
;
}
else
{
qCDebug
(
LANGUAGE
)
<<
"Failed to load enviro
m
ment-information for"
<<
qCDebug
(
LANGUAGE
)
<<
"Failed to load enviro
n
ment-information for"
<<
TopDUContextDynamicData
::
loadUrl
(
topContextIndex
).
str
();
}
}
...
...
kdevplatform/language/duchain/ducontext.cpp
View file @
1123dac1
...
...
@@ -1291,7 +1291,7 @@ void DUContext::applyUpwardsAliases(SearchItem::PtrList& identifiers, const TopD
//We do this by prepending items to the current identifiers that equal the local scope identifier.
SearchItem
::
Ptr
newItem
(
new
SearchItem
(
d_func
()
->
m_scopeIdentifier
.
identifier
()));
//This will exclude explictly global identifiers
//This will exclude explic
i
tly global identifiers
newItem
->
addToEachNode
(
identifiers
);
if
(
!
newItem
->
next
.
isEmpty
())
{
...
...
@@ -1378,7 +1378,7 @@ DUContext* DUContext::findContextAt(const CursorInRevision& position, bool inclu
{
ENSURE_CAN_READ
// qCDebug(LANGUAGE) << "searchi
g
n" << position << "in:" << scopeIdentifier(true).toString() << range() << includeRightBorder;
// qCDebug(LANGUAGE) << "searchin
g
" << position << "in:" << scopeIdentifier(true).toString() << range() << includeRightBorder;
if
(
!
range
().
contains
(
position
)
&&
(
!
includeRightBorder
||
range
().
end
!=
position
))
{
// qCDebug(LANGUAGE) << "mismatch";
...
...
kdevplatform/language/duchain/ducontext.h
View file @
1123dac1
...
...
@@ -803,7 +803,7 @@ private:
/**
* Returns the qualified identifier @p id with all aliases (for example namespace imports) applied
*
*
@e
xample: If the namespace 'Foo' is imported, and id is 'Bar',
*
E
xample: If the namespace 'Foo' is imported, and id is 'Bar',
* then the returned list is 'Bar' and 'Foo::Bar'
*/
QVector
<
QualifiedIdentifier
>
fullyApplyAliases
(
const
QualifiedIdentifier
&
id
,
...
...
kdevplatform/language/duchain/ducontextdynamicdata.h
View file @
1123dac1
...
...
@@ -25,7 +25,7 @@
#include
"ducontextdata.h"
namespace
KDevelop
{
///This class contains data that is only runtime-depend
a
nt and does not need to be stored to disk
///This class contains data that is only runtime-depend
e
nt and does not need to be stored to disk
class
DUContextDynamicData
{
private:
...
...
kdevplatform/language/duchain/navigation/useswidget.h
View file @
1123dac1
...
...
@@ -39,7 +39,7 @@ namespace KDevelop {
class
CodeRepresentation
;
class
IndexedDeclaration
;
///A widget representing one use of a Declaration in a spe
i
cific context
///A widget representing one use of a Declaration in a specific context
class
KDEVPLATFORMLANGUAGE_EXPORT
OneUseWidget
:
public
QWidget
{
...
...
kdevplatform/language/duchain/persistentsymboltable.h
View file @
1123dac1
...
...
@@ -139,7 +139,7 @@ public:
using
FilteredDeclarationIterator
=
ConvenientEmbeddedSetTreeFilterIterator
<
IndexedDeclaration
,
IndexedDeclarationHandler
,
IndexedTopDUContext
,
CachedIndexedRecursiveImports
,
DeclarationTopContextExtractor
>
;
///Retrieves an iterator to all declarations of the given id, filtered by the visi
lib
ity given through @a visibility
///Retrieves an iterator to all declarations of the given id, filtered by the visi
bil
ity given through @a visibility
///This is very efficient since it uses a cache
///The returned iterator is valid as long as the duchain read lock is held
FilteredDeclarationIterator
filteredDeclarations
(
const
IndexedQualifiedIdentifier
&
id
,
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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