Commit 74ed591d authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

Misc: Remove unneeded qualifications



Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 2f1509aa
......@@ -6,7 +6,7 @@
using namespace bb::cascades;
ApplicationUI::ApplicationUI(bb::cascades::Application *app) :
ApplicationUI::ApplicationUI(Application *app) :
QObject(app)
{
// By default the QmlDocument object is owned by the Application instance
......
......@@ -106,8 +106,8 @@ enum { debugLeaks = 0 };
loading.
\code
// 'plugins' and subdirs will be searched for plugins
ExtensionSystem::PluginManager::setPluginPaths(QStringList() << "plugins");
ExtensionSystem::PluginManager::loadPlugins(); // try to load all the plugins
PluginManager::setPluginPaths(QStringList() << "plugins");
PluginManager::loadPlugins(); // try to load all the plugins
\endcode
Additionally, it is possible to directly access the plugin specifications
(the information in the descriptor file), the plugin instances (via PluginSpec),
......@@ -129,10 +129,10 @@ enum { debugLeaks = 0 };
// Plugin A provides a "MimeTypeHandler" extension point
// in plugin B:
MyMimeTypeHandler *handler = new MyMimeTypeHandler();
ExtensionSystem::PluginManager::instance()->addObject(handler);
PluginManager::instance()->addObject(handler);
// In plugin A:
QList<MimeTypeHandler *> mimeHandlers =
ExtensionSystem::PluginManager::getObjects<MimeTypeHandler>();
PluginManager::getObjects<MimeTypeHandler>();
\endcode
......
......@@ -136,7 +136,7 @@ using namespace ExtensionSystem::Internal;
/*!
\internal
*/
uint ExtensionSystem::qHash(const ExtensionSystem::PluginDependency &value)
uint ExtensionSystem::qHash(const PluginDependency &value)
{
return qHash(value.name);
}
......
......@@ -280,7 +280,7 @@ PluginView::PluginView(QWidget *parent)
m_categoryView->setColumnWidth(LoadedColumn, 40);
m_categoryView->header()->setDefaultSectionSize(120);
m_categoryView->header()->setMinimumSectionSize(35);
m_categoryView->setActivationMode(Utils::DoubleClickActivation);
m_categoryView->setActivationMode(DoubleClickActivation);
m_categoryView->setSelectionMode(QAbstractItemView::SingleSelection);
m_categoryView->setSelectionBehavior(QAbstractItemView::SelectRows);
......
......@@ -231,7 +231,7 @@ bool DiagnosticMessage::isError() const
return _kind == Error;
}
bool GLSL::DiagnosticMessage::isWarning() const
bool DiagnosticMessage::isWarning() const
{
return _kind == Warning;
}
......
......@@ -378,8 +378,8 @@ bool Semantic::visit(FunctionCallExpressionAST *ast)
_engine->error(ast->lineno, QString::fromLatin1("too many arguments"));
_expr.type = funTy->returnType();
} else if (const OverloadSet *overloads = id.type->asOverloadSetType()) {
QVector<GLSL::Function *> candidates;
foreach (GLSL::Function *f, overloads->functions()) {
QVector<Function *> candidates;
foreach (Function *f, overloads->functions()) {
if (f->argumentCount() == actuals.size()) {
int argc = 0;
for (; argc < actuals.size(); ++argc) {
......
......@@ -263,10 +263,10 @@ bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &p
qWarning("%s: Unexpected code flow, expected success or exception.", Q_FUNC_INFO);
return false;
}
} catch (const Botan::Exception &ex) {
} catch (const Exception &ex) {
error = QLatin1String(ex.what());
return false;
} catch (const Botan::Decoding_Error &ex) {
} catch (const Decoding_Error &ex) {
error = QLatin1String(ex.what());
return false;
}
......@@ -334,10 +334,10 @@ bool SshEncryptionFacility::createAuthenticationKeyFromOpenSSL(const QByteArray
sequence.discard_remaining();
sequence.verify_end();
} catch (const Botan::Exception &ex) {
} catch (const Exception &ex) {
error = QLatin1String(ex.what());
return false;
} catch (const Botan::Decoding_Error &ex) {
} catch (const Decoding_Error &ex) {
error = QLatin1String(ex.what());
return false;
}
......
......@@ -78,20 +78,20 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke
generateOpenSslPublicKeyString(key);
}
return true;
} catch (const Botan::Exception &e) {
} catch (const Exception &e) {
m_error = tr("Error generating key: %1").arg(QString::fromLatin1(e.what()));
return false;
}
}
void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, Botan::RandomNumberGenerator &rng)
void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, RandomNumberGenerator &rng)
{
generatePkcs8KeyString(key, false, rng);
generatePkcs8KeyString(key, true, rng);
}
void SshKeyGenerator::generatePkcs8KeyString(const KeyPtr &key, bool privateKey,
Botan::RandomNumberGenerator &rng)
RandomNumberGenerator &rng)
{
Pipe pipe;
pipe.start_msg();
......
......@@ -102,7 +102,7 @@ bool ToolTip::pinToolTip(QWidget *w, QWidget *parent)
// Find the parent WidgetTip, tell it to pin/release the
// widget and close.
for (QWidget *p = w->parentWidget(); p ; p = p->parentWidget()) {
if (Internal::WidgetTip *wt = qobject_cast<Internal::WidgetTip *>(p)) {
if (WidgetTip *wt = qobject_cast<WidgetTip *>(p)) {
wt->pinToolTipWidget(parent);
ToolTip::hide();
return true;
......
......@@ -161,7 +161,7 @@ public slots:
void startTool();
void selectToolboxAction(int);
void selectMenuAction();
void modeChanged(Core::IMode *mode);
void modeChanged(IMode *mode);
void resetLayout();
void updateRunActions();
......
......@@ -48,7 +48,7 @@ using namespace ProjectExplorer;
namespace Analyzer {
AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration)
RunConfiguration *runConfiguration)
: RunControl(runConfiguration, sp.runMode)
{
setIcon(QLatin1String(":/images/analyzer_start_small.png"));
......
......@@ -62,7 +62,7 @@ using namespace ProjectExplorer::Constants;
//////////////////////////////////////
// AutotoolsBuildConfiguration class
//////////////////////////////////////
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent)
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent)
: BuildConfiguration(parent, Core::Id(AUTOTOOLS_BC_ID))
{ }
......@@ -71,11 +71,11 @@ NamedWidget *AutotoolsBuildConfiguration::createConfigWidget()
return new AutotoolsBuildSettingsWidget(this);
}
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id)
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, Core::Id id)
: BuildConfiguration(parent, id)
{ }
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent,
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent,
AutotoolsBuildConfiguration *source)
: BuildConfiguration(parent, source)
{
......@@ -173,7 +173,7 @@ bool AutotoolsBuildConfigurationFactory::canHandle(const Target *t) const
return t->project()->id() == Constants::AUTOTOOLS_PROJECT_ID;
}
BuildInfo *AutotoolsBuildConfigurationFactory::createBuildInfo(const ProjectExplorer::Kit *k,
BuildInfo *AutotoolsBuildConfigurationFactory::createBuildInfo(const Kit *k,
const Utils::FileName &buildDir) const
{
BuildInfo *info = new BuildInfo(this);
......@@ -230,7 +230,7 @@ void AutotoolsBuildConfiguration::setBuildDirectory(const Utils::FileName &direc
if (directory == buildDirectory())
return;
BuildConfiguration::setBuildDirectory(directory);
ProjectExplorer::BuildStepList *bsl = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
BuildStepList *bsl = stepList(BUILDSTEPS_BUILD);
foreach (BuildStep *bs, bsl->steps()) {
ConfigureStep *cs = qobject_cast<ConfigureStep *>(bs);
if (cs) {
......
......@@ -51,10 +51,10 @@ bool AutotoolsProjectNode::showInSimpleTree() const
return true;
}
QList<ProjectExplorer::ProjectAction> AutotoolsProjectNode::supportedActions(Node *node) const
QList<ProjectAction> AutotoolsProjectNode::supportedActions(Node *node) const
{
Q_UNUSED(node);
return QList<ProjectExplorer::ProjectAction>();
return QList<ProjectAction>();
}
bool AutotoolsProjectNode::canAddSubProject(const QString &proFilePath) const
......
......@@ -304,7 +304,7 @@ void MakeStepConfigWidget::updateDetails()
BuildConfiguration *bc = m_makeStep->buildConfiguration();
if (!bc)
bc = m_makeStep->target()->activeBuildConfiguration();
ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
ToolChain *tc = ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
if (tc) {
QString arguments = Utils::QtcProcess::joinArgs(m_makeStep->m_buildTargets);
......
......@@ -90,7 +90,7 @@ BareMetalDevice::IDevice::Ptr BareMetalDevice::clone() const
DeviceProcessSignalOperation::Ptr BareMetalDevice::signalOperation() const
{
return ProjectExplorer::DeviceProcessSignalOperation::Ptr();
return DeviceProcessSignalOperation::Ptr();
}
QString BareMetalDevice::displayType() const
......@@ -98,7 +98,7 @@ QString BareMetalDevice::displayType() const
return QCoreApplication::translate("BareMetal::Internal::BareMetalDevice", "Bare Metal");
}
ProjectExplorer::IDeviceWidget *BareMetalDevice::createWidget()
IDeviceWidget *BareMetalDevice::createWidget()
{
return new BareMetalDeviceConfigurationWidget(sharedFromThis());
}
......@@ -120,7 +120,7 @@ void BareMetalDevice::executeAction(Core::Id actionId, QWidget *parent)
Q_UNUSED(parent);
}
ProjectExplorer::DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const
DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const
{
return new GdbServerProviderProcess(sharedFromThis(), parent);
}
......
......@@ -109,7 +109,7 @@ QVariantMap BareMetalGdbCommandsDeployStep::toMap() const
return map;
}
ProjectExplorer::BuildStepConfigWidget *BareMetalGdbCommandsDeployStep::createConfigWidget()
BuildStepConfigWidget *BareMetalGdbCommandsDeployStep::createConfigWidget()
{
return new BareMetalGdbCommandsDeployStepWidget(*this);
}
......
......@@ -137,7 +137,7 @@ QString BareMetalRunConfiguration::defaultDisplayName()
QString BareMetalRunConfiguration::localExecutableFilePath() const
{
return target()->applicationTargets()
.targetForProject(Utils::FileName::fromString(m_projectFilePath)).toString();
.targetForProject(FileName::fromString(m_projectFilePath)).toString();
}
QString BareMetalRunConfiguration::arguments() const
......
......@@ -55,7 +55,7 @@ static QString pathFromId(Core::Id id)
}
BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory(QObject *parent) :
ProjectExplorer::IRunConfigurationFactory(parent)
IRunConfigurationFactory(parent)
{
setObjectName(QLatin1String("BareMetalRunConfigurationFactory"));
}
......
......@@ -63,7 +63,7 @@ namespace BareMetal {
namespace Internal {
BareMetalRunControlFactory::BareMetalRunControlFactory(QObject *parent) :
ProjectExplorer::IRunControlFactory(parent)
IRunControlFactory(parent)
{
}
......
......@@ -91,7 +91,7 @@ public:
namespace Internal {
class BinEditorFind : public Core::IFindSupport
class BinEditorFind : public IFindSupport
{
Q_OBJECT
......@@ -107,7 +107,7 @@ public:
QString currentFindString() const { return QString(); }
QString completedFindString() const { return QString(); }
Core::FindFlags supportedFindFlags() const
FindFlags supportedFindFlags() const
{
return FindBackward | FindCaseSensitively;
}
......@@ -118,7 +118,7 @@ public:
m_incrementalWrappedState = false;
}
virtual void highlightAll(const QString &txt, Core::FindFlags findFlags)
virtual void highlightAll(const QString &txt, FindFlags findFlags)
{
m_widget->highlightSearchResults(txt.toLatin1(), textDocumentFlagsForFindFlags(findFlags));
}
......@@ -128,7 +128,7 @@ public:
m_widget->highlightSearchResults(QByteArray());
}
int find(const QByteArray &pattern, int pos, Core::FindFlags findFlags, bool *wrapped)
int find(const QByteArray &pattern, int pos, FindFlags findFlags, bool *wrapped)
{
if (wrapped)
*wrapped = false;
......@@ -149,7 +149,7 @@ public:
return res;
}
Result findIncremental(const QString &txt, Core::FindFlags findFlags) {
Result findIncremental(const QString &txt, FindFlags findFlags) {
QByteArray pattern = txt.toLatin1();
if (pattern != m_lastPattern)
resetIncrementalSearch(); // Because we don't search for nibbles.
......@@ -184,7 +184,7 @@ public:
return result;
}
Result findStep(const QString &txt, Core::FindFlags findFlags) {
Result findStep(const QString &txt, FindFlags findFlags) {
QByteArray pattern = txt.toLatin1();
bool wasReset = (m_incrementalStartPos < 0);
if (m_contPos == -1) {
......@@ -224,12 +224,12 @@ private:
};
class BinEditorDocument : public Core::IDocument
class BinEditorDocument : public IDocument
{
Q_OBJECT
public:
BinEditorDocument(BinEditorWidget *parent) :
Core::IDocument(parent)
IDocument(parent)
{
setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
setMimeType(QLatin1String(BinEditor::Constants::C_BINEDITOR_MIMETYPE));
......@@ -274,14 +274,14 @@ public:
if (errorString)
*errorString = msg;
else
QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), msg);
QMessageBox::critical(ICore::mainWindow(), tr("File Error"), msg);
return false;
}
if (offset >= size)
return false;
if (file.open(QIODevice::ReadOnly)) {
file.close();
setFilePath(Utils::FileName::fromString(fileName));
setFilePath(FileName::fromString(fileName));
m_widget->setSizes(offset, file.size());
return true;
}
......@@ -290,7 +290,7 @@ public:
if (errorString)
*errorString = errStr;
else
QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), errStr);
QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errStr);
return false;
}
......@@ -311,7 +311,7 @@ private slots:
data += QByteArray(blockSize - dataSize, 0);
m_widget->addData(block, data);
} else {
QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"),
QMessageBox::critical(ICore::mainWindow(), tr("File Error"),
tr("Cannot open %1: %2").arg(
fn.toUserOutput(), file.errorString()));
}
......@@ -361,7 +361,7 @@ private:
BinEditorWidget *m_widget;
};
class BinEditor : public Core::IEditor
class BinEditor : public IEditor
{
Q_OBJECT
public:
......@@ -406,7 +406,7 @@ public:
QTC_ASSERT(fileName == realFileName, return false); // The bineditor can do no autosaving
return m_file->open(errorString, fileName);
}
Core::IDocument *document() { return m_file; }
IDocument *document() { return m_file; }
QWidget *toolBar() { return m_toolBar; }
......@@ -445,7 +445,7 @@ BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) :
addMimeType(Constants::C_BINEDITOR_MIMETYPE);
}
Core::IEditor *BinEditorFactory::createEditor()
IEditor *BinEditorFactory::createEditor()
{
BinEditorWidget *widget = new BinEditorWidget();
BinEditor *editor = new BinEditor(widget);
......@@ -466,14 +466,14 @@ BinEditorPlugin::~BinEditorPlugin()
{
}
QAction *BinEditorPlugin::registerNewAction(Core::Id id, const QString &title)
QAction *BinEditorPlugin::registerNewAction(Id id, const QString &title)
{
QAction *result = new QAction(title, this);
Core::ActionManager::registerAction(result, id, m_context);
ActionManager::registerAction(result, id, m_context);
return result;
}
QAction *BinEditorPlugin::registerNewAction(Core::Id id,
QAction *BinEditorPlugin::registerNewAction(Id id,
QObject *receiver,
const char *slot,
const QString &title)
......@@ -522,7 +522,7 @@ void BinEditorPlugin::extensionsInitialized()
{
}
void BinEditorPlugin::updateCurrentEditor(Core::IEditor *editor)
void BinEditorPlugin::updateCurrentEditor(IEditor *editor)
{
BinEditorWidget *binEditor = 0;
if (editor)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment