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

Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces.

Browse Source 
If this macro is used inside a namespace, it hides global operators.

Reviewed-by: hjk
This commit is contained in:
ck
2010-01-07 13:53:48 +01:00
parent 9a0baca9a5
commit dedea5ea19
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cpptools/searchsymbols.h
View File

@@ -134,11 +134,10 @@ private:
bool separateScope; bool separateScope;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(SearchSymbols::SymbolTypes)
} // namespace Internal } // namespace Internal
} // namespace CppTools } // namespace CppTools
Q_DECLARE_OPERATORS_FOR_FLAGS(CppTools::Internal::SearchSymbols::SymbolTypes)
Q_DECLARE_METATYPE(CppTools::Internal::ModelItemInfo) Q_DECLARE_METATYPE(CppTools::Internal::ModelItemInfo)
#endif // SEARCHSYMBOLS_H #endif // SEARCHSYMBOLS_H

4
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -179,8 +179,6 @@ private:
mutable QString m_linguistCommand; mutable QString m_linguistCommand;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(QtVersion::QmakeBuildConfigs)
struct QMakeAssignment struct QMakeAssignment
{ {
QString variable; QString variable;
@@ -255,4 +253,6 @@ private:
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager
Q_DECLARE_OPERATORS_FOR_FLAGS(Qt4ProjectManager::QtVersion::QmakeBuildConfigs)
#endif // QTVERSIONMANAGER_H #endif // QTVERSIONMANAGER_H