feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Remove unneeded qualifications

Browse Source 
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: I1d05d48b23f44e3d589cc2a790803714786b57d2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:59:04 +02:00
committed by hjk
parent 779d6a8c4b
commit 23b4dc128f
29 changed files with 159 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/session.cpp
View File

@@ -175,7 +175,7 @@ bool SessionManager::isDefaultSession(const QString &session)
}
void SessionManager::saveActiveMode(Core::IMode *mode)
void SessionManager::saveActiveMode(IMode *mode)
{
setValue(QLatin1String("ActiveMode"), mode->id().toString());
}
@@ -411,7 +411,7 @@ bool SessionManager::save()
data.insert(QLatin1String("valueKeys"), keys);
bool result = d->m_writer->save(data, Core::ICore::mainWindow());
bool result = d->m_writer->save(data, ICore::mainWindow());
if (!result) {
QMessageBox::warning(ICore::dialogParent(), tr("Error while saving session"),
tr("Could not save session to file %1").arg(d->m_writer->fileName().toUserOutput()));
@@ -595,7 +595,7 @@ bool SessionManagerPrivate::projectContainsFile(Project *p, const QString &fileN
return m_projectFileCache.value(p).contains(fileName);
}
void SessionManager::configureEditor(Core::IEditor *editor, const QString &fileName)
void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
{
if (TextEditor::BaseTextEditor *textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) {
Project *project = projectForFile(fileName);
@@ -702,7 +702,7 @@ QStringList SessionManager::sessions()
{
if (d->m_sessions.isEmpty()) {
// We are not initialized yet, so do that now
QDir sessionDir(Core::ICore::userResourcePath());
QDir sessionDir(ICore::userResourcePath());
QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time);
foreach (const QFileInfo &fileInfo, sessionFiles) {
if (fileInfo.completeBaseName() != QLatin1String("default"))
@@ -746,7 +746,7 @@ bool SessionManager::renameSession(const QString &original, const QString &newNa
*/
bool SessionManager::confirmSessionDelete(const QString &session)
{
return QMessageBox::question(Core::ICore::mainWindow(),
return QMessageBox::question(ICore::mainWindow(),
tr("Delete Session"),
tr("Delete session %1?").arg(session),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes;
@@ -870,7 +870,7 @@ void SessionManagerPrivate::restoreProjects(const QStringList &fileList)
QString errors;
QList<Project *> projects = ProjectExplorerPlugin::openProjects(fileList, &errors);
if (!errors.isEmpty())
QMessageBox::critical(Core::ICore::mainWindow(), SessionManager::tr("Failed to open project"), errors);
QMessageBox::critical(ICore::mainWindow(), SessionManager::tr("Failed to open project"), errors);
foreach (Project *p, projects)
m_failedProjects.removeAll(p->projectFilePath().toString());
}