[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kolourpaint] /: QString::null -> QString()
From: Martin Koller <kollix () aon ! at>
Date: 2011-09-01 8:27:20
Message-ID: 20110901082720.0C940A6078 () git ! kde ! org
[Download RAW message or body]
Git commit 53b80340cd293aba77aef2a0d576677a0a7df5bd by Martin Koller.
Committed on 01/09/2011 at 10:26.
Pushed by mkoller into branch 'master'.
QString::null -> QString()
M +1 -1 dialogs/imagelib/effects/kpEffectsDialog.cpp
M +1 -3 imagelib/kpDocumentMetaInfo.cpp
M +5 -5 kpViewScrollableContainer.cpp
M +2 -2 mainWindow/kpMainWindow_Edit.cpp
M +1 -1 imagelib/transforms/kpTransformCrop_TextSelection.cpp
M +1 -1 tools/selection/kpAbstractSelectionTool_Move.cpp
M +1 -1 tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
M +1 -1 tools/selection/text/kpToolText.cpp
M +2 -2 mainWindow/kpMainWindow_Image.cpp
M +1 -1 tools/selection/image/kpAbstractImageSelectionTool.cpp
http://commits.kde.org/kolourpaint/53b80340cd293aba77aef2a0d576677a0a7df5bd
diff --git a/dialogs/imagelib/effects/kpEffectsDialog.cpp \
b/dialogs/imagelib/effects/kpEffectsDialog.cpp index 2b67466..1f9326f 100644
--- a/dialogs/imagelib/effects/kpEffectsDialog.cpp
+++ b/dialogs/imagelib/effects/kpEffectsDialog.cpp
@@ -231,7 +231,7 @@ void kpEffectsDialog::selectEffect (int which)
m_effectWidget = 0;
- m_settingsGroupBox->setWindowTitle \
(QString::null); //krazy:exclude=nullstrassign for old broken gcc + \
m_settingsGroupBox->setWindowTitle(QString());
#define CREATE_EFFECT_WIDGET(name) \
m_effectWidget = new name (m_actOnSelection, m_settingsGroupBox)
diff --git a/imagelib/kpDocumentMetaInfo.cpp b/imagelib/kpDocumentMetaInfo.cpp
index bb6f6b1..55fb55b 100644
--- a/imagelib/kpDocumentMetaInfo.cpp
+++ b/imagelib/kpDocumentMetaInfo.cpp
@@ -137,9 +137,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const \
kpDocumentMetaInfo &rhs // public
void kpDocumentMetaInfo::printDebug (const QString &prefix) const
{
- const QString usedPrefix = !prefix.isEmpty () ?
- QString(prefix + QLatin1String (":")) :
- QString::null; //krazy:exclude=nullstrassign for \
old broken gcc + const QString usedPrefix = !prefix.isEmpty() ? QString(prefix + \
QLatin1String(":")) : QString();
kDebug () << usedPrefix;
diff --git a/imagelib/transforms/kpTransformCrop_TextSelection.cpp \
b/imagelib/transforms/kpTransformCrop_TextSelection.cpp index 0aa787e..b4853bc 100644
--- a/imagelib/transforms/kpTransformCrop_TextSelection.cpp
+++ b/imagelib/transforms/kpTransformCrop_TextSelection.cpp
@@ -62,7 +62,7 @@ void kpTransformCrop_TextSelection (kpMainWindow *mainWindow,
#endif
kpToolSelectionMoveCommand *moveCmd =
new kpToolSelectionMoveCommand (
- QString::null/*uninteresting child of macro cmd*/, \
//krazy:exclusion=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, environ);
moveCmd->moveTo (QPoint (0, 0), true/*move on exec, not now*/);
moveCmd->finalize ();
diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp
index 5f6657d..7ef9f44 100644
--- a/kpViewScrollableContainer.cpp
+++ b/kpViewScrollableContainer.cpp
@@ -318,7 +318,7 @@ void kpGrip::mouseReleaseEvent (QMouseEvent *e)
if ((e->buttons () & Qt::MouseButtonMask) == 0)
{
m_shouldReleaseMouseButtons = false;
- setUserMessage (QString::null); //krazy:exclude=nullstrassigment for old \
broken gcc + setUserMessage(QString());
setCursor (cursorForType (m_type));
releaseKeyboard ();
@@ -362,7 +362,7 @@ void kpGrip::leaveEvent (QEvent * /*e*/)
if (m_startPoint == KP_INVALID_POINT &&
!m_shouldReleaseMouseButtons)
{
- setUserMessage (QString::null); //krazy:exclude=nullstrassigment for old \
broken gcc + setUserMessage(QString());
}
}
@@ -470,9 +470,9 @@ void kpViewScrollableContainer::clearStatusMessage ()
#if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER && 1
kDebug () << "kpViewScrollableContainer::clearStatusMessage()";
#endif
- m_bottomRightGrip->setUserMessage \
(QString::null); //krazy:exclude=nullstrassigment for old broken gcc
- m_bottomGrip->setUserMessage (QString::null); //krazy:exclude=nullstrassigment \
for old broken gcc
- m_rightGrip->setUserMessage (QString::null); //krazy:exclude=nullstrassigment \
for old broken gcc + m_bottomRightGrip->setUserMessage(QString());
+ m_bottomGrip->setUserMessage(QString());
+ m_rightGrip->setUserMessage(QString());
}
//---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp
index 96828cb..54da703 100644
--- a/mainWindow/kpMainWindow_Edit.cpp
+++ b/mainWindow/kpMainWindow_Edit.cpp
@@ -464,7 +464,7 @@ void kpMainWindow::pasteText (const QString &text,
{
macroCmd->addCommand (
new kpToolTextEnterCommand (
- QString::null/*uninteresting child of macroCmd*/, \
//krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macroCmd*/, d->viewManager->textCursorRow (),
d->viewManager->textCursorCol (),
kpToolTextEnterCommand::AddEnterNow,
@@ -473,7 +473,7 @@ void kpMainWindow::pasteText (const QString &text,
macroCmd->addCommand (
new kpToolTextInsertCommand (
- QString::null/*uninteresting child of macroCmd*/, \
//krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macroCmd*/, d->viewManager->textCursorRow (),
d->viewManager->textCursorCol (),
textLines [i],
diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp
index f4ac62b..51e3cc5 100644
--- a/mainWindow/kpMainWindow_Image.cpp
+++ b/mainWindow/kpMainWindow_Image.cpp
@@ -346,7 +346,7 @@ void kpMainWindow::addImageOrSelectionCommand (kpCommand *cmd,
new kpToolSelectionPullFromDocumentCommand (
*imageSel,
backgroundColor (),
- QString::null/*uninteresting child of macro \
cmd*/, //krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, commandEnvironment ()));
}
else if (textSel)
@@ -354,7 +354,7 @@ void kpMainWindow::addImageOrSelectionCommand (kpCommand *cmd,
macroCmd->addCommand (
new kpToolTextGiveContentCommand (
*textSel,
- QString::null/*uninteresting child of macro cmd*/, \
//krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, commandEnvironment ()));
}
else
diff --git a/tools/selection/image/kpAbstractImageSelectionTool.cpp \
b/tools/selection/image/kpAbstractImageSelectionTool.cpp index f2a7ca4..6c817c3 \
100644
--- a/tools/selection/image/kpAbstractImageSelectionTool.cpp
+++ b/tools/selection/image/kpAbstractImageSelectionTool.cpp
@@ -70,7 +70,7 @@ kpAbstractSelectionContentCommand \
*kpAbstractImageSelectionTool::newGiveContentC return new \
kpToolSelectionPullFromDocumentCommand (
*imageSel,
environ ()->backgroundColor (),
- QString::null/*uninteresting child of macro \
cmd*/, //krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, environ ()->commandEnvironment ());
}
diff --git a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp \
b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp index a610436..038124c \
100644
--- a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
+++ b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
@@ -85,7 +85,7 @@ void kpAbstractSelectionTool::keyPressEvent (QKeyEvent *e)
if ( !d->currentMoveCommand )
{
d->currentMoveCommand = new kpToolSelectionMoveCommand(
- QString::null/*uninteresting child of macro \
cmd*/, //krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, environ()->commandEnvironment());
d->currentMoveCommandIsSmear = false;
}
diff --git a/tools/selection/kpAbstractSelectionTool_Move.cpp \
b/tools/selection/kpAbstractSelectionTool_Move.cpp index a99448c..65ee111 100644
--- a/tools/selection/kpAbstractSelectionTool_Move.cpp
+++ b/tools/selection/kpAbstractSelectionTool_Move.cpp
@@ -252,7 +252,7 @@ void kpAbstractSelectionTool::drawMove (const QPoint &thisPoint, \
const QRect &/* if (!d->currentMoveCommand)
{
d->currentMoveCommand = new kpToolSelectionMoveCommand (
- QString::null/*uninteresting child of macro \
cmd*/, //krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, environ ()->commandEnvironment ());
d->currentMoveCommandIsSmear = false;
}
diff --git a/tools/selection/text/kpToolText.cpp \
b/tools/selection/text/kpToolText.cpp index 850761d..9561667 100644
--- a/tools/selection/text/kpToolText.cpp
+++ b/tools/selection/text/kpToolText.cpp
@@ -82,7 +82,7 @@ kpAbstractSelectionContentCommand \
*kpToolText::newGiveContentCommand () const
return new kpToolTextGiveContentCommand (
*textSel,
- QString::null/*uninteresting child of macro \
cmd*/, //krazy:exclude=nullstrassign for old broken gcc + \
QString()/*uninteresting child of macro cmd*/, environ ()->commandEnvironment ());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic