diff options
author | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
---|---|---|
committer | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
commit | bd9e6617827818fd043452c08c606f07b78014a0 (patch) | |
tree | 425bb4c3168f9c02f10150f235d2cb998dcc6108 /kompare/interfaces | |
download | tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.tar.gz tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.zip |
Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.
BUG:215923
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kompare/interfaces')
-rw-r--r-- | kompare/interfaces/Makefile.am | 8 | ||||
-rw-r--r-- | kompare/interfaces/kompareinterface.cpp | 60 | ||||
-rw-r--r-- | kompare/interfaces/kompareinterface.h | 105 |
3 files changed, 173 insertions, 0 deletions
diff --git a/kompare/interfaces/Makefile.am b/kompare/interfaces/Makefile.am new file mode 100644 index 00000000..ab8f9b93 --- /dev/null +++ b/kompare/interfaces/Makefile.am @@ -0,0 +1,8 @@ +INCLUDES = $(all_includes) + +lib_LTLIBRARIES = libkompareinterface.la + +libkompareinterface_la_LDFLAGS = -no-undefined $(all_libraries) +libkompareinterface_la_SOURCES = kompareinterface.cpp +libkompareinterface_la_LIBADD = $(LIB_QT) + diff --git a/kompare/interfaces/kompareinterface.cpp b/kompare/interfaces/kompareinterface.cpp new file mode 100644 index 00000000..1522bad0 --- /dev/null +++ b/kompare/interfaces/kompareinterface.cpp @@ -0,0 +1,60 @@ +// Blah blah standard LGPL license +// Copyright 2002-2004, Otto Bruggeman <otto.bruggeman@home.nl> + +#include "kompareinterface.h" + +class KompareInterfacePrivate +{ +public: + KompareInterfacePrivate(); + ~KompareInterfacePrivate(); + KompareInterfacePrivate( const KompareInterfacePrivate& ); + KompareInterfacePrivate& operator=( const KompareInterfacePrivate& ); + +protected: + // Add all variables for the KompareInterface class here and access them through the kip pointer +}; + +KompareInterfacePrivate::KompareInterfacePrivate() +{ +} + +KompareInterfacePrivate::~KompareInterfacePrivate() +{ +} + +KompareInterfacePrivate::KompareInterfacePrivate( const KompareInterfacePrivate& /*kip*/ ) +{ +} + +KompareInterfacePrivate& KompareInterfacePrivate::operator=(const KompareInterfacePrivate& /*kip*/ ) +{ + return *this; +} + +KompareInterface::KompareInterface() +{ + kip = new KompareInterfacePrivate(); +} + +KompareInterface::~KompareInterface() +{ + delete kip; +} + +KompareInterface::KompareInterface( const KompareInterface& ki ) +{ + kip = new KompareInterfacePrivate( *(ki.kip) ); +} + +KompareInterface& KompareInterface::operator=( const KompareInterface& ki ) +{ + kip = ki.kip; + return *this; +} + +void KompareInterface::setEncoding( const QString& encoding ) +{ + m_encoding = encoding; +} + diff --git a/kompare/interfaces/kompareinterface.h b/kompare/interfaces/kompareinterface.h new file mode 100644 index 00000000..b9c0fcda --- /dev/null +++ b/kompare/interfaces/kompareinterface.h @@ -0,0 +1,105 @@ +// blah blah standard LGPL license +// Copyright 2002-2003, Otto Bruggeman <otto.bruggeman@home.nl> + +#ifndef _KOMPARE_INTERFACE_H +#define _KOMPARE_INTERFACE_H + +#include <qstring.h> +#include <qstringlist.h> +#include <kdemacros.h> + +class KConfig; +class KURL; + +class KompareInterfacePrivate; + +class KDE_EXPORT KompareInterface +{ +public: + KompareInterface(); + virtual ~KompareInterface(); + +protected: + KompareInterface( const KompareInterface& ); + KompareInterface& operator=(const KompareInterface& ); + +public: + /** + * Open and parse the diff file at url. + */ + virtual bool openDiff( const KURL& diffUrl ) = 0; + + /** + * Open and parse the supplied diff output + */ + virtual bool openDiff( const QString& diffOutput ) = 0; + + /** + * Open and parse the diff3 file at url. + */ + virtual bool openDiff3( const KURL& diff3Url ) = 0; + + /** + * Open and parse the supplied diff3 output + */ + virtual bool openDiff3( const QString& diff3Output ) = 0; + + /** + * Compare, with diff, source with destination, can also be used if you dont + * know what source and destination are. The part will try to figure out what + * they are (directory, file, diff output file) and call the + * appropriate method(s) + */ + virtual void compare( const KURL& sourceFile, const KURL& destinationFile ) = 0; + + /** + * Compare, with diff, source with destination files + */ + virtual void compareFiles( const KURL& sourceFile, const KURL& destinationFile ) = 0; + + /** + * Compare, with diff, source with destination directories + */ + virtual void compareDirs ( const KURL& sourceDir, const KURL& destinationDir ) = 0; + + /** + * Compare, with diff3, originalFile with changedFile1 and changedFile2 + */ + virtual void compare3Files( const KURL& originalFile, const KURL& changedFile1, const KURL& changedFile2 ) = 0; + + /** + * This will show the file and the file with the diff applied + */ + virtual void openFileAndDiff( const KURL& file, const KURL& diffFile ) = 0; + + /** + * This will show the directory and the directory with the diff applied + */ + virtual void openDirAndDiff ( const KURL& dir, const KURL& diffFile ) = 0; + + /** + * This will set the encoding to use for all files that are read or for the diffoutput + */ + virtual void setEncoding( const QString& encoding ); + +public: + /** + * Warning this should be in class Part in KDE 4.0, not here ! + * Around that time the methods will disappear here + */ + virtual int readProperties( KConfig* config ) = 0; + virtual int saveProperties( KConfig* config ) = 0; + + /** + * Warning this should be in class ReadWritePart in KDE 4.0, not here ! + * Around that time the method will disappear here + */ + virtual bool queryClose() = 0; + +protected: + // Add all variables to the KompareInterfacePrivate class and access them through the kip pointer + KompareInterfacePrivate* kip; + QString m_encoding; +}; + +#endif /* _KOMPARE_INTERFACE_H */ |