Update branding with command line --help generic options.

pull/16/head
Darrell Anderson 13 years ago
parent 053ba114a5
commit 554196e439

@ -856,7 +856,7 @@ void KApplication::init(bool GUIenabled)
// world writable directories // world writable directories
struct group *man = getgrnam("man"); struct group *man = getgrnam("man");
if ( !man || man->gr_gid != getegid() ){ if ( !man || man->gr_gid != getegid() ){
fprintf(stderr, "The KDE libraries are not designed to run with suid privileges.\n"); fprintf(stderr, "The TDE libraries are not designed to run with suid privileges.\n");
::exit(127); ::exit(127);
} }
} }
@ -1063,7 +1063,7 @@ DCOPClient *KApplication::dcopClient()
return s_DCOPClient; return s_DCOPClient;
s_DCOPClient = new DCOPClient(); s_DCOPClient = new DCOPClient();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kde"); KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
if (args && args->isSet("dcopserver")) if (args && args->isSet("dcopserver"))
{ {
s_DCOPClient->setServerAddress( args->getOption("dcopserver")); s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
@ -1160,7 +1160,7 @@ void KApplication::disableSessionManagement() {
void KApplication::enableSessionManagement() { void KApplication::enableSessionManagement() {
bSessionManagement = true; bSessionManagement = true;
#ifdef Q_WS_X11 #ifdef Q_WS_X11
// Session management support in Qt/KDE is awfully broken. // Session management support in Qt/TDE is awfully broken.
// If konqueror disables session management right after its startup, // If konqueror disables session management right after its startup,
// and enables it later (preloading stuff), it won't be properly // and enables it later (preloading stuff), it won't be properly
// saved on session shutdown. // saved on session shutdown.
@ -1481,7 +1481,7 @@ void KApplication::dcopFailure(const TQString &msg)
return; return;
#endif #endif
TQString msgStr(i18n("There was an error setting up inter-process " TQString msgStr(i18n("There was an error setting up inter-process "
"communications for KDE. The message returned " "communications for TDE. The message returned "
"by the system was:\n\n")); "by the system was:\n\n"));
msgStr += msg; msgStr += msg;
msgStr += i18n("\n\nPlease check that the \"dcopserver\" program is running!"); msgStr += i18n("\n\nPlease check that the \"dcopserver\" program is running!");
@ -1563,12 +1563,12 @@ void
KApplication::addCmdLineOptions() KApplication::addCmdLineOptions()
{ {
KCmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt"); KCmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
KCmdLineArgs::addCmdLineOptions(kde_options, "KDE", "kde"); KCmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
} }
void KApplication::parseCommandLine( ) void KApplication::parseCommandLine( )
{ {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kde"); KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
if ( !args ) return; if ( !args ) return;
@ -2583,7 +2583,7 @@ void KApplication::invokeHelp( const TQString& anchor,
{ {
if (Tty != kapp->type()) if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"), TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK")); i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
else else
kdWarning() << "Could not launch help:\n" << error << endl; kdWarning() << "Could not launch help:\n" << error << endl;
return; return;
@ -2618,7 +2618,7 @@ void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& to
{ {
if (Tty != kapp->type()) if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"), TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK")); i18n("Could not launch the TDE Help Center:\n\n%1").arg(error), i18n("&OK"));
else else
kdWarning() << "Could not launch help:\n" << error << endl; kdWarning() << "Could not launch help:\n" << error << endl;
return; return;

@ -145,7 +145,7 @@ void
KCmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname ) KCmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
{ {
init(_argc, _argv, init(_argc, _argv,
new KAboutData(_appname, _appname, "unknown", "KDE Application", false)); new KAboutData(_appname, _appname, "unknown", "TDE Application", false));
ignoreUnknown = true; ignoreUnknown = true;
} }
@ -240,9 +240,9 @@ KCmdLineArgs::saveAppArgs( TQDataStream &ds)
if (!parsed) if (!parsed)
parseAllArgs(); parseAllArgs();
// Remove Qt and KDE options. // Remove Qt and TDE options.
removeArgs("qt"); removeArgs("qt");
removeArgs("kde"); removeArgs("tde");
TQCString qCwd = mCwd; TQCString qCwd = mCwd;
ds << qCwd; ds << qCwd;
@ -265,9 +265,9 @@ KCmdLineArgs::loadAppArgs( TQDataStream &ds)
{ {
parsed = true; // don't reparse argc/argv! parsed = true; // don't reparse argc/argv!
// Remove Qt and KDE options. // Remove Qt and TDE options.
removeArgs("qt"); removeArgs("qt");
removeArgs("kde"); removeArgs("tde");
KCmdLineArgs *args; KCmdLineArgs *args;
if ( argsList ) { if ( argsList ) {
@ -625,8 +625,8 @@ KCmdLineArgs::parseAllArgs()
{ {
if (!about->customAuthorTextEnabled ()) if (!about->customAuthorTextEnabled ())
{ {
if (about->bugAddress().isEmpty() || about->bugAddress() == "submit@bugs.kde.org" ) if (about->bugAddress().isEmpty() || about->bugAddress() == "bugs.pearsoncomputing.net" )
printQ( i18n( "Please use http://bugs.kde.org to report bugs.\n" ) ); printQ( i18n( "Please use http://bugs.pearsoncomputing.net to report bugs.\n" ) );
else { else {
if( about->authors().count() == 1 && about->authors().first().emailAddress() == about->bugAddress() ) if( about->authors().count() == 1 && about->authors().first().emailAddress() == about->bugAddress() )
printQ( i18n( "Please report bugs to %1.\n" ).arg( about->authors().first().emailAddress() ) ); printQ( i18n( "Please report bugs to %1.\n" ).arg( about->authors().first().emailAddress() ) );
@ -1286,12 +1286,12 @@ static const KCmdLineOptions kde_tempfile_option[] =
void void
KCmdLineArgs::addTempFileOption() KCmdLineArgs::addTempFileOption()
{ {
KCmdLineArgs::addCmdLineOptions( kde_tempfile_option, "KDE-tempfile", "kde-tempfile" ); KCmdLineArgs::addCmdLineOptions( kde_tempfile_option, "TDE-tempfile", "tde-tempfile" );
} }
bool KCmdLineArgs::isTempFileSet() bool KCmdLineArgs::isTempFileSet()
{ {
KCmdLineArgs* args = KCmdLineArgs::parsedArgs( "kde-tempfile" ); KCmdLineArgs* args = KCmdLineArgs::parsedArgs( "tde-tempfile" );
if ( args ) if ( args )
return args->isSet( "tempfile" ); return args->isSet( "tempfile" );
return false; return false;

@ -86,7 +86,7 @@ public:
void void
KUniqueApplication::addCmdLineOptions() KUniqueApplication::addCmdLineOptions()
{ {
KCmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "kde" ); KCmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" );
} }
bool bool

Loading…
Cancel
Save