diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp --- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp +++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp @@ -246,15 +246,13 @@ // public virtual [base kpCommand] void kpTransformResizeScaleCommand::execute () { -#if DEBUG_KP_TOOL_RESIZE_SCALE_COMMAND qCDebug(kpLogCommands) << "kpTransformResizeScaleCommand::execute() type=" << (int) m_type << " oldWidth=" << m_oldWidth << " oldHeight=" << m_oldHeight << " newWidth=" << m_newWidth << " newHeight=" << m_newHeight << endl; -#endif if (m_oldWidth == m_newWidth && m_oldHeight == m_newHeight) return; @@ -366,10 +364,8 @@ // public virtual [base kpCommand] void kpTransformResizeScaleCommand::unexecute () { -#if DEBUG_KP_TOOL_RESIZE_SCALE_COMMAND qCDebug(kpLogCommands) << "kpTransformResizeScaleCommand::unexecute() type=" << m_type << endl; -#endif if (m_oldWidth == m_newWidth && m_oldHeight == m_newHeight) return; diff --git a/commands/kpCommandHistory.cpp b/commands/kpCommandHistory.cpp --- a/commands/kpCommandHistory.cpp +++ b/commands/kpCommandHistory.cpp @@ -35,6 +35,7 @@ #include "mainWindow/kpMainWindow.h" #include "tools/kpTool.h" #include "commands/tools/selection/kpToolSelectionCreateCommand.h" +#include "kpLogCategories.h" kpCommandHistory::kpCommandHistory (bool doReadConfig, kpMainWindow *mainWindow) @@ -91,14 +92,10 @@ // public slot virtual [base KCommandHistory] void kpCommandHistory::undo () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistory::undo() CALLED!"; -#endif if (m_mainWindow && m_mainWindow->toolHasBegunShape ()) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\thas begun shape - cancel draw"; - #endif m_mainWindow->tool ()->cancelShapeInternal (); } else diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp --- a/commands/kpCommandHistoryBase.cpp +++ b/commands/kpCommandHistoryBase.cpp @@ -141,11 +141,9 @@ // public void kpCommandHistoryBase::setUndoMinLimit (int limit) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::setUndoMinLimit(" << limit << ")" << endl; -#endif if (limit < 1 || limit > 5000/*"ought to be enough for anybody"*/) { @@ -172,11 +170,9 @@ // public void kpCommandHistoryBase::setUndoMaxLimit (int limit) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::setUndoMaxLimit(" << limit << ")" << endl; -#endif if (limit < 1 || limit > 5000/*"ought to be enough for anybody"*/) { @@ -203,11 +199,9 @@ // public void kpCommandHistoryBase::setUndoMaxLimitSizeLimit (kpCommandSize::SizeType sizeLimit) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::setUndoMaxLimitSizeLimit(" << sizeLimit << ")" << endl; -#endif if (sizeLimit < 0 || sizeLimit > (500 * 1048576)/*"ought to be enough for anybody"*/) @@ -229,9 +223,7 @@ // public void kpCommandHistoryBase::readConfig () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::readConfig()"; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupUndoRedo); setUndoMinLimit (cfg.readEntry (kpSettingUndoMinLimit, undoMinLimit ())); @@ -246,9 +238,7 @@ // public void kpCommandHistoryBase::writeConfig () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::writeConfig()"; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupUndoRedo); cfg.writeEntry (kpSettingUndoMinLimit, undoMinLimit ()); @@ -263,44 +253,36 @@ // public void kpCommandHistoryBase::addCommand (kpCommand *command, bool execute) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::addCommand(" << command << ",execute=" << execute << ")" << endl; -#endif if (execute) command->execute (); m_undoCommandList.push_front (command); ::ClearPointerList (&m_redoCommandList); -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; -#endif if (m_documentRestoredPosition != INT_MAX) { if (m_documentRestoredPosition > 0) m_documentRestoredPosition = INT_MAX; else m_documentRestoredPosition--; - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; - #endif } trimCommandListsUpdateActions (); } // public void kpCommandHistoryBase::clear () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::clear()"; -#endif ::ClearPointerList (&m_undoCommandList); ::ClearPointerList (&m_redoCommandList); @@ -315,9 +297,7 @@ // protected slot void kpCommandHistoryBase::undoInternal () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::undoInternal()"; -#endif kpCommand *undoCommand = nextUndoCommand (); if (!undoCommand) @@ -330,30 +310,24 @@ m_redoCommandList.push_front (undoCommand); -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; -#endif if (m_documentRestoredPosition != INT_MAX) { m_documentRestoredPosition++; if (m_documentRestoredPosition == 0) emit documentRestored (); - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; - #endif } } //--------------------------------------------------------------------- // protected slot void kpCommandHistoryBase::redoInternal () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::redoInternal()"; -#endif kpCommand *redoCommand = nextRedoCommand (); if (!redoCommand) @@ -365,31 +339,24 @@ m_redoCommandList.erase (m_redoCommandList.begin ()); m_undoCommandList.push_front (redoCommand); - -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; -#endif if (m_documentRestoredPosition != INT_MAX) { m_documentRestoredPosition--; if (m_documentRestoredPosition == 0) emit documentRestored (); - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; - #endif } } //--------------------------------------------------------------------- // public slot virtual void kpCommandHistoryBase::undo () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::undo()"; -#endif undoInternal (); trimCommandListsUpdateActions (); @@ -400,9 +367,7 @@ // public slot virtual void kpCommandHistoryBase::redo () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::redo()"; -#endif redoInternal (); trimCommandListsUpdateActions (); @@ -413,9 +378,7 @@ // public slot virtual void kpCommandHistoryBase::undoUpToNumber (QAction *which) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::undoUpToNumber(" << which << ")"; -#endif for (int i = 0; i <= which->data().toInt() && !m_undoCommandList.isEmpty (); @@ -430,9 +393,7 @@ // public slot virtual void kpCommandHistoryBase::redoUpToNumber (QAction *which) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::redoUpToNumber(" << which << ")"; -#endif for (int i = 0; i <= which->data().toInt() && !m_redoCommandList.isEmpty (); @@ -494,21 +455,17 @@ // protected void kpCommandHistoryBase::trimCommandListsUpdateActions () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::trimCommandListsUpdateActions()"; -#endif trimCommandLists (); updateActions (); } // protected void kpCommandHistoryBase::trimCommandList (QLinkedList *commandList) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::trimCommandList()"; QTime timer; timer.start (); -#endif if (!commandList) { @@ -518,25 +475,18 @@ } -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tsize=" << commandList->size () << " undoMinLimit=" << m_undoMinLimit << " undoMaxLimit=" << m_undoMaxLimit << " undoMaxLimitSizeLimit=" << m_undoMaxLimitSizeLimit << endl; -#endif if (static_cast (commandList->size ()) <= m_undoMinLimit) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\tsize under undoMinLimit - done"; - #endif return; } - -#if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "\tsize over undoMinLimit - iterating thru cmds:"; -#endif QLinkedList ::iterator it = commandList->begin (); int upto = 0; @@ -552,13 +502,11 @@ sizeSoFar += (*it)->size (); } - #if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "\t\t" << upto << ":" << " name='" << (*it)->name () << "' size=" << (*it)->size () << " sizeSoFar=" << sizeSoFar << endl; - #endif if (upto >= m_undoMinLimit) { @@ -579,38 +527,28 @@ upto++; } -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\ttook " << timer.elapsed () << "ms"; -#endif } // protected void kpCommandHistoryBase::trimCommandLists () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::trimCommandLists()"; -#endif trimCommandList (&m_undoCommandList); trimCommandList (&m_redoCommandList); -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tdocumentRestoredPosition=" << m_documentRestoredPosition << endl; -#endif if (m_documentRestoredPosition != INT_MAX) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\tundoCmdList.size=" << m_undoCommandList.size () << " redoCmdList.size=" << m_redoCommandList.size () << endl; - #endif if (m_documentRestoredPosition > static_cast (m_redoCommandList.size ()) || -m_documentRestoredPosition > static_cast (m_undoCommandList.size ())) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\t\t\tinvalidate documentRestoredPosition"; - #endif m_documentRestoredPosition = INT_MAX; } } @@ -650,9 +588,7 @@ // protected void kpCommandHistoryBase::updateActions () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::updateActions()"; -#endif m_actionUndo->setEnabled (static_cast (nextUndoCommand ())); // Don't want to keep changing toolbar text. @@ -664,16 +600,12 @@ // But in icon mode, a tooltip with context is useful. m_actionUndo->setToolTip (undoActionToolTip ()); -#if DEBUG_KP_COMMAND_HISTORY QTime timer; timer.start (); -#endif populatePopupMenu (m_actionUndo->menu (), i18n ("Undo"), m_undoCommandList); -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tpopuplatePopupMenu undo=" << timer.elapsed () << "ms" << endl;; -#endif m_actionRedo->setEnabled (static_cast (nextRedoCommand ())); // Don't want to keep changing toolbar text. @@ -685,16 +617,12 @@ // But in icon mode, a tooltip with context is useful. m_actionRedo->setToolTip (redoActionToolTip ()); -#if DEBUG_KP_COMMAND_HISTORY timer.restart (); -#endif populatePopupMenu (m_actionRedo->menu (), i18n ("Redo"), m_redoCommandList); -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tpopuplatePopupMenu redo=" << timer.elapsed () << "ms" << endl; -#endif } @@ -720,12 +648,10 @@ // public void kpCommandHistoryBase::setNextUndoCommand (kpCommand *command) { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::setNextUndoCommand(" << command << ")" << endl; -#endif if (m_undoCommandList.isEmpty ()) return; @@ -742,11 +668,7 @@ // public slot virtual void kpCommandHistoryBase::documentSaved () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpCommandHistoryBase::documentSaved()"; -#endif m_documentRestoredPosition = 0; } - - diff --git a/commands/kpCommandSize.cpp b/commands/kpCommandSize.cpp --- a/commands/kpCommandSize.cpp +++ b/commands/kpCommandSize.cpp @@ -31,11 +31,12 @@ #include "commands/kpCommandSize.h" #include "layers/selections/kpAbstractSelection.h" +#include "kpLogCategories.h" #include #include #include - +#include // public static kpCommandSize::SizeType kpCommandSize::PixmapSize (const QImage &image) @@ -57,14 +58,12 @@ kpCommandSize::SizeType ret = static_cast (width) * height * roundedDepth / 8; -#if DEBUG_KP_COMMAND_SIZE && 0 qCDebug(kpLogCommands) << "kpCommandSize::PixmapSize() w=" << width << " h=" << height << " d=" << depth << " roundedDepth=" << roundedDepth << " ret=" << ret << endl; -#endif return ret; } @@ -89,14 +88,12 @@ kpCommandSize::SizeType ret = static_cast (width) * height * roundedDepth / 8; -#if DEBUG_KP_COMMAND_SIZE && 0 qCDebug(kpLogCommands) << "kpCommandSize::QImageSize() w=" << width << " h=" << height << " d=" << depth << " roundedDepth=" << roundedDepth << " ret=" << ret << endl; -#endif return ret; } @@ -131,25 +128,21 @@ // public static kpCommandSize::SizeType kpCommandSize::StringSize (const QString &string) { -#if DEBUG_KP_COMMAND_SIZE && 1 qCDebug(kpLogCommands) << "kpCommandSize::StringSize(" << string << ")" << " len=" << string.length () << " sizeof(QChar)=" << sizeof (QChar) << endl; -#endif return static_cast (static_cast (string.length ()) * sizeof (QChar)); } // public static kpCommandSize::SizeType kpCommandSize::PolygonSize (const QPolygon &points) { -#if DEBUG_KP_COMMAND_SIZE && 1 qCDebug(kpLogCommands) << "kpCommandSize::PolygonSize() points.size=" << points.size () << " sizeof(QPoint)=" << sizeof (QPoint) << endl; -#endif return static_cast (static_cast (points.size ()) * sizeof (QPoint)); } diff --git a/commands/kpMacroCommand.cpp b/commands/kpMacroCommand.cpp --- a/commands/kpMacroCommand.cpp +++ b/commands/kpMacroCommand.cpp @@ -35,6 +35,7 @@ #include #include +#include "kpLogCategories.h" //--------------------------------------------------------------------- @@ -62,48 +63,36 @@ // public virtual [base kpCommand] kpCommandSize::SizeType kpMacroCommand::size () const { -#if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "kpMacroCommand::size()"; -#endif SizeType s = 0; -#if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "\tcalculating:"; -#endif foreach (kpCommand *cmd, m_commandList) { - #if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "\t\tcurrentSize=" << s << " + " << cmd->name () << ".size=" << cmd->size () << endl; - #endif s += cmd->size (); } -#if DEBUG_KP_COMMAND_HISTORY && 0 qCDebug(kpLogCommands) << "\treturning " << s; -#endif return s; } //--------------------------------------------------------------------- // public virtual [base kpCommand] void kpMacroCommand::execute () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpMacroCommand::execute()"; -#endif viewManager()->setQueueUpdates(); for (QLinkedList ::const_iterator it = m_commandList.begin (); it != m_commandList.end (); ++it) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\texecuting " << (*it)->name (); - #endif (*it)->execute (); } @@ -115,20 +104,16 @@ // public virtual [base kpCommand] void kpMacroCommand::unexecute () { -#if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "kpMacroCommand::unexecute()"; -#endif viewManager()->setQueueUpdates(); QLinkedList ::const_iterator it = m_commandList.end (); it--; while (it != m_commandList.end ()) { - #if DEBUG_KP_COMMAND_HISTORY qCDebug(kpLogCommands) << "\tunexecuting " << (*it)->name (); - #endif (*it)->unexecute (); it--; diff --git a/commands/tools/flow/kpToolFlowCommand.cpp b/commands/tools/flow/kpToolFlowCommand.cpp --- a/commands/tools/flow/kpToolFlowCommand.cpp +++ b/commands/tools/flow/kpToolFlowCommand.cpp @@ -36,6 +36,7 @@ #include "pixmapfx/kpPixmapFX.h" #include "tools/kpTool.h" #include "views/manager/kpViewManager.h" +#include "kpLogCategories.h" #include @@ -102,17 +103,13 @@ // public void kpToolFlowCommand::updateBoundingRect (const QRect &rect) { -#if DEBUG_KP_TOOL_FLOW_COMMAND & 0 qCDebug(kpLogCommands) << "kpToolFlowCommand::updateBoundingRect() existing=" << d->boundingRect << " plus=" << rect << endl; -#endif d->boundingRect = d->boundingRect.united (rect); -#if DEBUG_KP_TOOL_FLOW_COMMAND & 0 qCDebug(kpLogCommands) << "\tresult=" << d->boundingRect; -#endif } // public diff --git a/commands/tools/kpToolFloodFillCommand.cpp b/commands/tools/kpToolFloodFillCommand.cpp --- a/commands/tools/kpToolFloodFillCommand.cpp +++ b/commands/tools/kpToolFloodFillCommand.cpp @@ -98,10 +98,8 @@ // protected virtual [base kpCommand] void kpToolFloodFillCommand::execute () { -#if DEBUG_KP_TOOL_FLOOD_FILL && 1 qCDebug(kpLogCommands) << "kpToolFloodFillCommand::execute() fillEntireImage=" << d->fillEntireImage << endl; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -127,9 +125,7 @@ } else { - #if DEBUG_KP_TOOL_FLOOD_FILL && 1 qCDebug(kpLogCommands) << "\tinvalid boundingRect - must be NOP case"; - #endif } } } @@ -139,10 +135,8 @@ // protected virtual [base kpCommand] void kpToolFloodFillCommand::unexecute () { -#if DEBUG_KP_TOOL_FLOOD_FILL && 1 qCDebug(kpLogCommands) << "kpToolFloodFillCommand::unexecute() fillEntireImage=" << d->fillEntireImage << endl; -#endif kpDocument *doc = document (); Q_ASSERT (doc); diff --git a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp --- a/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp +++ b/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp @@ -67,9 +67,7 @@ // public virtual [base kpCommand] void kpToolImageSelectionTransparencyCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolImageSelectionTransparencyCommand::execute()"; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -82,9 +80,7 @@ // public virtual [base kpCommand] void kpToolImageSelectionTransparencyCommand::unexecute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolImageSelectionTransparencyCommand::unexecute()"; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); diff --git a/commands/tools/selection/kpToolSelectionCreateCommand.cpp b/commands/tools/selection/kpToolSelectionCreateCommand.cpp --- a/commands/tools/selection/kpToolSelectionCreateCommand.cpp +++ b/commands/tools/selection/kpToolSelectionCreateCommand.cpp @@ -94,20 +94,16 @@ // public virtual [base kpCommand] void kpToolSelectionCreateCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionCreateCommand::execute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); if (m_fromSelection) { - #if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "\tusing fromSelection"; qCDebug(kpLogCommands) << "\t\thave sel=" << doc->selection () << endl; - #endif kpAbstractImageSelection *imageSel = dynamic_cast (m_fromSelection); kpTextSelection *textSel = diff --git a/commands/tools/selection/kpToolSelectionDestroyCommand.cpp b/commands/tools/selection/kpToolSelectionDestroyCommand.cpp --- a/commands/tools/selection/kpToolSelectionDestroyCommand.cpp +++ b/commands/tools/selection/kpToolSelectionDestroyCommand.cpp @@ -72,9 +72,7 @@ // public virtual [base kpCommand] void kpToolSelectionDestroyCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionDestroyCommand::execute () CALLED"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -102,20 +100,16 @@ // public virtual [base kpCommand] void kpToolSelectionDestroyCommand::unexecute () { -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionDestroyCommand::unexecute () CALLED"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); if (doc->selection ()) { // not error because it's possible that the user dragged out a new // region (without pulling image), and then CTRL+Z - #if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionDestroyCommand::unexecute() already has sel region"; - #endif if (doc->selection ()->hasContent ()) { @@ -128,17 +122,13 @@ if (m_pushOntoDocument) { - #if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "\tunpush oldDocImage onto doc first"; - #endif doc->setImageAt (m_oldDocImage, m_oldSelectionPtr->topLeft ()); } -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "\tsetting selection to: rect=" << m_oldSelectionPtr->boundingRect () << " hasContent=" << m_oldSelectionPtr->hasContent () << endl; -#endif kpAbstractImageSelection *imageSel = dynamic_cast (m_oldSelectionPtr); kpTextSelection *textSel = diff --git a/commands/tools/selection/kpToolSelectionMoveCommand.cpp b/commands/tools/selection/kpToolSelectionMoveCommand.cpp --- a/commands/tools/selection/kpToolSelectionMoveCommand.cpp +++ b/commands/tools/selection/kpToolSelectionMoveCommand.cpp @@ -84,9 +84,7 @@ // public virtual [base kpCommand] void kpToolSelectionMoveCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolSelectionMoveCommand::execute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -116,9 +114,7 @@ // public virtual [base kpCommand] void kpToolSelectionMoveCommand::unexecute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolSelectionMoveCommand::unexecute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -134,9 +130,7 @@ if (!m_oldDocumentImage.isNull ()) doc->setImageAt (m_oldDocumentImage, m_documentBoundingRect.topLeft ()); -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "\tmove to startPoint=" << m_startPoint; -#endif sel->moveTo (m_startPoint); environ ()->somethingBelowTheCursorChanged (); @@ -147,11 +141,9 @@ // public void kpToolSelectionMoveCommand::moveTo (const QPoint &point, bool moveLater) { -#if DEBUG_KP_TOOL_SELECTION && 0 qCDebug(kpLogCommands) << "kpToolSelectionMoveCommand::moveTo" << point << " moveLater=" << moveLater <() environ=" << environ << endl; -#endif } kpToolSelectionPullFromDocumentCommand::~kpToolSelectionPullFromDocumentCommand () @@ -61,9 +59,7 @@ // public virtual [base kpCommand] void kpToolSelectionPullFromDocumentCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolSelectionPullFromDocumentCommand::execute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -122,9 +118,7 @@ // public virtual [base kpCommand] void kpToolSelectionPullFromDocumentCommand::unexecute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolSelectionPullFromDocumentCommand::unexecute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp --- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp +++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp @@ -158,10 +158,8 @@ // protected void kpToolSelectionResizeScaleCommand::resizeScaleAndMove (bool delayed) { -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionResizeScaleCommand::resizeScaleAndMove(delayed=" << delayed << ")" << endl; -#endif killSmoothScaleTimer (); @@ -210,12 +208,10 @@ // public void kpToolSelectionResizeScaleCommand::finalize () { -#if DEBUG_KP_TOOL_SELECTION qCDebug(kpLogCommands) << "kpToolSelectionResizeScaleCommand::finalize()" << " smoothScaleTimer->isActive=" << m_smoothScaleTimer->isActive () << endl; -#endif // Make sure the selection contains the final image and the timer won't // fire afterwards. diff --git a/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp b/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp --- a/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp +++ b/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp @@ -60,16 +60,14 @@ // public virtual [base kpCommand] void kpToolTextChangeStyleCommand::execute () { -#if DEBUG_KP_TOOL_TEXT && 1 qCDebug(kpLogCommands) << "kpToolTextChangeStyleCommand::execute()" << " font=" << m_newTextStyle.fontFamily () << " fontSize=" << m_newTextStyle.fontSize () << " isBold=" << m_newTextStyle.isBold () << " isItalic=" << m_newTextStyle.isItalic () << " isUnderline=" << m_newTextStyle.isUnderline () << " isStrikeThru=" << m_newTextStyle.isStrikeThru () << endl; -#endif environ ()->setTextStyle (m_newTextStyle); @@ -80,16 +78,14 @@ // public virtual [base kpCommand] void kpToolTextChangeStyleCommand::unexecute () { -#if DEBUG_KP_TOOL_TEXT && 1 qCDebug(kpLogCommands) << "kpToolTextChangeStyleCommand::unexecute()" << " font=" << m_newTextStyle.fontFamily () << " fontSize=" << m_newTextStyle.fontSize () << " isBold=" << m_newTextStyle.isBold () << " isItalic=" << m_newTextStyle.isItalic () << " isUnderline=" << m_newTextStyle.isUnderline () << " isStrikeThru=" << m_newTextStyle.isStrikeThru () << endl; -#endif environ ()->setTextStyle (m_oldTextStyle); diff --git a/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp b/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp --- a/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp +++ b/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp @@ -44,11 +44,9 @@ kpCommandEnvironment *environ) : kpAbstractSelectionContentCommand (originalSelBorder, name, environ) { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolTextGiveContentCommand::() environ=" << environ << endl; -#endif } kpToolTextGiveContentCommand::~kpToolTextGiveContentCommand () @@ -59,9 +57,7 @@ // public virtual [base kpCommand] void kpToolTextGiveContentCommand::execute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolTextGiveContentCommand::execute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -125,9 +121,7 @@ // public virtual [base kpCommand] void kpToolTextGiveContentCommand::unexecute () { -#if DEBUG_KP_TOOL_SELECTION && 1 qCDebug(kpLogCommands) << "kpToolTextGiveContentCommand::unexecute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); diff --git a/cursors/kpCursorLightCross.cpp b/cursors/kpCursorLightCross.cpp --- a/cursors/kpCursorLightCross.cpp +++ b/cursors/kpCursorLightCross.cpp @@ -82,9 +82,7 @@ const QCursor *kpCursorLightCrossCreate () { -#if DEBUG_KP_CURSOR_LIGHT_CROSS qCDebug(kpLogMisc) << "kpCursorLightCrossCreate() "; -#endif const int side = 24; const int byteSize = (side * side) / 8; diff --git a/dialogs/imagelib/effects/kpEffectsDialog.cpp b/dialogs/imagelib/effects/kpEffectsDialog.cpp --- a/dialogs/imagelib/effects/kpEffectsDialog.cpp +++ b/dialogs/imagelib/effects/kpEffectsDialog.cpp @@ -78,9 +78,7 @@ m_settingsLayout (nullptr), m_effectWidget (nullptr) { -#if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "kpEffectsDialog::kpEffectsDialog()"; -#endif const bool e = updatesEnabled (); setUpdatesEnabled (false); @@ -138,17 +136,10 @@ resize (s_lastWidth, s_lastHeight); -#if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "about to setUpdatesEnabled()"; -#endif // OPT: The preview pixmap gets recalculated here and then possibly // again when QResizeEvent fires, when the dialog is shown. setUpdatesEnabled (e); -#if DEBUG_KP_EFFECTS_DIALOG - qCDebug(kpLogDialogs) << endl - << endl - << endl; -#endif } kpEffectsDialog::~kpEffectsDialog () @@ -277,22 +268,16 @@ const bool e = updatesEnabled (); setUpdatesEnabled (false); - #if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "widget exists for effect #"; - #endif m_settingsGroupBox->setTitle (m_effectWidget->caption ()); // Show widget. // // Don't resize the whole dialog when doing this. // This seems to work magically without any extra code with Qt4. - #if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "addWidget"; - #endif m_settingsLayout->addWidget (m_effectWidget); - #if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "show widget"; - #endif m_effectWidget->show (); connect (m_effectWidget, &kpEffectWidgetBase::settingsChangedNoWaitCursor, @@ -302,30 +287,19 @@ connect (m_effectWidget, &kpEffectWidgetBase::settingsChangedDelayed, this, &kpEffectsDialog::slotDelayedUpdate); - #if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "about to setUpdatesEnabled()"; - #endif setUpdatesEnabled (e); } - -#if DEBUG_KP_EFFECTS_DIALOG - qCDebug(kpLogDialogs) << "done" - << endl - << endl - << endl; -#endif + qCDebug(kpLogDialogs) << "done"; } // protected slot virtual [base kpTransformPreviewDialog] void kpEffectsDialog::slotUpdate () { -#if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "kpEffectsDialog::slotUpdate()" - << " timerActive=" << m_delayedUpdateTimer->isActive () - << endl; -#endif + << " timerActive=" << m_delayedUpdateTimer->isActive (); m_delayedUpdateTimer->stop (); @@ -335,11 +309,8 @@ // protected slot virtual [base kpTransformPreviewDialog] void kpEffectsDialog::slotUpdateWithWaitCursor () { -#if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "kpEffectsDialog::slotUpdateWithWaitCursor()" - << " timerActive=" << m_delayedUpdateTimer->isActive () - << endl; -#endif + << " timerActive=" << m_delayedUpdateTimer->isActive (); m_delayedUpdateTimer->stop (); @@ -350,15 +321,11 @@ // protected slot void kpEffectsDialog::slotDelayedUpdate () { -#if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "kpEffectsDialog::slotDelayedUpdate()" - << " timerActive=" << m_delayedUpdateTimer->isActive () - << endl; -#endif + << " timerActive=" << m_delayedUpdateTimer->isActive (); m_delayedUpdateTimer->stop (); // (single shot) m_delayedUpdateTimer->start (400/*ms*/); } - diff --git a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp --- a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp +++ b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp @@ -560,33 +560,25 @@ // private void kpDocumentMetaInfoDialog::fieldsDeleteRow (int r) { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::fieldsDeleteRow(" << "row=" << r << ")" << " currentRow=" << d->fieldsTableWidget->currentRow () << endl; -#endif Q_ASSERT (isFieldsRowDeleteable (r)); if (r == d->fieldsTableWidget->currentRow ()) { // Assertion follows from previous assertion. const int newRow = r + 1; - #if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tnewRow=" << newRow; - #endif Q_ASSERT (newRow < d->fieldsTableWidget->rowCount ()); int newCol = d->fieldsTableWidget->currentColumn (); - #if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tnewCol=" << newCol; - #endif if (newCol != 0 && newCol != 1) { newCol = 0; - #if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\t\tcorrecting to " << newCol; - #endif } // WARNING: You must call this _before_ deleting the row. Else, you'll @@ -614,14 +606,10 @@ // private void kpDocumentMetaInfoDialog::enableFieldsDeleteRowButtonIfShould () { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::enableFieldsDeleteRowButtonIfShould()"; -#endif const int r = d->fieldsTableWidget->currentRow (); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tr=" << r; -#endif d->fieldsDeleteRowButton->setEnabled (isFieldsRowDeleteable (r)); } @@ -631,17 +619,10 @@ void kpDocumentMetaInfoDialog::slotFieldsCurrentCellChanged (int row, int col, int oldRow, int oldCol) { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::slotFieldsCurrentCellChanged(" << "row=" << row << ",col=" << col << ",oldRow=" << oldRow << ",oldCol=" << oldCol - << ")" << endl; -#endif - - (void) row; - (void) col; - (void) oldRow; - (void) oldCol; + << ")"; enableFieldsDeleteRowButtonIfShould (); } @@ -651,27 +632,19 @@ void kpDocumentMetaInfoDialog::slotFieldsItemChanged (QTableWidgetItem *it) { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::slotFieldsItemChanged(" << "item=" << it << ") rows=" << d->fieldsTableWidget->rowCount () << endl; -#endif const int r = d->fieldsTableWidget->row (it); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tr=" << r; -#endif Q_ASSERT (r >= 0 && r < d->fieldsTableWidget->rowCount ()); const QString key = d->fieldsTableWidget->item (r, 0)->text (); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << " key='" << key << "'"; -#endif const QString value = d->fieldsTableWidget->item (r, 1)->text (); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << " value='" << value << "'"; -#endif // At the last row? if (r == d->fieldsTableWidget->rowCount () - 1) @@ -695,15 +668,11 @@ void kpDocumentMetaInfoDialog::slotFieldsAddRowButtonClicked () { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::slotFieldsAddRowButtonClicked()" << endl; -#endif const int r = d->fieldsTableWidget->currentRow (); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tr=" << r; -#endif // (if no row is selected, r = -1) fieldsAddEmptyRow (r + 1); @@ -718,15 +687,11 @@ // private slot void kpDocumentMetaInfoDialog::slotFieldsDeleteRowButtonClicked () { -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "kpDocumentMetaInfoDialog::slotFieldsDeleteRowButtonClicked()" << endl; -#endif const int r = d->fieldsTableWidget->currentRow (); -#if DEBUG_KP_DOCUMENT_META_INFO_DIALOG qCDebug(kpLogDialogs) << "\tr=" << r; -#endif Q_ASSERT (isFieldsRowDeleteable (r)); fieldsDeleteRow (r); @@ -747,5 +712,3 @@ QDialog::accept (); } - - diff --git a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp @@ -236,16 +236,12 @@ if (!updatesEnabled ()) { - #if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "updates not enabled - aborting"; - #endif return; } QSize newDim = newDimensions (); -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::updateDimensions(): newDim=" << newDim; -#endif QString newDimString = i18n ("%1 x %2", newDim.width (), @@ -277,16 +273,13 @@ // private void kpTransformPreviewDialog::updateShrunkenDocumentPixmap () { -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::updateShrunkenDocumentPixmap()" << " shrunkenDocPixmap.size=" << m_shrunkenDocumentPixmap.size () << " previewPixmapLabelSizeWhenUpdatedPixmap=" << m_previewPixmapLabelSizeWhenUpdatedPixmap << " previewPixmapLabel.size=" - << m_previewPixmapLabel->size () - << endl; -#endif + << m_previewPixmapLabel->size (); if (!m_previewGroupBox) return; @@ -298,9 +291,7 @@ if (m_shrunkenDocumentPixmap.isNull () || m_previewPixmapLabel->size () != m_previewPixmapLabelSizeWhenUpdatedPixmap) { - #if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "\tupdating shrunkenDocPixmap"; - #endif // TODO: Why the need to keep aspect ratio here? // Isn't scaling the skewed result maintaining aspect enough? @@ -342,9 +333,7 @@ // private void kpTransformPreviewDialog::updatePreview () { -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::updatePreview()"; -#endif if (!m_previewGroupBox) return; @@ -357,9 +346,7 @@ if (!updatesEnabled ()) { - #if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "updates not enabled - aborting"; - #endif return; } @@ -396,7 +383,6 @@ (previewPixmap.height () - transformedShrunkenDocumentPixmap.height ()) / 2, transformedShrunkenDocumentPixmap); -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::updatePreview ():" << " shrunkenDocumentPixmap: w=" << m_shrunkenDocumentPixmap.width () @@ -413,48 +399,34 @@ << " previewPixmap: w=" << previewPixmap.width () << " h=" - << previewPixmap.height () - << endl; -#endif + << previewPixmap.height (); m_previewPixmapLabel->setPixmap (QPixmap::fromImage(previewPixmap)); // immediate update esp. for expensive previews m_previewPixmapLabel->repaint (); -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "\tafter QLabel::setPixmap() previewPixmapLabel: w=" << m_previewPixmapLabel->width () << " h=" - << m_previewPixmapLabel->height () - << endl; -#endif + << m_previewPixmapLabel->height (); } } // protected slot virtual void kpTransformPreviewDialog::slotUpdate () { -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::slotUpdate()"; -#endif updateDimensions (); updatePreview (); } // protected slot virtual void kpTransformPreviewDialog::slotUpdateWithWaitCursor () { -#if DEBUG_KP_TRANSFORM_PREVIEW_DIALOG qCDebug(kpLogDialogs) << "kpTransformPreviewDialog::slotUpdateWithWaitCursor()"; -#endif - QApplication::setOverrideCursor (Qt::WaitCursor); - slotUpdate (); - QApplication::restoreOverrideCursor (); } - - diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp @@ -451,9 +451,7 @@ void kpTransformResizeScaleDialog::slotActOnChanged () { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::slotActOnChanged()"; -#endif m_resizeButton->setEnabled (resizeEnabled ()); m_scaleButton->setEnabled (scaleEnabled ()); @@ -522,10 +520,8 @@ // public slot void kpTransformResizeScaleDialog::slotWidthChanged (int width) { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::slotWidthChanged(" - << width << ")" << endl; -#endif + << width << ")"; const double newPercentWidth = double (width) * 100 / double (originalWidth ()); SET_VALUE_WITHOUT_SIGNAL_EMISSION (m_percentWidthInput,newPercentWidth); @@ -540,10 +536,8 @@ void kpTransformResizeScaleDialog::slotHeightChanged (int height) { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::slotHeightChanged(" - << height << ")" << endl; -#endif + << height << ")"; const double newPercentHeight = double (height) * 100 / double (originalHeight ()); SET_VALUE_WITHOUT_SIGNAL_EMISSION (m_percentHeightInput,newPercentHeight); @@ -558,10 +552,8 @@ void kpTransformResizeScaleDialog::slotPercentWidthChanged (double percentWidth) { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::slotPercentWidthChanged(" << percentWidth << ")" << endl; -#endif SET_VALUE_WITHOUT_SIGNAL_EMISSION (m_newWidthInput, qRound (percentWidth * originalWidth () / 100.0)); @@ -576,10 +568,8 @@ void kpTransformResizeScaleDialog::slotPercentHeightChanged (double percentHeight) { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::slotPercentHeightChanged(" << percentHeight << ")" << endl; -#endif SET_VALUE_WITHOUT_SIGNAL_EMISSION (m_newHeightInput, qRound (percentHeight * originalHeight () / 100.0)); @@ -594,10 +584,8 @@ void kpTransformResizeScaleDialog::setKeepAspectRatio (bool on) { -#if DEBUG_KP_TOOL_RESIZE_SCALE_DIALOG && 1 qCDebug(kpLogDialogs) << "kpTransformResizeScaleDialog::setKeepAspectRatio(" << on << ")" << endl; -#endif if (on != m_keepAspectRatioCheckBox->isChecked ()) m_keepAspectRatioCheckBox->setChecked (on); diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp --- a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp +++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp @@ -119,28 +119,24 @@ qMax (1, static_cast (static_cast (fileSize * 100 / pixmapSize))) : 0; -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::setFilePixmapAndSize()" << " pixmapSize=" << pixmapSize << " fileSize=" << fileSize << " raw fileSize/pixmapSize%=" << (pixmapSize ? (kpCommandSize::SizeType) fileSize * 100 / pixmapSize : 0) << endl; -#endif m_fileSizeLabel->setText (i18np ("1 byte (approx. %2%)", "%1 bytes (approx. %2%)", m_fileSize, percent)); } // public slot void kpDocumentSaveOptionsPreviewDialog::updatePixmapPreview () { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::updatePreviewPixmap()" << " filePixmapLabel.size=" << m_filePixmapLabel->size () << " filePixmap.size=" << m_filePixmap->size () << endl; -#endif if (m_filePixmap) { @@ -152,12 +148,10 @@ double keepsAspect = kpTransformPreviewDialog::aspectScale ( maxNewWidth, maxNewHeight, m_filePixmap->width (), m_filePixmap->height ()); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "\tmaxNewWidth=" << maxNewWidth << " maxNewHeight=" << maxNewHeight << " keepsAspect=" << keepsAspect << endl; - #endif const int newWidth = kpTransformPreviewDialog::scaleDimension ( @@ -170,11 +164,9 @@ keepsAspect, 1, maxNewHeight); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "\tnewWidth=" << newWidth << " newHeight=" << newHeight << endl; - #endif QImage transformedPixmap = @@ -203,36 +195,24 @@ // protected virtual [base QWidget] void kpDocumentSaveOptionsPreviewDialog::closeEvent (QCloseEvent *e) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::closeEvent()"; -#endif - QWidget::closeEvent (e); - emit finished (); } // protected virtual [base QWidget] void kpDocumentSaveOptionsPreviewDialog::moveEvent (QMoveEvent *e) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::moveEvent()"; -#endif - QWidget::moveEvent (e); - emit moved (); } // protected virtual [base QWidget] void kpDocumentSaveOptionsPreviewDialog::resizeEvent (QResizeEvent *e) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::resizeEvent()"; -#endif - QWidget::resizeEvent (e); - emit resized (); } diff --git a/document/kpDocument.cpp b/document/kpDocument.cpp --- a/document/kpDocument.cpp +++ b/document/kpDocument.cpp @@ -323,14 +323,12 @@ // public void kpDocument::setImageAt (const kpImage &image, const QPoint &at) { -#if DEBUG_KP_DOCUMENT && 0 qCDebug(kpLogDocument) << "kpDocument::setImageAt (image (w=" << image.width () << ",h=" << image.height () << "), x=" << at.x () << ",y=" << at.y () << endl; -#endif kpPixmapFX::setPixmapAt (m_image, at, image); slotContentsChanged (QRect (at.x (), at.y (), image.width (), image.height ())); @@ -402,9 +400,7 @@ void kpDocument::fill (const kpColor &color) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::fill ()"; -#endif m_image->fill(color.toQRgb()); slotContentsChanged (m_image->rect ()); @@ -414,18 +410,14 @@ void kpDocument::resize (int w, int h, const kpColor &backgroundColor) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::resize (" << w << "," << h << ")"; -#endif m_oldWidth = width (); m_oldHeight = height (); -#if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\toldWidth=" << m_oldWidth << " oldHeight=" << m_oldHeight << endl; -#endif if (w == m_oldWidth && h == m_oldHeight) return; diff --git a/document/kpDocumentSaveOptions.cpp b/document/kpDocumentSaveOptions.cpp --- a/document/kpDocumentSaveOptions.cpp +++ b/document/kpDocumentSaveOptions.cpp @@ -361,9 +361,7 @@ saveOptions.setDither (defaultDither (config)); saveOptions.setQuality (defaultQuality (config)); -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS saveOptions.printDebug ("kpDocumentSaveOptions::defaultDocumentSaveOptions()"); -#endif return saveOptions; } @@ -377,11 +375,9 @@ { bool savedSomething = false; -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS qCDebug(kpLogDocument) << "kpDocumentSaveOptions::saveDefaultDifferences()"; oldDocInfo.printDebug ("\told"); newDocInfo.printDebug ("\tnew"); -#endif if (newDocInfo.mimeType () != oldDocInfo.mimeType ()) { diff --git a/document/kpDocument_Open.cpp b/document/kpDocument_Open.cpp --- a/document/kpDocument_Open.cpp +++ b/document/kpDocument_Open.cpp @@ -80,9 +80,7 @@ kpDocumentSaveOptions *saveOptions, kpDocumentMetaInfo *metaInfo) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::getPixmapFromFile(" << url << "," << parent << ")"; -#endif if (saveOptions) *saveOptions = kpDocumentSaveOptions (); @@ -113,11 +111,9 @@ if (saveOptions) saveOptions->setMimeType(mimeType.name()); -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\ttempFile=" << tempFile; qCDebug(kpLogDocument) << "\tmimetype=" << mimeType.name(); qCDebug(kpLogDocument) << "\tsrc=" << url.path (); -#endif QImageReader reader(tempFile); reader.setAutoTransform(true); @@ -136,11 +132,9 @@ return QImage (); } -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tpixmap: depth=" << image.depth () << " hasAlphaChannel=" << image.hasAlphaChannel () << endl; -#endif if ( saveOptions && metaInfo ) getDataFromImage(image, *saveOptions, *metaInfo); @@ -157,9 +151,7 @@ void kpDocument::openNew (const QUrl &url) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::openNew (" << url << ")"; -#endif m_image->fill(QColor(Qt::white).rgb()); @@ -189,9 +181,7 @@ bool kpDocument::open (const QUrl &url, bool newDocSameNameIfNotExist) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::open (" << url << ")"; -#endif kpDocumentSaveOptions newSaveOptions; kpDocumentMetaInfo newMetaInfo; diff --git a/document/kpDocument_Save.cpp b/document/kpDocument_Save.cpp --- a/document/kpDocument_Save.cpp +++ b/document/kpDocument_Save.cpp @@ -69,14 +69,12 @@ bool kpDocument::save (bool overwritePrompt, bool lossyPrompt) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::save(" << "overwritePrompt=" << overwritePrompt << ",lossyPrompt=" << lossyPrompt << ") url=" << m_url << " savedAtLeastOnceBefore=" << savedAtLeastOnceBefore () << endl; -#endif // TODO: check feels weak if (m_url.isEmpty () || m_saveOptions->mimeType ().isEmpty ()) @@ -105,9 +103,7 @@ const kpDocumentSaveOptions &saveOptions, QWidget *parent) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::lossyPromptContinue()"; -#endif #define QUIT_IF_CANCEL(messageBoxCommand) \ { \ @@ -176,29 +172,23 @@ *userCancelled = false; QStringList types = KImageIO::typeForMime (saveOptions.mimeType ()); -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\ttypes=" << types; -#endif if (types.isEmpty ()) return false; // It's safe to arbitrarily choose the 0th type as any type in the list // should invoke the same KImageIO image loader. const QString type = types [0]; -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tmimeType=" << saveOptions.mimeType () << " type=" << type << endl; -#endif if (lossyPrompt && !lossyPromptContinue (image, saveOptions, parent)) { if (userCancelled) *userCancelled = true; - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because of lossyPrompt"; - #endif return false; } @@ -216,11 +206,9 @@ // Reduce colors if required // -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tuseSaveOptionsColorDepth=" << useSaveOptionsColorDepth << "current image depth=" << image.depth () << "save options depth=" << saveOptions.colorDepth (); -#endif QImage imageToSave(image); if (useSaveOptionsColorDepth && @@ -266,21 +254,13 @@ if (useSaveOptionsQuality) quality = saveOptions.quality (); -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tsaving"; -#endif if (!imageToSave.save (device, type.toLatin1 (), quality)) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tQImage::save() returned false"; - #endif return false; } - - -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tsave OK"; -#endif return true; } @@ -316,15 +296,13 @@ // TODO: Use KIO::NetAccess:mostLocalURL() for accessing home:/ (and other // such local URLs) for efficiency and because only local writes // are atomic. -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::savePixmapToFile (" << url << ",overwritePrompt=" << overwritePrompt << ",lossyPrompt=" << lossyPrompt << ")" << endl; saveOptions.printDebug (QLatin1String ("\tsaveOptions")); metaInfo.printDebug (QLatin1String ("\tmetaInfo")); -#endif if (overwritePrompt && KIO::NetAccess::exists (url, KIO::NetAccess::DestinationSide/*write*/, parent)) @@ -338,20 +316,15 @@ if (result != KMessageBox::Continue) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tuser doesn't want to overwrite"; - #endif - return false; } } if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, parent)) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because of lossyPrompt"; - #endif return false; } @@ -372,10 +345,8 @@ // opened. atomicFileWriter.cancelWriting (); - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because could not open QSaveFile" - << " error=" << atomicFileWriter.error () << endl; - #endif + << " error=" << atomicFileWriter.error (); ::CouldNotCreateTemporaryFileDialog (parent); return false; } @@ -388,10 +359,7 @@ { atomicFileWriter.cancelWriting (); - #if DEBUG_KP_DOCUMENT - qCDebug(kpLogDocument) << "\treturning false because could not save pixmap to device" - << endl; - #endif + qCDebug(kpLogDocument) << "\treturning false because could not save pixmap to device"; ::CouldNotSaveDialog (url, parent); return false; } @@ -402,9 +370,7 @@ { atomicFileWriter.cancelWriting (); - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\tcould not close QSaveFile"; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -418,9 +384,7 @@ QTemporaryFile tempFile; if (!tempFile.open ()) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because could not open tempFile"; - #endif ::CouldNotCreateTemporaryFileDialog (parent); return false; } @@ -431,28 +395,21 @@ false/*no lossy prompt*/, parent)) { - #if DEBUG_KP_DOCUMENT - qCDebug(kpLogDocument) << "\treturning false because could not save pixmap to device" - << endl; - #endif + qCDebug(kpLogDocument) << "\treturning false because could not save pixmap to device"; ::CouldNotSaveDialog (url, parent); return false; } // Collect name of temporary file now, as QTemporaryFile::fileName() // stops working after close() is called. const QString tempFileName = tempFile.fileName (); - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\ttempFileName='" << tempFileName << "'"; - #endif Q_ASSERT (!tempFileName.isEmpty ()); tempFile.close (); if (tempFile.error () != QFile::NoError) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because could not close"; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -463,9 +420,7 @@ // At least, fish:// (ssh) is definitely not atomic. if (!KIO::NetAccess::upload (tempFileName, url, parent)) { - #if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "\treturning false because could not upload"; - #endif KMessageBox::error (parent, i18n ("Could not save image - failed to upload.")); return false; @@ -483,10 +438,8 @@ bool overwritePrompt, bool lossyPrompt) { -#if DEBUG_KP_DOCUMENT qCDebug(kpLogDocument) << "kpDocument::saveAs (" << url << "," - << saveOptions.mimeType () << ")" << endl; -#endif + << saveOptions.mimeType () << ")"; if (kpDocument::savePixmapToFile (imageWithSelection (), url, diff --git a/document/kpDocument_Selection.cpp b/document/kpDocument_Selection.cpp --- a/document/kpDocument_Selection.cpp +++ b/document/kpDocument_Selection.cpp @@ -75,11 +75,9 @@ // public void kpDocument::setSelection (const kpAbstractSelection &selection) { -#if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "kpDocument::setSelection() sel boundingRect=" << selection.boundingRect () << endl; -#endif d->environ->setQueueViewUpdates (); { @@ -119,11 +117,9 @@ // "wider environment") may access the document and the environment. // - #if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\tcheck sel " << (int *) m_selection << " boundingRect=" << m_selection->boundingRect () << endl; - #endif if (oldSelection) { if (oldSelection->hasContent ()) @@ -149,9 +145,7 @@ } d->environ->restoreQueueViewUpdates (); -#if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\tkpDocument::setSelection() ended"; -#endif } //--------------------------------------------------------------------- @@ -307,19 +301,15 @@ // public kpImage kpDocument::imageWithSelection () const { -#if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "kpDocument::imageWithSelection()"; -#endif // Have selection? // // It need not have any content because e.g. a text box with an opaque // background, but no content, is still visually there. if (m_selection) { - #if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\tselection @ " << m_selection->boundingRect (); - #endif kpImage output = *m_image; // (this is a NOP for image selections without content) @@ -329,9 +319,7 @@ } else { - #if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\tno selection"; - #endif return *m_image; } } diff --git a/environments/document/kpDocumentEnvironment.cpp b/environments/document/kpDocumentEnvironment.cpp --- a/environments/document/kpDocumentEnvironment.cpp +++ b/environments/document/kpDocumentEnvironment.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_DOCUMENT_ENVIRONMENT 0 - - #include "environments/document/kpDocumentEnvironment.h" #include "kpLogCategories.h" @@ -42,9 +38,7 @@ #include "layers/selections/image/kpRectangularImageSelection.h" #include "layers/selections/text/kpTextSelection.h" #include "layers/selections/text/kpTextStyle.h" -#if DEBUG_KP_DOCUMENT_ENVIRONMENT - #include "tools/kpTool.h" -#endif +#include "tools/kpTool.h" #include "views/manager/kpViewManager.h" @@ -94,7 +88,6 @@ void kpDocumentEnvironment::switchToCompatibleTool (const kpAbstractSelection &selection, bool *isTextChanged) const { -#if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "kpDocumentEnvironment::switchToCompatibleTool(" << &selection << ")" << " mainwindow.tool=" @@ -105,7 +98,7 @@ << " new selection is text=" << dynamic_cast (&selection) << endl; -#endif + *isTextChanged = (mainWindow ()->toolIsTextTool () != (dynamic_cast (&selection) != nullptr)); @@ -132,39 +125,29 @@ // (all selection tool's ::end() functions nuke the current selection) if (dynamic_cast (&selection)) { - #if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "\tswitch to rect selection tool"; - #endif mainWindow ()->slotToolRectSelection (); } else if (dynamic_cast (&selection)) { - #if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "\tswitch to elliptical selection tool"; - #endif mainWindow ()->slotToolEllipticalSelection (); } else if (dynamic_cast (&selection)) { - #if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "\tswitch to free form selection tool"; - #endif mainWindow ()->slotToolFreeFormSelection (); } else if (dynamic_cast (&selection)) { - #if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "\tswitch to text selection tool"; - #endif mainWindow ()->slotToolText (); } else Q_ASSERT (!"Unknown selection type"); } -#if DEBUG_KP_DOCUMENT_ENVIRONMENT qCDebug(kpLogEnvironments) << "kpDocumentEnvironment::switchToCompatibleTool(" << &selection << ") finished"; -#endif } //--------------------------------------------------------------------- diff --git a/generic/widgets/kpResizeSignallingLabel.cpp b/generic/widgets/kpResizeSignallingLabel.cpp --- a/generic/widgets/kpResizeSignallingLabel.cpp +++ b/generic/widgets/kpResizeSignallingLabel.cpp @@ -25,13 +25,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_RESIZE_SIGNALLING_LABEL 0 - - #include "generic/widgets/kpResizeSignallingLabel.h" #include +#include #include "kpLogCategories.h" @@ -55,10 +52,8 @@ // protected virtual [base QLabel] void kpResizeSignallingLabel::resizeEvent (QResizeEvent *e) { -#if DEBUG_KP_RESIZE_SIGNALLING_LABEL qCDebug(kpLogMisc) << "kpResizeSignallingLabel::resizeEvent() newSize=" << e->size () << " oldSize=" << e->oldSize () << endl; -#endif QLabel::resizeEvent (e); emit resized (); diff --git a/imagelib/effects/kpEffectBalance.cpp b/imagelib/effects/kpEffectBalance.cpp --- a/imagelib/effects/kpEffectBalance.cpp +++ b/imagelib/effects/kpEffectBalance.cpp @@ -30,20 +30,11 @@ #include "kpEffectBalance.h" - #include - #include - #include "kpLogCategories.h" - #include "pixmapfx/kpPixmapFX.h" - - -#if DEBUG_KP_EFFECT_BALANCE - #include -#endif - +#include static inline int between0And255 (int val) { @@ -90,15 +81,13 @@ int green = qGreen (rgb); int blue = qBlue (rgb); - if (channels & kpEffectBalance::Red) red = brightnessContrastGamma (red, brightness, contrast, gamma); if (channels & kpEffectBalance::Green) green = brightnessContrastGamma (green, brightness, contrast, gamma); if (channels & kpEffectBalance::Blue) blue = brightnessContrastGamma (blue, brightness, contrast, gamma); - return qRgba (red, green, blue, qAlpha (rgb)); } @@ -108,21 +97,16 @@ int channels, int brightness, int contrast, int gamma) { -#if DEBUG_KP_EFFECT_BALANCE qCDebug(kpLogImagelib) << "kpEffectBalance::applyEffect(" << "channels=" << channels << ",brightness=" << brightness << ",contrast=" << contrast << ",gamma=" << gamma << ")" << endl; QTime timer; timer.start (); -#endif QImage qimage = image; -#if DEBUG_KP_EFFECT_BALANCE qCDebug(kpLogImagelib) << "\tconvertToImage=" << timer.restart (); -#endif - quint8 transformRed [256], transformGreen [256], @@ -148,10 +132,7 @@ transformBlue [i] = static_cast (i); } -#if DEBUG_KP_EFFECT_BALANCE qCDebug(kpLogImagelib) << "\tbuild lookup=" << timer.restart (); -#endif - if (qimage.depth () > 8) { diff --git a/imagelib/effects/kpEffectBlurSharpen.cpp b/imagelib/effects/kpEffectBlurSharpen.cpp --- a/imagelib/effects/kpEffectBlurSharpen.cpp +++ b/imagelib/effects/kpEffectBlurSharpen.cpp @@ -30,15 +30,9 @@ #include "kpEffectBlurSharpen.h" #include "blitz.h" - #include "kpLogCategories.h" - #include "pixmapfx/kpPixmapFX.h" - - -#if DEBUG_KP_EFFECT_BLUR_SHARPEN - #include -#endif +#include //--------------------------------------------------------------------- @@ -77,11 +71,9 @@ (RadiusMax - RadiusMin) / (kpEffectBlurSharpen::MaxStrength - 1); -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogImagelib) << "kpEffectBlurSharpen.cpp:BlurQImage(strength=" << strength << ")" << " radius=" << radius << endl; -#endif QImage img(qimage); return Blitz::blur(img, qRound(radius)); @@ -124,26 +116,20 @@ (kpEffectBlurSharpen::MaxStrength - 1)); -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogImagelib) << "kpEffectBlurSharpen.cpp:SharpenQImage(strength=" << strength << ")" << " radius=" << radius << " sigma=" << sigma << " repeat=" << repeat << endl; -#endif for (int i = 0; i < repeat; i++) { - #if DEBUG_KP_EFFECT_BLUR_SHARPEN QTime timer; timer.start (); - #endif qimage = Blitz::gaussianSharpen (qimage, static_cast (radius), static_cast (sigma)); - #if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogImagelib) << "\titeration #" + QString::number (i) << ": " + QString::number (timer.elapsed ()) << "ms" << endl; - #endif } @@ -156,12 +142,10 @@ kpImage kpEffectBlurSharpen::applyEffect (const kpImage &image, Type type, int strength) { -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogImagelib) << "kpEffectBlurSharpen::applyEffect(image.rect=" << image.rect () << ",type=" << int (type) << ",strength=" << strength << ")" << endl; -#endif Q_ASSERT (strength >= MinStrength && strength <= MaxStrength); @@ -177,5 +161,3 @@ else return kpImage(); } - -//--------------------------------------------------------------------- diff --git a/imagelib/effects/kpEffectEmboss.cpp b/imagelib/effects/kpEffectEmboss.cpp --- a/imagelib/effects/kpEffectEmboss.cpp +++ b/imagelib/effects/kpEffectEmboss.cpp @@ -69,10 +69,7 @@ // public static kpImage kpEffectEmboss::applyEffect (const kpImage &image, int strength) { -#if DEBUG_KP_EFFECT_EMBOSS - qCDebug(kpLogImagelib) << "kpEffectEmboss::applyEffect(strength=" << strength << ")" - << endl; -#endif + qCDebug(kpLogImagelib) << "kpEffectEmboss::applyEffect(strength=" << strength << ")"; Q_ASSERT (strength >= MinStrength && strength <= MaxStrength); diff --git a/imagelib/effects/kpEffectInvert.cpp b/imagelib/effects/kpEffectInvert.cpp --- a/imagelib/effects/kpEffectInvert.cpp +++ b/imagelib/effects/kpEffectInvert.cpp @@ -46,11 +46,9 @@ (channels & Green) ? 0xFF : 0, (channels & Blue) ? 0xFF : 0, 0/*don't invert alpha*/); -#if DEBUG_KP_EFFECT_INVERT qCDebug(kpLogImagelib) << "kpEffectInvert::applyEffect(channels=" << channels << ") mask=" << (int *) mask << endl; -#endif if (destImagePtr->depth () > 8) { diff --git a/imagelib/effects/kpEffectReduceColors.cpp b/imagelib/effects/kpEffectReduceColors.cpp --- a/imagelib/effects/kpEffectReduceColors.cpp +++ b/imagelib/effects/kpEffectReduceColors.cpp @@ -68,32 +68,27 @@ // public static QImage kpEffectReduceColors::convertImageDepth (const QImage &image, int depth, bool dither) { -#if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "kpeffectreducecolors.cpp:ConvertImageDepth() changing image (w=" << image.width () << ",h=" << image.height () << ") depth from " << image.depth () << " to " << depth - << " (dither=" << dither << ")" - << endl; -#endif + << " (dither=" << dither << ")"; if (image.isNull ()) return image; if (depth == image.depth ()) return image; -#if DEBUG_KP_EFFECT_REDUCE_COLORS && 0 for (int y = 0; y < image.height (); y++) { for (int x = 0; x < image.width (); x++) { fprintf (stderr, " %08X", image.pixel (x, y)); } fprintf (stderr, "\n"); } -#endif // Hack around Qt's braindead QImage::convertToFormat(QImage::Format_MonoLSB, ...) @@ -106,22 +101,18 @@ // not necessarily black & white). if (depth == 1 && !dither) { - #if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\tinvoking convert-to-depth 1 hack"; - #endif QRgb color0 = 0, color1 = 0; bool color0Valid = false, color1Valid = false; bool moreThan2Colors = false; QImage monoImage (image.width (), image.height (), QImage::Format_MonoLSB); monoImage.setColorCount (2); - #if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\t\tinitialising output image w=" << monoImage.width () << ",h=" << monoImage.height () << ",d=" << monoImage.depth () << endl; - #endif for (int y = 0; y < image.height (); y++) { for (int x = 0; x < image.width (); x++) @@ -138,28 +129,22 @@ color0 = imagePixel; color0Valid = true; monoImage.setPixel (x, y, 0); - #if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\t\t\tcolor0=" << (int *) color0 << " at x=" << x << ",y=" << y << endl; - #endif } else if (!color1Valid) { color1 = imagePixel; color1Valid = true; monoImage.setPixel (x, y, 1); - #if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\t\t\tcolor1=" << (int *) color1 << " at x=" << x << ",y=" << y << endl; - #endif } else { - #if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\t\t\timagePixel=" << (int *) imagePixel << " at x=" << x << ",y=" << y << " moreThan2Colors - abort hack" << endl; - #endif moreThan2Colors = true; // Dijkstra, this is clearer than double break'ing or @@ -183,12 +168,9 @@ (dither ? Qt::DiffuseDither : Qt::ThresholdDither) | Qt::ThresholdAlphaDither | (dither ? Qt::PreferDither : Qt::AvoidDither)); -#if DEBUG_KP_EFFECT_REDUCE_COLORS qCDebug(kpLogImagelib) << "\tformat: before=" << image.format () << "after=" << retImage.format (); -#endif -#if DEBUG_KP_EFFECT_REDUCE_COLORS && 0 qCDebug(kpLogImagelib) << "After colour reduction:"; for (int y = 0; y < image.height (); y++) { @@ -198,7 +180,6 @@ } fprintf (stderr, "\n"); } -#endif return retImage; } diff --git a/imagelib/kpColor.cpp b/imagelib/kpColor.cpp --- a/imagelib/kpColor.cpp +++ b/imagelib/kpColor.cpp @@ -49,10 +49,8 @@ kpColor::kpColor (int red, int green, int blue, bool isTransparent) : m_rgba(0), m_colorCacheIsValid(false) { -#if DEBUG_KP_COLOR qCDebug(kpLogImagelib) << "kpColor::(r=" << red << ",g=" << green << ",b=" << blue << ",isTrans=" << isTransparent << ")" << endl; -#endif if (red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255) @@ -75,9 +73,7 @@ kpColor::kpColor (const QRgb &rgba) : m_colorCacheIsValid (false) { -#if DEBUG_KP_COLOR qCDebug(kpLogImagelib) << "kpColor::(rgba=" << (int *) rgba << ")"; -#endif m_rgba = rgba; m_rgbaIsValid = true; } @@ -90,9 +86,7 @@ m_colorCacheIsValid (rhs.m_colorCacheIsValid), m_colorCache (rhs.m_colorCache) { -#if DEBUG_KP_COLOR qCDebug(kpLogImagelib) << "kpColor::()"; -#endif } //--------------------------------------------------------------------- diff --git a/imagelib/kpFloodFill.cpp b/imagelib/kpFloodFill.cpp --- a/imagelib/kpFloodFill.cpp +++ b/imagelib/kpFloodFill.cpp @@ -165,9 +165,7 @@ if (d->colorToChange.isValid ()) return; -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "kpFloodFill::prepareColorToChange()"; -#endif d->colorToChange = kpPixmapFX::getColorAtPixel (*d->imagePtr, QPoint (d->x, d->y)); } @@ -257,10 +255,8 @@ // private void kpFloodFill::addLine (int y, int x1, int x2) { -#if DEBUG_KP_FLOOD_FILL && 0 qCDebug(kpLogImagelib) << "kpFillCommand::fillAddLine (" - << y << "," << x1 << "," << x2 << ")" << endl; -#endif + << y << "," << x1 << "," << x2 << ")"; d->fillLines.append (kpFillLine (y, x1, x2)); d->fillLinesCache [y].append ( @@ -303,18 +299,13 @@ if (d->prepared) return; -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "kpFloodFill::prepare()"; -#endif prepareColorToChange (); d->boundingRect = QRect (); - -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "\tperforming NOP check"; -#endif // get the color we need to replace if (d->processedColorSimilarity == 0 && d->color == d->colorToChange) @@ -325,31 +316,24 @@ return; } -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "\tcreating fillLinesCache"; -#endif // ready cache for (int i = 0; i < d->imagePtr->height (); i++) d->fillLinesCache.append (QLinkedList ()); -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "\tcreating fill lines"; -#endif // draw initial line addLine (d->y, findMinX (d->y, d->x), findMaxX (d->y, d->x)); for (QLinkedList ::ConstIterator it = d->fillLines.begin (); it != d->fillLines.end (); ++it) { - #if DEBUG_KP_FLOOD_FILL && 0 qCDebug(kpLogImagelib) << "Expanding from y=" << (*it).m_y << " x1=" << (*it).m_x1 - << " x2=" << (*it).m_x2 - << endl; - #endif + << " x2=" << (*it).m_x2; // // Make more lines above and below current line. @@ -364,9 +348,7 @@ findAndAddLines (*it, +1); } -#if DEBUG_KP_FLOOD_FILL && 1 qCDebug(kpLogImagelib) << "\tfinalising memory usage"; -#endif // finalize memory usage d->fillLinesCache.clear (); diff --git a/imagelib/kpPainter.cpp b/imagelib/kpPainter.cpp --- a/imagelib/kpPainter.cpp +++ b/imagelib/kpPainter.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_PAINTER 0 - - #include "kpPainter.h" #include "kpImage.h" @@ -40,6 +36,8 @@ #include #include +#include +#include #include "kpLogCategories.h" #include @@ -71,10 +69,8 @@ bool cardinalAdjacency, double probability) { -#if DEBUG_KP_PAINTER qCDebug(kpLogImagelib) << "CALL(startPoint=" << startPoint << ",endPoint=" << endPoint << ")"; -#endif QList ret; @@ -198,11 +194,9 @@ { bool didSomething = false; -#if DEBUG_KP_PAINTER && 0 qCDebug(kpLogImagelib) << "kppixmapfx.cpp:WashRect(imageRect=" << imageRect << ",drawRect=" << drawRect - << ")" << endl; -#endif + << ")"; // If you're going to pass painter pointers, those painters had better be // active (i.e. QPainter::begin() has been called). @@ -239,25 +233,19 @@ int x; // for FLUSH_LINE() for (x = minX; x <= maxX; x++) { - #if DEBUG_KP_PAINTER && 0 fprintf (stderr, "y=%i x=%i colorAtPixel=%08X colorToReplace=%08X ... ", y, x, kpPixmapFX::getColorAtPixel (image, QPoint (x, y)).toQRgb (), colorToReplace.toQRgb ()); - #endif if (kpPixmapFX::getColorAtPixel (image, QPoint (x, y)).isSimilarTo (colorToReplace, processedColorSimilarity)) { - #if DEBUG_KP_PAINTER && 0 fprintf (stderr, "similar\n"); - #endif if (startDrawX < 0) startDrawX = x; } else { - #if DEBUG_KP_PAINTER && 0 fprintf (stderr, "different\n"); - #endif if (startDrawX >= 0) FLUSH_LINE (); } @@ -308,13 +296,10 @@ const QRect normalizedRect = kpPainter::normalizedRect(pack.startPoint, pack.endPoint); pack.readableImageRect = kpTool::neededRect (normalizedRect, qMax (pack.penWidth, pack.penHeight)); -#if DEBUG_KP_PAINTER qCDebug(kpLogImagelib) << "kppainter.cpp:Wash() startPoint=" << startPoint << " endPoint=" << endPoint << " --> normalizedRect=" << normalizedRect - << " readableImageRect=" << pack.readableImageRect - << endl; -#endif + << " readableImageRect=" << pack.readableImageRect; pack.readableImage = kpPixmapFX::getPixmapAt (*image, pack.readableImageRect); QPainter painter(image); @@ -335,20 +320,11 @@ static QRect WashLineHelper (QPainter *rgbPainter, void *data) { -#if DEBUG_KP_PAINTER && 0 - qCDebug(kpLogImagelib) << "Washing pixmap (w=" << rect.width () - << ",h=" << rect.height () << ")" << endl; - QTime timer; - int convAndWashTime; -#endif - WashPack *pack = static_cast (data); - // Setup painters. ::WashHelperSetup (rgbPainter, pack); - bool didSomething = false; QList points = kpPainter::interpolatePoints (pack->startPoint, pack->endPoint); @@ -374,17 +350,6 @@ } } - -#if DEBUG_KP_PAINTER && 0 - int ms = timer.restart (); - qCDebug(kpLogImagelib) << "\ttried to wash: " << ms << "ms" - << " (" << (ms ? (rect.width () * rect.height () / ms) : -1234) - << " pixels/ms)" - << endl; - convAndWashTime += ms; -#endif - - // TODO: Rectangle may be too big. Use QRect::united() incrementally? // Efficiency? return didSomething ? pack->readableImageRect : QRect (); @@ -411,16 +376,8 @@ static QRect WashRectHelper (QPainter *rgbPainter, void *data) { -#if DEBUG_KP_PAINTER && 0 - qCDebug(kpLogImagelib) << "Washing pixmap (w=" << rect.width () - << ",h=" << rect.height () << ")" << endl; - QTime timer; - int convAndWashTime; -#endif - WashPack *pack = static_cast (data); - // Setup painters. ::WashHelperSetup (rgbPainter, pack); @@ -439,17 +396,6 @@ didSomething = true; } - -#if DEBUG_KP_PAINTER && 0 - int ms = timer.restart (); - qCDebug(kpLogImagelib) << "\ttried to wash: " << ms << "ms" - << " (" << (ms ? (rect.width () * rect.height () / ms) : -1234) - << " pixels/ms)" - << endl; - convAndWashTime += ms; -#endif - - return didSomething ? drawRect : QRect (); } @@ -478,10 +424,7 @@ const kpColor &color, int spraycanSize) { -#if DEBUG_KP_PAINTER qCDebug(kpLogImagelib) << "kpPainter::sprayPoints()"; -#endif - Q_ASSERT (spraycanSize > 0); QPainter painter(image); diff --git a/imagelib/transforms/kpTransformAutoCrop.cpp b/imagelib/transforms/kpTransformAutoCrop.cpp --- a/imagelib/transforms/kpTransformAutoCrop.cpp +++ b/imagelib/transforms/kpTransformAutoCrop.cpp @@ -41,9 +41,6 @@ // to get vastly differently colors in both sides yet they will be // considered similar). -#define DEBUG_KP_TOOL_AUTO_CROP 0 - - #include "kpTransformAutoCrop.h" #include "layers/selections/image/kpAbstractImageSelection.h" @@ -202,9 +199,7 @@ // public bool kpTransformAutoCropBorder::calculate (int isX, int dir) { -#if DEBUG_KP_TOOL_AUTO_CROP && 1 qCDebug(kpLogImagelib) << "kpTransformAutoCropBorder::calculate() CALLED!"; -#endif int maxX = m_imagePtr->width () - 1; int maxY = m_imagePtr->height () - 1; @@ -420,21 +415,17 @@ kpDocument *doc = document (); Q_ASSERT (doc); -#if DEBUG_KP_TOOL_AUTO_CROP && 1 qCDebug(kpLogImagelib) << "kpTransformAutoCropCommand::getUndoImage()"; qCDebug(kpLogImagelib) << "\timage=" << image << " border: rect=" << border.rect () << " isSingleColor=" << border.isSingleColor () << endl; -#endif if (image && border.exists () && !border.isSingleColor ()) { if (*image) { - #if DEBUG_KP_TOOL_AUTO_CROP && 1 qCDebug(kpLogImagelib) << "\talready have *image - delete it"; - #endif delete *image; } @@ -457,9 +448,7 @@ // private void kpTransformAutoCropCommand::deleteUndoImages () { -#if DEBUG_KP_TOOL_AUTO_CROP && 1 qCDebug(kpLogImagelib) << "kpTransformAutoCropCommand::deleteUndoImages()"; -#endif delete d->leftImage; d->leftImage = nullptr; delete d->rightImage; d->rightImage = nullptr; @@ -513,9 +502,7 @@ // public virtual [base kpCommand] void kpTransformAutoCropCommand::unexecute () { -#if DEBUG_KP_TOOL_AUTO_CROP && 1 qCDebug(kpLogImagelib) << "kpTransformAutoCropCommand::unexecute()"; -#endif kpDocument *doc = document (); Q_ASSERT (doc); @@ -638,9 +625,7 @@ bool kpTransformAutoCrop (kpMainWindow *mainWindow) { -#if DEBUG_KP_TOOL_AUTO_CROP qCDebug(kpLogImagelib) << "kpTransformAutoCrop() CALLED!"; -#endif Q_ASSERT (mainWindow); kpDocument *doc = mainWindow->document (); @@ -695,7 +680,6 @@ return false; } -#if DEBUG_KP_TOOL_AUTO_CROP qCDebug(kpLogImagelib) << "\tnumRegions=" << numRegions; qCDebug(kpLogImagelib) << "\t\tleft=" << leftBorder.rect () << " refCol=" << (leftBorder.exists () ? (int *) leftBorder.referenceColor ().toQRgb () : 0) @@ -713,7 +697,6 @@ << " refCol=" << (botBorder.exists () ? (int *) botBorder.referenceColor ().toQRgb () : 0) << " avgCol=" << (botBorder.exists () ? (int *) botBorder.averageColor ().toQRgb () : 0) << endl; -#endif // In case e.g. the user pastes a solid, coloured-in rectangle, @@ -731,9 +714,7 @@ if ((numRegions == 2 && !leftCol.isSimilarTo (rightCol, processedColorSimilarity)) || leftBorder.right () >= rightBorder.left () - 1) // kissing or overlapping { - #if DEBUG_KP_TOOL_AUTO_CROP qCDebug(kpLogImagelib) << "\tignoring left border"; - #endif leftBorder.invalidate (); } } @@ -746,9 +727,7 @@ if ((numRegions == 2 && !topCol.isSimilarTo (botCol, processedColorSimilarity)) || topBorder.bottom () >= botBorder.top () - 1) // kissing or overlapping { - #if DEBUG_KP_TOOL_AUTO_CROP qCDebug(kpLogImagelib) << "\tignoring top border"; - #endif topBorder.invalidate (); } } diff --git a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp --- a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp +++ b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_TOOL_CROP 0 - - #include "kpTransformCrop.h" #include "kpTransformCropPrivate.h" @@ -42,6 +38,7 @@ #include "pixmapfx/kpPixmapFX.h" #include "commands/tools/selection/kpToolSelectionCreateCommand.h" #include "views/manager/kpViewManager.h" +#include "kpLogCategories.h" // See the "image selection" part of the kpTransformCrop() API Doc. @@ -106,9 +103,7 @@ // public virtual [base kpCommand] void SetDocumentToSelectionImageCommand::execute () { -#if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "SetDocumentToSelectionImageCommand::execute()"; -#endif viewManager ()->setQueueUpdates (); { @@ -142,31 +137,25 @@ QImage newDocImage(document()->width(), document()->height(), QImage::Format_ARGB32_Premultiplied); newDocImage.fill(m_backgroundColor.toQRgb()); - #if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tsel: rect=" << m_fromSelectionPtr->boundingRect () << " pm=" << m_fromSelectionPtr->hasContent () << endl; - #endif QImage setTransparentImage; if (m_fromSelectionPtr->hasContent ()) { setTransparentImage = m_fromSelectionPtr->transparentImage (); - #if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\thave pixmap; rect=" << setTransparentImage.rect () << endl; - #endif } else { setTransparentImage = m_imageIfFromSelectionDoesntHaveOne; - #if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tno pixmap in sel - get it; rect=" << setTransparentImage.rect () << endl; - #endif } kpPixmapFX::paintPixmapAt (&newDocImage, @@ -188,20 +177,16 @@ // public virtual [base kpCommand] void SetDocumentToSelectionImageCommand::unexecute () { -#if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "SetDocumentToSelectionImageCommand::unexecute()"; -#endif viewManager ()->setQueueUpdates (); { document ()->setImageAt (m_oldImage, QPoint (0, 0)); m_oldImage = kpImage (); - #if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tsel: rect=" << m_fromSelectionPtr->boundingRect () << " pm=" << m_fromSelectionPtr->hasContent () << endl; - #endif document ()->setSelection (*m_fromSelectionPtr); environ ()->somethingBelowTheCursorChanged (); @@ -228,23 +213,17 @@ borderImageSel->deleteContent (); borderImageSel->moveTo (QPoint (0, 0)); - kpCommandEnvironment *environ = mainWindow->commandEnvironment (); - - kpMacroCommand *macroCmd = new kpMacroCommand (commandName, environ); // (must resize doc _before_ SetDocumentToSelectionImageCommand in case // doc needs to gets bigger - else selection image may not fit) macroCmd->addCommand (resizeDocCommand); -#if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tis pixmap sel"; qCDebug(kpLogImagelib) << "\tcreating SetImage cmd"; -#endif macroCmd->addCommand (new SetDocumentToSelectionImageCommand (environ)); - mainWindow->addImageOrSelectionCommand ( macroCmd, true/*add create cmd*/, @@ -258,6 +237,5 @@ *borderImageSel, mainWindow->commandEnvironment ())); - delete borderImageSel; } diff --git a/imagelib/transforms/kpTransformCrop_TextSelection.cpp b/imagelib/transforms/kpTransformCrop_TextSelection.cpp --- a/imagelib/transforms/kpTransformCrop_TextSelection.cpp +++ b/imagelib/transforms/kpTransformCrop_TextSelection.cpp @@ -36,6 +36,7 @@ #include "mainWindow/kpMainWindow.h" #include "commands/tools/selection/kpToolSelectionMoveCommand.h" +#include "kpLogCategories.h" void kpTransformCrop_TextSelection (kpMainWindow *mainWindow, const QString &commandName, kpCommand *resizeDocCommand) @@ -47,19 +48,15 @@ macroCmd->addCommand (resizeDocCommand); -#if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tisText"; qCDebug(kpLogImagelib) << "\tclearing doc with trans cmd"; -#endif macroCmd->addCommand ( new kpEffectClearCommand ( false/*act on doc*/, kpColor::Transparent, environ)); -#if DEBUG_KP_TOOL_CROP qCDebug(kpLogImagelib) << "\tmoving sel to (0,0) cmd"; -#endif kpToolSelectionMoveCommand *moveCmd = new kpToolSelectionMoveCommand ( QString()/*uninteresting child of macro cmd*/, diff --git a/layers/selections/image/kpAbstractImageSelection.cpp b/layers/selections/image/kpAbstractImageSelection.cpp --- a/layers/selections/image/kpAbstractImageSelection.cpp +++ b/layers/selections/image/kpAbstractImageSelection.cpp @@ -140,10 +140,8 @@ QImage qimage; stream >> qimage; -#if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "\timage: w=" << qimage.width () << " h=" << qimage.height () << " depth=" << qimage.depth () << endl; -#endif if (!qimage.isNull ()) { @@ -180,16 +178,12 @@ if (!d->baseImage.isNull ()) { const QImage image = d->baseImage; - #if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "\twrote image rect=" << image.rect (); - #endif stream << image; } else { - #if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "\twrote no image because no pixmap"; - #endif stream << QImage (); } } @@ -270,24 +264,19 @@ // public kpImage kpAbstractImageSelection::givenImageMaskedByShape (const kpImage &image) const { -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "kpAbstractImageSelection::givenImageMaskedByShape() boundingRect=" - << boundingRect () << endl; -#endif + << boundingRect (); Q_ASSERT (image.width () == width () && image.height () == height ()); if (isRectangular ()) return image; const QRegion mRegion = shapeRegion ().translated (-topLeft ()); -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tshapeRegion=" << shapeRegion () << " [rect=" << shapeRegion ().boundingRect () << "]" << " calculatePoints=" << calculatePoints () - << " [rect=" << calculatePoints ().boundingRect () << "]" - << endl; -#endif + << " [rect=" << calculatePoints ().boundingRect () << "]"; kpImage retImage(width (), height (), QImage::Format_ARGB32_Premultiplied); retImage.fill(0); // transparent @@ -373,9 +362,7 @@ { if (d->transparencyMaskCache.isNull ()) { - #if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tboth old and new pixmaps are null - nothing changed"; - #endif haveChanged = false; } else if (checkTransparentPixmapChanged) @@ -391,12 +378,9 @@ if (kpPixmapFX::getColorAtPixel (oldTransparencyMaskImage, x, y) != kpPixmapFX::getColorAtPixel (newTransparencyMaskImage, x, y)) { - #if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tdiffer at " << QPoint (x, y) << " old=" << kpPixmapFX::getColorAtPixel (oldTransparencyMaskImage, x, y).toQRgb () - << " new=" << kpPixmapFX::getColorAtPixel (newTransparencyMaskImage, x, y).toQRgb () - << endl; - #endif + << " new=" << kpPixmapFX::getColorAtPixel (newTransparencyMaskImage, x, y).toQRgb (); changed = true; break; } @@ -420,24 +404,18 @@ // private void kpAbstractImageSelection::recalculateTransparencyMaskCache () { -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "kpAbstractImageSelection::recalculateTransparencyMaskCache()"; -#endif if (d->baseImage.isNull ()) { - #if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tno image - no need for transparency mask"; - #endif d->transparencyMaskCache = QBitmap (); return; } if (d->transparency.isOpaque ()) { - #if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\topaque - no need for transparency mask"; - #endif d->transparencyMaskCache = QBitmap (); return; } @@ -472,9 +450,7 @@ if (!hasTransparent) { - #if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tcolour useless - completely opaque"; - #endif d->transparencyMaskCache = QBitmap (); return; } @@ -521,24 +497,18 @@ // public virtual void kpAbstractImageSelection::flip (bool horiz, bool vert) { -#if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "kpAbstractImageSelection::flip(horiz=" << horiz << ",vert=" << vert << ")" << endl; -#endif if (!d->baseImage.isNull ()) { - #if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "\thave pixmap - flipping that"; - #endif d->baseImage = d->baseImage.mirrored(horiz, vert); } if (!d->transparencyMaskCache.isNull ()) { - #if DEBUG_KP_SELECTION && 1 qCDebug(kpLogLayers) << "\thave transparency mask - flipping that"; - #endif QImage image = d->transparencyMaskCache.toImage().mirrored(horiz, vert); d->transparencyMaskCache = QBitmap::fromImage(image); } @@ -578,5 +548,3 @@ } //--------------------------------------------------------------------- - - diff --git a/layers/selections/image/kpFreeFormImageSelection.cpp b/layers/selections/image/kpFreeFormImageSelection.cpp --- a/layers/selections/image/kpFreeFormImageSelection.cpp +++ b/layers/selections/image/kpFreeFormImageSelection.cpp @@ -175,11 +175,9 @@ static QPolygon RecalculateCardinallyAdjacentPoints (const QPolygon &points) { -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "kpFreeFormImageSelection.cpp:RecalculateCardinallyAdjacentPoints()" << endl; qCDebug(kpLogLayers) << "\tpoints=" << points; -#endif // Filter out duplicates. QPolygon noDups; @@ -190,9 +188,7 @@ noDups.append (p); } -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\twithout dups=" << noDups; -#endif // Interpolate to ensure cardinal adjacency. QPolygon cardPoints; @@ -222,9 +218,7 @@ else cardPoints.append (p); } -#if DEBUG_KP_SELECTION qCDebug(kpLogLayers) << "\tcardinally adjacent=" << cardPoints; -#endif return cardPoints; } diff --git a/layers/selections/image/kpImageSelectionTransparency.cpp b/layers/selections/image/kpImageSelectionTransparency.cpp --- a/layers/selections/image/kpImageSelectionTransparency.cpp +++ b/layers/selections/image/kpImageSelectionTransparency.cpp @@ -68,36 +68,25 @@ bool kpImageSelectionTransparency::operator== (const kpImageSelectionTransparency &rhs) const { -#if DEBUG_KP_SELECTION_TRANSPARENCY && 0 qCDebug(kpLogLayers) << "kpImageSelectionTransparency::operator==()"; -#endif if (m_isOpaque != rhs.m_isOpaque) { - #if DEBUG_KP_SELECTION_TRANSPARENCY && 0 qCDebug(kpLogLayers) << "\tdifferent opacity: lhs=" << m_isOpaque - << " rhs=" << rhs.m_isOpaque - << endl; - #endif + << " rhs=" << rhs.m_isOpaque; return false; } if (m_isOpaque) { - #if DEBUG_KP_SELECTION_TRANSPARENCY && 0 qCDebug(kpLogLayers) << "\tboth opaque - eq"; - #endif return true; } -#if DEBUG_KP_SELECTION_TRANSPARENCY && 0 qCDebug(kpLogLayers) << "\tcolours: lhs=" << (int *) m_transparentColor.toQRgb () - << " rhs=" << (int *) rhs.m_transparentColor.toQRgb () - << endl; + << " rhs=" << (int *) rhs.m_transparentColor.toQRgb (); qCDebug(kpLogLayers) << "\tcolour similarity: lhs=" << m_colorSimilarity - << " rhs=" << rhs.m_colorSimilarity - << endl; -#endif + << " rhs=" << rhs.m_colorSimilarity; return (m_transparentColor == rhs.m_transparentColor && m_colorSimilarity == rhs.m_colorSimilarity); diff --git a/lgpl/CMakeLists.txt b/lgpl/CMakeLists.txt --- a/lgpl/CMakeLists.txt +++ b/lgpl/CMakeLists.txt @@ -10,6 +10,7 @@ generic/kpUrlFormatter.cpp generic/kpColorCollection.cpp generic/widgets/kpColorCellsBase.cpp + ../kpLogCategories.cpp ) add_library(kolourpaint_lgpl SHARED ${kolourpaint_lgpl_SRCS}) diff --git a/lgpl/generic/kpColorCollection.cpp b/lgpl/generic/kpColorCollection.cpp --- a/lgpl/generic/kpColorCollection.cpp +++ b/lgpl/generic/kpColorCollection.cpp @@ -125,9 +125,7 @@ QString tempPaletteFilePath; if (url.isEmpty () || !KIO::NetAccess::download (url, tempPaletteFilePath, parent)) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\tcould not download"; - #endif ::CouldNotOpenDialog (url, parent); return false; } @@ -138,9 +136,7 @@ if (!paletteFile.exists() || !paletteFile.open(QIODevice::ReadOnly)) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\tcould not open qfile"; - #endif KIO::NetAccess::removeTempFile (tempPaletteFilePath); ::CouldNotOpenDialog (url, parent); return false; @@ -210,43 +206,33 @@ bool kpColorCollection::openKDE(const QString &name, QWidget *parent) { -#if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "name=" << name; -#endif if (name.isEmpty()) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "name.isEmpty"; - #endif ::CouldNotOpenKDEDialog (name, parent); return false; } QString filename = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, "colors/" + name); if (filename.isEmpty()) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "could not find file"; - #endif ::CouldNotOpenKDEDialog (name, parent); return false; } // (this will pop up an error dialog on failure) if (!open (QUrl::fromLocalFile (filename), parent)) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "could not open"; - #endif return false; } d->name = name; -#if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "opened"; -#endif return true; } @@ -315,10 +301,8 @@ // opened. atomicFileWriter.cancelWriting (); - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\treturning false because could not open QSaveFile" << " error=" << atomicFileWriter.error () << endl; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -332,9 +316,7 @@ { atomicFileWriter.cancelWriting (); - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\tcould not close QSaveFile"; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -348,9 +330,7 @@ QTemporaryFile tempFile; if (!tempFile.open ()) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\treturning false because could not open tempFile"; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -361,17 +341,13 @@ // Collect name of temporary file now, as QTemporaryFile::fileName() // stops working after close() is called. const QString tempFileName = tempFile.fileName (); - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\ttempFileName='" << tempFileName << "'"; - #endif Q_ASSERT (!tempFileName.isEmpty ()); tempFile.close (); if (tempFile.error () != QFile::NoError) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\treturning false because could not close"; - #endif ::CouldNotSaveDialog (url, parent); return false; } @@ -382,9 +358,7 @@ // At least, fish:// (ssh) is definitely not atomic. if (!KIO::NetAccess::upload (tempFileName, url, parent)) { - #if DEBUG_KP_COLOR_COLLECTION qCDebug(kpLogMisc) << "\treturning false because could not upload"; - #endif ::CouldNotSaveDialog (url, parent); return false; } diff --git a/lgpl/generic/widgets/kpColorCellsBase.cpp b/lgpl/generic/widgets/kpColorCellsBase.cpp --- a/lgpl/generic/widgets/kpColorCellsBase.cpp +++ b/lgpl/generic/widgets/kpColorCellsBase.cpp @@ -136,10 +136,8 @@ { const int oldRows = rowCount (), oldCols = columnCount (); const int newRows = rows, newCols = columns; -#if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "oldRows=" << oldRows << "oldCols=" << oldCols << "newRows=" << newRows << "newCols=" << newCols; -#endif if (oldRows == newRows && oldCols == newCols) return; @@ -382,9 +380,7 @@ Q_UNUSED( ignoreBorders ) const int r = indexAt (pos).row (), c = indexAt (pos).column (); -#if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "r=" << r << "c=" << c; -#endif if (r == -1 || c == -1) return -1; @@ -420,16 +416,12 @@ int cell = positionToCell(d->mousePos); if (cell != -1) { - #if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "beginning drag from cell=" << cell << "color: isValid=" << d->colors [cell].isValid () << " rgba=" << (int *) d->colors [cell].rgba(); - #endif Q_ASSERT (d->colors[cell].isValid()); KColorMimeData::createDrag(d->colors[cell], this)->start(Qt::CopyAction | Qt::MoveAction); - #if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "finished drag"; - #endif } } } @@ -458,26 +450,22 @@ void kpColorCellsBase::dragEnterEvent( QDragEnterEvent *event) { -#if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "kpColorCellsBase::dragEnterEvent() acceptDrags=" << d->acceptDrags << " canDecode=" << KColorMimeData::canDecode(event->mimeData()) << endl; -#endif event->setAccepted( d->acceptDrags && KColorMimeData::canDecode( event->mimeData())); if (event->isAccepted ()) ::SetDropAction (this, event); } // Reimplemented to override QTableWidget's override. Else dropping doesn't work. void kpColorCellsBase::dragMoveEvent (QDragMoveEvent *event) { -#if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "kpColorCellsBase::dragMoveEvent() acceptDrags=" << d->acceptDrags << " canDecode=" << KColorMimeData::canDecode(event->mimeData()) << endl; -#endif // TODO: Disallow drag that isn't onto a cell. event->setAccepted( d->acceptDrags && KColorMimeData::canDecode( event->mimeData())); if (event->isAccepted ()) @@ -491,18 +479,14 @@ const int dragSourceCell = event->source () == this ? positionToCell (d->mousePos, true) : -1; -#if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "kpColorCellsBase::dropEvent()" << "color: rgba=" << (const int *) c.rgba () << "isValid=" << c.isValid() << "source=" << event->source () << "dragSourceCell=" << dragSourceCell; -#endif if( c.isValid()) { ::SetDropAction (this, event); int cell = positionToCell(event->pos(), true, true/*allow empty cell*/); - #if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "\tcell=" << cell; - #endif // TODO: I believe kdelibs forgets to do this. if (cell == -1) return; @@ -514,10 +498,8 @@ QColor destOldColor = d->colors [cell]; setColor(cell,c); - #if DEBUG_KP_COLOR_CELLS_BASE qCDebug(kpLogMisc) << "\tdropAction=" << event->dropAction () << "destOldColor.rgba=" << (const int *) destOldColor.rgba (); - #endif if (event->dropAction () == Qt::MoveAction && dragSourceCell != -1) { setColor(dragSourceCell, destOldColor); } @@ -561,5 +543,3 @@ if (cell != -1) emit colorDoubleClicked( cell , color(cell) ); } - - diff --git a/mainWindow/kpMainWindow.cpp b/mainWindow/kpMainWindow.cpp --- a/mainWindow/kpMainWindow.cpp +++ b/mainWindow/kpMainWindow.cpp @@ -100,9 +100,7 @@ // private void kpMainWindow::readGeneralSettings () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tkpMainWindow(" << objectName () << ")::readGeneralSettings()"; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupGeneral); @@ -119,11 +117,9 @@ else { d->configOpenImagesInSameWindow = false; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tconfigOpenImagesInSameWindow: first time" << " - writing default: " << d->configOpenImagesInSameWindow << endl; -#endif // TODO: More hidden options have to write themselves out on startup, // not on use, to be discoverable (e.g. printing centered on page). cfg.writeEntry (kpSettingOpenImagesInSameWindow, @@ -134,39 +130,33 @@ d->configPrintImageCenteredOnPage = cfg.readEntry (kpSettingPrintImageCenteredOnPage, true); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tGeneral Settings: firstTime=" << d->configFirstTime << " showGrid=" << d->configShowGrid << " showPath=" << d->configShowPath << " moreEffectsDialogLastEffect=" << d->moreEffectsDialogLastEffect << " openImagesInSameWindow=" << d->configOpenImagesInSameWindow << " printImageCenteredOnPage=" << d->configPrintImageCenteredOnPage; -#endif } //--------------------------------------------------------------------- // private void kpMainWindow::readThumbnailSettings () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tkpMainWindow(" << objectName () << ")::readThumbnailSettings()"; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupThumbnail); d->configThumbnailShown = cfg.readEntry (kpSettingThumbnailShown, false); d->configThumbnailGeometry = cfg.readEntry (kpSettingThumbnailGeometry, QRect ()); d->configZoomedThumbnail = cfg.readEntry (kpSettingThumbnailZoomed, true); d->configThumbnailShowRectangle = cfg.readEntry (kpSettingThumbnailShowRectangle, true); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tThumbnail Settings: shown=" << d->configThumbnailShown << " geometry=" << d->configThumbnailGeometry << " zoomed=" << d->configZoomedThumbnail << " showRectangle=" << d->configThumbnailShowRectangle << endl; -#endif } //--------------------------------------------------------------------- @@ -189,10 +179,8 @@ // private void kpMainWindow::init () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow(" << objectName () << ")::init()"; QTime totalTime; totalTime.start (); -#endif d = new kpMainWindowPrivate; @@ -279,36 +267,28 @@ } -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tall done in " << totalTime.elapsed () << "msec"; -#endif } //--------------------------------------------------------------------- // private virtual [base KMainWindow] void kpMainWindow::readProperties (const KConfigGroup &configGroup) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow<" << this << ">::readProperties()"; -#endif // No document at all? if (!configGroup.hasKey (kpSessionSettingDocumentUrl)) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tno url - no document"; - #endif setDocument (nullptr); } // Have a document. else { const QUrl url = QUrl (configGroup.readEntry (kpSessionSettingDocumentUrl, QString ())); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\turl=" << url; - #endif const QSize notFromURLDocSize = configGroup.readEntry (kpSessionSettingNotFromUrlDocumentSize, @@ -325,9 +305,7 @@ // Not from URL? else { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tnot from url; doc size=" << notFromURLDocSize; - #endif // Either we have an empty URL or we have a "kolourpaint doesnotexist.png" // URL. Regarding the latter case, if a file now actually exists at that // URL, we do open it - ignoring notFromURLDocSize - to avoid putting @@ -347,16 +325,12 @@ // in this function!" void kpMainWindow::saveProperties (KConfigGroup &configGroup) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow<" << this << ">::saveProperties()"; -#endif // No document at all? if (!d->document) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tno url - no document"; - #endif } // Have a document. else @@ -369,9 +343,7 @@ // ii) URL (from "kolourpaint doesnotexist.png") const QUrl url = d->document->url (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\turl=" << url; - #endif configGroup.writeEntry (kpSessionSettingDocumentUrl, url.url ()); // Not from URL e.g. "kolourpaint doesnotexist.png"? @@ -394,9 +366,7 @@ // Similarly for height() and constructorHeight(). const QSize docSize (d->document->constructorWidth (), d->document->constructorHeight ()); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tnot from url; doc size=" << docSize; - #endif configGroup.writeEntry (kpSessionSettingNotFromUrlDocumentSize, docSize); } } @@ -535,9 +505,7 @@ // is it a close operation? if (!newDoc) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdisabling actions"; - #endif // sync with the bit marked "sync" below @@ -577,10 +545,8 @@ delete d->viewManager; d->viewManager = nullptr; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdestroying document"; qCDebug(kpLogMainWindow) << "\t\td->document=" << d->document; -#endif // destroy current document delete d->document; d->document = newDoc; @@ -607,10 +573,8 @@ // not a close operation? if (d->document) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\treparenting doc that may have been created into a" << " different mainWindiow" << endl; - #endif d->document->setEnviron (documentEnvironment ()); d->viewManager = new kpViewManager (this); @@ -625,9 +589,7 @@ d->scrollView->setView (d->mainView); d->mainView->show (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\thooking up document signals"; - #endif // Copy/Cut/Deselect/Delete connect (d->document, &kpDocument::selectionEnabled, @@ -702,9 +664,7 @@ static_cast(&kpDocument::sizeChanged), d->viewManager, &kpViewManager::adjustViewsToEnvironment); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tenabling actions"; - #endif // sync with the bit marked "sync" above @@ -720,9 +680,7 @@ enableDocumentActions (true); } -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tupdating mainWindow elements"; -#endif slotImageMenuUpdateDueToSelection (); recalculateStatusBar (); @@ -733,9 +691,7 @@ if (d->commandHistory) d->commandHistory->clear (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdocument and views ready to go!"; -#endif } //--------------------------------------------------------------------- @@ -755,9 +711,7 @@ // private virtual [base QWidget] void kpMainWindow::dropEvent (QDropEvent *e) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::dropEvent" << e->pos (); -#endif QList urls; @@ -787,23 +741,18 @@ QPoint selTopLeft = KP_INVALID_POINT; const QPoint globalPos = QWidget::mapToGlobal (e->pos ()); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tpos toGlobal=" << globalPos; - #endif kpView *view = nullptr; if (d->viewManager) { view = d->viewManager->viewUnderCursor (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tviewUnderCursor=" << view; - #endif if (!view) { // HACK: see kpViewManager::setViewUnderCursor() to see why // it's not reliable - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tattempting to discover view"; if (d->mainView && d->scrollView) @@ -817,7 +766,6 @@ d->scrollView->viewport()->height ())) << endl; } - #endif if (d->thumbnailView && kpWidgetMapper::toGlobal (d->thumbnailView, d->thumbnailView->rect ()) .contains (globalPos)) diff --git a/mainWindow/kpMainWindow_Colors.cpp b/mainWindow/kpMainWindow_Colors.cpp --- a/mainWindow/kpMainWindow_Colors.cpp +++ b/mainWindow/kpMainWindow_Colors.cpp @@ -179,10 +179,8 @@ // private bool kpMainWindow::queryCloseColors () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::queryCloseColors() colorCells.modified=" << colorCells ()->isModified (); -#endif toolEndShape (); @@ -265,24 +263,18 @@ // private bool kpMainWindow::openKDEColors (const QString &name) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::openKDEColors(" << name << ")"; -#endif kpColorCollection colorCol; if (colorCol.openKDE (name, this)) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "opened"; - #endif colorCells ()->setColorCollection (colorCol); return true; } else { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "failed to open"; - #endif return false; } } @@ -396,10 +388,8 @@ } } - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "result=" << result << "vs KMessageBox::Continue" << KMessageBox::Continue; - #endif if (result != KMessageBox::Continue) return; } diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp --- a/mainWindow/kpMainWindow_Edit.cpp +++ b/mainWindow/kpMainWindow_Edit.cpp @@ -165,9 +165,7 @@ // private slot void kpMainWindow::slotCut () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotCut() CALLED"; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -193,9 +191,7 @@ // private slot void kpMainWindow::slotCopy () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotCopy() CALLED"; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -286,12 +282,10 @@ // private QRect kpMainWindow::calcUsefulPasteRect (int imageWidth, int imageHeight) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::calcUsefulPasteRect(" << imageWidth << "," << imageHeight << ")" << endl; -#endif Q_ASSERT (d->document); // TODO: 1st choice is to paste sel near but not overlapping last deselect point @@ -321,10 +315,8 @@ // private void kpMainWindow::paste(const kpAbstractSelection &sel, bool forceTopLeft) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::paste(forceTopLeft=" << forceTopLeft << ")" << endl; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -368,12 +360,10 @@ delete selInUsefulPos; -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "sel.size=" << QSize (sel.width (), sel.height ()) << " document.size=" << QSize (d->document->width (), d->document->height ()) << endl; -#endif // If the selection is bigger than the document, automatically // resize the document (with the option of Undo'ing) to fit @@ -401,12 +391,10 @@ bool forceNewTextSelection, const QPoint &newTextSelectionTopLeft) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::pasteText(" << text << ",forceNewTextSelection=" << forceNewTextSelection << ",newTextSelectionTopLeft=" << newTextSelectionTopLeft << ")" << endl; -#endif if ( text.isEmpty() ) return; @@ -421,18 +409,14 @@ d->document && d->document->textSelection () && d->commandHistory && d->viewManager) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\treusing existing Text Selection"; - #endif d->viewManager->setQueueUpdates(); kpTextSelection *textSel = d->document->textSelection (); if (!textSel->hasContent ()) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\t\tneeds content"; - #endif commandHistory ()->addCreateSelectionCommand ( new kpToolSelectionCreateCommand ( i18n ("Text: Create Box"), @@ -483,9 +467,7 @@ } else { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tcreating Text Selection"; - #endif const kpTextStyle ts = textStyle (); const QFontMetrics fontMetrics = ts.fontMetrics (); @@ -534,13 +516,11 @@ void kpMainWindow::pasteTextAt (const QString &text, const QPoint &point, bool allowNewTextSelectionPointShift) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::pasteTextAt(" << text << ",point=" << point << ",allowNewTextSelectionPointShift=" << allowNewTextSelectionPointShift << ")" << endl; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -623,9 +603,7 @@ // private slot void kpMainWindow::slotPasteInNewWindow () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotPasteInNewWindow() CALLED"; -#endif kpSetOverrideCursorSaver cursorSaver (Qt::WaitCursor); @@ -647,9 +625,7 @@ kpImageSelectionTransparency transparency = win->imageSelectionTransparency (); if (transparency.isTransparent ()) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tchanging image selection transparency to opaque"; - #endif transparency.setOpaque (); // Since we are setting selection transparency programmatically // -- as opposed to in response to user input -- this will not @@ -676,14 +652,10 @@ // public slot void kpMainWindow::slotDelete () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotDelete() CALLED"; -#endif if (!d->actionDelete->isEnabled ()) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\taction not enabled - was probably called from kpTool::keyPressEvent()"; - #endif return; } @@ -704,9 +676,7 @@ // private slot void kpMainWindow::slotSelectAll () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotSelectAll() CALLED"; -#endif Q_ASSERT (d->document); toolEndShape (); @@ -728,29 +698,23 @@ // private void kpMainWindow::addDeselectFirstCommand (kpCommand *cmd) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::addDeselectFirstCommand(" << cmd << ")" << endl; -#endif kpAbstractSelection *sel = d->document->selection (); -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tsel=" << sel; -#endif if (sel) { // if you just dragged out something with no action then // forget the drag if (!sel->hasContent ()) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tjust a fresh border - was nop - delete"; - #endif d->document->selectionDelete (); if (tool ()) tool ()->somethingBelowTheCursorChanged (); @@ -760,9 +724,7 @@ } else { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\treal selection with image - push onto doc cmd"; - #endif kpCommand *deselectCommand = new kpToolSelectionDestroyCommand ( dynamic_cast (sel) ? i18n ("Text: Finish") : @@ -794,9 +756,7 @@ // public slot void kpMainWindow::slotDeselect () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::slotDeselect() CALLED"; -#endif Q_ASSERT (d->document && d->document->selection ()); toolEndShape (); @@ -809,9 +769,7 @@ // private slot void kpMainWindow::slotCopyToFile () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotCopyToFile()"; -#endif toolEndShape (); @@ -886,9 +844,7 @@ // private slot void kpMainWindow::slotPasteFromFile () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotPasteFromFile()"; -#endif toolEndShape (); diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp --- a/mainWindow/kpMainWindow_File.cpp +++ b/mainWindow/kpMainWindow_File.cpp @@ -86,20 +86,16 @@ // private void kpMainWindow::setupFileMenuActions () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::setupFileMenuActions()"; -#endif KActionCollection *ac = actionCollection (); d->actionNew = KStandardAction::openNew (this, SLOT (slotNew()), ac); d->actionOpen = KStandardAction::open (this, SLOT (slotOpen()), ac); d->actionOpenRecent = KStandardAction::openRecent(this, &kpMainWindow::slotOpenRecent, ac); connect(d->actionOpenRecent, &KRecentFilesAction::recentListCleared, this, &kpMainWindow::slotRecentListCleared); d->actionOpenRecent->loadEntries (KSharedConfig::openConfig ()->group (kpSettingsGroupRecentFiles)); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\trecent URLs=" << d->actionOpenRecent->items (); -#endif d->actionSave = KStandardAction::save (this, SLOT (slotSave()), ac); d->actionSaveAs = KStandardAction::saveAs (this, SLOT (slotSaveAs()), ac); @@ -195,9 +191,7 @@ // ref. const QUrl url = url_; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::addRecentURL(" << url << ")"; -#endif if (url.isEmpty ()) return; @@ -208,24 +202,18 @@ // realize what other processes have done e.g. Settings / Show Path cfg->reparseConfiguration (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\trecent URLs=" << d->actionOpenRecent->items (); -#endif // HACK: Something might have changed interprocess. // If we could PROPAGATE: interprocess, then this wouldn't be required. d->actionOpenRecent->loadEntries (cfg->group (kpSettingsGroupRecentFiles)); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tafter loading config=" << d->actionOpenRecent->items (); -#endif d->actionOpenRecent->addUrl (url); d->actionOpenRecent->saveEntries (cfg->group (kpSettingsGroupRecentFiles)); cfg->sync (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tnew recent URLs=" << d->actionOpenRecent->items (); -#endif // TODO: PROPAGATE: interprocess @@ -237,9 +225,7 @@ Q_ASSERT (dynamic_cast (kmw)); kpMainWindow *mw = static_cast (kmw); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tmw=" << mw; - #endif if (mw != this) { @@ -252,10 +238,8 @@ mw->d->actionOpenRecent->clear (); mw->d->actionOpenRecent->loadEntries (cfg->group (kpSettingsGroupRecentFiles)); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\t\tcheck recent URLs=" << mw->d->actionOpenRecent->items () << endl; - #endif } } } @@ -319,9 +303,7 @@ // private void kpMainWindow::saveDefaultDocSize (const QSize &size) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tCONFIG: saving Last Doc Size = " << size; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupGeneral); @@ -336,15 +318,11 @@ { if (d->configOpenImagesInSameWindow) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\topenImagesInSameWindow"; - #endif // (this brings up a dialog and might save the current doc) if (!queryCloseDocument ()) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tqueryCloseDocument() aborts open"; - #endif return false; } } @@ -390,16 +368,12 @@ documentEnvironment ()); if (!newDoc->open (url, newDocSameNameIfNotExist)) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\topen failed"; - #endif delete newDoc; return nullptr; } -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\topen OK"; -#endif // Send document to current or new window. setDocumentChoosingWindow (newDoc); @@ -411,11 +385,9 @@ // private bool kpMainWindow::open (const QUrl &url, bool newDocSameNameIfNotExist) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::open(" << url << ",newDocSameNameIfNotExist=" << newDocSameNameIfNotExist << ")" << endl; -#endif kpDocument *newDoc = openInternal (url, defaultDocSize (), @@ -498,10 +470,8 @@ // private slot void kpMainWindow::slotOpenRecent (const QUrl &url) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotOpenRecent(" << url << ")"; qCDebug(kpLogMainWindow) << "\titems=" << d->actionOpenRecent->items (); -#endif toolEndShape (); @@ -533,9 +503,7 @@ // private slot void kpMainWindow::slotScan () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotScan() scanDialog=" << d->scanDialog; -#endif toolEndShape (); @@ -553,9 +521,7 @@ return; } - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcreated scanDialog=" << d->scanDialog; - #endif connect (d->scanDialog, &SaneDialog::finalImage, this, &kpMainWindow::slotScanned); } @@ -578,17 +544,13 @@ return; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcalling setup"; -#endif // Bring up dialog to select scan device. // If there is no scanner, we find that this does not bring up a dialog // but still returns true. if (d->scanDialog->setup ()) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tOK - showing dialog"; - #endif // Called only if scanner configured/available. // // In reality, this seems to be called even if you press "Cancel" in @@ -601,24 +563,18 @@ else { // Have never seen this code path execute even if "Cancel" is pressed. - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tFAIL"; - #endif } } //--------------------------------------------------------------------- // private slot void kpMainWindow::slotScanned (const QImage &image, int) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotScanned() image.rect=" << image.rect (); -#endif -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\thiding dialog"; -#endif // (KScanDialog does not close itself after a scan is made) // // Close the dialog, first thing: @@ -820,12 +776,10 @@ QStringList mimeTypes; foreach(const QByteArray &type, QImageWriter::supportedMimeTypes()) mimeTypes << QString::fromLatin1(type); -#if DEBUG_KP_MAIN_WINDOW - QStringList sortedMimeTypes = mimeTypes; - sortedMimeTypes.sort (); + qCDebug(kpLogMainWindow) << "\tmimeTypes=" << mimeTypes - << "\tsortedMimeTypes=" << sortedMimeTypes << endl; -#endif + << "\tsortedMimeTypes=" << endl; + if (mimeTypes.isEmpty ()) { qCCritical(kpLogMainWindow) << "No output mimetypes!" << endl; @@ -836,22 +790,18 @@ mimeTypes.contains (fdSaveOptions.mimeType ())) if (!MIME_TYPE_IS_VALID ()) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tmimeType=" << fdSaveOptions.mimeType () << " not valid, get default" << endl; - #endif SETUP_READ_CFG (); fdSaveOptions.setMimeType (kpDocumentSaveOptions::defaultMimeType (cfg)); if (!MIME_TYPE_IS_VALID ()) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tmimeType=" << fdSaveOptions.mimeType () << " not valid, get hardcoded" << endl; - #endif if (mimeTypes.contains ("image/png")) fdSaveOptions.setMimeType ("image/png"); else if (mimeTypes.contains ("image/bmp")) @@ -876,9 +826,7 @@ fdSaveOptions.setQuality (kpDocumentSaveOptions::defaultQuality (cfg)); } -#if DEBUG_KP_MAIN_WINDOW fdSaveOptions.printDebug ("\tcorrected saveOptions passed to fileDialog"); -#endif kpDocumentSaveOptionsWidget *saveOptionsWidget = new kpDocumentSaveOptionsWidget (imageToBeSaved, @@ -901,9 +849,7 @@ if ( fd.exec() == QDialog::Accepted ) { kpDocumentSaveOptions newSaveOptions = saveOptionsWidget->documentSaveOptions (); - #if DEBUG_KP_MAIN_WINDOW newSaveOptions.printDebug ("\tnewSaveOptions"); - #endif KConfigGroup cfg (KSharedConfig::openConfig (), forcedSaveOptionsGroup); @@ -923,9 +869,7 @@ if (allowOverwritePrompt) { *allowOverwritePrompt = shouldAllowOverwritePrompt; - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tallowOverwritePrompt=" << *allowOverwritePrompt; - #endif } if (allowLossyPrompt) @@ -939,15 +883,11 @@ newSaveOptions.mimeType () != startSaveOptions.mimeType () || newSaveOptions.colorDepth () != startSaveOptions.colorDepth () || newSaveOptions.dither () != startSaveOptions.dither ()); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tallowLossyPrompt=" << *allowLossyPrompt; - #endif } - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tselectedUrl=" << fd.selectedUrl (); - #endif return fd.selectedUrl (); } else @@ -1105,9 +1045,7 @@ if (d->document->isFromURL (false/*don't bother checking exists*/) || (!oldURL.isEmpty () && KIO::NetAccess::exists (oldURL, KIO::NetAccess::SourceSide/*open*/, this))) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotReload() reloading from disk!"; - #endif doc = new kpDocument (1, 1, documentEnvironment ()); if (!doc->open (oldURL)) @@ -1120,9 +1058,7 @@ } else { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotReload() create doc"; - #endif doc = new kpDocument (d->document->constructorWidth (), d->document->constructorHeight (), @@ -1152,13 +1088,11 @@ if (dot > 0) fileName.truncate (dot); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::sendDocumentNameToPrinter() fileName=" << fileName << " dir=" - << url.directory () + << url.path() << endl; - #endif printer->setDocName (fileName); } } @@ -1184,14 +1118,12 @@ double (d->document->metaInfo ()->dotsPerMeterX ()); double imageDotsPerMeterY = double (d->document->metaInfo ()->dotsPerMeterY ()); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::sendImageToPrinter() image:" << " width=" << image.width () << " height=" << image.height () << " dotsPerMeterX=" << imageDotsPerMeterX << " dotsPerMeterY=" << imageDotsPerMeterY << endl; -#endif // Image DPI invalid (e.g. new image, could not read from file // or Qt3 doesn't implement DPI for JPEG)? @@ -1222,9 +1154,7 @@ const QPaintDevice *screenDevice = &arbitraryScreenElement; const int dpiX = screenDevice->logicalDpiX (), dpiY = screenDevice->logicalDpiY (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tusing screen dpi: x=" << dpiX << " y=" << dpiY; - #endif imageDotsPerMeterX = dpiX * KP_INCHES_PER_METER; imageDotsPerMeterY = dpiY * KP_INCHES_PER_METER; @@ -1240,18 +1170,15 @@ // mmmmm const int printerWidthMM = printer->widthMM (); const int printerHeightMM = printer->heightMM (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tprinter: widthMM=" << printerWidthMM << " heightMM=" << printerHeightMM << endl; -#endif double dpiX = imageDotsPerMeterX / KP_INCHES_PER_METER; double dpiY = imageDotsPerMeterY / KP_INCHES_PER_METER; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\timage: dpiX=" << dpiX << " dpiY=" << dpiY; -#endif +# // @@ -1265,21 +1192,17 @@ (image.height () / (printerHeightMM / KP_MILLIMETERS_PER_INCH)) / dpiY; const double scaleDpi = qMax (scaleDpiX, scaleDpiY); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tscaleDpi: x=" << scaleDpiX << " y=" << scaleDpiY << " --> scale at " << scaleDpi << " to fit?" << endl; -#endif // Need to increase resolution to fit page? if (scaleDpi > 1.0) { dpiX *= scaleDpi; dpiY *= scaleDpi; - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\t\tto fit page, scaled to:" << " dpiX=" << dpiX << " dpiY=" << dpiY << endl; - #endif } @@ -1290,10 +1213,8 @@ // double-antialiasing looks bad. if (dpiX > dpiY) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdpiX > dpiY; stretching image height to equalise DPIs to dpiX=" << dpiX << endl; - #endif kpPixmapFX::scale (&image, image.width (), qMax (1, qRound (image.height () * dpiX / dpiY)), @@ -1303,10 +1224,8 @@ } else if (dpiY > dpiX) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdpiY > dpiX; stretching image width to equalise DPIs to dpiY=" << dpiY << endl; - #endif kpPixmapFX::scale (&image, qMax (1, qRound (image.width () * dpiY / dpiX)), image.height (), diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp --- a/mainWindow/kpMainWindow_Image.cpp +++ b/mainWindow/kpMainWindow_Image.cpp @@ -293,12 +293,10 @@ bool addSelCreateCmdIfSelAvail, bool addSelContentCmdIfSelAvail) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::addImageOrSelectionCommand()" << " addSelCreateCmdIfSelAvail=" << addSelCreateCmdIfSelAvail << " addSelContentCmdIfSelAvail=" << addSelContentCmdIfSelAvail << endl; -#endif Q_ASSERT (d->document); @@ -308,11 +306,9 @@ kpAbstractSelection *sel = d->document->selection (); -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\timage sel=" << sel << " sel->hasContent=" << (sel ? sel->hasContent () : 0) << endl; -#endif if (addSelCreateCmdIfSelAvail && sel && !sel->hasContent ()) { QString createCmdName; diff --git a/mainWindow/kpMainWindow_Settings.cpp b/mainWindow/kpMainWindow_Settings.cpp --- a/mainWindow/kpMainWindow_Settings.cpp +++ b/mainWindow/kpMainWindow_Settings.cpp @@ -100,9 +100,7 @@ // private slot void kpMainWindow::slotEnableSettingsShowPath () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotEnableSettingsShowPath()"; -#endif const bool enable = (d->document && !d->document->url ().isEmpty ()); @@ -115,9 +113,7 @@ // private slot void kpMainWindow::slotShowPathToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotShowPathToggled()"; -#endif d->configShowPath = d->actionShowPath->isChecked (); diff --git a/mainWindow/kpMainWindow_StatusBar.cpp b/mainWindow/kpMainWindow_StatusBar.cpp --- a/mainWindow/kpMainWindow_StatusBar.cpp +++ b/mainWindow/kpMainWindow_StatusBar.cpp @@ -107,12 +107,10 @@ // private slot void kpMainWindow::setStatusBarMessage (const QString &message) { -#if DEBUG_STATUS_BAR && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::setStatusBarMessage(" << message << ") ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; @@ -126,23 +124,19 @@ void kpMainWindow::setStatusBarShapePoints (const QPoint &startPoint, const QPoint &endPoint) { -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "kpMainWindow::setStatusBarShapePoints(" << startPoint << "," << endPoint << ") ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; if (d->statusBarShapeLastPointsInitialised && startPoint == d->statusBarShapeLastStartPoint && endPoint == d->statusBarShapeLastEndPoint) { - #if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "\tNOP"; - #endif return; } @@ -216,12 +210,10 @@ // private slot void kpMainWindow::setStatusBarDocSize (const QSize &size) { -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "kpMainWindow::setStatusBarDocSize(" << size << ") ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; @@ -244,12 +236,10 @@ // private slot void kpMainWindow::setStatusBarDocDepth (int depth) { -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "kpMainWindow::setStatusBarDocDepth(" << depth << ") ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; @@ -270,12 +260,10 @@ // private slot void kpMainWindow::setStatusBarZoom (int zoom) { -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "kpMainWindow::setStatusBarZoom(" << zoom << ") ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; @@ -295,18 +283,14 @@ void kpMainWindow::recalculateStatusBarMessage () { -#if DEBUG_STATUS_BAR && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::recalculateStatusBarMessage()"; -#endif QString scrollViewMessage = d->scrollView->statusMessage (); -#if DEBUG_STATUS_BAR && 1 qCDebug(kpLogMainWindow) << "\tscrollViewMessage=" << scrollViewMessage; qCDebug(kpLogMainWindow) << "\tresizing doc? " << !d->scrollView->newDocSize ().isEmpty () << endl; qCDebug(kpLogMainWindow) << "\tviewUnderCursor? " << (d->viewManager && d->viewManager->viewUnderCursor ()) << endl; -#endif // HACK: To work around kpViewScrollableContainer's unreliable // status messages (which in turn is due to Qt not updating @@ -352,21 +336,15 @@ // private slot void kpMainWindow::recalculateStatusBarShape () { -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "kpMainWindow::recalculateStatusBarShape()"; -#endif QSize docResizeTo = d->scrollView->newDocSize (); -#if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "\tdocResizeTo=" << docResizeTo; -#endif if (docResizeTo.isValid ()) { const QPoint startPoint (d->document->width (), d->document->height ()); - #if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "\thavedMovedFromOrgSize=" << d->scrollView->haveMovedFromOriginalDocSize () << endl; - #endif if (!d->scrollView->haveMovedFromOriginalDocSize ()) { setStatusBarShapePoints (startPoint); @@ -385,9 +363,7 @@ else { const kpTool *t = tool (); - #if DEBUG_STATUS_BAR && 0 qCDebug(kpLogMainWindow) << "\ttool=" << t; - #endif if (t) { setStatusBarShapePoints (t->userShapeStartPoint (), @@ -407,11 +383,9 @@ // private slot void kpMainWindow::recalculateStatusBar () { -#if DEBUG_STATUS_BAR && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::recalculateStatusBar() ok=" << d->statusBarCreated << endl; -#endif if (!d->statusBarCreated) return; diff --git a/mainWindow/kpMainWindow_Text.cpp b/mainWindow/kpMainWindow_Text.cpp --- a/mainWindow/kpMainWindow_Text.cpp +++ b/mainWindow/kpMainWindow_Text.cpp @@ -103,10 +103,9 @@ const QString font (cfg.readEntry (kpSettingFontFamily, QString::fromLatin1 ("Times"))); d->actionTextFontFamily->setFont (font); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "asked setFont to set to=" << font << "- got back=" << d->actionTextFontFamily->font (); -#endif + d->actionTextFontSize->setFontSize (cfg.readEntry (kpSettingFontSize, 14)); d->actionTextBold->setChecked (cfg.readEntry (kpSettingBold, false)); d->actionTextItalic->setChecked (cfg.readEntry (kpSettingItalic, false)); @@ -121,9 +120,7 @@ // public void kpMainWindow::enableTextToolBarActions (bool enable) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::enableTextToolBarActions(" << enable << ")"; -#endif d->actionTextFontFamily->setEnabled (enable); d->actionTextFontSize->setEnabled (enable); @@ -148,15 +145,13 @@ // private slot void kpMainWindow::slotTextFontFamilyChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextFontFamilyChanged() alive=" << d->isFullyConstructed << "fontFamily=" << d->actionTextFontFamily->font () << "action.currentItem=" << d->actionTextFontFamily->currentItem () << endl; -#endif if (!d->isFullyConstructed) return; @@ -183,13 +178,11 @@ // private slot void kpMainWindow::slotTextFontSizeChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextFontSizeChanged() alive=" << d->isFullyConstructed << " fontSize=" << d->actionTextFontSize->fontSize () << endl; -#endif if (!d->isFullyConstructed) return; @@ -216,13 +209,11 @@ // private slot void kpMainWindow::slotTextBoldChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextFontBoldChanged() alive=" << d->isFullyConstructed << " bold=" << d->actionTextBold->isChecked () << endl; -#endif if (!d->isFullyConstructed) return; @@ -241,13 +232,11 @@ // private slot void kpMainWindow::slotTextItalicChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextFontItalicChanged() alive=" << d->isFullyConstructed << " bold=" << d->actionTextItalic->isChecked () << endl; -#endif if (!d->isFullyConstructed) return; @@ -266,13 +255,11 @@ // private slot void kpMainWindow::slotTextUnderlineChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextFontUnderlineChanged() alive=" << d->isFullyConstructed << " underline=" << d->actionTextUnderline->isChecked () << endl; -#endif if (!d->isFullyConstructed) return; @@ -291,13 +278,11 @@ // private slot void kpMainWindow::slotTextStrikeThruChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotTextStrikeThruChanged() alive=" << d->isFullyConstructed << " strikeThru=" << d->actionTextStrikeThru->isChecked () << endl; -#endif if (!d->isFullyConstructed) return; @@ -353,9 +338,7 @@ // public void kpMainWindow::setTextStyle (const kpTextStyle &textStyle_) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::setTextStyle()"; -#endif d->settingTextStyle++; diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp --- a/mainWindow/kpMainWindow_Tools.cpp +++ b/mainWindow/kpMainWindow_Tools.cpp @@ -203,9 +203,7 @@ // private void kpMainWindow::enableToolsDocumentActions (bool enable) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::enableToolsDocumentsAction(" << enable << ")"; -#endif d->toolActionsEnabled = enable; @@ -277,15 +275,11 @@ // private slot void kpMainWindow::updateActionDrawOpaqueChecked () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::updateActionDrawOpaqueChecked()"; -#endif const bool drawOpaque = (d->toolToolBar->toolWidgetOpaqueOrTransparent ()->selectedRow () == 0); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdrawOpaque=" << drawOpaque; -#endif d->actionDrawOpaque->setChecked (drawOpaque); } @@ -295,18 +289,14 @@ // private void kpMainWindow::updateActionDrawOpaqueEnabled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::updateActionDrawOpaqueEnabled()"; -#endif const bool enable = d->toolActionsEnabled; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tenable=" << enable << " tool=" << (tool () ? tool ()->objectName () : 0) << " (is selection=" << toolIsASelectionTool () << ")" << endl; -#endif d->actionDrawOpaque->setEnabled (enable && toolIsASelectionTool ()); } @@ -386,12 +376,10 @@ // public void kpMainWindow::setImageSelectionTransparency (const kpImageSelectionTransparency &transparency, bool forceColorChange) { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::setImageSelectionTransparency() isOpaque=" << transparency.isOpaque () << " color=" << (transparency.transparentColor ().isValid () ? (int *) transparency.transparentColor ().toQRgb () : 0) << " forceColorChange=" << forceColorChange << endl; -#endif kpToolWidgetOpaqueOrTransparent *oot = d->toolToolBar->toolWidgetOpaqueOrTransparent (); Q_ASSERT (oot); @@ -570,11 +558,9 @@ Q_UNUSED(docPoint) Q_UNUSED(docLastPoint) -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotDragScroll() maybeDragScrolling=" << maybeDragScrollingMainView () << endl; -#endif if (maybeDragScrollingMainView ()) { @@ -691,13 +677,9 @@ // private slot void kpMainWindow::slotDocResizeMessageChanged (const QString &string) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotDocResizeMessageChanged(" << string << ") docResizeToBeCompleted=" << d->docResizeToBeCompleted << endl; -#else - (void) string; -#endif if (d->docResizeToBeCompleted) return; @@ -772,9 +754,7 @@ // private slot void kpMainWindow::slotActionDrawOpaqueToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotActionDrawOpaqueToggled()"; -#endif toolEndShape (); // TODO: How does this differ to setImageSelectionTransparency()? @@ -793,9 +773,7 @@ // private slot void kpMainWindow::slotActionDrawColorSimilarity () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotActionDrawColorSimilarity()"; -#endif toolEndShape (); d->colorToolBar->openColorSimilarityDialog (); diff --git a/mainWindow/kpMainWindow_View.cpp b/mainWindow/kpMainWindow_View.cpp --- a/mainWindow/kpMainWindow_View.cpp +++ b/mainWindow/kpMainWindow_View.cpp @@ -103,9 +103,7 @@ // private void kpMainWindow::actionShowGridUpdate () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::actionShowGridUpdate()"; -#endif const bool enable = (viewMenuDocumentActionsEnabled () && d->mainView && d->mainView->canShowGrid ()); @@ -118,9 +116,7 @@ // private slot void kpMainWindow::slotShowGridToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotActionShowGridToggled()"; -#endif updateMainViewGrid (); @@ -135,9 +131,7 @@ // private void kpMainWindow::updateMainViewGrid () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::updateMainViewGrid ()"; -#endif if (d->mainView) d->mainView->showGrid (d->actionShowGrid->isChecked ()); diff --git a/mainWindow/kpMainWindow_View_Thumbnail.cpp b/mainWindow/kpMainWindow_View_Thumbnail.cpp --- a/mainWindow/kpMainWindow_View_Thumbnail.cpp +++ b/mainWindow/kpMainWindow_View_Thumbnail.cpp @@ -96,9 +96,7 @@ // private slot void kpMainWindow::slotDestroyThumbnail () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotDestroyThumbnail()"; -#endif d->actionShowThumbnail->setChecked (false); enableThumbnailOptionActions (false); @@ -108,20 +106,16 @@ // private slot void kpMainWindow::slotDestroyThumbnailInitatedByUser () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotDestroyThumbnailInitiatedByUser()"; -#endif d->actionShowThumbnail->setChecked (false); slotShowThumbnailToggled (); } // private slot void kpMainWindow::slotCreateThumbnail () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotCreateThumbnail()"; -#endif d->actionShowThumbnail->setChecked (true); enableThumbnailOptionActions (true); @@ -131,9 +125,7 @@ // public void kpMainWindow::notifyThumbnailGeometryChanged () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::notifyThumbnailGeometryChanged()"; -#endif if (!d->thumbnailSaveConfigTimer) { @@ -150,26 +142,20 @@ // private slot void kpMainWindow::slotSaveThumbnailGeometry () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::saveThumbnailGeometry()"; -#endif if (!d->thumbnail) return; QRect rect (d->thumbnail->x (), d->thumbnail->y (), d->thumbnail->width (), d->thumbnail->height ()); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tthumbnail relative geometry=" << rect; -#endif d->configThumbnailGeometry = mapFromGlobal (rect); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tCONFIG: saving thumbnail geometry " << d->configThumbnailGeometry << endl; -#endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupThumbnail); @@ -180,9 +166,7 @@ // private slot void kpMainWindow::slotShowThumbnailToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotShowThumbnailToggled()"; -#endif d->configThumbnailShown = d->actionShowThumbnail->isChecked (); @@ -199,10 +183,8 @@ // private slot void kpMainWindow::updateThumbnailZoomed () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::updateThumbnailZoomed() zoomed=" << d->actionZoomedThumbnail->isChecked () << endl; -#endif if (!d->thumbnailView) return; @@ -214,9 +196,7 @@ // private slot void kpMainWindow::slotZoomedThumbnailToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotZoomedThumbnailToggled()"; -#endif d->configZoomedThumbnail = d->actionZoomedThumbnail->isChecked (); @@ -232,9 +212,7 @@ // private slot void kpMainWindow::slotThumbnailShowRectangleToggled () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotThumbnailShowRectangleToggled()"; -#endif d->configThumbnailShowRectangle = d->actionShowThumbnailRectangle->isChecked (); @@ -254,9 +232,7 @@ // private void kpMainWindow::enableViewZoomedThumbnail (bool enable) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::enableSettingsViewZoomedThumbnail()"; -#endif d->actionZoomedThumbnail->setEnabled (enable && d->actionShowThumbnail->isChecked ()); @@ -269,9 +245,7 @@ // private void kpMainWindow::enableViewShowThumbnailRectangle (bool enable) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::enableViewShowThumbnailRectangle()"; -#endif d->actionShowThumbnailRectangle->setEnabled (enable && d->actionShowThumbnail->isChecked ()); @@ -293,9 +267,7 @@ // private void kpMainWindow::createThumbnailView () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tcreating new kpView:"; -#endif if (d->thumbnailView) { @@ -326,17 +298,13 @@ d->actionShowThumbnailRectangle->isChecked ()); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tgive kpThumbnail the kpView:"; -#endif if (d->thumbnail) d->thumbnail->setView (d->thumbnailView); else qCCritical(kpLogMainWindow) << "kpMainWindow::createThumbnailView() no thumbnail" << endl; -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tregistering the kpView:"; -#endif if (d->viewManager) d->viewManager->registerView (d->thumbnailView); } @@ -360,42 +328,32 @@ // private void kpMainWindow::updateThumbnail () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::updateThumbnail()"; -#endif bool enable = d->actionShowThumbnail->isChecked (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tthumbnail=" << bool (d->thumbnail) << " action_isChecked=" << enable << endl; -#endif if (bool (d->thumbnail) == enable) return; if (!d->thumbnail) { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcreating thumbnail"; - #endif // Read last saved geometry before creating thumbnail & friends // in case they call notifyThumbnailGeometryChanged() QRect thumbnailGeometry = d->configThumbnailGeometry; - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tlast used geometry=" << thumbnailGeometry; - #endif d->thumbnail = new kpThumbnail (this); createThumbnailView (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tmoving thumbnail to right place"; - #endif if (!thumbnailGeometry.isEmpty () && QRect (0, 0, width (), height ()).intersects (thumbnailGeometry)) { @@ -415,39 +373,27 @@ initialWidth, initialHeight); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tcreating geometry=" << geometryRect; - #endif geometryRect = mapToGlobal (geometryRect); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tmap to global=" << geometryRect; - #endif d->thumbnail->resize (geometryRect.size ()); d->thumbnail->move (geometryRect.topLeft ()); } } - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tshowing thumbnail"; - #endif d->thumbnail->show (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tconnecting signal thumbnail::windowClosed to destroy slot"; - #endif connect (d->thumbnail, &kpThumbnail::windowClosed, this, &kpMainWindow::slotDestroyThumbnailInitatedByUser); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tDONE"; - #endif } else { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tdestroying thumbnail d->thumbnail=" << d->thumbnail << endl; - #endif if (d->thumbnailSaveConfigTimer && d->thumbnailSaveConfigTimer->isActive ()) { diff --git a/mainWindow/kpMainWindow_View_Zoom.cpp b/mainWindow/kpMainWindow_View_Zoom.cpp --- a/mainWindow/kpMainWindow_View_Zoom.cpp +++ b/mainWindow/kpMainWindow_View_Zoom.cpp @@ -53,26 +53,20 @@ static int ZoomLevelFromString (const QString &stringIn) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow_View.cpp:ZoomLevelFromString(" << stringIn << ")"; -#endif // Remove any non-digits kdelibs sometimes adds behind our back :( e.g.: // // 1. kdelibs adds accelerators to actions' text directly // 2. ',' is automatically added to change "1000%" to "1,000%" QString string = stringIn; string.remove (QRegExp ("[^0-9]")); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\twithout non-digits='" << string << "'"; -#endif // Convert zoom level to number. bool ok = false; int zoomLevel = string.toInt (&ok); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tzoomLevel=" << zoomLevel; -#endif if (!ok || zoomLevel < kpView::MinZoomLevel || zoomLevel > kpView::MaxZoomLevel) return 0; // error @@ -178,9 +172,7 @@ // We're called quite early in the init process and/or when there might // not be a document or a view so we have a lot of "if (ptr)" guards. -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::zoomToPre(" << zoomLevel << ")"; -#endif zoomLevel = qBound (kpView::MinZoomLevel, zoomLevel, kpView::MaxZoomLevel); @@ -199,19 +191,15 @@ // OPT: We get called twice on startup. sendZoomListToActionZoom() is very slow. sendZoomListToActionZoom (); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tsetCurrentItem(" << index << ")"; -#endif d->actionZoom->setCurrentItem (index); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcurrentItem=" << d->actionZoom->currentItem () << " action=" << d->actionZoom->action (d->actionZoom->currentItem ()) << " checkedAction" << d->actionZoom->selectableActionGroup ()->checkedAction () << endl;; -#endif if (viewMenuDocumentActionsEnabled ()) @@ -238,9 +226,7 @@ // private void kpMainWindow::zoomToPost () { -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::zoomToPost()"; -#endif if (d->mainView) { @@ -272,9 +258,7 @@ setStatusBarZoom (d->mainView ? d->mainView->zoomLevelX () : 0); -#if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "kpMainWindow::zoomToPost() done"; -#endif } //--------------------------------------------------------------------- @@ -287,7 +271,6 @@ if (d->scrollView && d->mainView) { - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tscrollView contentsX=" << d->scrollView->horizontalScrollBar()->value () << " contentsY=" << d->scrollView->verticalScrollBar()->value () << " contentsWidth=" << d->scrollView->widget()->width () @@ -298,7 +281,6 @@ << " oldZoomY=" << d->mainView->zoomLevelY () << " newZoom=" << zoomLevel << endl; - #endif // TODO: when changing from no scrollbars to scrollbars, Qt lies about // visibleWidth() & visibleHeight() (doesn't take into account the @@ -350,13 +332,11 @@ // Do the zoom. d->mainView->setZoomLevel (zoomLevel, zoomLevel); - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\tvisibleWidth=" << d->scrollView->viewport()->width () << " visibleHeight=" << d->scrollView->viewport()->height () << endl; qCDebug(kpLogMainWindow) << "\tnewCenterX=" << newCenterX << " newCenterY=" << newCenterY << endl; - #endif d->scrollView->horizontalScrollBar()->setValue(newCenterX - (d->scrollView->viewport()->width() / 2)); d->scrollView->verticalScrollBar()->setValue(newCenterY - (d->scrollView->viewport()->height() / 2)); @@ -370,29 +350,23 @@ kpView *const vuc = d->viewManager->viewUnderCursor (); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcenterUnderCursor: reposition cursor; viewUnderCursor=" << vuc->objectName () << endl; - #endif const double viewX = vuc->transformDocToViewX (targetDocX); const double viewY = vuc->transformDocToViewY (targetDocY); // Rounding error from zooming in and out :( // TODO: do everything in terms of tool doc points in type "double". const QPoint viewPoint (static_cast (viewX), static_cast (viewY)); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tdoc: (" << targetDocX << "," << targetDocY << ")" << " viewUnderCursor: (" << viewX << "," << viewY << ")" << endl; - #endif if (vuc->visibleRegion ().contains (viewPoint)) { const QPoint globalPoint = kpWidgetMapper::toGlobal (vuc, viewPoint); - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tglobalPoint=" << globalPoint; - #endif // TODO: Determine some sane cursor flashing indication - // cursor movement is convenient but not conventional. @@ -418,21 +392,17 @@ // on top of. else { - #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\twon't move cursor - would get outside view" << endl; - #endif // TODO: Sane cursor flashing indication that indicates // that the normal cursor movement didn't happen. } } - #if DEBUG_KP_MAIN_WINDOW && 1 qCDebug(kpLogMainWindow) << "\t\tcheck (contentsX=" << d->scrollView->horizontalScrollBar()->value () << ",contentsY=" << d->scrollView->verticalScrollBar()->value () << ")" << endl; - #endif } @@ -446,27 +416,23 @@ bool accountForGrips, bool careAboutWidth, bool careAboutHeight) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::zoomToRect(normalizedDocRect=" << normalizedDocRect << ",accountForGrips=" << accountForGrips << ",careAboutWidth=" << careAboutWidth << ",careAboutHeight=" << careAboutHeight << ")"; -#endif // You can't care about nothing. Q_ASSERT (careAboutWidth || careAboutHeight); // The size of the scroll view minus the current or future scrollbars. const QSize usableScrollArea (d->scrollView->maximumViewportSize().width() - d->scrollView->verticalScrollBar()->sizeHint().width(), d->scrollView->maximumViewportSize().height() - d->scrollView->horizontalScrollBar()->sizeHint().height()); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "size=" << d->scrollView->maximumViewportSize() << "scrollbar w=" << d->scrollView->verticalScrollBar()->sizeHint().width() << "usableSize=" << usableScrollArea; -#endif // Handle rounding error, mis-estimating the scroll view size and // cosmic rays. We do this because we really don't want unnecessary // scrollbars. This seems to need to be at least 2 for slotFitToWidth() @@ -504,11 +470,9 @@ // content. const int zoomLevel = qMin (zoomX, zoomY); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tzoomX=" << zoomX << " zoomY=" << zoomY << " -> zoomLevel=" << zoomLevel << endl; -#endif zoomToPre (zoomLevel); { @@ -588,22 +552,18 @@ // public void kpMainWindow::zoomIn (bool centerUnderCursor) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::zoomIn(centerUnderCursor=" << centerUnderCursor << ") currentItem=" << d->actionZoom->currentItem () << endl; -#endif const int targetItem = d->actionZoom->currentItem () + 1; if (targetItem >= static_cast (d->zoomList.count ())) return; d->actionZoom->setCurrentItem (targetItem); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tnew currentItem=" << d->actionZoom->currentItem (); -#endif zoomAccordingToZoomAction (centerUnderCursor); } @@ -613,22 +573,18 @@ // public void kpMainWindow::zoomOut (bool centerUnderCursor) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::zoomOut(centerUnderCursor=" << centerUnderCursor << ") currentItem=" << d->actionZoom->currentItem () << endl; -#endif const int targetItem = d->actionZoom->currentItem () - 1; if (targetItem < 0) return; d->actionZoom->setCurrentItem (targetItem); -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tnew currentItem=" << d->actionZoom->currentItem (); -#endif zoomAccordingToZoomAction (centerUnderCursor); } @@ -638,9 +594,7 @@ // public slot void kpMainWindow::slotZoomIn () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotZoomIn ()"; -#endif zoomIn (false/*don't center under cursor*/); } @@ -650,9 +604,7 @@ // public slot void kpMainWindow::slotZoomOut () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotZoomOut ()"; -#endif zoomOut (false/*don't center under cursor*/); } @@ -662,13 +614,11 @@ // public void kpMainWindow::zoomAccordingToZoomAction (bool centerUnderCursor) { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::zoomAccordingToZoomAction(centerUnderCursor=" << centerUnderCursor << ") currentItem=" << d->actionZoom->currentItem () << " currentText=" << d->actionZoom->currentText () << endl; -#endif // This might be a new zoom level the user has typed in. zoomTo (::ZoomLevelFromString (d->actionZoom->currentText ()), @@ -680,10 +630,8 @@ // private slot void kpMainWindow::slotZoom () { -#if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "kpMainWindow::slotZoom () index=" << d->actionZoom->currentItem () << " text='" << d->actionZoom->currentText () << "'" << endl; -#endif zoomAccordingToZoomAction (false/*don't center under cursor*/); } diff --git a/pixmapfx/kpPixmapFX_DrawShapes.cpp b/pixmapfx/kpPixmapFX_DrawShapes.cpp --- a/pixmapfx/kpPixmapFX_DrawShapes.cpp +++ b/pixmapfx/kpPixmapFX_DrawShapes.cpp @@ -161,9 +161,7 @@ // Qt bug: single point doesn't show up depending on penWidth. if (Only1PixelInPointArray(points)) { - #if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "\tinvoking single point hack"; - #endif painter.drawPoint(points[0]); return; } @@ -199,9 +197,7 @@ // Qt bug: single point doesn't show up depending on penWidth. if (Only1PixelInPointArray (points)) { - #if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "\tinvoking single point hack"; - #endif p.drawPoint(points [0]); return; } diff --git a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp --- a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp +++ b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp @@ -55,16 +55,14 @@ void kpPixmapFX::setPixmapAt(QImage *destPtr, const QRect &destRect, const QImage &src) { -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "kpPixmapFX::setPixmapAt(destPixmap->rect=" << destPtr->rect () << ",destRect=" << destRect << ",src.rect=" << src.rect () << ")" << endl; -#endif Q_ASSERT (destPtr); diff --git a/pixmapfx/kpPixmapFX_Transforms.cpp b/pixmapfx/kpPixmapFX_Transforms.cpp --- a/pixmapfx/kpPixmapFX_Transforms.cpp +++ b/pixmapfx/kpPixmapFX_Transforms.cpp @@ -50,9 +50,7 @@ void kpPixmapFX::resize (QImage *destPtr, int w, int h, const kpColor &backgroundColor) { -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "kpPixmapFX::resize()"; -#endif if (!destPtr) return; @@ -106,14 +104,12 @@ // public static QImage kpPixmapFX::scale (const QImage &image, int w, int h, bool pretty) { -#if DEBUG_KP_PIXMAP_FX && 0 qCDebug(kpLogPixmapfx) << "kpPixmapFX::scale(oldRect=" << image.rect () << ",w=" << w << ",h=" << h << ",pretty=" << pretty << ")" << endl; -#endif if (w == image.width () && h == image.height ()) return image; @@ -133,7 +129,6 @@ static void MatrixDebug (const QString matrixName, const QMatrix &matrix, int srcPixmapWidth = -1, int srcPixmapHeight = -1) { -#if DEBUG_KP_PIXMAP_FX const int w = srcPixmapWidth, h = srcPixmapHeight; qCDebug(kpLogPixmapfx) << matrixName << "=" << matrix; @@ -149,15 +144,6 @@ qCDebug(kpLogPixmapfx) << "(0,h-1) ->" << matrix.map (QPoint (0, h - 1)); qCDebug(kpLogPixmapfx) << "(w-1,h-1) ->" << matrix.map (QPoint (w - 1, h - 1)); } - -#else - - Q_UNUSED (matrixName); - Q_UNUSED (matrix); - Q_UNUSED (srcPixmapWidth); - Q_UNUSED (srcPixmapHeight); - -#endif // DEBUG_KP_PIXMAP_FX } //--------------------------------------------------------------------- @@ -178,33 +164,27 @@ // SYNC: I bet this is a Qt4 bug. static QMatrix MatrixWithZeroOrigin (const QMatrix &matrix, int width, int height) { -#if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "matrixWithZeroOrigin(w=" << width << ",h=" << height << ")"; qCDebug(kpLogPixmapfx) << "\tmatrix: m11=" << matrix.m11 () << "m12=" << matrix.m12 () << "m21=" << matrix.m21 () << "m22=" << matrix.m22 () << "dx=" << matrix.dx () << "dy=" << matrix.dy (); -#endif QRect mappedRect = matrix.mapRect (QRect (0, 0, width, height)); -#if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "\tmappedRect=" << mappedRect; -#endif QMatrix translatedMatrix ( matrix.m11 (), matrix.m12 (), matrix.m21 (), matrix.m22 (), matrix.dx () - mappedRect.left (), matrix.dy () - mappedRect.top ()); -#if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "\treturning" << translatedMatrix; qCDebug(kpLogPixmapfx) << "(0,0) ->" << translatedMatrix.map (QPoint (0, 0)); qCDebug(kpLogPixmapfx) << "(w-1,0) ->" << translatedMatrix.map (QPoint (width - 1, 0)); qCDebug(kpLogPixmapfx) << "(0,h-1) ->" << translatedMatrix.map (QPoint (0, height - 1)); qCDebug(kpLogPixmapfx) << "(w-1,h-1) ->" << translatedMatrix.map (QPoint (width - 1, height - 1)); -#endif return translatedMatrix; } @@ -269,40 +249,31 @@ { QMatrix transformMatrix = transformMatrix_; -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "kppixmapfx.cpp: TransformPixmap(pm.size=" << pm.size () << ",targetWidth=" << targetWidth << ",targetHeight=" << targetHeight << ")" << endl; -#endif QRect newRect = transformMatrix.mapRect (pm.rect ()); -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "\tmappedRect=" << newRect; -#endif QMatrix scaleMatrix; if (targetWidth > 0 && targetWidth != newRect.width ()) { - #if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "\tadjusting for targetWidth"; - #endif scaleMatrix.scale (double (targetWidth) / double (newRect.width ()), 1); } if (targetHeight > 0 && targetHeight != newRect.height ()) { - #if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "\tadjusting for targetHeight"; - #endif scaleMatrix.scale (1, double (targetHeight) / double (newRect.height ())); } if (!scaleMatrix.isIdentity ()) { - #if DEBUG_KP_PIXMAP_FX && 1 // TODO: What is going on here??? Why isn't matrix * working properly? QMatrix wrongMatrix = transformMatrix * scaleMatrix; QMatrix oldHat = transformMatrix; @@ -347,22 +318,17 @@ << " dy=" << correctMatrix.dy () << " rect=" << correctMatrix.mapRect (pm.rect ()) << endl; - #endif transformMatrix = transformMatrix * scaleMatrix; newRect = transformMatrix.mapRect (pm.rect ()); - #if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "\tnewRect after targetWidth,targetHeight adjust=" << newRect; - #endif } ::MatrixDebug ("TransformPixmap(): before trueMatrix", transformMatrix, pm.width (), pm.height ()); -#if DEBUG_KP_PIXMAP_FX && 1 QMatrix oldMatrix = transformMatrix; -#endif // Translate the matrix to account for Qt rounding errors, // so that flipping (if it used this method) and rotating by a multiple @@ -386,9 +352,7 @@ transformMatrix = ::TrueMatrix (transformMatrix, pm.width (), pm.height ()); -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "trueMatrix changed matrix?" << (oldMatrix == transformMatrix); -#endif ::MatrixDebug ("TransformPixmap(): after trueMatrix", transformMatrix, pm.width (), pm.height ()); @@ -400,29 +364,14 @@ if ((targetWidth > 0 && targetWidth != newRect.width ()) || (targetHeight > 0 && targetHeight != newRect.height ())) { - #if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "kppixmapfx.cpp: TransformPixmap(pm.size=" << pm.size () << ",targetWidth=" << targetWidth << ",targetHeight=" << targetHeight << ") newRect=" << newRect << " (you are a victim of rounding error)" << endl; - #endif } - -#if DEBUG_KP_PIXMAP_FX && 0 - qCDebug(kpLogPixmapfx) << "\ttranslate top=" << painter.xForm (QPoint (0, 0)); - qCDebug(kpLogPixmapfx) << "\tmatrix: m11=" << painter.worldMatrix ().m11 () - << " m12=" << painter.worldMatrix ().m12 () - << " m21=" << painter.worldMatrix ().m21 () - << " m22=" << painter.worldMatrix ().m22 () - << " dx=" << painter.worldMatrix ().dx () - << " dy=" << painter.worldMatrix ().dy () - << endl; -#endif - - // Note: Do _not_ use "p.setRenderHints (QPainter::SmoothPixmapTransform);" // as the user does not want their image to get blurier every // time they e.g. rotate it (especially important for multiples @@ -446,9 +395,7 @@ } p.end (); -#if DEBUG_KP_PIXMAP_FX && 1 qCDebug(kpLogPixmapfx) << "Done" << endl << endl; -#endif return newQImage; } @@ -533,15 +480,13 @@ const kpColor &backgroundColor, int targetWidth, int targetHeight) { -#if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "kpPixmapFX::skew() pm.width=" << pm.width () << " pm.height=" << pm.height () << " hangle=" << hangle << " vangle=" << vangle << " targetWidth=" << targetWidth << " targetHeight=" << targetHeight << endl; -#endif if (std::fabs (hangle - 0) < kpPixmapFX::AngleInDegreesEpsilon && std::fabs (vangle - 0) < kpPixmapFX::AngleInDegreesEpsilon && @@ -615,12 +560,10 @@ const bool ret = (angle < kpPixmapFX::AngleInDegreesEpsilon || 90 - angle < kpPixmapFX::AngleInDegreesEpsilon); -#if DEBUG_KP_PIXMAP_FX qCDebug(kpLogPixmapfx) << "kpPixmapFX::isLosslessRotation(" << angleIn << ")" << " residual angle=" << angle << " returning " << ret << endl; -#endif return ret; } diff --git a/tools/flow/kpToolColorEraser.cpp b/tools/flow/kpToolColorEraser.cpp --- a/tools/flow/kpToolColorEraser.cpp +++ b/tools/flow/kpToolColorEraser.cpp @@ -65,9 +65,7 @@ void kpToolColorEraser::globalDraw () { -#if DEBUG_KP_TOOL_COLOR_ERASER qCDebug(kpLogTools) << "kpToolColorEraser::globalDraw()"; -#endif if (!drawShouldProceed (QPoint ()/*unused*/, QPoint ()/*unused*/, QRect ()/*unused*/)) return; @@ -99,9 +97,7 @@ } else { - #if DEBUG_KP_TOOL_COLOR_ERASER qCDebug(kpLogTools) << "\tisNOP"; - #endif delete cmd; cmd = nullptr; } @@ -135,10 +131,8 @@ QRect kpToolColorEraser::drawLine (const QPoint &thisPoint, const QPoint &lastPoint) { -#if DEBUG_KP_TOOL_COLOR_ERASER qCDebug(kpLogTools) << "kpToolColorEraser::drawLine(thisPoint=" << thisPoint << ",lastPoint=" << lastPoint << ")" << endl; -#endif environ ()->flashColorSimilarityToolBarItem (); @@ -150,9 +144,7 @@ color (1 - mouseButton ())/*color to replace*/, processedColorSimilarity ()); -#if DEBUG_KP_TOOL_COLOR_ERASER qCDebug(kpLogTools) << "\tdirtyRect=" << dirtyRect; -#endif if (!dirtyRect.isEmpty ()) { diff --git a/tools/flow/kpToolEraser.cpp b/tools/flow/kpToolEraser.cpp --- a/tools/flow/kpToolEraser.cpp +++ b/tools/flow/kpToolEraser.cpp @@ -33,6 +33,7 @@ #include "commands/kpCommandHistory.h" #include "commands/imagelib/effects/kpEffectClearCommand.h" #include "environments/tools/kpToolEnvironment.h" +#include "kpLogCategories.h" #include @@ -51,9 +52,7 @@ // public virtual [base kpTool] void kpToolEraser::globalDraw () { -#if DEBUG_KP_TOOL_ERASER qCDebug(kpLogTools) << "kpToolEraser::globalDraw()"; -#endif commandHistory ()->addCommand ( new kpEffectClearCommand ( diff --git a/tools/flow/kpToolFlowBase.cpp b/tools/flow/kpToolFlowBase.cpp --- a/tools/flow/kpToolFlowBase.cpp +++ b/tools/flow/kpToolFlowBase.cpp @@ -221,13 +221,6 @@ // virtual void kpToolFlowBase::hover (const QPoint &point) { -#if DEBUG_KP_TOOL_FLOW_BASE && 0 - qCDebug(kpLogTools) << "kpToolFlowBase::hover(" << point << ")" - << " hasBegun=" << hasBegun () - << " hasBegunDraw=" << hasBegunDraw () - << " cursorPixmap.isNull=" << m_cursorPixmap.isNull () - << endl; -#endif if (point != KP_INVALID_POINT && d->cursorDrawFunc) { viewManager ()->setFastUpdates (); @@ -331,9 +324,7 @@ // TODO: maybe the base should be virtual? kpColor kpToolFlowBase::color (int which) { -#if DEBUG_KP_TOOL_FLOW_BASE && 0 qCDebug(kpLogTools) << "kpToolFlowBase::color (" << which << ")"; -#endif // Pen & Brush if (!colorsAreSwapped ()) @@ -390,9 +381,7 @@ // protected slot void kpToolFlowBase::updateBrushAndCursor () { -#if DEBUG_KP_TOOL_FLOW_BASE && 1 qCDebug(kpLogTools) << "kpToolFlowBase::updateBrushAndCursor()"; -#endif if (haveSquareBrushes ()) { @@ -438,22 +427,16 @@ // virtual private slot void kpToolFlowBase::slotForegroundColorChanged (const kpColor & /*col*/) { -#if DEBUG_KP_TOOL_FLOW_BASE qCDebug(kpLogTools) << "kpToolFlowBase::slotForegroundColorChanged()"; -#endif - updateBrushAndCursor (); } //--------------------------------------------------------------------- // virtual private slot void kpToolFlowBase::slotBackgroundColorChanged (const kpColor & /*col*/) { -#if DEBUG_KP_TOOL_FLOW_BASE qCDebug(kpLogTools) << "kpToolFlowBase::slotBackgroundColorChanged()"; -#endif - updateBrushAndCursor (); } diff --git a/tools/flow/kpToolSpraycan.cpp b/tools/flow/kpToolSpraycan.cpp --- a/tools/flow/kpToolSpraycan.cpp +++ b/tools/flow/kpToolSpraycan.cpp @@ -102,9 +102,7 @@ // public virtual [base kpToolFlowBase] void kpToolSpraycan::beginDraw () { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "kpToolSpraycan::beginDraw()"; -#endif kpToolFlowBase::beginDraw (); @@ -119,25 +117,19 @@ const QPoint &lastPoint, double probability) { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "CALL(thisPoint=" << thisPoint << ",lastPoint=" << lastPoint << ")" << endl; -#endif QList docPoints = kpPainter::interpolatePoints (lastPoint, thisPoint, false/*no need for cardinally adjacency points*/, probability); -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "\tdocPoints=" << docPoints; -#endif - // By chance no points to draw? if (docPoints.empty ()) return QRect (); - // For efficiency, only get image after NOP check above. QRect docRect = kpPainter::normalizedRect(thisPoint, lastPoint); docRect = neededRect (docRect, spraycanSize ()); @@ -171,11 +163,9 @@ // public virtual [base kpToolFlowBase] QRect kpToolSpraycan::drawPoint (const QPoint &point) { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "kpToolSpraycan::drawPoint" << point << " lastPoint=" << lastPoint () << endl; -#endif // If this is the first in the flow or if the user is moving the spray, // make the spray line continuous. @@ -192,9 +182,7 @@ // public virtual [base kpToolFlowBase] QRect kpToolSpraycan::drawLine (const QPoint &thisPoint, const QPoint &lastPoint) { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "CALL(thisPoint=" << thisPoint << ",lastPoint=" << lastPoint; -#endif // Draw only every so often in response to movement. return drawLineWithProbability (thisPoint, lastPoint, @@ -204,9 +192,7 @@ // protected slot void kpToolSpraycan::timeoutDraw () { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "kpToolSpraycan::timeoutDraw()"; -#endif // Draw at this single point without delay. const QRect drawnRect = drawLineWithProbability (currentPoint (), currentPoint (), @@ -221,9 +207,7 @@ // public virtual [base kpToolFlowBase] void kpToolSpraycan::cancelShape () { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "kpToolSpraycan::cancelShape()"; -#endif m_timer->stop (); kpToolFlowBase::cancelShape (); @@ -233,10 +217,8 @@ void kpToolSpraycan::endDraw (const QPoint &thisPoint, const QRect &normalizedRect) { -#if DEBUG_KP_TOOL_SPRAYCAN qCDebug(kpLogTools) << "kpToolSpraycan::endDraw(thisPoint=" << thisPoint << ")" << endl; -#endif m_timer->stop (); kpToolFlowBase::endDraw (thisPoint, normalizedRect); diff --git a/tools/kpToolColorPicker.cpp b/tools/kpToolColorPicker.cpp --- a/tools/kpToolColorPicker.cpp +++ b/tools/kpToolColorPicker.cpp @@ -56,9 +56,7 @@ // private kpColor kpToolColorPicker::colorAtPixel (const QPoint &p) { -#if DEBUG_KP_TOOL_COLOR_PICKER && 0 qCDebug(kpLogTools) << "kpToolColorPicker::colorAtPixel" << p; -#endif return kpPixmapFX::getColorAtPixel (document ()->image (), p); } diff --git a/tools/kpToolFloodFill.cpp b/tools/kpToolFloodFill.cpp --- a/tools/kpToolFloodFill.cpp +++ b/tools/kpToolFloodFill.cpp @@ -88,9 +88,7 @@ // public virtual [base kpTool] void kpToolFloodFill::beginDraw () { -#if DEBUG_KP_TOOL_FLOOD_FILL && 1 qCDebug(kpLogTools) << "kpToolFloodFill::beginDraw()"; -#endif QApplication::setOverrideCursor (Qt::WaitCursor); { @@ -103,9 +101,7 @@ color (mouseButton ()), processedColorSimilarity (), environ ()->commandEnvironment ()); - #if DEBUG_KP_TOOL_FLOOD_FILL && 1 qCDebug(kpLogTools) << "\tperforming new-doc-corner-case check"; - #endif if (document ()->url ().isEmpty () && !document ()->isModified ()) { diff --git a/tools/kpToolZoom.cpp b/tools/kpToolZoom.cpp --- a/tools/kpToolZoom.cpp +++ b/tools/kpToolZoom.cpp @@ -138,9 +138,7 @@ // public virtual [base kpTool] void kpToolZoom::globalDraw () { -#if DEBUG_KP_TOOL_ZOOM qCDebug(kpLogTools) << "CALL"; -#endif environ ()->fitToPage (); } @@ -157,11 +155,8 @@ // public virtual [base kpTool] void kpToolZoom::draw (const QPoint &thisPoint, const QPoint &, const QRect &normalizedRect) { -#if DEBUG_KP_TOOL_ZOOM qCDebug(kpLogTools) << "kpToomZoom::draw() currentPoint=" << currentPoint () - << " lastPoint=" << lastPoint () - << endl; -#endif + << " lastPoint=" << lastPoint (); // TODO: Need accidental drag detection from selection tool (when dragging // out new selection) @@ -215,10 +210,8 @@ // public virtual [base kpTool] void kpToolZoom::endDraw (const QPoint &, const QRect &normalizedRect) { -#if DEBUG_KP_TOOL_ZOOM qCDebug(kpLogTools) << "kpToolZoom::endDraw(rect=" << normalizedRect << ")" - << " dragHasBegun=" << d->dragHasBegun << endl; -#endif + << " dragHasBegun=" << d->dragHasBegun; // TODO: This cursor doesn't stay on for long enough because zooming uses // event loop tricks. diff --git a/tools/kpTool_Drawing.cpp b/tools/kpTool_Drawing.cpp --- a/tools/kpTool_Drawing.cpp +++ b/tools/kpTool_Drawing.cpp @@ -141,9 +141,7 @@ void kpTool::beginInternal () { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::beginInternal()"; -#endif if (!d->began) { @@ -211,19 +209,15 @@ // virtual void kpTool::begin () { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::begin() base implementation"; -#endif } //--------------------------------------------------------------------- // virtual void kpTool::end () { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::end() base implementation"; -#endif } //--------------------------------------------------------------------- @@ -266,11 +260,9 @@ // virtual void kpTool::hover (const QPoint &point) { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::hover" << point << " base implementation" << endl; -#endif setUserShapePoints (point); } @@ -287,9 +279,7 @@ // virtual void kpTool::reselect () { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::reselect() base implementation"; -#endif } //--------------------------------------------------------------------- @@ -357,9 +347,7 @@ void kpTool::endDrawInternal (const QPoint &thisPoint, const QRect &normalizedRect, bool wantEndShape) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::endDrawInternal() wantEndShape=" << wantEndShape; -#endif if (wantEndShape && !hasBegunShape ()) return; @@ -370,16 +358,12 @@ if (wantEndShape) { - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tcalling endShape()"; - #endif endShape (thisPoint, normalizedRect); } else { - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tcalling endDraw()"; - #endif endDraw (thisPoint, normalizedRect); } d->viewUnderStartPoint = nullptr; diff --git a/tools/kpTool_KeyboardEvents.cpp b/tools/kpTool_KeyboardEvents.cpp --- a/tools/kpTool_KeyboardEvents.cpp +++ b/tools/kpTool_KeyboardEvents.cpp @@ -65,9 +65,7 @@ { case 0: case Qt::Key_unknown: - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::seeIfAndHandleModifierKey() picked up unknown key!"; - #endif // HACK: around Qt bug: if you hold a modifier before you start the // program and then release it over the view, // Qt reports it as the release of an unknown key @@ -77,9 +75,7 @@ case Qt::Key_Alt: case Qt::Key_Shift: case Qt::Key_Control: - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::setIfAndHandleModifierKey() accepting"; - #endif keyUpdateModifierState (e); e->accept (); @@ -132,22 +128,16 @@ const QPoint oldPoint = view->mapFromGlobal (QCursor::pos ()); -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\toldPoint=" << oldPoint - << " dx=" << dx << " dy=" << dy << endl; -#endif - + << " dx=" << dx << " dy=" << dy; const int viewIncX = (dx ? qMax (1, view->zoomLevelX () / 100) * dx : 0); const int viewIncY = (dy ? qMax (1, view->zoomLevelY () / 100) * dy : 0); int newViewX = oldPoint.x () + viewIncX; int newViewY = oldPoint.y () + viewIncY; - -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tnewPoint=" << QPoint (newViewX, newViewY); -#endif // Make sure we really moved at least one doc point (needed due to // rounding error). @@ -158,10 +148,8 @@ newViewX += viewIncX; newViewY += viewIncY; - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tneed adjust for doc - newPoint=" - << QPoint (newViewX, newViewY) << endl; - #endif + << QPoint (newViewX, newViewY); } @@ -195,10 +183,7 @@ if (!isDrawKey (e->key ())) return; -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::seeIfAndHandleBeginDrawKeyPress() accept"; -#endif - // TODO: wrong for dragging lines outside of view (for e.g.) kpView * const view = viewUnderCursor (); @@ -218,24 +203,18 @@ void kpTool::seeIfAndHandleEndDrawKeyPress (QKeyEvent *e) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::setIfAndHandleEndDrawKeyPress() key=" << e->key () << " isAutoRepeat=" << e->isAutoRepeat () << " isDrawKey=" << isDrawKey (e->key ()) - << " view=" << viewUnderCursor () - << endl; -#endif + << " view=" << viewUnderCursor (); if (e->isAutoRepeat ()) return; if (!isDrawKey (e->key ())) return; -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::seeIfAndHandleEndDrawKeyPress() accept"; -#endif - kpView * const view = viewUnderCursor (); if (!view) @@ -257,16 +236,13 @@ void kpTool::keyPressEvent (QKeyEvent *e) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::keyPressEvent() key=" << (int *) e->key () << " stateAfter: modifiers=" << (int *) (int) e->modifiers () << " isAutoRep=" << e->isAutoRepeat () << endl; -#endif e->ignore (); - seeIfAndHandleModifierKey (e); if (e->isAccepted ()) return; @@ -279,7 +255,6 @@ if (e->isAccepted ()) return; - switch (e->key ()) { case Qt::Key_Delete: @@ -301,12 +276,10 @@ void kpTool::keyReleaseEvent (QKeyEvent *e) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::keyReleaseEvent() key=" << (int *) e->key () << " stateAfter: modifiers=" << (int *) (int) e->modifiers () << " isAutoRep=" << e->isAutoRepeat () << endl; -#endif e->ignore (); @@ -324,31 +297,24 @@ // private void kpTool::keyUpdateModifierState (QKeyEvent *e) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::keyUpdateModifierState() e->key=" << (int *) e->key (); qCDebug(kpLogTools) << "\tshift=" << (e->modifiers () & Qt::ShiftModifier) << " control=" << (e->modifiers () & Qt::ControlModifier) << " alt=" - << (e->modifiers () & Qt::AltModifier) - << endl; -#endif + << (e->modifiers () & Qt::AltModifier); if (e->key () & (Qt::Key_Alt | Qt::Key_Shift | Qt::Key_Control)) { - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\t\tmodifier changed - use e's claims"; - #endif setShiftPressed (e->modifiers () & Qt::ShiftModifier); setControlPressed (e->modifiers () & Qt::ControlModifier); setAltPressed (e->modifiers () & Qt::AltModifier); } // See seeIfAndHandleModifierKey() for why this code path exists. else { - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\t\tmodifiers not changed - figure out the truth"; - #endif const Qt::KeyboardModifiers keyState = QApplication::keyboardModifiers (); setShiftPressed (keyState & Qt::ShiftModifier); diff --git a/tools/kpTool_MouseEvents.cpp b/tools/kpTool_MouseEvents.cpp --- a/tools/kpTool_MouseEvents.cpp +++ b/tools/kpTool_MouseEvents.cpp @@ -59,27 +59,21 @@ // is generated at _all_, until you move it back into the view. void kpTool::mousePressEvent (QMouseEvent *e) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::mousePressEvent pos=" << e->pos () << " button=" << (int) e->button () << " stateAfter: buttons=" << (int *) (int) e->buttons () << " modifiers=" << (int *) (int) e->modifiers () - << " beganDraw=" << d->beganDraw << endl; -#endif + << " beganDraw=" << d->beganDraw; if (e->button () == Qt::MidButton) { const QString text = QApplication::clipboard ()->text (QClipboard::Selection); - #if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "\tMMB pasteText='" << text << "'"; - #endif if (!text.isEmpty ()) { if (hasBegunShape ()) { - #if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "\t\thasBegunShape - end"; - #endif endShapeInternal (d->currentPoint, normalizedRect ()); } @@ -96,9 +90,7 @@ } int mb = mouseButton (e->buttons ()); -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "\tmb=" << mb << " d->beganDraw=" << d->beganDraw; -#endif if (mb == -1 && !d->beganDraw) { @@ -110,9 +102,7 @@ { if (mb == -1 || mb != d->mouseButton) { - #if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "\tCancelling operation as " << mb << " == -1 or != " << d->mouseButton; - #endif kpView *view = viewUnderStartPoint (); Q_ASSERT (view); @@ -130,11 +120,8 @@ kpView *view = viewUnderCursor (); Q_ASSERT (view); -#if DEBUG_KP_TOOL && 1 if (view) qCDebug(kpLogTools) << "\tview=" << view->objectName (); -#endif - // let user know what mouse button is being used for entire draw d->mouseButton = mouseButton (e->buttons ()); @@ -146,9 +133,7 @@ d->viewUnderStartPoint = view; d->lastPoint = QPoint (-1, -1); -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "\tBeginning draw @ " << d->currentPoint; -#endif beginDrawInternal (); @@ -169,7 +154,6 @@ // selections' accidental drag detection feature cares? void kpTool::mouseMoveEvent (QMouseEvent *e) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::mouseMoveEvent pos=" << e->pos () << " stateAfter: buttons=" << (int *) (int) e->buttons () << " modifiers=" << (int *) (int) e->modifiers (); @@ -179,9 +163,8 @@ qCDebug(kpLogTools) << "\tviewUnderCursor=" << (v0 ? v0->objectName () : "(none)") << " viewUnderCursorQt=" << (v1 ? v1->objectName () : "(none)") << " viewUnderStartPoint=" << (v2 ? v2->objectName () : "(none)"); - qCDebug(kpLogTools) << "\tfocusWidget=" << kapp->focusWidget (); + qCDebug(kpLogTools) << "\tfocusWidget=" << qApp->focusWidget (); qCDebug(kpLogTools) << "\tbeganDraw=" << d->beganDraw; -#endif d->shiftPressed = (e->modifiers () & Qt::ShiftModifier); d->controlPressed = (e->modifiers () & Qt::ControlModifier); @@ -195,9 +178,7 @@ d->currentPoint = view->transformViewToDoc (e->pos ()); d->currentViewPoint = e->pos (); - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tDraw!"; - #endif bool dragScrolled = false; movedAndAboutToDraw (d->currentPoint, d->lastPoint, view->zoomLevelX (), &dragScrolled); @@ -243,13 +224,11 @@ void kpTool::mouseReleaseEvent (QMouseEvent *e) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::mouseReleaseEvent pos=" << e->pos () << " button=" << (int) e->button () << " stateAfter: buttons=" << (int *) (int) e->buttons () << " modifiers=" << (int *) (int) e->modifiers () << " beganDraw=" << d->beganDraw << endl; -#endif // Have _not_ already cancelShape()'ed by pressing other mouse button? // (e.g. you can cancel a line dragged out with the LMB, by pressing @@ -277,30 +256,24 @@ void kpTool::wheelEvent (QWheelEvent *e) { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool::wheelEvent() modifiers=" << (int *) (int) e->modifiers () << " hasBegunDraw=" << hasBegunDraw () << " delta=" << e->delta () << endl; -#endif e->ignore (); // If CTRL not pressed, bye. if ((e->modifiers () & Qt::ControlModifier) == 0) { - #if DEBUG_KP_TOOL qCDebug(kpLogTools) << "\tno CTRL -> bye"; - #endif return; } // If drawing, bye; don't care if a shape in progress though. if (hasBegunDraw ()) { - #if DEBUG_KP_TOOL qCDebug(kpLogTools) << "\thasBegunDraw() -> bye"; - #endif return; } @@ -310,26 +283,16 @@ // Moved wheel away from user? if (e->delta () > 0) { - #if DEBUG_KP_TOOL qCDebug(kpLogTools) << "\tzoom in"; - #endif d->environ->zoomIn (true/*center under cursor*/); e->accept (); } // Moved wheel towards user? else if (e->delta () < 0) { - #if DEBUG_KP_TOOL qCDebug(kpLogTools) << "\tzoom out"; - #endif - #if 1 d->environ->zoomOut (true/*center under cursor - make zoom in/out stay under same doc pos*/); - #else - d->environ->zoomOut (false/*don't center under cursor - as is - confusing behaviour when zooming - out*/); - #endif e->accept (); } } diff --git a/tools/kpTool_OtherEvents.cpp b/tools/kpTool_OtherEvents.cpp --- a/tools/kpTool_OtherEvents.cpp +++ b/tools/kpTool_OtherEvents.cpp @@ -32,32 +32,26 @@ // 2. Non-view events // - -#define DEBUG_KP_TOOL 0 - - #include "tools/kpTool.h" #include "kpToolPrivate.h" #include "kpLogCategories.h" #include "imagelib/kpColor.h" +#include + //--------------------------------------------------------------------- // // 1. View Events // bool kpTool::viewEvent (QEvent *e) { -#if DEBUG_KP_TOOL qCDebug(kpLogTools) << "kpTool<" << objectName () << "," << this << ">::viewEvent(type=" << e->type () - << ") returning false" << endl; -#else - (void) e; -#endif + << ") returning false"; // Don't handle. return false; @@ -73,9 +67,7 @@ void kpTool::focusOutEvent (QFocusEvent *) { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::focusOutEvent() beganDraw=" << d->beganDraw; -#endif if (d->beganDraw) endDrawInternal (d->currentPoint, normalizedRect ()); @@ -85,18 +77,14 @@ void kpTool::enterEvent (QEvent *) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::enterEvent() beganDraw=" << d->beganDraw; -#endif } //--------------------------------------------------------------------- void kpTool::leaveEvent (QEvent *) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::leaveEvent() beganDraw=" << d->beganDraw; -#endif // if we haven't started drawing (e.g. dragging a rectangle)... if (!d->beganDraw) @@ -130,9 +118,7 @@ { if (d->ignoreColorSignals > 0) { - #if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::slotForegroundColorChangedInternal() ignoreColorSignals=" << d->ignoreColorSignals; - #endif d->ignoreColorSignals--; return; } @@ -146,9 +132,7 @@ { if (d->ignoreColorSignals > 0) { - #if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::slotBackgroundColorChangedInternal() ignoreColorSignals=" << d->ignoreColorSignals; - #endif d->ignoreColorSignals--; return; } diff --git a/tools/kpTool_Utilities.cpp b/tools/kpTool_Utilities.cpp --- a/tools/kpTool_Utilities.cpp +++ b/tools/kpTool_Utilities.cpp @@ -85,44 +85,34 @@ // public QPoint kpTool::calculateCurrentPoint (bool zoomToDoc) const { -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "kpTool::currentPoint(zoomToDoc=" << zoomToDoc << ")"; qCDebug(kpLogTools) << "\tviewUnderStartPoint=" << (viewUnderStartPoint () ? viewUnderStartPoint ()->objectName () : "(none)") << " viewUnderCursor=" - << (viewUnderCursor () ? viewUnderCursor ()->objectName () : "(none)") - << endl; -#endif + << (viewUnderCursor () ? viewUnderCursor ()->objectName () : "(none)"); kpView *v = viewUnderStartPoint (); if (!v) { v = viewUnderCursor (); if (!v) { - #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tno view - returning sentinel"; - #endif return KP_INVALID_POINT; } } const QPoint globalPos = QCursor::pos (); const QPoint viewPos = v->mapFromGlobal (globalPos); -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tglobalPos=" << globalPos - << " viewPos=" << viewPos - << endl; -#endif + << " viewPos=" << viewPos; if (!zoomToDoc) return viewPos; const QPoint docPos = v->transformViewToDoc (viewPos); -#if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tdocPos=" << docPos; -#endif return docPos; } @@ -142,19 +132,16 @@ void kpTool::somethingBelowTheCursorChanged (const QPoint ¤tPoint_, const QPoint ¤tViewPoint_) { -#if DEBUG_KP_TOOL && 1 qCDebug(kpLogTools) << "kpTool::somethingBelowTheCursorChanged(docPoint=" << currentPoint_ << " viewPoint=" << currentViewPoint_ - << ")" << endl; + << ")"; qCDebug(kpLogTools) << "\tviewUnderStartPoint=" << (viewUnderStartPoint () ? viewUnderStartPoint ()->objectName () : "(none)") << " viewUnderCursor=" - << (viewUnderCursor () ? viewUnderCursor ()->objectName () : "(none)") - << endl; + << (viewUnderCursor () ? viewUnderCursor ()->objectName () : "(none)"); qCDebug(kpLogTools) << "\tbegan draw=" << d->beganDraw; -#endif d->currentPoint = currentPoint_; d->currentViewPoint = currentViewPoint_; @@ -245,18 +232,6 @@ const QString &continueButtonText, QWidget *parent) { -#if DEBUG_KP_TOOL - qCDebug(kpLogTools) << "kpTool::warnIfBigImageSize()" - << " old: w=" << oldWidth << " h=" << oldWidth - << " new: w=" << newWidth << " h=" << newHeight - << " pixmapSize=" - << kpPixmapFX::pixmapSize (newWidth, - newHeight, - QPixmap::defaultDepth ()) - << " vs BigImageSize=" << KP_BIG_IMAGE_SIZE - << endl; -#endif - // Only got smaller or unchanged - don't complain if (!(newWidth > oldWidth || newHeight > oldHeight)) { diff --git a/tools/polygonal/kpToolCurve.cpp b/tools/polygonal/kpToolCurve.cpp --- a/tools/polygonal/kpToolCurve.cpp +++ b/tools/polygonal/kpToolCurve.cpp @@ -133,10 +133,8 @@ // public virtual [base kpTool] void kpToolCurve::endDraw (const QPoint &, const QRect &) { -#if DEBUG_KP_TOOL_CURVE qCDebug(kpLogTools) << "kpToolCurve::endDraw() points=" << points ()->toList () << endl; -#endif switch (points ()->count ()) { @@ -183,9 +181,7 @@ // Have initial line and both control points? case 4: - #if DEBUG_KP_TOOL_CURVE qCDebug(kpLogTools) << "\tending shape"; - #endif endShape (); break; diff --git a/tools/polygonal/kpToolLine.cpp b/tools/polygonal/kpToolLine.cpp --- a/tools/polygonal/kpToolLine.cpp +++ b/tools/polygonal/kpToolLine.cpp @@ -60,10 +60,8 @@ // public virtual [base kpTool] void kpToolLine::endDraw (const QPoint &, const QRect &) { -#if DEBUG_KP_TOOL_LINE qCDebug(kpLogTools) << "kpToolLine::endDraw() points=" - << points ()->toList () << endl; -#endif + << points ()->toList (); // After the first drag, we should have a line. Q_ASSERT (points ()->count () == 2); diff --git a/tools/polygonal/kpToolPolygon.cpp b/tools/polygonal/kpToolPolygon.cpp --- a/tools/polygonal/kpToolPolygon.cpp +++ b/tools/polygonal/kpToolPolygon.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_TOOL_POLYGON 0 - - #include "kpToolPolygon.h" #include "widgets/toolbars/kpToolToolBar.h" #include "environments/tools/kpToolEnvironment.h" @@ -39,6 +35,7 @@ #include #include +#include "kpLogCategories.h" //-------------------------------------------------------------------------------- @@ -151,10 +148,8 @@ // inheritance and readability. void kpToolPolygon::endDraw (const QPoint &, const QRect &) { -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygon::endDraw() points=" << points ()->toList () << endl; -#endif // A click of the other mouse button (to finish shape, instead of adding // another control point) would have caused endShape() to have been @@ -165,9 +160,7 @@ if (points ()->count () >= kpToolPolygonalBase::MaxPoints) { - #if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "\tending shape"; - #endif endShape (); return; } diff --git a/tools/polygonal/kpToolPolygonalBase.cpp b/tools/polygonal/kpToolPolygonalBase.cpp --- a/tools/polygonal/kpToolPolygonalBase.cpp +++ b/tools/polygonal/kpToolPolygonalBase.cpp @@ -108,9 +108,7 @@ kpToolToolBar *tb = toolToolBar (); Q_ASSERT (tb); -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygonalBase::begin() tb=" << tb; -#endif d->toolWidgetLineWidth = tb->toolWidgetLineWidth (); connect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, @@ -142,10 +140,8 @@ void kpToolPolygonalBase::beginDraw () { -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygonalBase::beginDraw() d->points=" << d->points.toList () << ", startPoint=" << startPoint () << endl; -#endif bool endedShape = false; @@ -178,9 +174,7 @@ } } -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "\tafterwards, d->points=" << d->points.toList (); -#endif if (!endedShape) { @@ -198,15 +192,13 @@ QPoint &lineStartPoint = d->points [count - 2]; QPoint &lineEndPoint = d->points [count - 1]; -#if DEBUG_KP_TOOL_POLYGON && 1 qCDebug(kpLogTools) << "kpToolPolygonalBase::applyModifiers() #pts=" << count << " line: startPt=" << lineStartPoint << " endPt=" << lineEndPoint << " modifiers: shift=" << shiftPressed () << " alt=" << altPressed () << " ctrl=" << controlPressed () << endl; -#endif // angles if (shiftPressed () || controlPressed ()) @@ -219,11 +211,9 @@ ratio = DBL_MAX; else ratio = fabs (double (diffy) / double (diffx)); - #if DEBUG_KP_TOOL_POLYGON && 1 qCDebug(kpLogTools) << "\tdiffx=" << diffx << " diffy=" << diffy << " ratio=" << ratio << endl; - #endif // Shift = 0, 45, 90 // Ctrl = 0, 30, 60, 90 @@ -280,12 +270,10 @@ lineEndPoint = QPoint (lineStartPoint.x () + newdx, lineStartPoint.y () + newdy); - #if DEBUG_KP_TOOL_POLYGON && 1 qCDebug(kpLogTools) << "\t\tdiagonal line: dist=" << dist - << " angle=" << (angle * 180 / KP_PI) + << " angle=" << (angle * 180 / M_PI) << " endPoint=" << lineEndPoint << endl; - #endif } } // if (shiftPressed () || controlPressed ()) { @@ -329,18 +317,14 @@ if (d->points.count () == 0) return; -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygonalBase::draw() d->points=" << d->points.toList () << ", endPoint=" << currentPoint () << endl; -#endif // Update points() so that last point reflects current mouse position. const int count = d->points.count (); d->points [count - 1] = currentPoint (); -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "\tafterwards, d->points=" << d->points.toList (); -#endif // Are we drawing a line? if (/*virtual*/drawingALine ()) @@ -392,13 +376,10 @@ d->points.boundingRect (), d->toolWidgetLineWidth->lineWidth ()); -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygonalBase::updateShape() boundingRect=" << boundingRect << " lineWidth=" - << d->toolWidgetLineWidth->lineWidth () - << endl; -#endif + << d->toolWidgetLineWidth->lineWidth (); kpImage image = document ()->getImageAt (boundingRect); @@ -443,10 +424,8 @@ // public virtual [base kpTool] void kpToolPolygonalBase::endShape (const QPoint &, const QRect &) { -#if DEBUG_KP_TOOL_POLYGON qCDebug(kpLogTools) << "kpToolPolygonalBase::endShape() d->points=" - << d->points.toList () << endl; -#endif + << d->points.toList (); if (!hasBegunShape ()) return; diff --git a/tools/rectangular/kpToolRectangularBase.cpp b/tools/rectangular/kpToolRectangularBase.cpp --- a/tools/rectangular/kpToolRectangularBase.cpp +++ b/tools/rectangular/kpToolRectangularBase.cpp @@ -122,16 +122,12 @@ // virtual void kpToolRectangularBase::begin () { -#if DEBUG_KP_TOOL_RECTANGULAR_BASE qCDebug(kpLogTools) << "kpToolRectangularBase::begin ()"; -#endif kpToolToolBar *tb = toolToolBar (); Q_ASSERT (tb); -#if DEBUG_KP_TOOL_RECTANGULAR_BASE qCDebug(kpLogTools) << "\ttoolToolBar=" << tb; -#endif d->toolWidgetLineWidth = tb->toolWidgetLineWidth (); connect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, @@ -153,9 +149,7 @@ // virtual void kpToolRectangularBase::end () { -#if DEBUG_KP_TOOL_RECTANGULAR_BASE qCDebug(kpLogTools) << "kpToolRectangularBase::end ()"; -#endif if (d->toolWidgetLineWidth) { @@ -180,12 +174,9 @@ { QRect rect = normalizedRect (); -#if DEBUG_KP_TOOL_RECTANGULAR_BASE qCDebug(kpLogTools) << "kpToolRectangularBase::applyModifiers(" << rect << ") shift=" << shiftPressed () - << " ctrl=" << controlPressed () - << endl; -#endif + << " ctrl=" << controlPressed (); // user wants to startPoint () == center if (controlPressed ()) diff --git a/views/kpThumbnailView.cpp b/views/kpThumbnailView.cpp --- a/views/kpThumbnailView.cpp +++ b/views/kpThumbnailView.cpp @@ -56,13 +56,10 @@ // protected void kpThumbnailView::setMaskToCoverDocument () { -#if DEBUG_KP_THUMBNAIL_VIEW qCDebug(kpLogViews) << "kpThumbnailView::setMaskToCoverDocument()" << " origin=" << origin () << " zoomedDoc: width=" << zoomedDocWidth () - << " height=" << zoomedDocHeight () - << endl; -#endif + << " height=" << zoomedDocHeight (); setMask (QRegion (QRect (origin ().x (), origin ().y (), zoomedDocWidth (), zoomedDocHeight ()))); @@ -72,11 +69,6 @@ // protected virtual [base kpView] void kpThumbnailView::resizeEvent (QResizeEvent *e) { -#if DEBUG_KP_THUMBNAIL_VIEW - qCDebug(kpLogViews) << "kpThumbnailView(" << name () << ")::resizeEvent()" - << endl; -#endif - // For QResizeEvent's, Qt already throws an entire widget repaint into // the event loop. So eat useless update() calls that can only slow // things down. diff --git a/views/kpUnzoomedThumbnailView.cpp b/views/kpUnzoomedThumbnailView.cpp --- a/views/kpUnzoomedThumbnailView.cpp +++ b/views/kpUnzoomedThumbnailView.cpp @@ -99,30 +99,16 @@ const int scrollViewContentsY = buddyViewScrollableContainer ()->verticalScrollBar()->value(); -#if DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW - qCDebug(kpLogViews) << "kpUnzoomedThumbnailView(" << name () - << ")::adjustToEnvironment(" - << scrollViewContentsX - << "," - << scrollViewContentsY - << ") width=" << width () - << " height=" << height () - << endl; -#endif - - #if 1 int x; if (document ()->width () > width ()) { x = static_cast (buddyView ()->transformViewToDocX (scrollViewContentsX)); const int rightMostAllowedX = qMax (0, document ()->width () - width ()); - #if DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW qCDebug(kpLogViews) << "\tdocX=" << x << " docWidth=" << document ()->width () << " rightMostAllowedX=" << rightMostAllowedX << endl; - #endif if (x > rightMostAllowedX) x = rightMostAllowedX; } @@ -140,12 +126,10 @@ { y = static_cast (buddyView ()->transformViewToDocY (scrollViewContentsY)); const int bottomMostAllowedY = qMax (0, document ()->height () - height ()); - #if DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW qCDebug(kpLogViews) << "\tdocY=" << y << " docHeight=" << document ()->height () << " bottomMostAllowedY=" << bottomMostAllowedY << endl; - #endif if (y > bottomMostAllowedY) y = bottomMostAllowedY; } @@ -211,5 +195,3 @@ viewManager ()->restoreFastUpdates (); } } - - diff --git a/views/kpView.cpp b/views/kpView.cpp --- a/views/kpView.cpp +++ b/views/kpView.cpp @@ -204,15 +204,11 @@ // public virtual void kpView::setOrigin (const QPoint &origin) { -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "kpView(" << objectName () << ")::setOrigin" << origin; -#endif if (origin == d->origin) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tNOP"; - #endif return; } @@ -547,13 +543,11 @@ if (!vm) return; -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::setHasMouse(" << yes << ") existing viewUnderCursor=" << (vm->viewUnderCursor () ? vm->viewUnderCursor ()->objectName () : "(none)") << endl; -#endif if (yes && vm->viewUnderCursor () != this) vm->setViewUnderCursor (this); else if (!yes && vm->viewUnderCursor () == this) @@ -565,37 +559,29 @@ // public void kpView::addToQueuedArea (const QRegion ®ion) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::addToQueuedArea() already=" << d->queuedUpdateArea - << " - plus - " << region - << endl; -#endif + << " - plus - " << region; d->queuedUpdateArea += region; } //--------------------------------------------------------------------- // public void kpView::addToQueuedArea (const QRect &rect) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::addToQueuedArea() already=" << d->queuedUpdateArea - << " - plus - " << rect - << endl; -#endif + << " - plus - " << rect; d->queuedUpdateArea += rect; } //--------------------------------------------------------------------- // public void kpView::invalidateQueuedArea () { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView::invalidateQueuedArea()"; -#endif d->queuedUpdateArea = QRegion (); } @@ -606,14 +592,11 @@ void kpView::updateQueuedArea () { kpViewManager *vm = viewManager (); -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::updateQueuedArea() vm=" << (bool) vm << " queueUpdates=" << (vm && vm->queueUpdates ()) << " fastUpdates=" << (vm && vm->fastUpdates ()) - << " area=" << d->queuedUpdateArea - << endl; -#endif + << " area=" << d->queuedUpdateArea; if (!vm) return; @@ -647,9 +630,7 @@ // public virtual QVariant kpView::inputMethodQuery (Qt::InputMethodQuery query) const { -#if DEBUG_KP_VIEW && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::inputMethodQuery()"; -#endif QVariant ret; switch (query) { diff --git a/views/kpView_Events.cpp b/views/kpView_Events.cpp --- a/views/kpView_Events.cpp +++ b/views/kpView_Events.cpp @@ -27,17 +27,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_VIEW 0 -#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0) - - #include "views/kpView.h" #include "kpViewPrivate.h" -#if DEBUG_KP_VIEW #include "kpLogCategories.h" -#endif #include #include @@ -49,11 +42,8 @@ // protected virtual [base QWidget] void kpView::mouseMoveEvent (QMouseEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::mouseMoveEvent (" - << e->x () << "," << e->y () << ")" - << endl; -#endif + << e->x () << "," << e->y () << ")"; // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the // mainView, landing on top of the thumbnailView cleverly put on top @@ -69,11 +59,8 @@ // protected virtual [base QWidget] void kpView::mousePressEvent (QMouseEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::mousePressEvent (" - << e->x () << "," << e->y () << ")" - << endl; -#endif + << e->x () << "," << e->y () << ")"; setHasMouse (true); @@ -88,11 +75,8 @@ // protected virtual [base QWidget] void kpView::mouseReleaseEvent (QMouseEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::mouseReleaseEvent (" - << e->x () << "," << e->y () << ")" - << endl; -#endif + << e->x () << "," << e->y () << ")"; setHasMouse (rect ().contains (e->pos ())); @@ -116,9 +100,7 @@ // protected virtual [base QWidget] void kpView::keyPressEvent (QKeyEvent *e) { -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "kpView(" << objectName () << ")::keyPressEvent()" << e->text(); -#endif if (tool ()) tool ()->keyPressEvent (e); @@ -131,9 +113,7 @@ // protected virtual [base QWidget] void kpView::keyReleaseEvent (QKeyEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::keyReleaseEvent()"; -#endif if (tool ()) tool ()->keyReleaseEvent (e); @@ -146,9 +126,7 @@ // protected virtual [base QWidget] void kpView::inputMethodEvent (QInputMethodEvent *e) { -#if DEBUG_KP_VIEW && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::inputMethodEvent()"; -#endif if (tool ()) tool ()->inputMethodEvent (e); @@ -158,51 +136,39 @@ // protected virtual [base QWidget] bool kpView::event (QEvent *e) { -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "kpView::event() invoking kpTool::event()"; -#endif if (tool () && tool ()->viewEvent (e)) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tkpView::event() - tool said eat event, ret true"; - #endif return true; } -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tkpView::event() - no tool or said false, call QWidget::event()"; -#endif return QWidget::event (e); } // protected virtual [base QWidget] void kpView::focusInEvent (QFocusEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::focusInEvent()"; -#endif if (tool ()) tool ()->focusInEvent (e); } // protected virtual [base QWidget] void kpView::focusOutEvent (QFocusEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::focusOutEvent()"; -#endif if (tool ()) tool ()->focusOutEvent (e); } // protected virtual [base QWidget] void kpView::enterEvent (QEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::enterEvent()"; -#endif // Don't call setHasMouse(true) as it displays the brush cursor (if // active) when dragging open a menu and then dragging @@ -222,9 +188,7 @@ // protected virtual [base QWidget] void kpView::leaveEvent (QEvent *e) { -#if DEBUG_KP_VIEW && 0 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::leaveEvent()"; -#endif setHasMouse (false); if (tool ()) @@ -235,33 +199,27 @@ // protected virtual [base QWidget] void kpView::dragEnterEvent (QDragEnterEvent *) { -#if DEBUG_KP_VIEW && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::dragEnterEvent()"; -#endif setHasMouse (true); } // protected virtual [base QWidget] void kpView::dragLeaveEvent (QDragLeaveEvent *) { -#if DEBUG_KP_VIEW && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::dragLeaveEvent"; -#endif setHasMouse (false); } // protected virtual [base QWidget] void kpView::resizeEvent (QResizeEvent *e) { -#if DEBUG_KP_VIEW && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::resizeEvent(" << e->size () << " vs actual=" << size () - << ") old=" << e->oldSize () << endl; -#endif + << ") old=" << e->oldSize (); QWidget::resizeEvent (e); diff --git a/views/kpView_Paint.cpp b/views/kpView_Paint.cpp --- a/views/kpView_Paint.cpp +++ b/views/kpView_Paint.cpp @@ -53,9 +53,7 @@ // protected QRect kpView::paintEventGetDocRect (const QRect &viewRect) const { -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView::paintEventGetDocRect(" << viewRect << ")"; -#endif QRect docRect; @@ -79,9 +77,7 @@ docRect.setBottomRight (docRect.bottomRight () + QPoint (2, 2)); } -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tdocRect=" << docRect; -#endif kpDocument *doc = document (); if (doc) { @@ -102,13 +98,10 @@ const QRect &viewRect, bool isPreview) { -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView::drawTransparentBackground() patternOrigin=" << patternOrigin << " viewRect=" << viewRect - << " isPreview=" << isPreview - << endl; -#endif + << " isPreview=" << isPreview; const int cellSize = !isPreview ? 16 : 10; @@ -122,9 +115,7 @@ if ((startx - patternOrigin.x ()) % cellSize) startx -= ((startx - patternOrigin.x ()) % cellSize); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tstartXY=" << QPoint (startx, starty); -#endif painter->save (); @@ -161,11 +152,9 @@ // protected void kpView::paintEventDrawCheckerBoard (QPainter *painter, const QRect &viewRect) { -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::paintEventDrawCheckerBoard(viewRect=" << viewRect << ") origin=" << origin () << endl; -#endif kpDocument *doc = document (); if (!doc) @@ -175,21 +164,16 @@ if (scrollableContainer ()) { - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tscrollableContainer: contents[XY]=" << QPoint (scrollableContainer ()->horizontalScrollBar()->value (), - scrollableContainer ()->verticalScrollBar()->value ()) - << endl; - #endif + scrollableContainer ()->verticalScrollBar()->value ()); // Make checkerboard appear static relative to the scroll view. // This makes it more obvious that any visible bits of the // checkboard represent transparent pixels and not gray and white // squares. patternOrigin = QPoint (scrollableContainer ()->horizontalScrollBar()->value(), scrollableContainer ()->verticalScrollBar()->value()); - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\t\tpatternOrigin=" << patternOrigin; - #endif } // TODO: this static business doesn't work yet @@ -203,48 +187,38 @@ // protected void kpView::paintEventDrawSelection (QImage *destPixmap, const QRect &docRect) { -#if DEBUG_KP_VIEW_RENDERER && 1 || 0 qCDebug(kpLogViews) << "kpView::paintEventDrawSelection() docRect=" << docRect; -#endif kpDocument *doc = document (); if (!doc) { - #if DEBUG_KP_VIEW_RENDERER && 1 || 0 qCDebug(kpLogViews) << "\tno doc - abort"; - #endif return; } kpAbstractSelection *sel = doc->selection (); if (!sel) { - #if DEBUG_KP_VIEW_RENDERER && 1 || 0 qCDebug(kpLogViews) << "\tno sel - abort"; - #endif return; } // // Draw selection pixmap (if there is one) // -#if DEBUG_KP_VIEW_RENDERER && 1 || 0 qCDebug(kpLogViews) << "\tdraw sel pixmap @ " << sel->topLeft (); -#endif sel->paint (destPixmap, docRect); // // Draw selection border // kpViewManager *vm = viewManager (); -#if DEBUG_KP_VIEW_RENDERER && 1 || 0 qCDebug(kpLogViews) << "\tsel border visible=" << vm->selectionBorderVisible () << endl; -#endif if (vm->selectionBorderVisible ()) { sel->paintBorder (destPixmap, docRect, vm->selectionBorderFinished ()); @@ -287,46 +261,33 @@ // protected void kpView::paintEventDrawSelectionResizeHandles (const QRect &clipRect) { -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView::paintEventDrawSelectionResizeHandles(" << clipRect << ")" << endl; -#endif if (!selectionLargeEnoughToHaveResizeHandles ()) { - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tsel not large enough to have resize handles"; - #endif return; } kpViewManager *vm = viewManager (); if (!vm || !vm->selectionBorderVisible () || !vm->selectionBorderFinished ()) { - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tsel border not visible or not finished"; - #endif - return; } const QRect selViewRect = selectionViewRect (); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tselViewRect=" << selViewRect; -#endif if (!selViewRect.intersects (clipRect)) { - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tdoesn't intersect viewRect"; - #endif return; } QRegion selResizeHandlesRegion = selectionResizeHandlesViewRegion (true/*for renderer*/); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tsel resize handles view region=" - << selResizeHandlesRegion << endl; -#endif + << selResizeHandlesRegion; QPainter painter(this); painter.setPen(Qt::black); @@ -346,13 +307,10 @@ return; const kpTempImage *tpi = vm->tempImage (); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView::paintEventDrawTempImage() tempImage=" << tpi << " isVisible=" - << (tpi ? tpi->isVisible (vm) : false) - << endl; -#endif + << (tpi ? tpi->isVisible (vm) : false); if (!tpi || !tpi->isVisible (vm)) return; @@ -420,11 +378,9 @@ // QPaintEvent::region(). void kpView::paintEventDrawDoc_Unclipped (const QRect &viewRect) { -#if DEBUG_KP_VIEW_RENDERER QTime timer; timer.start (); qCDebug(kpLogViews) << "\tviewRect=" << viewRect; -#endif kpViewManager *vm = viewManager (); const kpDocument *doc = document (); @@ -437,9 +393,7 @@ QRect docRect = paintEventGetDocRect (viewRect); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tdocRect=" << docRect; -#endif QPainter painter (this); //painter.setCompositionMode(QPainter::CompositionMode_Source); @@ -452,26 +406,21 @@ { docPixmap = doc->getImageAt (docRect); - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tdocPixmap.hasAlphaChannel()=" << docPixmap.hasAlphaChannel () << endl; - #endif tempImageWillBeRendered = (!doc->selection () && vm->tempImage () && vm->tempImage ()->isVisible (vm) && docRect.intersects (vm->tempImage ()->rect ())); - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\ttempImageWillBeRendered=" << tempImageWillBeRendered << " (sel=" << doc->selection () << " tempImage=" << vm->tempImage () << " tempImage.isVisible=" << (vm->tempImage () ? vm->tempImage ()->isVisible (vm) : false) << " docRect.intersects(tempImage.rect)=" << (vm->tempImage () ? docRect.intersects (vm->tempImage ()->rect ()) : false) - << ")" - << endl; - #endif + << ")"; } @@ -500,28 +449,20 @@ paintEventDrawTempImage (&docPixmap, docRect); } - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\torigin=" << origin (); - #endif // Blit scaled version of docPixmap + tempImage. - #if DEBUG_KP_VIEW_RENDERER && 1 QTime scaleTimer; scaleTimer.start (); - #endif // This is the only troublesome part of the method that draws unclipped. painter.translate (origin ().x (), origin ().y ()); painter.scale (double (zoomLevelX ()) / 100.0, double (zoomLevelY ()) / 100.0); painter.drawImage (docRect, docPixmap); //painter.resetMatrix (); // back to 1-1 scaling - #if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tscale time=" << scaleTimer.elapsed (); - #endif } // if (!docRect.isEmpty ()) { -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tdrawDocRect done in: " << timer.restart () << "ms"; -#endif } //--------------------------------------------------------------------- @@ -533,21 +474,16 @@ // WARNING: document(), viewManager() and friends might be 0 in this method. // TODO: I'm not 100% convinced that we always check if their friends are 0. -#if DEBUG_KP_VIEW_RENDERER && 1 QTime timer; timer.start (); -#endif kpViewManager *vm = viewManager (); -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "kpView(" << objectName () << ")::paintEvent() vm=" << (bool) vm << " queueUpdates=" << (vm && vm->queueUpdates ()) << " fastUpdates=" << (vm && vm->fastUpdates ()) << " viewRect=" << e->rect () - << " topLeft=" << QPoint (x (), y ()) - << endl; -#endif + << " topLeft=" << QPoint (x (), y ()); if (!vm) return; @@ -570,9 +506,7 @@ // part of the view (which could be quite small inside a scrollview). QRegion viewRegion = e->region (); QVector rects = viewRegion.rects (); -#if DEBUG_KP_VIEW_RENDERER qCDebug(kpLogViews) << "\t#rects = " << rects.count (); -#endif // Draw all of the requested regions of the document _before_ drawing // the grid lines, buddy rectangle and selection resize handles. @@ -620,9 +554,5 @@ paintEventDrawSelectionResizeHandles (e->rect ()); } -#if DEBUG_KP_VIEW_RENDERER && 1 qCDebug(kpLogViews) << "\tall done in: " << timer.restart () << "ms"; -#endif } - -//--------------------------------------------------------------------- diff --git a/views/kpView_Selections.cpp b/views/kpView_Selections.cpp --- a/views/kpView_Selections.cpp +++ b/views/kpView_Selections.cpp @@ -25,17 +25,13 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_VIEW 0 -#define DEBUG_KP_VIEW_RENDERER ((DEBUG_KP_VIEW && 1) || 0) - - #include "views/kpView.h" #include "kpViewPrivate.h" #include "layers/selections/kpAbstractSelection.h" #include "layers/selections/text/kpTextSelection.h" #include "tools/kpTool.h" +#include "kpLogCategories.h" // public @@ -237,45 +233,33 @@ // REFACTOR: use QFlags as the return type for better type safety. int kpView::mouseOnSelectionResizeHandle (const QPoint &viewPoint) const { -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "kpView::mouseOnSelectionResizeHandle(viewPoint=" - << viewPoint << ")" << endl; -#endif + << viewPoint << ")"; if (!mouseOnSelection (viewPoint)) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tmouse not on sel"; - #endif return 0; } const QRect selViewRect = selectionViewRect (); -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tselViewRect=" << selViewRect; -#endif const int atomicLength = selectionResizeHandleAtomicSize (); -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tatomicLength=" << atomicLength; -#endif if (atomicLength <= 0) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tsel not large enough to have resize handles"; - #endif // Want to make it possible to move a small selection return 0; } const QPoint viewPointRelSel = mouseViewPointRelativeToSelection (viewPoint); -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tviewPointRelSel=" << viewPointRelSel; -#endif #define LOCAL_POINT_IN_BOX_AT(x,y) \ @@ -319,43 +303,32 @@ } else { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tnot on sel resize handle"; - #endif return 0; } #undef LOCAL_POINT_IN_BOX_AT } // public bool kpView::mouseOnSelectionToSelectText (const QPoint &viewPoint) const { -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "kpView::mouseOnSelectionToSelectText(viewPoint=" - << viewPoint << ")" << endl; -#endif + << viewPoint << ")"; if (!mouseOnSelection (viewPoint)) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tmouse non on sel"; - #endif return false; } if (!textSelection ()) { - #if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tsel not text"; - #endif return false; } -#if DEBUG_KP_VIEW qCDebug(kpLogViews) << "\tmouse on sel: to move=" << mouseOnSelectionToMove () - << " to resize=" << mouseOnSelectionResizeHandle () - << endl; -#endif + << " to resize=" << mouseOnSelectionResizeHandle (); return (!mouseOnSelectionToMove (viewPoint) && !mouseOnSelectionResizeHandle (viewPoint)); diff --git a/views/kpZoomedThumbnailView.cpp b/views/kpZoomedThumbnailView.cpp --- a/views/kpZoomedThumbnailView.cpp +++ b/views/kpZoomedThumbnailView.cpp @@ -25,15 +25,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_ZOOMED_THUMBNAIL_VIEW 0 - - #include "views/kpZoomedThumbnailView.h" #include "kpLogCategories.h" #include "document/kpDocument.h" #include "views/manager/kpViewManager.h" +#include "kpLogCategories.h" #include @@ -71,22 +68,11 @@ // public slot virtual [base kpView] void kpZoomedThumbnailView::adjustToEnvironment () { -#if DEBUG_KP_ZOOMED_THUMBNAIL_VIEW - qCDebug(kpLogViews) << "kpZoomedThumbnailView(" << name () - << ")::adjustToEnvironment()" - << " width=" << width () - << " height=" << height () - << endl; -#endif - if (!document ()) return; -#if DEBUG_KP_ZOOMED_THUMBNAIL_VIEW qCDebug(kpLogViews) << "\tdoc: width=" << document ()->width () - << " height=" << document ()->height () - << endl; -#endif + << " height=" << document ()->height (); if (document ()->width () <= 0 || document ()->height () <= 0) { @@ -107,14 +93,10 @@ else hzoom = vzoom; -#if DEBUG_KP_ZOOMED_THUMBNAIL_VIEW && 1 qCDebug(kpLogViews) << "\tproposed zoom=" << hzoom; -#endif if (hzoom > 100 || vzoom > 100) { - #if DEBUG_KP_ZOOMED_THUMBNAIL_VIEW && 1 qCDebug(kpLogViews) << "\twon't magnify - setting zoom to 100%"; - #endif hzoom = 100; vzoom = 100; } diff --git a/views/kpZoomedView.cpp b/views/kpZoomedView.cpp --- a/views/kpZoomedView.cpp +++ b/views/kpZoomedView.cpp @@ -62,11 +62,6 @@ // public virtual [base kpView] void kpZoomedView::setZoomLevel (int hzoom, int vzoom) { -#if DEBUG_KP_ZOOMED_VIEW - qCDebug(kpLogViews) << "kpZoomedView(" << name () << ")::setZoomLevel(" - << hzoom << "," << vzoom << ")" << endl; -#endif - if (viewManager ()) viewManager ()->setQueueUpdates (); @@ -84,13 +79,6 @@ // public slot virtual [base kpView] void kpZoomedView::adjustToEnvironment () { -#if DEBUG_KP_ZOOMED_VIEW - qCDebug(kpLogViews) << "kpZoomedView(" << name () << ")::adjustToEnvironment()" - << " doc: width=" << document ()->width () - << " height=" << document ()->height () - << endl; -#endif - if (document ()) { // TODO: use zoomedDocWidth() & zoomedDocHeight()? diff --git a/views/manager/kpViewManager.cpp b/views/manager/kpViewManager.cpp --- a/views/manager/kpViewManager.cpp +++ b/views/manager/kpViewManager.cpp @@ -102,15 +102,11 @@ // public void kpViewManager::registerView (kpView *view) { -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::registerView (" << view << ")"; -#endif Q_ASSERT (view); Q_ASSERT (!d->views.contains (view)); -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "\tadded view"; -#endif view->setCursor (d->cursor); d->views.append (view); } @@ -167,12 +163,10 @@ // public void kpViewManager::setViewUnderCursor (kpView *view) { -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::setViewUnderCursor (" << (view ? view->objectName () : "(none)") << ")" << " old=" << (d->viewUnderCursor ? d->viewUnderCursor->objectName () : "(none)") << endl; -#endif if (view == d->viewUnderCursor) return; @@ -186,19 +180,15 @@ // Hide the brush if the mouse cursor just left the view. if (d->tempImage && d->tempImage->isBrush ()) { - #if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "\thiding brush pixmap since cursor left view"; - #endif updateViews (d->tempImage->rect ()); } } else { if (d->mainWindow->tool ()) { - #if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "\tnotify tool that something changed below cursor"; - #endif d->mainWindow->tool ()->somethingBelowTheCursorChanged (); } } @@ -263,13 +253,11 @@ // public void kpViewManager::setTempImage (const kpTempImage &tempImage) { -#if DEBUG_KP_VIEW_MANAGER qCDebug(kpLogViews) << "kpViewManager::setTempImage(isBrush=" << tempImage.isBrush () << ",topLeft=" << tempImage.topLeft () << ",image.rect=" << tempImage.image ().rect () << ")" << endl; -#endif QRect oldRect; @@ -359,6 +347,3 @@ if (d->viewUnderCursor) d->viewUnderCursor->setAttribute (Qt::WA_InputMethodEnabled, inputMethodEnabled); } - -//--------------------------------------------------------------------- - diff --git a/views/manager/kpViewManager_TextCursor.cpp b/views/manager/kpViewManager_TextCursor.cpp --- a/views/manager/kpViewManager_TextCursor.cpp +++ b/views/manager/kpViewManager_TextCursor.cpp @@ -75,9 +75,7 @@ // public void kpViewManager::setTextCursorEnabled (bool yes) { -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::setTextCursorEnabled(" << yes << ")"; -#endif if (yes == textCursorEnabled ()) return; @@ -192,9 +190,7 @@ // protected void kpViewManager::updateTextCursor () { -#if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "kpViewManager::updateTextCursor()"; -#endif const QRect r = textCursorRect (); if (!r.isValid ()) @@ -211,10 +207,8 @@ // protected slot void kpViewManager::slotTextCursorBlink () { -#if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "kpViewManager::slotTextCursorBlink() cursorBlinkState=" << d->textCursorBlinkState << endl; -#endif if (d->textCursorBlinkTimer) { diff --git a/views/manager/kpViewManager_ViewUpdates.cpp b/views/manager/kpViewManager_ViewUpdates.cpp --- a/views/manager/kpViewManager_ViewUpdates.cpp +++ b/views/manager/kpViewManager_ViewUpdates.cpp @@ -57,20 +57,16 @@ void kpViewManager::setQueueUpdates () { d->queueUpdatesCounter++; -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::setQueueUpdates() counter=" - << d->queueUpdatesCounter << endl; -#endif + << d->queueUpdatesCounter; } // public slot void kpViewManager::restoreQueueUpdates () { d->queueUpdatesCounter--; -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::restoreQueueUpdates() counter=" << d->queueUpdatesCounter << endl; -#endif Q_ASSERT (d->queueUpdatesCounter >= 0); if (d->queueUpdatesCounter == 0) @@ -95,20 +91,16 @@ void kpViewManager::setFastUpdates () { d->fastUpdatesCounter++; -#if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "kpViewManager::setFastUpdates() counter=" - << d->fastUpdatesCounter << endl; -#endif + << d->fastUpdatesCounter; } // public slot void kpViewManager::restoreFastUpdates () { d->fastUpdatesCounter--; -#if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "kpViewManager::restoreFastUpdates() counter=" - << d->fastUpdatesCounter << endl; -#endif + << d->fastUpdatesCounter; Q_ASSERT (d->fastUpdatesCounter >= 0); } @@ -189,24 +181,17 @@ // public slot void kpViewManager::updateViews (const QRect &docRect) { -#if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "kpViewManager::updateViews (" << docRect << ")"; -#endif for (QLinkedList ::const_iterator it = d->views.begin (); it != d->views.end (); ++it) { kpView *view = *it; - #if DEBUG_KP_VIEW_MANAGER && 0 - qCDebug(kpLogViews) << "\tupdating view " << view->name (); - #endif if (view->zoomLevelX () % 100 == 0 && view->zoomLevelY () % 100 == 0) { - #if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "\t\tviewRect=" << view->transformDocToView (docRect); - #endif updateView (view, view->transformDocToView (docRect)); } else @@ -221,9 +206,7 @@ viewRect.height () + 2 * diff) .intersected (QRect (0, 0, view->width (), view->height ())); - #if DEBUG_KP_VIEW_MANAGER && 0 qCDebug(kpLogViews) << "\t\tviewRect (+compensate)=" << newRect; - #endif updateView (view, newRect); } } @@ -233,21 +216,13 @@ // public slot void kpViewManager::adjustViewsToEnvironment () { -#if DEBUG_KP_VIEW_MANAGER && 1 qCDebug(kpLogViews) << "kpViewManager::adjustViewsToEnvironment()" - << " numViews=" << d->views.count () - << endl; -#endif + << " numViews=" << d->views.count (); for (QLinkedList ::const_iterator it = d->views.begin (); it != d->views.end (); ++it) { kpView *view = *it; - - #if DEBUG_KP_VIEW_MANAGER && 1 - qCDebug(kpLogViews) << "\tview: " << view->name () - << endl; - #endif view->adjustToEnvironment (); } } diff --git a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp --- a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp +++ b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp @@ -107,15 +107,12 @@ const QPointF &bl, const QPointF &br, int highlight) { -#if DEBUG_KP_COLOR_SIMILARITY_CUBE qCDebug(kpLogWidgets) << "kpColorSimilarityCubeRenderer.cpp:DrawFace(RorGorB=" << redOrGreenOrBlue << ",tl=" << tl << ",tr=" << tr << ",bl=" << bl << ",br=" << br - << ")" - << endl; -#endif + << ")"; // tl --- tm --- tr // | | | @@ -143,16 +140,12 @@ ::Color (redOrGreenOrBlue, baseBrightness, colorSimilarity, +1, highlight) }; -#if DEBUG_KP_COLOR_SIMILARITY_CUBE qCDebug(kpLogWidgets) << "\tmaxColorSimilarity=" << kpColorSimilarityHolder::MaxColorSimilarity << " colorCubeDiagDist=" << kpColorSimilarityHolder::ColorCubeDiagonalDistance << endl << "\tbaseBrightness=" << baseBrightness << " color[0]=" << ((colors [0].rgba() & RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) - << " color[1]=" << ((colors [1].rgba() & RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)) - << endl; -#endif - + << " color[1]=" << ((colors [1].rgba() & RGB_MASK) >> ((2 - redOrGreenOrBlue) * 8)); ::DrawQuadrant(target, colors [0], tm, tl, ml, mm); ::DrawQuadrant(target, colors [1], tm, tr, mr, mm); diff --git a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp --- a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp +++ b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM 0 - - #include "kpColorSimilarityToolBarItem.h" #include @@ -42,6 +38,7 @@ #include "dialogs/kpColorSimilarityDialog.h" #include "kpColorSimilarityCubeRenderer.h" #include "kpDefs.h" +#include "kpLogCategories.h" //--------------------------------------------------------------------- @@ -86,11 +83,9 @@ void kpColorSimilarityToolBarItem::setColorSimilarityInternal (double similarity, bool writeConfig) { -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::setColorSimilarityInternal(" << "similarity=" << similarity << ",writeConfig=" << writeConfig - << ")" << endl; -#endif + << ")"; m_oldColorSimilarity = colorSimilarity (); @@ -145,10 +140,8 @@ // private slot: void kpColorSimilarityToolBarItem::slotFlashTimerTimeout () { -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::slotFlashTimerTimeout()" - << " highlight=" << m_flashHighlight << endl; -#endif + << " highlight=" << m_flashHighlight; int newHigh = m_flashHighlight - 20; if (newHigh < 0) newHigh = 0; @@ -166,17 +159,13 @@ // public void kpColorSimilarityToolBarItem::flash () { -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::flash()"; -#endif if (isSuppressingFlash ()) return; if (m_flashHighlight == 255) { - #if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "\tNOP"; - #endif } else { @@ -218,9 +207,7 @@ // private void kpColorSimilarityToolBarItem::updateToolTip () { -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::updateToolTip()"; -#endif if (colorSimilarity () > 0) { @@ -249,10 +236,8 @@ void kpColorSimilarityToolBarItem::updateIcon () { const int side = width () * 6 / 8; -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::updateIcon() width=" << width () << " side=" << side << endl; -#endif QPixmap icon(side, side); icon.fill(Qt::transparent); @@ -270,14 +255,9 @@ // private virtual [base QWidget] void kpColorSimilarityToolBarItem::resizeEvent (QResizeEvent *e) { -#if DEBUG_KP_COLOR_SIMILARITY_TOOL_BAR_ITEM qCDebug(kpLogWidgets) << "kpColorSimilarityToolBarItem::resizeEvent() size=" << size () << " oldSize=" << e->oldSize () << endl; -#endif QToolButton::resizeEvent (e); updateIcon (); } - -//--------------------------------------------------------------------- - diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp --- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp +++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp @@ -66,9 +66,7 @@ // contain and fixing its height to the maximum seen size hint height. int h = m_typeLabel->sizeHint ().height (); -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogWidgets) << "initial size hint height=" << h; -#endif m_typeLabel->setText ( kpEffectBlurSharpenCommand::nameForType (kpEffectBlurSharpen::Blur)); @@ -84,9 +82,7 @@ kpEffectBlurSharpenCommand::nameForType (kpEffectBlurSharpen::None)); h = qMax (h, m_typeLabel->sizeHint ().height ()); -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogWidgets) << "maximum size hint height" << h; -#endif m_typeLabel->setFixedHeight (h); m_typeLabel->setAlignment (Qt::AlignCenter); @@ -149,10 +145,8 @@ { QString text = kpEffectBlurSharpenCommand::nameForType (type ()); -#if DEBUG_KP_EFFECT_BLUR_SHARPEN qCDebug(kpLogWidgets) << "kpEffectBlurSharpenWidget::slotUpdateTypeLabel() text=" << text << endl; -#endif const int h = m_typeLabel->height (); m_typeLabel->setText (text); if (m_typeLabel->height () != h) diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp --- a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp +++ b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp @@ -141,10 +141,8 @@ // public virtual [base kpEffectWidgetBase] kpImage kpEffectFlattenWidget::applyEffect (const kpImage &image) { -#if DEBUG_KP_EFFECT_FLATTEN qCDebug(kpLogWidgets) << "kpEffectFlattenWidget::applyEffect() nop=" - << isNoOp () << endl; -#endif + << isNoOp (); if (isNoOp ()) return image; @@ -166,11 +164,8 @@ // protected slot: void kpEffectFlattenWidget::slotEnableChanged (bool enable) { -#if DEBUG_KP_EFFECT_FLATTEN qCDebug(kpLogWidgets) << "kpEffectFlattenWidget::slotEnableChanged(" << enable - << ") enableButton=" << m_enableCheckBox->isChecked () - << endl; -#endif + << ") enableButton=" << m_enableCheckBox->isChecked (); m_color1Button->setEnabled (enable); m_color2Button->setEnabled (enable); diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.cpp b/widgets/imagelib/effects/kpEffectInvertWidget.cpp --- a/widgets/imagelib/effects/kpEffectInvertWidget.cpp +++ b/widgets/imagelib/effects/kpEffectInvertWidget.cpp @@ -107,13 +107,10 @@ // public int kpEffectInvertWidget::channels () const { -#if DEBUG_KP_EFFECT_INVERT qCDebug(kpLogWidgets) << "kpEffectInvertWidget::channels()" << " isChecked: r=" << m_redCheckBox->isChecked () << " g=" << m_greenCheckBox->isChecked () - << " b=" << m_blueCheckBox->isChecked () - << endl; -#endif + << " b=" << m_blueCheckBox->isChecked (); int channels = 0; @@ -128,9 +125,7 @@ channels |= kpEffectInvert::Blue; -#if DEBUG_KP_EFFECT_INVERT qCDebug(kpLogWidgets) << "\treturning channels=" << (int *) channels; -#endif return channels; } diff --git a/widgets/kpColorCells.cpp b/widgets/kpColorCells.cpp --- a/widgets/kpColorCells.cpp +++ b/widgets/kpColorCells.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_COLOR_CELLS 0 - - #include "widgets/kpColorCells.h" #include "imagelib/kpColor.h" @@ -262,15 +258,13 @@ r = ::TableNumColumns (d->colorCol);; } -#if DEBUG_KP_COLOR_CELLS qCDebug(kpLogWidgets) << "kpColorCells::makeCellsMatchColorCollection():" << "r=" << r << "c=" << c; qCDebug(kpLogWidgets) << "verticalScrollBar=" << verticalScrollBar () << " sizeHint=" << (verticalScrollBar () ? verticalScrollBar ()->sizeHint () : QSize (-12, -34)); -#endif // Delete all cell widgets. This ensures that there will be no left-over // cell widgets, for the colors in the new color collection that are @@ -316,12 +310,10 @@ // int x = c - 1 - i / r; pos = y * c + x; } - #if DEBUG_KP_COLOR_CELLS && 0 qCDebug(kpLogWidgets) << "\tSetting cell " << i << ": y=" << y << " x=" << x << " pos=" << pos << endl; qCDebug(kpLogWidgets) << "\t\tcolor=" << (int *) d->colorCol.color (i).rgba() << "isValid=" << d->colorCol.color (i).isValid (); - #endif // (color may be invalid resulting in a hole in the middle of the table) setColor (pos, d->colorCol.color (i)); @@ -342,9 +334,7 @@ void kpColorCells::setModified (bool yes) { -#if DEBUG_KP_COLOR_CELLS qCDebug(kpLogWidgets) << "kpColorCells::setModified(" << yes << ")"; -#endif if (yes == d->isModified) return; @@ -525,14 +515,10 @@ void kpColorCells::slotColorSelected (int cell, const QColor &color, Qt::MouseButton button) { -#if DEBUG_KP_COLOR_CELLS qCDebug(kpLogWidgets) << "kpColorCells::slotColorSelected(cell=" << cell << ") mouseButton = " << button << " rgb=" << (int *) color.rgba() << endl; -#else - Q_UNUSED (cell); -#endif if (button == Qt::LeftButton) { @@ -574,10 +560,8 @@ // protected slot void kpColorCells::slotColorChanged (int cell, const QColor &color) { -#if DEBUG_KP_COLOR_CELLS qCDebug(kpLogWidgets) << "cell=" << cell << "color=" << (const int *) color.rgba() << "d->colorCol.count()=" << d->colorCol.count (); -#endif if (d->blockColorChangedSig) return; diff --git a/widgets/kpColorPalette.cpp b/widgets/kpColorPalette.cpp --- a/widgets/kpColorPalette.cpp +++ b/widgets/kpColorPalette.cpp @@ -25,10 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#define DEBUG_KP_COLOR_PALETTE 0 - - #include "kpColorPalette.h" #include "kpColorCells.h" diff --git a/widgets/kpDefaultColorCollection.cpp b/widgets/kpDefaultColorCollection.cpp --- a/widgets/kpDefaultColorCollection.cpp +++ b/widgets/kpDefaultColorCollection.cpp @@ -30,7 +30,6 @@ #include "imagelib/kpColor.h" - kpDefaultColorCollection::kpDefaultColorCollection () { kpColor colors [] = diff --git a/widgets/kpDocumentSaveOptionsWidget.cpp b/widgets/kpDocumentSaveOptionsWidget.cpp --- a/widgets/kpDocumentSaveOptionsWidget.cpp +++ b/widgets/kpDocumentSaveOptionsWidget.cpp @@ -25,9 +25,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET 0 - - #include "widgets/kpDocumentSaveOptionsWidget.h" #include "kpDefs.h" @@ -157,9 +154,7 @@ kpDocumentSaveOptionsWidget::~kpDocumentSaveOptionsWidget () { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::()"; -#endif hidePreview (); delete m_documentPixmap; @@ -169,10 +164,8 @@ // public void kpDocumentSaveOptionsWidget::setVisualParent (QWidget *visualParent) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::setVisualParent(" - << visualParent << ")" << endl; -#endif + << visualParent << ")"; m_visualParent = visualParent; } @@ -200,23 +193,17 @@ // public slots void kpDocumentSaveOptionsWidget::setMimeType (const QString &string) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::setMimeType(" << string << ") maxColorDepth=" - << kpDocumentSaveOptions::mimeTypeMaximumColorDepth (string) - << endl; -#endif + << kpDocumentSaveOptions::mimeTypeMaximumColorDepth (string); const int newMimeTypeMaxDepth = kpDocumentSaveOptions::mimeTypeMaximumColorDepth (string); -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\toldMimeType=" << mimeType () << " maxColorDepth=" << kpDocumentSaveOptions::mimeTypeMaximumColorDepth ( - mimeType ()) - << endl; -#endif + mimeType ()); if (mimeType ().isEmpty () || kpDocumentSaveOptions::mimeTypeMaximumColorDepth (mimeType ()) != @@ -241,27 +228,22 @@ if (m_colorDepthComboLastSelectedItem >= 0 && m_colorDepthComboLastSelectedItem < m_colorDepthCombo->count ()) { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tsetting colorDepthCombo to " - << m_colorDepthComboLastSelectedItem << endl; - #endif + << m_colorDepthComboLastSelectedItem; m_colorDepthCombo->setCurrentIndex (m_colorDepthComboLastSelectedItem); } else { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tsetting colorDepthCombo to max item since" << " m_colorDepthComboLastSelectedItem=" << m_colorDepthComboLastSelectedItem - << " out of range" << endl; - #endif + << " out of range"; m_colorDepthCombo->setCurrentIndex (m_colorDepthCombo->count () - 1); } } - m_baseDocumentSaveOptions.setMimeType (string); if (mimeTypeHasConfigurableColorDepth ()) @@ -358,12 +340,10 @@ // public slots void kpDocumentSaveOptionsWidget::setColorDepthDither (int newDepth, bool newDither) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::setColorDepthDither(" << "depth=" << newDepth << ",dither=" << newDither - << ")" << endl; -#endif + << ")"; m_baseDocumentSaveOptions.setColorDepth (newDepth); m_baseDocumentSaveOptions.setDither (newDither); @@ -398,13 +378,10 @@ m_baseDocumentSaveOptions.dither ()); } -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::slotColorDepthSelected()" << " mode&ColorDepth=" << (mode () & ColorDepth) << " colorDepthComboLastSelectedItem=" - << m_colorDepthComboLastSelectedItem - << endl; -#endif + << m_colorDepthComboLastSelectedItem; } @@ -424,10 +401,8 @@ // public void kpDocumentSaveOptionsWidget::setQuality (int newQuality) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::setQuality(" - << newQuality << ")" << endl; -#endif + << newQuality << ")"; m_baseDocumentSaveOptions.setQuality (newQuality); m_qualityInput->setValue (newQuality == -1/*QImage::save() default*/ ? @@ -519,11 +494,8 @@ // protected slot void kpDocumentSaveOptionsWidget::showPreview (bool yes) { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::showPreview(" << yes << ")" - << " m_previewDialog=" << bool (m_previewDialog) - << endl; -#endif + << " m_previewDialog=" << bool (m_previewDialog); if (yes == bool (m_previewDialog)) return; @@ -555,45 +527,33 @@ if (m_updatePreviewDelay < 0) m_updatePreviewDelay = 0; - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tread cfg preview dialog update delay=" - << m_updatePreviewDelay - << endl; - #endif + << m_updatePreviewDelay; if (m_previewDialogLastRelativeGeometry.isEmpty ()) { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tread cfg preview dialog last rel geometry"; - #endif KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupPreviewSave); m_previewDialogLastRelativeGeometry = cfg.readEntry ( kpSettingPreviewSaveGeometry, QRect ()); } - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tpreviewDialogLastRelativeGeometry=" << m_previewDialogLastRelativeGeometry - << " visualParent->rect()=" << m_visualParent->rect () - << endl; - #endif + << " visualParent->rect()=" << m_visualParent->rect (); QRect relativeGeometry; if (!m_previewDialogLastRelativeGeometry.isEmpty () && m_visualParent->rect ().intersects (m_previewDialogLastRelativeGeometry)) { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tok"; - #endif relativeGeometry = m_previewDialogLastRelativeGeometry; } else { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\t\tinvalid"; - #endif const int margin = 20; relativeGeometry = @@ -609,25 +569,19 @@ const QRect globalGeometry = kpWidgetMapper::toGlobal (m_visualParent, relativeGeometry); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\trelativeGeometry=" << relativeGeometry - << " globalGeometry=" << globalGeometry - << endl; - #endif + << " globalGeometry=" << globalGeometry; m_previewDialog->resize (globalGeometry.size ()); m_previewDialog->move (globalGeometry.topLeft ()); m_previewDialog->show (); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tgeometry after show=" << QRect (m_previewDialog->x (), m_previewDialog->y (), - m_previewDialog->width (), m_previewDialog->height ()) - << endl; - #endif + m_previewDialog->width (), m_previewDialog->height ()); updatePreviewDialogLastRelativeGeometry (); @@ -648,16 +602,13 @@ cfg.writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry); cfg.sync (); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tsaving preview geometry " << m_previewDialogLastRelativeGeometry << " (Qt would have us believe " << kpWidgetMapper::fromGlobal (m_visualParent, QRect (m_previewDialog->x (), m_previewDialog->y (), m_previewDialog->width (), m_previewDialog->height ())) - << ")" - << endl; - #endif + << ")"; m_previewDialog->deleteLater (); m_previewDialog = nullptr; @@ -732,30 +683,21 @@ // protected slot void kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry () { -#if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "kpDocumentSaveOptionsWidget::" - << "updatePreviewDialogLastRelativeGeometry()" - << endl; -#endif + << "updatePreviewDialogLastRelativeGeometry()"; if (m_previewDialog && m_previewDialog->isVisible ()) { m_previewDialogLastRelativeGeometry = kpWidgetMapper::fromGlobal (m_visualParent, QRect (m_previewDialog->x (), m_previewDialog->y (), m_previewDialog->width (), m_previewDialog->height ())); - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tcaching pos = " << m_previewDialogLastRelativeGeometry << endl; - #endif } else { - #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET qCDebug(kpLogWidgets) << "\tnot visible - ignoring geometry"; - #endif } } - - diff --git a/widgets/kpDualColorButton.cpp b/widgets/kpDualColorButton.cpp --- a/widgets/kpDualColorButton.cpp +++ b/widgets/kpDualColorButton.cpp @@ -199,24 +199,20 @@ // protected virtual void kpDualColorButton::dragEnterEvent (QDragEnterEvent *e) { -#if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "kpDualColorButton::dragEnterEvent() canDecode=" << KColorMimeData::canDecode (e->mimeData ()) << endl; -#endif e->accept (); } //--------------------------------------------------------------------- // protected virtual [base QWidget] void kpDualColorButton::dragMoveEvent (QDragMoveEvent *e) { -#if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "kpDualColorButton::dragMoveEvent() canDecode=" << KColorMimeData::canDecode (e->mimeData ()) << endl; -#endif e->setAccepted ( (foregroundRect ().contains (e->pos ()) || backgroundRect ().contains (e->pos ())) && @@ -229,11 +225,9 @@ void kpDualColorButton::dropEvent (QDropEvent *e) { QColor col = KColorMimeData::fromMimeData (e->mimeData ()); -#if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "kpDualColorButton::dropEvent() col=" << (int *) col.rgba() << " (with alpha=" << (int *) col.rgba () << ")" << endl; -#endif if (col.isValid ()) { @@ -250,9 +244,7 @@ // protected virtual [base QWidget] void kpDualColorButton::mousePressEvent (QMouseEvent *e) { -#if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "kpDualColorButton::mousePressEvent() pos=" << e->pos (); -#endif m_dragStartPoint = KP_INVALID_POINT; @@ -264,11 +256,9 @@ void kpDualColorButton::mouseMoveEvent (QMouseEvent *e) { -#if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "kpDualColorButton::mouseMoveEvent() pos=" << e->pos () << " buttons=" << e->buttons () - << " dragStartPoint=" << m_dragStartPoint << endl; -#endif + << " dragStartPoint=" << m_dragStartPoint; if (m_dragStartPoint == KP_INVALID_POINT) return; @@ -285,9 +275,7 @@ e->y () < m_dragStartPoint.y () - delay || e->y () > m_dragStartPoint.y () + delay) { - #if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "\tstarting drag as long as it's in a rectangle"; - #endif kpColor color; @@ -300,11 +288,8 @@ // "color" is left as invalid. } - #if DEBUG_KP_DUAL_COLOR_BUTTON qCDebug(kpLogWidgets) << "\tcolor.isValid=" << color.isValid () - << " rgb=" << (color.isValid () ? (int *) color.toQRgb () : 0) - << endl; - #endif + << " rgb=" << (color.isValid () ? (int *) color.toQRgb () : 0); if (color.isValid ()) { @@ -326,9 +311,7 @@ if (swapPixmapRect ().contains (e->pos ()) && m_color [0] != m_color [1]) { - #if DEBUG_KP_DUAL_COLOR_BUTTON && 1 qCDebug(kpLogWidgets) << "kpDualColorButton::mouseReleaseEvent() swap colors:"; - #endif m_oldColor [0] = m_color [0]; m_oldColor [1] = m_color [1]; @@ -371,11 +354,8 @@ // protected virtual [base QWidget] void kpDualColorButton::paintEvent (QPaintEvent *e) { -#if DEBUG_KP_DUAL_COLOR_BUTTON && 1 qCDebug(kpLogWidgets) << "kpDualColorButton::draw() rect=" << rect () - << " contentsRect=" << contentsRect () - << endl; -#endif + << " contentsRect=" << contentsRect (); // Draw frame first. QFrame::paintEvent (e); @@ -421,10 +401,7 @@ bgRect.width () - 4, bgRect.height () - 4); if (isEnabled ()) { - #if DEBUG_KP_DUAL_COLOR_BUTTON && 1 - qCDebug(kpLogWidgets) << "\tbackgroundColor=" << (int *) m_color [1].toQRgb () - << endl; - #endif + qCDebug(kpLogWidgets) << "\tbackgroundColor=" << (int *) m_color [1].toQRgb (); if (m_color [1].isTransparent ()) // only if fully transparent painter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26")); else @@ -444,10 +421,7 @@ fgRect.width () - 4, fgRect.height () - 4); if (isEnabled ()) { - #if DEBUG_KP_DUAL_COLOR_BUTTON && 1 - qCDebug(kpLogWidgets) << "\tforegroundColor=" << (int *) m_color [0].toQRgb () - << endl; - #endif + qCDebug(kpLogWidgets) << "\tforegroundColor=" << (int *) m_color [0].toQRgb (); if (m_color [0].isTransparent ()) // only if fully transparent painter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26")); else diff --git a/widgets/kpPrintDialogPage.cpp b/widgets/kpPrintDialogPage.cpp --- a/widgets/kpPrintDialogPage.cpp +++ b/widgets/kpPrintDialogPage.cpp @@ -51,9 +51,7 @@ : QWidget (parent), d (new kpPrintDialogPagePrivate ()) { -#if DEBUG_KP_PRINT_DIALOG_PAGE qCDebug(kpLogWidgets) << "kpPrintDialogPage::()"; -#endif setWindowTitle (i18nc ("@title:tab", "I&mage Position")); @@ -78,19 +76,15 @@ bool kpPrintDialogPage::printImageCenteredOnPage () { -#if DEBUG_KP_PRINT_DIALOG_PAGE qCDebug(kpLogWidgets) << "kpPrintDialogPage::printImageCenteredOnPage()" << " returning " << d->printCenteredRadio->isChecked() << endl; -#endif return d->printCenteredRadio->isChecked (); } void kpPrintDialogPage::setPrintImageCenteredOnPage (bool printCentered) { -#if DEBUG_KP_PRINT_DIALOG_PAGE qCDebug(kpLogWidgets) << "kpPrintDialogPage::setOptions(" << printCentered << ")"; -#endif if (printCentered) d->printCenteredRadio->setChecked (true); else diff --git a/widgets/kpTransparentColorCell.cpp b/widgets/kpTransparentColorCell.cpp --- a/widgets/kpTransparentColorCell.cpp +++ b/widgets/kpTransparentColorCell.cpp @@ -39,6 +39,7 @@ #include #include #include +#include "kpLogCategories.h" //--------------------------------------------------------------------- @@ -113,11 +114,8 @@ if (isEnabled ()) { - #if DEBUG_KP_TRANSPARENT_COLOR_CELL qCDebug(kpLogWidgets) << "kpTransparentColorCell::paintEvent() contentsRect=" - << contentsRect () - << endl; - #endif + << contentsRect (); QPainter p (this); p.drawPixmap (contentsRect (), m_pixmap); } diff --git a/widgets/toolbars/kpColorToolBar.cpp b/widgets/toolbars/kpColorToolBar.cpp --- a/widgets/toolbars/kpColorToolBar.cpp +++ b/widgets/toolbars/kpColorToolBar.cpp @@ -119,11 +119,9 @@ void kpColorToolBar::adjustToOrientation (Qt::Orientation o) { -#if DEBUG_KP_COLOR_TOOL_BAR qCDebug(kpLogWidgets) << "kpColorToolBar::adjustToOrientation(" << (o == Qt::Vertical ? "vertical" : "horizontal") << ") called!"; -#endif Q_ASSERT (o == Qt::Horizontal); @@ -176,10 +174,8 @@ void kpColorToolBar::setForegroundColor (const kpColor &color) { -#if DEBUG_KP_COLOR_TOOL_BAR qCDebug(kpLogWidgets) << "kpColorToolBar::setForegroundColor(" << (int *) color.toQRgb () << ")" << endl; -#endif m_dualColorButton->setForegroundColor (color); } @@ -194,10 +190,8 @@ void kpColorToolBar::setBackgroundColor (const kpColor &color) { -#if DEBUG_KP_COLOR_TOOL_BAR qCDebug(kpLogWidgets) << "kpColorToolBar::setBackgroundColor(" << (int *) color.toQRgb () << ")" << endl; -#endif m_dualColorButton->setBackgroundColor (color); } @@ -316,9 +310,7 @@ // Grab the color drag for this widget, preventing it from being // handled by our parent, the main window. e->setAccepted (KColorMimeData::canDecode (e->mimeData ()) == true); -#if DEBUG_KP_COLOR_TOOL_BAR qCDebug(kpLogWidgets) << "isAccepted=" << e->isAccepted (); -#endif } //--------------------------------------------------------------------- @@ -328,10 +320,5 @@ { // Stop the grabbed drag from being dropped. e->setAccepted (KColorMimeData::canDecode (e->mimeData ()) == false); -#if DEBUG_KP_COLOR_TOOL_BAR qCDebug(kpLogWidgets) << "isAccepted=" << e->isAccepted (); -#endif } - -//--------------------------------------------------------------------- - diff --git a/widgets/toolbars/kpToolToolBar.cpp b/widgets/toolbars/kpToolToolBar.cpp --- a/widgets/toolbars/kpToolToolBar.cpp +++ b/widgets/toolbars/kpToolToolBar.cpp @@ -195,11 +195,8 @@ // public void kpToolToolBar::selectTool (const kpTool *tool, bool reselectIfSameTool) { -#if DEBUG_KP_TOOL_TOOL_BAR qCDebug(kpLogWidgets) << "kpToolToolBar::selectTool (tool=" << tool - << ") currentTool=" << m_currentTool - << endl; -#endif + << ") currentTool=" << m_currentTool; if (!reselectIfSameTool && tool == m_currentTool) return; @@ -284,9 +281,7 @@ { QAbstractButton *b = m_buttonGroup->checkedButton(); -#if DEBUG_KP_TOOL_TOOL_BAR qCDebug(kpLogWidgets) << "kpToolToolBar::slotToolButtonClicked() button=" << b; -#endif kpTool *tool = nullptr; foreach (const kpToolButton *button, m_toolButtons) @@ -298,11 +293,8 @@ } } -#if DEBUG_KP_TOOL_TOOL_BAR qCDebug(kpLogWidgets) << "\ttool=" << tool - << " currentTool=" << m_currentTool - << endl; -#endif + << " currentTool=" << m_currentTool; if (tool == m_currentTool) { @@ -341,11 +333,8 @@ { const kpTool *tool = dynamic_cast(sender()); -#if DEBUG_KP_TOOL_TOOL_BAR qCDebug(kpLogWidgets) << "kpToolToolBar::slotToolActionActivated() tool=" - << (tool ? tool->objectName () : "null") - << endl; -#endif + << (tool ? tool->objectName () : "null"); selectTool (tool, true/*reselect if same tool*/); } @@ -355,11 +344,9 @@ // public void kpToolToolBar::adjustToOrientation(Qt::Orientation o) { -#if DEBUG_KP_TOOL_TOOL_BAR qCDebug(kpLogWidgets) << "kpToolToolBar::adjustToOrientation(" << (o == Qt::Vertical ? "vertical" : "horizontal") - << ") called!" << endl; -#endif + << ") called!"; delete m_baseLayout; if (o == Qt::Vertical)