Hello community,
here is the log from the commit of package kdewebdev4 for openSUSE:Factory checked in at 2013-12-02 12:34:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdewebdev4 (Old)
and /work/SRC/openSUSE:Factory/.kdewebdev4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdewebdev4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdewebdev4/kdewebdev4.changes 2013-10-03 15:55:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdewebdev4.new/kdewebdev4.changes 2013-12-02 12:34:27.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Nov 16 18:18:55 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.90
+ * KDE 4.12 Beta 2 release
+ * See http://www.kde.org/announcements/announce-4.12-beta2.php
+
+-------------------------------------------------------------------
+Sat Nov 9 23:21:08 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.80
+ * KDE 4.12 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.12-beta1.php
+
+-------------------------------------------------------------------
+Sat Nov 2 15:36:38 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.11.3
+ * KDE 4.11.3 bugfix release
+ * See http://www.kde.org/announcements/announce-4.11.3.php
+
+-------------------------------------------------------------------
Old:
----
kdewebdev-4.11.2.tar.xz
New:
----
kdewebdev-4.11.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdewebdev4.spec ++++++
--- /var/tmp/diff_new_pack.gPgWa5/_old 2013-12-02 12:34:28.000000000 +0100
+++ /var/tmp/diff_new_pack.gPgWa5/_new 2013-12-02 12:34:28.000000000 +0100
@@ -17,7 +17,7 @@
Name: kdewebdev4
-Version: 4.11.2
+Version: 4.11.90
Release: 0
Summary: Base package for kdewebdev
License: GPL-2.0+
++++++ kdewebdev-4.11.2.tar.xz -> kdewebdev-4.11.90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/CMakeLists.txt new/kdewebdev-4.11.90/kimagemapeditor/CMakeLists.txt
--- old/kdewebdev-4.11.2/kimagemapeditor/CMakeLists.txt 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/CMakeLists.txt 2013-08-27 16:34:48.000000000 +0200
@@ -25,7 +25,7 @@
set_target_properties(kimagemapeditor_bin PROPERTIES OUTPUT_NAME kimagemapeditor)
-target_link_libraries(kimagemapeditor_bin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} )
+target_link_libraries(kimagemapeditor_bin ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KHTML_LIBS} )
install(TARGETS kimagemapeditor_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -39,7 +39,7 @@
-target_link_libraries(kimagemapeditor ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} )
+target_link_libraries(kimagemapeditor ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KHTML_LIBS} )
install(TARGETS kimagemapeditor DESTINATION ${PLUGIN_INSTALL_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/drawzone.cpp new/kdewebdev-4.11.90/kimagemapeditor/drawzone.cpp
--- old/kdewebdev-4.11.2/kimagemapeditor/drawzone.cpp 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/drawzone.cpp 2013-08-27 16:48:10.000000000 +0200
@@ -18,7 +18,6 @@
// QT
#include
#include
-#include
#include
//Added by qt3to4:
#include <QDropEvent>
@@ -28,11 +27,11 @@
// KDE
#include
-#include
#include
#include
#include
#include
+#include
// Local
#include "drawzone.h"
@@ -461,10 +460,9 @@
case DrawCircle:
case DrawRectangle:
currentAction = None;
- imageMapEditor->commandHistory()->addCommand(
+ imageMapEditor->commandHistory()->push(
new CreateCommand( imageMapEditor,
- currentArea ),
- true);
+ currentArea ));
break;
case DrawPolygon:
// If the number of Polygonpoints is more than 2
@@ -476,8 +474,8 @@
{
currentArea->setFinished(true);
currentAction=None;
- imageMapEditor->commandHistory()->addCommand(
- new CreateCommand( imageMapEditor, currentArea ), true);
+ imageMapEditor->commandHistory()->push(
+ new CreateCommand( imageMapEditor, currentArea ));
} else {
currentArea->insertCoord(currentArea->countSelectionPoints()-1, drawEnd);
currentSelectionPoint=currentArea->selectionPoints().last();
@@ -487,19 +485,18 @@
currentArea->setFinished(true,false);
currentArea->simplifyCoords();
currentAction=None;
- imageMapEditor->commandHistory()->addCommand(
- new CreateCommand( imageMapEditor, currentArea ), true);
+ imageMapEditor->commandHistory()->push(
+ new CreateCommand( imageMapEditor, currentArea ));
break;
case MoveArea: {
QPoint p1 = oldArea->rect().topLeft();
QPoint p2 = imageMapEditor->selected()->rect().topLeft();
if (p1 != p2) {
- imageMapEditor->commandHistory()->addCommand(
+ imageMapEditor->commandHistory()->push(
new MoveCommand( imageMapEditor,
imageMapEditor->selected(),
- oldArea->rect().topLeft()),
- true);
+ oldArea->rect().topLeft()));
imageMapEditor->slotAreaChanged(currentArea);
} else {
imageMapEditor->updateSelection();
@@ -509,11 +506,10 @@
break;
}
case MoveSelectionPoint:
- imageMapEditor->commandHistory()->addCommand(
+ imageMapEditor->commandHistory()->push(
new ResizeCommand( imageMapEditor,
imageMapEditor->selected(),
- oldArea),
- true);
+ oldArea));
imageMapEditor->slotAreaChanged(currentArea);
currentAction=None;
break;
@@ -522,22 +518,20 @@
currentArea->onSelectionPoint(zoomedPoint,_zoom))
{
currentArea->removeSelectionPoint(currentSelectionPoint);
- imageMapEditor->commandHistory()->addCommand(
+ imageMapEditor->commandHistory()->push(
new RemovePointCommand( imageMapEditor,
imageMapEditor->selected(),
- oldArea),
- true);
+ oldArea));
imageMapEditor->slotAreaChanged(currentArea);
}
currentAction=None;
break;
case AddPoint:
if (currentArea == imageMapEditor->onArea(drawEnd)) {
- imageMapEditor->commandHistory()->addCommand(
+ imageMapEditor->commandHistory()->push(
new AddPointCommand( imageMapEditor,
imageMapEditor->selected(),
- drawEnd),
- true);
+ drawEnd));
imageMapEditor->slotAreaChanged(currentArea);
}
currentAction=None;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimagemapeditor.cpp new/kdewebdev-4.11.90/kimagemapeditor/kimagemapeditor.cpp
--- old/kdewebdev-4.11.2/kimagemapeditor/kimagemapeditor.cpp 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimagemapeditor.cpp 2013-08-27 16:57:55.000000000 +0200
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include <QMenu>
#include
@@ -37,9 +36,10 @@
#include
#include
#include <QLinkedList>
+#include
// KDE
-#include
+#include
#include
#include
#include
@@ -320,7 +320,7 @@
void KImageMapEditor::setModified(bool modified)
{
// get a handle on our Save action and make sure it is valid
- QAction *save = actionCollection()->action(KStandardAction::stdName(KStandardAction::Save));
+ QAction *save = actionCollection()->action(KStandardAction::name(KStandardAction::Save));
if (!save)
return;
@@ -343,16 +343,14 @@
}
void KImageMapEditor::readConfig(const KConfigGroup &config) {
- KConfigGroup data = config;
- data.changeGroup( "Data" );
+ KConfigGroup data = config.parent().group( "Data" );
recentFilesAction->loadEntries( data );
}
void KImageMapEditor::writeConfig(KConfigGroup& config) {
config.writeEntry("highlightareas",highlightAreasAction->isChecked());
config.writeEntry("showalt",showAltAction->isChecked());
- KConfigGroup data = config;
- data.changeGroup( "Data" );
+ KConfigGroup data = config.parent().group( "Data" );
recentFilesAction->saveEntries( data );
saveLastURL(config);
@@ -386,7 +384,9 @@
int newHeight=group.readEntry("maximum-preview-height",50);
group = config()->group("General Options");
_commandHistory->setUndoLimit(group.readEntry("undo-level",100));
+#if 0
_commandHistory->setRedoLimit(group.readEntry("redo-level",100));
+#endif
Area::highlightArea = group.readEntry("highlightareas",true);
highlightAreasAction->setChecked(Area::highlightArea);
Area::showAlt = group.readEntry("showalt",true);
@@ -502,7 +502,9 @@
deleteAction->setEnabled(false);
// Edit Undo/Redo
- _commandHistory = new K3CommandHistory( actionCollection(), true);
+ _commandHistory = new KUndoStack(this);
+ _commandHistory->createUndoAction(actionCollection());
+ _commandHistory->createRedoAction(actionCollection());
// Edit Properties
areaPropertiesAction = new KAction(i18n("Pr&operties"), this);
@@ -2451,8 +2453,8 @@
copyArea= static_cast< AreaSelection* > (currentSelected->clone());
pasteAction->setEnabled(true);
- K3Command *command= new CutCommand(this,*currentSelected);
- commandHistory()->addCommand( command ,true);
+ QUndoCommand *command= new CutCommand(this,*currentSelected);
+ commandHistory()->push(command);
}
@@ -2461,8 +2463,8 @@
if ( 0 == currentSelected->count() )
return;
- K3Command *command= new DeleteCommand(this,*currentSelected);
- commandHistory()->addCommand( command ,true);
+ QUndoCommand *command= new DeleteCommand(this,*currentSelected);
+ commandHistory()->push(command);
}
void KImageMapEditor::slotCopy()
@@ -2488,7 +2490,7 @@
return;
AreaSelection *a=static_cast< AreaSelection* > (copyArea->clone());
- commandHistory()->addCommand( new PasteCommand(this,*a),true);
+ commandHistory()->push(new PasteCommand(this,*a));
delete a;
// addAreaAndEdit(a);
}
@@ -2572,8 +2574,8 @@
selected()->setMoving(true);
selected()->moveBy(0,-1);
- commandHistory()->addCommand(
- new MoveCommand( this, selected(), r.topLeft() ) ,true );
+ commandHistory()->push(
+ new MoveCommand( this, selected(), r.topLeft() ));
selected()->setMoving(false);
slotAreaChanged(selected());
slotUpdateSelectionCoords();
@@ -2585,8 +2587,8 @@
selected()->setMoving(true);
selected()->moveBy(0,1);
- commandHistory()->addCommand(
- new MoveCommand( this, selected(), r.topLeft() ) ,true );
+ commandHistory()->push(
+ new MoveCommand( this, selected(), r.topLeft() ));
selected()->setMoving(false);
slotAreaChanged(selected());
slotUpdateSelectionCoords();
@@ -2599,8 +2601,8 @@
selected()->setMoving(true);
selected()->moveBy(-1,0);
- commandHistory()->addCommand(
- new MoveCommand( this, selected(), r.topLeft() ) ,true );
+ commandHistory()->push(
+ new MoveCommand( this, selected(), r.topLeft() ));
selected()->setMoving(false);
slotAreaChanged(selected());
slotUpdateSelectionCoords();
@@ -2612,8 +2614,8 @@
selected()->setMoving(true);
selected()->moveBy(1,0);
- commandHistory()->addCommand(
- new MoveCommand( this, selected(), r.topLeft() ) ,true );
+ commandHistory()->push(
+ new MoveCommand( this, selected(), r.topLeft() ));
selected()->setMoving(false);
slotAreaChanged(selected());
slotUpdateSelectionCoords();
@@ -2634,8 +2636,8 @@
selected()->setRect(r);
- commandHistory()->addCommand(
- new ResizeCommand( this, selected(), oldArea ) ,true );
+ commandHistory()->push(
+ new ResizeCommand( this, selected(), oldArea ));
slotAreaChanged(selected());
slotUpdateSelectionCoords();
}
@@ -2650,8 +2652,8 @@
selected()->setRect(r);
- commandHistory()->addCommand(
- new ResizeCommand( this, selected(), oldArea ) ,true );
+ commandHistory()->push(
+ new ResizeCommand( this, selected(), oldArea ));
slotAreaChanged(selected());
slotUpdateSelectionCoords();
}
@@ -2665,8 +2667,8 @@
selected()->setRect(r);
- commandHistory()->addCommand(
- new ResizeCommand( this, selected(), oldArea ) ,true );
+ commandHistory()->push(
+ new ResizeCommand( this, selected(), oldArea ));
slotAreaChanged(selected());
slotUpdateSelectionCoords();
}
@@ -2680,8 +2682,8 @@
selected()->setRect(r);
- commandHistory()->addCommand(
- new ResizeCommand( this, selected(), oldArea ) ,true );
+ commandHistory()->push(
+ new ResizeCommand( this, selected(), oldArea ));
slotAreaChanged(selected());
slotUpdateSelectionCoords();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimagemapeditor.h new/kdewebdev-4.11.90/kimagemapeditor/kimagemapeditor.h
--- old/kdewebdev-4.11.2/kimagemapeditor/kimagemapeditor.h 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimagemapeditor.h 2013-08-27 16:32:45.000000000 +0200
@@ -115,7 +115,7 @@
class KRecentFilesAction;
class KAction;
///class QListViewItem;
-class K3CommandHistory;
+class KUndoStack;
class KApplication;
class QTabWidget;
class AreaListView;
@@ -176,7 +176,7 @@
AreaSelection* selected() const;
void setPicture(const QImage & pix);
int showTagEditor(Area *);
- K3CommandHistory *commandHistory() const;
+ KUndoStack *commandHistory() const;
KApplication* app() const;
@@ -318,7 +318,7 @@
QDockWidget* mapsDock;
QDockWidget* imagesDock;
- K3CommandHistory *_commandHistory;
+ KUndoStack *_commandHistory;
int maxAreaPreviewHeight;
QString cursorStatusText;
@@ -447,7 +447,7 @@
return _mapName;
}
-inline K3CommandHistory* KImageMapEditor::commandHistory() const {
+inline KUndoStack* KImageMapEditor::commandHistory() const {
return _commandHistory;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimearea.cpp new/kdewebdev-4.11.90/kimagemapeditor/kimearea.cpp
--- old/kdewebdev-4.11.2/kimagemapeditor/kimearea.cpp 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimearea.cpp 2013-08-27 16:48:10.000000000 +0200
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimecommands.cpp new/kdewebdev-4.11.90/kimagemapeditor/kimecommands.cpp
--- old/kdewebdev-4.11.2/kimagemapeditor/kimecommands.cpp 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimecommands.cpp 2013-08-27 16:32:45.000000000 +0200
@@ -23,7 +23,7 @@
#include "drawzone.h"
CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a)
- : K3NamedCommand(i18n( "Cut %1", a.typeString() ))
+ : QUndoCommand(i18n( "Cut %1", a.typeString() ))
{
_document=document;
_cutAreaSelection=new AreaSelection();
@@ -45,7 +45,7 @@
delete _cutAreaSelection;
}
-void CutCommand::execute()
+void CutCommand::redo()
{
// The Area won't be really delete
// it only gets removed from the AreaList
@@ -54,7 +54,7 @@
_cutted=true;
}
-void CutCommand::unexecute()
+void CutCommand::undo()
{
if (_document) {
_document->addArea( _cutAreaSelection );
@@ -67,11 +67,11 @@
DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a)
: CutCommand(document,a)
{
- setName(i18n( "Delete %1", a.typeString() ));
+ setText(i18n( "Delete %1", a.typeString() ));
}
PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a)
- : K3NamedCommand(i18n( "Paste %1", a.typeString() ))
+ : QUndoCommand(i18n( "Paste %1", a.typeString() ))
{
_document=document;
_pasteAreaSelection=new AreaSelection();
@@ -92,7 +92,7 @@
delete _pasteAreaSelection;
}
-void PasteCommand::execute()
+void PasteCommand::redo()
{
_document->deselectAll();
_document->addArea( _pasteAreaSelection );
@@ -101,7 +101,7 @@
_pasted=true;
}
-void PasteCommand::unexecute()
+void PasteCommand::undo()
{
_document->deleteArea(_pasteAreaSelection );
_pasted=false;
@@ -110,7 +110,7 @@
MoveCommand::MoveCommand (KImageMapEditor *document, AreaSelection * a, const QPoint & oldPoint)
- : K3NamedCommand(i18n( "Move %1", a->typeString() ))
+ : QUndoCommand(i18n( "Move %1", a->typeString() ))
{
_document=document;
_areaSelection=new AreaSelection();
@@ -126,7 +126,7 @@
delete _areaSelection;
}
-void MoveCommand::execute()
+void MoveCommand::redo()
{
// only for repainting reasons
Area* tempArea = _areaSelection->clone();
@@ -146,7 +146,7 @@
}
-void MoveCommand::unexecute()
+void MoveCommand::undo()
{
// only to erase the old Area
Area* tempArea = _areaSelection->clone();
@@ -166,7 +166,7 @@
ResizeCommand::ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
- :K3NamedCommand(i18n( "Resize %1", a->typeString() ))
+ :QUndoCommand(i18n( "Resize %1", a->typeString() ))
{
_areaSelection=new AreaSelection();
_areaSelection->setAreaList( a->getAreaList() );
@@ -183,7 +183,7 @@
delete _areaSelection;
}
-void ResizeCommand::execute()
+void ResizeCommand::redo()
{
_areaSelection->setArea ( *_newArea);
_areaSelection->setMoving(false);
@@ -194,7 +194,7 @@
}
-void ResizeCommand::unexecute()
+void ResizeCommand::undo()
{
_areaSelection->setArea ( *_oldArea);
_areaSelection->setMoving(false);
@@ -207,7 +207,7 @@
AddPointCommand::AddPointCommand (KImageMapEditor *document, AreaSelection *a, const QPoint & p)
- :K3NamedCommand(i18n( "Add point to %1", a->typeString() ))
+ :QUndoCommand(i18n( "Add point to %1", a->typeString() ))
{
if (a->type()!=Area::Polygon)
{
@@ -227,7 +227,7 @@
delete _areaSelection;
}
-void AddPointCommand::execute()
+void AddPointCommand::redo()
{
_coordpos = _areaSelection->addCoord(_point);
_areaSelection->setMoving(false);
@@ -235,7 +235,7 @@
_document->slotAreaChanged( _areaSelection );
}
-void AddPointCommand::unexecute()
+void AddPointCommand::undo()
{
// QRect *selectionPoint = _areaSelection->onSelectionPoint(_point);
Area* repaintArea = _areaSelection->clone();
@@ -251,7 +251,7 @@
RemovePointCommand::RemovePointCommand(KImageMapEditor *document,
AreaSelection *a, Area *oldArea)
- : K3NamedCommand(i18n( "Remove point from %1", a->typeString() ))
+ : QUndoCommand(i18n( "Remove point from %1", a->typeString() ))
{
if (a->type()!=Area::Polygon)
{
@@ -274,7 +274,7 @@
delete _areaSelection;
}
-void RemovePointCommand::execute()
+void RemovePointCommand::redo()
{
_areaSelection->setArea ( *_newArea);
_areaSelection->setMoving(false);
@@ -285,7 +285,7 @@
}
-void RemovePointCommand::unexecute()
+void RemovePointCommand::undo()
{
_areaSelection->setArea ( *_oldArea);
_areaSelection->setMoving(false);
@@ -298,7 +298,7 @@
CreateCommand::CreateCommand (KImageMapEditor *document, Area *area)
- : K3NamedCommand(i18n( "Create %1", area->typeString() ))
+ : QUndoCommand(i18n( "Create %1", area->typeString() ))
{
_document=document;
_area=area;
@@ -313,7 +313,7 @@
delete _area;
}
-void CreateCommand::execute()
+void CreateCommand::redo()
{
if (_document) {
@@ -331,7 +331,7 @@
}
-void CreateCommand::unexecute()
+void CreateCommand::undo()
{
if (_document) {
_document->deleteArea( _area );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimecommands.h new/kdewebdev-4.11.90/kimagemapeditor/kimecommands.h
--- old/kdewebdev-4.11.2/kimagemapeditor/kimecommands.h 2013-06-28 18:53:47.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimecommands.h 2013-08-27 16:32:45.000000000 +0200
@@ -19,7 +19,7 @@
#define KIMECOMMANDS_H
-#include
+#include
#include
@@ -28,15 +28,15 @@
-class CutCommand : public K3NamedCommand
+class CutCommand : public QUndoCommand
{
public:
CutCommand (KImageMapEditor * document, const AreaSelection & selection);
virtual ~CutCommand();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
AreaSelection *_cutAreaSelection;
@@ -54,14 +54,14 @@
DeleteCommand (KImageMapEditor * document, const AreaSelection & selection);
};
-class PasteCommand : public K3NamedCommand
+class PasteCommand : public QUndoCommand
{
public:
PasteCommand (KImageMapEditor * document, const AreaSelection & selection);
~PasteCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
AreaSelection *_pasteAreaSelection;
@@ -71,14 +71,14 @@
};
-class MoveCommand : public K3NamedCommand
+class MoveCommand : public QUndoCommand
{
public:
MoveCommand (KImageMapEditor *document, AreaSelection *a,const QPoint & oldPoint);
~MoveCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
QPoint _newPoint;
@@ -89,14 +89,14 @@
//- Area *_oldArea;
};
-class ResizeCommand : public K3NamedCommand
+class ResizeCommand : public QUndoCommand
{
public:
ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea);
~ResizeCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
@@ -106,14 +106,14 @@
Area *_newArea;
};
-class AddPointCommand : public K3NamedCommand
+class AddPointCommand : public QUndoCommand
{
public:
AddPointCommand (KImageMapEditor *document, AreaSelection *a, const QPoint & p);
~AddPointCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
@@ -123,14 +123,14 @@
int _coordpos;
};
-class RemovePointCommand : public K3NamedCommand
+class RemovePointCommand : public QUndoCommand
{
public:
RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea);
~RemovePointCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
@@ -141,14 +141,14 @@
};
-class CreateCommand : public K3NamedCommand
+class CreateCommand : public QUndoCommand
{
public:
CreateCommand (KImageMapEditor *document, Area *area);
~CreateCommand ();
- virtual void execute();
- virtual void unexecute();
+ virtual void redo();
+ virtual void undo();
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/kimagemapeditor/kimedialogs.cpp new/kdewebdev-4.11.90/kimagemapeditor/kimedialogs.cpp
--- old/kdewebdev-4.11.2/kimagemapeditor/kimedialogs.cpp 2013-08-28 18:52:38.000000000 +0200
+++ new/kdewebdev-4.11.90/kimagemapeditor/kimedialogs.cpp 2013-08-27 16:48:10.000000000 +0200
@@ -17,14 +17,12 @@
// QT
#include
-#include
#include
#include
#include
#include <QListWidget>
#include <QTableWidget>
#include <QHeaderView>
-#include
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebdev-4.11.2/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop new/kdewebdev-4.11.90/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop
--- old/kdewebdev-4.11.2/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop 2013-08-28 18:52:39.000000000 +0200
+++ new/kdewebdev-4.11.90/klinkstatus/src/plugins/scripting/krossmoduleklinkstatus.desktop 2013-10-09 06:06:39.000000000 +0200
@@ -3,7 +3,7 @@
Name[bg]=Приставка за скриптове
Name[bs]=Dodatak za skriptanje
Name[ca]=Connector per scripts
-Name[ca@valencia]=Connector d'scripting
+Name[ca@valencia]=Connector per scripts
Name[cs]=Skriptovací modul
Name[da]=Scripting-plugin
Name[de]=Skript-Modul
@@ -47,7 +47,7 @@
Comment[bg]=Позволява изпълнение на скриптове
Comment[bs]=Dozvoli izvršenje skripti
Comment[ca]=Permet l'execució d'scripts
-Comment[ca@valencia]=Permet l'execució de guions (scripts)
+Comment[ca@valencia]=Permet l'execució d'scripts
Comment[cs]=Umožní spouštění skriptů
Comment[da]=Tillad afvikling af scripts
Comment[de]=Ausführung von Skripten erlauben
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org