Commit 301a0f23 authored by Andreas Pakulat's avatar Andreas Pakulat

Change includes from <> to "" when the included file is in the same library....

Change includes from <> to "" when the included file is in the same library. Also use relative paths where needed.

Makes it possible to use #include <project/projectmodel.h> and only add KDEVPLATFORM_INCLUDE_DIR to the include_directories. So its easier to extend a given plugin to use another of the platform libs.

CCMAIL:kdevelop-devel@kdevelop.org
parent 1fb858f2
......@@ -19,7 +19,7 @@
#ifndef KDEVDOCUMENTCURSOR_H
#define KDEVDOCUMENTCURSOR_H
#include <editorexport.h>
#include "editorexport.h"
#include <kurl.h>
......
......@@ -22,7 +22,7 @@
#include <ktexteditor/cursor.h>
#include <ktexteditor/cursorfeedback.h>
#include <documentcursor.h>
#include "documentcursor.h"
namespace KDevelop
{
......
......@@ -19,7 +19,7 @@
#ifndef KDEVDOCUMENTRANGE_H
#define KDEVDOCUMENTRANGE_H
#include <editorexport.h>
#include "editorexport.h"
#include <kurl.h>
......
......@@ -24,8 +24,10 @@
#include <ktexteditor/range.h>
#include <ktexteditor/rangefeedback.h>
#include <documentcursor.h>
#include <documentrange.h>
#include "editorexport.h"
#include "documentcursor.h"
#include "documentrange.h"
namespace KDevelop
{
......@@ -61,7 +63,7 @@ public:
KTextEditor::SmartRange* smartRange() const;
RangeOwning ownsRange() const;
KUrl url() const;
static KUrl url(const KTextEditor::Range* range);
......
......@@ -25,7 +25,8 @@
#include <ktexteditor/range.h>
#include <ktexteditor/smartrange.h>
#include <documentcursor.h>
#include "editorexport.h"
#include "documentcursor.h"
class QMutex;
......@@ -42,7 +43,7 @@ namespace KDevelop
* Use this to track changes to files, by storing the file-modification time and the editor-revision if applicable(@see KTextEditor::SmartInterface)
*
* All member-functions directly act on the two members, without additional logic.
*
*
* Does not need a d-pointer, is only a container-class.
* */
struct KDEVPLATFORMEDITOR_EXPORT ModificationRevision
......@@ -52,7 +53,7 @@ struct KDEVPLATFORMEDITOR_EXPORT ModificationRevision
bool operator <( const ModificationRevision& rhs ) const;
bool operator==( const ModificationRevision& rhs ) const;
bool operator!=( const ModificationRevision& rhs ) const;
QString toString() const;
......@@ -242,7 +243,7 @@ public:
* Use this to connect to notifications provided by EditorIntegratorStatic.
*/
static QObject* notifier();
private:
static KDevelop::EditorIntegratorStatic *data();
class EditorIntegratorPrivate* const d;
......
......@@ -27,7 +27,7 @@
#include <ktexteditor/range.h>
#include <ktexteditor/rangefeedback.h>
#include <documentcursor.h>
#include "documentcursor.h"
namespace KTextEditor
{
......@@ -52,7 +52,7 @@ public:
Q_SIGNALS:
void documentAboutToBeDeleted(KTextEditor::Document* document);
public Q_SLOTS:
/**
* Removes the text editor \a document from the integrator.
......
......@@ -31,7 +31,7 @@ Boston, MA 02110-1301, USA.
#ifndef CONTEXT_H
#define CONTEXT_H
#include <interfacesexport.h>
#include "interfacesexport.h"
#include <QtCore/QStringList>
......
......@@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA.
#define ICORE_H
#include <QtCore/QObject>
#include <interfacesexport.h>
#include "interfacesexport.h"
namespace KParts
......
......@@ -23,7 +23,7 @@
#include <kurl.h>
#include <kmimetype.h>
#include <interfacesexport.h>
#include "interfacesexport.h"
#include <ktexteditor/cursor.h>
namespace KParts { class Part; }
......
......@@ -24,7 +24,7 @@
#include <kurl.h>
#include <ktexteditor/cursor.h>
#include <interfacesexport.h>
#include "interfacesexport.h"
#include "idocument.h"
......@@ -104,7 +104,7 @@ Q_SIGNALS:
/**This is emitted when the document content changed.*/
void documentContentChanged( KDevelop::IDocument* document );
friend class IDocument;
};
......
......@@ -23,7 +23,7 @@
#include <kurl.h>
#include <interfacesexport.h>
#include "interfacesexport.h"
class QMutex;
class QThread;
......
......@@ -22,7 +22,7 @@
#include <QtCore/QList>
#include <QtCore/QObject>
#include <interfacesexport.h>
#include "interfacesexport.h"
class KUrl;
......
......@@ -29,7 +29,7 @@
#include <QtCore/QPointer>
#include <QtCore/QPair>
#include <QtDesigner/QExtensionManager>
#include <interfacesexport.h>
#include "interfacesexport.h"
class KIconLoader;
class QAction;
......
......@@ -31,8 +31,8 @@ Boston, MA 02110-1301, USA.
#include <kurl.h>
#include <kservice.h>
#include <iplugin.h>
#include <interfacesexport.h>
#include "iplugin.h"
#include "interfacesexport.h"
class QExtensionManager;
class KMenu;
......
......@@ -31,7 +31,7 @@
#include <kurl.h>
#include <interfacesexport.h>
#include "interfacesexport.h"
#include <ksharedconfig.h>
template<typename T> class QList;
......
......@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
#include <QtCore/QObject>
#include <QtCore/QList>
#include <kurl.h>
#include <interfacesexport.h>
#include "interfacesexport.h"
namespace KDevelop
......
......@@ -20,8 +20,8 @@
#ifndef ISTATUS_H
#define ISTATUS_H
#include <interfacesexport.h>
#include <iextension.h>
#include "interfacesexport.h"
#include "iextension.h"
namespace KDevelop {
......@@ -37,7 +37,7 @@ public:
* Return a name for the status object
*/
virtual QString statusName() const = 0;
Q_SIGNALS:
/**
* Request the current message for this plugin to be cleared.
......
......@@ -19,7 +19,7 @@
#ifndef IUICONTROLLER_H
#define IUICONTROLLER_H
#include <interfacesexport.h>
#include "interfacesexport.h"
#include <QtCore/QStringList>
#include <kurl.h>
......
......@@ -31,7 +31,7 @@
#include <kurl.h>
#include <languageexport.h>
#include "../languageexport.h"
#include <istatus.h>
class QMutex;
......@@ -94,7 +94,7 @@ public:
* Set the delay in miliseconds before the background parser starts parsing.
*/
void setDelay(int miliseconds);
Q_SIGNALS:
///Emitted whenever a document parse-job has finished. The job contains the du-chain(if one was created) etc.
void parseJobFinished(KDevelop::ParseJob* job);
......
......@@ -24,7 +24,7 @@
#include <JobSequence.h>
#include <kurl.h>
#include <languageexport.h>
#include "../languageexport.h"
......
......@@ -20,7 +20,7 @@
#define ABSTRACTFUNCTIONDECLARATION_H
#include <QtCore/QString>
#include <languageexport.h>
#include "../languageexport.h"
namespace KDevelop
{
......@@ -74,7 +74,7 @@ public:
const QList<QString>& parameterNames() const;
void addParameterName(const QString& str);
private:
AbstractFunctionDeclarationPrivate* const d;
};
......
......@@ -21,9 +21,9 @@
#ifndef CLASSFUNCTIONDECLARATION_H
#define CLASSFUNCTIONDECLARATION_H
#include <classmemberdeclaration.h>
#include <abstractfunctiondeclaration.h>
#include <languageexport.h>
#include "classmemberdeclaration.h"
#include "abstractfunctiondeclaration.h"
#include "../languageexport.h"
namespace KDevelop
{
......@@ -66,7 +66,7 @@ public:
//bool isSimilar(KDevelop::CodeItem *other, bool strict = true) const;
virtual void setAbstractType(AbstractType::Ptr type);
virtual Declaration* clone() const;
private:
class ClassFunctionDeclarationPrivate* const d;
......
......@@ -21,8 +21,8 @@
#ifndef CLASSMEMBERDECLARATION_H
#define CLASSMEMBERDECLARATION_H
#include <declaration.h>
#include <languageexport.h>
#include "declaration.h"
#include "../languageexport.h"
namespace KDevelop
{
......@@ -71,7 +71,7 @@ public:
void setMutable(bool isMutable);
virtual Declaration* clone() const;
private:
class ClassMemberDeclarationPrivate* const d;
};
......
/*
/*
Copyright 2007 David Nolden <david.nolden.kdevelop@art-master.de>
This library is free software; you can redistribute it and/or
......@@ -19,7 +19,7 @@
#ifndef CONTEXTOWNER_H
#define CONTEXTOWNER_H
#include <languageexport.h>
#include "../languageexport.h"
namespace KDevelop
{
......@@ -44,16 +44,16 @@ class KDEVPLATFORMLANGUAGE_EXPORT ContextOwner {
///If this is a declaration, this returns the pointer, else zero.
Declaration* asDeclaration();
///If this is a definition, this returns the pointer, else zero.
Definition* asDefinition();
///If this is a declaration, this returns the pointer, else zero.
const Declaration* asDeclaration() const;
///If this is a definition, this returns the pointer, else zero.
const Definition* asDefinition() const;
private:
class ContextOwnerPrivate* const d;
};
......
......@@ -20,12 +20,12 @@
#define DECLARATION_H
#include <QtCore/QList>
#include <languageexport.h>
#include "../languageexport.h"
#include <identifier.h>
#include "identifier.h"
#include <documentrangeobject.h>
#include <typesystem.h>
#include <duchainbase.h>
#include "typesystem.h"
#include "duchainbase.h"
#include "contextowner.h"
namespace KDevelop
......@@ -39,7 +39,7 @@ class Definition;
/**
* Represents a single declaration in a definition-use chain.
*
*
* NOTE: A du-context can be freely edited as long as it's parent-context is zero.
* In the moment the parent-context is set, the context may only be edited when it
* is allowed to edited it's top-level context(@see TopLevelContext::inDUChain()
......@@ -70,7 +70,7 @@ public:
Type, //A type is declared, like a class-declaration or function-declaration, or a typedef("class MyClass {};")
Instance //An instance of a type is declared("MyClass m;")
};
Q_DECLARE_FLAGS(CVSpecs, CVSpec)
Declaration(KTextEditor::Range* range, Scope scope, DUContext* context);
......@@ -90,7 +90,7 @@ public:
///Returns true if this declaration is accessible through the du-chain, and thus cannot be edited without a du-chain write lock
virtual bool inDUChain() const;
bool isDefinition() const;
void setDeclarationIsDefinition(bool dd);
......@@ -112,7 +112,7 @@ public:
* If this is a definition, and the definition is resolved, it returns the internal context of the definition.
* */
virtual DUContext * internalContext() const;
/**
* Returns the parent-context of this declaration.
* */
......@@ -156,7 +156,7 @@ public:
* */
QString comment() const;
void setComment(const QString& str);
/**
* Provides a mangled version of this definition's identifier, for use in a symbol table.
*/
......@@ -184,14 +184,14 @@ public:
* The declaration will not be registered anywhere, so you must care about its deletion.
*
* This declaration's text-range will be referenced from the clone, so the clone must not live longer than the original.
*
*
* Sub-classes should implement this and should copy as much information into the clone as possible without breaking the du-chain.
* Sub-classes should also implement a public copy-constructor that can be used for cloning by sub-classes.
*
* ---> You do not have to implement this for your language if you are not going to use it(the du-chain itself does not and should not depend on it).
* */
virtual Declaration* clone() const;
private:
class DeclarationPrivate* const d;
};
......
......@@ -20,8 +20,8 @@
#define DEFINITION_H
#include <documentrangeobject.h>
#include <duchainbase.h>
#include <languageexport.h>
#include "duchainbase.h"
#include "../languageexport.h"
#include "contextowner.h"
namespace KDevelop
......
......@@ -21,11 +21,11 @@
#include <QtCore/QObject>
#include <languageexport.h>
#include <duchainobserver.h>
#include "../languageexport.h"
#include "duchainobserver.h"
#include "topducontext.h"
#include "iproblem.h"
#include "../interfaces/iproblem.h"
class KUrl;
......@@ -131,7 +131,7 @@ public Q_SLOTS:
private Q_SLOTS:
void documentAboutToBeDeleted(KTextEditor::Document* doc);
private:
void addToEnvironmentManager( TopDUContext * chain );
void removeFromEnvironmentManager( TopDUContext * chain );
......
......@@ -22,7 +22,7 @@
//krazy:excludeall=dpointer
#include <documentrangeobject.h>
#include <languageexport.h>
#include "../languageexport.h"
#include <ksharedptr.h>
namespace KDevelop
......
......@@ -19,7 +19,7 @@
#ifndef DUCHAINLOCK_H
#define DUCHAINLOCK_H
#include <languageexport.h>
#include "../languageexport.h"
namespace KDevelop
{
......@@ -105,7 +105,7 @@ public:
* has an arbitrary count of read- and write-locks acquired.
*/
bool lockForRead();
/**
* Releases a previously acquired read lock.
*/
......@@ -122,7 +122,7 @@ public:
*
* Write locks are recursive. That means that they can by acquired by threads
* that already have an arbitrary count of write-locks acquired.
*
*
* WARNING: Write-locks can NOT be acquired by threads that already have a read-lock.
*/
bool lockForWrite();
......
......@@ -26,7 +26,7 @@
#include <KTextEditor/Range>
#include "duchainpointer.h"
#include "iproblem.h"
#include "../interfaces/iproblem.h"
namespace KDevelop
{
......
......@@ -22,7 +22,7 @@
#include <QMetaType>
#include <ksharedptr.h>
#include <languageexport.h>
#include "../languageexport.h"
//krazy:excludeall=dpointer
......@@ -129,7 +129,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT DUChainPointerData : public KShared {
bool operator !=( const DUChainPointer<Type>& rhs ) const {
return d.data() != rhs.d.data();
}
///Returns whether the pointed object is still existing
operator bool() const {
return d && d->base();
......@@ -139,7 +139,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT DUChainPointerData : public KShared {
Q_ASSERT(d);
return *static_cast<Type*>(d->base());
}
Type* operator->() const {
Q_ASSERT(d);
return static_cast<Type*>(d->base());
......
......@@ -26,7 +26,7 @@
#include <ktexteditor/codecompletionmodel.h>
#include <languageexport.h>
#include "../languageexport.h"
namespace KDevelop {
......
......@@ -20,12 +20,12 @@
#define DUCONTEXT_H
#include <QtCore/QHash>
#include <languageexport.h>
#include "../languageexport.h"
#include <documentcursorobject.h>
#include <identifier.h>
#include <typesystem.h>
#include <duchainbase.h>
#include "identifier.h"
#include "typesystem.h"
#include "duchainbase.h"
template<class T>
class QSet;
......@@ -58,7 +58,7 @@ typedef DUChainPointer<DUContext> DUContextPointer;
* NOTE: A du-context can be freely edited as long as it's parent-context is zero.
* In the moment the parent-context is set, the context may only be edited when it
* is allowed to edited it's top-level context(@see TopLevelContext::inDUChain()
*
*
* \todo change child relationships to a linked list within the context?
*/
class KDEVPLATFORMLANGUAGE_EXPORT DUContext : public DUChainBase
......@@ -106,12 +106,12 @@ public:
const DUContext* ctx;
KTextEditor::Cursor position;
};
typedef QList<ImportTraceItem> ImportTrace;
Q_DECLARE_FLAGS(SearchFlags, SearchFlag)
ContextType type() const;
void setType(ContextType type);
......@@ -125,7 +125,7 @@ public:
* Sets the declaration/definition, and also updates it's internal context(they are strictly paired together)
* */
void setOwner(ContextOwner* decl);
/**
* Calculate the depth of this context, from the top level context in the file.