Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent ed70cd1b53
commit 8856e75c20

@ -42,12 +42,12 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqtimer.h> #include <tqtimer.h>
KAboutData *ArkPart::createAboutData() TDEAboutData *ArkPart::createAboutData()
{ {
KAboutData *about = new KAboutData("ark", I18N_NOOP("ark"), TDEAboutData *about = new TDEAboutData("ark", I18N_NOOP("ark"),
"1.0", "1.0",
I18N_NOOP("Ark KParts Component"), I18N_NOOP("Ark KParts Component"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP( "(c) 1997-2003, The Various Ark Developers" )); I18N_NOOP( "(c) 1997-2003, The Various Ark Developers" ));
about->addAuthor("Robert Palmbos",0, "palm9744@kettering.edu"); about->addAuthor("Robert Palmbos",0, "palm9744@kettering.edu");
about->addAuthor("Francois-Xavier Duranceau",0, "duranceau@kde.org"); about->addAuthor("Francois-Xavier Duranceau",0, "duranceau@kde.org");

@ -32,7 +32,7 @@
#include <tqlabel.h> #include <tqlabel.h>
class KAboutData; class TDEAboutData;
class KPushButton; class KPushButton;
class ArkWidget; class ArkWidget;
@ -94,7 +94,7 @@ public:
const char *name, const TQStringList &, bool readWrite ); const char *name, const TQStringList &, bool readWrite );
virtual ~ArkPart(); virtual ~ArkPart();
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
public slots: public slots:
void fixEnables();//rename to slotFixEnables()... void fixEnables();//rename to slotFixEnables()...

@ -25,8 +25,8 @@
#include "ark_part.h" #include "ark_part.h"
#include "arkfactory.h" #include "arkfactory.h"
KInstance* ArkFactory::s_instance = 0L; TDEInstance* ArkFactory::s_instance = 0L;
KAboutData* ArkFactory::s_about = 0L; TDEAboutData* ArkFactory::s_about = 0L;
int ArkFactory::instanceNumber = 0; int ArkFactory::instanceNumber = 0;
K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory ) K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory )
@ -55,13 +55,13 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
return obj; return obj;
} }
KInstance* ArkFactory::instance() TDEInstance* ArkFactory::instance()
{ {
instanceNumber++; instanceNumber++;
if( !s_instance ) if( !s_instance )
{ {
s_about = ArkPart::createAboutData(); s_about = ArkPart::createAboutData();
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }

@ -33,10 +33,10 @@ public:
TQObject *parent = 0, const char *name = 0, TQObject *parent = 0, const char *name = 0,
const char *classname = "KParts::Part", const char *classname = "KParts::Part",
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
static int instanceNumber; static int instanceNumber;
}; };

@ -64,9 +64,9 @@ static KCmdLineOptions option[] =
extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] )
{ {
KAboutData aboutData( "ark", I18N_NOOP( "Ark" ), TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ),
"2.6.4", I18N_NOOP( "TDE Archiving tool" ), "2.6.4", I18N_NOOP( "TDE Archiving tool" ),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP( "(c) 1997-2006, The Various Ark Developers" ) I18N_NOOP( "(c) 1997-2006, The Various Ark Developers" )
); );

@ -139,11 +139,11 @@ void CharSelectApplet::preferences()
void CharSelectApplet::about() void CharSelectApplet::about()
{ {
if(!_aboutData) { if(!_aboutData) {
_aboutData = new KAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0", _aboutData = new TDEAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0",
I18N_NOOP("A character picker applet.\n" I18N_NOOP("A character picker applet.\n"
"Used to copy single characters to the X11 clipboard.\n" "Used to copy single characters to the X11 clipboard.\n"
"You can paste them to an application with the middle mouse button."), "You can paste them to an application with the middle mouse button."),
KAboutData::License_BSD, "(c) 2001, Matthias Elter"); TDEAboutData::License_BSD, "(c) 2001, Matthias Elter");
_aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org"); _aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org");
} }

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class TQSpinBox; class TQSpinBox;
class KLineEdit; class KLineEdit;
class KAboutData; class TDEAboutData;
class ConfigDialog : public KDialogBase class ConfigDialog : public KDialogBase
{ {
@ -111,7 +111,7 @@ public:
private: private:
CharTable *_table; CharTable *_table;
KAboutData *_aboutData; TDEAboutData *_aboutData;
ConfigDialog *_configDialog; ConfigDialog *_configDialog;
}; };

@ -2269,8 +2269,8 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{ {
KAboutData aboutData( "kcalc", I18N_NOOP("KCalc"), TDEAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n" I18N_NOOP("(c) 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n"
"(c) 1996-2000, Bernd Johannes Wuebben\n" "(c) 1996-2000, Bernd Johannes Wuebben\n"
"(c) 2000-2005, The KDE Team")); "(c) 2000-2005, The KDE Team"));

@ -18,8 +18,8 @@ static const char description[] =
/*================================================================*/ /*================================================================*/
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData( "kcharselect", I18N_NOOP("KCharSelect"), TDEAboutData aboutData( "kcharselect", I18N_NOOP("KCharSelect"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 1999, Reginald Stadlbauer"); "(c) 1999, Reginald Stadlbauer");
aboutData.addAuthor("Reginald Stadlbauer",0, "reggie@kde.org"); aboutData.addAuthor("Reginald Stadlbauer",0, "reggie@kde.org");
aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "GUI cleanup and fixes" ), aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "GUI cleanup and fixes" ),

@ -53,7 +53,7 @@ class IRKick: public TQObject, public DCOPObject
Modes allModes; Modes allModes;
IRKTrayIcon *theTrayIcon; IRKTrayIcon *theTrayIcon;
KAboutData *aboutData; TDEAboutData *aboutData;
TQTimer *theFlashOff; TQTimer *theFlashOff;
void updateModeIcons(); void updateModeIcons();

@ -19,7 +19,7 @@
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{ {
KAboutData *aboutData = new KAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), KAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org");
aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/");
aboutData->addCredit("Malte Starostik", I18N_NOOP("Original LIRC interface code"), "malte.starostik@t-online.de"); aboutData->addCredit("Malte Starostik", I18N_NOOP("Original LIRC interface code"), "malte.starostik@t-online.de");
aboutData->addCredit("Dirk Ziegelmeier", I18N_NOOP("Ideas, concept code"), "dirk@ziegelmeier.net"); aboutData->addCredit("Dirk Ziegelmeier", I18N_NOOP("Ideas, concept code"), "dirk@ziegelmeier.net");

@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name) KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
{ {
KGlobal::locale()->insertCatalogue( "kcmlirc" ); KGlobal::locale()->insertCatalogue( "kcmlirc" );
setAboutData(new KAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org")); setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org"));
setButtons(KCModule::Help); setButtons(KCModule::Help);
setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>")); setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
bool ok; bool ok;

@ -48,9 +48,9 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData("kdessh", I18N_NOOP("TDE ssh"), TDEAboutData aboutData("kdessh", I18N_NOOP("TDE ssh"),
VERSION, I18N_NOOP("Runs a program on a remote host"), VERSION, I18N_NOOP("Runs a program on a remote host"),
KAboutData::License_Artistic, TDEAboutData::License_Artistic,
"Copyright (c) 2000 Geert Jansen"); "Copyright (c) 2000 Geert Jansen");
aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"),
"jansen@kde.org", "http://www.stack.nl/~geertj/"); "jansen@kde.org", "http://www.stack.nl/~geertj/");

@ -64,8 +64,8 @@ bool KDFTopLevel::queryExit( void )
/***************************************************************/ /***************************************************************/
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData( "kdf", I18N_NOOP("KDiskFree"), TDEAboutData aboutData( "kdf", I18N_NOOP("KDiskFree"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 1998-2001, Michael Kropfberger"); "(c) 1998-2001, Michael Kropfberger");
aboutData.addAuthor("Michael Kropfberger",0, "michael.kropfberger@gmx.net"); aboutData.addAuthor("Michael Kropfberger",0, "michael.kropfberger@gmx.net");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -321,8 +321,8 @@ int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue( "kdf" ); KLocale::setMainCatalogue( "kdf" );
KAboutData about("kwikdisk", I18N_NOOP("KwikDisk"), version, description, TDEAboutData about("kwikdisk", I18N_NOOP("KwikDisk"), version, description,
KAboutData::License_GPL, "(C) 2004 Stanislav Karchebny", TDEAboutData::License_GPL, "(C) 2004 Stanislav Karchebny",
0, 0, "Stanislav.Karchebny@kdemail.net"); 0, 0, "Stanislav.Karchebny@kdemail.net");
about.addAuthor( "Michael Kropfberger", I18N_NOOP("Original author"), about.addAuthor( "Michael Kropfberger", I18N_NOOP("Original author"),
"michael.kropfberger@gmx.net" ); "michael.kropfberger@gmx.net" );

@ -7,7 +7,7 @@
2000-01-29 Charles Samuels <charles@altair.dhs.org> 2000-01-29 Charles Samuels <charles@altair.dhs.org>
* Bug fixes * Bug fixes
* KAboutData stuff * TDEAboutData stuff
1999-10-16 Harri Porten <porten@kde.org> 1999-10-16 Harri Porten <porten@kde.org>

@ -1263,8 +1263,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
{ {
bool have_top_window = false; bool have_top_window = false;
KAboutData aboutData( "kedit", I18N_NOOP("KEdit"), TDEAboutData aboutData( "kedit", I18N_NOOP("KEdit"),
KEDITVERSION, description, KAboutData::License_GPL, KEDITVERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2000, Bernd Johannes Wuebben"); "(c) 1997-2000, Bernd Johannes Wuebben");
aboutData.addAuthor("Bernd Johannes Wuebben",0, "wuebben@kde.org"); aboutData.addAuthor("Bernd Johannes Wuebben",0, "wuebben@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -41,9 +41,9 @@ static const KCmdLineOptions options[] =
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData("kfloppy", TDEAboutData aboutData("kfloppy",
I18N_NOOP("KFloppy"), I18N_NOOP("KFloppy"),
TDE_VERSION_STRING, description, KAboutData::License_GPL, TDE_VERSION_STRING, description, TDEAboutData::License_GPL,
"(c) 1997, Bernd Johannes Wuebben\n" "(c) 1997, Bernd Johannes Wuebben\n"
"(c) 2001, Chris Howells\n" "(c) 2001, Chris Howells\n"
"(c) 2002, Adriaan de Groot\n" "(c) 2002, Adriaan de Groot\n"

@ -35,7 +35,7 @@
class TQPopupMenu; class TQPopupMenu;
class KTempFile; class KTempFile;
class KAboutData; class TDEAboutData;
class KPassivePopup; class KPassivePopup;
class KgpgWizard; class KgpgWizard;
class popupPublic; class popupPublic;
@ -58,7 +58,7 @@ public:
private: private:
TQPopupMenu *droppopup,*udroppopup; TQPopupMenu *droppopup,*udroppopup;
KAboutData *_aboutData; TDEAboutData *_aboutData;
TQStringList customDecrypt; TQStringList customDecrypt;
KgpgWizard *wiz; KgpgWizard *wiz;
KPassivePopup *pop; KPassivePopup *pop;

@ -47,8 +47,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, TDEAboutData about("kgpg", I18N_NOOP("KGpg"), version, description,
KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); TDEAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle");
about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" ); about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -46,8 +46,8 @@ static uint parseDecimalOrHexadecimal( char *buf );
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"), TDEAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"),
version, description, KAboutData::License_GPL_V2, version, description, TDEAboutData::License_GPL_V2,
"(c) 1999-2000, Espen Sand"); "(c) 1999-2000, Espen Sand");
aboutData.addAuthor("Espen Sand",0, "espensa@online.no", aboutData.addAuthor("Espen Sand",0, "espensa@online.no",
"http://home.online.no/~espensa/khexedit/" ); "http://home.online.no/~espensa/khexedit/" );

@ -38,8 +38,8 @@ static const char FWHKEmailAddress[] = "Friedrich.W.H@Kossebau.de";
// static const char FWHKWebAddress[] = "http://www.kossebau.de"; // static const char FWHKWebAddress[] = "http://www.kossebau.de";
KInstance* KHexEditPartFactory::s_instance = 0L; TDEInstance* KHexEditPartFactory::s_instance = 0L;
KAboutData* KHexEditPartFactory::s_about = 0L; TDEAboutData* KHexEditPartFactory::s_about = 0L;
KHexEditPartFactory::KHexEditPartFactory() KHexEditPartFactory::KHexEditPartFactory()
@ -72,14 +72,14 @@ KParts::Part* KHexEditPartFactory::createPartObject( TQWidget *ParentWidget, con
} }
KInstance* KHexEditPartFactory::instance() TDEInstance* KHexEditPartFactory::instance()
{ {
if( !s_instance ) if( !s_instance )
{ {
s_about = new KAboutData( PartId, PartName, PartVersion, PartDescription, s_about = new TDEAboutData( PartId, PartName, PartVersion, PartDescription,
KAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress ); TDEAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress );
s_about->addAuthor( FWHKName, FWHKTask, FWHKEmailAddress ); s_about->addAuthor( FWHKName, FWHKTask, FWHKEmailAddress );
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }

@ -20,8 +20,8 @@
#include <kparts/factory.h> #include <kparts/factory.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KHexEditPartFactory : public KParts::Factory class KHexEditPartFactory : public KParts::Factory
@ -37,12 +37,12 @@ class KHexEditPartFactory : public KParts::Factory
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
#endif #endif

@ -41,8 +41,8 @@ static const char version[] = "v0.7";
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "kjots", I18N_NOOP("KJots"), TDEAboutData aboutData( "kjots", I18N_NOOP("KJots"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 1997-2002, Christoph Neerfeld"); "(c) 1997-2002, Christoph Neerfeld");
aboutData.addAuthor("Pradeepto K. Bhattacharya", I18N_NOOP("Current maintainer"), "pradeepto@kde.org"); aboutData.addAuthor("Pradeepto K. Bhattacharya", I18N_NOOP("Current maintainer"), "pradeepto@kde.org");
aboutData.addAuthor("Jaison Lee", 0, "lee.jaison@gmail.com"); aboutData.addAuthor("Jaison Lee", 0, "lee.jaison@gmail.com");

@ -63,7 +63,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
apm = laptop_portable::has_power_management(); apm = laptop_portable::has_power_management();
config = new KConfig("kcmlaptoprc"); config = new KConfig("kcmlaptoprc");
instance = new KInstance("klaptopdaemon"); instance = new TDEInstance("klaptopdaemon");
TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() ); KDialog::spacingHint() );

@ -94,7 +94,7 @@ private:
TQPtrList<TQLabel> batt_label_1, batt_label_2, batt_label_3; TQPtrList<TQLabel> batt_label_1, batt_label_2, batt_label_3;
TQPixmap battery_pm, battery_nopm; TQPixmap battery_pm, battery_nopm;
KInstance *instance; TDEInstance *instance;
}; };
#endif #endif

@ -57,7 +57,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent )
pdaemon = parent; pdaemon = parent;
current_code = -1; current_code = -1;
brightness_widget = 0; brightness_widget = 0;
instance = new KInstance("klaptopdaemon"); instance = new TDEInstance("klaptopdaemon");
// popup menu for right mouse button // popup menu for right mouse button
rightPopup = contextMenu(); rightPopup = contextMenu();
SetupPopup(); SetupPopup();

@ -101,7 +101,7 @@ private:
_displayActions, _displayActions,
_insertActions; _insertActions;
KInstance *instance; // handle so we get our pretty icons right TDEInstance *instance; // handle so we get our pretty icons right
KPopupMenu *rightPopup; KPopupMenu *rightPopup;
}; };

@ -38,8 +38,8 @@ extern void wake_laptop_daemon();
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
KAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"), TDEAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2003, Paul Campbell"); "(c) 2003, Paul Campbell");
aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com"); aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -223,10 +223,10 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
sony = 0; sony = 0;
} }
KAboutData* about = TDEAboutData* about =
new KAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION, new TDEAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION,
I18N_NOOP("Battery Control Panel Module"), I18N_NOOP("Battery Control Panel Module"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999 Paul Campbell"), 0, 0); I18N_NOOP("(c) 1999 Paul Campbell"), 0, 0);
//about->addAuthor("NAME", 0, "e-mail addy"); //about->addAuthor("NAME", 0, "e-mail addy");
setAboutData( about ); setAboutData( about );

@ -40,10 +40,10 @@
PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
: KCModule(parent, name) : KCModule(parent, name)
{ {
KAboutData *about = TDEAboutData *about =
new KAboutData(I18N_NOOP("kcmlaptop"), new TDEAboutData(I18N_NOOP("kcmlaptop"),
I18N_NOOP("TDE Panel System Information Control Module"), I18N_NOOP("TDE Panel System Information Control Module"),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999 - 2002 Paul Campbell")); I18N_NOOP("(c) 1999 - 2002 Paul Campbell"));
about->addAuthor("Paul Campbell", 0, "paul@taniwha.com"); about->addAuthor("Paul Campbell", 0, "paul@taniwha.com");
setAboutData( about ); setAboutData( about );

@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio"))
KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KVaioModuleFactory::instance(), parent, name) : KCModule(KVaioModuleFactory::instance(), parent, name)
{ {
KAboutData *about = TDEAboutData *about =
new KAboutData(I18N_NOOP("kcmkvaio"), new TDEAboutData(I18N_NOOP("kcmkvaio"),
I18N_NOOP("TDE Control Module for Sony " I18N_NOOP("TDE Control Module for Sony "
"Vaio Laptop Hardware"), "Vaio Laptop Hardware"),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
"(c) 2003 Mirko Boehm"); "(c) 2003 Mirko Boehm");
about->addAuthor("Mirko Boehm", about->addAuthor("Mirko Boehm",

@ -56,11 +56,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad"
KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&)
: KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) {
KAboutData* about = TDEAboutData* about =
new KAboutData(I18N_NOOP("kcmthinkpad"), new TDEAboutData(I18N_NOOP("kcmthinkpad"),
I18N_NOOP("TDE Control Module for IBM Thinkpad " I18N_NOOP("TDE Control Module for IBM Thinkpad "
"Laptop Hardware"), "Laptop Hardware"),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
"(c) 2004 Jonathan Riddell"); "(c) 2004 Jonathan Riddell");
about->addAuthor("Jonathan Riddell", about->addAuthor("Jonathan Riddell",

@ -35,9 +35,9 @@ int main( int argc, char* argv[] )
#ifdef TQT_ONLY #ifdef TQT_ONLY
TQApplication myapp( argc, argv ); TQApplication myapp( argc, argv );
#else #else
KAboutData aboutData( "kregexpeditor", I18N_NOOP("RegExp Editor"), TDEAboutData aboutData( "kregexpeditor", I18N_NOOP("RegExp Editor"),
"1.0", I18N_NOOP("Editor for Regular Expressions"), "1.0", I18N_NOOP("Editor for Regular Expressions"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2002-2003 Jesper K. Pedersen"); "(c) 2002-2003 Jesper K. Pedersen");
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
TDEApplication myapp; TDEApplication myapp;

@ -55,9 +55,9 @@ KSim::PanelExtension::PanelExtension(const TQString &configFile,
m_dcopClient->registerAs(name, false); m_dcopClient->registerAs(name, false);
m_aboutData = new KAboutData(name, I18N_NOOP("KSim"), KSIM_VERSION_STRING, m_aboutData = new TDEAboutData(name, I18N_NOOP("KSim"), KSIM_VERSION_STRING,
I18N_NOOP("A plugin based system monitor for TDE"), I18N_NOOP("A plugin based system monitor for TDE"),
KAboutData::License_GPL, I18N_NOOP("(C) 2001-2003 Robbie Ward\n(C) 2005 Reuben Sutton")); TDEAboutData::License_GPL, I18N_NOOP("(C) 2001-2003 Robbie Ward\n(C) 2005 Reuben Sutton"));
m_aboutData->addAuthor("Reuben Sutton", I18N_NOOP("Maintainer"),"reuben.sutton@gmail.com"); m_aboutData->addAuthor("Reuben Sutton", I18N_NOOP("Maintainer"),"reuben.sutton@gmail.com");
m_aboutData->addAuthor("Robbie Ward", I18N_NOOP("Original Author"), m_aboutData->addAuthor("Robbie Ward", I18N_NOOP("Original Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -24,8 +24,8 @@
#include <kpanelextension.h> #include <kpanelextension.h>
class TQBoxLayout; class TQBoxLayout;
class KAboutData; class TDEAboutData;
class KInstance; class TDEInstance;
class DCOPClient; class DCOPClient;
namespace KSim namespace KSim
@ -61,7 +61,7 @@ namespace KSim
private: private:
KSim::MainView * m_view; KSim::MainView * m_view;
TQBoxLayout * m_layout; TQBoxLayout * m_layout;
KAboutData * m_aboutData; TDEAboutData * m_aboutData;
DCOPClient * m_dcopClient; DCOPClient * m_dcopClient;
}; };
} }

@ -96,10 +96,10 @@ void CpuPlugin::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim CPU Plugin"), version.latin1(), I18N_NOOP("KSim CPU Plugin"), version.latin1(),
I18N_NOOP("A cpu monitor plugin for KSim"), I18N_NOOP("A cpu monitor plugin for KSim"),
KAboutData::License_GPL, "(C) 2001 Robbie Ward"); TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -92,10 +92,10 @@ void DiskPlugin::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim Disk Plugin"), version.latin1(), I18N_NOOP("KSim Disk Plugin"), version.latin1(),
I18N_NOOP("A disk monitor plugin for KSim"), I18N_NOOP("A disk monitor plugin for KSim"),
KAboutData::License_GPL, "(C) 2001 Robbie Ward"); TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -66,10 +66,10 @@ void PluginModule::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim FileSystem Plugin"), version.latin1(), I18N_NOOP("KSim FileSystem Plugin"), version.latin1(),
I18N_NOOP("A filesystem plugin for KSim"), I18N_NOOP("A filesystem plugin for KSim"),
KAboutData::License_GPL, "(C) 2001 Robbie Ward"); TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -61,10 +61,10 @@ void I8KPlugin::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim I8K Plugin"), version.latin1(), I18N_NOOP("KSim I8K Plugin"), version.latin1(),
I18N_NOOP("Dell I8K Hardware Monitor plugin"), I18N_NOOP("Dell I8K Hardware Monitor plugin"),
KAboutData::License_GPL, "(C) 2003 Nadeem Hasan"); TDEAboutData::License_GPL, "(C) 2003 Nadeem Hasan");
aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"),
"nhasan@kde.org"); "nhasan@kde.org");

@ -60,10 +60,10 @@ void PluginModule::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim Sensors Plugin"), version.latin1(), I18N_NOOP("KSim Sensors Plugin"), version.latin1(),
I18N_NOOP("An lm_sensors plugin for KSim"), I18N_NOOP("An lm_sensors plugin for KSim"),
KAboutData::License_GPL, "(C) 2001 Robbie Ward"); TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -26,7 +26,7 @@
class KConfig; class KConfig;
class SensorList; class SensorList;
class KInstance; class TDEInstance;
/** /**
* This class is the lm_sensors monitor plugin * This class is the lm_sensors monitor plugin

@ -57,10 +57,10 @@ KSim::PluginPage* MailPlugin::createConfigPage( const char* name )
void MailPlugin::showAbout() void MailPlugin::showAbout()
{ {
KAboutData about( instanceName(), TDEAboutData about( instanceName(),
I18N_NOOP( "KSim Mail Plugin" ), "0.1", I18N_NOOP( "KSim Mail Plugin" ), "0.1",
I18N_NOOP( "A mail monitor plugin for KSim" ), I18N_NOOP( "A mail monitor plugin for KSim" ),
KAboutData::License_GPL, "(c) 2002 Malte Starostik" ); TDEAboutData::License_GPL, "(c) 2002 Malte Starostik" );
about.addAuthor( "Malte Starostik", I18N_NOOP( "Author" ), "malte@kde.org" ); about.addAuthor( "Malte Starostik", I18N_NOOP( "Author" ), "malte@kde.org" );
KAboutApplication( &about ).exec(); KAboutApplication( &about ).exec();

@ -86,10 +86,10 @@ void NetPlugin::showAbout()
{ {
TQString version = kapp->aboutData()->version(); TQString version = kapp->aboutData()->version();
KAboutData aboutData(instanceName(), TDEAboutData aboutData(instanceName(),
I18N_NOOP("KSim Net Plugin"), version.latin1(), I18N_NOOP("KSim Net Plugin"), version.latin1(),
I18N_NOOP("A net plugin for KSim"), I18N_NOOP("A net plugin for KSim"),
KAboutData::License_GPL, "(C) 2001 Robbie Ward"); TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"), aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
"linuxphreak@gmx.co.uk"); "linuxphreak@gmx.co.uk");

@ -30,8 +30,8 @@ static const char version[] = "v0.1";
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "ktimer", I18N_NOOP("KTimer"), TDEAboutData aboutData( "ktimer", I18N_NOOP("KTimer"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2001, Stefan Schimanski"); "(c) 2001, Stefan Schimanski");
aboutData.addAuthor("Stefan Schimanski",0, "schimmi@kde.org"); aboutData.addAuthor("Stefan Schimanski",0, "schimmi@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -43,10 +43,10 @@ K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&) KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(KWalletFactory::instance(), parent, name) { : KCModule(KWalletFactory::instance(), parent, name) {
KAboutData *about = TDEAboutData *about =
new KAboutData(I18N_NOOP("kcmkwallet"), new TDEAboutData(I18N_NOOP("kcmkwallet"),
I18N_NOOP("TDE Wallet Control Module"), I18N_NOOP("TDE Wallet Control Module"),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003 George Staikos")); I18N_NOOP("(c) 2003 George Staikos"));
about->addAuthor("George Staikos", 0, "staikos@kde.org"); about->addAuthor("George Staikos", 0, "staikos@kde.org");
setAboutData( about ); setAboutData( about );

@ -48,9 +48,9 @@ int main(int argc, char **argv) {
KCmdLineLastOption KCmdLineLastOption
}; };
KAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1", TDEAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
I18N_NOOP("TDE Wallet Management Tool"), I18N_NOOP("TDE Wallet Management Tool"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003,2004 George Staikos"), 0, I18N_NOOP("(c) 2003,2004 George Staikos"), 0,
"http://www.kde.org/"); "http://www.kde.org/");

@ -126,7 +126,7 @@ void KarambaApplication::checkSuperKarambaDir()
} }
} }
void KarambaApplication::setUpSysTray(KAboutData* about) void KarambaApplication::setUpSysTray(TDEAboutData* about)
{ {
//kdDebug() << k_funcinfo << endl; //kdDebug() << k_funcinfo << endl;
KAction* action; KAction* action;

@ -34,7 +34,7 @@ class TDECmdLineArgs;
class ThemesDlg; class ThemesDlg;
class dcopIface_stub; class dcopIface_stub;
class KHelpMenu; class KHelpMenu;
class KAboutData; class TDEAboutData;
class KarambaApplication : public TDEApplication class KarambaApplication : public TDEApplication
{ {
@ -65,7 +65,7 @@ class KarambaApplication : public TDEApplication
TQStringList getKarambas(); TQStringList getKarambas();
bool themeExists(TQString pretty_name); bool themeExists(TQString pretty_name);
void initDcopStub(TQCString app = ""); void initDcopStub(TQCString app = "");
void setUpSysTray(KAboutData* about); void setUpSysTray(TDEAboutData* about);
void checkPreviousSession(TDEApplication &app, TQStringList &lst); void checkPreviousSession(TDEApplication &app, TQStringList &lst);
void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst); void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
bool startThemes(TQStringList &lst); bool startThemes(TQStringList &lst);

@ -89,9 +89,9 @@ int main(int argc, char **argv)
#ifdef KARAMBA_LOG #ifdef KARAMBA_LOG
tqInstallMsgHandler(karambaMessageOutput); tqInstallMsgHandler(karambaMessageOutput);
#endif #endif
KAboutData about("superkaramba", I18N_NOOP("SuperKaramba"), TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"),
version, description, version, description,
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2003-2006 The SuperKaramba developers"); "(c) 2003-2006 The SuperKaramba developers");
about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org"); about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org");
about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se"); about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se");

@ -50,8 +50,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("karamba", I18N_NOOP("karamba"), version, description, TDEAboutData about("karamba", I18N_NOOP("karamba"), version, description,
KAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se"); TDEAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se");
about.addAuthor( "Hans Karlsson", 0, "karlsson.h@home.se" ); about.addAuthor( "Hans Karlsson", 0, "karlsson.h@home.se" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

Loading…
Cancel
Save