Commit f9dd89b1 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Rename the old dcop interfaces to something approaching a standard preparatory

to adding new dcop interfaces.

svn path=/trunk/koffice/; revision=443981
parent a18ddeb7
......@@ -37,8 +37,8 @@ libkritacore_la_SOURCES = kis_color.cc kis_paint_device.cc kis_layer.cc \
kis_painter.cc kis_fill_painter.cc kis_gradient_painter.cc \
kis_convolution_painter.cc kis_cursor.cc kis_selection.cc kis_command.cc kis_background.cc \
kis_config.cc kis_canvas_observer.cc kis_transaction.cc \
kis_selected_transaction.cc kis_vec.cc kis_rect.cc kis_iterators_pixel.cc KRayonViewIface.cc \
KRayonViewIface.skel KIsDocIface.cc KIsDocIface.skel KIsImageIface.cc KIsImageIface.skel \
kis_selected_transaction.cc kis_vec.cc kis_rect.cc kis_iterators_pixel.cc kis_view_iface.cc \
kis_view_iface.skel kis_doc_iface.cc kis_doc_iface.skel kis_image_iface.cc kis_image_iface.skel \
kis_selection_manager.cc kis_scale_visitor.cc kis_transform_visitor.cc kis_rotate_visitor.cc \
kis_clipboard.cc kis_filter.cc kis_filter_registry.cc kis_filter_strategy.cc \
kis_composite_op.cc kis_part_layer.cc kis_filter_manager.cc kis_tool_manager.cc
......@@ -48,7 +48,7 @@ noinst_HEADERS = kis_paint_device.h kis_layer.h kis_image.h kis_doc.h \
kis_view.h kis_factory.h kis_nameserver.h kis_cursor.h kis_selection.h \
kis_command.h kis_background.h kis_global.h kis_config.h kis_canvas_subject.h \
kis_canvas_controller.h kis_canvas_observer.h kis_transaction.h kis_vec.h kis_rect.h \
kis_iteratorpixeltrait.h kis_iterators_pixel.h KRayonViewIface.h KIsDocIface.h KIsImageIface.h \
kis_iteratorpixeltrait.h kis_iterators_pixel.h kis_view_iface.h kis_doc_iface.h kis_image_iface.h \
kis_matrix.h kis_selection_manager.h kis_scale_visitor.h kis_rotate_visitor.h \
kis_filter.h kis_filter_registry.h kis_composite_op.h kis_part_layer.h \
kis_filter_manager.h kis_tool_manager.h
......
......@@ -70,7 +70,7 @@
#include "kis_profile.h"
#include "kis_id.h"
#include "kis_part_layer.h"
#include "KIsDocIface.h"
#include "kis_doc_iface.h"
static const char *CURRENT_DTD_VERSION = "1.3";
......@@ -151,7 +151,7 @@ QCString KisDoc::mimeType() const
DCOPObject *KisDoc::dcopObject()
{
if (!m_dcop) {
m_dcop = new KIsDocIface(this);
m_dcop = new KisDocIface(this);
Q_CHECK_PTR(m_dcop);
}
return m_dcop;
......
......@@ -16,22 +16,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "KIsDocIface.h"
#include "kis_doc_iface.h"
#include <kapplication.h>
#include "kis_doc.h"
#include <dcopclient.h>
KIsDocIface::KIsDocIface( KisDoc *doc_ )
KisDocIface::KisDocIface( KisDoc *doc_ )
: KoDocumentIface( doc_ )
{
m_doc = doc_;
}
DCOPRef KIsDocIface::image()
DCOPRef KisDocIface::currentImage()
{
KisImage *img=0;//XXX
KisImage *img = m_doc->currentImage();
if( !img )
return DCOPRef();
else
......@@ -40,27 +40,27 @@ DCOPRef KIsDocIface::image()
}
int KIsDocIface::undoLimit () const
int KisDocIface::undoLimit () const
{
return m_doc->undoLimit();
}
void KIsDocIface::setUndoLimit(int limit)
void KisDocIface::setUndoLimit(int limit)
{
m_doc->setUndoLimit(limit);
}
int KIsDocIface::redoLimit() const
int KisDocIface::redoLimit() const
{
return m_doc->redoLimit();
}
void KIsDocIface::setRedoLimit(int limit)
void KisDocIface::setRedoLimit(int limit)
{
m_doc->setRedoLimit(limit);
}
void KIsDocIface::renameImage(const QString& oldName, const QString& newName)
void KisDocIface::renameImage(const QString& oldName, const QString& newName)
{
m_doc->renameImage(oldName,newName);
}
......@@ -26,13 +26,13 @@
class KisDoc;
class KIsDocIface : virtual public KoDocumentIface
class KisDocIface : virtual public KoDocumentIface
{
K_DCOP
public:
KIsDocIface( KisDoc *doc_ );
KisDocIface( KisDoc *doc_ );
k_dcop:
virtual DCOPRef image();
virtual DCOPRef currentImage();
virtual int undoLimit () const;
virtual void setUndoLimit(int limit);
......
......@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <klocale.h>
#include "KIsImageIface.h"
#include "kis_image_iface.h"
#include "kis_command.h"
#include "kis_types.h"
......@@ -503,7 +503,7 @@ KisImage::KisImage(const KisImage& rhs) : QObject(), KShared(rhs)
DCOPObject *KisImage::dcopObject()
{
if (!m_dcop) {
m_dcop = new KIsImageIface(this);
m_dcop = new KisImageIface(this);
Q_CHECK_PTR(m_dcop);
}
return m_dcop;
......
......@@ -18,39 +18,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "KIsImageIface.h"
#include "kis_image_iface.h"
#include "kis_image.h"
#include <dcopclient.h>
KIsImageIface::KIsImageIface( KisImage *img_ )
KisImageIface::KisImageIface( KisImage *img_ )
: DCOPObject()
{
m_img = img_;
}
QString KIsImageIface::name()const
QString KisImageIface::name()const
{
return m_img->name();
}
int KIsImageIface::height() const
int KisImageIface::height() const
{
return m_img->height();
}
int KIsImageIface::width() const
int KisImageIface::width() const
{
return m_img->width();
}
bool KIsImageIface::empty() const
bool KisImageIface::empty() const
{
return m_img->empty();
}
void KIsImageIface::setName(const QString& name)
void KisImageIface::setName(const QString& name)
{
m_img->setName( name );
}
......
......@@ -26,11 +26,11 @@
class KisImage;
class KIsImageIface : virtual public DCOPObject
class KisImageIface : virtual public DCOPObject
{
K_DCOP
public:
KIsImageIface( KisImage *img_ );
KisImageIface( KisImage *img_ );
k_dcop:
QString name()const;
int height() const;
......
......@@ -103,7 +103,7 @@
#include "kis_types.h"
#include "kis_undo_adapter.h"
#include "kis_view.h"
#include "KRayonViewIface.h"
#include "kis_view_iface.h"
#include "labels/kis_label_cursor_pos.h"
#include "labels/kis_label_progress.h"
#include "strategy/kis_strategy_move.h"
......@@ -300,7 +300,7 @@ void KisView::createToolBox()
DCOPObject* KisView::dcopObject()
{
if (!m_dcop) {
m_dcop = new KRayonViewIface(this);
m_dcop = new KisViewIface(this);
Q_CHECK_PTR(m_dcop);
}
return m_dcop;
......
......@@ -18,95 +18,95 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "KRayonViewIface.h"
#include "kis_view_iface.h"
#include "kis_view.h"
#include <dcopclient.h>
KRayonViewIface::KRayonViewIface( KisView *view_ )
KisViewIface::KisViewIface( KisView *view_ )
: KoViewIface( view_ )
{
m_view = view_;
}
void KRayonViewIface::copy()
void KisViewIface::copy()
{
// m_view->copy();
}
void KRayonViewIface::cut()
void KisViewIface::cut()
{
// m_view->cut();
}
void KRayonViewIface::removeSelection()
void KisViewIface::removeSelection()
{
// m_view->removeSelection();
}
void KRayonViewIface::paste()
void KisViewIface::paste()
{
// m_view->paste();
}
void KRayonViewIface::copySelectionToNewLayer()
void KisViewIface::copySelectionToNewLayer()
{
// m_view->copySelectionToNewLayer();
}
void KRayonViewIface::selectAll()
void KisViewIface::selectAll()
{
// m_view->selectAll();
}
void KRayonViewIface::unSelectAll()
void KisViewIface::unSelectAll()
{
// m_view->unSelectAll();
}
void KRayonViewIface::next_layer()
void KisViewIface::next_layer()
{
m_view->next_layer();
}
void KRayonViewIface::previous_layer()
void KisViewIface::previous_layer()
{
m_view->previous_layer();
}
void KRayonViewIface::slotImportImage()
void KisViewIface::slotImportImage()
{
}
void KRayonViewIface::preferences()
void KisViewIface::preferences()
{
m_view->preferences();
}
void KRayonViewIface::rotateLayer180()
void KisViewIface::rotateLayer180()
{
m_view->rotateLayer180();
}
void KRayonViewIface::rotateLayerLeft90()
void KisViewIface::rotateLayerLeft90()
{
m_view->rotateLayerLeft90();
}
void KRayonViewIface::rotateLayerRight90()
void KisViewIface::rotateLayerRight90()
{
m_view->rotateLayerRight90();
}
void KRayonViewIface::mirrorLayerX()
void KisViewIface::mirrorLayerX()
{
m_view->mirrorLayerX();
}
void KRayonViewIface::mirrorLayerY()
void KisViewIface::mirrorLayerY()
{
m_view->mirrorLayerY();
}
......@@ -29,11 +29,11 @@ class KisView;
* This is the definition of the interface Krita presents to
* dcop.
*/
class KRayonViewIface : public KoViewIface
class KisViewIface : public KoViewIface
{
K_DCOP
public:
KRayonViewIface( KisView *view_ );
KisViewIface( KisView *view_ );
k_dcop:
void copy();
void cut();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment