diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kopete/libkopete/ui | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/ui')
| -rw-r--r-- | kopete/libkopete/ui/kopete.widgets | 2 | ||||
| -rw-r--r-- | kopete/libkopete/ui/kopeteviewplugin.cpp | 2 | ||||
| -rw-r--r-- | kopete/libkopete/ui/kopeteviewplugin.h | 2 | ||||
| -rw-r--r-- | kopete/libkopete/ui/kopetewidgets.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 7c441d0f..bb4ee05f 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KopeteWidgets Includes=kinstance.h -Init=new KInstance("kopetewidgets"); +Init=new TDEInstance("kopetewidgets"); [Kopete::UI::ListView::ListView] ToolTip=List View (Kopete) diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index 843fe939..f0000998 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.cpp +++ b/kopete/libkopete/ui/kopeteviewplugin.cpp @@ -16,7 +16,7 @@ #include "kopeteviewplugin.h" -Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : +Kopete::ViewPlugin::ViewPlugin( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Plugin( instance, parent, name ) { diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index 25ce704b..9ebc57a6 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.h +++ b/kopete/libkopete/ui/kopeteviewplugin.h @@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin /** * @brief Create and initialize the plugin */ - ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); + ViewPlugin( TDEInstance *instance, TQObject *parent = 0L, const char *name = 0L ); /** * @brief Creates a view to be associated with the passed in session diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index a1d7d1e1..b7addd10 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -107,7 +107,7 @@ KopeteWidgets::KopeteWidgets() widget.isContainer = false; m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); - new KInstance("kopetewidgets"); + new TDEInstance("kopetewidgets"); } KopeteWidgets::~KopeteWidgets() { |