Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 11 years ago
parent 1e0a98b862
commit 1d061b286a

@ -68,10 +68,10 @@ void level1(int t)
int main(int argc, char *argv[])
{
KAboutData aboutData("crashtext", "Crash Test for DrKonqi",
TDEAboutData aboutData("crashtext", "Crash Test for DrKonqi",
"1.1",
"Crash Test for DrKonqi",
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2000-2002 David Faure, Waldo Bastian");
TDECmdLineArgs::init(argc, argv, &aboutData);

@ -35,7 +35,7 @@
#include "drbugreport.h"
DrKBugReport::DrKBugReport(TQWidget *parent, bool modal,
const KAboutData *aboutData)
const TDEAboutData *aboutData)
: KBugReport(parent, modal, aboutData)
{
}

@ -28,7 +28,7 @@
#ifndef DRBUGREPORT_H
#define DRBUGREPORT_H
class KAboutData;
class TDEAboutData;
#include <kbugreport.h>
@ -41,7 +41,7 @@ public:
* Constructor.
*/
DrKBugReport(TQWidget *parent = 0, bool modal = true,
const KAboutData *aboutData = 0);
const TDEAboutData *aboutData = 0);
public:
/**

@ -74,7 +74,7 @@ void KrashConfig :: readConfig()
programname.setStr(I18N_NOOP("unknown"));
// leak some memory... Well. It's only done once anyway :-)
const char * progname = tqstrdup(programname);
m_aboutData = new KAboutData(args->getOption("appname"),
m_aboutData = new TDEAboutData(args->getOption("appname"),
progname,
args->getOption("appversion"),
0, 0, 0, 0, 0,

@ -70,7 +70,7 @@ public:
bool showDebugger() const { return m_showdebugger && !m_debugger.isNull(); };
bool showBugReport() const { return m_showbugreport; };
bool disableChecks() const { return m_disablechecks; };
const KAboutData *aboutData() const { return m_aboutData; }
const TDEAboutData *aboutData() const { return m_aboutData; }
TQString execName() const { return m_execname; }
void expandString(TQString &str, bool shell, const TQString &tempFile = TQString::null) const;
@ -84,7 +84,7 @@ private:
void readConfig();
private:
KAboutData *m_aboutData;
TDEAboutData *m_aboutData;
int m_pid;
int m_signalnum;
bool m_showdebugger;

@ -68,11 +68,11 @@ int main( int argc, char* argv[] )
setenv("TDE_DEBUG", "true", 1);
unsetenv("SESSION_MANAGER");
KAboutData aboutData( "drkonqi",
TDEAboutData aboutData( "drkonqi",
I18N_NOOP("The TDE Crash Handler"),
version,
description,
KAboutData::License_BSD,
TDEAboutData::License_BSD,
"(C) 2012, The Trinity Desktop Project");
aboutData.addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
aboutData.addAuthor("Hans Petter Bieker", 0, "bieker@kde.org");

@ -30,7 +30,7 @@
#ifndef TOPLEVEL_H
#define TOPLEVEL_H
class KAboutData;
class TDEAboutData;
class KrashConfig;
class DrKBugReport;

@ -33,8 +33,8 @@ static KCmdLineOptions options[] = {
int main( int argc, char *argv[] )
{
KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ),
"1.0", description, KAboutData::License_GPL,
TDEAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ),
"1.0", description, TDEAboutData::License_GPL,
"(c) 1998-2000, Matthias Hoelzer-Kluepfel" );
aboutData.addAuthor( "Matthias Hoelzer-Kluepfel", 0, "hoelzer@kde.org" );
aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );

@ -34,7 +34,7 @@
int main( int argc, char *argv[] )
{
KInstance instance( "kappfinder_install" );
TDEInstance instance( "kappfinder_install" );
int added = 0;
if ( argc != 2 ) {

@ -60,8 +60,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
// here we go, construct the Kate version
TQString kateVersion = KateApp::kateVersion();
KAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
I18N_NOOP( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,
TDEAboutData aboutData ("kate", I18N_NOOP("Kate"), kateVersion.latin1(),
I18N_NOOP( "Kate - Advanced Text Editor" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org");
aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "cullmann@kde.org", "http://www.babylon2k.de");

@ -549,10 +549,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */
TQString kWriteVersion = TQString ("4.5.%1").arg(KDE::versionMajor());
KAboutData aboutData ( "kwrite",
TDEAboutData aboutData ( "kwrite",
I18N_NOOP("KWrite"),
kWriteVersion.latin1(),
I18N_NOOP( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
I18N_NOOP( "KWrite - Text Editor" ), TDEAboutData::License_LGPL_V2,
I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org" );
aboutData.addAuthor ("Christoph Cullmann", I18N_NOOP("Maintainer"), "cullmann@kde.org", "http://www.babylon2k.de");

@ -234,7 +234,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from starttde?
KLocale::setMainCatalogue("kcontrol");
KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
TDEAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
"",
I18N_NOOP("KCMInit - runs startups initialization for Control Modules."));

@ -225,9 +225,9 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
: KCModule(parent, "kcmaccess")
{
KAboutData *about =
new KAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
@ -563,7 +563,7 @@ KAccessConfig::~KAccessConfig()
void KAccessConfig::configureKNotify()
{
KAboutData about(I18N_NOOP("kaccess"),
TDEAboutData about(I18N_NOOP("kaccess"),
I18N_NOOP("TDE Accessibility Tool"),
0);
KNotifyDialog::configure (this, 0, &about);

@ -22,7 +22,7 @@ class TQRadioButton;
class KColorButton;
class TQSlider;
class KNumInput;
class KAboutData;
class TDEAboutData;
class ExtendedIntNumInput : public KIntNumInput
{

@ -6,8 +6,8 @@
extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
{
KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, KAboutData::License_GPL,
TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");

@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib
AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &)
: AccessibilityConfigWidget( parent, name){
KAboutData *about =
new KAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");

@ -242,9 +242,9 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( slotChanged() ) );
KAboutData *about = new KAboutData(I18N_NOOP("kcmarts"),
TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmarts"),
I18N_NOOP("The Sound Server Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999 - 2001, Stefan Westerfeld"));
about->addAuthor("Stefan Westerfeld",I18N_NOOP("aRts Author") , "stw@kde.org");
setAboutData(about);

@ -67,9 +67,9 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2009,2010 Timothy Pearson"));
about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");

@ -132,9 +132,9 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997 - 2001 Christian Czezatke, Matthias Elter"));
about->addAuthor("Christian Czezatke", I18N_NOOP("Original author"), "e9025461@student.tuwien.ac.at");

@ -42,9 +42,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock"))
KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KlockModuleFactory::instance(), parent, name)
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),
0, 0, TDEAboutData::License_GPL,
"(c) 1996 - 2001 Luca Montecchiani");
about->addAuthor("Luca Montecchiani", I18N_NOOP("Original author"), "m.luca@usa.net");

@ -279,8 +279,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
load();
KAboutData* about = new KAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0,
KAboutData::License_GPL,
TDEAboutData* about = new TDEAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997-2005 Colors Developers"), 0, 0);
about->addAuthor("Mark Donohoe", 0, 0);
about->addAuthor("Matthias Hoelzer", 0, 0);

@ -30,9 +30,9 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool)));
setButtons( Help | Apply );
KAboutData *about =
new KAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c), 2002 Joseph Wenninger"));
about->addAuthor("Joseph Wenninger", 0 , "jowenn@kde.org");

@ -20,7 +20,7 @@
#include "componentchooser.h"
class KAboutData;
class TDEAboutData;
class KCMComponentChooser : public KCModule
{

@ -235,9 +235,9 @@ TQString whatstr;
_signers = new KSSLSigners;
KAboutData *about =
new KAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000 - 2001 George Staikos"));
about->addAuthor("George Staikos", 0, "staikos@kde.org");
about->addAuthor("Carsten Pfeiffer", 0, "pfeiffer@kde.org");

@ -757,9 +757,9 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
systemconfig->setFileWriteMode(0644);
}
KAboutData *about =
new KAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2011 Timothy Pearson"));
about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");

@ -56,8 +56,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
: ConfigDialog(parent, name), m_wdchanged(false)
{
setAboutData(new KAboutData(I18N_NOOP("kcm_kdnssd"),
I18N_NOOP("ZeroConf configuration"),0,0,KAboutData::License_GPL,
setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
setQuickHelp(i18n("Setup services browsing with ZeroConf"));
if (geteuid()!=0) tabs->removePage(tab_2); // normal user cannot change wide-area settings

@ -75,7 +75,7 @@ private:
SearchProvider *m_provider;
};
FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name)
FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name)
:KCModule(instance, parent, name)
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),

@ -35,7 +35,7 @@ class FilterOptions : public KCModule
Q_OBJECT
public:
FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0);
FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0);
void load();
void load( bool useDefaults );

@ -27,7 +27,7 @@
#include <kurifilter.h>
class KInstance;
class TDEInstance;
class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
{

@ -27,7 +27,7 @@
#include <kurifilter.h>
class KInstance;
class TDEInstance;
class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
{

@ -28,7 +28,7 @@
#include <kurifilter.h>
#include <tqregexp.h>
class KInstance;
class TDEInstance;
class KProcess;
/*

@ -27,7 +27,7 @@
#include <kgenericfactory.h>
#include <kurifilter.h>
class KInstance;
class TDEInstance;
/**
* This is short URL filter class.

@ -111,9 +111,9 @@ static KCmdLineOptions options[] =
int main(int argc, char ** argv)
{
KLocale::setMainCatalogue("filetypes");
KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
TDEAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
I18N_NOOP("TDE file type editor - simplified version for editing a single file type"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000, KDE developers") );
aboutData.addAuthor("Preston Brown",0, "pbrown@kde.org");
aboutData.addAuthor("David Faure",0, "faure@kde.org");

@ -67,9 +67,9 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2012 Timothy Pearson"));
about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");

@ -73,9 +73,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
}
systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2009,2010 Timothy Pearson"));
about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");

@ -51,9 +51,9 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
tab->addTab(tab2, i18n("Ad&vanced"));
connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
KAboutData* about = new KAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
I18N_NOOP("Icons Control Panel Module"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000-2003 Geert Jansen"), 0, 0);
about->addAuthor("Geert Jansen", 0, "jansen@kde.org");
about->addAuthor("Antonio Larrosa Jimenez", 0, "larrosa@kde.org");

@ -402,10 +402,10 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
: KCModule(parent, name),
title(_title)
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcminfo"),
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcminfo"),
I18N_NOOP("TDE Panel System Information Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998 - 2002 Helge Deller"));
about->addAuthor("Helge Deller", 0, "deller@kde.org");

@ -91,10 +91,10 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
: KCModule(parent, name)
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcminfo"),
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcminfo"),
I18N_NOOP("TDE Panel Memory Information Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998 - 2002 Helge Deller"));
about->addAuthor("Helge Deller", 0, "deller@gmx.de");

@ -404,8 +404,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
load();
KAboutData* about = new KAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0,
KAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers"));
TDEAboutData* about = new TDEAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0,
TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers"));
about->addAuthor("Patrick Dowler", 0, 0);
about->addAuthor("Dirk A. Mueller", 0, 0);
about->addAuthor("David Faure", 0, 0);

@ -82,10 +82,10 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
setButtons(KCModule::Help);
KAboutData *about =
new KAboutData(I18N_NOOP("kcmioslaveinfo"),
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmioslaveinfo"),
I18N_NOOP("TDE Panel System Information Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf"));
about->addAuthor("Alexander Neundorf", 0, "neundorf@kde.org");

@ -69,9 +69,9 @@ extern "C"
joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(JoystickFactory::instance(), parent, name)
{
setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
I18N_NOOP("TDE Control Center Module to test Joysticks"),
KAboutData::License_GPL, "(c) 2004, Martin Koller",
TDEAboutData::License_GPL, "(c) 2004, Martin Koller",
0, "m.koller@surfeu.at"));
setQuickHelp( i18n("<h1>Joystick</h1>"

@ -101,16 +101,16 @@ KControlApp::~KControlApp()
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
KLocale::setMainCatalogue("kcontrol");
KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL,
TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL,
TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
TQCString argv_0 = argv[0];
KAboutData *aboutData;
TDEAboutData *aboutData;
if (argv_0.right(11) == "kinfocenter")
{
aboutData = &aboutKInfoCenter;

@ -253,7 +253,7 @@ void ConfigModule::embedded()
_embedStack->raiseWidget(_embedWidget); // put it above the busy label
}
const KAboutData *ConfigModule::aboutData() const
const TDEAboutData *ConfigModule::aboutData() const
{
if (!_module) return 0;
return _module->aboutData();

@ -27,7 +27,7 @@
template<class ConfigModule> class TQPtrList;
class TQStringList;
class KAboutData;
class TDEAboutData;
class KCModule;
class ProxyWidget;
class KProcess;
@ -50,7 +50,7 @@ public:
bool isActive() { return _module != 0; };
ProxyWidget *module();
const KAboutData *aboutData() const;
const TDEAboutData *aboutData() const;
public slots:

@ -320,7 +320,7 @@ void ProxyWidget::clientChanged(bool state)
emit changed(state);
}
const KAboutData *ProxyWidget::aboutData() const
const TDEAboutData *ProxyWidget::aboutData() const
{
return _client->aboutData();
}

@ -29,7 +29,7 @@ class TQPushButton;
class TQFrame;
class KCModule;
class KAboutData;
class TDEAboutData;
#include "dockcontainer.h"
#include <tqscrollview.h>
@ -46,7 +46,7 @@ public:
~ProxyWidget();
TQString quickHelp() const;
const KAboutData *aboutData() const;
const TDEAboutData *aboutData() const;
public slots:

@ -486,15 +486,15 @@ void TopLevel::reportBug()
bool deleteit = false;
if (!_active) // report against kcontrol
dummyAbout = const_cast<KAboutData*>(KGlobal::instance()->aboutData());
dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData());
else
{
if (_active->aboutData())
dummyAbout = const_cast<KAboutData*>(_active->aboutData());
dummyAbout = const_cast<TDEAboutData*>(_active->aboutData());
else
{
snprintf(buffer, sizeof(buffer), "kcm%s", _active->library().latin1());
dummyAbout = new KAboutData(buffer, _active->moduleName().utf8(), "2.0");
dummyAbout = new TDEAboutData(buffer, _active->moduleName().utf8(), "2.0");
deleteit = true;
}
}

@ -100,7 +100,7 @@ private:
* against a module with no about data
* we construct one for him
**/
KAboutData *dummyAbout;
TDEAboutData *dummyAbout;
};
#endif

@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
KCModule( KDEDFactory::instance(), parent, name )
{
KAboutData *about =
new KAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP( "(c) 2002 Daniel Molkentin" ) );
about->addAuthor("Daniel Molkentin",0,"molkentin@kde.org");
setAboutData( about );

@ -84,10 +84,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
KAboutData* about = new KAboutData("kcmfontinst",
TDEAboutData* about = new TDEAboutData("kcmfontinst",
I18N_NOOP("TDE Font Installer"),
0, 0,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("GUI front end to the fonts:/ ioslave.\n"
"(c) Craig Drummond, 2000 - 2004"));
about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org");

@ -110,7 +110,7 @@ int kdemain(int argc, char **argv)
KLocale::setMainCatalogue(KFI_CATALOGUE);
KInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
KFI::CKioFonts slave(argv[2], argv[3]);
slave.dispatchLoop();

@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
itsToolsFrame->setFrameShape(TQFrame::NoFrame);
previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
previewFrame->setFrameShape(TQFrame::Panel);
setInstance(new KInstance("kfontview"));
setInstance(new TDEInstance("kfontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);

@ -45,8 +45,8 @@ extern "C"
namespace KFI
{
KInstance * CFontViewPartFactory::theirInstance=NULL;
KAboutData * CFontViewPartFactory::theirAbout=NULL;
TDEInstance * CFontViewPartFactory::theirInstance=NULL;
TDEAboutData * CFontViewPartFactory::theirAbout=NULL;
CFontViewPartFactory::CFontViewPartFactory()
{
@ -71,12 +71,12 @@ TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name
return new CFontViewPart((TQWidget*) parent, name);
}
KInstance* CFontViewPartFactory::instance()
TDEInstance* CFontViewPartFactory::instance()
{
if(!theirInstance)
{
theirAbout = new KAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1");
theirInstance = new KInstance(theirAbout);
theirAbout = new TDEAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1");
theirInstance = new TDEInstance(theirAbout);
}
return theirInstance;
}

@ -31,8 +31,8 @@
#include <klibloader.h>
class KInstance;
class KAboutData;
class TDEInstance;
class TDEAboutData;
namespace KFI
{
@ -47,12 +47,12 @@ class CFontViewPartFactory : public KLibFactory
virtual ~CFontViewPartFactory();
virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
static KInstance * instance();
static TDEInstance * instance();
private:
static KInstance *theirInstance;
static KAboutData *theirAbout;
static TDEInstance *theirInstance;
static TDEAboutData *theirAbout;
};
}

@ -112,8 +112,8 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
KAboutData::License_GPL,
static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
TDEAboutData::License_GPL,
I18N_NOOP("(c) Craig Drummond, 2004"));
int main(int argc, char **argv)

@ -32,9 +32,9 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
: KCModule(parent, name)
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999 - 2001 Matthias Elter\n(c) 2002 Aaron J. Seigo"));
about->addAuthor("Matthias Elter", 0, "elter@kde.org");

@ -351,13 +351,13 @@ TQString KickerConfig::quickHelp() const
" manipulation of the panel's buttons and applets.");
}
KAboutData *KickerConfig::aboutData()
TDEAboutData *KickerConfig::aboutData()
{
// the KAboutDatas are deleted by the KCModules
KAboutData *about
= new KAboutData(I18N_NOOP("kcmkicker"),
// the TDEAboutDatas are deleted by the KCModules
TDEAboutData *about
= new TDEAboutData(I18N_NOOP("kcmkicker"),
I18N_NOOP("TDE Panel Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2009 - 2010 Timothy Pearson\n"
"(c) 1999 - 2001 Matthias Elter\n"
"(c) 2002 - 2003 Aaron J. Seigo"));

@ -24,7 +24,7 @@
#include "extensionInfo.h"
class TQComboBox;
class KAboutData;
class TDEAboutData;
class KDirWatch;
class KickerConfig : public TQObject, public DCOPObject
@ -46,7 +46,7 @@ public:
void restartKicker();
TQString quickHelp() const;
KAboutData *aboutData();
TDEAboutData *aboutData();
int currentPanelIndex() const { return m_currentPanelIndex; }

@ -38,9 +38,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001 George Staikos"));
about->addAuthor("George Staikos", 0, "staikos@kde.org");

@ -84,10 +84,10 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ),
TQT_SLOT( slotPlayerSettings()));
KAboutData* ab = new KAboutData(
TDEAboutData* ab = new TDEAboutData(
"kcmknotify", I18N_NOOP("KNotify"), "3.0",
I18N_NOOP("System Notification Control Panel Module"),
KAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 );
TDEAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 );
ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
ab->addCredit( "Charles Samuels", I18N_NOOP("Original implementation"),
"charles@altair.dhs.org" );

@ -32,7 +32,7 @@ class TQCheckBox;
class TQLabel;
class TQSlider;
class KAboutData;
class TDEAboutData;
class KComboBox;
class KURLRequester;
class PlayerSettingsDialog;

@ -78,9 +78,9 @@ extern "C"
KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
: KCModule(parent, name), mConfig(config)
{
KAboutData *about =
new KAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999 - 2001 The Konqueror Developers"));
about->addAuthor("Waldo Bastian",0,"bastian@kde.org");

@ -53,8 +53,8 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
topLayout->add(dialog);
load();
KAboutData *ab=new KAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"),
"0.2",I18N_NOOP("KControl module for Konsole configuration"), KAboutData::License_GPL,
TDEAboutData *ab=new TDEAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"),
"0.2",I18N_NOOP("KControl module for Konsole configuration"), TDEAboutData::License_GPL,
"(c) 2001, Andrea Rizzi", 0, 0, "rizzi@kde.org");
ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");

@ -46,10 +46,10 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
: KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
{
KAboutData *about = new KAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
"0.4", I18N_NOOP("This control module handles installing, removing and "
"creating visual TDE themes."),
KAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
TDEAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
"http://developer.kde.org/~lukas/kthememanager");
setAboutData( about );

@ -29,7 +29,7 @@
class TQString;
class KAboutData;
class TDEAboutData;
#define ORIGINAL_THEME "original" // no i18n() here!!!

@ -49,11 +49,11 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
const TQStringList &args)
: KCModule( KLocaleFactory::instance(), parent, args)
{
KAboutData* aboutData = new KAboutData("kcmlocale",
TDEAboutData* aboutData = new TDEAboutData("kcmlocale",
I18N_NOOP("KCMLocale"),
"3.0",
I18N_NOOP("Regional settings"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(C) 1998 Matthias Hoelzer, "
"(C) 1999-2003 Hans Petter Bieker",
0, 0, "bieker@kde.org");

@ -106,10 +106,10 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update()));
connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
update();
KAboutData *about =
new KAboutData(I18N_NOOP("kcminfo"),
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcminfo"),
I18N_NOOP("TDE Panel System Information Control Module"),
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf"));
about->addAuthor("Alexander Neundorf", 0, "neundorf@kde.org");

@ -45,9 +45,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
setButtons( KCModule::Default|KCModule::Apply|KCModule::Help );
KAboutData *about =
new KAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"),
0, 0, KAboutData::License_GPL,
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"),
0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003 Ralf Hoelzer"));
about->addAuthor("Ralf Hoelzer", 0, "ralf@well.com");

@ -35,7 +35,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv)
{
KAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), KAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "kb9vqf@pearsoncomputing.net");
aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org");
aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz");

@ -81,10 +81,10 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
" is parsed. On some systems showmount is in /usr/sbin, check if you have"
" showmount in your PATH."));
KAboutData *about =
new KAboutData(I18N_NOOP("kcmsamba"),
TDEAboutData *about =
new TDEAboutData(I18N_NOOP(