[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/kolourpaint
From: Urs Wolfer <uwolfer () kde ! org>
Date: 2008-04-19 16:56:06
Message-ID: 1208624166.243657.24660.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 798849 by uwolfer:
port away from QT3_SUPPORT
M +0 -2 CMakeLists.txt
M +13 -11 commands/kpCommandHistoryBase.cpp
M +3 -2 commands/kpCommandHistoryBase.h
M +2 -2 commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp
M +10 -10 imagelib/effects/kpEffectBalance.cpp
M +9 -9 mainWindow/kpMainWindow_Edit.cpp
M +2 -2 tools/kpToolZoom.cpp
M +1 -1 tools/kpTool_MouseEvents.cpp
M +1 -1 tools/selection/kpAbstractSelectionTool_Create.cpp
M +1 -1 tools/selection/kpAbstractSelectionTool_Move.cpp
--- trunk/KDE/kdegraphics/kolourpaint/CMakeLists.txt #798848:798849
@@ -1,7 +1,5 @@
project(kolourpaint4)
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
include_directories(
# GENERATED BY ./gen_cmake_include_dirs
--- trunk/KDE/kdegraphics/kolourpaint/commands/kpCommandHistoryBase.cpp \
#798848:798849 @@ -92,10 +92,10 @@
m_actionRedo->setEnabled (false);
- connect (m_actionUndo->popupMenu (), SIGNAL (activated (int)),
- this, SLOT (undoUpToNumber (int)));
- connect (m_actionRedo->popupMenu (), SIGNAL (activated (int)),
- this, SLOT (redoUpToNumber (int)));
+ connect (m_actionUndo->menu (), SIGNAL (triggered (QAction *)),
+ this, SLOT (undoUpToNumber (QAction *)));
+ connect (m_actionRedo->menu (), SIGNAL (triggered (QAction *)),
+ this, SLOT (redoUpToNumber (QAction *)));
m_undoMinLimit = 10;
@@ -404,14 +404,14 @@
// public slot virtual
-void kpCommandHistoryBase::undoUpToNumber (int which)
+void kpCommandHistoryBase::undoUpToNumber (QAction *which)
{
#if DEBUG_KP_COMMAND_HISTORY
kDebug () << "kpCommandHistoryBase::undoUpToNumber(" << which << ")";
#endif
for (int i = 0;
- i <= which && !m_undoCommandList.isEmpty ();
+ i <= which->data().toInt() && !m_undoCommandList.isEmpty ();
i++)
{
undoInternal ();
@@ -421,14 +421,14 @@
}
// public slot virtual
-void kpCommandHistoryBase::redoUpToNumber (int which)
+void kpCommandHistoryBase::redoUpToNumber (QAction *which)
{
#if DEBUG_KP_COMMAND_HISTORY
kDebug () << "kpCommandHistoryBase::redoUpToNumber(" << which << ")";
#endif
for (int i = 0;
- i <= which && !m_redoCommandList.isEmpty ();
+ i <= which->data().toInt() && !m_redoCommandList.isEmpty ();
i++)
{
redoInternal ();
@@ -623,7 +623,9 @@
int i = 0;
while (i < 10 && it != commandList.end ())
{
- popupMenu->insertItem (i18n ("%1: %2", undoOrRedo, (*it)->name ()), \
i/*id*/); + QAction *action = new QAction(i18n ("%1: %2", undoOrRedo, \
(*it)->name ()), popupMenu); + action->setData(i);
+ popupMenu->addAction (action);
i++, it++;
}
@@ -657,7 +659,7 @@
#if DEBUG_KP_COMMAND_HISTORY
QTime timer; timer.start ();
#endif
- populatePopupMenu (m_actionUndo->popupMenu (),
+ populatePopupMenu (qobject_cast<KMenu*> (m_actionUndo->menu ()),
i18n ("Undo"),
m_undoCommandList);
#if DEBUG_KP_COMMAND_HISTORY
@@ -678,7 +680,7 @@
#if DEBUG_KP_COMMAND_HISTORY
timer.restart ();
#endif
- populatePopupMenu (m_actionRedo->popupMenu (),
+ populatePopupMenu (qobject_cast<KMenu*> (m_actionRedo->menu ()),
i18n ("Redo"),
m_redoCommandList);
#if DEBUG_KP_COMMAND_HISTORY
--- trunk/KDE/kdegraphics/kolourpaint/commands/kpCommandHistoryBase.h #798848:798849
@@ -36,6 +36,7 @@
#include <kpCommandSize.h>
+class QAction;
class KActionCollection;
class KToolBarPopupAction;
@@ -100,8 +101,8 @@
virtual void undo ();
virtual void redo ();
- virtual void undoUpToNumber (int which);
- virtual void redoUpToNumber (int which);
+ virtual void undoUpToNumber (QAction *which);
+ virtual void redoUpToNumber (QAction *which);
protected:
QString undoActionText () const;
--- trunk/KDE/kdegraphics/kolourpaint/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp \
#798848:798849 @@ -72,7 +72,7 @@
kDebug () << "kpToolImageSelectionTransparencyCommand::execute()";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
environ ()->setImageSelectionTransparency (m_st, true/*force colour change*/);
@@ -87,7 +87,7 @@
kDebug () << "kpToolImageSelectionTransparencyCommand::unexecute()";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
environ ()->setImageSelectionTransparency (m_oldST, true/*force colour \
change*/);
--- trunk/KDE/kdegraphics/kolourpaint/imagelib/effects/kpEffectBalance.cpp \
#798848:798849 @@ -124,13 +124,13 @@
#endif
- Q_UINT8 transformRed [256],
+ quint8 transformRed [256],
transformGreen [256],
transformBlue [256];
for (int i = 0; i < 256; i++)
{
- Q_UINT8 applied = (Q_UINT8) brightnessContrastGamma (i, brightness, \
contrast, gamma); + quint8 applied = (quint8) brightnessContrastGamma (i, \
brightness, contrast, gamma);
if (channels & kpEffectBalance::Red)
transformRed [i] = applied;
@@ -161,10 +161,10 @@
{
const QRgb rgb = qimage.pixel (x, y);
- const Q_UINT8 red = (Q_UINT8) qRed (rgb);
- const Q_UINT8 green = (Q_UINT8) qGreen (rgb);
- const Q_UINT8 blue = (Q_UINT8) qBlue (rgb);
- const Q_UINT8 alpha = (Q_UINT8) qAlpha (rgb);
+ const quint8 red = (quint8) qRed (rgb);
+ const quint8 green = (quint8) qGreen (rgb);
+ const quint8 blue = (quint8) qBlue (rgb);
+ const quint8 alpha = (quint8) qAlpha (rgb);
qimage.setPixel (x, y,
qRgba (transformRed [red],
@@ -187,10 +187,10 @@
{
const QRgb rgb = qimage.color (i);
- const Q_UINT8 red = (Q_UINT8) qRed (rgb);
- const Q_UINT8 green = (Q_UINT8) qGreen (rgb);
- const Q_UINT8 blue = (Q_UINT8) qBlue (rgb);
- const Q_UINT8 alpha = (Q_UINT8) qAlpha (rgb);
+ const quint8 red = (quint8) qRed (rgb);
+ const quint8 green = (quint8) qGreen (rgb);
+ const quint8 blue = (quint8) qBlue (rgb);
+ const quint8 alpha = (quint8) qAlpha (rgb);
qimage.setColor (i,
qRgba (transformRed [red],
--- trunk/KDE/kdegraphics/kolourpaint/mainWindow/kpMainWindow_Edit.cpp #798848:798849
@@ -210,7 +210,7 @@
kDebug () << "kpMainWindow::slotCut() CALLED";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
Q_ASSERT (d->document && d->document->selection ());
@@ -234,7 +234,7 @@
kDebug () << "kpMainWindow::slotCopy() CALLED";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
Q_ASSERT (d->document && d->document->selection ());
@@ -364,7 +364,7 @@
if (::HasSomethingToPaste (mw))
return true;
- kpSetOverrideCursorSaver cursorSaver (Qt::arrowCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::ArrowCursor);
KMessageBox::sorry (mw,
i18n ("<qt><p>There is nothing in the clipboard to paste.</p></qt>"),
@@ -446,7 +446,7 @@
<< endl;
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
toolEndShape ();
@@ -532,7 +532,7 @@
return;
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
toolEndShape ();
@@ -665,7 +665,7 @@
<< ")" << endl;
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
toolEndShape ();
@@ -715,7 +715,7 @@
kDebug () << "kpMainWindow::slotPaste() CALLED";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
toolEndShape ();
@@ -745,7 +745,7 @@
}
else
{
- kpSetOverrideCursorSaver cursorSaver (Qt::arrowCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::ArrowCursor);
kDebug () << "kpMainWindow::slotPaste() could not decode selection";
kDebug () << "\tFormats supported:" << md->formats ();
@@ -787,7 +787,7 @@
kDebug () << "kpMainWindow::slotPasteInNewWindow() CALLED";
#endif
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
toolEndShape ();
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpToolZoom.cpp #798848:798849
@@ -124,7 +124,7 @@
// public virtual [base kpTool]
void kpToolZoom::begin ()
{
- viewManager ()->setCursor (Qt::crossCursor);
+ viewManager ()->setCursor (Qt::CrossCursor);
setUserMessage (haventBegunDrawUserMessage ());
}
@@ -223,7 +223,7 @@
// TODO: This cursor doesn't stay on for long enough because zooming uses
// event loop tricks.
- kpSetOverrideCursorSaver cursorSaver (Qt::waitCursor);
+ kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor);
viewManager ()->invalidateTempImage ();
--- trunk/KDE/kdegraphics/kolourpaint/tools/kpTool_MouseEvents.cpp #798848:798849
@@ -302,7 +302,7 @@
e->ignore ();
// If CTRL not pressed, bye.
- if ((e->modifiers () & Qt::ControlButton) == 0)
+ if ((e->modifiers () & Qt::ControlModifier) == 0)
{
#if DEBUG_KP_TOOL
kDebug () << "\tno CTRL -> bye";
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_Create.cpp \
#798848:798849 @@ -96,7 +96,7 @@
// private
void kpAbstractSelectionTool::setCursorCreate ()
{
- viewManager ()->setCursor (Qt::crossCursor);
+ viewManager ()->setCursor (Qt::CrossCursor);
}
--- trunk/KDE/kdegraphics/kolourpaint/tools/selection/kpAbstractSelectionTool_Move.cpp \
#798848:798849 @@ -123,7 +123,7 @@
// private
void kpAbstractSelectionTool::setCursorMove ()
{
- viewManager ()->setCursor (Qt::sizeAllCursor);
+ viewManager ()->setCursor (Qt::SizeAllCursor);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic