forked from qt-creator/qt-creator
Fixes: gcc 4.3.2 compile warnings
This commit is contained in:
@@ -98,12 +98,12 @@ static void displayError(const QString &t) // No console on Windows.
|
|||||||
|
|
||||||
static void displayHelpText(const QString &t)
|
static void displayHelpText(const QString &t)
|
||||||
{
|
{
|
||||||
qWarning(t.toUtf8().constData());
|
qWarning("%s", qPrintable(t));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void displayError(const QString &t)
|
static void displayError(const QString &t)
|
||||||
{
|
{
|
||||||
qCritical(t.toUtf8().constData());
|
qCritical("%s", qPrintable(t));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ QString CMakeBuildStepConfigWidget::displayName() const
|
|||||||
return "CMake";
|
return "CMake";
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeBuildStepConfigWidget::init(const QString &buildConfiguration)
|
void CMakeBuildStepConfigWidget::init(const QString & /*buildConfiguration */)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
@@ -121,12 +121,12 @@ ProjectExplorer::BuildStep *CMakeBuildStepFactory::create(ProjectExplorer::Proje
|
|||||||
return new CMakeStep(pro);
|
return new CMakeStep(pro);
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList CMakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
|
QStringList CMakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
|
||||||
{
|
{
|
||||||
return QStringList();
|
return QStringList();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString CMakeBuildStepFactory::displayNameForName(const QString &name) const
|
QString CMakeBuildStepFactory::displayNameForName(const QString & /* name */) const
|
||||||
{
|
{
|
||||||
return "CMake";
|
return "CMake";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ QString MakeBuildStepConfigWidget::displayName() const
|
|||||||
return "Make";
|
return "Make";
|
||||||
}
|
}
|
||||||
|
|
||||||
void MakeBuildStepConfigWidget::init(const QString &buildConfiguration)
|
void MakeBuildStepConfigWidget::init(const QString & /* buildConfiguration */)
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
@@ -115,12 +115,12 @@ ProjectExplorer::BuildStep *MakeBuildStepFactory::create(ProjectExplorer::Projec
|
|||||||
return new MakeStep(pro);
|
return new MakeStep(pro);
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
|
QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
|
||||||
{
|
{
|
||||||
return QStringList();
|
return QStringList();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString MakeBuildStepFactory::displayNameForName(const QString &name) const
|
QString MakeBuildStepFactory::displayNameForName(const QString & /* name */) const
|
||||||
{
|
{
|
||||||
return "Make";
|
return "Make";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,12 +49,12 @@ QKeySequence INavigationWidgetFactory::activationSequence()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void INavigationWidgetFactory::saveSettings(int position, QWidget *widget)
|
void INavigationWidgetFactory::saveSettings(int /* position */, QWidget * /* widget */)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void INavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
|
void INavigationWidgetFactory::restoreSettings(int /* position */, QWidget * /* widget */)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -476,7 +476,7 @@ static inline QString trimFileSpecification(QString fileSpec)
|
|||||||
// Collapse the sequence of spaces
|
// Collapse the sequence of spaces
|
||||||
const int filePos = colonIndex + 2;
|
const int filePos = colonIndex + 2;
|
||||||
int nonBlankPos = filePos;
|
int nonBlankPos = filePos;
|
||||||
for ( ; fileSpec.at(nonBlankPos).isSpace(); nonBlankPos++);
|
for ( ; fileSpec.at(nonBlankPos).isSpace(); nonBlankPos++) ;
|
||||||
if (nonBlankPos > filePos)
|
if (nonBlankPos > filePos)
|
||||||
fileSpec.remove(filePos, nonBlankPos - filePos);
|
fileSpec.remove(filePos, nonBlankPos - filePos);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ QString PerforceEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock)
|
|||||||
// Ask plugin to map back
|
// Ask plugin to map back
|
||||||
const QString fileName = m_plugin->fileNameFromPerforceName(diffFileName.trimmed(), &errorMessage);
|
const QString fileName = m_plugin->fileNameFromPerforceName(diffFileName.trimmed(), &errorMessage);
|
||||||
if (fileName.isEmpty())
|
if (fileName.isEmpty())
|
||||||
qWarning(errorMessage.toUtf8().constData());
|
qWarning("%s", qPrintable(errorMessage));
|
||||||
return fileName;
|
return fileName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,7 +207,8 @@ int FileWatcher::m_objectCount = 0;
|
|||||||
QHash<QString,int> FileWatcher::m_fileCount;
|
QHash<QString,int> FileWatcher::m_fileCount;
|
||||||
QFileSystemWatcher *FileWatcher::m_watcher = 0;
|
QFileSystemWatcher *FileWatcher::m_watcher = 0;
|
||||||
|
|
||||||
FileWatcher::FileWatcher(QObject *parent)
|
FileWatcher::FileWatcher(QObject *parent) :
|
||||||
|
QObject(parent)
|
||||||
{
|
{
|
||||||
if (!m_watcher)
|
if (!m_watcher)
|
||||||
m_watcher = new QFileSystemWatcher();
|
m_watcher = new QFileSystemWatcher();
|
||||||
|
|||||||
Reference in New Issue
Block a user