Commit 8df7fbc6 authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Compile fix for pedantic C++ compilers.

Get rid of all those ugly stray semicolons. They are not valid C++.
parent 61493f3e
......@@ -67,8 +67,8 @@
using namespace ExtensionSystem;
Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*);
Q_DECLARE_METATYPE(ExtensionSystem::PluginCollection*);
Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*)
Q_DECLARE_METATYPE(ExtensionSystem::PluginCollection*)
/*!
\fn PluginView::PluginView(PluginManager *manager, QWidget *parent)
......
......@@ -93,6 +93,6 @@ private:
} //QmlEditorWidgets
QML_DECLARE_TYPE(QmlEditorWidgets::ColorBox);
QML_DECLARE_TYPE(QmlEditorWidgets::ColorBox)
#endif //COLORBOX_H
......@@ -69,6 +69,6 @@ private:
} //QmlEditorWidgets
QML_DECLARE_TYPE(QmlEditorWidgets::ColorButton);
QML_DECLARE_TYPE(QmlEditorWidgets::ColorButton)
#endif //COLORBUTTON_H
......@@ -70,6 +70,6 @@ private:
} //QmlEditorWidgets
QML_DECLARE_TYPE(QmlEditorWidgets::HueControl);
QML_DECLARE_TYPE(QmlEditorWidgets::HueControl)
#endif //HUECONTROL_H
......@@ -48,7 +48,7 @@
#include <QtCore/QCoreApplication>
#include <QtDebug>
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*);
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
using namespace Core;
using namespace Core::Internal;
......
......@@ -40,7 +40,7 @@
#include <QtGui/QHeaderView>
#include <QtGui/QCheckBox>
Q_DECLARE_METATYPE(Core::IFile*);
Q_DECLARE_METATYPE(Core::IFile*)
using namespace Core;
using namespace Core::Internal;
......
......@@ -50,7 +50,7 @@
#include <QtCore/QCoreApplication>
#include <QtDebug>
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*);
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
using namespace Core;
using namespace Core::Internal;
......
......@@ -2609,9 +2609,9 @@ void GdbEngine::handleShowModuleSymbols(const GdbResponse &response)
Symbols rc;
QFile file(fileName);
file.open(QIODevice::ReadOnly);
// Object file /opt/dev/qt/lib/libQtNetworkMyns.so.4:
// Object file /opt/dev/qt/lib/libQtNetworkMyns.so.4:
// [ 0] A 0x16bd64 _DYNAMIC moc_qudpsocket.cpp
// [12] S 0xe94680 _ZN4myns5QFileC1Ev section .plt myns::QFile::QFile()
// [12] S 0xe94680 _ZN4myns5QFileC1Ev section .plt myns::QFile::QFile()
foreach (const QByteArray &line, file.readAll().split('\n')) {
if (line.isEmpty())
continue;
......@@ -4425,6 +4425,6 @@ void addGdbOptionPages(QList<Core::IOptionsPage *> *opts)
} // namespace Internal
} // namespace Debugger
Q_DECLARE_METATYPE(Debugger::Internal::MemoryAgentCookie);
Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgentCookie);
Q_DECLARE_METATYPE(Debugger::Internal::GdbMi);
Q_DECLARE_METATYPE(Debugger::Internal::MemoryAgentCookie)
Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgentCookie)
Q_DECLARE_METATYPE(Debugger::Internal::GdbMi)
......@@ -174,6 +174,6 @@ void extractGdbVersion(const QString &msg,
} // namespace Internal
} // namespace Debugger
//Q_DECLARE_METATYPE(GdbDebugger::Internal::GdbMi);
//Q_DECLARE_METATYPE(GdbDebugger::Internal::GdbMi)
#endif // DEBUGGER_GDBMI_H
......@@ -219,6 +219,6 @@ QPair<quint64, unsigned> parseGdbSetBreakpointRequest(const QByteArray &cmd);
} // namespace Internal
} // namespace Debugger
Q_DECLARE_METATYPE(Debugger::Internal::MemoryRange);
Q_DECLARE_METATYPE(Debugger::Internal::MemoryRange)
#endif // SYMBIANUTILS_H
......@@ -71,6 +71,6 @@ typedef QList<StackFrame> StackFrames;
} // namespace Internal
} // namespace Debugger
Q_DECLARE_METATYPE(Debugger::Internal::StackFrame);
Q_DECLARE_METATYPE(Debugger::Internal::StackFrame)
#endif // DEBUGGER_STACKFRAME_H
......@@ -95,6 +95,6 @@ private:
} // namespace Internal
} // namespace Debugger
//Q_DECLARE_METATYPE(GdbDebugger::Internal::JsonValue);
//Q_DECLARE_METATYPE(GdbDebugger::Internal::JsonValue)
#endif // DEBUGGER_JSON_H
......@@ -144,7 +144,7 @@ public:
} // namespace Internal
} // namespace Debugger
Q_DECLARE_METATYPE(Debugger::Internal::WatchData);
Q_DECLARE_METATYPE(Debugger::Internal::WatchData)
#endif // DEBUGGER_WATCHDATA_H
......@@ -137,7 +137,7 @@ private:
} // namespace Internal
} // namespace FakeVim
Q_DECLARE_METATYPE(FakeVim::Internal::ExCommand);
Q_DECLARE_METATYPE(FakeVim::Internal::ExCommand)
#endif // FAKEVIM_HANDLER_H
......@@ -283,7 +283,7 @@ struct CommandItem
QTreeWidgetItem *m_item;
};
Q_DECLARE_METATYPE(CommandItem *);
Q_DECLARE_METATYPE(CommandItem *)
namespace FakeVim {
namespace Internal {
......@@ -753,8 +753,8 @@ static int moveRightWeight(const QRect &cursor, const QRect &other)
if (dx < 0)
return -1;
int w = 10000 * dx;
int dy1 = cursor.top() - other.bottom();
int dy2 = cursor.bottom() - other.top();
int dy1 = cursor.top() - other.bottom();
int dy2 = cursor.bottom() - other.top();
w += dy1 * (dy1 > 0);
w += dy2 * (dy2 > 0);
qDebug() << " DX: " << dx << dy1 << dy2 << w;
......@@ -767,8 +767,8 @@ static int moveLeftWeight(const QRect &cursor, const QRect &other)
if (dx < 0)
return -1;
int w = 10000 * dx;
int dy1 = cursor.top() - other.bottom();
int dy2 = cursor.bottom() - other.top();
int dy1 = cursor.top() - other.bottom();
int dy2 = cursor.bottom() - other.top();
w += dy1 * (dy1 > 0);
w += dy2 * (dy2 > 0);
return w;
......@@ -780,8 +780,8 @@ static int moveUpWeight(const QRect &cursor, const QRect &other)
if (dy < 0)
return -1;
int w = 10000 * dy;
int dx1 = cursor.left() - other.right();
int dx2 = cursor.right() - other.left();
int dx1 = cursor.left() - other.right();
int dx2 = cursor.right() - other.left();
w += dx1 * (dx1 > 0);
w += dx2 * (dx2 > 0);
return w;
......@@ -793,8 +793,8 @@ static int moveDownWeight(const QRect &cursor, const QRect &other)
if (dy < 0)
return -1;
int w = 10000 * dy;
int dx1 = cursor.left() - other.right();
int dx2 = cursor.right() - other.left();
int dx1 = cursor.left() - other.right();
int dx2 = cursor.right() - other.left();
w += dx1 * (dx1 > 0);
w += dx2 * (dx2 > 0);
return w;
......@@ -863,7 +863,7 @@ void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
QRect editorRect(w->mapToGlobal(w->geometry().topLeft()),
w->mapToGlobal(w->geometry().bottomRight()));
//qDebug() << " EDITOR: " << editorRect << editor;
int value = f(cursorRect, editorRect);
if (value != -1 && value < bestValue) {
bestValue = value;
......
......@@ -42,7 +42,7 @@ using namespace Locator;
using namespace Help;
using namespace Help::Internal;
Q_DECLARE_METATYPE(ILocatorFilter*);
Q_DECLARE_METATYPE(ILocatorFilter*)
HelpIndexFilter::HelpIndexFilter()
{
......
......@@ -36,7 +36,7 @@
using namespace Locator;
using namespace Locator::Internal;
Q_DECLARE_METATYPE(ILocatorFilter*);
Q_DECLARE_METATYPE(ILocatorFilter*)
LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin,
LocatorWidget *locatorWidget):
......
......@@ -65,8 +65,8 @@
#include <QtGui/QScrollBar>
#include <QtGui/QTreeView>
Q_DECLARE_METATYPE(Locator::ILocatorFilter*);
Q_DECLARE_METATYPE(Locator::FilterEntry);
Q_DECLARE_METATYPE(Locator::ILocatorFilter*)
Q_DECLARE_METATYPE(Locator::FilterEntry)
namespace Locator {
namespace Internal {
......
......@@ -138,7 +138,7 @@ signals:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *);
Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *)
// Default directory to run custom (build) commands in.
#define DEFAULT_WORKING_DIR "%{buildDir}"
......
......@@ -83,6 +83,6 @@ private:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *);
Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *)
#endif // PROJECTEXPLORER_BUILDSTEPLIST_H
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