From c6c1ef94fc37b4a3cab7f2ef1b66e82ceaddc03d Mon Sep 17 00:00:00 2001 From: Andrew Eidsness Date: Thu, 12 Dec 2013 07:40:51 -0500 Subject: [PATCH] Fix Qt plugin's project structure The Qt plugins have been naming internal packages using two different prefixes: cdt.qt.internal cdt.internal.qt This renames all packages to cdt.internal.qt, which seems to be the convention for other projects. I've increased the Qt plugin versions because alot of new API has been added, especially to the qt.core plugin. I increased the version in the MANIFEST.MF and pom.xml files. I've also fixed the MANIFEST.MF files to take CDT out of the plugin names. I've also replaced a call to CCorePlugin.log(Exception) with a call to QtUIPlugin.log (and added the logging functions to QtUIPlugin. Change-Id: I1e3e7b2a42c2eb79fe33608c14a1abcf013a9f2c Signed-off-by: Andrew Eidsness Reviewed-on: https://git.eclipse.org/r/19698 Tested-by: Hudson CI Reviewed-by: Doug Schaefer IP-Clean: Doug Schaefer --- .../META-INF/MANIFEST.MF | 6 +-- qt/org.eclipse.cdt.qt.core/plugin.properties | 5 ++- qt/org.eclipse.cdt.qt.core/plugin.xml | 6 +-- qt/org.eclipse.cdt.qt.core/pom.xml | 2 +- .../qt}/core/QtIncludePaths.java | 2 +- .../qt}/core/QtIncludePathsProvider.java | 2 +- .../qt}/core/QtMethodUtil.java | 2 +- .../qt}/core/index/AbstractQField.java | 2 +- .../qt}/core/index/CDTIndex.java | 2 +- .../qt}/core/index/QEnum.java | 2 +- .../qt}/core/index/QMethod.java | 6 +-- .../qt}/core/index/QObject.java | 10 ++--- .../qt}/core/index/QObjectMembers.java | 2 +- .../qt}/core/index/QProperty.java | 2 +- .../qt}/core/index/QtFactory.java | 2 +- .../qt}/core/index/QtIndexImpl.java | 4 +- .../qt}/core/pdom/ASTDelegatedName.java | 2 +- .../qt}/core/pdom/ASTNameReference.java | 2 +- .../core/pdom/AbstractQObjectMemberName.java | 2 +- .../qt}/core/pdom/IQtASTName.java | 2 +- .../qt}/core/pdom/IQtPDOMCodec.java | 2 +- .../qt}/core/pdom/PDOMQtLinkageFactory.java | 2 +- .../qt}/core/pdom/QMethodName.java | 2 +- .../qt}/core/pdom/QObjectName.java | 2 +- .../qt}/core/pdom/QtASTClass.java | 2 +- .../qt}/core/pdom/QtASTImageLocation.java | 2 +- .../qt}/core/pdom/QtASTVisitor.java | 6 +-- .../qt}/core/pdom/QtEnumName.java | 2 +- .../qt}/core/pdom/QtPDOMASTProcessor.java | 2 +- .../qt}/core/pdom/QtPDOMArray.java | 2 +- .../qt}/core/pdom/QtPDOMBinding.java | 2 +- .../qt}/core/pdom/QtPDOMLinkage.java | 2 +- .../qt}/core/pdom/QtPDOMNodeType.java | 2 +- .../qt}/core/pdom/QtPDOMProperty.java | 2 +- .../qt}/core/pdom/QtPDOMQEnum.java | 2 +- .../qt}/core/pdom/QtPDOMQMethod.java | 2 +- .../qt}/core/pdom/QtPDOMQObject.java | 2 +- .../qt}/core/pdom/QtPDOMVisitor.java | 2 +- .../core/pdom/QtPropertyAttributeName.java | 2 +- .../qt}/core/pdom/QtPropertyName.java | 2 +- .../eclipse/cdt/qt/core/index/QtIndex.java | 2 +- .../META-INF/MANIFEST.MF | 5 ++- qt/org.eclipse.cdt.qt.tests/plugin.properties | 8 ++++ qt/org.eclipse.cdt.qt.tests/pom.xml | 2 +- qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF | 8 ++-- qt/org.eclipse.cdt.qt.ui/plugin.properties | 3 ++ qt/org.eclipse.cdt.qt.ui/plugin.xml | 2 +- qt/org.eclipse.cdt.qt.ui/pom.xml | 2 +- .../qt}/ui/QtCompletionProposalComputer.java | 5 ++- .../src/org/eclipse/cdt/qt/ui/QtUIPlugin.java | 45 +++++++++++++++++++ 50 files changed, 126 insertions(+), 65 deletions(-) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/QtIncludePaths.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/QtIncludePathsProvider.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/QtMethodUtil.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/AbstractQField.java (95%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/CDTIndex.java (97%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QEnum.java (97%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QMethod.java (93%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QObject.java (93%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QObjectMembers.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QProperty.java (97%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QtFactory.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/index/QtIndexImpl.java (94%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/ASTDelegatedName.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/ASTNameReference.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/AbstractQObjectMemberName.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/IQtASTName.java (94%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/IQtPDOMCodec.java (96%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/PDOMQtLinkageFactory.java (95%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QMethodName.java (96%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QObjectName.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtASTClass.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtASTImageLocation.java (97%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtASTVisitor.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtEnumName.java (95%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMASTProcessor.java (95%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMArray.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMBinding.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMLinkage.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMNodeType.java (97%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMProperty.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMQEnum.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMQMethod.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMQObject.java (99%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPDOMVisitor.java (98%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPropertyAttributeName.java (95%) rename qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/{qt/internal => internal/qt}/core/pdom/QtPropertyName.java (97%) create mode 100644 qt/org.eclipse.cdt.qt.tests/plugin.properties rename qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/{qt/internal => internal/qt}/ui/QtCompletionProposalComputer.java (99%) diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF index 0d10edde6e4..e11a2c6eb58 100644 --- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF +++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: CDT Qt Support Core +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.qt.core;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.cdt.qt.core.QtPlugin -Bundle-Vendor: Eclipse CDT +Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", diff --git a/qt/org.eclipse.cdt.qt.core/plugin.properties b/qt/org.eclipse.cdt.qt.core/plugin.properties index 322b6ca7011..b66c9d0ff85 100644 --- a/qt/org.eclipse.cdt.qt.core/plugin.properties +++ b/qt/org.eclipse.cdt.qt.core/plugin.properties @@ -4,7 +4,10 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html +pluginName=C/C++ Qt Support Core +providerName=Eclipse CDT + qtProjectFile.name = Qt Project File qmlFile.name = QML File qmakeEnvProvider.name = QMake Environment Provider -QtInstallHeaders.pathProvider.name = Qt Installed Headers \ No newline at end of file +QtInstallHeaders.pathProvider.name = Qt Installed Headers diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml index e1e3cc1de54..aa0f7908f27 100644 --- a/qt/org.eclipse.cdt.qt.core/plugin.xml +++ b/qt/org.eclipse.cdt.qt.core/plugin.xml @@ -67,7 +67,7 @@ id="qt.PDOMASTProcessor" name="Qt PDOM AST Processor"> + class="org.eclipse.cdt.internal.qt.core.pdom.QtPDOMASTProcessor"> @@ -80,11 +80,11 @@ + class="org.eclipse.cdt.internal.qt.core.pdom.PDOMQtLinkageFactory"/> diff --git a/qt/org.eclipse.cdt.qt.core/pom.xml b/qt/org.eclipse.cdt.qt.core/pom.xml index 8862e5515a0..b7ed0d0bfd6 100644 --- a/qt/org.eclipse.cdt.qt.core/pom.xml +++ b/qt/org.eclipse.cdt.qt.core/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT org.eclipse.cdt.qt.core eclipse-plugin diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePaths.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePaths.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePaths.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePaths.java index 20a75126d36..3ab4504e18e 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePaths.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePaths.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core; +package org.eclipse.cdt.internal.qt.core; import java.io.BufferedReader; import java.io.File; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePathsProvider.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePathsProvider.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePathsProvider.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePathsProvider.java index 6c2076bd48d..fa832c66d79 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtIncludePathsProvider.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtIncludePathsProvider.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core; +package org.eclipse.cdt.internal.qt.core; import java.util.HashMap; import java.util.List; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtMethodUtil.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtMethodUtil.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtMethodUtil.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtMethodUtil.java index c25a7e511c1..bb38d44b43e 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/QtMethodUtil.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtMethodUtil.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core; +package org.eclipse.cdt.internal.qt.core; import java.util.ArrayList; import java.util.Arrays; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/AbstractQField.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/AbstractQField.java similarity index 95% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/AbstractQField.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/AbstractQField.java index 90c97e0bd12..a9f77cb2417 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/AbstractQField.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/AbstractQField.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import org.eclipse.cdt.qt.core.index.IQObject; import org.eclipse.cdt.qt.core.index.IQObject.IMember; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/CDTIndex.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/CDTIndex.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/CDTIndex.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/CDTIndex.java index c187dea5881..8886eb6d7e7 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/CDTIndex.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/CDTIndex.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.qt.core.QtPlugin; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QEnum.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QEnum.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QEnum.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QEnum.java index 0610f6101f8..255a41efb88 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QEnum.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QEnum.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import java.util.ArrayList; import java.util.Collection; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QMethod.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QMethod.java similarity index 93% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QMethod.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QMethod.java index 8c5bc7574aa..7bf8e3188cd 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QMethod.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QMethod.java @@ -5,17 +5,17 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import java.util.Collection; import java.util.Collections; import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.internal.qt.core.QtMethodUtil; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQMethod; import org.eclipse.cdt.qt.core.index.IQMethod; import org.eclipse.cdt.qt.core.index.IQObject; import org.eclipse.cdt.qt.core.index.IQObject.IMember; -import org.eclipse.cdt.qt.internal.core.QtMethodUtil; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMQMethod; import org.eclipse.core.runtime.CoreException; public class QMethod implements IQMethod { diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObject.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObject.java similarity index 93% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObject.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObject.java index 0f5b83d3faf..60157b7409a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObject.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObject.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import java.util.ArrayList; import java.util.Collection; @@ -13,14 +13,14 @@ import java.util.List; import java.util.Map; import org.eclipse.cdt.core.dom.ast.IBinding; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMProperty; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQEnum; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQMethod; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQObject; import org.eclipse.cdt.qt.core.index.IQEnum; import org.eclipse.cdt.qt.core.index.IQMethod; import org.eclipse.cdt.qt.core.index.IQObject; import org.eclipse.cdt.qt.core.index.IQProperty; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMProperty; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMQEnum; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMQMethod; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMQObject; import org.eclipse.core.runtime.CoreException; public class QObject implements IQObject { diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObjectMembers.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObjectMembers.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObjectMembers.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObjectMembers.java index 73116d92b2b..faf09377a6a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QObjectMembers.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QObjectMembers.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import java.util.ArrayList; import java.util.Collection; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QProperty.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QProperty.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QProperty.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QProperty.java index f8e2f957718..9e8b2c14b20 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QProperty.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QProperty.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import org.eclipse.cdt.qt.core.index.IQObject; import org.eclipse.cdt.qt.core.index.IQProperty; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtFactory.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtFactory.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java index 7d95d6e1515..4b6e9576e92 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtFactory.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import java.util.SortedSet; import java.util.TreeSet; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtIndexImpl.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtIndexImpl.java similarity index 94% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtIndexImpl.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtIndexImpl.java index d127c133a8e..7390f91d368 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/index/QtIndexImpl.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtIndexImpl.java @@ -5,16 +5,16 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.index; +package org.eclipse.cdt.internal.qt.core.index; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IndexFilter; +import org.eclipse.cdt.internal.qt.core.pdom.QtPDOMQObject; import org.eclipse.cdt.qt.core.index.IQObject; import org.eclipse.cdt.qt.core.index.QtIndex; -import org.eclipse.cdt.qt.internal.core.pdom.QtPDOMQObject; import org.eclipse.core.runtime.CoreException; public class QtIndexImpl extends QtIndex { diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTDelegatedName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTDelegatedName.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTDelegatedName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTDelegatedName.java index 81b66da9fb6..271c3f5d3d5 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTDelegatedName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTDelegatedName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTNameReference.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTNameReference.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTNameReference.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTNameReference.java index 3ab9467d43f..52d511a8337 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/ASTNameReference.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/ASTNameReference.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTName; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/AbstractQObjectMemberName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/AbstractQObjectMemberName.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/AbstractQObjectMemberName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/AbstractQObjectMemberName.java index 94eff5904e7..edc404fa52c 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/AbstractQObjectMemberName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/AbstractQObjectMemberName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtASTName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtASTName.java similarity index 94% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtASTName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtASTName.java index aead1422f2a..0d13bb8ef4d 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtASTName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtASTName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.core.runtime.CoreException; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtPDOMCodec.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtPDOMCodec.java similarity index 96% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtPDOMCodec.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtPDOMCodec.java index 040f2a850d4..8cc4b08a7c1 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/IQtPDOMCodec.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/IQtPDOMCodec.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.core.runtime.CoreException; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/PDOMQtLinkageFactory.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/PDOMQtLinkageFactory.java similarity index 95% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/PDOMQtLinkageFactory.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/PDOMQtLinkageFactory.java index e2b2c190ae9..79d3fad1836 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/PDOMQtLinkageFactory.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/PDOMQtLinkageFactory.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.dom.IPDOMLinkageFactory; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QMethodName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QMethodName.java similarity index 96% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QMethodName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QMethodName.java index 59c08673d6b..b0da79542d2 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QMethodName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QMethodName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.qt.core.index.IQMethod; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QObjectName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QObjectName.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QObjectName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QObjectName.java index d84e11b2338..06544b49b38 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QObjectName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QObjectName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTClass.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTClass.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTClass.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTClass.java index 7f873cf29c8..6fb7a19ae1f 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTClass.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTClass.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.Iterator; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTImageLocation.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTImageLocation.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTImageLocation.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTImageLocation.java index e7b063afc66..bfc7858e9e9 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTImageLocation.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTImageLocation.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTImageLocation; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTVisitor.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTVisitor.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java index 32c2b12234e..4273ef4d6b8 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtASTVisitor.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.HashMap; @@ -35,11 +35,11 @@ import org.eclipse.cdt.core.index.IIndexSymbols; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.parser.scanner.LocationMap; +import org.eclipse.cdt.internal.qt.core.QtMethodUtil; +import org.eclipse.cdt.internal.qt.core.index.QProperty; import org.eclipse.cdt.qt.core.QtKeywords; import org.eclipse.cdt.qt.core.index.IQMethod; import org.eclipse.cdt.qt.core.index.IQProperty; -import org.eclipse.cdt.qt.internal.core.QtMethodUtil; -import org.eclipse.cdt.qt.internal.core.index.QProperty; @SuppressWarnings("restriction") public class QtASTVisitor extends ASTVisitor { diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtEnumName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtEnumName.java similarity index 95% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtEnumName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtEnumName.java index 8827fb0af3e..77a98b2f217 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtEnumName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtEnumName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.core.runtime.CoreException; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMASTProcessor.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMASTProcessor.java similarity index 95% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMASTProcessor.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMASTProcessor.java index ba9b5689d1d..02518e25b9b 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMASTProcessor.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMASTProcessor.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMArray.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMArray.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMArray.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMArray.java index ea3f6a649a4..7ddb88336e9 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMArray.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMArray.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.core.runtime.CoreException; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMBinding.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMBinding.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMBinding.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMBinding.java index d06054aefec..d2a772926c5 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMBinding.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMBinding.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMLinkage.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMLinkage.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMLinkage.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMLinkage.java index 983de4e8641..f6123b14878 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMLinkage.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMLinkage.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.HashMap; import java.util.Map; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMNodeType.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMNodeType.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMNodeType.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMNodeType.java index 86734c22aa1..f79c65749d4 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMNodeType.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMNodeType.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.internal.core.index.IIndexBindingConstants; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMProperty.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMProperty.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java index 48823bab01f..91123a91301 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMProperty.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.IString; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQEnum.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQEnum.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQEnum.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQEnum.java index ddf2e974278..e17a61b36db 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQEnum.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQEnum.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.Arrays; import java.util.Collections; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQMethod.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQMethod.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQMethod.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQMethod.java index 98657eadf4c..0cd317e5782 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQMethod.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQMethod.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.internal.core.pdom.db.Database; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQObject.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java similarity index 99% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQObject.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java index e8c0e54026e..ce599868cfd 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMQObject.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.Collections; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMVisitor.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMVisitor.java similarity index 98% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMVisitor.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMVisitor.java index 3dec16f2114..867b2ac1944 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPDOMVisitor.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMVisitor.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.Arrays; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyAttributeName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyAttributeName.java similarity index 95% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyAttributeName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyAttributeName.java index 7739e76d4cb..0bead196c15 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyAttributeName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyAttributeName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTName; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyName.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyName.java similarity index 97% rename from qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyName.java rename to qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyName.java index 36b19fef9e7..12a4cfa4819 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/internal/core/pdom/QtPropertyName.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPropertyName.java @@ -5,7 +5,7 @@ * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.core.pdom; +package org.eclipse.cdt.internal.qt.core.pdom; import java.util.ArrayList; import java.util.List; diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/index/QtIndex.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/index/QtIndex.java index 90bdde99d2c..eb8f3a8f1e4 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/index/QtIndex.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/index/QtIndex.java @@ -7,8 +7,8 @@ */ package org.eclipse.cdt.qt.core.index; +import org.eclipse.cdt.internal.qt.core.index.QtFactory; import org.eclipse.cdt.qt.core.QtPlugin; -import org.eclipse.cdt.qt.internal.core.index.QtFactory; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; diff --git a/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF index 2e2cf2a9d36..a6110d5794a 100644 --- a/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF +++ b/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Tests +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.qt.tests -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.cdt.qt.tests.QtTestPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: %vendorName diff --git a/qt/org.eclipse.cdt.qt.tests/plugin.properties b/qt/org.eclipse.cdt.qt.tests/plugin.properties new file mode 100644 index 00000000000..243e869b19c --- /dev/null +++ b/qt/org.eclipse.cdt.qt.tests/plugin.properties @@ -0,0 +1,8 @@ +# Copyright (c) 2013 QNX Software Systems and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html + +pluginName=C/C++ Qt Test Suite +providerName=Eclipse CDT diff --git a/qt/org.eclipse.cdt.qt.tests/pom.xml b/qt/org.eclipse.cdt.qt.tests/pom.xml index a284bdd3c5e..00e53027593 100644 --- a/qt/org.eclipse.cdt.qt.tests/pom.xml +++ b/qt/org.eclipse.cdt.qt.tests/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT org.eclipse.cdt.qt.tests eclipse-test-plugin diff --git a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF index 856b83c6f2a..ddddef63eeb 100644 --- a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF +++ b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: CDT Qt Support UI +Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.qt.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.cdt.qt.ui.QtUIPlugin -Bundle-Vendor: Eclipse CDT +Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.cdt.ui, org.eclipse.cdt.core, - org.eclipse.cdt.qt.core, + org.eclipse.cdt.qt.core;bundle-version="[1.1.0,2.0.0)", org.eclipse.jface.text, org.eclipse.core.resources Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/qt/org.eclipse.cdt.qt.ui/plugin.properties b/qt/org.eclipse.cdt.qt.ui/plugin.properties index 5f970b962b6..5784ad40ca8 100644 --- a/qt/org.eclipse.cdt.qt.ui/plugin.properties +++ b/qt/org.eclipse.cdt.qt.ui/plugin.properties @@ -4,5 +4,8 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html +pluginName=C/C++ Qt Support UI +providerName=Eclipse CDT + qtHighlighting.extName=Qt Semantic Highlighting qtHighlighting.displayName=Qt Keywords \ No newline at end of file diff --git a/qt/org.eclipse.cdt.qt.ui/plugin.xml b/qt/org.eclipse.cdt.qt.ui/plugin.xml index e03dd26e7ab..69dc0e2226c 100644 --- a/qt/org.eclipse.cdt.qt.ui/plugin.xml +++ b/qt/org.eclipse.cdt.qt.ui/plugin.xml @@ -29,7 +29,7 @@ name="Qt Completion Proposal Computer"> diff --git a/qt/org.eclipse.cdt.qt.ui/pom.xml b/qt/org.eclipse.cdt.qt.ui/pom.xml index 1b474a09b75..0f66153d5a9 100644 --- a/qt/org.eclipse.cdt.qt.ui/pom.xml +++ b/qt/org.eclipse.cdt.qt.ui/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT org.eclipse.cdt.qt.ui eclipse-plugin diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/QtCompletionProposalComputer.java similarity index 99% rename from qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java rename to qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/QtCompletionProposalComputer.java index 2e6e6d53823..78511171803 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/internal/ui/QtCompletionProposalComputer.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/QtCompletionProposalComputer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html */ -package org.eclipse.cdt.qt.internal.ui; +package org.eclipse.cdt.internal.qt.ui; import java.util.ArrayList; import java.util.Collection; @@ -45,6 +45,7 @@ import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants; import org.eclipse.cdt.qt.core.QtKeywords; import org.eclipse.cdt.qt.core.QtNature; import org.eclipse.cdt.qt.core.QtPlugin; +import org.eclipse.cdt.qt.ui.QtUIPlugin; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.text.contentassist.ICEditorContentAssistInvocationContext; import org.eclipse.core.resources.IProject; @@ -324,7 +325,7 @@ public class QtCompletionProposalComputer extends ParsingBasedProposalComputer { unparsed = context.getDocument().get(parseOffset, invocationOffset - parseOffset); } catch (BadLocationException e) { - CCorePlugin.log(e); + QtUIPlugin.log(e); } if (unparsed.length() > 0 && unparsed.charAt(0) == '(') diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/ui/QtUIPlugin.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/ui/QtUIPlugin.java index a8fab56b811..a24fb4de002 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/ui/QtUIPlugin.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/qt/ui/QtUIPlugin.java @@ -7,6 +7,10 @@ */ package org.eclipse.cdt.qt.ui; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -56,4 +60,45 @@ public class QtUIPlugin extends AbstractUIPlugin { return plugin; } + public static CoreException coreException(String msg) { + return new CoreException(new Status(IStatus.INFO, PLUGIN_ID, msg)); + } + + public static IStatus info(String msg) { + return new Status(IStatus.INFO, PLUGIN_ID, msg); + } + + public static IStatus error(String msg) { + return error(msg, null); + } + + public static IStatus error(String msg, Throwable e) { + return new Status(IStatus.ERROR, PLUGIN_ID, msg, e); + } + + public static void log(String e) { + log(IStatus.INFO, e, null); + } + + public static void log(Throwable e) { + String msg= e.getMessage(); + if (msg == null) { + log("Error", e); //$NON-NLS-1$ + } else { + log("Error: " + msg, e); //$NON-NLS-1$ + } + } + + public static void log(String message, Throwable e) { + Throwable nestedException; + if (e instanceof CModelException + && (nestedException = ((CModelException)e).getException()) != null) { + e = nestedException; + } + log(IStatus.ERROR, message, e); + } + + public static void log(int code, String msg, Throwable e) { + getDefault().getLog().log(new Status(code, PLUGIN_ID, msg, e)); + } }