Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
5948e284
Commit
5948e284
authored
Oct 05, 2009
by
Friedemann Kleint
Browse files
Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor -> Designer::FormWindowEditor.
parent
406d35ac
Changes
249
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/abstractprocess.h
View file @
5948e284
...
...
@@ -34,7 +34,6 @@
#include
<QtCore/QStringList>
namespace
Core
{
namespace
Utils
{
class
QTCREATOR_UTILS_EXPORT
AbstractProcess
...
...
@@ -75,7 +74,6 @@ private:
};
}
//namespace Utils
}
//namespace Core
#endif // ABSTRACTPROCESS_H
src/libs/utils/abstractprocess_win.cpp
View file @
5948e284
...
...
@@ -31,7 +31,6 @@
#include
<windows.h>
namespace
Core
{
namespace
Utils
{
QStringList
AbstractProcess
::
fixWinEnvironment
(
const
QStringList
&
env
)
...
...
@@ -114,4 +113,3 @@ QByteArray AbstractProcess::createWinEnvironment(const QStringList &env)
}
}
//namespace Utils
}
//namespace Core
src/libs/utils/basevalidatinglineedit.cpp
View file @
5948e284
...
...
@@ -33,7 +33,6 @@
enum
{
debug
=
0
};
namespace
Core
{
namespace
Utils
{
struct
BaseValidatingLineEditPrivate
{
...
...
@@ -156,4 +155,3 @@ void BaseValidatingLineEdit::triggerChanged()
}
}
// namespace Utils
}
// namespace Core
src/libs/utils/basevalidatinglineedit.h
View file @
5948e284
...
...
@@ -34,7 +34,6 @@
#include
<QtGui/QLineEdit>
namespace
Core
{
namespace
Utils
{
struct
BaseValidatingLineEditPrivate
;
...
...
@@ -98,6 +97,5 @@ private:
};
}
// namespace Utils
}
// namespace Core
#endif // BASEVALIDATINGLINEEDIT_H
src/libs/utils/checkablemessagebox.cpp
View file @
5948e284
...
...
@@ -4,7 +4,6 @@
#include
<QtGui/QPushButton>
#include
<QtCore/QDebug>
namespace
Core
{
namespace
Utils
{
struct
CheckableMessageBoxPrivate
{
...
...
@@ -147,4 +146,3 @@ QMessageBox::StandardButton CheckableMessageBox::dialogButtonBoxToMessageBoxButt
}
}
// namespace Utils
}
// namespace Core
src/libs/utils/checkablemessagebox.h
View file @
5948e284
...
...
@@ -7,7 +7,6 @@
#include
<QtGui/QMessageBox>
#include
<QtGui/QDialog>
namespace
Core
{
namespace
Utils
{
struct
CheckableMessageBoxPrivate
;
...
...
@@ -72,6 +71,5 @@ private:
};
}
// namespace Utils
}
// namespace Core
#endif // CHECKABLEMESSAGEBOX_H
src/libs/utils/checkablemessagebox.ui
View file @
5948e284
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
Core::
Utils::CheckableMessageBox
</class>
<widget
class=
"QDialog"
name=
"
Core::
Utils::CheckableMessageBox"
>
<class>
Utils::CheckableMessageBox
</class>
<widget
class=
"QDialog"
name=
"Utils::CheckableMessageBox"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
@@ -121,7 +121,7 @@
<connection>
<sender>
buttonBox
</sender>
<signal>
accepted()
</signal>
<receiver>
Core::
Utils::CheckableMessageBox
</receiver>
<receiver>
Utils::CheckableMessageBox
</receiver>
<slot>
accept()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
...
...
@@ -137,7 +137,7 @@
<connection>
<sender>
buttonBox
</sender>
<signal>
rejected()
</signal>
<receiver>
Core::
Utils::CheckableMessageBox
</receiver>
<receiver>
Utils::CheckableMessageBox
</receiver>
<slot>
reject()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
...
...
src/libs/utils/classnamevalidatinglineedit.cpp
View file @
5948e284
...
...
@@ -34,7 +34,6 @@
#include
<QtCore/QDebug>
#include
<QtCore/QRegExp>
namespace
Core
{
namespace
Utils
{
struct
ClassNameValidatingLineEditPrivate
{
...
...
@@ -58,7 +57,7 @@ ClassNameValidatingLineEditPrivate:: ClassNameValidatingLineEditPrivate() :
// --------------------- ClassNameValidatingLineEdit
ClassNameValidatingLineEdit
::
ClassNameValidatingLineEdit
(
QWidget
*
parent
)
:
Core
::
Utils
::
BaseValidatingLineEdit
(
parent
),
Utils
::
BaseValidatingLineEdit
(
parent
),
m_d
(
new
ClassNameValidatingLineEditPrivate
)
{
}
...
...
@@ -98,7 +97,7 @@ bool ClassNameValidatingLineEdit::validate(const QString &value, QString *errorM
void
ClassNameValidatingLineEdit
::
slotChanged
(
const
QString
&
t
)
{
Core
::
Utils
::
BaseValidatingLineEdit
::
slotChanged
(
t
);
Utils
::
BaseValidatingLineEdit
::
slotChanged
(
t
);
if
(
isValid
())
{
// Suggest file names, strip namespaces
QString
fileName
=
m_d
->
m_lowerCaseFileName
?
t
.
toLower
()
:
t
;
...
...
@@ -148,4 +147,3 @@ void ClassNameValidatingLineEdit::setLowerCaseFileName(bool v)
}
}
// namespace Utils
}
// namespace Core
src/libs/utils/classnamevalidatinglineedit.h
View file @
5948e284
...
...
@@ -33,7 +33,6 @@
#include
"utils_global.h"
#include
"basevalidatinglineedit.h"
namespace
Core
{
namespace
Utils
{
struct
ClassNameValidatingLineEditPrivate
;
...
...
@@ -42,7 +41,7 @@ struct ClassNameValidatingLineEditPrivate;
* to derive suggested file names from it. */
class
QTCREATOR_UTILS_EXPORT
ClassNameValidatingLineEdit
:
public
Core
::
Utils
::
BaseValidatingLineEdit
:
public
Utils
::
BaseValidatingLineEdit
{
Q_DISABLE_COPY
(
ClassNameValidatingLineEdit
)
Q_PROPERTY
(
bool
namespacesEnabled
READ
namespacesEnabled
WRITE
setNamespacesEnabled
DESIGNABLE
true
)
...
...
@@ -76,6 +75,5 @@ private:
};
}
// namespace Utils
}
// namespace Core
#endif // CLASSNAMEVALIDATINGLINEEDIT_H
src/libs/utils/codegeneration.cpp
View file @
5948e284
...
...
@@ -33,7 +33,6 @@
#include
<QtCore/QStringList>
#include
<QtCore/QFileInfo>
namespace
Core
{
namespace
Utils
{
static
QString
toAlphaNum
(
const
QString
&
s
)
...
...
@@ -101,4 +100,3 @@ void writeClosingNameSpaces(const QStringList &l, const QString &indent,
}
}
// namespace Utils
}
// namespace Core
src/libs/utils/codegeneration.h
View file @
5948e284
...
...
@@ -38,7 +38,6 @@ class QTextStream;
class
QStringList
;
QT_END_NAMESPACE
namespace
Core
{
namespace
Utils
{
QTCREATOR_UTILS_EXPORT
QString
headerGuard
(
const
QString
&
file
);
...
...
@@ -62,6 +61,5 @@ void writeClosingNameSpaces(const QStringList &namespaces,
QTextStream
&
str
);
}
// namespace Utils
}
// namespace Core
#endif // CODEGENERATION_H
src/libs/utils/consoleprocess.cpp
View file @
5948e284
...
...
@@ -29,7 +29,6 @@
#include
"consoleprocess.h"
namespace
Core
{
namespace
Utils
{
QString
ConsoleProcess
::
modeOption
(
Mode
m
)
...
...
@@ -83,4 +82,3 @@ QString ConsoleProcess::msgCannotExecute(const QString & p, const QString &why)
}
}
}
src/libs/utils/consoleprocess.h
View file @
5948e284
...
...
@@ -51,7 +51,6 @@ class QSettings;
class
QTemporaryFile
;
QT_END_NAMESPACE
namespace
Core
{
namespace
Utils
{
class
QTCREATOR_UTILS_EXPORT
ConsoleProcess
:
public
QObject
,
public
AbstractProcess
...
...
@@ -138,6 +137,5 @@ private:
};
}
//namespace Utils
}
//namespace Core
#endif
src/libs/utils/consoleprocess_unix.cpp
View file @
5948e284
...
...
@@ -42,7 +42,7 @@
#include
<string.h>
#include
<unistd.h>
using
namespace
Core
::
Utils
;
using
namespace
Utils
;
ConsoleProcess
::
ConsoleProcess
(
QObject
*
parent
)
:
QObject
(
parent
),
...
...
src/libs/utils/consoleprocess_win.cpp
View file @
5948e284
...
...
@@ -40,7 +40,7 @@
#include
<stdlib.h>
using
namespace
Core
::
Utils
;
using
namespace
Utils
;
ConsoleProcess
::
ConsoleProcess
(
QObject
*
parent
)
:
QObject
(
parent
),
...
...
src/libs/utils/fancylineedit.cpp
View file @
5948e284
...
...
@@ -39,7 +39,6 @@
enum
{
margin
=
6
};
namespace
Core
{
namespace
Utils
{
static
inline
QString
sideToStyleSheetString
(
FancyLineEdit
::
Side
side
)
...
...
@@ -311,4 +310,3 @@ QString FancyLineEdit::typedText() const
}
}
// namespace Utils
}
// namespace Core
src/libs/utils/fancylineedit.h
View file @
5948e284
...
...
@@ -34,7 +34,6 @@
#include
<QtGui/QLineEdit>
namespace
Core
{
namespace
Utils
{
class
FancyLineEditPrivate
;
...
...
@@ -107,6 +106,5 @@ private:
};
}
// namespace Utils
}
// namespace Core
#endif // FANCYLINEEDIT_H
src/libs/utils/fancymainwindow.cpp
View file @
5948e284
...
...
@@ -35,7 +35,7 @@
#include
<QtCore/QSettings>
using
namespace
Core
::
Utils
;
using
namespace
Utils
;
FancyMainWindow
::
FancyMainWindow
(
QWidget
*
parent
)
:
QMainWindow
(
parent
),
...
...
src/libs/utils/fancymainwindow.h
View file @
5948e284
...
...
@@ -41,7 +41,6 @@ QT_BEGIN_NAMESPACE
class
QSettings
;
QT_END_NAMESPACE
namespace
Core
{
namespace
Utils
{
class
QTCREATOR_UTILS_EXPORT
FancyMainWindow
:
public
QMainWindow
...
...
@@ -85,6 +84,5 @@ private:
};
}
// namespace Utils
}
// namespace Core
#endif // FANCYMAINWINDOW_H
src/libs/utils/filenamevalidatinglineedit.cpp
View file @
5948e284
...
...
@@ -33,7 +33,6 @@
#include
<QtCore/QRegExp>
#include
<QtCore/QDebug>
namespace
Core
{
namespace
Utils
{
#define WINDOWS_DEVICES "CON|AUX|PRN|COM1|COM2|LPT1|LPT2|NUL"
...
...
@@ -133,4 +132,3 @@ bool FileNameValidatingLineEdit::validate(const QString &value, QString *errorM
}
}
// namespace Utils
}
// namespace Core
Prev
1
2
3
4
5
…
13
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment