Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent da2af44884
commit 609724b5d2

@ -7,11 +7,11 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( TDEAboutData aboutData(
"atlantikdesigner", "atlantikdesigner",
I18N_NOOP("Atlantik Designer"), "1.1.0", I18N_NOOP("Atlantik Designer"), "1.1.0",
I18N_NOOP("Atlantik gameboard designer"), I18N_NOOP("Atlantik gameboard designer"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2002 Jason Katz-Brown"), I18N_NOOP("(c) 2002 Jason Katz-Brown"),
0, 0,
"http://www.unixcode.org/atlantik/" "http://www.unixcode.org/atlantik/"

@ -58,7 +58,7 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" );
act->setCheckedState(i18n("Show Symbols")); act->setCheckedState(i18n("Show Symbols"));
setInstance (new KInstance("kate")); setInstance (new TDEInstance("kate"));
setXMLFile("plugins/katecppsymbolviewer/ui.rc"); setXMLFile("plugins/katecppsymbolviewer/ui.rc");
w->guiFactory()->addClient (this); w->guiFactory()->addClient (this);
win = w; win = w;

@ -91,7 +91,7 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win)
this, TQT_SLOT( slotSaveListAs() ), this, TQT_SLOT( slotSaveListAs() ),
view->actionCollection(), "file_kfllsaveas" ); view->actionCollection(), "file_kfllsaveas" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile( "plugins/katefll/ui.rc" ); view->setXMLFile( "plugins/katefll/ui.rc" );
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -90,7 +90,7 @@ extern "C"
KatePluginFactory::KatePluginFactory() KatePluginFactory::KatePluginFactory()
{ {
s_instance = new KInstance( "kate" ); s_instance = new TDEInstance( "kate" );
} }
KatePluginFactory::~KatePluginFactory() KatePluginFactory::~KatePluginFactory()
@ -103,7 +103,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c
return new KateFileTemplates( parent, name ); return new KateFileTemplates( parent, name );
} }
KInstance* KatePluginFactory::s_instance = 0L; TDEInstance* KatePluginFactory::s_instance = 0L;
//END //END
//BEGIN TemplateInfo //BEGIN TemplateInfo
@ -127,7 +127,7 @@ class TemplateInfo
//BEGIN KateFileTemplates //BEGIN KateFileTemplates
KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
: Kate::Plugin ( (Kate::Application*)parent, name ), : Kate::Plugin ( (Kate::Application*)parent, name ),
m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) m_actionCollection( new KActionCollection( this, "template_actions", new TDEInstance("kate") ) )
{ {
// create actions, so that they are shared. // create actions, so that they are shared.
// We plug them into each view's menus, and update them centrally, so that // We plug them into each view's menus, and update them centrally, so that
@ -256,7 +256,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win)
view->actionCollection(), "file_new_fromtemplate" ); view->actionCollection(), "file_new_fromtemplate" );
refreshMenu( view ); refreshMenu( view );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/katefiletemplates/ui.rc"); view->setXMLFile("plugins/katefiletemplates/ui.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -48,7 +48,7 @@ class KatePluginFactory : public KLibFactory
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
/** /**

@ -34,7 +34,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win)
TQT_SLOT( slotInsertHello() ), view->actionCollection(), TQT_SLOT( slotInsertHello() ), view->actionCollection(),
"edit_insert_helloworld" ); "edit_insert_helloworld" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/katehelloworld/ui.rc"); view->setXMLFile("plugins/katehelloworld/ui.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -53,7 +53,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win)
(void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, (void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this,
TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile( "plugins/katehtmltools/ui.rc" ); view->setXMLFile( "plugins/katehtmltools/ui.rc" );
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -87,7 +87,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win)
TQT_SLOT( slotInsertCommand() ), view->actionCollection(), TQT_SLOT( slotInsertCommand() ), view->actionCollection(),
"edit_insert_command" ); "edit_insert_command" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/kateinsertcommand/ui.rc"); view->setXMLFile("plugins/kateinsertcommand/ui.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -342,7 +342,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win)
if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl; if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl;
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname));
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
} }

@ -38,7 +38,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w)
"python_update_pybrowse" ); "python_update_pybrowse" );
//set up the menus //set up the menus
setInstance(new KInstance("kate")); setInstance(new TDEInstance("kate"));
setXMLFile( "plugins/katepybrowse/ui.rc" ); setXMLFile( "plugins/katepybrowse/ui.rc" );
win->guiFactory()->addClient(this); win->guiFactory()->addClient(this);

@ -349,7 +349,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ),
actionCollection(), "make_settings" ); actionCollection(), "make_settings" );
setInstance(new KInstance("kate")); setInstance(new TDEInstance("kate"));
setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc"));

@ -59,7 +59,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win)
this, TQT_SLOT(applyModeline()), this, TQT_SLOT(applyModeline()),
view->actionCollection(), "edit_apply_modeline" ); view->actionCollection(), "edit_apply_modeline" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile( "plugins/katemodeline/ui.rc" ); view->setXMLFile( "plugins/katemodeline/ui.rc" );
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -54,7 +54,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win)
this, TQT_SLOT( slotOpenHeader() ), this, TQT_SLOT( slotOpenHeader() ),
view->actionCollection(), "file_openheader" ); view->actionCollection(), "file_openheader" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile( "plugins/kateopenheader/ui.rc" ); view->setXMLFile( "plugins/kateopenheader/ui.rc" );
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY(katesnippetsplugin, KGenericFactory<KatePluginSnippet
KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *dock) : CWidgetSnippets(dock,"snippetswidget") KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *dock) : CWidgetSnippets(dock,"snippetswidget")
, dock (dock) , dock (dock)
{ {
setInstance (new KInstance("kate")); setInstance (new TDEInstance("kate"));
setXMLFile("plugins/katesnippets/plugin_katesnippets.rc"); setXMLFile("plugins/katesnippets/plugin_katesnippets.rc");
w->guiFactory()->addClient (this); w->guiFactory()->addClient (this);

@ -64,7 +64,7 @@ extern "C"
KatePluginFactory::KatePluginFactory() KatePluginFactory::KatePluginFactory()
{ {
s_instance = new KInstance( "kate" ); s_instance = new TDEInstance( "kate" );
} }
KatePluginFactory::~KatePluginFactory() KatePluginFactory::~KatePluginFactory()
@ -78,7 +78,7 @@ TQObject* KatePluginFactory::createObject(
return new KatePluginTabBarExtension( parent, name ); return new KatePluginTabBarExtension( parent, name );
} }
KInstance* KatePluginFactory::s_instance = 0L; TDEInstance* KatePluginFactory::s_instance = 0L;
// BEGIN KatePluginTabBarExtension // BEGIN KatePluginTabBarExtension
KatePluginTabBarExtension::KatePluginTabBarExtension( KatePluginTabBarExtension::KatePluginTabBarExtension(
@ -112,7 +112,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
new KWidgetAction(view->tabbar, "tab_bar_widget", new KWidgetAction(view->tabbar, "tab_bar_widget",
KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget");
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/katetabbarextension/ui.rc"); view->setXMLFile("plugins/katetabbarextension/ui.rc");
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -71,7 +71,7 @@ class KatePluginFactory : public KLibFactory
const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
/** /**

@ -66,7 +66,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win)
(void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, (void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this,
TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" );
view->setInstance (new KInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile( "plugins/katetextfilter/ui.rc" ); view->setXMLFile( "plugins/katetextfilter/ui.rc" );
win->guiFactory()->addClient (view); win->guiFactory()->addClient (view);
view->win = win; view->win = win;

@ -105,7 +105,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
//(void) new KAction ( i18n("Indent XML"), 0, this, //(void) new KAction ( i18n("Indent XML"), 0, this,
// TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" );
setInstance(new KInstance("kate")); setInstance(new TDEInstance("kate"));
setXMLFile("plugins/katexmlcheck/ui.rc"); setXMLFile("plugins/katexmlcheck/ui.rc");
@ -299,7 +299,7 @@ bool PluginKateXMLCheckView::slotValidate()
// use catalogs for KDE docbook: // use catalogs for KDE docbook:
if( ! getenv("SGML_CATALOG_FILES") ) { if( ! getenv("SGML_CATALOG_FILES") ) {
KInstance ins("katexmlcheckplugin"); TDEInstance ins("katexmlcheckplugin");
TQString catalogs; TQString catalogs;
catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog");
catalogs += ":"; catalogs += ":";

@ -156,7 +156,7 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win )
( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this, ( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this,
TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" );
view->setInstance( new KInstance("kate") ); view->setInstance( new TDEInstance("kate") );
view->setXMLFile( "plugins/katexmltools/ui.rc" ); view->setXMLFile( "plugins/katexmltools/ui.rc" );
win->guiFactory()->addClient( view ); win->guiFactory()->addClient( view );

@ -62,14 +62,14 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
: KPanelApplet(configFile, type, actions, parent, name), : KPanelApplet(configFile, type, actions, parent, name),
m_picking(0) m_picking(0)
{ {
KAboutData *about = new KAboutData("kolourpicker", TDEAboutData *about = new TDEAboutData("kolourpicker",
I18N_NOOP("Color Picker"), I18N_NOOP("Color Picker"),
"v0.1", "v0.1",
I18N_NOOP("An applet to pick color values from anywhere on the screen"), I18N_NOOP("An applet to pick color values from anywhere on the screen"),
KAboutData::License_GPL_V2, TDEAboutData::License_GPL_V2,
"(c) 2001 Malte Starostik"); "(c) 2001 Malte Starostik");
about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "malte@kde.org"); about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "malte@kde.org");
m_instance = new KInstance(about); m_instance = new TDEInstance(about);
KConfig *conf = config(); KConfig *conf = config();
conf->setGroup("General"); conf->setGroup("General");

@ -28,7 +28,7 @@
#include "simplebutton.h" #include "simplebutton.h"
class KInstance; class TDEInstance;
class TQPopupMenu; class TQPopupMenu;
class KolourPicker : public KPanelApplet class KolourPicker : public KPanelApplet
@ -59,7 +59,7 @@ private:
void arrangeButtons(); void arrangeButtons();
void setClipboard(const TQString& text); void setClipboard(const TQString& text);
KInstance *m_instance; TDEInstance *m_instance;
bool m_picking; bool m_picking;
SimpleButton *m_historyButton, *m_colourButton; SimpleButton *m_historyButton, *m_colourButton;
TQValueList<TQColor> m_history; TQValueList<TQColor> m_history;

@ -94,12 +94,12 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
TQWidget *parent, const char *name) TQWidget *parent, const char *name)
: DCOPObject("MediaControl"), : DCOPObject("MediaControl"),
KPanelApplet(configFile, t, actions, parent, name), KPanelApplet(configFile, t, actions, parent, name),
mInstance(new KInstance("mediacontrol")), mInstance(new TDEInstance("mediacontrol")),
mAboutData(new KAboutData("mediacontrol", mAboutData(new TDEAboutData("mediacontrol",
I18N_NOOP("MediaControl"), I18N_NOOP("MediaControl"),
MEDIACONTROL_VERSION, MEDIACONTROL_VERSION,
I18N_NOOP("A small control-applet for various media players"), I18N_NOOP("A small control-applet for various media players"),
KAboutData::License_GPL_V2, TDEAboutData::License_GPL_V2,
"(c) 2001-2004 Stefan Gehn", "(c) 2001-2004 Stefan Gehn",
0, 0,
"http://metz.gehn.net")) "http://metz.gehn.net"))

@ -43,9 +43,9 @@
class MCSlider; class MCSlider;
class KPopupMenu; class KPopupMenu;
class KInstance; class TDEInstance;
class MediaControlConfig; class MediaControlConfig;
class KAboutData; class TDEAboutData;
class MediaControlToolTip; class MediaControlToolTip;
// ============================================================================= // =============================================================================
@ -84,8 +84,8 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
void reportBug(); void reportBug();
private: private:
KInstance *mInstance; TDEInstance *mInstance;
KAboutData *mAboutData; TDEAboutData *mAboutData;
DCOPClient *_dcopClient; DCOPClient *_dcopClient;
PlayerInterface *_player; PlayerInterface *_player;
ConfigFrontend *_configFrontend; ConfigFrontend *_configFrontend;

@ -11,7 +11,7 @@
#include <klibloader.h> #include <klibloader.h>
class KURL; class KURL;
class KInstance; class TDEInstance;
class TQTimer; class TQTimer;
/** /**

@ -31,7 +31,7 @@
#include <khtml_part.h> #include <khtml_part.h>
typedef KGenericFactory<PluginBabelFish> BabelFishFactory; typedef KGenericFactory<PluginBabelFish> BabelFishFactory;
static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" ); static const TDEAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) )
PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,

@ -83,12 +83,12 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
// FSViewPart // FSViewPart
KAboutData* FSViewPart::createAboutData() TDEAboutData* FSViewPart::createAboutData()
{ {
KAboutData* aboutData; TDEAboutData* aboutData;
aboutData = new KAboutData("fsview", I18N_NOOP("FSView"), "0.1.1", aboutData = new TDEAboutData("fsview", I18N_NOOP("FSView"), "0.1.1",
I18N_NOOP("Filesystem Utilization Viewer"), I18N_NOOP("Filesystem Utilization Viewer"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003-2005, Josef Weidendorfer")); I18N_NOOP("(c) 2003-2005, Josef Weidendorfer"));
return aboutData; return aboutData;
} }

@ -29,7 +29,7 @@
#include "fsview.h" #include "fsview.h"
class KAboutData; class TDEAboutData;
class KActionMenu; class KActionMenu;
class FSViewPart; class FSViewPart;
@ -93,7 +93,7 @@ public:
bool supportsUndo() const { return false; } bool supportsUndo() const { return false; }
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
FSView* view() const { return _view; } FSView* view() const { return _view; }
public slots: public slots:

@ -23,9 +23,9 @@ static KCmdLineOptions options[] =
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
// KDE compliant startup // KDE compliant startup
KAboutData aboutData("fsview", I18N_NOOP("FSView"), "0.1", TDEAboutData aboutData("fsview", I18N_NOOP("FSView"), "0.1",
I18N_NOOP("Filesystem Viewer"), I18N_NOOP("Filesystem Viewer"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2002, Josef Weidendorfer")); I18N_NOOP("(c) 2002, Josef Weidendorfer"));
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -35,7 +35,7 @@
#include "settingsplugin.h" #include "settingsplugin.h"
typedef KGenericFactory<SettingsPlugin> SettingsPluginFactory; typedef KGenericFactory<SettingsPlugin> SettingsPluginFactory;
static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" ); static const TDEAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin,
SettingsPluginFactory( &aboutdata ) ) SettingsPluginFactory( &aboutdata ) )

@ -36,8 +36,8 @@ K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
:KCModule(parent, name) :KCModule(parent, name)
{ {
KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
"0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL, "0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL,
"(c) 2001, Holger Freyther", 0, 0, "freyther@kde.org"); "(c) 2001, Holger Freyther", 0, 0, "freyther@kde.org");
ab->addAuthor("Holger Freyther",0, "freyther@kde.org"); ab->addAuthor("Holger Freyther",0, "freyther@kde.org");
setAboutData( ab ); setAboutData( ab );

@ -54,7 +54,7 @@ typedef KGenericFactory<RelLinksPlugin> RelLinksFactory;
#include <tdeversion.h> #include <tdeversion.h>
#if KDE_IS_VERSION(3,2,90) #if KDE_IS_VERSION(3,2,90)
#include <kaboutdata.h> #include <kaboutdata.h>
static const KAboutData aboutdata("rellinks", I18N_NOOP("Rellinks") , "1.0" ); static const TDEAboutData aboutdata("rellinks", I18N_NOOP("Rellinks") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory(&aboutdata) ) K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory(&aboutdata) )
#else #else
K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") )

@ -27,7 +27,7 @@
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *parent,
TQWidget *widgetParent, TQString &desktopName_, TQWidget *widgetParent, TQString &desktopName_,
const char* name ) const char* name )
: KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ),
@ -68,7 +68,7 @@ bool KonqSidebarDelicious::universalMode()
extern "C" extern "C"
{ {
KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, TQObject *par, TQWidget *widp, KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp,
TQString &desktopname, const char *name ) TQString &desktopname, const char *name )
{ {
KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" );

@ -43,7 +43,7 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject
// //
K_DCOP K_DCOP
public: public:
KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, KonqSidebarDelicious( TDEInstance * instance, TQObject * parent, TQWidget * widgetParent,
TQString & desktopName_, const char * name = 0 ); TQString & desktopName_, const char * name = 0 );
~KonqSidebarDelicious(); ~KonqSidebarDelicious();
virtual void * provides( const TQString & ); virtual void * provides( const TQString & );

@ -27,7 +27,7 @@
#include <kdemacros.h> #include <kdemacros.h>
#include "mediawidget.h" #include "mediawidget.h"
KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
{ {
widget=new KSB_MediaWidget(widgetParent); widget=new KSB_MediaWidget(widgetParent);
@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/)
extern "C" extern "C"
{ {
KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{ {
KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer");
return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name);

@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin
Q_OBJECT Q_OBJECT
public: public:
KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
~KonqSidebar_MediaPlayer(); ~KonqSidebar_MediaPlayer();
virtual void *provides(const TQString &); virtual void *provides(const TQString &);
void emitStatusBarText (const TQString &); void emitStatusBarText (const TQString &);

@ -7,7 +7,7 @@
#include "metabar.h" #include "metabar.h"
#include "metabar.moc" #include "metabar.moc"
Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
{ {
KImageIO::registerFormats(); KImageIO::registerFormats();
@ -52,7 +52,7 @@ extern "C" {
extern "C" extern "C"
{ {
void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) void* create_konqsidebar_metabar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{ {
return new Metabar(instance,par,widp,desktopname,name); return new Metabar(instance,par,widp,desktopname,name);
} }

@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin
public: public:
Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
~Metabar(); ~Metabar();
virtual TQWidget *getWidget(){ return widget; } virtual TQWidget *getWidget(){ return widget; }

@ -59,11 +59,11 @@ namespace KSB_News {
pages.setAutoDelete(TRUE); pages.setAutoDelete(TRUE);
// about dialog // about dialog
m_aboutdata = new KAboutData("konq_sidebarnews", m_aboutdata = new TDEAboutData("konq_sidebarnews",
I18N_NOOP("Newsticker"), I18N_NOOP("Newsticker"),
KDE::versionString(), KDE::versionString(),
I18N_NOOP("RSS Feed Viewer"), I18N_NOOP("RSS Feed Viewer"),
KAboutData::License_LGPL, TDEAboutData::License_LGPL,
I18N_NOOP("(c) 2002-2004, the Sidebar Newsticker developers")); I18N_NOOP("(c) 2002-2004, the Sidebar Newsticker developers"));
m_aboutdata->addAuthor("Marcus Camen", I18N_NOOP("Maintainer"), m_aboutdata->addAuthor("Marcus Camen", I18N_NOOP("Maintainer"),
"mcamen@mcamen.de"); "mcamen@mcamen.de");

@ -36,7 +36,7 @@ class TQVBoxLayout;
class TQPushButton; class TQPushButton;
class TQStringList; class TQStringList;
class KPopupMenu; class KPopupMenu;
class KAboutData; class TDEAboutData;
class KAboutApplication; class KAboutApplication;
class KBugReport; class KBugReport;
class KConfigDialog; class KConfigDialog;
@ -77,7 +77,7 @@ namespace KSB_News {
TQVBoxLayout *layout; TQVBoxLayout *layout;
TQWidget *currentPage; TQWidget *currentPage;
KPopupMenu *popup, *helpmenu; KPopupMenu *popup, *helpmenu;
KAboutData *m_aboutdata; TDEAboutData *m_aboutdata;
KAboutApplication *m_about; KAboutApplication *m_about;
KBugReport *m_bugreport; KBugReport *m_bugreport;
TQPushButton *m_last_button_rightclicked; TQPushButton *m_last_button_rightclicked;

@ -46,7 +46,7 @@
namespace KSB_News { namespace KSB_News {
KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, KonqSidebar_News::KonqSidebar_News(TDEInstance *inst, TQObject *parent,
TQWidget *widgetParent, TQWidget *widgetParent,
TQString &desktopName, const char* name) TQString &desktopName, const char* name)
: KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name),
@ -252,7 +252,7 @@ namespace KSB_News {
extern "C" { extern "C" {
KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par, KDE_EXPORT void* create_konq_sidebarnews(TDEInstance *instance, TQObject *par,
TQWidget *widp, TQWidget *widp,
TQString &desktopname, TQString &desktopname,
const char *name) { const char *name) {

@ -48,7 +48,7 @@ namespace KSB_News {
K_DCOP K_DCOP
public: public:
KonqSidebar_News(KInstance *instance, TQObject *parent, KonqSidebar_News(TDEInstance *instance, TQObject *parent,
TQWidget *widgetParent, TQString &desktopName_, TQWidget *widgetParent, TQString &desktopName_,
const char* name=0); const char* name=0);
~KonqSidebar_News(); ~KonqSidebar_News();

@ -42,7 +42,7 @@
#include "uachangerplugin.h" #include "uachangerplugin.h"
typedef KGenericFactory<UAChangerPlugin> UAChangerPluginFactory; typedef KGenericFactory<UAChangerPlugin> UAChangerPluginFactory;
static const KAboutData aboutdata("uachangerplugin", I18N_NOOP("Change Browser Identification") , "1.0" ); static const TDEAboutData aboutdata("uachangerplugin", I18N_NOOP("Change Browser Identification") , "1.0" );
K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutdata)) K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutdata))

@ -40,7 +40,7 @@
typedef KGenericFactory<PluginValidators> PluginValidatorsFactory; typedef KGenericFactory<PluginValidators> PluginValidatorsFactory;
static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Page") , "1.0" ); static const TDEAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Page") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin,
PluginValidatorsFactory( &aboutdata ) ) PluginValidatorsFactory( &aboutdata ) )

@ -36,8 +36,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData("ksig", I18N_NOOP("KSig"), TDEAboutData aboutData("ksig", I18N_NOOP("KSig"),
"1.1", description, KAboutData::License_GPL, "1.1", description, TDEAboutData::License_GPL,
"(c) 2002, Scott Wheeler", 0, 0, "wheeler@kde.org"); "(c) 2002, Scott Wheeler", 0, 0, "wheeler@kde.org");
aboutData.addAuthor("Scott Wheeler", 0, "wheeler@kde.org"); aboutData.addAuthor("Scott Wheeler", 0, "wheeler@kde.org");

@ -568,9 +568,9 @@ int main(int argc, char **argv)
runLock.lock(); runLock.lock();
#endif #endif
KAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1", TDEAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1",
I18N_NOOP("The awesome customizable scope"), I18N_NOOP("The awesome customizable scope"),
KAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0, TDEAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0,
"http://noatun.kde.org"); "http://noatun.kde.org");
aboutData.addAuthor("Charles Samuels", I18N_NOOP("Nex Author"), aboutData.addAuthor("Charles Samuels", I18N_NOOP("Nex Author"),

@ -178,7 +178,7 @@ void warning(const char *str, bool)
int main(void) int main(void)
{ {
KInstance in("noatunsynaescope"); TDEInstance in("noatunsynaescope");
core = new Core; core = new Core;

@ -160,7 +160,7 @@ void warning(const char *, bool)
int main() int main()
{ {
fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) & ~O_NONBLOCK); fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) & ~O_NONBLOCK);
KInstance in("noatunsynaescope"); TDEInstance in("noatunsynaescope");
core=new Core; core=new Core;
core->go(); core->go();
delete core; delete core;

@ -68,7 +68,7 @@ int main(int, char **)
atexit(SDL_Quit); atexit(SDL_Quit);
KInstance in("noatuntyler"); TDEInstance in("noatuntyler");
finished = false; finished = false;
access_mutex = SDL_CreateMutex(); access_mutex = SDL_CreateMutex();

Loading…
Cancel
Save