[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/kolourpaint
From: Martin Koller <kollix () aon ! at>
Date: 2011-01-12 21:04:54
Message-ID: 20110112210454.07BB2AC8B3 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1214080 by mkoller:
get rid of Qt bug workarounds since the bugs have been solved in the meantime
M +0 -2 CMakeLists.txt
M +0 -1 commands/tools/polygonal/kpToolPolygonalCommand.cpp
M +0 -1 commands/tools/rectangular/kpToolRectangularCommand.cpp
D compat (directory)
M +2 -3 imagelib/kpPainter.cpp
M +4 -5 imagelib/transforms/kpTransformAutoCrop.cpp
M +0 -1 tools/flow/kpToolColorEraser.cpp
M +0 -1 tools/flow/kpToolFlowBase.cpp
M +1 -2 tools/flow/kpToolFlowPixmapBase.cpp
M +1 -2 tools/flow/kpToolPen.cpp
M +1 -2 tools/flow/kpToolSpraycan.cpp
M +0 -1 tools/kpTool.cpp
M +1 -2 tools/kpTool_Drawing.cpp
M +0 -1 tools/kpTool_KeyboardEvents.cpp
M +0 -1 tools/kpTool_MouseEvents.cpp
M +0 -1 tools/kpTool_OtherEvents.cpp
M +0 -1 tools/kpTool_UserNotifications.cpp
M +0 -1 tools/kpTool_Utilities.cpp
M +0 -1 tools/polygonal/kpToolPolygonalBase.cpp
M +0 -1 tools/rectangular/kpToolRectangularBase.cpp
M +0 -1 tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
M +1 -3 tools/selection/kpAbstractSelectionTool.cpp
M +0 -1 tools/selection/kpAbstractSelectionTool_Create.cpp
M +0 -1 tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
M +0 -1 tools/selection/kpAbstractSelectionTool_Move.cpp
M +0 -1 tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
M +0 -1 tools/selection/text/kpToolText.cpp
M +0 -1 tools/selection/text/kpToolText_CursorCalc.cpp
M +0 -1 tools/selection/text/kpToolText_InputMethodEvents.cpp
M +0 -1 tools/selection/text/kpToolText_KeyboardEvents.cpp
M +0 -1 tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
M +0 -1 tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
M +0 -1 tools/selection/text/kpToolText_TextStyle.cpp
M +2 -3 widgets/toolbars/kpToolToolBar.cpp
--- trunk/KDE/kdegraphics/kolourpaint/CMakeLists.txt #1214079:1214080
@@ -143,7 +143,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextEnterCommand.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextInsertCommand.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/compat/kpBug.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorLightCross.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorProvider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects/kpEffectsDialog.cpp
@@ -377,7 +376,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextEnterCommand.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextInsertCommand.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/compat/kpBug.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorLightCross.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorProvider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects/kpEffectsDialog.cpp
--- trunk/KDE/kdegraphics/kolourpaint/commands/tools/polygonal/kpToolPolygonalCommand.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpDocument.h>
#include <kpDefs.h>
#include <kpImage.h>
--- trunk/KDE/kdegraphics/kolourpaint/commands/tools/rectangular/kpToolRectangularCommand.cpp \
#1214079:1214080 @@ -40,7 +40,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/imagelib/kpPainter.cpp #1214079:1214080
@@ -41,7 +41,6 @@
#include <kdebug.h>
#include <krandom.h>
-#include <kpBug.h>
#include <kpImage.h>
#include <kpPixmapFX.h>
#include <kpTool.h>
@@ -376,8 +375,8 @@
// Get the rectangle that bounds the changes and the pixmap for that
// rectangle.
- const QRect normalizedRect = kpBug::QRect_Normalized (
- QRect (pack.startPoint, pack.endPoint));
+ const QRect normalizedRect =
+ QRect (pack.startPoint, pack.endPoint).normalized();
pack.readableImageRect = kpTool::neededRect (normalizedRect,
qMax (pack.penWidth, pack.penHeight));
#if DEBUG_KP_PAINTER
--- trunk/KDE/kdegraphics/kolourpaint/imagelib/transforms/kpTransformAutoCrop.cpp \
#1214079:1214080 @@ -56,7 +56,6 @@
#include <kmessagebox.h>
#include <kpAbstractImageSelection.h>
-#include <kpBug.h>
#include <kpColorToolBar.h>
#include <kpCommandEnvironment.h>
#include <kpCommandHistory.h>
@@ -237,9 +236,9 @@
if (numCols)
{
- m_rect = kpBug::QRect_Normalized (
+ m_rect =
QRect (QPoint (startX, 0),
- QPoint (startX + (numCols - 1) * dir, maxY)));
+ QPoint (startX + (numCols - 1) * dir, maxY)).normalized();
m_referenceColor = col;
}
}
@@ -268,9 +267,9 @@
if (numRows)
{
- m_rect = kpBug::QRect_Normalized (
+ m_rect =
QRect (QPoint (0, startY),
- QPoint (maxX, startY + (numRows - 1) * dir)));
+ QPoint (maxX, startY + (numRows - 1) * dir)).normalized();
m_referenceColor = col;
}
}
--- trunk/KDE/kdegraphics/kolourpaint/tools/flow/kpToolColorEraser.cpp \
#1214079:1214080 @@ -39,7 +39,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/flow/kpToolFlowBase.cpp #1214079:1214080
@@ -41,7 +41,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpCommandHistory.h>
#include <kpCursorProvider.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/flow/kpToolFlowPixmapBase.cpp \
#1214079:1214080 @@ -30,7 +30,6 @@
#include <qbitmap.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpDocument.h>
#include <kpPainter.h>
@@ -71,7 +70,7 @@
QRect kpToolFlowPixmapBase::drawLine (const QPoint &thisPoint, const QPoint \
&lastPoint) {
- QRect docRect = kpBug::QRect_Normalized (QRect (thisPoint, lastPoint));
+ QRect docRect = QRect (thisPoint, lastPoint).normalized();
docRect = neededRect (docRect, qMax (brushWidth (), brushHeight ()));
kpImage image = document ()->getImageAt (docRect);
--- trunk/KDE/kdegraphics/kolourpaint/tools/flow/kpToolPen.cpp #1214079:1214080
@@ -34,7 +34,6 @@
#include <klocale.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpDocument.h>
#include <kpImage.h>
@@ -100,7 +99,7 @@
// protected virtual [base kpToolFlowBase]
QRect kpToolPen::drawLine (const QPoint &thisPoint, const QPoint &lastPoint)
{
- QRect docRect = kpBug::QRect_Normalized (QRect (thisPoint, lastPoint));
+ QRect docRect = QRect (thisPoint, lastPoint).normalized();
docRect = neededRect (docRect, 1/*pen width*/);
kpImage image = document ()->getImageAt (docRect);
--- trunk/KDE/kdegraphics/kolourpaint/tools/flow/kpToolSpraycan.cpp #1214079:1214080
@@ -43,7 +43,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpPainter.h>
@@ -144,7 +143,7 @@
// For efficiency, only get image after NOP check above.
- QRect docRect = kpBug::QRect_Normalized (QRect (thisPoint, lastPoint));
+ QRect docRect = QRect (thisPoint, lastPoint).normalized();
docRect = neededRect (docRect, spraycanSize ());
kpImage image = document ()->getImageAt (docRect);
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool.cpp #1214079:1214080
@@ -54,7 +54,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_Drawing.cpp #1214079:1214080
@@ -54,7 +54,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
@@ -120,7 +119,7 @@
// protected
QRect kpTool::normalizedRect () const
{
- return kpBug::QRect_Normalized (QRect (d->startPoint, d->currentPoint));
+ return QRect (d->startPoint, d->currentPoint).normalized();
}
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_KeyboardEvents.cpp \
#1214079:1214080 @@ -54,7 +54,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_MouseEvents.cpp #1214079:1214080
@@ -54,7 +54,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_OtherEvents.cpp #1214079:1214080
@@ -56,7 +56,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_UserNotifications.cpp \
#1214079:1214080 @@ -53,7 +53,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_Utilities.cpp #1214079:1214080
@@ -54,7 +54,6 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpColorToolBar.h>
#include <kpCommandSize.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/polygonal/kpToolPolygonalBase.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/rectangular/kpToolRectangularBase.cpp \
#1214079:1214080 @@ -40,7 +40,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpColor.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kpAbstractImageSelection.h>
#include <kpAbstractSelection.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool.cpp \
#1214079:1214080 @@ -41,7 +41,6 @@
#include <kpAbstractSelection.h>
#include <kpAbstractSelectionContentCommand.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
@@ -387,8 +386,7 @@
if (hasBegunShape ())
{
endShape (currentPoint (),
- kpBug::QRect_Normalized (
- QRect (startPoint ()/* TODO: wrong */, currentPoint ())));
+ QRect (startPoint ()/* TODO: wrong */, currentPoint \
()).normalized()); }
d->drawType = calculateDrawType ();
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_Create.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kpAbstractImageSelection.h>
#include <kpAbstractSelection.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kpAbstractImageSelection.h>
#include <kpAbstractSelection.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_Move.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kpAbstractImageSelection.h>
#include <kpAbstractSelection.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp \
#1214079:1214080 @@ -47,7 +47,6 @@
#include <kpAbstractImageSelection.h>
#include <kpAbstractSelection.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDefs.h>
#include <kpDocument.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText.cpp \
#1214079:1214080 @@ -39,7 +39,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_CursorCalc.cpp \
#1214079:1214080 @@ -36,7 +36,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
#include <kpToolTextBackspaceCommand.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_InputMethodEvents.cpp \
#1214079:1214080 @@ -38,7 +38,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
#include <kpToolTextBackspaceCommand.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents.cpp \
#1214079:1214080 @@ -37,7 +37,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp \
#1214079:1214080 @@ -37,7 +37,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp \
#1214079:1214080 @@ -37,7 +37,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/text/kpToolText_TextStyle.cpp \
#1214079:1214080 @@ -37,7 +37,6 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kpBug.h>
#include <kpCommandHistory.h>
#include <kpDocument.h>
#include <kpTextSelection.h>
--- trunk/KDE/kdegraphics/kolourpaint/widgets/toolbars/kpToolToolBar.cpp \
#1214079:1214080 @@ -50,7 +50,6 @@
#include <KIconLoader>
#include <ksharedconfig.h>
-#include <kpBug.h>
#include <kpDefs.h>
#include <kpTool.h>
#include <kpToolAction.h>
@@ -341,7 +340,7 @@
}
else
{
- QAbstractButton *b = kpBug::QButtonGroup_CheckedButton (m_buttonGroup);
+ QAbstractButton *b = m_buttonGroup->checkedButton();
#if DEBUG_KP_TOOL_TOOL_BAR
kDebug () << "\twant to select no tool - button selected=" << b;
#endif
@@ -439,7 +438,7 @@
// private slot
void kpToolToolBar::slotToolButtonClicked ()
{
- QAbstractButton *b = kpBug::QButtonGroup_CheckedButton (m_buttonGroup);
+ QAbstractButton *b = m_buttonGroup->checkedButton();
#if DEBUG_KP_TOOL_TOOL_BAR
kDebug () << "kpToolToolBar::slotToolButtonClicked() button=" << b;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic