Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent 0b4a3f1e23
commit a81a3f2a9c
  1. 2
      ChangeLog
  2. 4
      libkipi/libkipi/imagedialog.cpp
  3. 4
      libkipi/libkipi/plugin.cpp
  4. 4
      libkipi/libkipi/plugin.h

@ -1099,7 +1099,7 @@ v0.1.0 2004-09-06
The basic point of all this was that the
KIPI::Plugin::actionCollection() needed to know about the plugins
KInstance - as it was till this change, it got the KInstance for
TDEInstance - as it was till this change, it got the TDEInstance for
the host application, and would thus look for icons in the host
applications directory.

@ -124,11 +124,11 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
// About data and help button.
KAboutData* about = new KAboutData("kipiplugins",
TDEAboutData* about = new TDEAboutData("kipiplugins",
I18N_NOOP("Image selector dialog"),
kipi_version,
I18N_NOOP("A Kipi dialog for image selection"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2004,2005, Kipi development team",
0,
"http://extragear.kde.org/apps/kipi");

@ -37,13 +37,13 @@
struct KIPI::Plugin::Private {
TQMap<TQWidget*, KActionCollection*> m_actionCollection;
KInstance* m_instance;
TDEInstance* m_instance;
TQMap<TQWidget*, KActionPtrList> m_actions;
TQWidget* m_defaultWidget;
};
KIPI::Plugin::Plugin( KInstance* instance, TQObject *parent, const char* name)
KIPI::Plugin::Plugin( TDEInstance* instance, TQObject *parent, const char* name)
: TQObject( parent, name)
{
d=new Private;

@ -37,7 +37,7 @@
#include "libkipi/libkipi_export.h"
class KInstance;
class TDEInstance;
/** @namespace KIPI */
namespace KIPI
@ -56,7 +56,7 @@ namespace KIPI
class LIBKIPI_EXPORT Plugin : public TQObject
{
public:
Plugin( KInstance* instance, TQObject *parent, const char* name);
Plugin( TDEInstance* instance, TQObject *parent, const char* name);
virtual ~Plugin();
virtual void setup( TQWidget* widget ) = 0;

Loading…
Cancel
Save