diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
435 files changed, 2251 insertions, 2251 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html index c69d11732..41b9f5379 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -22,7 +22,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <LI><A HREF="#TDEApplication">TDEApplication</A></LI> <LI><A HREF="#TDECmdLineArgs">TDECmdLineArgs</A></LI> <LI><A HREF="#KLocale">KLocale</A></LI> -<LI><A HREF="#KGlobal">KGlobal: access to KDE global objects.</A></LI> +<LI><A HREF="#TDEGlobal">TDEGlobal: access to KDE global objects.</A></LI> <LI><A HREF="#KIconLoader">KIconLoader</A></LI> <LI><A HREF="#KTMainWindow">KTMainWindow</A></LI> <LI><A HREF="#KHelpMenu">KHelpMenu</A></LI> @@ -37,7 +37,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <LI><A HREF="#kcharsets">kcharsets</A></LI> <LI><A HREF="#KWizard">KWizard, KNoteBook</A></LI> <LI><A HREF="#KSpinBox">KSpinBox, KNumericSpinBox</A></LI> -<LI><A HREF="#KClipboard">KClipboard</A></LI> +<LI><A HREF="#TDEClipboard">TDEClipboard</A></LI> <LI><A HREF="#KPanner">KPanner, KNewPanner</A></LI> <LI><A HREF="#KTreeList">KTreeList, KTreeListItem</A></LI> <LI><A HREF="#KMsgBox">KMsgBox</A></LI> @@ -110,11 +110,11 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <H3><A NAME="TDEApplication">TDEApplication</A></H3> doesn't hold any longer a KLocale instance. With this getLocale() - and isLocaleInstantiated are now replaced by KGlobal::locale()<P> + and isLocaleInstantiated are now replaced by TDEGlobal::locale()<P> it also doesn't hold a KiconLoader instance. As this also getIconLoader() has been removed. Replace kapp->getIconLoader()->loadIcon() with - BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()<P> + BarIcon() or use TDEGlobal::iconLoader() instead of getIconLoader()<P> kde_*dir() have been removed as they require a unique top level directory for all applications (TDEDIR). This concept doesn't exist in KDE 2.0 @@ -125,16 +125,16 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> Replace code that uses kde_*dir() + filename with calls to locate(filetype, filename) where filetype is what * used to be in kde_*dir(). locate is defined as function in kstddirs.h to call - KGlobal::dirs()->findResource.<P> + TDEGlobal::dirs()->findResource.<P> Use locateLocal to get the path of a writable file. For instance, TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ), - but for most cases, simply using KGlobal::config() is enough, if you're happy + but for most cases, simply using TDEGlobal::config() is enough, if you're happy with saving the application's configuration into appnamerc, or KSimpleConfig cfg("anothercfgfile") to create a config file with another name.<P> generalFont() and fixedFont() are deprecated and will be removed soon. - Please use KGlobalSettings::generalFont() and KGlobalSettings::fixedFont() instead.<P> + Please use TDEGlobalSettings::generalFont() and TDEGlobalSettings::fixedFont() instead.<P> appName() is deprecated. Please use TQApplication::name() or instanceName instead.<P> @@ -193,9 +193,9 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="KGlobal">KGlobal: access to KDE global objects.</A></H3> +<H3><A NAME="TDEGlobal">TDEGlobal: access to KDE global objects.</A></H3> -KGlobal allows centralized access to KDE global objects without including +TDEGlobal allows centralized access to KDE global objects without including extraneous headers. object creation is deferred if possible.<P> All methods are static and headers for returned types are not included. You @@ -215,11 +215,11 @@ must have created a TDEApplication object before the methods can be used.<P> <TD> <PRE> ... - KConfig *appcfg = KGlobal::config(); + KConfig *appcfg = TDEGlobal::config(); TQString mystr = i18n( "This is a string" ); - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); </PRE> </TD> </TR> @@ -309,9 +309,9 @@ you should or should not use them. <H4>1. fork + exec</H4> <P> You never want to use this unless you have a very good reason why it is -impossible to use KProcess. +impossible to use TDEProcess. </P> -<H4>2. KProcess</H4> +<H4>2. TDEProcess</H4> <P> You want to use this if you need to start a new process which needs to be a child of your process, e.g. because you want to catch stdout/stderr or need @@ -323,7 +323,7 @@ off with KProcIO <H4>3. KProcIO</H4> <P> -Like KProcess. Unlike KProcess, this class actually makes it easy to +Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to send data to and receive data from the process. </P> @@ -534,7 +534,7 @@ The kcharsets class has been completely rewritten, and most of it has vanished, since support for it moved to Qt.<P> Most applications will only need to replace kapp->getKCharsets() with -KGlobal::charsets().<P> +TDEGlobal::charsets().<P> For conversion of various input formats to QStrings, please have a look at TQTextCodec and classes derived from it.<P> @@ -570,9 +570,9 @@ HINTS:<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="KClipboard">KClipboard</A></H3> +<H3><A NAME="TDEClipboard">TDEClipboard</A></H3> -KClipboard has been removed. In case you've been using KClipboard, +TDEClipboard has been removed. In case you've been using TDEClipboard, QClipboard is the way to go now, as it has all the functionality the K version had, and more.<P> diff --git a/KDE3PORTING.html b/KDE3PORTING.html index f3a3f0256..1c96f6ecb 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -179,7 +179,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>. this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" ); </pre> -<h5>KGlobalAccel</h5> +<h5>TDEGlobalAccel</h5> <ul> <li>Call <i>updateConnections()</i> after all <i>insert()</i> or <i>insertItem()</i> (deprecated) calls have been made. This function then performs the @@ -68,7 +68,7 @@ that we would like to make for the next binary incompatible release. KGuiItem has one of these dangerous ctors, too. KUser has a whole bunch of them. -- Solve need for casting when using bitfield enums (e.g. KProcess::Communication), +- Solve need for casting when using bitfield enums (e.g. TDEProcess::Communication), if Simon's solution works. - Merge tdelibs/tdecore/kuser.h and tdeadmin/kuser/kuser.h. @@ -133,7 +133,7 @@ that we would like to make for the next binary incompatible release. - kpassdlg.h needs to be renamed to kpassworddialog.h - consistent with other classes(it won't break many apps). The class needs a facelift - see the comments in kpassdlg.{h,cpp} -- KProcess needs a major facelift. Not all of these items need to be BIC, but not needing to +- TDEProcess needs a major facelift. Not all of these items need to be BIC, but not needing to worry about legacy will certainly allow an overall cleaner solution. - the internals need to be encapsulated properly. many of the virtuals shouldn't be virtual; lots of protected members should be accessible only via accessors. the current model is @@ -149,7 +149,7 @@ that we would like to make for the next binary incompatible release. - do something about the NoRead comm mode - add setComm(); remove comm arg from start(). as a side effect, this will allow for using writeStdin() in Block mode. - - merge KProcIO into KProcess; add setBuffered() for separate channels. + - merge KProcIO into TDEProcess; add setBuffered() for separate channels. - use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted. - To discuss: Migrate the about dialog to use qhtml or khtml rather then the current diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index e030cb411..50a2ae462 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -60,7 +60,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); - KProcess proc; + TDEProcess proc; config.setGroup("Arts"); @@ -86,7 +86,7 @@ Arts::SoundServerV2 KArtsServer::server(void) proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) ); - if(proc.start(KProcess::Block) && proc.normalExit()) + if(proc.start(TDEProcess::Block) && proc.normalExit()) { // We could have a race-condition here. // The correct way to do it is to make artsd fork-and-exit diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 3fcaff6e0..5ff633516 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -78,7 +78,7 @@ public: TQMap<TQString, KConfig*> events; TQMap<TQString, KConfig*> configs; TQString externalPlayer; - KProcess *externalPlayerProc; + TDEProcess *externalPlayerProc; #ifndef WITHOUT_ARTS TQPtrList<KDE::PlayObject> playObjects; @@ -136,7 +136,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) // abort this. #ifndef WITHOUT_ARTS - KConfigGroup config( KGlobal::config(), "StartProgress" ); + KConfigGroup config( TDEGlobal::config(), "StartProgress" ); KConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true ); @@ -285,7 +285,7 @@ KNotify::~KNotify() void KNotify::loadConfig() { // load external player settings - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); kc->setGroup("Misc"); d->useExternal = kc->readBoolEntry( "Use external player", false ); d->externalPlayer = kc->readPathEntry("External player"); @@ -452,7 +452,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( TQFileInfo(sound).isRelative() ) { TQString search = TQString("%1/sounds/%2").arg(appname).arg(sound); - soundFile = KGlobal::instance()->dirs()->findResource("data", search); + soundFile = TDEGlobal::instance()->dirs()->findResource("data", search); if ( soundFile.isEmpty() ) soundFile = locate( "sound", sound ); } @@ -537,12 +537,12 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int } else if(!d->externalPlayer.isEmpty()) { // use an external player to play the sound - KProcess *proc = d->externalPlayerProc; + TDEProcess *proc = d->externalPlayerProc; if (!proc) { - proc = d->externalPlayerProc = new KProcess; - connect( proc, TQT_SIGNAL( processExited( KProcess * )), - TQT_SLOT( slotPlayerProcessExited( KProcess * ))); + proc = d->externalPlayerProc = new TDEProcess; + connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), + TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { @@ -552,7 +552,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int proc->clearArguments(); (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data(); d->externalPlayerEventId = eventId; - proc->start(KProcess::NotifyOnExit); + proc->start(TDEProcess::NotifyOnExit); return true; } @@ -619,10 +619,10 @@ bool KNotify::notifyByExecute(const TQString &command, const TQString& event, if ( execLine.isEmpty() ) execLine = command; // fallback - KProcess p; + TDEProcess p; p.setUseShell(true); p << execLine; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return true; } return false; @@ -721,7 +721,7 @@ bool KNotify::isPlaying( const TQString& soundFile ) const return false; } -void KNotify::slotPlayerProcessExited( KProcess *proc ) +void KNotify::slotPlayerProcessExited( TDEProcess *proc ) { soundFinished( d->externalPlayerEventId, (proc->normalExit() && proc->exitStatus() == 0) ? PlayedOK : Unknown ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 12e699299..a6fec6747 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -25,7 +25,7 @@ #include <dcopobject.h> class KNotifyPrivate; -class KProcess; +class TDEProcess; class KConfig; class KNotify : public TQObject, public DCOPObject @@ -98,7 +98,7 @@ private: private slots: void playTimeout(); - void slotPlayerProcessExited( KProcess *proc ); + void slotPlayerProcessExited( TDEProcess *proc ); void restartedArtsd(); private: diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 37bf4b75e..77f2a6185 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -57,7 +57,7 @@ TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", int main(int argc, char **argv) { aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org"); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); TDEApplication app; diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 639be9bf1..061f8405d 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -56,7 +56,7 @@ public: KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ) { - KGlobal::locale()->insertCatalogue("kfileaudiopreview"); + TDEGlobal::locale()->insertCatalogue("kfileaudiopreview"); TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); // ### @@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) } m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); - KConfigGroup config( KGlobal::config(), ConfigGroup ); + KConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() { - KConfigGroup config( KGlobal::config(), ConfigGroup ); + KConfigGroup config( TDEGlobal::config(), ConfigGroup ); config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() ); delete d; diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/kscript/sample/shellscript.cpp index 49aee0727..9ec34f7a2 100644 --- a/interfaces/kscript/sample/shellscript.cpp +++ b/interfaces/kscript/sample/shellscript.cpp @@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { - m_script = new KProcess(); - connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int ))); + m_script = new TDEProcess(); + connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } @@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & ) void ShellScript::run(TQObject *, const TQVariant &) { - m_script->start(KProcess::NotifyOnExit,KProcess::All); + m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All); } void ShellScript::kill() { @@ -68,16 +68,16 @@ void ShellScript::kill() m_script->kill(9); // Kill it harder } -void ShellScript::Exit(KProcess *proc) +void ShellScript::Exit(TDEProcess *proc) { ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), ""); } -void ShellScript::stdErr(KProcess *, char *buffer, int) +void ShellScript::stdErr(TDEProcess *, char *buffer, int) { ScriptClientInterface->error(buffer); } -void ShellScript::stdOut(KProcess *, char *buffer, int) +void ShellScript::stdOut(TDEProcess *, char *buffer, int) { ScriptClientInterface->output(buffer); } diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/kscript/sample/shellscript.h index 853a7bd12..2cdaf7e5a 100644 --- a/interfaces/kscript/sample/shellscript.h +++ b/interfaces/kscript/sample/shellscript.h @@ -36,11 +36,11 @@ public: void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); private slots: - void Exit(KProcess *proc); - void stdErr(KProcess *proc, char *buffer, int buflen); - void stdOut(KProcess *proc, char *buffer, int buflen); + void Exit(TDEProcess *proc); + void stdErr(TDEProcess *proc, char *buffer, int buflen); + void stdOut(TDEProcess *proc, char *buffer, int buflen); private: - KProcess *m_script; + TDEProcess *m_script; KScriptClientInterface *ScriptClientInterface; TQString m_scriptName; }; diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 894d23f6a..ecc34c7e2 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * } else if ( placeholder == "date" ) { - map[ placeholder ] = KGlobal::locale() ->formatDate( date, true ); + map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true ); } else if ( placeholder == "time" ) { - map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false ); + map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false ); } else if ( placeholder == "year" ) { - map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false ); + map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false ); } else if ( placeholder == "month" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) ); } else if ( placeholder == "day" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) ); } else if ( placeholder == "hostname" ) { diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 6a65477c2..0624c0e8d 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -35,7 +35,7 @@ class TQStrList; * we can't have signals without having a TQObject, which * TerminalInterface is not. * These are the signals you can connect to: - * void processExited( KProcess *process ); + * void processExited( TDEProcess *process ); * void receivedData( const TQString& s ); * See the example code below for how to connect to these.. * diff --git a/kabc/address.cpp b/kabc/address.cpp index 9ecf8eb2d..2fce393e0 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName, ciso = countryToISO( country() ); } else { // fall back to our own country - ciso = KGlobal::locale()->country(); + ciso = TDEGlobal::locale()->country(); } KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) ); @@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName, // the rules of our own system country ) if ( !country().isEmpty() ) { KSimpleConfig entry( locate( "locale", TQString( "l10n/" ) - + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); + + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); TQString cpos = entry.readEntry( "AddressCountryPosition" ); if ( "BELOW" == cpos || cpos.isEmpty() ) { @@ -520,7 +520,7 @@ TQString Address::countryToISO( const TQString &cname ) if ( it != mISOMap->end() ) return it.data(); - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); @@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname ) } // fall back to system country - mISOMap->insert( cname, KGlobal::locale()->country() ); - return KGlobal::locale()->country(); + mISOMap->insert( cname, TDEGlobal::locale()->country() ); + return TDEGlobal::locale()->country(); } TQString Address::ISOtoCountry( const TQString &ISOname ) @@ -550,7 +550,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) if ( ISOname.simplifyWhiteSpace().isEmpty() ) return TQString::null; - TQString mapfile = KGlobal::dirs()->findResource( "data", + TQString mapfile = TDEGlobal::dirs()->findResource( "data", TQString::fromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index bf6d0d17a..45d4f10e3 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -673,7 +673,7 @@ bool AddressBook::addCustomField( const TQString &label, int category, d->mAllFields = Field::allFields(); } - TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app; + TQString a = app.isNull() ? TDEGlobal::instance()->instanceName() : app; TQString k = key.isNull() ? label : key; Field *field = Field::createCustomField( label, category, k, a ); diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index ec8e7be05..623d26cf3 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -78,7 +78,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : TQT_SLOT( updateEdit( TQListViewItem * ) ) ); mAddresseeEdit = new KLineEdit( topWidget ); - mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); + mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ), TQT_SLOT( selectItem( const TQString & ) ) ); mAddresseeEdit->setFocus(); diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index fe9d1f602..6f056a404 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -326,16 +326,16 @@ void AddressLineEdit::doCompletion(bool ctrlT) return; } - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); switch ( mode ) { - case KGlobalSettings::CompletionPopupAuto: + case TDEGlobalSettings::CompletionPopupAuto: { if (s.isEmpty()) break; } - case KGlobalSettings::CompletionPopup: + case TDEGlobalSettings::CompletionPopup: { m_previousAddresses = prevAddr; TQStringList items = s_completion->allMatches( s ); @@ -368,7 +368,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) // completion (suggestion) since it does not know how to deal // with providing proper completions for different items on the // same line, e.g. comma-separated list of email addresses. - bool autoSuggest = (mode != KGlobalSettings::CompletionPopupAuto); + bool autoSuggest = (mode != TDEGlobalSettings::CompletionPopupAuto); setCompletedItems( items, autoSuggest ); if (!autoSuggest) @@ -385,7 +385,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } - case KGlobalSettings::CompletionShell: + case TDEGlobalSettings::CompletionShell: { TQString match = s_completion->makeCompletion( s ); if ( !match.isNull() && match != s ) @@ -396,8 +396,8 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } - case KGlobalSettings::CompletionMan: // Short-Auto in fact - case KGlobalSettings::CompletionAuto: + case TDEGlobalSettings::CompletionMan: // Short-Auto in fact + case TDEGlobalSettings::CompletionAuto: { if (!s.isEmpty()) { @@ -410,7 +410,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) break; } } - case KGlobalSettings::CompletionNone: + case TDEGlobalSettings::CompletionNone: default: // fall through break; } @@ -496,7 +496,7 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs ) if( hasFocus() || completionBox()->hasFocus()) { - if( completionMode() != KGlobalSettings::CompletionNone ) + if( completionMode() != TDEGlobalSettings::CompletionNone ) { doCompletion( false ); } diff --git a/kabc/field.h b/kabc/field.h index f1de43717..7a622b90f 100644 --- a/kabc/field.h +++ b/kabc/field.h @@ -138,7 +138,7 @@ public: const Field::List &fields ); /** * This is the same as above, with the difference, that - * the list is stored in KGlobal::config() in group "KABCFields". + * the list is stored in TDEGlobal::config() in group "KABCFields". */ static void saveFields( const TQString &identifier, const Field::List &fields ); @@ -153,7 +153,7 @@ public: /** * This is the same as above, with the difference, that - * the list is loaded from KGlobal::config() from group "KABCFields". + * the list is loaded from TDEGlobal::config() from group "KABCFields". */ static Field::List restoreFields( const TQString &identifier ); diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp index 8af9e1701..17e7b0f33 100644 --- a/kabc/formatfactory.cpp +++ b/kabc/formatfactory.cpp @@ -56,7 +56,7 @@ FormatFactory::FormatFactory() info->descriptionLabel = i18n( "vCard Format" ); mFormatList.insert( "vcard", info ); - const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); + const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { KSimpleConfig config( *it, true ); diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index c23426260..2447229da 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) } else if ( fieldName == "ROLE" ) { a.setRole( fieldValue ); } else if ( fieldName == "BDAY" ) { - a.setBirthday( KGlobal::locale()->readDate( fieldValue ) ); + a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) ); } else if ( fieldName == "WEBPAGE" ) { a.setUrl( KURL( fieldValue ) ); } else if ( fieldName == "N" ) { @@ -280,7 +280,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) void importKab( KABC::AddressBook *ab, bool override, bool quiet ) { - TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" ); + TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" ); fileName += "addressbook.kab"; if ( !TQFile::exists( fileName ) ) { if ( !quiet ) { diff --git a/kabc/lock.cpp b/kabc/lock.cpp index b5e0ea5a6..42c8c8580 100644 --- a/kabc/lock.cpp +++ b/kabc/lock.cpp @@ -68,7 +68,7 @@ bool Lock::writeLockFile( const TQString &filename ) TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) return false; TQTextStream t( &file ); - t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() ); + t << ::getpid() << endl << TQString( TDEGlobal::instance()->instanceName() ); return true; } diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index f4b4f83b8..e8da1b6aa 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -110,7 +110,7 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config ) d->mCachePolicy = Cache_No; d->mAutoCache = true; } - d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + + d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" + type() + "_" + identifier(); init(); } diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp index 98b21061e..975837bf8 100644 --- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp @@ -30,7 +30,7 @@ extern "C" { KDE_EXPORT void *init_kabc_ldapkio() { - KGlobal::locale()->insertCatalogue("kabc_ldapkio"); + TDEGlobal::locale()->insertCatalogue("kabc_ldapkio"); return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>(); } } diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index 5291303f5..b0704e393 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -428,7 +428,7 @@ void Field::deleteFields() void Field::saveFields( const TQString &identifier, const Field::List &fields ) { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); KConfigGroupSaver( cfg, "KABCFields" ); saveFields( cfg, identifier, fields ); @@ -458,7 +458,7 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier, Field::List Field::restoreFields( const TQString &identifier ) { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); KConfigGroupSaver( cfg, "KABCFields" ); return restoreFields( cfg, identifier ); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 4b3c2f52b..ef6da69c1 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); + return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else - return KGlobal::charsets()->codecForName (m_encoding); + return TDEGlobal::charsets()->codecForName (m_encoding); } return s_global->codec (); @@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding) if (!enc.isEmpty()) { bool found = false; - TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found); if (!found || !codec) return; @@ -1127,12 +1127,12 @@ void KateRendererConfig::setSchemaInternal( int schema ) KConfig *config (KateFactory::self()->schemaManager()->schema(schema)); - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema ) m_lineMarkerColor[index] = col; } - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); if (!m_fontSet) { diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 5a5a73b70..1ae416264 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -999,7 +999,7 @@ void KateSaveConfigTab::apply() KateDocumentConfig::global()->setConfigFlags(configFlags); - KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText())); + KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText())); KateDocumentConfig::global()->setEol(m_eol->currentItem()); KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked()); @@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload() m_encoding->clear (); m_encoding->insertItem (i18n("TDE Default")); m_encoding->setCurrentItem(0); - TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames()); int insert = 1; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found); if (found) { @@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data) void KateHlDownloadDialog::slotUser1() { - TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/"); + TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/"); for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling()) { if (list->isSelected(it)) @@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt() void KateModOnHdPrompt::slotDiff() { - // Start a KProcess that creates a diff + // Start a TDEProcess that creates a diff KProcIO *p = new KProcIO(); - p->setComm( KProcess::All ); + p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) ); + connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); - p->start( KProcess::NotifyOnExit, true ); + p->start( TDEProcess::NotifyOnExit, true ); uint lastln = m_doc->numLines(); for ( uint l = 0; l < lastln; l++ ) @@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p) p->ackRead(); } -void KateModOnHdPrompt::slotPDone( KProcess *p ) +void KateModOnHdPrompt::slotPDone( TDEProcess *p ) { setCursor( ArrowCursor ); if( ! m_tmpfile ) diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index aa6f21f6d..169ffaffc 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -360,7 +360,7 @@ class KateHlDownloadDialog: public KDialogBase }; class KProcIO; -class KProcess; +class TDEProcess; /** * This dialog will prompt the user for what do with a file that is * modified on disk. @@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase private slots: void slotPRead(KProcIO*); ///< Read from the diff process - void slotPDone(KProcess*); ///< Runs the diff file when done + void slotPDone(TDEProcess*); ///< Runs the diff file when done private: KateDocument *m_doc; diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 603388479..b264e6533 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -1955,7 +1955,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig) void KateDocument::writeSessionConfig(KConfig *kconfig) { - if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) + if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; // save url kconfig->writeEntry("URL", m_url.prettyURL() ); diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index 89bfd0025..29955d7e2 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c) // KateFontStruct::KateFontStruct() -: myFont(KGlobalSettings::fixedFont()), - myFontBold(KGlobalSettings::fixedFont()), - myFontItalic(KGlobalSettings::fixedFont()), - myFontBI(KGlobalSettings::fixedFont()), +: myFont(TDEGlobalSettings::fixedFont()), + myFontBold(TDEGlobalSettings::fixedFont()), + myFontItalic(TDEGlobalSettings::fixedFont()), + myFontBI(TDEGlobalSettings::fixedFont()), myFontMetrics(myFont), myFontMetricsBold(myFontBold), myFontMetricsItalic(myFontItalic), diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index d5eec4c27..ca1276a6b 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { - static const TQString& sq = KGlobal::staticQString("\"'"); + static const TQString& sq = TDEGlobal::staticQString("\"'"); return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); } diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 58b4dd163..d33f26947 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force) } // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index dbc7d1fa4..178831f69 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e9a74c50e..7f4481722 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc) KUser u (KUser::UseRealUserID); tags["u"] = u.loginName(); - tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false); - tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); + tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); + tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); + tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); + tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 1978c867c..bb3aa2866 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number) void KateSchemaManager::addSchema (const TQString &t) { m_config.setGroup (t); - m_config.writeEntry("Color Background", KGlobalSettings::baseColor()); + m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor()); update (false); } @@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) if ( ! m_schemas.contains( newSchema ) ) { // fallback defaults - TQColor tmp0 (KGlobalSettings::baseColor()); - TQColor tmp1 (KGlobalSettings::highlightColor()); - TQColor tmp2 (KGlobalSettings::alternateBackgroundColor()); + TQColor tmp0 (TDEGlobalSettings::baseColor()); + TQColor tmp1 (TDEGlobalSettings::highlightColor()); + TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor()); TQColor tmp3 ( "#FFFF99" ); TQColor tmp4 (tmp2.dark()); - TQColor tmp5 ( KGlobalSettings::textColor() ); + TQColor tmp5 ( TDEGlobalSettings::textColor() ); TQColor tmp6 ( "#EAE9E8" ); TQColor tmp7 ( "#000000" ); @@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_schema = newSchema; - TQFont f (KGlobalSettings::fixedFont()); + TQFont f (TDEGlobalSettings::fixedFont()); m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); @@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema) // set colors TQPalette p ( m_defaultStyles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -762,11 +762,11 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // TODO this reads of the KConfig object, which should be changed when // the color tab is fixed. TQPalette p ( m_styles->palette() ); - TQColor _c ( KGlobalSettings::baseColor() ); + TQColor _c ( TDEGlobalSettings::baseColor() ); p.setColor( TQColorGroup::Base, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Background", &_c ) ); - _c = KGlobalSettings::highlightColor(); + _c = TDEGlobalSettings::highlightColor(); p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(m_schema)-> readColorEntry( "Color Selection", &_c ) ); @@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font - normalcol = KGlobalSettings::textColor(); + normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); selcol = KateRendererConfig::global()->selectionColor(); docfont = *KateRendererConfig::global()->font(); diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 8e391b620..34f44bf66 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force) } // Let's get a list of all the xml files for hl - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index ab4c2f54e..50f186c8c 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -709,8 +709,8 @@ void KateView::slotStatusMsg () uint r = cursorLine() + 1; uint c = cursorColumn() + 1; - TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0)); - TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0)); + TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0)); + TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0)); TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" "); TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM "); diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index f858ae908..a7a88b945 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -1175,7 +1175,7 @@ KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_vi void KateViewEncodingAction::slotAboutToShow() { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) @@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); if (found && codecForEnc) { @@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow() void KateViewEncodingAction::setMode (int mode) { - TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames()); - doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) ); + TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames()); + doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) ); // now we don't want the encoding changed again unless the user does so using the menu. doc->setEncodingSticky( true ); doc->reloadFile(); diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 7f916c6e9..bea6ba3bc 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) TQPoint p( e->pos() - dragInfo.start ); // we've left the drag square, we can start a real drag operation now - if( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) doDrag(); return; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index da3d96da9..c996b216e 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir); - // are blocking reads possible with KProcess? + // are blocking reads possible with TDEProcess? char pwd[PATH_MAX]; (void) getcwd( pwd, PATH_MAX ); chdir( TQFile::encodeName( m_baseDir ) ); diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 7ae79d874..5b31c8166 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -775,7 +775,7 @@ void KCertPart::slotDone() { void KCertPart::slotLaunch() { KShellProcess p; p << "kcmshell" << "crypto"; -p.start(KProcess::DontCare); +p.start(TDEProcess::DontCare); } diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 7196c0e0a..2ef0ac781 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - KGlobal::locale()->setMainCatalogue("kcmshell"); + TDEGlobal::locale()->setMainCatalogue("kcmshell"); TDECmdLineArgs::init(_argc, _argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. @@ -221,7 +221,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) const TQCString lang = args->getOption("lang"); if( !lang.isNull() ) - KGlobal::locale()->setLanguage(lang); + TDEGlobal::locale()->setLanguage(lang); if (args->isSet("list")) { diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index ac4fda768..15a963678 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -209,7 +209,7 @@ KonfUpdate::log() TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly) { TQStringList result; - TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true); for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 958f38303..59ff8bc18 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -104,13 +104,13 @@ static TQString sycocaPath() if (bGlobalDatabase) { - path = KGlobal::dirs()->saveLocation("services")+"ksycoca"; + path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca"; } else { TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - path = KGlobal::dirs()->saveLocation("cache")+"ksycoca"; + path = TDEGlobal::dirs()->saveLocation("cache")+"ksycoca"; else path = TQFile::decodeName(ksycoca_env); } @@ -122,7 +122,7 @@ static TQString oldSycocaPath() { TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - return KGlobal::dirs()->saveLocation("tmp")+"ksycoca"; + return TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"; return TQString::null; } @@ -189,7 +189,7 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, file, true); } KSycocaEntry* entry = 0; if (g_allEntries) @@ -317,7 +317,7 @@ bool KBuildSycoca::build() TQStringList relFiles; - (void) KGlobal::dirs()->findAllResources( g_resource, + (void) TDEGlobal::dirs()->findAllResources( g_resource, TQString::null, true, // Recursive! true, // uniq @@ -417,7 +417,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); } KServiceGroup* entry = 0; @@ -563,10 +563,10 @@ void KBuildSycoca::save() } (*m_str) << (TQ_INT32) 0; // No more factories. // Write TDEDIRS - (*m_str) << KGlobal::dirs()->kfsstnd_prefixes(); + (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes(); (*m_str) << newTimestamp; - (*m_str) << KGlobal::locale()->language(); - (*m_str) << KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + (*m_str) << TDEGlobal::locale()->language(); + (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); (*m_str) << (*g_allResourceDirs); // Write factory data.... @@ -673,7 +673,7 @@ TQStringList KBuildSycoca::existingResourceDirs() while( !resources.empty()) { TQString res = resources.front(); - *dirs += KGlobal::dirs()->resourceDirs( res.latin1()); + *dirs += TDEGlobal::dirs()->resourceDirs( res.latin1()); resources.remove( res ); // remove this 'res' and all its duplicates } @@ -767,8 +767,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KLocale::setMainCatalogue("tdelibs"); // force generating of KLocale object. if not, the database will get // be translated - KGlobal::locale(); - KGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); + TDEGlobal::locale(); + TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); DCOPClient *dcopClient = new DCOPClient(); @@ -804,9 +804,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (incremental || !checkfiles) { KSycoca::self()->disableAutoRebuild(); // Prevent deadlock - TQString current_language = KGlobal::locale()->language(); + TQString current_language = TDEGlobal::locale()->language(); TQString ksycoca_language = KSycoca::self()->language(); - TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); if ((current_update_sig != ksycoca_update_sig) || @@ -914,9 +914,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { // These directories may have been created with 0700 permission // better delete them if they are empty - TQString applnkDir = KGlobal::dirs()->saveLocation("apps", TQString::null, false); + TQString applnkDir = TDEGlobal::dirs()->saveLocation("apps", TQString::null, false); ::rmdir(TQFile::encodeName(applnkDir)); - TQString servicetypesDir = KGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); + TQString servicetypesDir = TDEGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); ::rmdir(TQFile::encodeName(servicetypesDir)); } } diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 7c73fb226..5c1a38b4d 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { tqWarning("Can't talk to klauncher!"); - command = KGlobal::dirs()->findExe(command); + command = TDEGlobal::dirs()->findExe(command); command += " " + args.join(" "); system(command.local8Bit()); } diff --git a/kded/kded.cpp b/kded/kded.cpp index 84db43b46..efbde0011 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -106,7 +106,7 @@ Kded::Kded(bool checkUpdates, bool new_startup) TQCString cPath; TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca"); + cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"); else cPath = ksycoca_env; m_pTimer = new TQTimer(this); @@ -665,7 +665,7 @@ KUpdateD::KUpdateD() TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotNewUpdateFile())); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kconf_update"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) diff --git a/kded/khostname.cpp b/kded/khostname.cpp index bd0980a2b..7e080378b 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -166,15 +166,15 @@ void KHostName::changeX() // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it if (!xauthlocalhostname || oldNetId != xauthlocalhostname) { - cmd = "xauth -n remove "+KProcess::quote(netId); + cmd = "xauth -n remove "+TDEProcess::quote(netId); system(TQFile::encodeName(cmd)); } cmd = "xauth -n add "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -236,7 +236,7 @@ void KHostName::changeDcop() ::symlink(fname.data(), compatLink.data()); // Compatibility link // Update .ICEauthority - TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId); FILE *iceFile = popen(TQFile::encodeName(cmd), "r"); if (!iceFile) { @@ -272,13 +272,13 @@ void KHostName::changeDcop() continue; cmd = "iceauth add "; - cmd += KProcess::quote(protName); + cmd += TDEProcess::quote(protName); cmd += " '' "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -288,7 +288,7 @@ void KHostName::changeDcop() char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) { - TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId); system(TQFile::encodeName(cmd)); unlink(origFName.data()); origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link @@ -299,8 +299,8 @@ void KHostName::changeDcop() void KHostName::changeStdDirs(const TQCString &type) { // We make links to the old dirs cause we can't delete the old dirs. - TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); - TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); + TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); + TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); KDE_struct_stat st_buf; diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index e147dcfaf..b00b3553d 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -441,10 +441,10 @@ VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool kee if (TQDir::isRelativePath(dir) && !keepRelativeToCfg) { - dir = KGlobal::dirs()->findResource("xdgconf-menu", dir); + dir = TDEGlobal::dirs()->findResource("xdgconf-menu", dir); } - dir = KGlobal::dirs()->realPath(dir); + dir = TDEGlobal::dirs()->realPath(dir); return dir; } @@ -642,7 +642,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) else if( e.tagName() == "MergeDir") { TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"), true); - TQStringList dirs = KGlobal::dirs()->findDirs("xdgconf-menu", dir); + TQStringList dirs = TDEGlobal::dirs()->findDirs("xdgconf-menu", dir); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { @@ -653,12 +653,12 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) if (!TQDir::isRelativePath(dir)) { // Absolute - fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); + fileList = TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); } else { // Relative - (void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); + (void) TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); } for(TQStringList::ConstIterator it=fileList.begin(); @@ -699,7 +699,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir) if (!baseDir.isEmpty()) { if (!TQDir::isRelativePath(baseDir)) - m_docInfo.baseDir = KGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); + m_docInfo.baseDir = TDEGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); else m_docInfo.baseDir = baseDir; } @@ -743,7 +743,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir m_docInfo.baseName = fileName.left( fileName.length() - 5 ); TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName); - TQStringList result = KGlobal::dirs()->findAllResources("xdgconf-menu", baseName); + TQStringList result = TDEGlobal::dirs()->findAllResources("xdgconf-menu", baseName); while( !result.isEmpty() && (result[0] != basePath)) result.remove(result.begin()); @@ -830,13 +830,13 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName) void VFolderMenu::initDirs() { - m_defaultDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes()); + m_defaultDataDirs = TQStringList::split(':', TDEGlobal::dirs()->kfsstnd_prefixes()); TQString localDir = m_defaultDataDirs.first(); m_defaultDataDirs.remove(localDir); // Remove local dir - m_defaultAppDirs = KGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); - m_defaultDirectoryDirs = KGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); - m_defaultLegacyDirs = KGlobal::dirs()->resourceDirs("apps"); + m_defaultAppDirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); + m_defaultDirectoryDirs = TDEGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); + m_defaultLegacyDirs = TDEGlobal::dirs()->resourceDirs("apps"); } void @@ -1038,7 +1038,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; TQRegExp files("\\.(desktop|kdelnk)$"); TQRegExp dirs("\\.directory$"); - (void) KGlobal::dirs()->findAllResources( "apps", + (void) TDEGlobal::dirs()->findAllResources( "apps", TQString::null, true, // Recursive! true, // uniq @@ -1629,7 +1629,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad) m_legacyLoaded = false; m_appsInfo = 0; - TQStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu"); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs("xdgconf-menu"); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 292c4de13..dda8fa324 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -42,9 +42,9 @@ TQString HelpProtocol::langLookup(const TQString& fname) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle"); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 577d0341d..1c47ec43f 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -100,7 +100,7 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kio_help"); TDEInstance ins("meinproc"); - KGlobal::locale(); + TDEGlobal::locale(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -171,7 +171,7 @@ int main(int argc, char **argv) { chdir( TQFile::encodeName( file.dirPath( true ) ) ); TQString cmd = exe; cmd += " --catalogs --valid --noout "; - cmd += KProcess::quote(file.fileName()); + cmd += TDEProcess::quote(file.fileName()); cmd += " 2>&1"; FILE *xmllint = popen( TQFile::encodeName( cmd ), "r"); char buf[ 512 ]; diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index fc125b5e2..6559a2b9e 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value ) TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); globalConfig->setGroup( uicol->configGroup ); c = globalConfig->readColorEntry( uicol->configEntry, &c ); } diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index b8d445900..674a3f3c6 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -77,11 +77,11 @@ using namespace khtml; SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name) : TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin), - m_font(KGlobalSettings::fixedFont()) + m_font(TDEGlobalSettings::fixedFont()) { verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height()); viewport()->setBackgroundMode(TQt::NoBackground); - m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); } SourceDisplay::~SourceDisplay() @@ -296,7 +296,7 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b setMainWidget(page); TQLabel *iconLabel = new TQLabel("",page); - iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical", + iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical", KIcon::NoGroup,KIcon::SizeMedium, KIcon::DefaultState,0,true)); @@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_execsAlloc = 0; m_steppingDepth = 0; - m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height()); TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true); m_emptyIcon.setMask(emptyMask); @@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) // frame list & code TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget); TQSplitter *vsplitter = new TQSplitter(hsplitter); - TQFont font(KGlobalSettings::fixedFont()); + TQFont font(TDEGlobalSettings::fixedFont()); TQWidget *contextContainer = new TQWidget(vsplitter); diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index ee36ddd1b..426c68343 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const case BrowserLanguage: case Language: case UserLanguage: - return String(KGlobal::locale()->language()); + return String(TDEGlobal::locale()->language()); case UserAgent: return String(userAgent); case Platform: diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 8d96380ab..e557497e0 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const KWinModule info(0, KWinModule::INFO_DESKTOP); #endif TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget(); - TQRect sg = KGlobalSettings::desktopGeometry(thisWidget); + TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget); switch( token ) { case Height: @@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const case ScreenX: { if (!part->view()) return Undefined(); - TQRect sg = KGlobalSettings::desktopGeometry(part->view()); + TQRect sg = TDEGlobalSettings::desktopGeometry(part->view()); return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x()); } case ScreenTop: case ScreenY: { if (!part->view()) return Undefined(); - TQRect sg = KGlobalSettings::desktopGeometry(part->view()); + TQRect sg = TDEGlobalSettings::desktopGeometry(part->view()); return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y()); } case ScrollX: { @@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) return; } - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); if ( width > sg.width() || height > sg.height() ) { kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<<width<<","<<height<<")" << endl; @@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); + TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget()); if (key == "left" || key == "screenx") { winargs.x = (int)val.toFloat() + screen.x(); @@ -1951,7 +1951,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { TQWidget * tl = widget->topLevelWidget(); - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) ); // Security check (the spec talks about UniversalBrowserWrite to disable this check...) @@ -1971,7 +1971,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { TQWidget * tl = widget->topLevelWidget(); - TQRect sg = KGlobalSettings::desktopGeometry(tl); + TQRect sg = TDEGlobalSettings::desktopGeometry(tl); TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() ); // Security check (the spec talks about UniversalBrowserWrite to disable this check...) diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index b7ae2a8f4..7477679bc 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) if(view && view->part()) enc = view->part()->encoding(); } - if((codec = KGlobal::charsets()->codecForName(enc.latin1()))) + if((codec = TDEGlobal::charsets()->codecForName(enc.latin1()))) break; } } @@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) TQString val = static_cast<HTMLInputElementImpl*>(current)->value().string().stripWhiteSpace(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - path.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + path.setPath(TDEGlobalSettings::documentPath() + val); } else { path = KURL::fromPathOrURL(val); } @@ -1609,8 +1609,8 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis TQString val = value().string(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - fileurl.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + fileurl.setPath(TDEGlobalSettings::documentPath() + val); } else { fileurl = KURL::fromPathOrURL(val); } diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 2329e2325..50e3ea69e 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -129,7 +129,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser(_view, _doc); m_executingScript = 0; m_autoCloseTimer = 0; @@ -144,7 +144,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser( i, _doc ); m_executingScript = 0; m_autoCloseTimer = 0; diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 48eb7b764..dbe80305e 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -46,20 +46,20 @@ private: bool processKilled; }; -KJavaProcess::KJavaProcess() : KProcess() +KJavaProcess::KJavaProcess() : TDEProcess() { d = new KJavaProcessPrivate; d->BufferList.setAutoDelete( true ); d->processKilled = false; - javaProcess = this; //new KProcess(); + javaProcess = this; //new TDEProcess(); - connect( javaProcess, TQT_SIGNAL( wroteStdin( KProcess * ) ), + connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), this, TQT_SLOT( slotWroteData() ) ); connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), this, TQT_SLOT( slotReceivedData(int, int&) ) ); - connect( javaProcess, TQT_SIGNAL( processExited (KProcess *) ), - this, TQT_SLOT( slotExited (KProcess *) ) ); + connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ), + this, TQT_SLOT( slotExited (TDEProcess *) ) ); d->jvmPath = "java"; d->mainClass = "-help"; @@ -303,11 +303,11 @@ bool KJavaProcess::invokeJVM() tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) ); kdDebug(6100) << argStr << endl; - KProcess::Communication flags = (KProcess::Communication) - (KProcess::Stdin | KProcess::Stdout | - KProcess::NoRead); + TDEProcess::Communication flags = (TDEProcess::Communication) + (TDEProcess::Stdin | TDEProcess::Stdout | + TDEProcess::NoRead); - const bool rval = javaProcess->start( KProcess::NotifyOnExit, flags ); + const bool rval = javaProcess->start( TDEProcess::NotifyOnExit, flags ); if( rval ) javaProcess->resume(); //start processing stdout on the java process else @@ -382,7 +382,7 @@ void KJavaProcess::slotReceivedData( int fd, int& len ) len = num_bytes + num_bytes_msg; } -void KJavaProcess::slotExited( KProcess *process ) +void KJavaProcess::slotExited( TDEProcess *process ) { if (process == javaProcess) { int status = -1; diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h index 280701233..4768bc382 100644 --- a/khtml/java/kjavaprocess.h +++ b/khtml/java/kjavaprocess.h @@ -39,7 +39,7 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public KProcess //QObject +class KJavaProcess : public TDEProcess //QObject { Q_OBJECT @@ -64,7 +64,7 @@ public: /** * Returns the status of the java Process- true if it's ok, false if it has died. - * It calls KProcess::isRunning() + * It calls TDEProcess::isRunning() */ bool isRunning(); @@ -139,7 +139,7 @@ protected slots: /** * This slot is called when the Java Process exited. */ - void slotExited( KProcess *process ); + void slotExited( TDEProcess *process ); protected: virtual bool invokeJVM(); @@ -150,7 +150,7 @@ protected: void sendBuffer( TQByteArray* buff ); void storeSize( TQByteArray* buff ); - KProcess* javaProcess; + TDEProcess* javaProcess; signals: void received( const TQByteArray& ); diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 3f94dcd17..44c060b61 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -897,8 +897,8 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, downloadViaKIO = false; KURL cleanDest = destURL; cleanDest.setPass( TQString::null ); // don't put password into commandline - cmd += " " + KProcess::quote(url.url()) + " " + - KProcess::quote(cleanDest.url()); + cmd += " " + TDEProcess::quote(url.url()) + " " + + TDEProcess::quote(cleanDest.url()); kdDebug(1000) << "Calling command "<<cmd<<endl; KRun::runCommand(cmd); } diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index c2eee7d17..6b5662882 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -120,7 +120,7 @@ void KHTMLFactory::ref() // that the factory gets deleted from within a qPostRoutine, called // from the TQApplication destructor. That however is too late, because // we want to destruct a TDEInstance object, which involves destructing - // a KConfig object, which might call KGlobal::dirs() (in sync()) which + // a KConfig object, which might call TDEGlobal::dirs() (in sync()) which // probably is not going to work ;-) // well, perhaps I'm wrong here, but as I'm unsure I try to stay on the // safe side ;-) -> let's use a simple reference counting scheme diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index ffa1e0853..bf4566c86 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -300,13 +300,13 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) d->m_manualDetection = new KSelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); - TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); d->m_manualDetection->setItems( encodings ); d->m_manualDetection->setCurrentItem( -1 ); d->m_paSetEncoding->insert( d->m_manualDetection ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if ( config->hasGroup( "HTML Settings" ) ) { config->setGroup( "HTML Settings" ); khtml::Decoder::AutoDetectLanguage language; @@ -460,16 +460,16 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) // loadPlugins( partObject(), this, instance() ); // "khtml" catalog does not exist, our translations are in tdelibs. - // removing this catalog from KGlobal::locale() prevents problems + // removing this catalog from TDEGlobal::locale() prevents problems // with changing the language in applications at runtime -Thomas Reitelbach - KGlobal::locale()->removeCatalogue("khtml"); + TDEGlobal::locale()->removeCatalogue("khtml"); } KHTMLPart::~KHTMLPart() { //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "HTML Settings" ); config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage ); @@ -1086,7 +1086,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { if (!d->m_jsedlg) { d->m_jsedlg = new KJSErrorDlg; d->m_jsedlg->setURL(m_url.prettyURL()); - if (KGlobalSettings::showIconsOnPushButtons()) { + if (TDEGlobalSettings::showIconsOnPushButtons()) { d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase")); d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose")); } @@ -1757,7 +1757,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString url, protocol, datetime; url = reqUrl.prettyURL(); protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString doc = TQString::fromLatin1( "<html><head><title>" ); @@ -2500,7 +2500,7 @@ TQString KHTMLPart::defaultEncoding() const if ( url().protocol().startsWith( "http" ) ) return "iso-8859-1"; else - return KGlobal::locale()->encoding(); + return TDEGlobal::locale()->encoding(); } void KHTMLPart::setUserStyleSheet(const KURL &url) @@ -3800,7 +3800,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi else { float d = (float) buff.st_size/1024.0; - text = i18n("%2 (%1 K)").arg(KGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f + text = i18n("%2 (%1 K)").arg(TDEGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f } text += " "; text += com; @@ -4222,7 +4222,7 @@ void KHTMLPart::slotSetEncoding() d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false ); d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), true ); - TQString enc = KGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() ); + TQString enc = TDEGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() ); setEncoding( enc, true ); } @@ -6390,7 +6390,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event ) if( d->m_bDnd && d->m_bMousePressed && ( (!d->m_strSelectedURL.isEmpty() && !isEditable()) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) { - if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= KGlobalSettings::dndEventDelay() ) + if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= TDEGlobalSettings::dndEventDelay() ) return; TQPixmap pix; diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 431aec0ca..5c5db7341 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -292,7 +292,7 @@ void KHTMLSettings::init() KConfig global( "khtmlrc", true, false ); init( &global, true ); - KConfig *local = KGlobal::config(); + KConfig *local = TDEGlobal::config(); if ( !local ) return; @@ -369,8 +369,8 @@ void KHTMLSettings::init( KConfig * config, bool reset ) // Fonts and colors if( reset ) { d->defaultFonts = TQStringList(); - d->defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) ); - d->defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) ); + d->defaultFonts.append( config->readEntry( "StandardFont", TDEGlobalSettings::generalFont().family() ) ); + d->defaultFonts.append( config->readEntry( "FixedFont", TDEGlobalSettings::fixedFont().family() ) ); d->defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) ); @@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("HTML Settings"); config->writeEntry("ReportJSErrors", enabled); config->sync(); @@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) { d->m_jsPopupBlockerPassivePopup = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Java/JavaScript Settings"); config->writeEntry("PopupBlockerPassivePopup", enabled); config->sync(); diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 7782f1786..4cb4bb3f1 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -135,7 +135,7 @@ KHTMLImage::~KHTMLImage() bool KHTMLImage::openURL( const KURL &url ) { - static const TQString &html = KGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" ); + static const TQString &html = TDEGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" ); disposeImage(); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 14169e651..411d03f2e 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -975,13 +975,13 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); - icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); p.drawPixmap( 16, 0, icon ); - icon = KGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small ); p.drawPixmap( 0, 16, icon ); - icon = KGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small ); p.drawPixmap( 16, 32,icon ); - icon = KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ); p.drawPixmap( 32, 16, icon ); p.drawEllipse( 23, 23, 2, 2 ); @@ -994,7 +994,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) bool hasHorBar = visibleWidth() < contentsWidth(); bool hasVerBar = visibleHeight() < contentsHeight(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "HTML Settings" ); if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) { d->m_mouseScrollIndicator->show(); @@ -1269,7 +1269,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { #ifdef Q_WS_X11 - TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true ); + TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap(); @@ -2839,7 +2839,7 @@ void KHTMLView::print(bool quick) int headerHeight = 0; TQFont headerFont("Sans Serif", 8); - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true); + TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(),true); TQString headerMid = docname; TQString headerRight; @@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20; void KHTMLView::scrollBy(int dx, int dy) { - KConfigGroup cfg( KGlobal::config(), "KDE" ); + KConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", false )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index f227f4014..f75fa411d 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -97,7 +97,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type) if(enc == "visual") // hebrew visually ordered enc = "iso8859-8"; bool b; - TQTextCodec *codec = KGlobal::charsets()->codecForName(enc, b); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(enc, b); if (!b) codec = 0; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 7b085aab9..b9400f229 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -194,7 +194,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte // Link or @charset if(!charset.isEmpty()) { - TQTextCodec* c = KGlobal::charsets()->codecForName(charset); + TQTextCodec* c = TDEGlobal::charsets()->codecForName(charset); if(c->mibEnum() == 11) { // iso8859-8 (visually ordered) c = TQTextCodec::codecForName("iso8859-8-i"); @@ -256,7 +256,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof ) // TQString charset = checkCharset( buffer.buffer() ); TQTextCodec* c = 0; if (!m_charset.isEmpty()) { - c = KGlobal::charsets()->codecForName(m_charset); + c = TDEGlobal::charsets()->codecForName(m_charset); if(c->mibEnum() == 11) c = TQTextCodec::codecForName("iso8859-8-i"); } else { @@ -469,7 +469,7 @@ static TQString buildAcceptHeader() CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*) : TQObject(), CachedObject(url, Image, _cachePolicy, 0) { - static const TQString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() ); + static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() ); m = 0; p = 0; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index a0ac7b732..81005de85 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -783,7 +783,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" ); w->setMode(KFile::File | KFile::ExistingOnly); - w->completionObject()->setDir(KGlobalSettings::documentPath()); + w->completionObject()->setDir(TDEGlobalSettings::documentPath()); connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 6d6823455..319f842e7 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -272,7 +272,7 @@ void RenderWidget::updateFromElement() if ( color.isValid() || backgroundColor.isValid() ) { TQPalette pal(TQApplication::palette(m_widget)); - int contrast_ = KGlobalSettings::contrast(); + int contrast_ = TDEGlobalSettings::contrast(); int highlightVal = 100 + (2*contrast_+4)*16/10; int lowlightVal = 100 + (2*contrast_+4)*10; diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 8db2c590a..62785e204 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -1131,7 +1131,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir); - // are blocking reads possible with KProcess? + // are blocking reads possible with TDEProcess? char pwd[PATH_MAX]; (void) getcwd( pwd, PATH_MAX ); chdir( TQFile::encodeName( m_baseDir ) ); diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index 257b656c2..ba5bf063f 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) void Dummy::doBenchmark() { - KConfigGroup settings(KGlobal::config(), "bench"); + KConfigGroup settings(TDEGlobal::config(), "bench"); results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 197ceee13..3a277ecf5 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -1127,7 +1127,7 @@ void DocumentImpl::recalcStyle( StyleChange change ) // ### make the font stuff _really_ work!!!! khtml::FontDef fontDef; - TQFont f = KGlobalSettings::generalFont(); + TQFont f = TDEGlobalSettings::generalFont(); fontDef.family = f.family(); fontDef.italic = f.italic(); fontDef.weight = f.weight(); diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index c7feb1752..4e8b6c784 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -49,14 +49,14 @@ AutoStart::AutoStart( bool new_startup ) { m_startList = new AutoStartList; m_startList->setAutoDelete(true); - KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + TDEGlobal::dirs()->addResourceType("autostart", "share/autostart"); TQString xdgdirs = getenv("XDG_CONFIG_DIRS"); if (xdgdirs.isEmpty()) xdgdirs = "/etc/xdg"; TQStringList xdgdirslist = TQStringList::split( ':', xdgdirs ); for ( TQStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) { - KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); + TDEGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); } } @@ -114,8 +114,8 @@ static bool startCondition(const TQString &condition) void AutoStart::loadAutoStartList() { - TQStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); - TQStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); + TQStringList files = TDEGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); + TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); files += kdefiles; for(TQStringList::ConstIterator it = files.begin(); @@ -143,7 +143,7 @@ AutoStart::loadAutoStartList() localit != files.end(); ++localit) { - if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) { + if (((*localit).startsWith(TDEGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(TDEGlobal::dirs()->localtdedir()) == true)) { // Same local file name? TQString localOuter; TQString localInner; diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp index 650a3e129..470e7faba 100644 --- a/kinit/kdostartupconfig.cpp +++ b/kinit/kdostartupconfig.cpp @@ -126,7 +126,7 @@ int main() } startupconfigfiles << line << endl; // use even currently non-existing paths in $TDEDIRS - TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes()); + TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, TDEGlobal::dirs()->kfsstnd_prefixes()); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 9bc6b7b1b..d7e7c7e1c 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -1759,8 +1759,8 @@ int main(int argc, char **argv, char **envp) tdeinit_library_path(); // Don't make our instance the global instance // (do it only after tdeinit_library_path, that one indirectly uses KConfig, - // which seems to be buggy and always use KGlobal instead of the maching TDEInstance) - KGlobal::_instance = 0L; + // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance) + TDEGlobal::_instance = 0L; // don't change envvars before tdeinit_initsetproctitle() unsetenv("LD_BIND_NOW"); unsetenv("DYLD_BIND_AT_LAUNCH"); diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 15a0882fe..3f5510ea0 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -396,7 +396,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, } else if (fun == "reparseConfiguration()") { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl; KProtocolManager::reparseConfiguration(); IdleSlave *slave; diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 44b8b496c..ab1cc398a 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -89,9 +89,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const // firstElement() and lastElement() TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const { - static const TQString & bookmark = KGlobal::staticQString("bookmark"); - static const TQString & folder = KGlobal::staticQString("folder"); - static const TQString & separator = KGlobal::staticQString("separator"); + static const TQString & bookmark = TDEGlobal::staticQString("bookmark"); + static const TQString & folder = TDEGlobal::staticQString("folder"); + static const TQString & separator = TDEGlobal::staticQString("separator"); for( TQDomNode n = start; !n.isNull(); ) { diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 08c34061b..dc2ad0cde 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -223,8 +223,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) action->setDelayed( false ); // this flag doesn't have any UI yet - KGlobal::config()->setGroup( "Settings" ); - bool addEntriesBookmarkBar = KGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); + TDEGlobal::config()->setGroup( "Settings" ); + bool addEntriesBookmarkBar = TDEGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 96ce12896..9e6d711d2 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old void KBookmarkManager::importDesktopFiles() { KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) ); - TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); + TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); importer.import( path ); //kdDebug(7043) << internalDocument().toCString() << endl; @@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) proc << TQString::fromLatin1("--nobrowser"); proc << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks") << TQString::fromLatin1("--address") << address << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } /////// diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 30513bbf3..1c762bfb9 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -60,7 +60,7 @@ public: // to accelators, replace them with two ampersands. serviceName.replace("&", "&&"); - TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, + TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 16x16 @@ -164,7 +164,7 @@ KCustomMenuEditor::save(KConfigBase *cfg) { i++; TQString path = item->s->desktopEntryPath(); - if (TQDir::isRelativePath(path) || TQDir::isRelativePath(KGlobal::dirs()->relativeLocation("xdgdata-apps", path))) + if (TQDir::isRelativePath(path) || TQDir::isRelativePath(TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path))) path = item->s->desktopEntryName(); cfg->writePathEntry(TQString("Item%1").arg(i), path); item = (Item *) item->nextSibling(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index f9e2d237c..0f2e9f4e1 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -812,7 +812,7 @@ bool KDirOperator::checkPreviewSupport() KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" )); bool hasPreviewSupport = false; - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, ConfigGroup ); if ( kc->readBoolEntry( "Show Default Preview", true ) ) hasPreviewSupport = checkPreviewInternal(); @@ -1385,7 +1385,7 @@ void KDirOperator::setupMenu(int whichActions) actionMenu->insert( mkdirAction ); if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); - KConfig *globalconfig = KGlobal::config(); + KConfig *globalconfig = TDEGlobal::config(); KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index 85bcf9187..e644f7b98 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -82,7 +82,7 @@ namespace KIO { * connect(op, TQT_SIGNAL(finishedLoading()), * TQT_SLOT(slotLoadingFinished())); * - * op->readConfig( KGlobal::config(), "Your KDiroperator ConfigGroup" ); + * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); * \endcode * @@ -400,7 +400,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * instantiation can make use of it already. * * Note that KDirOperator does NOT take ownership of that object (typically - * it's KGlobal::config() anyway. + * it's TDEGlobal::config() anyway. * * @see viewConfig * @see viewConfigGroup diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 4a3613b98..8f8a8b299 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -133,7 +133,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, if ( localOnly && !d->startURL.isLocalFile() ) { d->startURL = KURL(); - TQString docPath = KGlobalSettings::documentPath(); + TQString docPath = TDEGlobalSettings::documentPath(); if (TQDir(docPath).exists()) d->startURL.setPath( docPath ); else @@ -146,7 +146,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->branch = createBranch( root ); - readConfig( KGlobal::config(), "DirSelect Dialog" ); + readConfig( TDEGlobal::config(), "DirSelect Dialog" ); m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); @@ -314,7 +314,7 @@ void KDirSelectDialog::accept() KFileDialog::setStartDir( url() ); KDialogBase::accept(); - saveConfig( KGlobal::config(), "DirSelect Dialog" ); + saveConfig( TDEGlobal::config(), "DirSelect Dialog" ); } diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 86dfc756d..3ab42817b 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -79,8 +79,8 @@ void KDirSize::startNextJob( const KURL & url ) void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) { - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); KIO::UDSEntryListConstIterator it = list.begin(); KIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 1e9d3a130..21338c058 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -46,11 +46,11 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) : TQObject(parent,name) { - dfProc = new KProcess(); TQ_CHECK_PTR(dfProc); + dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ), + connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), this, TQT_SLOT(dfDone() ) ); readingDFStdErrOut=false; @@ -68,7 +68,7 @@ KDiskFreeSp::~KDiskFreeSp() /*************************************************************************** * is called, when the df-command writes on StdOut **/ -void KDiskFreeSp::receivedDFStdErrOut(KProcess *, char *data, int len) +void KDiskFreeSp::receivedDFStdErrOut(TDEProcess *, char *data, int len) { TQCString tmp(data,len+1); // adds a zero-byte dfStringErrOut.append(tmp); @@ -85,7 +85,7 @@ int KDiskFreeSp::readDF( const TQString & mountPoint ) dfStringErrOut=""; // yet no data received dfProc->clearArguments(); (*dfProc) << TQString::fromLocal8Bit(DF_COMMAND) << TQString::fromLocal8Bit(DF_ARGS); - if (!dfProc->start( KProcess::NotifyOnExit, KProcess::AllOutput )) + if (!dfProc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput )) kdError() << "could not execute ["<< DF_COMMAND << "]" << endl; return 1; } diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index b7286f2df..7b9fc6238 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -31,7 +31,7 @@ #include <tdelibs_export.h> -class KProcess; +class TDEProcess; /** * This class parses the output of "df" to find the disk usage @@ -72,11 +72,11 @@ signals: void done(); private slots: - void receivedDFStdErrOut(KProcess *, char *data, int len); + void receivedDFStdErrOut(TDEProcess *, char *data, int len); void dfDone(); private: - KProcess *dfProc; + TDEProcess *dfProc; TQCString dfStringErrOut; TQString m_mountPoint; bool readingDFStdErrOut; diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..183023cf5 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,14 +54,14 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); - TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found); if (found) { diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..1bc6f6257 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -234,7 +234,7 @@ void KFileDetailView::selected( TQListViewItem *item ) if ( !item ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileListViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -671,7 +671,7 @@ void KFileListViewItem::init() KFileListViewItem::setPixmap( COL_NAME, inf->pixmap(KIcon::SizeSmall)); setText( COL_NAME, inf->text() ); - setText( COL_SIZE, KGlobal::locale()->formatNumber( inf->size(), 0)); + setText( COL_SIZE, TDEGlobal::locale()->formatNumber( inf->size(), 0)); setText( COL_DATE, inf->timeString() ); setText( COL_PERM, inf->permissionsString() ); setText( COL_OWNER, inf->user() ); diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 1decc462e..5e1634144 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -185,7 +185,7 @@ KFileDialog::~KFileDialog() { hide(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->urlBar) d->urlBar->save( config ); @@ -672,7 +672,7 @@ void KFileDialog::accept() locationEdit->insertItem( file, 1 ); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -751,7 +751,7 @@ void KFileDialog::multiSelectionChanged() return; } - static const TQString &begin = KGlobal::staticQString(" \""); + static const TQString &begin = TDEGlobal::staticQString(" \""); KFileItemListIterator it ( *list ); TQString text; while ( (item = it.current()) ) { @@ -857,7 +857,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); KURL docPath; - docPath.setPath( KGlobalSettings::documentPath() ); + docPath.setPath( TDEGlobalSettings::documentPath() ); if ( (u.path(+1) != docPath.path(+1)) && TQDir(docPath.path(+1)).exists() ) { @@ -867,7 +867,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); } - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); text = i18n("Desktop: %1").arg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), @@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge initGUI(); // activate GM - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); readRecentFiles( config ); adjustSize(); @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const d->urlList.clear(); if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename - static const TQString &prot = KGlobal::staticQString(":/"); + static const TQString &prot = TDEGlobal::staticQString(":/"); KURL u; if ( d->filenames.find( prot ) != -1 ) u = d->filenames; @@ -1717,16 +1717,16 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) autoDirectoryFollowing = kc->readBoolEntry( AutoDirectoryFollowing, DefaultDirectoryFollowing ); - KGlobalSettings::Completion cm = (KGlobalSettings::Completion) + TDEGlobalSettings::Completion cm = (TDEGlobalSettings::Completion) kc->readNumEntry( PathComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) combo->setCompletionMode( cm ); - cm = (KGlobalSettings::Completion) + cm = (TDEGlobalSettings::Completion) kc->readNumEntry( LocationComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) locationEdit->setCompletionMode( cm ); // show or don't show the speedbar @@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel() ops->close(); KDialogBase::slotCancel(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -2332,7 +2332,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir, if ( useDefaultStartDir ) { if (lastDirectory->isEmpty()) { - lastDirectory->setPath(KGlobalSettings::documentPath()); + lastDirectory->setPath(TDEGlobalSettings::documentPath()); KURL home; home.setPath( TQDir::homeDirPath() ); // if there is no docpath set (== home dir), we prefer the current diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 10b8285c1..a9882d56f 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -365,7 +365,7 @@ void KFileIconView::selected( TQIconViewItem *item ) if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -547,7 +547,7 @@ void KFileIconView::slotLargeRows() // setIconSize() all call arrangeItemsInGrid() :( Prevent this. d->noArrangement = true; // stop arrangeItemsInGrid()! - setGridX( KGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); + setGridX( TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); setItemTextPos( Bottom ); setArrangement( LeftToRight ); setWordWrapIconText( true ); diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 0a2798ae6..e9b4c2673 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -45,7 +45,7 @@ class KFileSharePropsPlugin::Private { public: TQVBox *m_vBox; - KProcess *m_configProc; + TDEProcess *m_configProc; bool m_bAllShared; bool m_bAllUnshared; bool m_bAllReadOnly; @@ -86,7 +86,7 @@ bool KFileSharePropsPlugin::supports( const KFileItemList& items ) if ( !(*it)->isDir() || !isLocal ) return false; // And sharing the trash doesn't make sense - if ( isLocal && (*it)->url().path( 1 ) == KGlobalSettings::trashPath() ) + if ( isLocal && (*it)->url().path( 1 ) == TDEGlobalSettings::trashPath() ) return false; } return true; @@ -236,15 +236,15 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() { if (d->m_configProc) return; - d->m_configProc = new KProcess(this); + d->m_configProc = new TDEProcess(this); (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; - if (!d->m_configProc->start( KProcess::NotifyOnExit )) + if (!d->m_configProc->start( TDEProcess::NotifyOnExit )) { delete d->m_configProc; d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(KProcess *)), + connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..9ab3b8ee5 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -35,24 +35,24 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) : KURLBar( true, parent, name ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", true ); setIconSize(KIcon::SizeSmallMedium); - readConfig( KGlobal::config(), "KFileDialog Speedbar" ); + readConfig( TDEGlobal::config(), "KFileDialog Speedbar" ); if ( m_initializeSpeedbar ) { KURL u; - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); insertItem( u, i18n("Desktop"), false ); //TODO: win32 - if ((KGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && - TQDir(KGlobalSettings::documentPath()).exists()) + if ((TDEGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && + TQDir(TDEGlobalSettings::documentPath()).exists()) { - u.setPath( KGlobalSettings::documentPath() ); + u.setPath( TDEGlobalSettings::documentPath() ); insertItem( u, i18n("Documents"), false, "folder_txt" ); } diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..b32746aa6 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -171,7 +171,7 @@ void KFileView::sortReversed() #if 0 int KFileView::compareItems(const KFileItem *fi1, const KFileItem *fi2) const { - static const TQString &dirup = KGlobal::staticQString(".."); + static const TQString &dirup = TDEGlobal::staticQString(".."); bool bigger = true; bool keepFirst = false; bool dirsFirst = ((m_sorting & TQDir::DirsFirst) == TQDir::DirsFirst); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 3d0b6be8f..dfbf47d0d 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -241,7 +241,7 @@ KIconDialog::KIconDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Select Icon"), Ok|Cancel, Ok) { d = new KIconDialogPrivate; - mpLoader = KGlobal::iconLoader(); + mpLoader = TDEGlobal::iconLoader(); init(); } @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = TDEGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -660,7 +660,7 @@ class KIconButton::KIconButtonPrivate KIconButton::KIconButton(TQWidget *parent, const char *name) : TQPushButton(parent, name) { - init( KGlobal::iconLoader() ); + init( TDEGlobal::iconLoader() ); } KIconButton::KIconButton(KIconLoader *loader, diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..c55acaf9e 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -35,7 +35,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) : KPreviewWidgetBase( parent ), m_job( 0L ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); autoMode = config->readBoolEntry( "Automatic Preview", true ); @@ -70,7 +70,7 @@ KImageFilePreview::~KImageFilePreview() if ( m_job ) m_job->kill(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); config->writeEntry( "Automatic Preview", autoPreview->isChecked() ); } diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index d82c4523b..c349693e5 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -250,7 +250,7 @@ bool KFileMetaPropsPlugin::supports( KFileItemList _items ) if (KExecPropsPlugin::supports(_items) || KURLPropsPlugin::supports(_items)) return false; // Having both is redundant. - bool metaDataEnabled = KGlobalSettings::showFilePreview(_items.first()->url()); + bool metaDataEnabled = TDEGlobalSettings::showFilePreview(_items.first()->url()); return _items.count() == 1 && metaDataEnabled; } diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index ebaadaa76..69d7be4e8 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -864,8 +864,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); TQStringList soundDirs = - KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; @@ -920,8 +920,8 @@ void KNotifyWidget::playSound() // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); - TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { TQDir dir; diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 1f758a01b..ef5d356fd 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -71,7 +71,7 @@ public: KNotifyDialog( TQWidget *parent = 0, const char *name = 0, bool modal = true, const TDEAboutData *aboutData = - KGlobal::instance()->aboutData() ); + TDEGlobal::instance()->aboutData() ); /** * Destroys the KNotifyDialog */ @@ -88,7 +88,7 @@ public: * @return The value of TQDialog::exec() */ static int configure( TQWidget *parent = 0, const char *name = 0, - const TDEAboutData *aboutData = KGlobal::instance()->aboutData() ); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData() ); /** * With this method, you can add the KNotify events of one eventsrc diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index c8623ced2..9a3fcabd1 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -171,7 +171,7 @@ bool TDEApplicationTree::isDirSel() static TQPixmap appIcon(const TQString &iconName) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { @@ -412,13 +412,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // init the history combo and insert it into the URL-Requester KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), - KGlobalSettings::completionMode()); - combo->setCompletionMode((KGlobalSettings::Completion)mode); + TDEGlobalSettings::completionMode()); + combo->setCompletionMode((TDEGlobalSettings::Completion)mode); TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); @@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") @@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using @@ -813,7 +813,7 @@ void KOpenWithDlg::accept() if ( combo ) { combo->addToHistory( edit->url() ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); kc->writeEntry(TQString::fromLatin1("CompletionMode"), diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp index 9fd91cc7b..3672f4387 100644 --- a/kio/kfile/kpreviewprops.cpp +++ b/kio/kfile/kpreviewprops.cpp @@ -66,7 +66,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) { if ( _items.count() != 1) return false; - if( !KGlobalSettings::showFilePreview(_items.first()->url())) + if( !TDEGlobalSettings::showFilePreview(_items.first()->url())) return false; KMimeType::Ptr mt = KMimeType::findByURL( _items.first()->url() ); if ( mt->inherits("inode/directory") || mt->name() == "application/octet-stream" ) diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index a1076c134..94b95a2b6 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -885,7 +885,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); - iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); + iconLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); @@ -1041,7 +1041,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1052,7 +1052,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1063,7 +1063,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } } @@ -1139,7 +1139,7 @@ void KFilePropsPlugin::slotEditFileType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) - + " " + KProcess::quote(mime), + + " " + TDEProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif } @@ -1162,16 +1162,16 @@ void KFilePropsPlugin::determineRelativePath( const TQString & path ) TQStringList dirs; if (KBindingPropsPlugin::supports(properties->items())) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("mime", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("mime", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; } else { - m_sRelativePath =KGlobal::dirs()->relativeLocation("apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("apps", path); if (m_sRelativePath.startsWith("/")) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; else @@ -1220,7 +1220,7 @@ void KFilePropsPlugin::slotDirSizeUpdate() KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1236,7 +1236,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1755,8 +1755,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) kcom->addItem(TQString::fromLatin1(user->pw_name)); endpwent(); - usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : - KGlobalSettings::CompletionNone); + usrEdit->setCompletionMode((i < maxEntries) ? TDEGlobalSettings::CompletionAuto : + TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -1833,7 +1833,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setItems(groupList); grpEdit->setCompletionObject(kcom, true); grpEdit->setAutoDeleteCompletionObject( true ); - grpEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -3402,11 +3402,11 @@ void KDesktopPropsPlugin::applyChanges() config.sync(); // KSycoca update needed? - TQString sycocaPath = KGlobal::dirs()->relativeLocation("apps", path); + TQString sycocaPath = TDEGlobal::dirs()->relativeLocation("apps", path); bool updateNeeded = !sycocaPath.startsWith("/"); if (!updateNeeded) { - sycocaPath = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + sycocaPath = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); updateNeeded = !sycocaPath.startsWith("/"); } if (updateNeeded) @@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3499,7 +3499,7 @@ void KDesktopPropsPlugin::slotAdvanced() { w->suidEdit->setCompletionObject(kcom, true); w->suidEdit->setAutoDeleteCompletionObject( true ); - w->suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + w->suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { @@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3773,7 +3773,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) { suidEdit->setCompletionObject(kcom, true); suidEdit->setAutoDeleteCompletionObject( true ); - suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..609668373 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -34,7 +34,7 @@ static void recentdirs_done(KConfig *config) { - if (config == KGlobal::config()) + if (config == TDEGlobal::config()) { config->sync(); } @@ -57,14 +57,14 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re else { key = key.mid(1); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); if (result.isEmpty()) { - result.append(KGlobalSettings::documentPath()); + result.append(TDEGlobalSettings::documentPath()); } return config; } diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 7ad690be4..d91e7551f 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -79,14 +79,14 @@ void KRecentDocument::add(const KURL& url) void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; TQString openStr = url.url(); openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString oldGrp = config->group(); config->setGroup(TQString::fromLatin1("RecentDocuments")); bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); @@ -169,7 +169,7 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index ee79b4e58..1d2cf1547 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -142,7 +142,7 @@ void KURLBarItem::setIcon( const TQString& icon, KIcon::Group group ) if ( icon.isEmpty() ) m_pixmap = KMimeType::pixmapForURL( m_url, 0, group, iconSize() ); else - m_pixmap = KGlobal::iconLoader()->loadIcon( icon, group, iconSize(), + m_pixmap = TDEGlobal::iconLoader()->loadIcon( icon, group, iconSize(), KIcon::DefaultState ); } @@ -585,7 +585,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize ); if ( m_useGlobal ) { // read global items - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); int num = globalConfig->readNumEntry( "Number of Entries" ); for ( int i = 0; i < num; i++ ) { @@ -977,10 +977,10 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( allowGlobal ) { TQString appName; - if ( KGlobal::instance()->aboutData() ) - appName = KGlobal::instance()->aboutData()->programName(); + if ( TDEGlobal::instance()->aboutData() ) + appName = TDEGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::fromLatin1( TDEGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..e01be4548 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -81,7 +81,7 @@ void KURLComboBox::init( Mode mode ) TQStringList KURLComboBox::urls() const { kdDebug(250) << "::urls()" << endl; - //static const TQString &fileProt = KGlobal::staticQString("file:"); + //static const TQString &fileProt = TDEGlobal::staticQString("file:"); TQStringList list; TQString url; for ( int i = defaultList.count(); i < count(); i++ ) { diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index e131bda3a..cf28557f8 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -66,7 +66,7 @@ void testFrame::showPath( const KURL &url ) { TQString fname = "TestBranch"; // url.fileName (); /* try a user icon */ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); TQPixmap pix = loader->loadIcon( "contents2", KIcon::Small ); TQPixmap pixOpen = loader->loadIcon( "contents", KIcon::Small ); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index f85995a61..b0ecabcc6 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) if (argv1 == TQString::fromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); - op->setViewConfig( KGlobal::config(), "TestGroup" ); + op->setViewConfig( TDEGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); op->show(); a.setMainWidget(op); diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 12eacab5d..3f16f565f 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -89,8 +89,8 @@ void DefaultProgress::init() #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), @@ -470,7 +470,7 @@ void DefaultProgress::checkDestination(const KURL& dest) { bool ok = true; if ( dest.isLocalFile() ) { TQString path = dest.path( -1 ); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource @@ -486,17 +486,17 @@ void DefaultProgress::checkDestination(const KURL& dest) { void DefaultProgress::slotOpenFile() { - KProcess proc; + TDEProcess proc; proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::slotOpenLocation() { - KProcess proc; + TDEProcess proc; d->location.setFileName(""); proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::virtual_hook( int id, void* data ) diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 1ad304a41..63ba82921 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -45,7 +45,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size ) { if ( size >= 1024 ) - return convertSize( size ) + " (" + i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(size, 0) ) + ")"; + return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; else return convertSize( size ); } @@ -59,26 +59,26 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size ) { fsize /= 1073741824.0; if ( fsize > 1024 ) // Tera-byte - s = i18n( "%1 TB" ).arg( KGlobal::locale()->formatNumber(fsize / 1024.0, 1)); + s = i18n( "%1 TB" ).arg( TDEGlobal::locale()->formatNumber(fsize / 1024.0, 1)); else - s = i18n( "%1 GB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 GB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Mega-byte else if ( size >= 1048576 ) { fsize /= 1048576.0; - s = i18n( "%1 MB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 MB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Kilo-byte else if ( size >= 1024 ) { fsize /= 1024.0; - s = i18n( "%1 KB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 KB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Just byte else if ( size > 0 ) { - s = i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(fsize, 0)); + s = i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(fsize, 0)); } // Nothing else @@ -117,7 +117,7 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds ) seconds = (seconds - (days * 86400) - (hours * 3600) - (mins * 60)); const TQTime time(hours, mins, seconds); - const TQString timeStr( KGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); + const TQString timeStr( TDEGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); if ( days > 0 ) return i18n("1 day %1", "%n days %1", days).arg(timeStr); else @@ -477,7 +477,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 url = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); ret << errorName; @@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT protocol = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString errorName, techName, description; @@ -1666,7 +1666,7 @@ static TQString get_mount_info(const TQString& filename, gotDevice = true; if (stat_buf.st_dev == rootDevice) { - static const TQString &root = KGlobal::staticQString("/"); + static const TQString &root = TDEGlobal::staticQString("/"); isautofs = Wrong; isslow = Wrong; ismanual = Wrong; diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 69b363392..3bbb72432 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -298,7 +298,7 @@ void Job::showErrorDialog( TQWidget * parent ) // Show a message box, except for "user canceled" or "no content" if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) { //old plain error message - //kdDebug(7007) << "Default language: " << KGlobal::locale()->defaultLanguage() << endl; + //kdDebug(7007) << "Default language: " << TDEGlobal::locale()->defaultLanguage() << endl; if ( 1 ) KMessageBox::queuedMessageBox( parent, KMessageBox::Error, errorString() ); #if 0 diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 76cf7836b..17a220541 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -98,7 +98,7 @@ TQPixmap KDataToolInfo::icon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("icon"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; @@ -112,7 +112,7 @@ TQPixmap KDataToolInfo::miniIcon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("mini"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("mini"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 0641645a6..b6905b3a3 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -951,8 +951,8 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes; // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -1539,8 +1539,8 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) fileItems.insert( (*kit)->url().url(), *kit ); } - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KFileItem *item = 0, *tmp; @@ -1979,8 +1979,8 @@ void KDirLister::emitChanges() if ( d->changes == NONE ) return; - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); for ( KURL::List::Iterator it = d->lstDirs.begin(); it != d->lstDirs.end(); ++it ) @@ -2180,7 +2180,7 @@ bool KDirLister::matchesMimeFilter( const TQString& mime ) const bool KDirLister::matchesFilter( const KFileItem *item ) const { Q_ASSERT( item ); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); if ( item->text() == dotdot ) return false; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index 330e6cd39..580de16cc 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(KGlobal::config(), TQCString("DirWatch")); + KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/kio/kio/kfilefilter.cpp b/kio/kio/kfilefilter.cpp index 05c53c02c..c927804b5 100644 --- a/kio/kio/kfilefilter.cpp +++ b/kio/kio/kfilefilter.cpp @@ -79,8 +79,8 @@ void KSimpleFileFilter::setModeFilter( mode_t mode ) bool KSimpleFileFilter::passesFilter( const KFileItem *item ) const { - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); const TQString& name = item->name(); diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index cf903f712..50ee1a5d2 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -261,7 +261,7 @@ void KFileItem::readUDSEntry( bool _urlIsDirectory ) } // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); + static const TQString& dot = TDEGlobal::staticQString("."); if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot ) m_url.addPath( m_strName ); } @@ -602,7 +602,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const if ( !m_pMimeType ) { static const TQString & defaultFolderIcon = - KGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); + TDEGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); if ( S_ISDIR( m_fileMode ) ) return DesktopIcon( defaultFolderIcon, _size, _state ); @@ -672,7 +672,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { p = DesktopIcon( sysIconName.ascii(), _size, _state ); } } @@ -688,7 +688,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; p = DesktopIcon( entry->name, _size, _state ); break; @@ -1137,7 +1137,7 @@ TQString KFileItem::timeString( unsigned int which ) const TQDateTime t; t.setTime_t( time_); - return KGlobal::locale()->formatDateTime( t ); + return TDEGlobal::locale()->formatDateTime( t ); } void KFileItem::setMetaInfo( const KFileMetaInfo & info ) @@ -1151,7 +1151,7 @@ const KFileMetaInfo & KFileItem::metaInfo(bool autoget, int) const KURL url = mostLocalURL(isLocalURL); if ( autoget && !m_metaInfo.isValid() && - KGlobalSettings::showFilePreview(url) ) + TDEGlobalSettings::showFilePreview(url) ) { m_metaInfo = KFileMetaInfo( url, mimetype() ); } diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index d04a22ca1..c345ef89e 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1634,11 +1634,11 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle return KIO::convertSizeFromKB(value.toInt()); } else - s = KGlobal::locale()->formatNumber( value.toInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toInt() , 0); break; case TQVariant::LongLong : - s = KGlobal::locale()->formatNumber( value.toLongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toLongLong(), 0 ); break; case TQVariant::ULongLong : @@ -1647,27 +1647,27 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle else if ( unit() == KFileMimeTypeInfo::KiloBytes ) return KIO::convertSizeFromKB( value.toULongLong() ); else - s = KGlobal::locale()->formatNumber( value.toULongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 ); break; case TQVariant::UInt : - s = KGlobal::locale()->formatNumber( value.toUInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toUInt() , 0); break; case TQVariant::Double : - s = KGlobal::locale()->formatNumber( value.toDouble(), 3); + s = TDEGlobal::locale()->formatNumber( value.toDouble(), 3); break; case TQVariant::Date : - s = KGlobal::locale()->formatDate( value.toDate(), true ); + s = TDEGlobal::locale()->formatDate( value.toDate(), true ); break; case TQVariant::Time : - s = KGlobal::locale()->formatTime( value.toTime(), true ); + s = TDEGlobal::locale()->formatTime( value.toTime(), true ); break; case TQVariant::DateTime : - s = KGlobal::locale()->formatDateTime( value.toDateTime(), + s = TDEGlobal::locale()->formatDateTime( value.toDateTime(), true, true ); break; diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 1f6dca285..bf8cdca1d 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -181,7 +181,7 @@ void KFileShare::readShareList() } KProcIO proc; proc << exe; - if ( !proc.start( KProcess::Block ) ) { + if ( !proc.start( TDEProcess::Block ) ) { kdError() << "Can't run " << exe << endl; s_authorization = ErrorNotFound; return; @@ -264,11 +264,11 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) return false; // we want to share, so we kick it first - just to be sure - KProcess proc; + TDEProcess proc; proc << exe; proc << "--remove"; proc << path; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); proc.clearArguments(); proc << exe; @@ -279,7 +279,7 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) else proc << "--remove"; proc << path; - proc.start( KProcess::Block ); // should be ok, the perl script terminates fast + proc.start( TDEProcess::Block ); // should be ok, the perl script terminates fast bool ok = proc.normalExit() && (proc.exitStatus() == 0); kdDebug(7000) << "KFileSharePropsPlugin::setShared normalExit=" << proc.normalExit() << endl; diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index e2c4c1fa7..f639a7049 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -529,7 +529,7 @@ public: // The trick is that we also don't want the user to override globally set // directories. So we have to misuse KStandardDirs :} - TQStringList confDirs = KGlobal::dirs()->resourceDirs( "config" ); + TQStringList confDirs = TDEGlobal::dirs()->resourceDirs( "config" ); if ( !confDirs.isEmpty() ) { TQString globalConf = confDirs.last() + "kmimemagicrc"; @@ -2121,7 +2121,7 @@ KMimeMagic::KMimeMagic() TQString mimefile = locate( "mime", "magic" ); init( mimefile ); // Add snippets from share/config/magic/* - TQStringList snippets = KGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); + TQStringList snippets = TDEGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); for ( TQStringList::Iterator it = snippets.begin() ; it != snippets.end() ; ++it ) if ( !mergeConfig( *it ) ) kdWarning() << k_funcinfo << "Failed to parse " << *it << endl; diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 09a45b5ea..37867cd23 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -204,7 +204,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, TQString fileName ( _url.fileName() ); - static const TQString& slash = KGlobal::staticQString("/"); + static const TQString& slash = TDEGlobal::staticQString("/"); if ( ! fileName.isNull() && !path.endsWith( slash ) ) { // Try to find it out by looking at the filename @@ -230,9 +230,9 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, } } - static const TQString& dotdesktop = KGlobal::staticQString(".desktop"); - static const TQString& dotkdelnk = KGlobal::staticQString(".kdelnk"); - static const TQString& dotdirectory = KGlobal::staticQString(".directory"); + static const TQString& dotdesktop = TDEGlobal::staticQString(".desktop"); + static const TQString& dotkdelnk = TDEGlobal::staticQString(".kdelnk"); + static const TQString& dotdirectory = TDEGlobal::staticQString(".directory"); // Another filename binding, hardcoded, is .desktop: if ( fileName.endsWith( dotdesktop ) ) @@ -453,7 +453,7 @@ KMimeType::~KMimeType() TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( TQString::null, false ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -469,7 +469,7 @@ TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( _url, _url.isLocalFile() ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -485,7 +485,7 @@ TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_si TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, KIcon::Group _group, int _force_size, int _state, TQString * _path ) { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName = iconForURL( _url, _mode ); if (!iconLoader->extraDesktopThemesAdded()) @@ -504,7 +504,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) { const KMimeType::Ptr mt = findByURL( _url, _mode, _url.isLocalFile(), false /*HACK*/); - static const TQString& unknown = KGlobal::staticQString("unknown"); + static const TQString& unknown = TDEGlobal::staticQString("unknown"); const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() ); TQString i = mimeTypeIcon; @@ -533,7 +533,7 @@ TQString KMimeType::favIconForURL( const KURL& url ) static bool check = true; if ( check ) { check = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "HTML Settings" ); useFavIcons = config->readBoolEntry( "EnableFavicon", true ); } @@ -749,10 +749,10 @@ TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, KIcon::Group _group, int int _state, TQString * _path ) const { TQString _icon = icon( _url, _url.isLocalFile() ); - TQPixmap pix = KGlobal::iconLoader()->loadIcon( _icon, _group, + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group, _force_size, _state, _path, false ); if ( pix.isNull() ) - pix = KGlobal::iconLoader()->loadIcon( "unknown", _group, + pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group, _force_size, _state, _path, false ); return pix; } @@ -903,9 +903,9 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) ) return pid; - KProcess p; + TDEProcess p; p << "kfmclient" << args; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return p.pid(); } @@ -1152,7 +1152,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT const TQString & KMimeType::defaultMimeType() { static const TQString & s_strDefaultMimeType = - KGlobal::staticQString( "application/octet-stream" ); + TDEGlobal::staticQString( "application/octet-stream" ); return s_strDefaultMimeType; } diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 78011e143..0cb010913 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -198,7 +198,7 @@ void KMimeTypeChooser::editMimeType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) - + " " + KProcess::quote(mt), + + " " + TDEProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( KMimeTypeChooserDialog::~KMimeTypeChooserDialog() { - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); group.writeEntry("size", size()); } diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index a3d8e0302..252bdbfbd 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -189,7 +189,7 @@ KIO::CacheControl KProtocolManager::cacheControl() TQString KProtocolManager::cacheDir() { KConfig *cfg = http_config(); - return cfg->readPathEntry("CacheDir", KGlobal::dirs()->saveLocation("cache","http")); + return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http")); } int KProtocolManager::maxCacheAge() @@ -470,7 +470,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) } if( modifiers.contains('l') ) { - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index cbc72242e..2f6e9861a 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -184,7 +184,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, KURL::List lst; lst.append( u ); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); KService::Ptr offer = KServiceTypeProfile::preferredService( _mimetype, app_str ); @@ -476,8 +476,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List */ if (_service.terminal()) { - KConfigGroupSaver gs(KGlobal::config(), "General"); - TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); if (terminal == "konsole") terminal += " -caption=%c %i %m"; terminal += " "; @@ -549,7 +549,7 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) return TQString(); } -static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName, +static pid_t runCommandInternal( TDEProcess* proc, const KService* service, const TQString& binName, const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn ) { if (service && !service->desktopEntryPath().isEmpty() @@ -590,7 +590,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const data.setLaunchedBy( window->winId()); KStartupInfo::sendStartup( id, data ); } - pid_t pid = KProcessRunner::run( proc, binName, id ); + pid_t pid = TDEProcessRunner::run( proc, binName, id ); if( startup_notify && pid ) { KStartupInfoData data; @@ -602,7 +602,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const #else Q_UNUSED( execName ); Q_UNUSED( iconName ); - return KProcessRunner::run( proc, bin ); + return TDEProcessRunner::run( proc, bin ); #endif } @@ -681,9 +681,9 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls, { args = KRun::processDesktopExec(_service, _urls, false, tempFiles, suggestedFileName); } - kdDebug(7010) << "runTempService: KProcess args=" << args << endl; + kdDebug(7010) << "runTempService: TDEProcess args=" << args << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; *proc << args; if (!_service.path().isEmpty()) @@ -856,7 +856,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS TQWidget* window, const TQCString& asn ) { kdDebug(7010) << "runCommand " << cmd << "," << execName << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; proc->setUseShell(true); *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); @@ -1440,7 +1440,7 @@ void KRun::abort() void KRun::setEnableExternalBrowser(bool b) { if (b) - d->m_externalBrowser = KConfigGroup(KGlobal::config(), "General").readEntry("BrowserApplication"); + d->m_externalBrowser = KConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication"); else d->m_externalBrowser = TQString::null; } @@ -1477,27 +1477,27 @@ bool KRun::isExecutable( const TQString& serviceType ) /****************/ pid_t -KProcessRunner::run(KProcess * p, const TQString & binName) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName) { - return (new KProcessRunner(p, binName))->pid(); + return (new TDEProcessRunner(p, binName))->pid(); } #ifdef Q_WS_X11 pid_t -KProcessRunner::run(KProcess * p, const TQString & binName, const KStartupInfoId& id ) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const KStartupInfoId& id ) { - return (new KProcessRunner(p, binName, id))->pid(); + return (new TDEProcessRunner(p, binName, id))->pid(); } #endif -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) : TQObject(), process_(p), binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1505,15 +1505,15 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) } #ifdef Q_WS_X11 -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KStartupInfoId& id ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const KStartupInfoId& id ) : TQObject(), process_(p), binName( _binName ), id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1521,19 +1521,19 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KS } #endif -KProcessRunner::~KProcessRunner() +TDEProcessRunner::~TDEProcessRunner() { delete process_; } pid_t -KProcessRunner::pid() const +TDEProcessRunner::pid() const { return process_->pid(); } void -KProcessRunner::slotProcessExited(KProcess * p) +TDEProcessRunner::slotProcessExited(TDEProcess * p) { if (p != process_) return; // Eh ? diff --git a/kio/kio/krun.h b/kio/kio/krun.h index e6aa4d027..9e4bf8c44 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -30,7 +30,7 @@ #include <kurl.h> #include <kstartupinfo.h> -class KProcess; +class TDEProcess; class KService; namespace KIO { class Job; @@ -475,34 +475,34 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT KProcessRunner : public TQObject +class KIO_EXPORT TDEProcessRunner : public TQObject { Q_OBJECT public: - static pid_t run(KProcess *, const TQString & binName); + static pid_t run(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - static pid_t run(KProcess *, const TQString & binName, const KStartupInfoId& id ); + static pid_t run(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - virtual ~KProcessRunner(); + virtual ~TDEProcessRunner(); pid_t pid() const; protected slots: - void slotProcessExited(KProcess *); + void slotProcessExited(TDEProcess *); private: - KProcessRunner(KProcess *, const TQString & binName); + TDEProcessRunner(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - KProcessRunner(KProcess *, const TQString & binName, const KStartupInfoId& id ); + TDEProcessRunner(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - KProcessRunner(); + TDEProcessRunner(); - KProcess * process_; + TDEProcess * process_; TQString binName; #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded KStartupInfoId id_; diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index defeae4a7..ff5b9c104 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -151,7 +151,7 @@ bool KSambaSharePrivate::readSmbConf() { TQString name = completeLine.left(i).stripWhiteSpace().lower(); TQString value = completeLine.mid(i+1).stripWhiteSpace(); - if (name == KGlobal::staticQString("path")) { + if (name == TDEGlobal::staticQString("path")) { // Handle quotation marks if ( value[0] == '"' ) value.remove(0,1); diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index e3b4a4adb..9324f964d 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -310,7 +310,7 @@ KService::~KService() TQPixmap KService::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); if (!iconLoader->extraDesktopThemesAdded()) { TQPixmap pixmap=iconLoader->loadIcon( m_strIcon, _group, _force_size, _state, _path, true ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index c7e076eac..d1425e9eb 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -186,7 +186,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -200,7 +200,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -239,7 +239,7 @@ TQString KURIFilterData::iconName() // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { m_strIconName = sysIconName; } } @@ -255,7 +255,7 @@ TQString KURIFilterData::iconName() // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; m_strIconName = entry->name; break; diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 17caccb88..0443e0fce 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -519,7 +519,7 @@ void KURLCompletion::init() d->mode = KURLCompletion::FileCompletion; // Read settings - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); KConfigGroupSaver cgs( c, "URLCompletion" ); d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true); @@ -736,10 +736,10 @@ bool KURLCompletion::isListedURL( int complType, */ bool KURLCompletion::isAutoCompletion() { - return completionMode() == KGlobalSettings::CompletionAuto - || completionMode() == KGlobalSettings::CompletionPopup - || completionMode() == KGlobalSettings::CompletionMan - || completionMode() == KGlobalSettings::CompletionPopupAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto + || completionMode() == TDEGlobalSettings::CompletionPopup + || completionMode() == TDEGlobalSettings::CompletionMan + || completionMode() == TDEGlobalSettings::CompletionPopupAuto; } ////////////////////////////////////////////////// ////////////////////////////////////////////////// @@ -963,7 +963,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) if (url.url().length() == 1) { *match = - ( completionMode() == KGlobalSettings::CompletionMan )? "." : ".."; + ( completionMode() == TDEGlobalSettings::CompletionMan )? "." : ".."; return true; } if (url.url().length() == 2 && url.url()[1]=='.') @@ -1008,8 +1008,8 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) // Append '/' to directories in Popup mode? bool append_slash = ( d->popup_append_slash - && (completionMode() == KGlobalSettings::CompletionPopup || - completionMode() == KGlobalSettings::CompletionPopupAuto ) ); + && (completionMode() == TDEGlobalSettings::CompletionPopup || + completionMode() == TDEGlobalSettings::CompletionPopupAuto ) ); bool only_dir = ( d->mode == DirCompletion ); diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index b7ef68c76..fe07c3ad1 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -55,7 +55,7 @@ void KServiceTypeProfile::initStatic() KConfig config( "profilerc", true, false); - static const TQString & defaultGroup = KGlobal::staticQString("<default>"); + static const TQString & defaultGroup = TDEGlobal::staticQString("<default>"); TQStringList tmpList = config.groupList(); for (TQStringList::Iterator aIt = tmpList.begin(); @@ -243,7 +243,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const KServiceTypeProfile* KServiceTypeProfile::serviceTypeProfile( const TQString& _servicetype, const TQString& _genericServiceType ) { initStatic(); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); const TQString &_genservicetype = ((!_genericServiceType.isEmpty()) ? _genericServiceType : app_str); diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index e18666328..28d32d377 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -74,7 +74,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->nRow = 0; d->keepCheckBox = 0; - KConfig* cfg = KGlobal::config(); + KConfig* cfg = TDEGlobal::config(); KConfigGroupSaver saver( cfg, "Passwords" ); d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); @@ -82,7 +82,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 0: pixmap prompt TQLabel* lbl; - TQPixmap pix( KGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if ( !pix.isNull() ) { lbl = new TQLabel( main ); @@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label) // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, label->font()); - TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); + TQRect d = TDEGlobalSettings::desktopGeometry(label->topLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 2249a1bfa..c266947f3 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -244,7 +244,7 @@ void PreviewJob::startPreview() } // Read configuration value for the maximum allowed size - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 722f2874b..9eb7a2c73 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -253,14 +253,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeDest != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeDest ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeDest != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeDest ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } @@ -288,14 +288,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeSrc != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeSrc ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeSrc != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeSrc ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 8619c2dc4..d3c398fc4 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -252,7 +252,7 @@ void SessionData::configDataFor( MetaData &configData, const TQString &proto, if ( configData["Charsets"].isEmpty() ) configData["Charsets"] = d->charsets; if ( configData["CacheDir"].isEmpty() ) - configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http"); + configData["CacheDir"] = TDEGlobal::dirs()->saveLocation("cache", "http"); if ( configData["UserAgent"].isEmpty() ) { configData["UserAgent"] = KProtocolManager::defaultUserAgent(); @@ -269,10 +269,10 @@ void SessionData::reset() d->useCookie = cfg->readBoolEntry( "Cookies", true ); delete cfg; - static const TQString & english = KGlobal::staticQString( "en" ); + static const TQString & english = TDEGlobal::staticQString( "en" ); // Get language settings... - TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); + TQStringList languageList = TDEGlobal::locale()->languagesTwoAlpha(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if ( it != languageList.end() ) { diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 29b8482fb..8306c8650 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -363,7 +363,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { @@ -388,7 +388,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error // klauncher for a slave, because the slave might have that other uid // as well, which might either be a) undesired or b) make it impossible // for the slave to connect to the application. - // In such case we start the slave via KProcess. + // In such case we start the slave via TDEProcess. // It's possible to force this by setting the env. variable // TDE_FORK_SLAVES, Clearcase seems to require this. static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty(); @@ -411,12 +411,12 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error return 0; } - KProcess proc; + TDEProcess proc; proc << locate("exe", "kioslave") << lib_path << protocol << "" << socketfile.name(); kdDebug(7002) << "kioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); #ifndef Q_WS_WIN slave->setPID(proc.pid()); @@ -468,7 +468,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index fe888c99c..9ce4a86a0 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -72,7 +72,7 @@ void SlaveConfigPrivate::readGlobalConfig() global.clear(); // Read stuff... KConfig *config = KProtocolManager::config(); - readConfig(KGlobal::config(), "Socks", &global); // Socks settings. + readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings. if ( config ) readConfig(config, "<default>", &global); } diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 2a1494043..22c539a75 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -111,7 +111,7 @@ KIOExec::KIOExec() // Build the destination filename, in ~/.trinity/cache-*/krun/ // Unlike KDE-1.1, we put the filename at the end so that the extension is kept // (Some programs rely on it) - TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + + TQString tmp = TDEGlobal::dirs()->saveLocation( "cache", "krun/" ) + TQString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName); fileInfo file; file.path = tmp; @@ -211,9 +211,9 @@ void KIOExec::slotRunApp() id.setupStartupEnv(); #endif - KProcess proc; + TDEProcess proc; proc << params; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); #ifdef Q_WS_X11 KStartupInfo::resetStartupEnv(); diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 511bd4021..3d51c1e85 100644 --- a/kio/kssl/ksslcertdlg.cc +++ b/kio/kssl/ksslcertdlg.cc @@ -60,7 +60,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _certs = new TQListView(this); _certs->addColumn(i18n("Certificate")); _certs->setResizeMode(TQListView::LastColumn); - TQFontMetrics fm( KGlobalSettings::generalFont() ); + TQFontMetrics fm( TDEGlobalSettings::generalFont() ); _certs->setMinimumHeight(4*fm.height()); grid->addWidget(_certs); diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 285bb1d2d..8e2192f7d 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -93,7 +93,7 @@ public: KSSLCertificate::KSSLCertificate() { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; #endif @@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() { KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert())); @@ -637,7 +637,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi return errors; } - TQStringList qsl = KGlobal::dirs()->resourceDirs("kssl"); + TQStringList qsl = TDEGlobal::dirs()->resourceDirs("kssl"); if (qsl.isEmpty()) { errors << KSSLCertificate::NoCARoot; diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index bc67d3e6e..c6f76a190 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -127,9 +127,9 @@ KSSLInfoDlg::~KSSLInfoDlg() { } void KSSLInfoDlg::launchConfig() { - KProcess p; + TDEProcess p; p << "kcmshell" << "crypto"; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc index 5e7eb3a77..a34773989 100644 --- a/kio/kssl/ksslkeygen.cc +++ b/kio/kssl/ksslkeygen.cc @@ -166,9 +166,9 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits // back from there. Yes it's inefficient, but it doesn't happen // often and this way things are uniform. - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); - TQString path = KGlobal::dirs()->saveLocation("kssl"); + TQString path = TDEGlobal::dirs()->saveLocation("kssl"); KTempFile csrFile(path + "csr_", ".der"); if (!csrFile.fstream()) { diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 5a77b12bf..26f6114a1 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -98,7 +98,7 @@ KSSLSettings::KSSLSettings(bool readConfig) { d = new KSSLSettingsPrivate; m_cfg = new KConfig("cryptodefaults", false, false); - if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { + if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl; } @@ -316,7 +316,7 @@ void KSSLSettings::save() { m_cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); #endif diff --git a/kio/kssl/ksslutils.cc b/kio/kssl/ksslutils.cc index cf024347c..80651757f 100644 --- a/kio/kssl/ksslutils.cc +++ b/kio/kssl/ksslutils.cc @@ -73,7 +73,7 @@ TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm) { int gmt; TQDateTime qdt = ASN1_UTCTIME_QDateTime(tm, &gmt); - qstr = KGlobal::locale()->formatDateTime(qdt, false, true); + qstr = TDEGlobal::locale()->formatDateTime(qdt, false, true); if (gmt) { qstr += " "; qstr += i18n("GMT"); diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..4f33d1389 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -54,7 +54,7 @@ namespace KPAC m_helper( new KProcIO ) { connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 6f419f5f5..19417b1fb 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -71,7 +71,7 @@ namespace KPAC if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; - m_script = KGlobal::charsets()->codecForName( + m_script = TDEGlobal::charsets()->codecForName( job->queryMetaData( "charset" ), dummy )->toUnicode( m_data ); emit result( true ); } diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 760e654d7..40c52a1be 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); } - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); caVerifyUpdate(); cacheLoadDefaultPolicies(); certList.setAutoDelete(false); @@ -195,7 +195,7 @@ KSSLCNode *node; cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "ksslpolicies")); if (!cfgName.isEmpty()) { ::chmod(TQFile::encodeName(cfgName), 0600); @@ -618,12 +618,12 @@ return false; /////////////////////////////////////////////////////////////////////////// void KSSLD::caVerifyUpdate() { - TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; + TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; if (!TQFile::exists(path)) return; cfg->setGroup(TQString::null); - TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 newStamp = TDEGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { @@ -634,7 +634,7 @@ void KSSLD::caVerifyUpdate() { } bool KSSLD::caRegenerate() { -TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; +TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; TQFile out(path); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index a88f4e5b1..e87f96c31 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(KGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = KGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQDir dir(path, "*.kwl"); TQStringList rc; diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 1626f2ebc..79f050f51 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -44,7 +44,7 @@ TestService::TestService(const TQString &exec) this, TQT_SLOT(newApp(const TQCString&))); connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(KProcess *)), + connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(appExit())); TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index 9a76e6246..593dbba1e 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -22,7 +22,7 @@ public slots: protected: int result; TQString m_exec; - KProcess proc; + TDEProcess proc; }; #endif diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index 03bbbdac6..845f3367c 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) { assert( KProtocolInfo::showFilePreview( "file" ) == true ); assert( KProtocolInfo::showFilePreview( "audiocd" ) == false ); - assert( KGlobalSettings::showFilePreview( "audiocd:/" ) == false ); + assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc index 4e3865837..9b906ffb5 100644 --- a/kioslave/file/file.cc +++ b/kioslave/file/file.cc @@ -114,7 +114,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_file" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); kdDebug(7101) << "Starting " << getpid() << endl; @@ -1406,24 +1406,24 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c if ( _dev.startsWith( "LABEL=" ) ) { // turn LABEL=foo into -L foo (#71430) TQString labelName = _dev.mid( 6 ); dev = "-L "; - dev += TQFile::encodeName( KProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem? + dev += TQFile::encodeName( TDEProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem? } else if ( _dev.startsWith( "UUID=" ) ) { // and UUID=bar into -U bar TQString uuidName = _dev.mid( 5 ); dev = "-U "; - dev += TQFile::encodeName( KProcess::quote( uuidName ) ); + dev += TQFile::encodeName( TDEProcess::quote( uuidName ) ); } else - dev = TQFile::encodeName( KProcess::quote(_dev) ); // get those ready to be given to a shell + dev = TQFile::encodeName( TDEProcess::quote(_dev) ); // get those ready to be given to a shell - TQCString point = TQFile::encodeName( KProcess::quote(_point) ); + TQCString point = TQFile::encodeName( TDEProcess::quote(_point) ); bool fstype_empty = !_fstype || !*_fstype; - TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess + TQCString fstype = TDEProcess::quote(_fstype).latin1(); // good guess TQCString readonly = _ro ? "-r" : ""; TQString epath = TQString::fromLatin1(getenv("PATH")); TQString path = TQString::fromLatin1("/sbin:/bin"); if(!epath.isEmpty()) path += TQString::fromLatin1(":") + epath; - TQString mountProg = KGlobal::dirs()->findExe("mount", path); + TQString mountProg = TDEGlobal::dirs()->findExe("mount", path); if (mountProg.isEmpty()){ error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\"")); return; @@ -1572,7 +1572,7 @@ void FileProtocol::unmount( const TQString& _point ) */ ptr = strrchr( devname, '/' ); *ptr = '\0'; - TQCString qdevname(TQFile::encodeName(KProcess::quote(TQFile::decodeName(TQCString(devname)))).data()); + TQCString qdevname(TQFile::encodeName(TDEProcess::quote(TQFile::decodeName(TQCString(devname)))).data()); buffer.sprintf( "/usr/bin/eject %s 2>%s", qdevname.data(), tmp ); kdDebug(7101) << "VOLMGT: eject " << qdevname << endl; @@ -1607,13 +1607,13 @@ void FileProtocol::unmount( const TQString& _point ) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString umountProg = KGlobal::dirs()->findExe("umount", path); + TQString umountProg = TDEGlobal::dirs()->findExe("umount", path); if (umountProg.isEmpty()) { error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\"")); return; } - buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(KProcess::quote(_point)).data(), tmp ); + buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp ); system( buffer.data() ); #endif /* HAVE_VOLMGT */ @@ -1661,14 +1661,14 @@ bool FileProtocol::pmount(const TQString &dev) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString pmountProg = KGlobal::dirs()->findExe("pmount", path); + TQString pmountProg = TDEGlobal::dirs()->findExe("pmount", path); if (pmountProg.isEmpty()) return false; TQCString buffer; buffer.sprintf( "%s %s", TQFile::encodeName(pmountProg).data(), - TQFile::encodeName(KProcess::quote(dev)).data() ); + TQFile::encodeName(TDEProcess::quote(dev)).data() ); int res = system( buffer.data() ); @@ -1703,14 +1703,14 @@ bool FileProtocol::pumount(const TQString &point) TQString path = TQString::fromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; - TQString pumountProg = KGlobal::dirs()->findExe("pumount", path); + TQString pumountProg = TDEGlobal::dirs()->findExe("pumount", path); if (pumountProg.isEmpty()) return false; TQCString buffer; buffer.sprintf( "%s %s", TQFile::encodeName(pumountProg).data(), - TQFile::encodeName(KProcess::quote(dev)).data() ); + TQFile::encodeName(TDEProcess::quote(dev)).data() ); int res = system( buffer.data() ); diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc index 00fe94b2e..62ff5c59c 100644 --- a/kioslave/ftp/ftp.cc +++ b/kioslave/ftp/ftp.cc @@ -141,7 +141,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_ftp" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); kdDebug(7102) << "Starting " << getpid() << endl; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index 8c732d823..f6e714988 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -100,7 +100,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_http" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); if (argc != 4) { @@ -5120,7 +5120,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy ) { //for sites like lib.homelinux.org TQTextCodec* oldCodec=TQTextCodec::codecForCStrings(); - if (KGlobal::locale()->language().contains("ru")) + if (TDEGlobal::locale()->language().contains("ru")) TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251")); p += 6; diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index 4a140262e..554d221d5 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -220,7 +220,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (deleteAll) m_maxCacheSize = -1; - TQString strCacheDir = KGlobal::dirs()->saveLocation("cache", "http"); + TQString strCacheDir = TDEGlobal::dirs()->saveLocation("cache", "http"); TQDir cacheDir( strCacheDir ); if (!cacheDir.exists()) diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index ca86e0a16..57a22f62c 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -357,7 +357,7 @@ void KCookieDetail::slotNextCookie() TQDateTime cookiedate; cookiedate.setTime_t( m_cookie->expireDate() ); if ( m_cookie->expireDate() ) - m_expires->setText( KGlobal::locale()->formatDateTime(cookiedate) ); + m_expires->setText( TDEGlobal::locale()->formatDateTime(cookiedate) ); else m_expires->setText( i18n("End of Session") ); TQString sec; diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 65433cfaa..79e319964 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -278,7 +278,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) case TQEvent::MouseMove: if (m_movingState==WaitingForMoveStart) { TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() ); - if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) { + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) { m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent)); m_dockManager->eventFilter(m_dragPanel,event); m_movingState=Moving; diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index fe28fdff9..342fbdd9c 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -52,10 +52,10 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionFont = TQFont(); TQFontMetrics fm( m_captionFont ); m_captionFontLineSpacing = fm.lineSpacing(); - m_captionActiveBackColor = KGlobalSettings::activeTitleColor(); - m_captionActiveForeColor = KGlobalSettings::activeTextColor(); - m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor(); - m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor(); + m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor(); + m_captionActiveForeColor = TDEGlobalSettings::activeTextColor(); + m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor(); + m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); setFocusPolicy( TQ_ClickFocus ); @@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr ) void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG, TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG ) { - activeBG = KGlobalSettings::activeTitleColor(); - activeFG = KGlobalSettings::activeTextColor(); - inactiveBG = KGlobalSettings::inactiveTitleColor(); - inactiveFG = KGlobalSettings::inactiveTextColor(); + activeBG = TDEGlobalSettings::activeTitleColor(); + activeFG = TDEGlobalSettings::activeTextColor(); + inactiveBG = TDEGlobalSettings::inactiveTitleColor(); + inactiveFG = TDEGlobalSettings::inactiveTextColor(); } // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index 747919a4a..0a6076076 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -188,8 +188,8 @@ public: * This method is useful not only for KMDI child windows. * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references. * - * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(), - * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead. + * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(), + * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead. */ static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG, TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index cf7053c51..7c3da3878 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -301,7 +301,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) if ( m_movingState == WaitingForMoveStart ) { TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); - if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); m_dockManager->eventFilter( m_dragPanel, event ); diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index e8e2bfb3f..6a54e3a78 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -88,7 +88,7 @@ class DateSortListViewItem : public KListViewItem if (col == 2) { TQString s; - TQDate date = KGlobal::locale()->readDate(text(col)); + TQDate date = TDEGlobal::locale()->readDate(text(col)); s.sprintf("%08d", date.year() * 366 + date.dayOfYear()); return s; } @@ -242,11 +242,11 @@ void DownloadDialog::addProvider(Provider *p) } else { - pix = KGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel); + pix = TDEGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel); ret = true; } } - if(!ret) pix = KGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); + if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); frame = addPage(p->name(), p->name(), pix); m_frame = frame; @@ -392,7 +392,7 @@ int DownloadDialog::installStatus(Entry *entry) TQString datestring; int installed; - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); kapp->config()->setGroup("KNewStuffStatus"); datestring = kapp->config()->readEntry(entry->name(lang)); @@ -415,11 +415,11 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) installed = installStatus(entry); - if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small); + if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); else pix = TQPixmap(); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); if(variants.contains("score")) { @@ -436,7 +436,7 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) if(variants.contains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, - entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); + entry->name(lang), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate())); tmp_l->setPixmap(0, pix); } @@ -470,7 +470,7 @@ void DownloadDialog::slotDetails() Entry *e = getEntry(); if(!e) return; - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQString info = i18n ( @@ -490,7 +490,7 @@ void DownloadDialog::slotDetails() ).arg(e->release() ).arg(e->rating() ).arg(e->downloads() - ).arg(KGlobal::locale()->formatDate(e->releaseDate()) + ).arg(TDEGlobal::locale()->formatDate(e->releaseDate()) ).arg(e->summary(lang) ); @@ -550,9 +550,9 @@ void DownloadDialog::install(Entry *e) kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->sync(); - TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); if(m_entryitem) { @@ -640,12 +640,12 @@ void DownloadDialog::slotSelected() TQString tmp; bool enabled; Entry *e = getEntry(); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); bool ret; if(e) { - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); TQListViewItem *item; if(m_curtab != 0) @@ -685,7 +685,7 @@ void DownloadDialog::slotSelected() { desc += TQString("%1").arg(e->author()); } - desc += TQString("<br>%1").arg(KGlobal::locale()->formatDate(e->releaseDate())); + desc += TQString("<br>%1").arg(TDEGlobal::locale()->formatDate(e->releaseDate())); desc += TQString("<br><br>"); if(ret) { @@ -728,7 +728,7 @@ Entry *DownloadDialog::getEntry() TQString entryName = entryItem->text(0); - TQString lang = KGlobal::locale()->language(); + TQString lang = TDEGlobal::locale()->language(); for(Entry *e = m_entries.first(); e; e = m_entries.next()) if(e->name(lang) == entryName) diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h index 2c30ee9ba..1f879d938 100644 --- a/knewstuff/downloaddialog.h +++ b/knewstuff/downloaddialog.h @@ -112,7 +112,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase a previously set type. @param providerList the URl to the list of providers; if empty - we first try the ProvidersUrl from KGlobal::config, then we + we first try the ProvidersUrl from TDEGlobal::config, then we fall back to a hardcoded value. */ void load(TQString providerList); // KDE4: merge with load() above diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index 55d60579c..56dd375f4 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -72,7 +72,7 @@ TQString Entry::name( const TQString &lang ) const if ( !d(this)->mNameMap[ lang ].isEmpty() ) return d(this)->mNameMap[ lang ]; else { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !d(this)->mNameMap[ *it ].isEmpty() ) return d(this)->mNameMap[ *it ]; } @@ -175,7 +175,7 @@ TQString Entry::summary( const TQString &lang ) const if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ]; else { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ]; } @@ -228,7 +228,7 @@ KURL Entry::payload( const TQString &lang ) const { KURL payload = mPayloadMap[ lang ]; if ( payload.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ]; } @@ -251,7 +251,7 @@ KURL Entry::preview( const TQString &lang ) const { KURL preview = mPreviewMap[ lang ]; if ( preview.isEmpty() ) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ]; } diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index c572f347d..6bfbb3333 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -71,7 +71,7 @@ void KNewStuff::download() TQString KNewStuff::downloadDestination( Entry * ) { - return KGlobal::dirs()->saveLocation( "tmp" ) + + return TDEGlobal::dirs()->saveLocation( "tmp" ) + TDEApplication::randomString( 10 ); } diff --git a/knewstuff/knewstuffbutton.h b/knewstuff/knewstuffbutton.h index 6935ba653..bebd08297 100644 --- a/knewstuff/knewstuffbutton.h +++ b/knewstuff/knewstuffbutton.h @@ -46,7 +46,7 @@ class Button : public KPushButton * @param what text describing what is being downloaded. will be * shown on the button as "Download New <what>" * @param providerList the URL to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value * @param resourceType the Hotstuff data type for this downlaod such * as "korganizer/calendar" diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 8438e25ea..1e4e6ecc3 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -40,7 +40,7 @@ using namespace std; KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent ) : KNewStuff( type, parent ) { - mConfig = KGlobal::config(); + mConfig = TDEGlobal::config(); } KNewStuffGeneric::~KNewStuffGeneric() @@ -72,9 +72,9 @@ bool KNewStuffGeneric::install( const TQString &fileName ) for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { list2 << (*it).replace("%f", fileName); } - KProcess proc; + TDEProcess proc; proc << list2; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } return true; diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index f68be7ae3..5010b5084 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index 3c4018a13..b9dd24ed8 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -219,7 +219,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = KGlobal::config(); + KConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 37e2a8daf..829e52d71 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -186,7 +186,7 @@ class KDE_EXPORT ProviderLoader : public TQObject * * @param type data type such as 'kdesktop/wallpaper'. * @param providerList the URl to the list of providers; if empty - * we first try the ProvidersUrl from KGlobal::config, then we + * we first try the ProvidersUrl from TDEGlobal::config, then we * fall back to a hardcoded value. */ void load( const TQString &type, const TQString &providerList = TQString::null ); diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index 247c6d5bc..d9ad85a7c 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -57,9 +57,9 @@ void Security::readKeys() m_keys.clear(); KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (!readProcess->start(KProcess::NotifyOnExit, true)) + if (!readProcess->start(TDEProcess::NotifyOnExit, true)) KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>")); else m_gpgRunning = true; @@ -75,13 +75,13 @@ void Security::readSecretKeys() m_runMode = ListSecret; KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys"; - connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (readProcess->start(KProcess::NotifyOnExit, true)) + if (readProcess->start(TDEProcess::NotifyOnExit, true)) m_gpgRunning = true; } -void Security::slotProcessExited(KProcess *process) +void Security::slotProcessExited(TDEProcess *process) { switch (m_runMode) { @@ -248,9 +248,9 @@ void Security::slotCheckValidity() //verify the signature KProcIO *verifyProcess=new KProcIO(); *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName; - connect(verifyProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); - if (verifyProcess->start(KProcess::NotifyOnExit,true)) + if (verifyProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { @@ -328,10 +328,10 @@ void Security::slotSignFile() //verify the signature KProcIO *signProcess=new KProcIO(); *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName; - connect(signProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); m_runMode = Sign; - if (signProcess->start(KProcess::NotifyOnExit,true)) + if (signProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else { diff --git a/knewstuff/security.h b/knewstuff/security.h index 2831770e0..230821e7e 100644 --- a/knewstuff/security.h +++ b/knewstuff/security.h @@ -22,7 +22,7 @@ #include <tqobject.h> class KProcIO; -class KProcess; +class TDEProcess; struct KeyStruct { TQString id; @@ -120,7 +120,7 @@ private: TQString m_secretKey; /// the key used for signing private slots: - void slotProcessExited(KProcess *process); + void slotProcessExited(TDEProcess *process); void slotDataArrived(KProcIO *process); signals: diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp index a1de4c1d0..db8e255ff 100644 --- a/knewstuff/testnewstuff.cpp +++ b/knewstuff/testnewstuff.cpp @@ -54,9 +54,9 @@ bool TestNewStuff::install( const TQString &fileName ) bool TestNewStuff::createUploadFile( const TQString &fileName ) { - KProcess p; + TDEProcess p; p << "touch" << fileName; - p.start(KProcess::Block); + p.start(TDEProcess::Block); kdDebug() << "TestNewStuff::createUploadFile(): " << fileName << endl; return true; } diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp index cecc67e32..0a9ec85c0 100644 --- a/knewstuff/uploaddialog.cpp +++ b/knewstuff/uploaddialog.cpp @@ -94,7 +94,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) : topLayout->addWidget( languageLabel, 6, 0 ); mLanguageCombo = new TQComboBox( topPage ); topLayout->addWidget( mLanguageCombo, 6, 1 ); - mLanguageCombo->insertStringList( KGlobal::locale()->languageList() ); + mLanguageCombo->insertStringList( TDEGlobal::locale()->languageList() ); TQLabel *previewLabel = new TQLabel( i18n("Preview URL:"), topPage ); topLayout->addWidget( previewLabel, 7, 0 ); diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 0500e0631..8bec0e790 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -399,9 +399,9 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam // the duplicated code) with shiny new KDownload class for 3.2 (pfeiffer) // Until the shiny new class comes about, send the suggestedFilename // along with the actual URL to download. (DA) - cmd += " " + KProcess::quote(url.url()); + cmd += " " + TDEProcess::quote(url.url()); if ( !suggestedFilename.isEmpty() ) - cmd +=" " + KProcess::quote(suggestedFilename); + cmd +=" " + TDEProcess::quote(suggestedFilename); kdDebug(1000) << "Calling command " << cmd << endl; // slave is already on hold (slotBrowserMimetype()) diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index 9f7703ab6..9d8d73057 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index c0c4cd086..ce963c23a 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -134,7 +134,7 @@ void MainWindow::createGUI( Part * part ) TQApplication::sendEvent( part, &ev ); if ( autoSaveSettings() ) - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } setUpdatesEnabled( true ); @@ -185,7 +185,7 @@ void MainWindow::createShellGUI( bool create ) void KParts::MainWindow::saveNewToolbarConfig() { createGUI( d->m_activePart ); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } #include "mainwindow.moc" diff --git a/kparts/part.cpp b/kparts/part.cpp index d2efbeeac..68e9dbbf2 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -110,9 +110,9 @@ void PartBase::setInstance( TDEInstance *inst ) void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins ) { KXMLGUIClient::setInstance( inst ); - KGlobal::locale()->insertCatalogue( inst->instanceName() ); + TDEGlobal::locale()->insertCatalogue( inst->instanceName() ); // install 'instancename'data resource type - KGlobal::dirs()->addResourceType( inst->instanceName() + "data", + TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default( "data" ) + TQString::fromLatin1( inst->instanceName() ) + '/' ); if ( bLoadPlugins ) diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 8d9ff1994..0f3bc347d 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -479,7 +479,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activeWidget, &ev ); } } - // Set the new active instance in KGlobal + // Set the new active instance in TDEGlobal setActiveInstance( d->m_activePart ? d->m_activePart->instance() : 0L ); kdDebug(1000) << this << " emitting activePartChanged " << d->m_activePart << endl; @@ -489,7 +489,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) void PartManager::setActiveInstance( TDEInstance * instance ) { // It's a separate method to allow redefining this behavior - KGlobal::_activeInstance = instance; + TDEGlobal::_activeInstance = instance; } Part *PartManager::activePart() const diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index 1e5ca9008..b36d4dbc6 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -220,7 +220,7 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library ) void Plugin::setInstance( TDEInstance *instance ) { - KGlobal::locale()->insertCatalogue( instance->instanceName() ); + TDEGlobal::locale()->insertCatalogue( instance->instanceName() ); KXMLGUIClient::setInstance( instance ); } diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp index 3675781ea..4628e8ca7 100644 --- a/kparts/tests/example.cpp +++ b/kparts/tests/example.cpp @@ -63,7 +63,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index 82c464a5a..913686bf9 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -61,7 +61,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp index 664ae24e0..dd54cf53f 100644 --- a/kspell2/settings.cpp +++ b/kspell2/settings.cpp @@ -207,7 +207,7 @@ void Settings::loadConfig() d->defaultClient = conf.readEntry( "defaultClient", TQString::null ); d->defaultLanguage = conf.readEntry( - "defaultLanguage", KGlobal::locale()->language() ); + "defaultLanguage", TDEGlobal::locale()->language() ); //same defaults are in the default filter (filter.cpp) d->checkUppercase = conf.readBoolEntry( diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp index 233fb7365..9de7f1bfd 100644 --- a/kstyles/highcontrast/config/highcontrastconfig.cpp +++ b/kstyles/highcontrast/config/highcontrastconfig.cpp @@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( { // Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this); @@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( HighContrastStyleConfig::~HighContrastStyleConfig() { - KGlobal::locale()->removeCatalogue("kstyle_keramik_config"); + TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); } diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index 7be529840..bd1deffb8 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -3040,7 +3040,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h TQString s(title); - static const TQString &modStr = KGlobal::staticQString( + static const TQString &modStr = TDEGlobal::staticQString( TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]")); int modStrPos = s.find(modStr); diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp index 70d4f6cfa..338cdcd1e 100644 --- a/kstyles/plastik/config/plastikconf.cpp +++ b/kstyles/plastik/config/plastikconf.cpp @@ -41,7 +41,7 @@ extern "C" { KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) { - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); return new PlastikStyleConfig(parent); } } @@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); // scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this); animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index e6ffce721..67e29f706 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -40,8 +40,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? - KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); - TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc"); + TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); + TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc"); TQMap <TQString, TQString> themes; //Name->file mapping.. @@ -62,7 +62,7 @@ int main(int argc, char **argv) } } - KSimpleConfig cache( KGlobal::dirs()->saveLocation("config")+"kthemestylerc"); + KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); #if 0 //Doesn't seem to work with present Qt.. diff --git a/kunittest/runner.cpp b/kunittest/runner.cpp index 972a34276..e3a8830bb 100644 --- a/kunittest/runner.cpp +++ b/kunittest/runner.cpp @@ -58,7 +58,7 @@ namespace KUnitTest // Add the folder to the "module" resource such that the KLibLoader can // find the modules in this folder. - KGlobal::dirs()->addResourceDir("module", folder); + TDEGlobal::dirs()->addResourceDir("module", folder); kdDebug() << "Looking in folder: " << dir.absPath() << endl; // Get a list of all modules. diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp index 258a5d965..8df54f231 100644 --- a/kutils/kcmodulecontainer.cpp +++ b/kutils/kcmodulecontainer.cpp @@ -140,7 +140,7 @@ void KCModuleContainer::addModule( const TQString& module ) KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1()); allModules.append( proxy ); - d->tabWidget->addTab( proxy, TQIconSet(KGlobal::iconLoader()->loadIcon( + d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon( proxy->moduleInfo().icon(), KIcon::Desktop)), /* QT eats ampersands for dinner. But not this time. */ proxy->moduleInfo().moduleName().replace( "&", "&&" )); diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 3528ae738..f034c9a5f 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -93,7 +93,7 @@ class KCModuleProxy::KCModuleProxyPrivate TQStringList args; KCModule *kcm; QXEmbed *embedWidget; - KProcess *rootProcess; + TDEProcess *rootProcess; TQVBox *embedFrame; KCModuleProxyIfaceImpl *dcopObject; DCOPClient *dcopClient; @@ -359,17 +359,17 @@ void KCModuleProxy::runAsRoot() if (!tdesu.isEmpty()) { - d->rootProcess = new KProcess; + d->rootProcess = new TDEProcess; *d->rootProcess << tdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon()); *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell")) - .arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language()); + .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); - if ( !d->rootProcess->start( KProcess::NotifyOnExit )) + if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { d->rootMode = false; rootExited(); diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h index 633652955..baf532e34 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/kcmoduleproxy.h @@ -31,7 +31,7 @@ class TDEAboutData; class KCModule; class KCModuleInfo; class TDEInstance; -class KProcess; +class TDEProcess; /** * @ingroup kcmodule diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 58c196abc..511af866b 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -196,10 +196,10 @@ void KCMultiDialog::slotHelp() KURL url( KURL("help:/"), docPath ); if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { - KProcess process; + TDEProcess process; process << "khelpcenter" << url.url(); - process.start(KProcess::DontCare); + process.start(TDEProcess::DontCare); process.detach(); } else { new KRun(url); diff --git a/kutils/kplugininfo.cpp b/kutils/kplugininfo.cpp index 7b83be7ed..acdf57dc2 100644 --- a/kutils/kplugininfo.cpp +++ b/kutils/kplugininfo.cpp @@ -179,7 +179,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KC TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group ) { - TQStringList files = KGlobal::dirs()->findAllResources( "data", name + + TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name + "/kpartplugins/*.desktop", true, false ); return fromFiles( files, config, group ); } diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 3b6b4c39a..9dbf42c4a 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -575,7 +575,7 @@ static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName if( instanceName.isNull() ) return TQValueList<KPluginInfo*>(); //nothing - const TQStringList desktopfilenames = KGlobal::dirs()->findAllResources( "data", + const TQStringList desktopfilenames = TDEGlobal::dirs()->findAllResources( "data", instanceName + "/kpartplugins/*.desktop", true, false ); return KPluginInfo::fromFiles( desktopfilenames ); } @@ -631,7 +631,7 @@ void KPluginSelector::addPlugins( const TQValueList<KPluginInfo*> & plugininfos, { checkNeedForTabWidget(); // the KConfigGroup becomes owned by KPluginSelectionWidget - KConfigGroup * cfgGroup = new KConfigGroup( config ? config : KGlobal::config(), "Plugins" ); + KConfigGroup * cfgGroup = new KConfigGroup( config ? config : TDEGlobal::config(), "Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); } diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h index f018d2f9e..87026154e 100644 --- a/kutils/kpluginselector.h +++ b/kutils/kpluginselector.h @@ -130,7 +130,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget * and all plugins are shown. * @param config The KConfig object that holds the state of the * plugins being enabled or not. By default it will - * use KGlobal::config(). It is recommended to + * use TDEGlobal::config(). It is recommended to * always pass a KConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). diff --git a/kutils/ksettings/README.dox b/kutils/ksettings/README.dox index f42c325eb..b9efd0dcb 100644 --- a/kutils/ksettings/README.dox +++ b/kutils/ksettings/README.dox @@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args \endcode For the KConfig object you can either use -KGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). +TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). I added a method to KSettings::Dispatcher that gives you the KConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName @@ -122,7 +122,7 @@ Some explanation for those keys: - X-TDE-ParentApp is the name of the application this config page belongs to. It is used by the first two \ref KSettings::Dialog constructors. The Dialog will use all modules that set X-TDE-ParentApp to - KGlobal::instance()->instanceName(). It + TDEGlobal::instance()->instanceName(). It should be pretty easy to find out what name that is: look at the first argument to the TDEAboutData ctor. - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever) diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 8fbe74c81..c64e2e64a 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -428,7 +428,7 @@ KCMultiDialog * Dialog::dialog() TQValueList<KService::Ptr> Dialog::instanceServices() const { kdDebug( 700 ) << k_funcinfo << endl; - TQString instanceName = KGlobal::instance()->instanceName(); + TQString instanceName = TDEGlobal::instance()->instanceName(); d->registeredComponents.append( instanceName ); kdDebug( 700 ) << "calling KServiceGroup::childGroup( " << instanceName << " )" << endl; @@ -533,8 +533,8 @@ void Dialog::createDialogFromServices() { // read .setdlg files TQString setdlgpath = locate( "appdata", - KGlobal::instance()->instanceName() + ".setdlg" ); - TQStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata", + TDEGlobal::instance()->instanceName() + ".setdlg" ); + TQStringList setdlgaddon = TDEGlobal::dirs()->findAllResources( "appdata", "ksettingsdialog/*.setdlg" ); if( ! setdlgpath.isNull() ) parseGroupFile( setdlgpath ); diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h index 5a8afa510..cd9b539ef 100644 --- a/kutils/ksettings/dialog.h +++ b/kutils/ksettings/dialog.h @@ -95,7 +95,7 @@ class KUTILS_EXPORT Dialog : public TQObject /** * Construct a new Preferences Dialog for the application. It uses all - * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName(). + * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName(). * * @param parent The parent is only used as the parent for the * dialog - centering the dialog over the parent @@ -106,7 +106,7 @@ class KUTILS_EXPORT Dialog : public TQObject /** * Construct a new Preferences Dialog for the application. It uses all - * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName(). + * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName(). * * @param content Select whether you want a static or configurable * config dialog. diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h index 74c7756da..16cfbc572 100644 --- a/kutils/ksettings/pluginpage.h +++ b/kutils/ksettings/pluginpage.h @@ -44,8 +44,8 @@ namespace KSettings * MyAppPluginConfig( TQWidget * parent, const char *, const TQStringList & args ) * : PluginPage( MyAppPluginConfigFactory::instance(), parent, args ) * { - * pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" ); - * pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" ); + * pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" ); + * pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" ); * } * \endcode * diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc index 59b7dda2e..cfc296a61 100644 --- a/kwallet/backend/kwalletbackend.cc +++ b/kwallet/backend/kwalletbackend.cc @@ -56,7 +56,7 @@ using namespace KWallet; static void initKWalletDir() { - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); } Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { @@ -64,7 +64,7 @@ Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { if (isPath) { _path = name; } else { - _path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl"; + _path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl"; } _open = false; @@ -245,7 +245,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) { bool Backend::exists(const TQString& wallet) { initKWalletDir(); - TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl"; // Note: 60 bytes is presently the minimum size of a wallet file. // Anything smaller is junk. return TQFile::exists(path) && TQFileInfo(path).size() >= 60; diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index f989f2beb..ad9fc54fb 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -109,7 +109,7 @@ DeviceManager::DeviceManager(int def) if (def==-1) { TDEInstance *tmp_instance=0L; - if (!KGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); + if (!TDEGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp"); KConfig *config = new KConfig("kcmmidirc", true); config->setGroup("Configuration"); diff --git a/libkmid/midfile.cc b/libkmid/midfile.cc index 0e804e4e3..4bf19f5b1 100644 --- a/libkmid/midfile.cc +++ b/libkmid/midfile.cc @@ -54,7 +54,7 @@ double metronomeTempoToTempo(ulong x) int uncompressFile(const char *gzname, char *tmpname) // Returns 0 if OK, 1 if error (tmpname not set) { - TQString cmd("gzip -dc " + KProcess::quote(gzname)); + TQString cmd("gzip -dc " + TDEProcess::quote(gzname)); FILE *infile = popen( TQFile::encodeName(cmd).data(), "r"); if (infile==NULL) { fprintf(stderr,"ERROR : popen failed : %s\n",TQFile::encodeName(cmd).data()); diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index 75c2e72dd..4934a1658 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -101,8 +101,8 @@ KDE_EXPORT int main(int argc, char *argv[]) TDEApplication app; KCrash::setCrashHandler( crashHandler ); - KGlobal::locale()->insertCatalogue("klock"); - KGlobal::locale()->insertCatalogue("kscreensaver"); + TDEGlobal::locale()->insertCatalogue("klock"); + TDEGlobal::locale()->insertCatalogue("kscreensaver"); DemoWindow *demoWidget = 0; Window saveWin = 0; diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS index aad1c76e9..07b7d44ef 100644 --- a/tdecore/AUTHORS +++ b/tdecore/AUTHORS @@ -37,7 +37,7 @@ Michael Will <Michael.Will@student.uni-tuebingen.de> loading routine in KPixmap Christian Czezatke <e9025461@student.tuwien.ac.at> -KProcess class +TDEProcess class Matthias Ettrich <ettrich@kde.org> KWM, Changes to TDEApplication and KIconLoader diff --git a/tdecore/README.exec b/tdecore/README.exec index f2065b7ad..d47c808e9 100644 --- a/tdecore/README.exec +++ b/tdecore/README.exec @@ -7,9 +7,9 @@ you should or should not use them. 1. fork + exec You never want to use this unless you have a very good reason why it is -impossible to use KProcess. +impossible to use TDEProcess. -2. KProcess +2. TDEProcess You want to use this if you need to start a new process which needs to be a child of your process, e.g. because you want to catch stdout/stderr or need @@ -20,7 +20,7 @@ off with KProcIO 3. KProcIO -Like KProcess. Unlike KProcess, this class actually makes it easy to +Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to send data to and receive data from the process. 4. startServiceByDesktopPath diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo index 91d87329f..051b1fae6 100644 --- a/tdecore/README.kstartupinfo +++ b/tdecore/README.kstartupinfo @@ -30,7 +30,7 @@ ASNs which will stay too long until a timeout ). For improving the quality of ASN and reducing the number of ASNs that don't detect when the application has started, some .desktop file entries may be helpful ( see below ). If you want to start an application in your code, prefer using KRun or -TDEApplication::startServiceByXXX() calls. Classes like KProcess don't create +TDEApplication::startServiceByXXX() calls. Classes like TDEProcess don't create ASN, so if you need to use it, you have to send it manually ( only in case ASN is useful in this case, it shouldn't be sent e.g. for system processes ). diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp index 303403ef7..2add13022 100644 --- a/tdecore/kaboutdata.cpp +++ b/tdecore/kaboutdata.cpp @@ -274,7 +274,7 @@ TDEAboutData::translateInternalProgramName() const { delete[] d->mTranslatedProgramName; d->mTranslatedProgramName = 0; - if( KGlobal::locale() ) + if( TDEGlobal::locale() ) d->mTranslatedProgramName = tqstrdup( programName().utf8()); } diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h index 7f24a5e73..a54c6bd2e 100644 --- a/tdecore/kaccel.h +++ b/tdecore/kaccel.h @@ -51,7 +51,7 @@ class KAccelPrivate; * has precedence over any KAccel objects created before it. * When a shortcut pressed, KAccel calls the slot to which it has been * connected. If you want to set global accelerators, independent of the window - * which has the focus, use KGlobalAccel. + * which has the focus, use TDEGlobalAccel. * * Reconfiguration of a given shortcut can be prevented by specifying * that an accelerator item is not configurable when it is inserted. A special @@ -84,7 +84,7 @@ class KAccelPrivate; * \endcode * * @short Configurable shortcut support for widgets. - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KAccelShortcutList * @see KKeyChooser * @see KKeyDialog @@ -281,7 +281,7 @@ class TDECORE_EXPORT KAccel : public TQAccel /** * Read all shortcuts from @p pConfig, or (if @p pConfig * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/tdecore/kaccelaction.cpp b/tdecore/kaccelaction.cpp index 856bbefdc..0dc320a84 100644 --- a/tdecore/kaccelaction.cpp +++ b/tdecore/kaccelaction.cpp @@ -203,8 +203,8 @@ bool KAccelAction::useFourModifierKeys() { if( KAccelAction::g_bUseFourModifierKeys == -1 ) { // Read in whether to use 4 modifier keys - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - bool b = KGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys", false ); KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey(); } return KAccelAction::g_bUseFourModifierKeys == 1; @@ -219,8 +219,8 @@ void KAccelAction::useFourModifierKeys( bool b ) if( b && !KKeyNative::keyboardHasWinKey() ) kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n"; } - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl; } @@ -507,7 +507,7 @@ bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig, { kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); KConfigGroupSaver cs( pConfig, sGroup ); for( uint i = 0; i < m_nSize; i++ ) { diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h index 470c70559..4c7ac1840 100644 --- a/tdecore/kaccelaction.h +++ b/tdecore/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/tdecore/kaccelbase.cpp b/tdecore/kaccelbase.cpp index 4ba4c9c3b..cb21146d2 100644 --- a/tdecore/kaccelbase.cpp +++ b/tdecore/kaccelbase.cpp @@ -63,9 +63,9 @@ KAccelBase::~KAccelBase() uint KAccelBase::actionCount() const { return m_rgActions.count(); } KAccelActions& KAccelBase::actions() { return m_rgActions; } bool KAccelBase::isEnabled() const { return m_bEnabled; } -// see KGlobalAccel::blockShortcuts() stuff - it's to temporarily block +// see TDEGlobalAccel::blockShortcuts() stuff - it's to temporarily block // all global shortcuts, so that the key grabs are released, but from the app's -// point of view the KGlobalAccel is still enabled, so KGlobalAccel needs +// point of view the TDEGlobalAccel is still enabled, so TDEGlobalAccel needs // to disable key grabbing even if enabled bool KAccelBase::isEnabledInternal() const { return isEnabled(); } diff --git a/tdecore/kaccelbase.h b/tdecore/kaccelbase.h index 082f09324..03cad863a 100644 --- a/tdecore/kaccelbase.h +++ b/tdecore/kaccelbase.h @@ -200,7 +200,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp index e3ee63353..768a94fff 100644 --- a/tdecore/kappdcopiface.cpp +++ b/tdecore/kappdcopiface.cpp @@ -61,7 +61,7 @@ void KAppDCOPInterface::updateUserTimestamp( ulong time ) void KAppDCOPInterface::reparseConfiguration() { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); } void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) { diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 62eb373e5..dfc3bb612 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -569,7 +569,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) // icon() cannot be null pixmap, it'll be the "unknown" icon - so check if there is this application icon static TQPixmap* ic = NULL; if( ic == NULL ) - ic = new TQPixmap( KGlobal::iconLoader()->loadIcon( iconName(), + ic = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( iconName(), KIcon::NoGroup, 0, KIcon::DefaultState, NULL, true )); if( !ic->isNull()) { @@ -841,7 +841,7 @@ public: const char* message) const { TQTranslatorMessage res; - res.setTranslation(KGlobal::locale()->translateQt(context, sourceText, message)); + res.setTranslation(TDEGlobal::locale()->translateQt(context, sourceText, message)); return res; } }; @@ -861,9 +861,9 @@ void TDEApplication::init(bool GUIenabled) } } - KProcessController::ref(); + TDEProcessController::ref(); - (void) KClipboardSynchronizer::self(); + (void) TDEClipboardSynchronizer::self(); TQApplication::setDesktopSettingsAware( false ); @@ -912,9 +912,9 @@ void TDEApplication::init(bool GUIenabled) #endif // Trigger creation of locale. - (void) KGlobal::locale(); + (void) TDEGlobal::locale(); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception; // For brain-dead configurations where the user's local config file is not writable. // * We use kdialog to warn the user, so we better not generate warnings from @@ -945,7 +945,7 @@ void TDEApplication::init(bool GUIenabled) #endif { - TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); TQStringList::Iterator it = plugins.begin(); while (it != plugins.end()) { addLibraryPath( *it ); @@ -977,7 +977,7 @@ void TDEApplication::init(bool GUIenabled) #ifdef Q_WS_MACX if (GUIenabled) { - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(), KIcon::NoGroup, KIcon::SizeLarge, KIcon::DefaultState, 0L, false ); if (!pixmap.isNull()) { TQImage i = pixmap.convertToImage().convertDepth(32).smoothScale(40, 40); @@ -1013,7 +1013,7 @@ void TDEApplication::init(bool GUIenabled) setReverseLayout( !rtl ); // install appdata resource type - KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") + TDEGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") + TQString::fromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1453,7 +1453,7 @@ void TDEApplication::startKdeinit() // Try to launch tdeinit. TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) @@ -1476,8 +1476,8 @@ void TDEApplication::dcopFailure(const TQString &msg) if (failureCount == 2) { #ifdef Q_WS_WIN - KGlobal::config()->setGroup("General"); - if (KGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) + TDEGlobal::config()->setGroup("General"); + if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false)) return; #endif TQString msgStr(i18n("There was an error setting up inter-process " @@ -1581,7 +1581,7 @@ void TDEApplication::parseCommandLine( ) if (args->isSet("style")) { - TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" ); + TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" ); TQStringList::Iterator itp = plugins.begin(); while (itp != plugins.end()) { addLibraryPath( *itp ); @@ -1736,7 +1736,7 @@ TDEApplication::~TDEApplication() // First call the static deleters and then call KLibLoader::cleanup() // The static deleters may delete libraries for which they need KLibLoader. // KLibLoader will take care of the remaining ones. - KGlobal::deleteStaticDeleters(); + TDEGlobal::deleteStaticDeleters(); KLibLoader::cleanUp(); delete smw; @@ -1745,7 +1745,7 @@ TDEApplication::~TDEApplication() delete s_DCOPClient; s_DCOPClient = 0L; - KProcessController::deref(); + TDEProcessController::deref(); #ifdef Q_WS_X11 if ( d->oldXErrorHandler != NULL ) @@ -2123,24 +2123,24 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) switch (id) { case KIPC::StyleChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdisplaySetStyle(); break; case KIPC::ToolbarStyleChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); if (useStyles) emit toolbarAppearanceChanged(arg); break; case KIPC::PaletteChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); kdisplaySetPalette(); break; case KIPC::FontChanged: - KGlobal::config()->reparseConfiguration(); - KGlobalSettings::rereadFontSettings(); + TDEGlobal::config()->reparseConfiguration(); + TDEGlobalSettings::rereadFontSettings(); kdisplaySetFont(); break; @@ -2149,28 +2149,28 @@ bool TDEApplication::x11EventFilter( XEvent *_event ) break; case KIPC::SettingsChanged: - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); if (arg == SETTINGS_PATHS) - KGlobalSettings::rereadPathSettings(); + TDEGlobalSettings::rereadPathSettings(); else if (arg == SETTINGS_MOUSE) - KGlobalSettings::rereadMouseSettings(); + TDEGlobalSettings::rereadMouseSettings(); propagateSettings((SettingsCategory)arg); break; case KIPC::IconChanged: TQPixmapCache::clear(); - KGlobal::config()->reparseConfiguration(); - KGlobal::instance()->newIconLoader(); + TDEGlobal::config()->reparseConfiguration(); + TDEGlobal::instance()->newIconLoader(); emit updateIconLoaders(); emit iconChanged(arg); break; case KIPC::ClipboardConfigChanged: - KClipboardSynchronizer::newConfiguration(arg); + TDEClipboardSynchronizer::newConfiguration(arg); break; case KIPC::BlockShortcuts: - KGlobalAccel::blockShortcuts(arg); + TDEGlobalAccel::blockShortcuts(arg); emit kipcMessage(id, arg); // some apps may do additional things break; } @@ -2276,7 +2276,7 @@ void TDEApplication::applyGUIStyle() { if ( !useStyles ) return; - KConfigGroup pConfig (KGlobal::config(), "General"); + KConfigGroup pConfig (TDEGlobal::config(), "General"); TQString defaultStyle = KStyle::defaultStyle(); TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle); @@ -2306,8 +2306,8 @@ TQString TDEApplication::caption() const return aCaption; else // We have some about data ? - if ( KGlobal::instance()->aboutData() ) - return KGlobal::instance()->aboutData()->programName(); + if ( TDEGlobal::instance()->aboutData() ) + return TDEGlobal::instance()->aboutData()->programName(); else // Last resort : application name return name(); @@ -2339,9 +2339,9 @@ TQString TDEApplication::makeStdCaption( const TQString &userCaption, TQPalette TDEApplication::createApplicationPalette() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); - return createApplicationPalette( config, KGlobalSettings::contrast() ); + return createApplicationPalette( config, TDEGlobalSettings::contrast() ); } TQPalette TDEApplication::createApplicationPalette( KConfig *config, int contrast_ ) @@ -2440,7 +2440,7 @@ void TDEApplication::kdisplaySetPalette() #ifdef Q_WS_MACX //Can I have this on other platforms, please!? --Sam { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); bool do_not_set_palette = FALSE; if(config->readBoolEntry("nopaletteChange", &do_not_set_palette)) @@ -2455,16 +2455,16 @@ void TDEApplication::kdisplaySetPalette() void TDEApplication::kdisplaySetFont() { - TQApplication::setFont(KGlobalSettings::generalFont(), true); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); + TQApplication::setFont(TDEGlobalSettings::generalFont(), true); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING); + TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "KPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts TQStyleSheet* sheet = TQStyleSheet::defaultSheet(); - sheet->item ("pre")->setFontFamily (KGlobalSettings::fixedFont().family()); - sheet->item ("code")->setFontFamily (KGlobalSettings::fixedFont().family()); - sheet->item ("tt")->setFontFamily (KGlobalSettings::fixedFont().family()); + sheet->item ("pre")->setFontFamily (TDEGlobalSettings::fixedFont().family()); + sheet->item ("code")->setFontFamily (TDEGlobalSettings::fixedFont().family()); + sheet->item ("tt")->setFontFamily (TDEGlobalSettings::fixedFont().family()); emit kdisplayFontChanged(); emit appearanceChanged(); @@ -2484,7 +2484,7 @@ void TDEApplication::kdisplaySetStyle() void TDEApplication::propagateSettings(SettingsCategory arg) { - KConfigBase* config = KGlobal::config(); + KConfigBase* config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); #ifdef QT_HAVE_MAX_IMAGE_SIZE @@ -2821,7 +2821,7 @@ void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, cons if (config.readBoolEntry("TerminalClient", false)) { - KConfigGroup confGroup( KGlobal::config(), "General" ); + KConfigGroup confGroup( TDEGlobal::config(), "General" ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole"); command = preferredTerminal + " -e " + command; } @@ -3167,7 +3167,7 @@ TQString TDEApplication::tempSaveName( const TQString& pFilename ) const if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) ) { // Last chance: use temp dir - aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") ); + aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") ); } } @@ -3196,7 +3196,7 @@ TQString TDEApplication::checkRecoverFile( const TQString& pFilename, if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) ) { // Last chance: use temp dir - aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") ); + aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") ); } } @@ -3351,7 +3351,7 @@ bool TDEApplication::authorize(const TQString &genericAction) if (!d->actionRestrictions) return true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE Action Restrictions" ); return config->readBoolEntry(genericAction, true); } @@ -3361,7 +3361,7 @@ bool TDEApplication::authorizeKAction(const char *action) if (!d->actionRestrictions || !action) return true; - static const TQString &action_prefix = KGlobal::staticQString( "action/" ); + static const TQString &action_prefix = TDEGlobal::staticQString( "action/" ); return authorize(action_prefix + action); } @@ -3370,14 +3370,14 @@ bool TDEApplication::authorizeControlModule(const TQString &menuId) { if (menuId.isEmpty() || kde_kiosk_exception) return true; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); return config->readBoolEntry(menuId, true); } TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "TDE Control Module Restrictions" ); TQStringList result; for(TQStringList::ConstIterator it = menuIds.begin(); @@ -3426,7 +3426,7 @@ void TDEApplication::initUrlActionRestrictions() d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true)); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE URL Restrictions" ); int count = config->readNumEntry("rule_count"); TQString keyFormat = TQString("rule_%1"); @@ -3457,9 +3457,9 @@ void TDEApplication::initUrlActionRestrictions() urlPath.replace(0, 1, TQDir::homeDirPath()); if (refPath.startsWith("$TMP")) - refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + refPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp")); if (urlPath.startsWith("$TMP")) - urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + urlPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp")); d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule ( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled)); diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index 49abf1202..f472e3351 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -662,7 +662,7 @@ public slots: /** * Broadcast a received keycode to all listening KDE applications * The primary use for this feature is to connect hotkeys such as - * XF86Display to their respective KGlobalAccel functions while + * XF86Display to their respective TDEGlobalAccel functions while * the screen is locked by kdesktop_lock. */ void broadcastKeyCode(unsigned int keyCode); @@ -1450,8 +1450,8 @@ signals: void backgroundChanged(int desk); /** - * Emitted when the global settings have been changed - see KGlobalSettings - * TDEApplication takes care of calling reparseConfiguration on KGlobal::config() + * Emitted when the global settings have been changed - see TDEGlobalSettings + * TDEApplication takes care of calling reparseConfiguration on TDEGlobal::config() * so that applications/classes using this only have to re-read the configuration * @param category the category among the enum above */ @@ -1522,7 +1522,7 @@ signals: /** * @internal - * Used to send KGlobalAccel objects a new keypress from physical hotkeys. + * Used to send TDEGlobalAccel objects a new keypress from physical hotkeys. */ void coreFakeKeyPress(unsigned int keyCode); @@ -1546,7 +1546,7 @@ private: /** - * \relates KGlobal + * \relates TDEGlobal * Check, if a file may be accessed in a given mode. * This is a wrapper around the access() system call. * checkAccess() calls access() with the given parameters. diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index e5b19a28c..f6c29be7d 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -42,8 +42,8 @@ */ void TDEApplication_init_windows(bool /*GUIenabled*/) { - TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() - + "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" ); + TQString qt_transl_file = ::locate( "locale", TDEGlobal::locale()->language() + + "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" ); QTranslator *qt_transl = new QTranslator(); if (qt_transl->load( qt_transl_file, "")) kapp->installTranslator( qt_transl ); diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp index 57898da84..ab38dc4ca 100644 --- a/tdecore/kcalendarsystem.cpp +++ b/tdecore/kcalendarsystem.cpp @@ -49,7 +49,7 @@ const KLocale * KCalendarSystem::locale() const if ( d->locale ) return d->locale; - return KGlobal::locale(); + return TDEGlobal::locale(); } TQString KCalendarSystem::dayString(const TQDate & pDate, bool bShort) const diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp index 52cf87849..a732bf266 100644 --- a/tdecore/kcharsets.cpp +++ b/tdecore/kcharsets.cpp @@ -535,7 +535,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const return codec; // cache hit, return if (n.isEmpty()) { - codec = KGlobal::locale()->codecForEncoding(); + codec = TDEGlobal::locale()->codecForEncoding(); d->codecForNameDict.replace("->locale<-", codec); return codec; } @@ -572,8 +572,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const TQString dir; { - KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" ); - dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); + KConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" ); + dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); } // these are codecs not included in Qt. They can be build up if the corresponding charmap diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h index 2816e4fcd..da96643ff 100644 --- a/tdecore/kcharsets.h +++ b/tdecore/kcharsets.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include "tdelibs_export.h" -class KGlobal; +class TDEGlobal; class KCharsetsPrivate; class TQTextCodec; @@ -42,11 +42,11 @@ class TQTextCodec; */ class TDECORE_EXPORT KCharsets { - friend class KGlobal; + friend class TDEGlobal; protected: /** Protected constructor. If you need the kcharsets object, use - KGlobal::charsets() instead. + TDEGlobal::charsets() instead. */ KCharsets(); diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index 06337485c..c245f9435 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -80,15 +80,15 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) : TQObject( parent, "kapp_accel_filter" ), key(0), block( false ), drklash(0) { parent->installEventFilter( this ); - KConfigGroupSaver saver( KGlobal::config(), "Development" ); - TQString sKey = KGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace(); + KConfigGroupSaver saver( TDEGlobal::config(), "Development" ); + TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace(); if( !sKey.isEmpty() ) { KShortcut cuts( sKey ); if( cuts.count() > 0 ) key = int(cuts.seq(0).qt()); } - alwaysShow = KGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); - autoCheck = KGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); + alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); + autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot())); } diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 4d77c3da2..e6d763b79 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -38,7 +38,7 @@ * especially the second one. */ -class KClipboardSynchronizer::MimeSource : public TQMimeSource +class TDEClipboardSynchronizer::MimeSource : public TQMimeSource { public: MimeSource( const TQMimeSource * src ) @@ -89,25 +89,25 @@ private: }; -KClipboardSynchronizer * KClipboardSynchronizer::s_self = 0L; -bool KClipboardSynchronizer::s_sync = false; -bool KClipboardSynchronizer::s_reverse_sync = false; -bool KClipboardSynchronizer::s_blocked = false; +TDEClipboardSynchronizer * TDEClipboardSynchronizer::s_self = 0L; +bool TDEClipboardSynchronizer::s_sync = false; +bool TDEClipboardSynchronizer::s_reverse_sync = false; +bool TDEClipboardSynchronizer::s_blocked = false; -KClipboardSynchronizer * KClipboardSynchronizer::self() +TDEClipboardSynchronizer * TDEClipboardSynchronizer::self() { if ( !s_self ) - s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); + s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); return s_self; } -KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *name ) +TDEClipboardSynchronizer::TDEClipboardSynchronizer( TQObject *parent, const char *name ) : TQObject( parent, name ) { s_self = this; - KConfigGroup config( KGlobal::config(), "General" ); + KConfigGroup config( TDEGlobal::config(), "General" ); s_sync = config.readBoolEntry( "SynchronizeClipboardAndSelection", s_sync); s_reverse_sync = config.readBoolEntry( "ClipboardSetSelection", s_reverse_sync ); @@ -115,13 +115,13 @@ KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *na setupSignals(); } -KClipboardSynchronizer::~KClipboardSynchronizer() +TDEClipboardSynchronizer::~TDEClipboardSynchronizer() { if ( s_self == this ) s_self = 0L; } -void KClipboardSynchronizer::setupSignals() +void TDEClipboardSynchronizer::setupSignals() { TQClipboard *clip = TQApplication::clipboard(); disconnect( clip, NULL, this, NULL ); @@ -133,7 +133,7 @@ void KClipboardSynchronizer::setupSignals() TQT_SLOT( slotClipboardChanged() )); } -void KClipboardSynchronizer::slotSelectionChanged() +void TDEClipboardSynchronizer::slotSelectionChanged() { TQClipboard *clip = TQApplication::clipboard(); @@ -145,7 +145,7 @@ void KClipboardSynchronizer::slotSelectionChanged() TQClipboard::Clipboard ); } -void KClipboardSynchronizer::slotClipboardChanged() +void TDEClipboardSynchronizer::slotClipboardChanged() { TQClipboard *clip = TQApplication::clipboard(); @@ -157,7 +157,7 @@ void KClipboardSynchronizer::slotClipboardChanged() TQClipboard::Selection ); } -void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode ) +void TDEClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode ) { // tqDebug("---> setting clipboard: %p", data); @@ -177,20 +177,20 @@ void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode s_blocked = false; } -void KClipboardSynchronizer::setSynchronizing( bool sync ) +void TDEClipboardSynchronizer::setSynchronizing( bool sync ) { s_sync = sync; self()->setupSignals(); } -void KClipboardSynchronizer::setReverseSynchronizing( bool enable ) +void TDEClipboardSynchronizer::setReverseSynchronizing( bool enable ) { s_reverse_sync = enable; self()->setupSignals(); } // private, called by TDEApplication -void KClipboardSynchronizer::newConfiguration( int config ) +void TDEClipboardSynchronizer::newConfiguration( int config ) { s_sync = (config & Synchronize); self()->setupSignals(); diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h index c13959e61..8ed8dcc91 100644 --- a/tdecore/kclipboard.h +++ b/tdecore/kclipboard.h @@ -33,7 +33,7 @@ * @since 3.1 * @internal */ -class TDECORE_EXPORT KClipboardSynchronizer : public TQObject +class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject { Q_OBJECT @@ -43,13 +43,13 @@ public: friend class TDEApplication; /** - * Returns the KClipboardSynchronizer singleton object. - * @return the KClipboardSynchronizer singleton object. + * Returns the TDEClipboardSynchronizer singleton object. + * @return the TDEClipboardSynchronizer singleton object. */ - static KClipboardSynchronizer *self(); + static TDEClipboardSynchronizer *self(); /** - * Configures KClipboardSynchronizer to synchronize the Selection to Clipboard whenever + * Configures TDEClipboardSynchronizer to synchronize the Selection to Clipboard whenever * it changes. * * Default is false. @@ -69,7 +69,7 @@ public: } /** - * Configures KClipboardSynchronizer to copy the Clipboard buffer to the Selection + * Configures TDEClipboardSynchronizer to copy the Clipboard buffer to the Selection * buffer whenever the Clipboard changes. * * @@ -93,19 +93,19 @@ public: protected: - ~KClipboardSynchronizer(); + ~TDEClipboardSynchronizer(); private slots: void slotSelectionChanged(); void slotClipboardChanged(); private: - KClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L ); + TDEClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L ); void setupSignals(); static void setClipboard( TQMimeSource* data, TQClipboard::Mode mode ); - static KClipboardSynchronizer *s_self; + static TDEClipboardSynchronizer *s_self; static bool s_sync; static bool s_reverse_sync; static bool s_blocked; diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index 186f7e3af..b5af05f20 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -743,10 +743,10 @@ void TDECmdLineArgs::enable_i18n() { // called twice or too late - if (KGlobal::_locale) + if (TDEGlobal::_locale) return; - if (!KGlobal::_instance) { + if (!TDEGlobal::_instance) { TDEInstance *instance = new TDEInstance(about); (void) instance->config(); // Don't delete instance! @@ -756,7 +756,7 @@ TDECmdLineArgs::enable_i18n() void TDECmdLineArgs::usage(const TQString &error) { - assert(KGlobal::_locale); + assert(TDEGlobal::_locale); TQCString localError = error.local8Bit(); if (localError[error.length()-1] == '\n') localError = localError.left(error.length()-1); diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp index f74c0460c..8d1c7f0ac 100644 --- a/tdecore/kcompletion.cpp +++ b/tdecore/kcompletion.cpp @@ -42,7 +42,7 @@ KCompletion::KCompletion() { d = new KCompletionPrivate; - myCompletionMode = KGlobalSettings::completionMode(); + myCompletionMode = TDEGlobalSettings::completionMode(); myTreeRoot = new KCompTreeNode; myBeep = true; myIgnoreCase = false; @@ -188,7 +188,7 @@ void KCompletion::clear() TQString KCompletion::makeCompletion( const TQString& string ) { - if ( myCompletionMode == KGlobalSettings::CompletionNone ) + if ( myCompletionMode == TDEGlobalSettings::CompletionNone ) return TQString::null; //kdDebug(0) << "KCompletion: completing: " << string << endl; @@ -200,7 +200,7 @@ TQString KCompletion::makeCompletion( const TQString& string ) // in Shell-completion-mode, emit all matches when we get the same // complete-string twice - if ( myCompletionMode == KGlobalSettings::CompletionShell && + if ( myCompletionMode == TDEGlobalSettings::CompletionShell && string == myLastString ) { // Don't use d->matches since calling postProcessMatches() // on d->matches here would interfere with call to @@ -219,8 +219,8 @@ TQString KCompletion::makeCompletion( const TQString& string ) TQString completion; // in case-insensitive popup mode, we search all completions at once - if ( myCompletionMode == KGlobalSettings::CompletionPopup || - myCompletionMode == KGlobalSettings::CompletionPopupAuto ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionPopup || + myCompletionMode == TDEGlobalSettings::CompletionPopupAuto ) { findAllCompletions( string, &d->matches, myHasMultipleMatches ); if ( !d->matches.isEmpty() ) completion = d->matches.first(); @@ -288,7 +288,7 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const } -void KCompletion::setCompletionMode( KGlobalSettings::Completion mode ) +void KCompletion::setCompletionMode( TDEGlobalSettings::Completion mode ) { myCompletionMode = mode; } @@ -442,7 +442,7 @@ TQString KCompletion::findCompletion( const TQString& string ) if ( node && node->childrenCount() > 1 ) { myHasMultipleMatches = true; - if ( myCompletionMode == KGlobalSettings::CompletionAuto ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionAuto ) { myRotationIndex = 1; if (myOrder != Weighted) { while ( (node = node->firstChild()) ) { @@ -632,14 +632,14 @@ void KCompletion::doBeep( BeepMode mode ) const text = i18n("You reached the end of the list\nof matching items.\n"); break; case PartialMatch: - if ( myCompletionMode == KGlobalSettings::CompletionShell || - myCompletionMode == KGlobalSettings::CompletionMan ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionShell || + myCompletionMode == TDEGlobalSettings::CompletionMan ) { event = TQString::fromLatin1("Textcompletion: partial match"); text = i18n("The completion is ambiguous, more than one\nmatch is available.\n"); } break; case NoMatch: - if ( myCompletionMode == KGlobalSettings::CompletionShell ) { + if ( myCompletionMode == TDEGlobalSettings::CompletionShell ) { event = TQString::fromLatin1("Textcompletion: no match"); text = i18n("There is no matching item available.\n"); } diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index c0ba02d34..45182bd9d 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -77,8 +77,8 @@ class TQPopupMenu; * of manual and auto-completion is therefore only visible in UI classes, * KCompletion needs to know whether to deliver partial matches * (shell completion) or whole matches (auto/manual completion), therefore - * KGlobalSettings::CompletionMan and - * KGlobalSettings::CompletionAuto have the exact same effect in + * TDEGlobalSettings::CompletionMan and + * TDEGlobalSettings::CompletionAuto have the exact same effect in * KCompletion. * * @li shell completion works like how shells complete filenames: @@ -90,7 +90,7 @@ class TQPopupMenu; * You don't have to worry much about that though, KCompletion handles * that for you, according to the setting setCompletionMode(). * The default setting is globally configured by the user and read - * from KGlobalSettings::completionMode(). + * from TDEGlobalSettings::completionMode(). * * A short example: * \code @@ -251,22 +251,22 @@ public: /** * Sets the completion mode to Auto/Manual, Shell or None. * If you don't set the mode explicitly, the global default value - * KGlobalSettings::completionMode() is used. - * KGlobalSettings::CompletionNone disables completion. + * TDEGlobalSettings::completionMode() is used. + * TDEGlobalSettings::CompletionNone disables completion. * @param mode the completion mode * @see completionMode - * @see KGlobalSettings::completionMode + * @see TDEGlobalSettings::completionMode */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Return the current completion mode. - * May be different from KGlobalSettings::completionMode(), if you + * May be different from TDEGlobalSettings::completionMode(), if you * explicitly called setCompletionMode(). * @return the current completion mode * @see setCompletionMode */ - KGlobalSettings::Completion completionMode() const { + TDEGlobalSettings::Completion completionMode() const { return myCompletionMode; } @@ -570,7 +570,7 @@ private: enum BeepMode { NoMatch, PartialMatch, Rotation }; void doBeep( BeepMode ) const; - KGlobalSettings::Completion myCompletionMode; + TDEGlobalSettings::Completion myCompletionMode; CompOrder myOrder; TQString myLastString; @@ -825,7 +825,7 @@ public: * Sets the type of completion to be used. * * The completion modes supported are those defined in - * KGlobalSettings(). See below. + * TDEGlobalSettings(). See below. * * @param mode Completion type: * @li CompletionNone: Disables completion feature. @@ -841,17 +841,17 @@ public: * @li CompletionPopup: Shows all available completions at once, * in a listbox popping up. */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Returns the current completion mode. * - * The return values are of type KGlobalSettings::Completion. + * The return values are of type TDEGlobalSettings::Completion. * See setCompletionMode() for details. * * @return the completion mode. */ - KGlobalSettings::Completion completionMode() const { + TDEGlobalSettings::Completion completionMode() const { return m_delegate ? m_delegate->completionMode() : m_iCompletionMode; } @@ -908,7 +908,7 @@ public: * * This method changes the values of the key bindings for * rotation and completion features to the default values - * provided in KGlobalSettings. + * provided in TDEGlobalSettings. * * NOTE: By default inheriting widgets should uses the * global key-bindings so that there will be no need to @@ -992,7 +992,7 @@ private: // Determines whether this widget fires rotation signals bool m_bEmitSignals; // Stores the completion mode locally. - KGlobalSettings::Completion m_iCompletionMode; + TDEGlobalSettings::Completion m_iCompletionMode; // Pointer to Completion object. TQGuardedPtr<KCompletion> m_pCompObj; // Keybindings diff --git a/tdecore/kcompletionbase.cpp b/tdecore/kcompletionbase.cpp index 9e7f6d746..7589d842c 100644 --- a/tdecore/kcompletionbase.cpp +++ b/tdecore/kcompletionbase.cpp @@ -26,7 +26,7 @@ KCompletionBase::KCompletionBase() { m_delegate = 0L; // Assign the default completion type to use. - m_iCompletionMode = KGlobalSettings::completionMode(); + m_iCompletionMode = TDEGlobalSettings::completionMode(); // Initialize all key-bindings to 0 by default so that // the event filter will use the global settings. @@ -98,7 +98,7 @@ void KCompletionBase::setHandleSignals( bool handle ) m_bHandleSignals = handle; } -void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode ) +void KCompletionBase::setCompletionMode( TDEGlobalSettings::Completion mode ) { if ( m_delegate ) { m_delegate->setCompletionMode( mode ); @@ -108,7 +108,7 @@ void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode ) m_iCompletionMode = mode; // Always sync up KCompletion mode with ours as long as we // are performing completions. - if( m_pCompObj && m_iCompletionMode != KGlobalSettings::CompletionNone ) + if( m_pCompObj && m_iCompletionMode != TDEGlobalSettings::CompletionNone ) m_pCompObj->setCompletionMode( m_iCompletionMode ); } diff --git a/tdecore/kconfig.cpp b/tdecore/kconfig.cpp index 968c45d02..b8ac9d2a1 100644 --- a/tdecore/kconfig.cpp +++ b/tdecore/kconfig.cpp @@ -71,7 +71,7 @@ KConfig::KConfig( const TQString& fileName, // config object. // Since this makes only sense for config directories, addCustomized // returns true only if new config directories appeared. - if (KGlobal::dirs()->addCustomized(this)) + if (TDEGlobal::dirs()->addCustomized(this)) reparseConfiguration(); } diff --git a/tdecore/kconfig.h b/tdecore/kconfig.h index e3eb52f64..63e7be591 100644 --- a/tdecore/kconfig.h +++ b/tdecore/kconfig.h @@ -37,7 +37,7 @@ class KConfigPrivate; * This class implements KDE's default configuration system. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> -* @see KGlobal::config(), KConfigBase, KSimpleConfig +* @see TDEGlobal::config(), KConfigBase, KSimpleConfig * @short KDE Configuration Management class */ class TDECORE_EXPORT KConfig : public KConfigBase diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp index 91e8c7998..51175c528 100644 --- a/tdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp @@ -666,7 +666,7 @@ TQString defaultValue( const TQString &type ) { if ( type == "String" ) return "\"\""; // Use empty string, not null string! else if ( type == "StringList" ) return "TQStringList()"; - else if ( type == "Font" ) return "KGlobalSettings::generalFont()"; + else if ( type == "Font" ) return "TDEGlobalSettings::generalFont()"; else if ( type == "Rect" ) return "TQRect()"; else if ( type == "Size" ) return "TQSize()"; else if ( type == "Color" ) return "TQColor(128, 128, 128)"; @@ -1220,7 +1220,7 @@ int main( int argc, char **argv ) if ( !singleton ) { h << " " << className << "("; if (cfgFileNameArg) - h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = KGlobal::sharedConfig()" : ", "); + h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", "); for (TQValueList<Param>::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref index f89b7c133..413e75c9c 100644 --- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref +++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref @@ -9,10 +9,10 @@ Test8a::Test8a( KSharedConfig::Ptr config ) setCurrentGroup( TQString::fromLatin1( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() ); addItem( itemFont, TQString::fromLatin1( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() ); addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); } diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref index 2e947c437..0ab182a04 100644 --- a/tdecore/kconfig_compiler/tests/test8a.h.ref +++ b/tdecore/kconfig_compiler/tests/test8a.h.ref @@ -11,7 +11,7 @@ class Test8a : public KConfigSkeleton { public: - Test8a( KSharedConfig::Ptr config = KGlobal::sharedConfig() ); + Test8a( KSharedConfig::Ptr config = TDEGlobal::sharedConfig() ); ~Test8a(); /** diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfg b/tdecore/kconfig_compiler/tests/test8a.kcfg index 5ee87199f..53448b624 100644 --- a/tdecore/kconfig_compiler/tests/test8a.kcfg +++ b/tdecore/kconfig_compiler/tests/test8a.kcfg @@ -7,11 +7,11 @@ <group name="Group"> <entry name="Font" type="Font"> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry name="TitleFont" type="Font"> - <default code="true">KGlobalSettings::windowTitleFont()</default> + <default code="true">TDEGlobalSettings::windowTitleFont()</default> </entry> </group> </kcfg> diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index 492d4f494..4f217597b 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -254,11 +254,11 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, mLocalFileName = mfileName; } else { - mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName; + mLocalFileName = TDEGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName; } if (useKDEGlobals) { - mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); + mGlobalFileName = TDEGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals"); } else { mGlobalFileName = TQString::null; @@ -350,7 +350,7 @@ bool KConfigINIBackEnd::parseConfigFiles() // Parse the general config files if (useKDEGlobals) { - TQStringList kdercs = KGlobal::dirs()-> + TQStringList kdercs = TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("kdeglobals")); #ifdef Q_WS_WIN @@ -362,7 +362,7 @@ bool KConfigINIBackEnd::parseConfigFiles() if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; - kdercs += KGlobal::dirs()-> + kdercs += TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; @@ -383,7 +383,7 @@ bool KConfigINIBackEnd::parseConfigFiles() while(bReadFile) { bReadFile = false; TQString bootLanguage; - if (useKDEGlobals && localeString.isEmpty() && !KGlobal::_locale) { + if (useKDEGlobals && localeString.isEmpty() && !TDEGlobal::_locale) { // Boot strap language bootLanguage = KLocale::_initLanguage(pConfig); setLocaleString(bootLanguage.utf8()); @@ -394,7 +394,7 @@ bool KConfigINIBackEnd::parseConfigFiles() if ( !TQDir::isRelativePath(mfileName) ) list << mfileName; else - list = KGlobal::dirs()->findAllResources(resType, mfileName); + list = TDEGlobal::dirs()->findAllResources(resType, mfileName); TQStringList::ConstIterator it; @@ -410,7 +410,7 @@ bool KConfigINIBackEnd::parseConfigFiles() break; } } - if (KGlobal::dirs()->isRestrictedResource(resType, mfileName)) + if (TDEGlobal::dirs()->isRestrictedResource(resType, mfileName)) bFileImmutable = true; TQString currentLanguage; if (!bootLanguage.isEmpty()) @@ -1181,9 +1181,9 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser) TDEApplication *app = kapp; if (!cmdToExec.isEmpty() && app) { - KProcess lprocess; + TDEProcess lprocess; lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << TQCString(errorMsg.local8Bit()); - lprocess.start( KProcess::Block ); + lprocess.start( TDEProcess::Block ); } } return allWritable; diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index c5c0a4e25..e13d07782 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -63,8 +63,8 @@ void KConfigBase::setLocale() { bLocaleInitialized = true; - if (KGlobal::locale()) - aLocaleString = KGlobal::locale()->language().utf8(); + if (TDEGlobal::locale()) + aLocaleString = TDEGlobal::locale()->language().utf8(); else aLocaleString = KLocale::defaultLanguage().utf8(); if (backEnd) @@ -231,7 +231,7 @@ TQString KConfigBase::readEntry( const char *pKey, // because calling locale() will create a locale object if it // doesn't exist, which requires KConfig, which will create a infinite // loop, and nobody likes those. - if (!bLocaleInitialized && KGlobal::_locale) { + if (!bLocaleInitialized && TDEGlobal::_locale) { // get around const'ness. KConfigBase *that = const_cast<KConfigBase *>(this); that->setLocale(); @@ -259,7 +259,7 @@ TQString KConfigBase::readEntry( const char *pKey, aValue = TQString::fromUtf8(aEntryData.mValue.data()); if (aValue.isNull()) { - static const TQString &emptyString = KGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticQString(""); aValue = emptyString; } expand = aEntryData.bExpand; @@ -526,7 +526,7 @@ TQStringList KConfigBase::readListEntry( const TQString& pKey, char sep ) const TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const { - static const TQString& emptyString = KGlobal::staticQString(""); + static const TQString& emptyString = TDEGlobal::staticQString(""); TQStringList list; if( !hasKey( pKey ) ) @@ -1081,7 +1081,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value, if( bPersistent ) setDirty(true); - if (!bLocaleInitialized && KGlobal::locale()) + if (!bLocaleInitialized && TDEGlobal::locale()) setLocale(); KEntryKey entryKey(mGroup, pKey); @@ -1152,7 +1152,7 @@ static TQString translatePath( TQString path ) path.remove(0,1); } - // we can not use KGlobal::dirs()->relativeLocation("home", path) here, + // we can not use TDEGlobal::dirs()->relativeLocation("home", path) here, // since it would not recognize paths without a trailing '/'. // All of the 3 following functions to return the user's home directory // can return different paths. We have to test all them. @@ -1222,7 +1222,7 @@ void KConfigBase::deleteEntry( const char *pKey, // possible but minimized. setDirty(true); - if (!bLocaleInitialized && KGlobal::locale()) + if (!bLocaleInitialized && TDEGlobal::locale()) setLocale(); KEntryKey entryKey(mGroup, pKey); @@ -1750,7 +1750,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, void KConfigBase::parseConfigFiles() { - if (!bLocaleInitialized && KGlobal::_locale) { + if (!bLocaleInitialized && TDEGlobal::_locale) { setLocale(); } if (backEnd) diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h index 600bceb69..1818aadb5 100644 --- a/tdecore/kconfigbase.h +++ b/tdecore/kconfigbase.h @@ -62,7 +62,7 @@ class KConfigGroup; * a group name. * * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org> - * @see KGlobal#config() + * @see TDEGlobal#config() * @see KConfig * @see KSimpleConfig * @see KSharedConfig diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/kconfigskeleton.cpp index b464f64d2..ee873eca2 100644 --- a/tdecore/kconfigskeleton.cpp +++ b/tdecore/kconfigskeleton.cpp @@ -889,7 +889,7 @@ KConfigSkeleton::KConfigSkeleton( const TQString &configname ) } else { - mConfig = KGlobal::sharedConfig(); + mConfig = TDEGlobal::sharedConfig(); } } diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h index dde0779cf..3ad18d958 100644 --- a/tdecore/kconfigskeleton.h +++ b/tdecore/kconfigskeleton.h @@ -670,7 +670,7 @@ public: { public: ItemFont(const TQString & group, const TQString & key, TQFont & reference, - const TQFont & defaultValue = KGlobalSettings::generalFont()); + const TQFont & defaultValue = TDEGlobalSettings::generalFont()); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -1059,7 +1059,7 @@ public: */ ItemFont *addItemFont(const TQString & name, TQFont & reference, const TQFont & defaultValue = - KGlobalSettings::generalFont(), + TDEGlobalSettings::generalFont(), const TQString & key = TQString::null); /** diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp index 86ec1f39d..ae767ffb2 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/kcrash.cpp @@ -196,7 +196,7 @@ KCrash::defaultCrashHandler (int sig) argv[i++] = "--pid"; argv[i++] = pidtxt; - const TDEInstance *instance = KGlobal::_instance; + const TDEInstance *instance = TDEGlobal::_instance; const TDEAboutData *about = instance ? instance->aboutData() : 0; if (about) { if (about->internalVersion()) { diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index df38ff422..3d1818592 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -19,7 +19,7 @@ 172 tdecore (KStartupInfo) 173 tdecore (KLocale) 174 tdecore (KProcIO) -175 tdecore (KProcess) +175 tdecore (TDEProcess) 176 tdecore (KWin) 177 tdecore (KConfigSkeleton) 178 tdecore (KConfigDialogManager) diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index d3cc3c6b6..ef76e04f6 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -82,7 +82,7 @@ static TQCString getDescrFromNum(unsigned int _num) if (!KDebugCache) { kdd.setObject(KDebugCache, new TQIntDict<KDebugEntry>( 601 )); // Do not call this deleter from ~TDEApplication - KGlobal::unregisterStaticDeleter(&kdd); + TDEGlobal::unregisterStaticDeleter(&kdd); KDebugCache->setAutoDelete(true); } @@ -176,7 +176,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char { pcd.setObject(kDebug_data, new kDebugPrivate()); // Do not call this deleter from ~TDEApplication - KGlobal::unregisterStaticDeleter(&pcd); + TDEGlobal::unregisterStaticDeleter(&pcd); // create the dcop interface if it has not been created yet if (!kDebugDCOPIface) @@ -185,25 +185,25 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char } } - if (!kDebug_data->config && KGlobal::_instance ) + if (!kDebug_data->config && TDEGlobal::_instance ) { kDebug_data->config = new KConfig("kdebugrc", false, false); kDebug_data->config->setGroup("0"); //AB: this is necessary here, otherwise all output with area 0 won't be //prefixed with anything, unless something with area != 0 is called before - if ( KGlobal::_instance ) - kDebug_data->aAreaName = KGlobal::instance()->instanceName(); + if ( TDEGlobal::_instance ) + kDebug_data->aAreaName = TDEGlobal::instance()->instanceName(); } if (kDebug_data->config && kDebug_data->oldarea != nArea) { kDebug_data->config->setGroup( TQString::number(static_cast<int>(nArea)) ); kDebug_data->oldarea = nArea; - if ( nArea > 0 && KGlobal::_instance ) + if ( nArea > 0 && TDEGlobal::_instance ) kDebug_data->aAreaName = getDescrFromNum(nArea); if ((nArea == 0) || kDebug_data->aAreaName.isEmpty()) - if ( KGlobal::_instance ) - kDebug_data->aAreaName = KGlobal::instance()->instanceName(); + if ( TDEGlobal::_instance ) + kDebug_data->aAreaName = TDEGlobal::instance()->instanceName(); } int nPriority = 0; diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h index 1121d3679..d8a1998f9 100644 --- a/tdecore/kdebug.h +++ b/tdecore/kdebug.h @@ -422,7 +422,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list ) } /** - * \relates KGlobal + * \relates TDEGlobal * Prints an "\n". * @param s the debug stream to write to * @return the debug stream (@p s) @@ -430,7 +430,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list ) inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; } /** - * \relates KGlobal + * \relates TDEGlobal * Flushes the stream. * @param s the debug stream to write to * @return the debug stream (@p s) @@ -440,7 +440,7 @@ inline kdbgstream &flush( kdbgstream &s) { s.flush(); return s; } TDECORE_EXPORT kdbgstream &perror( kdbgstream &s); /** - * \relates KGlobal + * \relates TDEGlobal * kndbgstream is a dummy variant of kdbgstream. All functions do * nothing. * @see kndDebug() @@ -590,7 +590,7 @@ inline kndbgstream &flush( kndbgstream & s) { return s; } inline kndbgstream &perror( kndbgstream & s) { return s; } /** - * \relates KGlobal + * \relates TDEGlobal * Returns a debug stream. You can use it to print debug * information. * @param area an id to identify the output, 0 for default @@ -599,13 +599,13 @@ inline kndbgstream &perror( kndbgstream & s) { return s; } TDECORE_EXPORT kdbgstream kdDebug(int area = 0); TDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a backtrace. * @return a backtrace */ TDECORE_EXPORT TQString kdBacktrace(); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a backtrace. * @param levels the number of levels of the backtrace * @return a backtrace @@ -623,7 +623,7 @@ inline TQString kndBacktrace() { return TQString::null; } inline TQString kndBacktrace(int) { return TQString::null; } /** - * \relates KGlobal + * \relates TDEGlobal * Returns a warning stream. You can use it to print warning * information. * @param area an id to identify the output, 0 for default @@ -631,7 +631,7 @@ inline TQString kndBacktrace(int) { return TQString::null; } TDECORE_EXPORT kdbgstream kdWarning(int area = 0); TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns an error stream. You can use it to print error * information. * @param area an id to identify the output, 0 for default @@ -639,7 +639,7 @@ TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0); TDECORE_EXPORT kdbgstream kdError(int area = 0); TDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Returns a fatal error stream. You can use it to print fatal error * information. * @param area an id to identify the output, 0 for default @@ -648,7 +648,7 @@ TDECORE_EXPORT kdbgstream kdFatal(int area = 0); TDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0); /** - * \relates KGlobal + * \relates TDEGlobal * Deletes the kdebugrc cache and therefore forces KDebug to reread the * config file */ diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 02dfb1d5f..29c30f9d9 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -67,7 +67,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) if (!TQDir::isRelativePath(local)) { // Relative wrt apps? - local = KGlobal::dirs()->relativeLocation("apps", path); + local = TDEGlobal::dirs()->relativeLocation("apps", path); } if (TQDir::isRelativePath(local)) @@ -78,7 +78,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", local); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", local); if (!TQDir::isRelativePath(local)) { // Hm, that didn't work... @@ -98,7 +98,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (!TQDir::isRelativePath(local)) { // What now? Use filename only and hope for the best. @@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path) if (TQDir::isRelativePath(path)) return true; // Relative paths are ok. - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); if (TQDir::isRelativePath( dirs->relativeLocation("apps", path) )) return true; if (TQDir::isRelativePath( dirs->relativeLocation("xdgdata-apps", path) )) @@ -157,7 +157,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const TQString fName = fileName(); fName = fName.mid(fName.findRev('/')+1); TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value; - TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data()); + TQString po_value = TDEGlobal::locale()->translate(po_lookup_key.utf8().data()); if (po_value == po_lookup_key) return value; diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h index 032c14302..426b29ef1 100644 --- a/tdecore/kgenericfactory.h +++ b/tdecore/kgenericfactory.h @@ -49,7 +49,7 @@ public: virtual ~KGenericFactoryBase() { if ( s_instance ) - KGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) ); + TDEGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) ); delete s_instance; s_instance = 0; s_self = 0; @@ -72,7 +72,7 @@ protected: virtual void setupTranslations( void ) { if ( instance() ) - KGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) ); + TDEGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) ); } void initializeMessageCatalogue() diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index 57135a769..c51f13e7f 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ /* -* kglobal.cpp -- Implementation of class KGlobal. +* kglobal.cpp -- Implementation of class TDEGlobal. * Author: Sirtaj Singh Kang * Version: $Id$ * Generated: Sat May 1 02:08:43 EST 1999 @@ -53,55 +53,55 @@ static void kglobal_init(); -KStandardDirs *KGlobal::dirs() +KStandardDirs *TDEGlobal::dirs() { MYASSERT(_instance); return _instance->dirs(); } -KConfig *KGlobal::config() +KConfig *TDEGlobal::config() { MYASSERT(_instance); return _instance->config(); } -KSharedConfig *KGlobal::sharedConfig() +KSharedConfig *TDEGlobal::sharedConfig() { MYASSERT(_instance); return _instance->sharedConfig(); } -KIconLoader *KGlobal::iconLoader() +KIconLoader *TDEGlobal::iconLoader() { MYASSERT(_instance); return _instance->iconLoader(); } -TDEHardwareDevices *KGlobal::hardwareDevices() +TDEHardwareDevices *TDEGlobal::hardwareDevices() { MYASSERT(_instance); return _instance->hardwareDevices(); } -TDEGlobalNetworkManager *KGlobal::networkManager() +TDEGlobalNetworkManager *TDEGlobal::networkManager() { MYASSERT(_instance); return _instance->networkManager(); } -TDEInstance *KGlobal::instance() +TDEInstance *TDEGlobal::instance() { MYASSERT(_instance); return _instance; } -KLocale *KGlobal::locale() +KLocale *TDEGlobal::locale() { if( _locale == 0 ) { if (!_instance) @@ -117,7 +117,7 @@ KLocale *KGlobal::locale() return _locale; } -KCharsets *KGlobal::charsets() +KCharsets *TDEGlobal::charsets() { if( _charsets == 0 ) { _charsets =new KCharsets(); @@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets() return _charsets; } -void KGlobal::setActiveInstance(TDEInstance *i) +void TDEGlobal::setActiveInstance(TDEInstance *i) { _activeInstance = i; if (i && _locale) @@ -138,10 +138,10 @@ void KGlobal::setActiveInstance(TDEInstance *i) * Create a static QString * * To be used inside functions(!) like: - * static const TQString &myString = KGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticQString("myText"); */ const TQString & -KGlobal::staticQString(const char *str) +TDEGlobal::staticQString(const char *str) { return staticQString(TQString::fromLatin1(str)); } @@ -156,10 +156,10 @@ public: * Create a static QString * * To be used inside functions(!) like: - * static const TQString &myString = KGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); */ const TQString & -KGlobal::staticQString(const TQString &str) +TDEGlobal::staticQString(const TQString &str) { if (!_stringDict) { _stringDict = new KStringDict; @@ -182,7 +182,7 @@ public: }; void -KGlobal::registerStaticDeleter(KStaticDeleterBase *obj) +TDEGlobal::registerStaticDeleter(KStaticDeleterBase *obj) { if (!_staticDeleters) kglobal_init(); @@ -191,16 +191,16 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj) } void -KGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj) +TDEGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj) { if (_staticDeleters) _staticDeleters->removeRef(obj); } void -KGlobal::deleteStaticDeleters() +TDEGlobal::deleteStaticDeleters() { - if (!KGlobal::_staticDeleters) + if (!TDEGlobal::_staticDeleters) return; for(;_staticDeleters->count();) @@ -208,18 +208,18 @@ KGlobal::deleteStaticDeleters() _staticDeleters->take(0)->destructObject(); } - delete KGlobal::_staticDeleters; - KGlobal::_staticDeleters = 0; + delete TDEGlobal::_staticDeleters; + TDEGlobal::_staticDeleters = 0; } // The Variables -KStringDict *KGlobal::_stringDict = 0; -TDEInstance *KGlobal::_instance = 0; -TDEInstance *KGlobal::_activeInstance = 0; -KLocale *KGlobal::_locale = 0; -KCharsets *KGlobal::_charsets = 0; -KStaticDeleterList *KGlobal::_staticDeleters = 0; +KStringDict *TDEGlobal::_stringDict = 0; +TDEInstance *TDEGlobal::_instance = 0; +TDEInstance *TDEGlobal::_activeInstance = 0; +KLocale *TDEGlobal::_locale = 0; +KCharsets *TDEGlobal::_charsets = 0; +KStaticDeleterList *TDEGlobal::_staticDeleters = 0; #ifdef WIN32 #include <windows.h> @@ -235,23 +235,23 @@ __attribute__((destructor)) #endif static void kglobal_freeAll() { - delete KGlobal::_locale; - KGlobal::_locale = 0; - delete KGlobal::_charsets; - KGlobal::_charsets = 0; - delete KGlobal::_stringDict; - KGlobal::_stringDict = 0; - KGlobal::deleteStaticDeleters(); + delete TDEGlobal::_locale; + TDEGlobal::_locale = 0; + delete TDEGlobal::_charsets; + TDEGlobal::_charsets = 0; + delete TDEGlobal::_stringDict; + TDEGlobal::_stringDict = 0; + TDEGlobal::deleteStaticDeleters(); // so that we don't hold a reference and see memory leaks :/ - KGlobal::setActiveInstance(0); + TDEGlobal::setActiveInstance(0); } static void kglobal_init() { - if (KGlobal::_staticDeleters) + if (TDEGlobal::_staticDeleters) return; - KGlobal::_staticDeleters = new KStaticDeleterList; + TDEGlobal::_staticDeleters = new KStaticDeleterList; } int kasciistricmp( const char *str1, const char *str2 ) diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h index 5a775ae8c..361129e2b 100644 --- a/tdecore/kglobal.h +++ b/tdecore/kglobal.h @@ -36,14 +36,14 @@ class TQString; /** * Access to the KDE global objects. - * KGlobal provides you with pointers of many central + * TDEGlobal provides you with pointers of many central * objects that exist only once in the process. It is also * responsible for managing instances of KStaticDeleterBase. * * @see KStaticDeleterBase * @author Sirtaj Singh Kang (taj@kde.org) */ -class TDECORE_EXPORT KGlobal +class TDECORE_EXPORT TDEGlobal { public: @@ -108,12 +108,12 @@ public: * * To be used inside functions(!) like: * \code - * static const TQString &myString = KGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticQString("myText"); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = KGlobal::staticQString("myText"); + * static TQString myString = TDEGlobal::staticQString("myText"); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. @@ -127,12 +127,12 @@ public: * * To be used inside functions(!) like: * \code - * static const TQString &myString = KGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = KGlobal::staticQString(i18n("myText")); + * static TQString myString = TDEGlobal::staticQString(i18n("myText")); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. @@ -185,22 +185,22 @@ public: }; /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to find the minimum of the two arguments. */ #define KMIN(a,b) kMin(a,b) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to find the maximum of the two arguments. */ #define KMAX(a,b) kMax(a,b) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function to determine the absolute value of the argument. */ #define KABS(a) kAbs(a) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function that returns x if it's between low and high values. * low if x is smaller than then low and high if x is bigger than high. */ diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp index 32ed04f3f..f5fb71027 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/kglobalaccel.cpp @@ -36,45 +36,45 @@ //---------------------------------------------------- -KGlobalAccel::KGlobalAccel( TQObject* pParent, const char* psName ) +TDEGlobalAccel::TDEGlobalAccel( TQObject* pParent, const char* psName ) : TQObject( pParent, psName ) { - kdDebug(125) << "KGlobalAccel(): this = " << this << endl; - d = new KGlobalAccelPrivate(); + kdDebug(125) << "TDEGlobalAccel(): this = " << this << endl; + d = new TDEGlobalAccelPrivate(); } -KGlobalAccel::~KGlobalAccel() +TDEGlobalAccel::~TDEGlobalAccel() { - kdDebug(125) << "~KGlobalAccel(): this = " << this << endl; + kdDebug(125) << "~TDEGlobalAccel(): this = " << this << endl; delete d; } /* -void KGlobalAccel::clear() +void TDEGlobalAccel::clear() { d->clearActions(); } */ -KAccelActions& KGlobalAccel::actions() +KAccelActions& TDEGlobalAccel::actions() { return d->KAccelBase::actions(); } -const KAccelActions& KGlobalAccel::actions() const +const KAccelActions& TDEGlobalAccel::actions() const { return d->KAccelBase::actions(); } -bool KGlobalAccel::isEnabled() +bool TDEGlobalAccel::isEnabled() { return ((KAccelBase*)d)->isEnabled(); } -void KGlobalAccel::setEnabled( bool bEnabled ) +void TDEGlobalAccel::setEnabled( bool bEnabled ) { d->setEnabled( bEnabled ); } -void KGlobalAccel::suspend( bool s ) +void TDEGlobalAccel::suspend( bool s ) { d->suspend( s ); } -void KGlobalAccel::blockShortcuts( bool block ) - { KGlobalAccelPrivate::blockShortcuts( block ); } +void TDEGlobalAccel::blockShortcuts( bool block ) + { TDEGlobalAccelPrivate::blockShortcuts( block ); } -void KGlobalAccel::disableBlocking( bool disable ) +void TDEGlobalAccel::disableBlocking( bool disable ) { d->disableBlocking( disable ); } -KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp, +KAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp, const KShortcut& cutDef3, const KShortcut& cutDef4, const TQObject* pObjSlot, const char* psMethodSlot, bool bConfigurable, bool bEnabled ) @@ -85,55 +85,55 @@ KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDe bConfigurable, bEnabled ); } -KAccelAction* KGlobalAccel::insert( const TQString& sName, const TQString& sDesc ) +KAccelAction* TDEGlobalAccel::insert( const TQString& sName, const TQString& sDesc ) { return d->insert( sName, sDesc ); } -bool KGlobalAccel::updateConnections() +bool TDEGlobalAccel::updateConnections() { return d->updateConnections(); } -bool KGlobalAccel::remove( const TQString& sAction ) +bool TDEGlobalAccel::remove( const TQString& sAction ) { return d->remove( sAction ); } -const KShortcut& KGlobalAccel::shortcut( const TQString& sAction ) const +const KShortcut& TDEGlobalAccel::shortcut( const TQString& sAction ) const { const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->shortcut() : KShortcut::null(); } -bool KGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut ) +bool TDEGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut ) { return d->setShortcut( sAction, cut ); } -bool KGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot ) +bool TDEGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot ) { return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); } -TQString KGlobalAccel::label( const TQString& sAction ) const +TQString TDEGlobalAccel::label( const TQString& sAction ) const { const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->label() : TQString(); } -bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) +bool TDEGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) { return d->setActionEnabled( sAction, bEnable ); } -const TQString& KGlobalAccel::configGroup() const +const TQString& TDEGlobalAccel::configGroup() const { return d->configGroup(); } // for tdemultimedia/kmix -void KGlobalAccel::setConfigGroup( const TQString& s ) +void TDEGlobalAccel::setConfigGroup( const TQString& s ) { d->setConfigGroup( s ); } -bool KGlobalAccel::readSettings( KConfigBase* pConfig ) +bool TDEGlobalAccel::readSettings( KConfigBase* pConfig ) { d->readSettings( pConfig ); return true; } -bool KGlobalAccel::writeSettings( KConfigBase* pConfig ) const +bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig ) const { d->writeSettings( pConfig ); return true; } -bool KGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const +bool TDEGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const { d->setConfigGlobal( bGlobal ); d->writeSettings( pConfig ); return true; } -bool KGlobalAccel::useFourModifierKeys() +bool TDEGlobalAccel::useFourModifierKeys() { return KAccelAction::useFourModifierKeys(); } -void KGlobalAccel::virtual_hook( int, void* ) +void TDEGlobalAccel::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } #include "kglobalaccel.moc" diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index 7fb44a021..1389386c4 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -29,10 +29,10 @@ class KAccelAction; class KAccelActions; class KConfigBase; -class KGlobalAccelPrivate; +class TDEGlobalAccelPrivate; /** -* KGlobalAccel allows you to have global accelerators that are independent of +* TDEGlobalAccel allows you to have global accelerators that are independent of * the focused window. Unlike KAccel it does not matter which window is * currently active. * @@ -42,28 +42,28 @@ class KGlobalAccelPrivate; * @see KKeyDialog * @short Configurable global shortcut support */ -class TDECORE_EXPORT KGlobalAccel : public TQObject +class TDECORE_EXPORT TDEGlobalAccel : public TQObject { Q_OBJECT public: /** - * Creates a new KGlobalAccel object with the given pParent and + * Creates a new TDEGlobalAccel object with the given pParent and * psName. * @param pParent the parent of the QObject * @param psName the name of the QObject */ - KGlobalAccel( TQObject* pParent, const char* psName = 0 ); - virtual ~KGlobalAccel(); + TDEGlobalAccel( TQObject* pParent, const char* psName = 0 ); + virtual ~TDEGlobalAccel(); /** * Checks whether the accelerators are enabled. - * @return true if the KGlobalAccel is enabled + * @return true if the TDEGlobalAccel is enabled */ bool isEnabled(); /** - * Enables or disables the KGlobalAccel - * @param bEnabled true if the KGlobalAccel should be enabled, false if it + * Enables or disables the TDEGlobalAccel + * @param bEnabled true if the TDEGlobalAccel should be enabled, false if it * should be disabled. */ void setEnabled( bool bEnabled ); @@ -171,7 +171,7 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject /** * Read all shortcuts from @p pConfig, or (if @p pConfig * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * @param pConfig the configuration file to read from, or 0 for the application * configuration file * @return true if successful, false otherwise @@ -219,7 +219,7 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject /** * @internal */ - // like setEnabled(), but doesn't ungrab (see in KGlobalAccelPrivate) + // like setEnabled(), but doesn't ungrab (see in TDEGlobalAccelPrivate) void suspend( bool s ); private: @@ -227,13 +227,13 @@ private: KAccelActions& actions(); const KAccelActions& actions() const; - friend class KGlobalAccelPrivate; + friend class TDEGlobalAccelPrivate; friend class KAccelShortcutList; protected: /** \internal */ virtual void virtual_hook( int id, void* data ); private: - class KGlobalAccelPrivate* d; + class TDEGlobalAccelPrivate* d; }; #endif // _KGLOBALACCEL_H_ diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h index 859a53362..8a5352817 100644 --- a/tdecore/kglobalaccel_emb.h +++ b/tdecore/kglobalaccel_emb.h @@ -4,10 +4,10 @@ #include "kaccelbase.h" #include "kshortcut.h" -class KGlobalAccelPrivate +class TDEGlobalAccelPrivate { public: - KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h index 1bed4f3cc..c82bdc17a 100644 --- a/tdecore/kglobalaccel_mac.h +++ b/tdecore/kglobalaccel_mac.h @@ -6,10 +6,10 @@ #include "kshortcut.h" #include "kaccelbase.h" -class KGlobalAccelPrivate: public KAccelBase +class TDEGlobalAccelPrivate: public KAccelBase { public: - KGlobalAccelPrivate() + TDEGlobalAccelPrivate() : KAccelBase(KAccelBase::NATIVE_KEYS) {} diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 4323320bc..1ea3f0250 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -37,21 +37,21 @@ //---------------------------------------------------- -static TQValueList< KGlobalAccelPrivate* >* all_accels = 0; +static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; -KGlobalAccelPrivate::KGlobalAccelPrivate() +TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() : KAccelBase( KAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) { if( all_accels == NULL ) - all_accels = new TQValueList< KGlobalAccelPrivate* >; + all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; // kapp->installX11EventFilter( this ); } -KGlobalAccelPrivate::~KGlobalAccelPrivate() +TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() { // TODO: Need to release all grabbed keys if the main window is not shutting down. //for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { @@ -64,17 +64,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate() } } -void KGlobalAccelPrivate::setEnabled( bool bEnable ) +void TDEGlobalAccelPrivate::setEnabled( bool bEnable ) { m_bEnabled = bEnable; //updateConnections(); } -void KGlobalAccelPrivate::blockShortcuts( bool block ) +void TDEGlobalAccelPrivate::blockShortcuts( bool block ) { if( all_accels == NULL ) return; - for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); + for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); it != all_accels->end(); ++it ) { if( (*it)->m_blockingDisabled ) @@ -84,35 +84,35 @@ void KGlobalAccelPrivate::blockShortcuts( bool block ) } } -void KGlobalAccelPrivate::disableBlocking( bool block ) +void TDEGlobalAccelPrivate::disableBlocking( bool block ) { m_blockingDisabled = block; } -bool KGlobalAccelPrivate::isEnabledInternal() const +bool TDEGlobalAccelPrivate::isEnabledInternal() const { return KAccelBase::isEnabled() && !m_blocked; } -bool KGlobalAccelPrivate::emitSignal( Signal ) +bool TDEGlobalAccelPrivate::emitSignal( Signal ) { return false; } -bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } -bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } -bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) { /* if( !key.code() ) { - kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; + kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; return false; } @@ -190,7 +190,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce return false; } -/*bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) +/*bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent ) { //kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl; switch( pEvent->type ) { @@ -206,9 +206,9 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce } } -void KGlobalAccelPrivate::x11MappingNotify() +void TDEGlobalAccelPrivate::x11MappingNotify() { - kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl; if( m_bEnabled ) { // Maybe the X modifier map has been changed. KKeyServer::initializeMods(); @@ -218,7 +218,7 @@ void KGlobalAccelPrivate::x11MappingNotify() } } -bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) +bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) { // do not change this line unless you really really know what you are doing (Matthias) if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) { @@ -297,9 +297,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; }*/ -void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) { - kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; TQRegExp rexPassIndex( "([ ]*int[ ]*)" ); TQRegExp rexPassInfo( " TQString" ); @@ -333,7 +333,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s } } -void KGlobalAccelPrivate::slotActivated( int iAction ) +void TDEGlobalAccelPrivate::slotActivated( int iAction ) { KAccelAction* pAction = actions().actionPtr( iAction ); if( pAction ) diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h index 414254881..cde46c472 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/kglobalaccel_win.h @@ -30,13 +30,13 @@ /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 260bc39e1..701c954f3 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -77,23 +77,23 @@ static void calculateGrabMasks() //---------------------------------------------------- -static TQValueList< KGlobalAccelPrivate* >* all_accels = 0; +static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0; -KGlobalAccelPrivate::KGlobalAccelPrivate() +TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() : KAccelBase( KAccelBase::NATIVE_KEYS ) , m_blocked( false ) , m_blockingDisabled( false ) , m_suspended( false ) { if( all_accels == NULL ) - all_accels = new TQValueList< KGlobalAccelPrivate* >; + all_accels = new TQValueList< TDEGlobalAccelPrivate* >; all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; kapp->installX11EventFilter( this ); connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); } -KGlobalAccelPrivate::~KGlobalAccelPrivate() +TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() { // TODO: Need to release all grabbed keys if the main window is not shutting down. //for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { @@ -106,17 +106,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate() } } -void KGlobalAccelPrivate::setEnabled( bool bEnable ) +void TDEGlobalAccelPrivate::setEnabled( bool bEnable ) { m_bEnabled = bEnable; updateConnections(); } -void KGlobalAccelPrivate::blockShortcuts( bool block ) +void TDEGlobalAccelPrivate::blockShortcuts( bool block ) { if( all_accels == NULL ) return; - for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); + for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin(); it != all_accels->end(); ++it ) { if( (*it)->m_blockingDisabled ) @@ -126,41 +126,41 @@ void KGlobalAccelPrivate::blockShortcuts( bool block ) } } -void KGlobalAccelPrivate::disableBlocking( bool block ) +void TDEGlobalAccelPrivate::disableBlocking( bool block ) { m_blockingDisabled = block; } -bool KGlobalAccelPrivate::isEnabledInternal() const +bool TDEGlobalAccelPrivate::isEnabledInternal() const { return KAccelBase::isEnabled() && !m_blocked; } // see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably // difficult to make, and so on - just don't release the grabs and only ignore the events instead -void KGlobalAccelPrivate::suspend( bool s ) +void TDEGlobalAccelPrivate::suspend( bool s ) { m_suspended = s; } -bool KGlobalAccelPrivate::emitSignal( Signal ) +bool TDEGlobalAccelPrivate::emitSignal( Signal ) { return false; } -bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, true, &action ); } -bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key ) { return grabKey( key, true, 0 ); } -bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key ) { return grabKey( key, false, &action ); } -bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) +bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key ) { return grabKey( key, false, 0 ); } -bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) +bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction ) { if( !key.code() ) { - kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; + kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl; return false; } @@ -245,7 +245,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce return !failed; } -bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) +bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent ) { //kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl; switch( pEvent->type ) { @@ -261,9 +261,9 @@ bool KGlobalAccelPrivate::x11Event( XEvent* pEvent ) } } -void KGlobalAccelPrivate::x11MappingNotify() +void TDEGlobalAccelPrivate::x11MappingNotify() { - kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl; // Maybe the X modifier map has been changed. KKeyServer::initializeMods(); calculateGrabMasks(); @@ -271,7 +271,7 @@ void KGlobalAccelPrivate::x11MappingNotify() updateConnections(); } -void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { +void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { CodeMod codemod; codemod.code = keyCode; codemod.mod = 0; @@ -314,7 +314,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { activate( pAction, KKeySequence(key) ); } -bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) +bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) { // do not change this line unless you really really know what you are doing (Matthias) if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) { @@ -394,9 +394,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) return true; } -void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) +void TDEGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq ) { - kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; + kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl; TQRegExp rexPassIndex( "([ ]*int[ ]*)" ); TQRegExp rexPassInfo( " TQString" ); @@ -430,7 +430,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s } } -void KGlobalAccelPrivate::slotActivated( int iAction ) +void TDEGlobalAccelPrivate::slotActivated( int iAction ) { KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction ); if( pAction ) diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h index 3022e0d90..e28df060d 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/kglobalaccel_x11.h @@ -30,13 +30,13 @@ /** * @internal */ -class KGlobalAccelPrivate : public TQWidget, public KAccelBase +class TDEGlobalAccelPrivate : public TQWidget, public KAccelBase { - friend class KGlobalAccel; + friend class TDEGlobalAccel; Q_OBJECT public: - KGlobalAccelPrivate(); - virtual ~KGlobalAccelPrivate(); + TDEGlobalAccelPrivate(); + virtual ~TDEGlobalAccelPrivate(); virtual void setEnabled( bool bEnabled ); diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index 74cdaa603..f654608ac 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -58,28 +58,28 @@ static QRgb qt_colorref2qrgb(COLORREF col) #include <X11/Xlib.h> #endif -TQString* KGlobalSettings::s_desktopPath = 0; -TQString* KGlobalSettings::s_autostartPath = 0; -TQString* KGlobalSettings::s_trashPath = 0; -TQString* KGlobalSettings::s_documentPath = 0; -TQFont *KGlobalSettings::_generalFont = 0; -TQFont *KGlobalSettings::_fixedFont = 0; -TQFont *KGlobalSettings::_toolBarFont = 0; -TQFont *KGlobalSettings::_menuFont = 0; -TQFont *KGlobalSettings::_windowTitleFont = 0; -TQFont *KGlobalSettings::_taskbarFont = 0; -TQFont *KGlobalSettings::_largeFont = 0; -TQColor *KGlobalSettings::_trinity4Blue = 0; -TQColor *KGlobalSettings::_inactiveBackground = 0; -TQColor *KGlobalSettings::_inactiveForeground = 0; -TQColor *KGlobalSettings::_activeBackground = 0; -TQColor *KGlobalSettings::_buttonBackground = 0; -TQColor *KGlobalSettings::_selectBackground = 0; -TQColor *KGlobalSettings::_linkColor = 0; -TQColor *KGlobalSettings::_visitedLinkColor = 0; -TQColor *KGlobalSettings::alternateColor = 0; - -KGlobalSettings::KMouseSettings *KGlobalSettings::s_mouseSettings = 0; +TQString* TDEGlobalSettings::s_desktopPath = 0; +TQString* TDEGlobalSettings::s_autostartPath = 0; +TQString* TDEGlobalSettings::s_trashPath = 0; +TQString* TDEGlobalSettings::s_documentPath = 0; +TQFont *TDEGlobalSettings::_generalFont = 0; +TQFont *TDEGlobalSettings::_fixedFont = 0; +TQFont *TDEGlobalSettings::_toolBarFont = 0; +TQFont *TDEGlobalSettings::_menuFont = 0; +TQFont *TDEGlobalSettings::_windowTitleFont = 0; +TQFont *TDEGlobalSettings::_taskbarFont = 0; +TQFont *TDEGlobalSettings::_largeFont = 0; +TQColor *TDEGlobalSettings::_trinity4Blue = 0; +TQColor *TDEGlobalSettings::_inactiveBackground = 0; +TQColor *TDEGlobalSettings::_inactiveForeground = 0; +TQColor *TDEGlobalSettings::_activeBackground = 0; +TQColor *TDEGlobalSettings::_buttonBackground = 0; +TQColor *TDEGlobalSettings::_selectBackground = 0; +TQColor *TDEGlobalSettings::_linkColor = 0; +TQColor *TDEGlobalSettings::_visitedLinkColor = 0; +TQColor *TDEGlobalSettings::alternateColor = 0; + +TDEGlobalSettings::KMouseSettings *TDEGlobalSettings::s_mouseSettings = 0; // helper function for reading xdg user dirs: it is required in order to take // care of locale stuff @@ -106,49 +106,49 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) } } -int KGlobalSettings::dndEventDelay() +int TDEGlobalSettings::dndEventDelay() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readNumEntry("StartDragDist", TQApplication::startDragDistance()); } -bool KGlobalSettings::singleClick() +bool TDEGlobalSettings::singleClick() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); } -bool KGlobalSettings::iconUseRoundedRect() +bool TDEGlobalSettings::iconUseRoundedRect() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED); } -KGlobalSettings::TearOffHandle KGlobalSettings::insertTearOffHandle() +TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle() { int tearoff; bool effectsenabled; - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); effectsenabled = g.readBoolEntry( "EffectsEnabled", false); tearoff = g.readNumEntry("InsertTearOffHandle", KDE_DEFAULT_INSERTTEAROFFHANDLES); return effectsenabled ? (TearOffHandle) tearoff : Disable; } -bool KGlobalSettings::changeCursorOverIcon() +bool TDEGlobalSettings::changeCursorOverIcon() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR); } -bool KGlobalSettings::visualActivate() +bool TDEGlobalSettings::visualActivate() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("VisualActivate", KDE_DEFAULT_VISUAL_ACTIVATE); } -unsigned int KGlobalSettings::visualActivateSpeed() +unsigned int TDEGlobalSettings::visualActivateSpeed() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "VisualActivateSpeed", @@ -158,16 +158,16 @@ unsigned int KGlobalSettings::visualActivateSpeed() -int KGlobalSettings::autoSelectDelay() +int TDEGlobalSettings::autoSelectDelay() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY); } -KGlobalSettings::Completion KGlobalSettings::completionMode() +TDEGlobalSettings::Completion TDEGlobalSettings::completionMode() { int completion; - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); completion = g.readNumEntry("completionMode", -1); if ((completion < (int) CompletionNone) || (completion > (int) CompletionPopupAuto)) @@ -177,51 +177,51 @@ KGlobalSettings::Completion KGlobalSettings::completionMode() return (Completion) completion; } -bool KGlobalSettings::showContextMenusOnPress () +bool TDEGlobalSettings::showContextMenusOnPress () { - KConfigGroup g(KGlobal::config(), "ContextMenus"); + KConfigGroup g(TDEGlobal::config(), "ContextMenus"); return g.readBoolEntry("ShowOnPress", true); } -int KGlobalSettings::contextMenuKey () +int TDEGlobalSettings::contextMenuKey () { - KConfigGroup g(KGlobal::config(), "Shortcuts"); + KConfigGroup g(TDEGlobal::config(), "Shortcuts"); KShortcut cut (g.readEntry ("PopupMenuContext", "Menu")); return cut.keyCodeQt(); } -TQColor KGlobalSettings::toolBarHighlightColor() +TQColor TDEGlobalSettings::toolBarHighlightColor() { initColors(); - KConfigGroup g( KGlobal::config(), "Toolbar style" ); + KConfigGroup g( TDEGlobal::config(), "Toolbar style" ); return g.readColorEntry("HighlightColor", _trinity4Blue); } -TQColor KGlobalSettings::inactiveTitleColor() +TQColor TDEGlobalSettings::inactiveTitleColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)); #else if (!_inactiveBackground) _inactiveBackground = new TQColor(157, 170, 186); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveBackground", _inactiveBackground ); #endif } -TQColor KGlobalSettings::inactiveTextColor() +TQColor TDEGlobalSettings::inactiveTextColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); #else if (!_inactiveForeground) _inactiveForeground = new TQColor(221,221,221); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "inactiveForeground", _inactiveForeground ); #endif } -TQColor KGlobalSettings::activeTitleColor() +TQColor TDEGlobalSettings::activeTitleColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); @@ -229,89 +229,89 @@ TQColor KGlobalSettings::activeTitleColor() initColors(); if (!_activeBackground) _activeBackground = new TQColor(65,142,220); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeBackground", _activeBackground); #endif } -TQColor KGlobalSettings::activeTextColor() +TQColor TDEGlobalSettings::activeTextColor() { #ifdef Q_WS_WIN return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)); #else - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); return g.readColorEntry( "activeForeground", tqwhiteptr ); #endif } -int KGlobalSettings::contrast() +int TDEGlobalSettings::contrast() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry( "contrast", 7 ); } -TQColor KGlobalSettings::buttonBackground() +TQColor TDEGlobalSettings::buttonBackground() { if (!_buttonBackground) _buttonBackground = new TQColor(221,223,228); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonBackground", _buttonBackground ); } -TQColor KGlobalSettings::buttonTextColor() +TQColor TDEGlobalSettings::buttonTextColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "buttonForeground", tqblackptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::baseColor() +TQColor TDEGlobalSettings::baseColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowBackground", tqwhiteptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::textColor() +TQColor TDEGlobalSettings::textColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "windowForeground", tqblackptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::highlightedTextColor() +TQColor TDEGlobalSettings::highlightedTextColor() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectForeground", tqwhiteptr ); } // IMPORTANT: // This function should be kept in sync with // TDEApplication::kdisplaySetPalette() -TQColor KGlobalSettings::highlightColor() +TQColor TDEGlobalSettings::highlightColor() { initColors(); if (!_selectBackground) _selectBackground = new TQColor(103,141,178); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "selectBackground", _selectBackground ); } -TQColor KGlobalSettings::alternateBackgroundColor() +TQColor TDEGlobalSettings::alternateBackgroundColor() { initColors(); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *alternateColor = calculateAlternateBackgroundColor( baseColor() ); return g.readColorEntry( "alternateBackground", alternateColor ); } -TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) +TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) { if (base == Qt::white) return TQColor(238,246,255); @@ -328,30 +328,30 @@ TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base) } } -bool KGlobalSettings::shadeSortColumn() +bool TDEGlobalSettings::shadeSortColumn() { - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN ); } -TQColor KGlobalSettings::linkColor() +TQColor TDEGlobalSettings::linkColor() { initColors(); if (!_linkColor) _linkColor = new TQColor(0,0,238); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "linkColor", _linkColor ); } -TQColor KGlobalSettings::visitedLinkColor() +TQColor TDEGlobalSettings::visitedLinkColor() { if (!_visitedLinkColor) _visitedLinkColor = new TQColor(82,24,139); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); return g.readColorEntry( "visitedLinkColor", _visitedLinkColor ); } -TQFont KGlobalSettings::generalFont() +TQFont TDEGlobalSettings::generalFont() { if (_generalFont) return *_generalFont; @@ -361,13 +361,13 @@ TQFont KGlobalSettings::generalFont() _generalFont->setPointSize(10); _generalFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_generalFont = g.readFontEntry("font", _generalFont); return *_generalFont; } -TQFont KGlobalSettings::fixedFont() +TQFont TDEGlobalSettings::fixedFont() { if (_fixedFont) return *_fixedFont; @@ -377,13 +377,13 @@ TQFont KGlobalSettings::fixedFont() _fixedFont->setPointSize(10); _fixedFont->setStyleHint(TQFont::TypeWriter); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_fixedFont = g.readFontEntry("fixed", _fixedFont); return *_fixedFont; } -TQFont KGlobalSettings::toolBarFont() +TQFont TDEGlobalSettings::toolBarFont() { if(_toolBarFont) return *_toolBarFont; @@ -393,13 +393,13 @@ TQFont KGlobalSettings::toolBarFont() _toolBarFont->setPointSize(10); _toolBarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_toolBarFont = g.readFontEntry("toolBarFont", _toolBarFont); return *_toolBarFont; } -TQFont KGlobalSettings::menuFont() +TQFont TDEGlobalSettings::menuFont() { if(_menuFont) return *_menuFont; @@ -409,13 +409,13 @@ TQFont KGlobalSettings::menuFont() _menuFont->setPointSize(10); _menuFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_menuFont = g.readFontEntry("menuFont", _menuFont); return *_menuFont; } -TQFont KGlobalSettings::windowTitleFont() +TQFont TDEGlobalSettings::windowTitleFont() { if(_windowTitleFont) return *_windowTitleFont; @@ -425,13 +425,13 @@ TQFont KGlobalSettings::windowTitleFont() _windowTitleFont->setPointSize(10); _windowTitleFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "WM" ); + KConfigGroup g( TDEGlobal::config(), "WM" ); *_windowTitleFont = g.readFontEntry("activeFont", _windowTitleFont); // inconsistency return *_windowTitleFont; } -TQFont KGlobalSettings::taskbarFont() +TQFont TDEGlobalSettings::taskbarFont() { if(_taskbarFont) return *_taskbarFont; @@ -441,14 +441,14 @@ TQFont KGlobalSettings::taskbarFont() _taskbarFont->setPointSize(10); _taskbarFont->setStyleHint(TQFont::SansSerif); - KConfigGroup g( KGlobal::config(), "General" ); + KConfigGroup g( TDEGlobal::config(), "General" ); *_taskbarFont = g.readFontEntry("taskbarFont", _taskbarFont); return *_taskbarFont; } -TQFont KGlobalSettings::largeFont(const TQString &text) +TQFont TDEGlobalSettings::largeFont(const TQString &text) { TQFontDatabase db; TQStringList fam = db.families(); @@ -501,12 +501,12 @@ TQFont KGlobalSettings::largeFont(const TQString &text) return *_largeFont; } } - _largeFont = new TQFont(KGlobalSettings::generalFont()); + _largeFont = new TQFont(TDEGlobalSettings::generalFont()); _largeFont->setPointSize(48); return *_largeFont; } -void KGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here. +void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here. { if ( s_desktopPath != 0 ) return; @@ -516,7 +516,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an s_trashPath = new TQString(); s_documentPath = new TQString(); - KConfigGroup g( KGlobal::config(), "Paths" ); + KConfigGroup g( TDEGlobal::config(), "Paths" ); // Read desktop and documents path using XDG_USER_DIRS readXdgUserDirs(s_desktopPath, s_documentPath); @@ -553,7 +553,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an } // Autostart Path - *s_autostartPath = KGlobal::dirs()->localtdedir() + "Autostart/"; + *s_autostartPath = TDEGlobal::dirs()->localtdedir() + "Autostart/"; *s_autostartPath = g.readPathEntry( "Autostart" , *s_autostartPath); *s_autostartPath = TQDir::cleanDirPath( *s_autostartPath ); if ( !s_autostartPath->endsWith("/") ) @@ -564,7 +564,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an kapp->addKipcEventMask(KIPC::SettingsChanged); } -void KGlobalSettings::initColors() +void TDEGlobalSettings::initColors() { if (!_trinity4Blue) { if (TQPixmap::defaultDepth() > 8) @@ -576,7 +576,7 @@ void KGlobalSettings::initColors() alternateColor = new TQColor(237, 244, 249); } -void KGlobalSettings::rereadFontSettings() +void TDEGlobalSettings::rereadFontSettings() { delete _generalFont; _generalFont = 0L; @@ -592,9 +592,9 @@ void KGlobalSettings::rereadFontSettings() _taskbarFont = 0L; } -void KGlobalSettings::rereadPathSettings() +void TDEGlobalSettings::rereadPathSettings() { - kdDebug() << "KGlobalSettings::rereadPathSettings" << endl; + kdDebug() << "TDEGlobalSettings::rereadPathSettings" << endl; delete s_autostartPath; s_autostartPath = 0L; delete s_trashPath; @@ -605,7 +605,7 @@ void KGlobalSettings::rereadPathSettings() s_documentPath = 0L; } -KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() +TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() { if ( ! s_mouseSettings ) { @@ -613,7 +613,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() KMouseSettings & s = *s_mouseSettings; // for convenience #ifndef Q_WS_WIN - KConfigGroup g( KGlobal::config(), "Mouse" ); + KConfigGroup g( TDEGlobal::config(), "Mouse" ); TQString setting = g.readEntry("MouseButtonMapping"); if (setting == "RightHanded") s.handed = KMouseSettings::RightHanded; @@ -655,7 +655,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings() return *s_mouseSettings; } -void KGlobalSettings::rereadMouseSettings() +void TDEGlobalSettings::rereadMouseSettings() { #ifndef Q_WS_WIN delete s_mouseSettings; @@ -663,7 +663,7 @@ void KGlobalSettings::rereadMouseSettings() #endif } -bool KGlobalSettings::isMultiHead() +bool TDEGlobalSettings::isMultiHead() { #ifdef Q_WS_WIN return GetSystemMetrics(SM_CMONITORS) > 1; @@ -676,18 +676,18 @@ bool KGlobalSettings::isMultiHead() #endif } -bool KGlobalSettings::wheelMouseZooms() +bool TDEGlobalSettings::wheelMouseZooms() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry( "WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM ); } -TQRect KGlobalSettings::splashScreenDesktopGeometry() +TQRect TDEGlobalSettings::splashScreenDesktopGeometry() { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); int scr = group.readNumEntry("Unmanaged", -3); if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) { if (scr == -3) @@ -701,12 +701,12 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry() } } -TQRect KGlobalSettings::desktopGeometry(const TQPoint& point) +TQRect TDEGlobalSettings::desktopGeometry(const TQPoint& point) { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { return dw->screenGeometry(dw->screenNumber(point)); @@ -718,12 +718,12 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point) } } -TQRect KGlobalSettings::desktopGeometry(TQWidget* w) +TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w) { TQDesktopWidget *dw = TQApplication::desktop(); if (dw->isVirtualDesktop()) { - KConfigGroup group(KGlobal::config(), "Windows"); + KConfigGroup group(TDEGlobal::config(), "Windows"); if (group.readBoolEntry("XineramaEnabled", true) && group.readBoolEntry("XineramaPlacementEnabled", true)) { if (w) @@ -737,38 +737,38 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w) } } -bool KGlobalSettings::showIconsOnPushButtons() +bool TDEGlobalSettings::showIconsOnPushButtons() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowIconsOnPushButtons", KDE_DEFAULT_ICON_ON_PUSHBUTTON); } -bool KGlobalSettings::showFilePreview(const KURL &url) +bool TDEGlobalSettings::showFilePreview(const KURL &url) { - KConfigGroup g(KGlobal::config(), "PreviewSettings"); + KConfigGroup g(TDEGlobal::config(), "PreviewSettings"); TQString protocol = url.protocol(); bool defaultSetting = KProtocolInfo::showFilePreview( protocol ); return g.readBoolEntry(protocol, defaultSetting ); } -bool KGlobalSettings::showKonqIconActivationEffect() +bool TDEGlobalSettings::showKonqIconActivationEffect() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT); } -bool KGlobalSettings::opaqueResize() +bool TDEGlobalSettings::opaqueResize() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readBoolEntry("OpaqueResize", KDE_DEFAULT_OPAQUE_RESIZE); } -int KGlobalSettings::buttonLayout() +int TDEGlobalSettings::buttonLayout() { - KConfigGroup g( KGlobal::config(), "KDE" ); + KConfigGroup g( TDEGlobal::config(), "KDE" ); return g.readNumEntry("ButtonLayout", KDE_DEFAULT_BUTTON_LAYOUT); } diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h index 5fad8fa5a..2d3adc5e1 100644 --- a/tdecore/kglobalsettings.h +++ b/tdecore/kglobalsettings.h @@ -45,7 +45,7 @@ class KURL; * * @author David Faure <faure@kde.org> */ -class TDECORE_EXPORT KGlobalSettings +class TDECORE_EXPORT TDEGlobalSettings { public: @@ -74,7 +74,7 @@ class TDECORE_EXPORT KGlobalSettings * { * if( !(e->state() && LeftButton)) return; * - * int delay = KGlobalSettings::dndEventDelay(); + * int delay = TDEGlobalSettings::dndEventDelay(); * TQPoint newPos = e->pos(); * if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay || * newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay) diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 7525e6760..546ef99eb 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -63,7 +63,7 @@ KIconEffect::~KIconEffect() void KIconEffect::init() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); int i, j, effect=-1; TQStringList groups; @@ -190,7 +190,7 @@ TQImage KIconEffect::apply(TQImage image, int group, int state) const TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, bool trans) const { - return apply (image, effect, value, col, KGlobalSettings::baseColor(), trans); + return apply (image, effect, value, col, TDEGlobalSettings::baseColor(), trans); } TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, const TQColor col2, bool trans) const @@ -248,7 +248,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int group, int state) const TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value, const TQColor col, bool trans) const { - return apply (pixmap, effect, value, col, KGlobalSettings::baseColor(), trans); + return apply (pixmap, effect, value, col, TDEGlobalSettings::baseColor(), trans); } TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value, @@ -706,10 +706,10 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay) void KIconEffect::visualActivate(TQWidget * widget, TQRect rect) { - if (!KGlobalSettings::visualActivate()) + if (!TDEGlobalSettings::visualActivate()) return; - uint actSpeed = KGlobalSettings::visualActivateSpeed(); + uint actSpeed = TDEGlobalSettings::visualActivateSpeed(); uint actCount = QMIN(rect.width(), rect.height()) / 2; @@ -774,7 +774,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect) void KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) { - if (!KGlobalSettings::visualActivate()) + if (!TDEGlobalSettings::visualActivate()) return; // Image too big to display smoothly @@ -783,7 +783,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) return; } - uint actSpeed = KGlobalSettings::visualActivateSpeed(); + uint actSpeed = TDEGlobalSettings::visualActivateSpeed(); uint actCount = TQMIN(rect.width(), rect.height()) / 4; diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index f413b75f3..01aaa84fd 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -184,11 +184,11 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) if (_dirs) d->mpDirs = _dirs; else - d->mpDirs = KGlobal::dirs(); + d->mpDirs = TDEGlobal::dirs(); TQString appname = _appname; if (appname.isEmpty()) - appname = KGlobal::instance()->instanceName(); + appname = TDEGlobal::instance()->instanceName(); // Add the default theme and its base themes to the theme tree KIconTheme *def = new KIconTheme(KIconTheme::current(), appname); @@ -214,7 +214,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) // These have to match the order in kicontheme.h static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L }; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs(config, "dummy"); // loading config and default sizes @@ -349,7 +349,7 @@ void KIconLoader::addExtraDesktopThemes() if ( d->extraDesktopIconsLoaded ) return; TQStringList list; - TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); + TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::ConstIterator it; char buf[1000]; int r; @@ -406,15 +406,15 @@ TQString KIconLoader::removeIconExtension(const TQString &name) const TQString ext = name.right(4); - static const TQString &png_ext = KGlobal::staticQString(".png"); - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); if (ext == png_ext || ext == xpm_ext) extensionLength=4; #ifdef HAVE_LIBART else { - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); if (name.right(5) == svgz_ext) extensionLength=5; @@ -437,7 +437,7 @@ TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const #ifndef NDEBUG if (name != name_noext) { - kdDebug(264) << "Application " << KGlobal::instance()->instanceName() + kdDebug(264) << "Application " << TDEGlobal::instance()->instanceName() << " loads icon " << name << " with extension." << endl; } #endif @@ -451,15 +451,15 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const const TQString *ext[4]; int count=0; - static const TQString &png_ext = KGlobal::staticQString(".png"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); ext[count++]=&png_ext; #ifdef HAVE_LIBART - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); ext[count++]=&svgz_ext; - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); ext[count++]=&svg_ext; #endif - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); ext[count++]=&xpm_ext; /* JRT: To follow the XDG spec, the order in which we look for an @@ -495,7 +495,7 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const inline TQString KIconLoader::unknownIconPath( int size ) const { - static const TQString &str_unknown = KGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); KIcon icon = findMatchingIcon(str_unknown, size); if (!icon.isValid()) @@ -523,13 +523,13 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size, TQString path; if (group_or_size == KIcon::User) { - static const TQString &png_ext = KGlobal::staticQString(".png"); - static const TQString &xpm_ext = KGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); path = d->mpDirs->findResource("appicon", name + png_ext); #ifdef HAVE_LIBART - static const TQString &svgz_ext = KGlobal::staticQString(".svgz"); - static const TQString &svg_ext = KGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); if (path.isEmpty()) path = d->mpDirs->findResource("appicon", name + svgz_ext); if (path.isEmpty()) @@ -595,7 +595,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si } if (!TQDir::isRelativePath(name)) absolutePath=true; - static const TQString &str_unknown = KGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); // Special case for "User" icons. if (group == KIcon::User) @@ -1241,7 +1241,7 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS if( !(*it).valid ) { #ifdef NDEBUG - loader = KGlobal::iconLoader(); + loader = TDEGlobal::iconLoader(); iconName = "no_way_man_you_will_get_broken_icon"; #else kdWarning() << "Using already destroyed KIconLoader for loading an icon!" << endl; @@ -1260,7 +1260,7 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS if( !found ) { #ifdef NDEBUG - loader = KGlobal::iconLoader(); + loader = TDEGlobal::iconLoader(); iconName = "no_way_man_you_will_get_broken_icon"; #else kdWarning() << "Using unknown KIconLoader for loading an icon!" << endl; @@ -1391,7 +1391,7 @@ TQPixmap KIconLoader::unknown() if ( TQPixmapCache::find("unknown", pix) ) return pix; - TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true); + TQString path = TDEGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true); if (path.isEmpty()) { kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl; diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h index 2ad23ae38..9cac06c5d 100644 --- a/tdecore/kiconloader.h +++ b/tdecore/kiconloader.h @@ -86,10 +86,10 @@ public: * @param dirs the KStandardDirs object to use. If null the global one is used * * Usually, you use the default iconloader, which can be accessed via - * KGlobal::iconLoader(), so you hardly ever have to create an + * TDEGlobal::iconLoader(), so you hardly ever have to create an * iconloader object yourself. That one is the current TDEInstance's * (typically TDEApplication's) iconloader. - * @see KGlobal::iconLoader() + * @see TDEGlobal::iconLoader() * @see TDEInstance::iconLoader() */ KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0); @@ -299,7 +299,7 @@ public: * Called by TDEInstance::newIconLoader to reconfigure the icon loader. * @param _appname the new application name * @param _dirs the new standard directories. If 0, the directories - * from KGlobal will be taken. + * from TDEGlobal will be taken. */ void reconfigure( const TQString& _appname, KStandardDirs *_dirs ); @@ -447,7 +447,7 @@ public: */ TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -460,14 +460,14 @@ TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance) * Load a desktop icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader * Load a toolbar icon. */ TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -480,7 +480,7 @@ TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance); * Load a toolbar icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -488,7 +488,7 @@ TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0, */ TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -501,7 +501,7 @@ TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance); * Load a small icon, and apply the necessary effects to get an IconSet. */ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -509,7 +509,7 @@ TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0, */ TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -522,14 +522,14 @@ TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance) * Load a main toolbar icon, and apply the effects to get an IconSet. */ TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader * Load a user icon. User icons are searched in $appdir/pics. */ TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader @@ -542,12 +542,12 @@ TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, TDEInstance *instance); * Load a user icon, and apply the effects to get an IconSet. */ TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name, - TDEInstance *instance=KGlobal::instance()); + TDEInstance *instance=TDEGlobal::instance()); /** * \relates KIconLoader * Returns the current icon size for a specific group. */ -TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=KGlobal::instance()); +TDECORE_EXPORT int IconSize(KIcon::Group group, TDEInstance *instance=TDEGlobal::instance()); #endif // __KIconLoader_h_Included__ diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index d30e254d0..103d37a05 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -95,7 +95,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) if (!appName.isEmpty() && ( name == "crystalsvg" || name== "hicolor" || name == "locolor" ) ) { - icnlibs = KGlobal::dirs()->resourceDirs("data"); + icnlibs = TDEGlobal::dirs()->resourceDirs("data"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + appName + "/icons/" + name; @@ -105,11 +105,11 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) } // Find the theme description file. These are always global. - icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon"); + icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-icon"); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + name + "/"; @@ -448,7 +448,7 @@ TQString KIconTheme::current() return *_theme; _theme = new TQString(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); @@ -470,11 +470,11 @@ TQStringList KIconTheme::list() return *_theme_list; _theme_list = new TQStringList(); - TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); - icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon")); + TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon"); + icnlibs += (TDEGlobal::dirs()->resourceDirs("xdgdata-icon")); icnlibs += "/usr/share/pixmaps"; // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. - icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); + icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap"); TQStringList::ConstIterator it; for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp index 6d37c3dbc..13e29c049 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -78,10 +78,10 @@ TDEInstance::TDEInstance( const TQCString& name) { DEBUG_ADD Q_ASSERT(!name.isEmpty()); - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -99,10 +99,10 @@ TDEInstance::TDEInstance( const TDEAboutData * aboutData ) DEBUG_ADD Q_ASSERT(!_name.isEmpty()); - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -120,10 +120,10 @@ TDEInstance::TDEInstance( TDEInstance* src ) DEBUG_ADD Q_ASSERT(!_name.isEmpty()); - if (!KGlobal::_instance || KGlobal::_instance == src ) + if (!TDEGlobal::_instance || TDEGlobal::_instance == src ) { - KGlobal::_instance = this; - KGlobal::setActiveInstance(this); + TDEGlobal::_instance = this; + TDEGlobal::setActiveInstance(this); } d = new TDEInstancePrivate (); @@ -164,10 +164,10 @@ TDEInstance::~TDEInstance() delete _dirs; _dirs = 0; - if (KGlobal::_instance == this) - KGlobal::_instance = 0; - if (KGlobal::activeInstance() == this) - KGlobal::setActiveInstance(0); + if (TDEGlobal::_instance == this) + TDEGlobal::_instance = 0; + if (TDEGlobal::activeInstance() == this) + TDEGlobal::setActiveInstance(0); DEBUG_REMOVE } diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index 36d463d8a..775fe3bdf 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -38,7 +38,7 @@ class TDEGlobalNetworkManager; * Access to KDE global objects for use in shared libraries. In * practical terms, this class is used in KDE components. This allows * components to store things that normally would be accessed by - * KGlobal. + * TDEGlobal. * * @author Torben Weis */ diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp index c12cde7e6..d0ec7583d 100644 --- a/tdecore/kkeyserver_x11.cpp +++ b/tdecore/kkeyserver_x11.cpp @@ -361,7 +361,7 @@ bool initializeMods() XFreeModifiermap( xmk ); - //KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); + //KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); // read in mod that win should be attached to g_bInitializedMods = true; @@ -380,11 +380,11 @@ static void initializeVariations() static void intializeKKeyLabels() { - KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); - g_rgModInfo[0].sLabel = KGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) ); - g_rgModInfo[1].sLabel = KGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) ); - g_rgModInfo[2].sLabel = KGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) ); - g_rgModInfo[3].sLabel = KGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) ); + KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + g_rgModInfo[0].sLabel = TDEGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) ); + g_rgModInfo[1].sLabel = TDEGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) ); + g_rgModInfo[2].sLabel = TDEGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) ); + g_rgModInfo[3].sLabel = TDEGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) ); g_bMacLabels = (g_rgModInfo[2].sLabel == "Command"); g_bInitializedKKeyLabels = true; } diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h index 9f080b88b..3e8f9ff45 100644 --- a/tdecore/klibloader.h +++ b/tdecore/klibloader.h @@ -273,7 +273,7 @@ public: * ".la" will be appended. * @param instance a TDEInstance used to get the standard paths */ - static TQString findLibrary( const char * name, const TDEInstance * instance = KGlobal::instance() ); + static TQString findLibrary( const char * name, const TDEInstance * instance = TDEGlobal::instance() ); protected: KLibLoader( TQObject* parent = 0, const char* name = 0 ); @@ -311,7 +311,7 @@ private: * \code * s_global = new TDEInstance( "kspread" ); * \endcode - * This TDEInstance is comparable to KGlobal used by normal applications. + * This TDEInstance is comparable to TDEGlobal used by normal applications. * It allows you to find resource files (images, XML, sound etc.) belonging * to the library. * diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index 43c21ef2e..6b64abbd8 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -94,7 +94,7 @@ KLocale::KLocale( const TQString & catalog, KConfig * config ) KConfig *cfg = d->config; this_klocale = this; - if (!cfg) cfg = KGlobal::instance()->config(); + if (!cfg) cfg = TDEGlobal::instance()->config(); this_klocale = 0; Q_ASSERT( cfg ); @@ -298,7 +298,7 @@ void KLocale::doFormatInit() const void KLocale::initFormat() { KConfig *config = d->config; - if (!config) config = KGlobal::instance()->config(); + if (!config) config = TDEGlobal::instance()->config(); Q_ASSERT( config ); kdDebug(173) << "KLocale::initFormat" << endl; @@ -306,8 +306,8 @@ void KLocale::initFormat() // make sure the config files are read using the correct locale // ### Why not add a KConfigBase::setLocale( const KLocale * )? // ### Then we could remove this hack - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = this; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = this; KConfigGroupSaver saver(config, "Locale"); @@ -385,7 +385,7 @@ void KLocale::initFormat() d->dateMonthNamePossessive); // end of hack - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } bool KLocale::setCountry(const TQString & country) @@ -695,7 +695,7 @@ void KLocale::removeCatalogue(const TQString &catalog) { if ( d->catalogNames.contains( catalog )) { d->catalogNames.remove( catalog ); - if (KGlobal::_instance) + if (TDEGlobal::_instance) updateCatalogues(); // walk through the KCatalogue instances and weed out everything we no longer need } } @@ -1976,7 +1976,7 @@ TQString KLocale::formatDateTime(const TQDateTime &pDateTime, TQString i18n(const char* text) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(text); return TQString::fromUtf8(text); @@ -1984,7 +1984,7 @@ TQString i18n(const char* text) TQString i18n(const char* index, const char *text) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(index, text); return TQString::fromUtf8(text); @@ -1992,7 +1992,7 @@ TQString i18n(const char* index, const char *text) TQString i18n(const char* singular, const char* plural, unsigned long n) { - register KLocale *instance = KGlobal::locale(); + register KLocale *instance = TDEGlobal::locale(); if (instance) return instance->translate(singular, plural, n); if (n == 1) @@ -2003,15 +2003,15 @@ TQString i18n(const char* singular, const char* plural, unsigned long n) void KLocale::initInstance() { - if (KGlobal::_locale) + if (TDEGlobal::_locale) return; - TDEInstance *app = KGlobal::instance(); + TDEInstance *app = TDEGlobal::instance(); if (app) { - KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); + TDEGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); // only do this for the global instance - TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding()); + TQTextCodec::setCodecForLocale(TDEGlobal::_locale->codecForEncoding()); } else kdDebug(173) << "no app name available using KLocale - nothing to do\n"; @@ -2022,12 +2022,12 @@ TQString KLocale::langLookup(const TQString &fname, const char *rtype) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs(rtype); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs(rtype); // look up the different languages for (int id=localDoc.count()-1; id >= 0; --id) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( defaultLanguage() ); TQStringList::ConstIterator lang; @@ -2380,7 +2380,7 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const TQStringList KLocale::allCountriesTwoAlpha() const { TQStringList countries; - TQStringList paths = KGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop"); + TQStringList paths = TDEGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop"); for(TQStringList::ConstIterator it = paths.begin(); it != paths.end(); ++it) { diff --git a/tdecore/klocale.h b/tdecore/klocale.h index ce9dad46b..42619afd4 100644 --- a/tdecore/klocale.h +++ b/tdecore/klocale.h @@ -31,7 +31,7 @@ class TQDate; class TQTime; class TQDateTime; -class KGlobal; +class TDEGlobal; class KConfig; class KConfigBase; class KLocalePrivate; @@ -123,7 +123,7 @@ inline TQString tr2i18n(const char* message, const char* =0) { */ class TDECORE_EXPORT KLocale { - friend class KGlobal; // for initInstance() + friend class TDEGlobal; // for initInstance() public: /** * Constructs a KLocale with the given catalog name. @@ -1173,7 +1173,7 @@ private: protected: /** - * @internal Creates a KLocale object for KGlobal and inits the locale + * @internal Creates a KLocale object for TDEGlobal and inits the locale * pointer. */ static void initInstance(); diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h index 7090b1733..e18c7d888 100644 --- a/tdecore/kmimesourcefactory.h +++ b/tdecore/kmimesourcefactory.h @@ -46,7 +46,7 @@ public: * * @param loader is the iconloader used to find images. */ - KMimeSourceFactory (KIconLoader* loader = KGlobal::iconLoader()); + KMimeSourceFactory (KIconLoader* loader = TDEGlobal::iconLoader()); /** * Destructor. diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 073dff626..c06184221 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -34,7 +34,7 @@ TQStringList KPalette::getPaletteList() { TQStringList paletteList; - KGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); + TDEGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList); int strip = strlen("colors/"); for(TQStringList::Iterator it = paletteList.begin(); diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index d8170c0a8..76ad0b167 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -33,29 +33,29 @@ #include <tqsocketnotifier.h> -KProcessController *KProcessController::theKProcessController; -int KProcessController::refCount; +TDEProcessController *TDEProcessController::theTDEProcessController; +int TDEProcessController::refCount; -void KProcessController::ref() +void TDEProcessController::ref() { if( !refCount ) { - theKProcessController = new KProcessController; + theTDEProcessController = new TDEProcessController; setupHandlers(); } refCount++; } -void KProcessController::deref() +void TDEProcessController::deref() { refCount--; if( !refCount ) { resetHandlers(); - delete theKProcessController; - theKProcessController = 0; + delete theTDEProcessController; + theTDEProcessController = 0; } } -KProcessController::KProcessController() +TDEProcessController::TDEProcessController() : needcheck( false ) { if( pipe( fd ) ) @@ -75,7 +75,7 @@ KProcessController::KProcessController() TQT_SLOT(slotDoHousekeeping())); } -KProcessController::~KProcessController() +TDEProcessController::~TDEProcessController() { delete notifier; @@ -87,16 +87,16 @@ KProcessController::~KProcessController() extern "C" { static void theReaper( int num ) { - KProcessController::theSigCHLDHandler( num ); + TDEProcessController::theSigCHLDHandler( num ); } } #ifdef Q_OS_UNIX -struct sigaction KProcessController::oldChildHandlerData; +struct sigaction TDEProcessController::oldChildHandlerData; #endif -bool KProcessController::handlerSet = false; +bool TDEProcessController::handlerSet = false; -void KProcessController::setupHandlers() +void TDEProcessController::setupHandlers() { if( handlerSet ) return; @@ -127,7 +127,7 @@ void KProcessController::setupHandlers() #endif } -void KProcessController::resetHandlers() +void TDEProcessController::resetHandlers() { if( !handlerSet ) return; @@ -144,12 +144,12 @@ void KProcessController::resetHandlers() // the pipe is needed to sync the child reaping with our event processing, // as otherwise there are race conditions, locking requirements, and things // generally get harder -void KProcessController::theSigCHLDHandler( int arg ) +void TDEProcessController::theSigCHLDHandler( int arg ) { int saved_errno = errno; char dummy = 0; - ::write( theKProcessController->fd[1], &dummy, 1 ); + ::write( theTDEProcessController->fd[1], &dummy, 1 ); #ifdef Q_OS_UNIX if( oldChildHandlerData.sa_handler != SIG_IGN && @@ -162,12 +162,12 @@ void KProcessController::theSigCHLDHandler( int arg ) errno = saved_errno; } -int KProcessController::notifierFd() const +int TDEProcessController::notifierFd() const { return fd[0]; } -void KProcessController::unscheduleCheck() +void TDEProcessController::unscheduleCheck() { char dummy[16]; // somewhat bigger - just in case several have queued up if( ::read( fd[0], dummy, sizeof(dummy) ) > 0 ) @@ -175,7 +175,7 @@ void KProcessController::unscheduleCheck() } void -KProcessController::rescheduleCheck() +TDEProcessController::rescheduleCheck() { if( needcheck ) { @@ -185,23 +185,23 @@ KProcessController::rescheduleCheck() } } -void KProcessController::slotDoHousekeeping() +void TDEProcessController::slotDoHousekeeping() { char dummy[16]; // somewhat bigger - just in case several have queued up ::read( fd[0], dummy, sizeof(dummy) ); int status; again: - TQValueListIterator<KProcess*> it( kProcessList.begin() ); - TQValueListIterator<KProcess*> eit( kProcessList.end() ); + TQValueListIterator<TDEProcess*> it( kProcessList.begin() ); + TQValueListIterator<TDEProcess*> eit( kProcessList.end() ); while( it != eit ) { - KProcess *prc = *it; + TDEProcess *prc = *it; if( prc->runs && waitpid( prc->pid_, &status, WNOHANG ) > 0 ) { prc->processHasExited( status ); // the callback can nuke the whole process list and even 'this' - if (!theKProcessController) + if (!theTDEProcessController) return; goto again; } @@ -220,7 +220,7 @@ void KProcessController::slotDoHousekeeping() } } -bool KProcessController::waitForProcessExit( int timeout ) +bool TDEProcessController::waitForProcessExit( int timeout ) { #ifdef Q_OS_UNIX for(;;) @@ -258,20 +258,20 @@ bool KProcessController::waitForProcessExit( int timeout ) #endif } -void KProcessController::addKProcess( KProcess* p ) +void TDEProcessController::addTDEProcess( TDEProcess* p ) { kProcessList.append( p ); } -void KProcessController::removeKProcess( KProcess* p ) +void TDEProcessController::removeTDEProcess( TDEProcess* p ) { kProcessList.remove( p ); } -void KProcessController::addProcess( int pid ) +void TDEProcessController::addProcess( int pid ) { unixProcessList.append( pid ); - ref(); // make sure we stay around when the KProcess goes away + ref(); // make sure we stay around when the TDEProcess goes away } #include "kprocctrl.moc" diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index fbd096cbf..1cb6cc302 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -27,16 +27,16 @@ class TQSocketNotifier; /** - * @short Used internally by KProcess + * @short Used internally by TDEProcess * @internal * @author Christian Czezatke <e9025461@student.tuwien.ac.at> * - * A class for internal use by KProcess only. -- Exactly one instance + * A class for internal use by TDEProcess only. -- Exactly one instance * of this class is created by TDEApplication. * * This class takes care of the actual (UN*X) signal handling. */ -class TDECORE_EXPORT KProcessController : public TQObject +class TDECORE_EXPORT TDEProcessController : public TQObject { Q_OBJECT @@ -57,7 +57,7 @@ public: * Only a single instance of this class is allowed at a time, * and this static variable is used to track the one instance. */ - static KProcessController *theKProcessController; // kde4: rename: instance + static TDEProcessController *theTDEProcessController; // kde4: rename: instance /** * Automatically called upon SIGCHLD. Never call it directly. @@ -71,7 +71,7 @@ public: /** * Wait for any process to exit and handle their exit without * starting an event loop. - * This function may cause KProcess to emit any of its signals. + * This function may cause TDEProcess to emit any of its signals. * * @param timeout the timeout in seconds. -1 means no timeout. * @return true if a process exited, false @@ -95,7 +95,7 @@ public: void rescheduleCheck(); /* - * Obtain the file descriptor KProcessController uses to get notified + * Obtain the file descriptor TDEProcessController uses to get notified * about process exits. select() or poll() on it if you create a custom * event loop that needs to act upon SIGCHLD. * @return the file descriptor of the reading end of the notification pipe @@ -106,11 +106,11 @@ public: /** * @internal */ - void addKProcess( KProcess* ); + void addTDEProcess( TDEProcess* ); /** * @internal */ - void removeKProcess( KProcess* ); + void removeTDEProcess( TDEProcess* ); /** * @internal */ @@ -125,7 +125,7 @@ private: int fd[2]; bool needcheck; TQSocketNotifier *notifier; - TQValueList<KProcess*> kProcessList; + TQValueList<TDEProcess*> kProcessList; TQValueList<int> unixProcessList; static void setupHandlers(); @@ -136,12 +136,12 @@ private: static int refCount; // Disallow instantiation - KProcessController(); - ~KProcessController(); + TDEProcessController(); + ~TDEProcessController(); // Disallow assignment and copy-construction - KProcessController( const KProcessController& ); - KProcessController& operator= ( const KProcessController& ); + TDEProcessController( const TDEProcessController& ); + TDEProcessController& operator= ( const TDEProcessController& ); }; diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp index 3658116ab..b899c637f 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/kprocess.cpp @@ -85,10 +85,10 @@ // private data // ////////////////// -class KProcessPrivate { +class TDEProcessPrivate { public: - KProcessPrivate() : - usePty(KProcess::NoCommunication), + TDEProcessPrivate() : + usePty(TDEProcess::NoCommunication), addUtmp(false), useShell(false), #ifdef Q_OS_UNIX pty(0), @@ -97,7 +97,7 @@ public: { } - KProcess::Communication usePty; + TDEProcess::Communication usePty; bool addUtmp : 1; bool useShell : 1; @@ -117,7 +117,7 @@ public: // public member functions // ///////////////////////////// -KProcess::KProcess( TQObject* parent, const char *name ) +TDEProcess::TDEProcess( TQObject* parent, const char *name ) : TQObject( parent, name ), run_mode(NotifyOnExit), runs(false), @@ -132,17 +132,17 @@ KProcess::KProcess( TQObject* parent, const char *name ) input_sent(0), input_total(0) { - KProcessController::ref(); - KProcessController::theKProcessController->addKProcess(this); + TDEProcessController::ref(); + TDEProcessController::theTDEProcessController->addTDEProcess(this); - d = new KProcessPrivate; + d = new TDEProcessPrivate; out[0] = out[1] = -1; in[0] = in[1] = -1; err[0] = err[1] = -1; } -KProcess::KProcess() +TDEProcess::TDEProcess() : TQObject(), run_mode(NotifyOnExit), runs(false), @@ -157,10 +157,10 @@ KProcess::KProcess() input_sent(0), input_total(0) { - KProcessController::ref(); - KProcessController::theKProcessController->addKProcess(this); + TDEProcessController::ref(); + TDEProcessController::theTDEProcessController->addTDEProcess(this); - d = new KProcessPrivate; + d = new TDEProcessPrivate; out[0] = out[1] = -1; in[0] = in[1] = -1; @@ -168,19 +168,19 @@ KProcess::KProcess() } void -KProcess::setEnvironment(const TQString &name, const TQString &value) +TDEProcess::setEnvironment(const TQString &name, const TQString &value) { d->env.insert(name, value); } void -KProcess::setWorkingDirectory(const TQString &dir) +TDEProcess::setWorkingDirectory(const TQString &dir) { d->wd = dir; } void -KProcess::setupEnvironment() +TDEProcess::setupEnvironment() { TQMap<TQString,TQString>::Iterator it; for(it = d->env.begin(); it != d->env.end(); ++it) @@ -195,19 +195,19 @@ KProcess::setupEnvironment() } void -KProcess::setRunPrivileged(bool keepPrivileges) +TDEProcess::setRunPrivileged(bool keepPrivileges) { keepPrivs = keepPrivileges; } bool -KProcess::runPrivileged() const +TDEProcess::runPrivileged() const { return keepPrivs; } bool -KProcess::setPriority(int prio) +TDEProcess::setPriority(int prio) { #ifdef Q_OS_UNIX if (runs) { @@ -222,7 +222,7 @@ KProcess::setPriority(int prio) return true; } -KProcess::~KProcess() +TDEProcess::~TDEProcess() { if (run_mode != DontCare) kill(SIGKILL); @@ -233,26 +233,26 @@ KProcess::~KProcess() #endif delete d; - KProcessController::theKProcessController->removeKProcess(this); - KProcessController::deref(); + TDEProcessController::theTDEProcessController->removeTDEProcess(this); + TDEProcessController::deref(); } -void KProcess::detach() +void TDEProcess::detach() { if (runs) { - KProcessController::theKProcessController->addProcess(pid_); + TDEProcessController::theTDEProcessController->addProcess(pid_); runs = false; pid_ = 0; // close without draining commClose(); // Clean up open fd's and socket notifiers. } } -void KProcess::setBinaryExecutable(const char *filename) +void TDEProcess::setBinaryExecutable(const char *filename) { d->executable = filename; } -bool KProcess::setExecutable(const TQString& proc) +bool TDEProcess::setExecutable(const TQString& proc) { if (runs) return false; @@ -265,7 +265,7 @@ bool KProcess::setExecutable(const TQString& proc) return true; } -KProcess &KProcess::operator<<(const TQStringList& args) +TDEProcess &TDEProcess::operator<<(const TQStringList& args) { TQStringList::ConstIterator it = args.begin(); for ( ; it != args.end() ; ++it ) @@ -273,29 +273,29 @@ KProcess &KProcess::operator<<(const TQStringList& args) return *this; } -KProcess &KProcess::operator<<(const TQCString& arg) +TDEProcess &TDEProcess::operator<<(const TQCString& arg) { return operator<< (arg.data()); } -KProcess &KProcess::operator<<(const char* arg) +TDEProcess &TDEProcess::operator<<(const char* arg) { arguments.append(arg); return *this; } -KProcess &KProcess::operator<<(const TQString& arg) +TDEProcess &TDEProcess::operator<<(const TQString& arg) { arguments.append(TQFile::encodeName(arg)); return *this; } -void KProcess::clearArguments() +void TDEProcess::clearArguments() { arguments.clear(); } -bool KProcess::start(RunMode runmode, Communication comm) +bool TDEProcess::start(RunMode runmode, Communication comm) { if (runs) { kdDebug(175) << "Attempted to start an already running process" << endl; @@ -454,11 +454,11 @@ bool KProcess::start(RunMode runmode, Communication comm) if (!runs) { // commClose detected data on the process exit notifification pipe - KProcessController::theKProcessController->unscheduleCheck(); + TDEProcessController::theTDEProcessController->unscheduleCheck(); if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too { commClose(); // this time for real (runs is false) - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); break; } runs = true; // for next commClose() iteration @@ -490,7 +490,7 @@ bool KProcess::start(RunMode runmode, Communication comm) -bool KProcess::kill(int signo) +bool TDEProcess::kill(int signo) { #ifdef Q_OS_UNIX if (runs && pid_ > 0 && !::kill(run_mode == OwnGroup ? -pid_ : pid_, signo)) @@ -501,14 +501,14 @@ bool KProcess::kill(int signo) -bool KProcess::isRunning() const +bool TDEProcess::isRunning() const { return runs; } -pid_t KProcess::pid() const +pid_t TDEProcess::pid() const { return pid_; } @@ -525,7 +525,7 @@ pid_t KProcess::pid() const } while (0) #endif -bool KProcess::wait(int timeout) +bool TDEProcess::wait(int timeout) { if (!runs) return true; @@ -549,7 +549,7 @@ bool KProcess::wait(int timeout) } #ifdef Q_OS_UNIX - int fd = KProcessController::theKProcessController->notifierFd(); + int fd = TDEProcessController::theTDEProcessController->notifierFd(); for(;;) { fd_set fds; @@ -573,14 +573,14 @@ bool KProcess::wait(int timeout) break; // fall through; should happen if tvp->tv_sec < 0 case 0: - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); return false; default: - KProcessController::theKProcessController->unscheduleCheck(); + TDEProcessController::theTDEProcessController->unscheduleCheck(); if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too { processHasExited(status); - KProcessController::theKProcessController->rescheduleCheck(); + TDEProcessController::theTDEProcessController->rescheduleCheck(); return true; } } @@ -591,19 +591,19 @@ bool KProcess::wait(int timeout) -bool KProcess::normalExit() const +bool TDEProcess::normalExit() const { return (pid_ != 0) && !runs && WIFEXITED(status); } -bool KProcess::signalled() const +bool TDEProcess::signalled() const { return (pid_ != 0) && !runs && WIFSIGNALED(status); } -bool KProcess::coreDumped() const +bool TDEProcess::coreDumped() const { #ifdef WCOREDUMP return signalled() && WCOREDUMP(status); @@ -613,19 +613,19 @@ bool KProcess::coreDumped() const } -int KProcess::exitStatus() const +int TDEProcess::exitStatus() const { return WEXITSTATUS(status); } -int KProcess::exitSignal() const +int TDEProcess::exitSignal() const { return WTERMSIG(status); } -bool KProcess::writeStdin(const char *buffer, int buflen) +bool TDEProcess::writeStdin(const char *buffer, int buflen) { // if there is still data pending, writing new data // to stdout is not allowed (since it could also confuse @@ -645,19 +645,19 @@ bool KProcess::writeStdin(const char *buffer, int buflen) return false; } -void KProcess::suspend() +void TDEProcess::suspend() { if (outnot) outnot->setEnabled(false); } -void KProcess::resume() +void TDEProcess::resume() { if (outnot) outnot->setEnabled(true); } -bool KProcess::closeStdin() +bool TDEProcess::closeStdin() { if (communication & Stdin) { communication = (Communication) (communication & ~Stdin); @@ -671,7 +671,7 @@ bool KProcess::closeStdin() return false; } -bool KProcess::closeStdout() +bool TDEProcess::closeStdout() { if (communication & Stdout) { communication = (Communication) (communication & ~Stdout); @@ -685,7 +685,7 @@ bool KProcess::closeStdout() return false; } -bool KProcess::closeStderr() +bool TDEProcess::closeStderr() { if (communication & Stderr) { communication = (Communication) (communication & ~Stderr); @@ -699,7 +699,7 @@ bool KProcess::closeStderr() return false; } -bool KProcess::closePty() +bool TDEProcess::closePty() { #ifdef Q_OS_UNIX if (d->pty && d->pty->masterFd() >= 0) { @@ -714,7 +714,7 @@ bool KProcess::closePty() #endif } -void KProcess::closeAll() +void TDEProcess::closeAll() { closeStdin(); closeStdout(); @@ -728,21 +728,21 @@ void KProcess::closeAll() -void KProcess::slotChildOutput(int fdno) +void TDEProcess::slotChildOutput(int fdno) { if (!childOutput(fdno)) closeStdout(); } -void KProcess::slotChildError(int fdno) +void TDEProcess::slotChildError(int fdno) { if (!childError(fdno)) closeStderr(); } -void KProcess::slotSendData(int) +void TDEProcess::slotSendData(int) { if (input_sent == input_total) { innot->setEnabled(false); @@ -762,7 +762,7 @@ void KProcess::slotSendData(int) } } -void KProcess::setUseShell(bool useShell, const char *shell) +void TDEProcess::setUseShell(bool useShell, const char *shell) { d->useShell = useShell; if (shell && *shell) @@ -787,7 +787,7 @@ void KProcess::setUseShell(bool useShell, const char *shell) } #ifdef Q_OS_UNIX -void KProcess::setUsePty(Communication usePty, bool addUtmp) +void TDEProcess::setUsePty(Communication usePty, bool addUtmp) { d->usePty = usePty; d->addUtmp = addUtmp; @@ -800,13 +800,13 @@ void KProcess::setUsePty(Communication usePty, bool addUtmp) } } -KPty *KProcess::pty() const +KPty *TDEProcess::pty() const { return d->pty; } #endif //Q_OS_UNIX -TQString KProcess::quote(const TQString &arg) +TQString TDEProcess::quote(const TQString &arg) { TQChar q('\''); return TQString(arg).replace(q, "'\\''").prepend(q).append(q); @@ -818,7 +818,7 @@ TQString KProcess::quote(const TQString &arg) ////////////////////////////// -void KProcess::processHasExited(int state) +void TDEProcess::processHasExited(int state) { // only successfully run NotifyOnExit processes ever get here @@ -833,7 +833,7 @@ void KProcess::processHasExited(int state) -int KProcess::childOutput(int fdno) +int TDEProcess::childOutput(int fdno) { if (communication & NoRead) { int len = -1; @@ -856,7 +856,7 @@ int KProcess::childOutput(int fdno) } } -int KProcess::childError(int fdno) +int TDEProcess::childError(int fdno) { char buffer[1025]; int len; @@ -871,7 +871,7 @@ int KProcess::childError(int fdno) } -int KProcess::setupCommunication(Communication comm) +int TDEProcess::setupCommunication(Communication comm) { #ifdef Q_OS_UNIX // PTY stuff // @@ -939,7 +939,7 @@ int KProcess::setupCommunication(Communication comm) -int KProcess::commSetupDoneP() +int TDEProcess::commSetupDoneP() { int rcomm = communication & ~d->usePty; if (rcomm & Stdin) @@ -984,7 +984,7 @@ int KProcess::commSetupDoneP() -int KProcess::commSetupDoneC() +int TDEProcess::commSetupDoneC() { int ok = 1; #ifdef Q_OS_UNIX @@ -1034,7 +1034,7 @@ int KProcess::commSetupDoneC() -void KProcess::commClose() +void TDEProcess::commClose() { closeStdin(); @@ -1044,7 +1044,7 @@ void KProcess::commClose() // buffer doesn't fill up whilst we are waiting for data on the other // (causing a deadlock). Hence we need to use select. - int notfd = KProcessController::theKProcessController->notifierFd(); + int notfd = TDEProcessController::theTDEProcessController->notifierFd(); while ((communication & (Stdout | Stderr)) || runs) { fd_set rfds; @@ -1104,7 +1104,7 @@ void KProcess::commClose() } -void KProcess::virtual_hook( int, void* ) +void TDEProcess::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } @@ -1113,7 +1113,7 @@ void KProcess::virtual_hook( int, void* ) /////////////////////////// KShellProcess::KShellProcess(const char *shellname): - KProcess() + TDEProcess() { setUseShell( true, shellname ? shellname : getenv("SHELL") ); } @@ -1123,15 +1123,15 @@ KShellProcess::~KShellProcess() { TQString KShellProcess::quote(const TQString &arg) { - return KProcess::quote(arg); + return TDEProcess::quote(arg); } bool KShellProcess::start(RunMode runmode, Communication comm) { - return KProcess::start(runmode, comm); + return TDEProcess::start(runmode, comm); } void KShellProcess::virtual_hook( int id, void* data ) -{ KProcess::virtual_hook( id, data ); } +{ TDEProcess::virtual_hook( id, data ); } #include "kprocess.moc" diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index 7e9941717..ae4a25af6 100644 --- a/tdecore/kprocess.h +++ b/tdecore/kprocess.h @@ -30,7 +30,7 @@ #include "tdelibs_export.h" class TQSocketNotifier; -class KProcessPrivate; +class TDEProcessPrivate; #ifdef Q_OS_UNIX #include <kpty.h> @@ -60,15 +60,15 @@ class KPty; * @li NotifyOnExit -- The child process is invoked and both the * child and the parent process run concurrently. * - * When the child process exits, the KProcess instance + * When the child process exits, the TDEProcess instance * corresponding to it emits the Qt signal processExited(). * Since this signal is @em not emitted from within a UN*X * signal handler, arbitrary function calls can be made. * - * Be aware: When the KProcess object gets destructed, the child + * Be aware: When the TDEProcess object gets destructed, the child * process will be killed if it is still running! * This means in particular, that it usually makes no sense to use - * a KProcess on the stack with NotifyOnExit. + * a TDEProcess on the stack with NotifyOnExit. * * @li OwnGroup -- like NotifyOnExit, but the child process is started * in an own process group (and an own session, FWIW). The behavior of @@ -84,7 +84,7 @@ class KPty; * In this mode the parent can read the child's output, but can't send it any * input. * - * KProcess also provides several functions for determining the exit status + * TDEProcess also provides several functions for determining the exit status * and the pid of the child process it represents. * * Furthermore it is possible to supply command-line arguments to the process @@ -92,12 +92,12 @@ class KPty; * * A small usage example: * \code - * KProcess *proc = new KProcess; + * TDEProcess *proc = new TDEProcess; * * *proc << "my_executable"; * *proc << "These" << "are" << "the" << "command" << "line" << "args"; - * TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), - * pointer_to_my_object, TQT_SLOT(my_objects_slot(KProcess *))); + * TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), + * pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *))); * proc->start(); * \endcode * @@ -107,7 +107,7 @@ class KPty; * * <b>Communication with the child process:</b>\n * - * KProcess supports communication with the child process through + * TDEProcess supports communication with the child process through * stdin/stdout/stderr. * * The following functions are provided for getting data from the child @@ -127,7 +127,7 @@ class KPty; * @author Christian Czezatke e9025461@student.tuwien.ac.at * **/ -class TDECORE_EXPORT KProcess : public TQObject +class TDECORE_EXPORT TDEProcess : public TQObject { Q_OBJECT @@ -191,12 +191,12 @@ public: * Constructor * @since 3.2 */ - KProcess( TQObject* parent, const char *name = 0 ); + TDEProcess( TQObject* parent, const char *name = 0 ); /** * Constructor */ // KDE4 merge with the above - KProcess(); + TDEProcess(); /** *Destructor: @@ -206,13 +206,13 @@ public: * only if the run mode is not of type @p DontCare. * Processes started as @p DontCare keep running anyway. */ - virtual ~KProcess(); + virtual ~TDEProcess(); /** @deprecated Use operator<<() instead. - Sets the executable to be started with this KProcess object. + Sets the executable to be started with this TDEProcess object. Returns false if the process is currently running (in that case the executable remains unchanged). @@ -227,33 +227,33 @@ public: * * For example, doing an "ls -l /usr/local/bin" can be achieved by: * \code - * KProcess p; + * TDEProcess p; * ... * p << "ls" << "-l" << "/usr/local/bin" * \endcode * * @param arg the argument to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess **/ - KProcess &operator<<(const TQString& arg); + TDEProcess &operator<<(const TQString& arg); /** * Similar to previous method, takes a char *, supposed to be in locale 8 bit already. */ - KProcess &operator<<(const char * arg); + TDEProcess &operator<<(const char * arg); /** * Similar to previous method, takes a TQCString, supposed to be in locale 8 bit already. * @param arg the argument to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess */ - KProcess &operator<<(const TQCString & arg); + TDEProcess &operator<<(const TQCString & arg); /** * Sets the executable and the command line argument list for this process, * in a single method call, or add a list of arguments. * @param args the arguments to add - * @return a reference to this KProcess + * @return a reference to this TDEProcess **/ - KProcess &operator<<(const TQStringList& args); + TDEProcess &operator<<(const TQStringList& args); /** * Clear a command line argument list that has been set by using @@ -265,7 +265,7 @@ public: * Starts the process. * For a detailed description of the * various run modes and communication semantics, have a look at the - * general description of the KProcess class. Note that if you use + * general description of the TDEProcess class. Note that if you use * setUsePty( Stdout | Stderr, \<bool\> ), you cannot use Stdout | Stderr * here - instead, use Stdout only to receive the mixed output. * @@ -308,10 +308,10 @@ public: * * If it is called after * the process has exited, it returns the process id of the last - * child process that was created by this instance of KProcess. + * child process that was created by this instance of TDEProcess. * * Calling it before any child process has been started by this - * KProcess instance causes pid() to return 0. + * TDEProcess instance causes pid() to return 0. * @return the pid of the process or 0 if no process has been started yet. **/ pid_t pid() const; @@ -535,9 +535,9 @@ public: static TQString quote(const TQString &arg); /** - * Detaches KProcess from child process. All communication is closed. + * Detaches TDEProcess from child process. All communication is closed. * No exit notification is emitted any more for the child process. - * Deleting the KProcess will no longer kill the child process. + * Deleting the TDEProcess will no longer kill the child process. * Note that the current process remains the parent process of the * child process. */ @@ -588,7 +588,7 @@ signals: * start() ) or the Block mode. * @param proc a pointer to the process that has exited **/ - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); /** @@ -609,7 +609,7 @@ signals: * TQString myBuf = TQString::fromLatin1(buffer, buflen); * \endcode **/ - void receivedStdout(KProcess *proc, char *buffer, int buflen); + void receivedStdout(TDEProcess *proc, char *buffer, int buflen); /** * Emitted when output from the child process has @@ -646,7 +646,7 @@ signals: * @param buffer The data received. * @param buflen The number of bytes that are available. **/ - void receivedStderr(KProcess *proc, char *buffer, int buflen); + void receivedStderr(TDEProcess *proc, char *buffer, int buflen); /** * Emitted after all the data that has been @@ -654,7 +654,7 @@ signals: * written to the child process. * @param proc a pointer to the process **/ - void wroteStdin(KProcess *proc); + void wroteStdin(TDEProcess *proc); protected slots: @@ -703,7 +703,7 @@ protected: * true if the process is currently running. You should not * modify this data member directly from derived classes. Please use * isRunning() for reading the value of this data member since it - * will probably be made private in later versions of KProcess. + * will probably be made private in later versions of TDEProcess. */ bool runs; @@ -712,7 +712,7 @@ protected: * You should not modify this data member in derived classes. * Please use pid() instead of directly accessing this * member since it will probably be made private in - * later versions of KProcess. + * later versions of TDEProcess. */ pid_t pid_; @@ -721,7 +721,7 @@ protected: * modify the value of this data member from derived classes. You should * rather use exitStatus() than accessing this data member directly * since it will probably be made private in further versions of - * KProcess. + * TDEProcess. */ int status; @@ -736,7 +736,7 @@ protected: /** * This function is called from start() right before a fork() takes * place. According to the @p comm parameter this function has to initialize - * the in, out and err data members of KProcess. + * the in, out and err data members of TDEProcess. * * This function should return 1 if setting the needed communication channels * was successful. @@ -754,7 +754,7 @@ protected: * * Furthermore, it must also create the TQSocketNotifiers innot, * outnot and errnot and connect their Qt signals to the respective - * KProcess slots. + * TDEProcess slots. * * For a more detailed explanation, it is best to have a look at the default * implementation in kprocess.cpp. @@ -788,12 +788,12 @@ protected: * before closing them. * @li if pid() returns non-zero and runs is true, the communication * links should be monitored for data until the file handle returned by - * KProcessController::theKProcessController->notifierFd() becomes ready + * TDEProcessController::theTDEProcessController->notifierFd() becomes ready * for reading - when it triggers, runs should be reset to false, and * the function should be immediately left without closing anything. * * The previous semantics of this function are forward-compatible, but should - * be avoided, as they are prone to race conditions and can cause KProcess + * be avoided, as they are prone to race conditions and can cause TDEProcess * (and thus the whole program) to lock up under certain circumstances. At the * end the function closes the communication links in any case. Additionally * @li if runs is true, the communication links are monitored for data @@ -879,15 +879,15 @@ protected: int input_total; /** - * KProcessController is a friend of KProcess because it has to have + * TDEProcessController is a friend of TDEProcess because it has to have * access to various data members. */ - friend class KProcessController; + friend class TDEProcessController; protected: virtual void virtual_hook( int id, void* data ); private: - KProcessPrivate *d; + TDEProcessPrivate *d; }; class KShellProcessPrivate; @@ -895,13 +895,13 @@ class KShellProcessPrivate; /** * @obsolete * -* Use KProcess and KProcess::setUseShell(true) instead. +* Use TDEProcess and TDEProcess::setUseShell(true) instead. * -* @short A class derived from KProcess to start child +* @short A class derived from TDEProcess to start child * processes through a shell. * @author Christian Czezatke <e9025461@student.tuwien.ac.at> */ -class TDECORE_EXPORT KShellProcess: public KProcess +class TDECORE_EXPORT KShellProcess: public TDEProcess { Q_OBJECT diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp index 9159edab5..7157662df 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/kprocio.cpp @@ -31,8 +31,8 @@ class KProcIOPrivate { public: - KProcIOPrivate() : comm(KProcess::All) {} - KProcess::Communication comm; + KProcIOPrivate() : comm(TDEProcess::All) {} + TDEProcess::Communication comm; }; KProcIO::KProcIO ( TQTextCodec *_codec) @@ -67,14 +67,14 @@ KProcIO::resetAll () rbi=0; readsignalon=writeready=true; - disconnect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (wroteStdin(KProcess *)), - this, TQT_SLOT (sent (KProcess *))); + disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), + this, TQT_SLOT (sent (TDEProcess *))); outbuffer.clear(); @@ -87,19 +87,19 @@ void KProcIO::setComm (Communication comm) bool KProcIO::start (RunMode runmode, bool includeStderr) { - connect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); if (includeStderr) { - connect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT (received (KProcess *, char *, int))); + connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQT_SLOT (received (TDEProcess *, char *, int))); } - connect (this, TQT_SIGNAL (wroteStdin(KProcess *)), - this, TQT_SLOT (sent (KProcess *))); + connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), + this, TQT_SLOT (sent (TDEProcess *))); - return KProcess::start (runmode, d->comm); + return TDEProcess::start (runmode, d->comm); } bool KProcIO::writeStdin (const TQString &line, bool appendnewline) @@ -131,7 +131,7 @@ bool KProcIO::writeStdin (const TQCString &line, bool appendnewline) if (writeready) { writeready=false; - return KProcess::writeStdin( b->data(), b->size() ); + return TDEProcess::writeStdin( b->data(), b->size() ); } return true; } @@ -146,7 +146,7 @@ bool KProcIO::writeStdin(const TQByteArray &data) if (writeready) { writeready=false; - return KProcess::writeStdin( b->data(), b->size() ); + return TDEProcess::writeStdin( b->data(), b->size() ); } return true; } @@ -163,7 +163,7 @@ void KProcIO::closeWhenDone() return; } -void KProcIO::sent(KProcess *) +void KProcIO::sent(TDEProcess *) { outbuffer.removeFirst(); @@ -180,13 +180,13 @@ void KProcIO::sent(KProcess *) } else { - KProcess::writeStdin(b->data(), b->size()); + TDEProcess::writeStdin(b->data(), b->size()); } } } -void KProcIO::received (KProcess *, char *buffer, int buflen) +void KProcIO::received (TDEProcess *, char *buffer, int buflen) { recvbuffer += TQCString(buffer, buflen+1); @@ -270,7 +270,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial) } void KProcIO::virtual_hook( int id, void* data ) -{ KProcess::virtual_hook( id, data ); } +{ TDEProcess::virtual_hook( id, data ); } #include "kprocio.moc" diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h index 3dceb9c1b..4e42ee533 100644 --- a/tdecore/kprocio.h +++ b/tdecore/kprocio.h @@ -30,7 +30,7 @@ class TQTextCodec; * KProcIO * * This class provides a slightly simpler interface to the communication - * functions provided by KProcess. The simplifications are: + * functions provided by TDEProcess. The simplifications are: * @li The buffer for a write is copied to an internal KProcIO * buffer and maintained/freed appropriately. There is no need * to be concerned with wroteStdin() signals _at_all_. @@ -40,14 +40,14 @@ class TQTextCodec; * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs(). * * Aside from these, and the fact that start() takes different - * parameters, use this class just like KProcess. + * parameters, use this class just like TDEProcess. * * @author David Sweet - * @short A slightly simpler interface to KProcess + * @short A slightly simpler interface to TDEProcess **/ -class TDECORE_EXPORT KProcIO : public KProcess +class TDECORE_EXPORT KProcIO : public TDEProcess { Q_OBJECT @@ -63,10 +63,10 @@ public: ~KProcIO(); /** - * Sets the communication mode to be passed to KProcess::start() - * by start(). The default communication mode is KProcess::All. + * Sets the communication mode to be passed to TDEProcess::start() + * by start(). The default communication mode is TDEProcess::All. * You probably want to use this function in conjunction with - * KProcess::setUsePty(). + * TDEProcess::setUsePty(). * @param comm the communication mode */ void setComm (Communication comm); @@ -80,7 +80,7 @@ public: * * @param runmode For a detailed description of the * various run modes, have a look at the - * general description of the KProcess class. + * general description of the TDEProcess class. * @param includeStderr If true, data from both stdout and stderr is * listened to. If false, only stdout is listened to. * @return true on success, false on error. @@ -204,8 +204,8 @@ protected: void controlledEmission (); protected slots: - void received (KProcess *proc, char *buffer, int buflen); - void sent (KProcess *); + void received (TDEProcess *proc, char *buffer, int buflen); + void sent (TDEProcess *); protected: virtual void virtual_hook( int id, void* data ); diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index f6fc9d5cd..e13540e19 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -144,7 +144,7 @@ extern "C" { /////////////////////// #ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess +class TDEProcess_Utmp : public TDEProcess { public: int commSetupDoneC() @@ -440,12 +440,12 @@ void KPty::setCTty() void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "add"; if (remotehost) utmp << remotehost; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); Q_UNUSED(user); Q_UNUSED(remotehost); #elif defined(USE_LOGIN) @@ -485,10 +485,10 @@ void KPty::login(const char *user, const char *remotehost) void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; + TDEProcess_Utmp utmp; utmp.cmdFd = d->masterFd; utmp << "/usr/lib/utempter/utempter" << "del"; - utmp.start(KProcess::Block); + utmp.start(TDEProcess::Block); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5)) @@ -572,8 +572,8 @@ int KPty::slaveFd() const // private bool KPty::chownpty(bool grant) { - KProcess proc; + TDEProcess proc; proc << locate("exe", BASE_CHOWN) << (grant?"--grant":"--revoke") << TQString::number(d->masterFd); - return proc.start(KProcess::Block) && proc.normalExit() && !proc.exitStatus(); + return proc.start(TDEProcess::Block) && proc.normalExit() && !proc.exitStatus(); } diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp index 7c3fc67da..9666f7aab 100644 --- a/tdecore/kshortcutlist.cpp +++ b/tdecore/kshortcutlist.cpp @@ -72,7 +72,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo { kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); // If the config file still has the old group name: @@ -110,7 +110,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC { kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts"); @@ -166,7 +166,7 @@ KAccelShortcutList::KAccelShortcutList( KAccel* pAccel ) d->m_configGroup=pAccel->configGroup(); } -KAccelShortcutList::KAccelShortcutList( KGlobalAccel* pAccel ) +KAccelShortcutList::KAccelShortcutList( TDEGlobalAccel* pAccel ) : m_actions( pAccel->actions() ) { d=new KAccelShortcutListPrivate; diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h index ce8f408a1..497bfaf15 100644 --- a/tdecore/kshortcutlist.h +++ b/tdecore/kshortcutlist.h @@ -40,7 +40,7 @@ class KShortcut; * KAccelShortcutList and KStdAccel::ShortcutList. It gives * you an unified interface for accessing the accelerator lists * of KAccel (using KAccelShortcutList), - * KGlobalAccel (using KAccelShortcutList), and + * TDEGlobalAccel (using KAccelShortcutList), and * KStdAccel (using KStdAccel::ShortcutList). * * @short Base class for accessing accelerator lists @@ -189,11 +189,11 @@ class TDECORE_EXPORT KShortcutList class KAccel; class KAccelActions; -class KGlobalAccel; +class TDEGlobalAccel; /** * KShortcutList implementation to access KAccel and - * KGlobalAccel lists. + * TDEGlobalAccel lists. */ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList { @@ -206,10 +206,10 @@ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList /** * Creates a new KShortcutList that accesses the given - * KGlobalAccel. + * TDEGlobalAccel. * @param accel the accelerators to access */ - KAccelShortcutList( KGlobalAccel* accel ); + KAccelShortcutList( TDEGlobalAccel* accel ); /** * @internal diff --git a/tdecore/kshortcutmenu.cpp b/tdecore/kshortcutmenu.cpp index 3df389f07..4bf18d965 100644 --- a/tdecore/kshortcutmenu.cpp +++ b/tdecore/kshortcutmenu.cpp @@ -34,7 +34,7 @@ KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySe { kdDebug() << seq.toStringInternal() << endl; - TQFont fontTitle = KGlobalSettings::menuFont(); + TQFont fontTitle = TDEGlobalSettings::menuFont(); fontTitle.setBold( true ); pTitle = new TQLabel( "", (TQWidget*)0 ); diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 6b4e13a14..5c17b665d 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -43,7 +43,7 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) // the difference between KConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { - backEnd->changeFileName( KGlobal::dirs()-> + backEnd->changeFileName( TDEGlobal::dirs()-> saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false); } else { backEnd->changeFileName(fileName, "config", false); diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index cad0345ab..9552c4104 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -214,7 +214,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(KGlobal::config(), TQCString("DirWatch")); + KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index 1f948653e..85d6e4249 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -1461,8 +1461,8 @@ void KStandardDirs::addKDEDefaults() void KStandardDirs::checkConfig() const { - if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config) - const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config); + if (!addedCustoms && TDEGlobal::_instance && TDEGlobal::_instance->_config) + const_cast<KStandardDirs*>(this)->addCustomized(TDEGlobal::_instance->_config); } static TQStringList lookupProfiles(const TQString &mapFile) diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h index 6c6e71ab2..8d026682c 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/kstandarddirs.h @@ -97,7 +97,7 @@ class KStandardDirsPrivate; * So while you had to ::locate("data", "appname/filename") so you can * also write ::locate("appdata", "filename") if your TDEApplication instance * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if - * you use the global KStandardDirs object KGlobal::dirs()). + * you use the global KStandardDirs object TDEGlobal::dirs()). * Please note though that you cannot use the "appdata" * type if you intend to use it in an applet for Kicker because 'appname' would * be "Kicker" instead of the applet's name. Therefore, for applets, you've got @@ -120,7 +120,7 @@ class KStandardDirsPrivate; * home directory of root, usually "/root/.trinity". * Note that the setting of $HOME is ignored in this case. * - * @see KGlobalSettings + * @see TDEGlobalSettings */ class TDECORE_EXPORT KStandardDirs { @@ -175,7 +175,7 @@ public: * The later a suffix is added, the higher its priority. Note, that the * suffix should end with / but doesn't have to start with one (as prefixes * should end with one). So adding a suffix for app_pics would look - * like KGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); + * like TDEGlobal::dirs()->addResourceType("app_pics", "share/app/pics"); * * @param type Specifies a short descriptive string to access * files of this type. @@ -414,7 +414,7 @@ public: * It's a series of addResourceTypes() * and addPrefix() calls. * You normally wouldn't call this function because it's called - * for you from KGlobal. + * for you from TDEGlobal. */ void addKDEDefaults(); @@ -700,7 +700,7 @@ public: * This function is just for convenience. It simply calls *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename). **/ -TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() ); /*! * \relates KStandardDirs @@ -711,7 +711,7 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons * specific file, filename must have a trailing slash. * **/ -TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() ); /*! * \relates KStandardDirs @@ -722,7 +722,7 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, * filename must have a trailing slash. * **/ -TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = KGlobal::instance() ); +TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = TDEGlobal::instance() ); /*! @} */ diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h index 61b4a8e4a..dd759adf7 100644 --- a/tdecore/kstaticdeleter.h +++ b/tdecore/kstaticdeleter.h @@ -27,14 +27,14 @@ /** * Static deleters are used to manage static resources. They can register - * themselves with KGlobal. KGlobal will call destructObject() when - * KGlobal::deleteStaticDeleters() is called or when it the process + * themselves with TDEGlobal. TDEGlobal will call destructObject() when + * TDEGlobal::deleteStaticDeleters() is called or when it the process * finishes. * * @see KStaticDeleter - * @see KGlobal::registerStaticDeleter() - * @see KGlobal::unregisterStaticDeleter() - * @see KGlobal::deleteStaticDeleters() + * @see TDEGlobal::registerStaticDeleter() + * @see TDEGlobal::unregisterStaticDeleter() + * @see TDEGlobal::deleteStaticDeleters() */ class TDECORE_EXPORT KStaticDeleterBase { public: @@ -42,7 +42,7 @@ public: /** * Should destruct the resources managed by this KStaticDeleterBase. * Usually you also want to call it in your destructor. - * @see KGlobal::deleteStaticDeleters() + * @see TDEGlobal::deleteStaticDeleters() */ virtual void destructObject(); }; @@ -76,7 +76,7 @@ public: KStaticDeleter() { deleteit = 0; globalReference = 0; array = false; } /** * Sets the object to delete and registers the object to be - * deleted to KGlobal. If the given object is 0, the former + * deleted to TDEGlobal. If the given object is 0, the former * registration is unregistered. * @param obj the object to delete * @param isArray tells the destructor to delete an array instead of an object @@ -87,14 +87,14 @@ public: globalReference = 0; array = isArray; if (obj) - KGlobal::registerStaticDeleter(this); + TDEGlobal::registerStaticDeleter(this); else - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); return obj; } /** * Sets the object to delete and registers the object to be - * deleted to KGlobal. If the given object is 0, the former + * deleted to TDEGlobal. If the given object is 0, the former * registration is unregistered. * @param globalRef the static pointer where this object is stored * This pointer will be reset to 0 after deletion of the object. @@ -106,9 +106,9 @@ public: deleteit = obj; array = isArray; if (obj) - KGlobal::registerStaticDeleter(this); + TDEGlobal::registerStaticDeleter(this); else - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); globalRef = obj; return obj; } @@ -127,7 +127,7 @@ public: deleteit = 0; } virtual ~KStaticDeleter() { - KGlobal::unregisterStaticDeleter(this); + TDEGlobal::unregisterStaticDeleter(this); destructObject(); } private: diff --git a/tdecore/kstdaccel.cpp b/tdecore/kstdaccel.cpp index cb2d9dbba..fa3abd5af 100644 --- a/tdecore/kstdaccel.cpp +++ b/tdecore/kstdaccel.cpp @@ -126,7 +126,7 @@ static KStdAccelInfo* infoPtr( StdAccel id ) */ static void initialize( StdAccel id ) { - KConfigGroupSaver saver( KGlobal::config(), "Shortcuts" ); + KConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" ); KStdAccelInfo* pInfo = infoPtr( id ); if( !pInfo ) { diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index d33c3c924..c562c539f 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -654,7 +654,7 @@ TQString KStringHandler::from8Bit( const char *str ) if (!str) return TQString::null; if (!*str) { - static const TQString &emptyString = KGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticQString(""); return emptyString; } return KStringHandler::isUtf8( str ) ? diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index fe9e50d57..0a2cd2511 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/ksycoca.cpp @@ -114,7 +114,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) TQString path; TQCString ksycoca_env = getenv("TDESYCOCA"); if (ksycoca_env.isEmpty()) - path = KGlobal::dirs()->saveLocation("cache") + "ksycoca"; + path = TDEGlobal::dirs()->saveLocation("cache") + "ksycoca"; else path = TQFile::decodeName(ksycoca_env); @@ -424,7 +424,7 @@ TQStringList KSycoca::allResourceDirs() TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char *_resource ) { TQString sRelativeFilePath; - TQStringList dirs = KGlobal::dirs()->resourceDirs( _resource ); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs( _resource ); TQStringList::ConstIterator dirsit = dirs.begin(); for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) { // might need canonicalPath() ... diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp index 8a4d88c2e..69554fd86 100644 --- a/tdecore/ktempdir.cpp +++ b/tdecore/ktempdir.cpp @@ -63,7 +63,7 @@ KTempDir::KTempDir(TQString directoryPrefix, int mode) mError=0; if (directoryPrefix.isEmpty()) { - directoryPrefix = locateLocal("tmp", KGlobal::instance()->instanceName()); + directoryPrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName()); } (void) create(directoryPrefix , mode); } diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp index db8ba796d..35d66f81c 100644 --- a/tdecore/ktempfile.cpp +++ b/tdecore/ktempfile.cpp @@ -71,7 +71,7 @@ KTempFile::KTempFile(TQString filePrefix, TQString fileExtension, int mode) fileExtension = ".tmp"; if (filePrefix.isEmpty()) { - filePrefix = locateLocal("tmp", KGlobal::instance()->instanceName()); + filePrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName()); } (void) create(filePrefix, fileExtension, mode); } diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp index 77a0cca0f..b46e05dd5 100644 --- a/tdecore/ktimezones.cpp +++ b/tdecore/ktimezones.cpp @@ -400,7 +400,7 @@ const KTimezones::ZoneMap KTimezones::allZones() "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'"; // Note the use of blocking here...it is a trivial amount of data! temp.close(); - reader.start(KProcess::Block); + reader.start(TDEProcess::Block); f.setName(temp.name()); if (!temp.status() || !f.open(IO_ReadOnly)) { diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 7817742bc..9479029a9 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de if (decodeDots) { #ifndef KDE_QT_ONLY - static const TQString &encodedDot = KGlobal::staticQString("%2e"); + static const TQString &encodedDot = TDEGlobal::staticQString("%2e"); #else TQString encodedDot("%2e"); #endif if (path.find(encodedDot, 0, false) != -1) { #ifndef KDE_QT_ONLY - static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase! + static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase! #else TQString encodedDOT("%2E"); #endif @@ -2340,7 +2340,7 @@ KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol) KURL::URIMode mode = Auto; if (protocol == fileProt) return URL; - if (KGlobal::_instance) + if (TDEGlobal::_instance) mode = KProtocolInfo::uriParseMode(protocol); if (mode == Auto ) { #else diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp index 2b07c2580..20aa6388e 100644 --- a/tdecore/kurldrag.cpp +++ b/tdecore/kurldrag.cpp @@ -253,7 +253,7 @@ TQByteArray KURLDrag::encodedData( const char* mime ) const KURL KURLDrag::stringToUrl(const TQCString &s) { if (strncmp(s.data(), "file:", 5) == 0) - return KURL(s, KGlobal::locale()->fileEncodingMib()); + return KURL(s, TDEGlobal::locale()->fileEncodingMib()); return KURL(s, 106); // 106 is mib enum for utf8 codec; } @@ -263,12 +263,12 @@ TQString KURLDrag::urlToString(const KURL &url) if (url.isLocalFile()) { #if 1 - return url.url(0, KGlobal::locale()->fileEncodingMib()); + return url.url(0, TDEGlobal::locale()->fileEncodingMib()); #else // According to the XDND spec, file:/ URLs for DND must have // the hostname part. But in really it just breaks many apps, // so it's disabled for now. - TQString s = url.url(0, KGlobal::locale()->fileEncodingMib()); + TQString s = url.url(0, TDEGlobal::locale()->fileEncodingMib()); if( !s.startsWith( "file://" )) { char hostname[257]; diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 77c085e08..41075685e 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -84,7 +84,7 @@ void KBlacklistWorker::init() // HACK! // FIXME KDE4: How do I detect there is an instance, without triggering // its creation or an assertion fault? - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) return; static bool beenhere = false; @@ -99,7 +99,7 @@ void KBlacklistWorker::init() void KBlacklistWorker::loadBlacklist() { TQMutexLocker locker(&blacklistMutex); - TQStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist"); + TQStringList filelist = TDEGlobal::dirs()->findAllResources("config", "ipv6blacklist"); TQStringList::ConstIterator it = filelist.constBegin(), end = filelist.constEnd(); diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 8dc501590..7c253ee34 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -1299,7 +1299,7 @@ TQString macAddressForGenericDevice(TQT_DBusObjectPath path) { } TQString tdeDeviceUUIDForMACAddress(TQString macAddress) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) { return TQString::null; } diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 9fe328509..18d2a373f 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); - (void)KGlobal::dirs(); // trigger the creation - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); // trigger the creation + (void)TDEGlobal::config(); // Get application specific arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (args->isSet("localprefix")) { - printResult(KGlobal::dirs()->localtdedir()); + printResult(TDEGlobal::dirs()->localtdedir()); return 0; } @@ -163,7 +163,7 @@ int main(int argc, char **argv) if (args->isSet("types")) { - TQStringList types = KGlobal::dirs()->allTypes(); + TQStringList types = TDEGlobal::dirs()->allTypes(); types.sort(); const char *helptexts[] = { "apps", I18N_NOOP("Applications menu (.desktop files)"), @@ -211,7 +211,7 @@ int main(int argc, char **argv) TQString type = args->getOption("path"); if (!type.isEmpty()) { - printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":")); + printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":")); return 0; } @@ -219,13 +219,13 @@ int main(int argc, char **argv) if (!type.isEmpty()) { if ( type == "desktop" ) - printResult(KGlobalSettings::desktopPath()); + printResult(TDEGlobalSettings::desktopPath()); else if ( type == "autostart" ) - printResult(KGlobalSettings::autostartPath()); + printResult(TDEGlobalSettings::autostartPath()); else if ( type == "trash" ) - printResult(KGlobalSettings::trashPath()); + printResult(TDEGlobalSettings::trashPath()); else if ( type == "document" ) - printResult(KGlobalSettings::documentPath()); + printResult(TDEGlobalSettings::documentPath()); else fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); return 0; diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index 61feeea7f..3d6ba7850 100644 --- a/tdecore/tde-config.cpp.in +++ b/tdecore/tde-config.cpp.in @@ -121,8 +121,8 @@ int main(int argc, char **argv) TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); - (void)KGlobal::dirs(); // trigger the creation - (void)KGlobal::config(); + (void)TDEGlobal::dirs(); // trigger the creation + (void)TDEGlobal::config(); // Get application specific arguments TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -151,7 +151,7 @@ int main(int argc, char **argv) if (args->isSet("localprefix")) { - printResult(KGlobal::dirs()->localtdedir()); + printResult(TDEGlobal::dirs()->localtdedir()); return 0; } @@ -163,7 +163,7 @@ int main(int argc, char **argv) if (args->isSet("types")) { - TQStringList types = KGlobal::dirs()->allTypes(); + TQStringList types = TDEGlobal::dirs()->allTypes(); types.sort(); const char *helptexts[] = { "apps", I18N_NOOP("Applications menu (.desktop files)"), @@ -210,7 +210,7 @@ int main(int argc, char **argv) TQString type = args->getOption("path"); if (!type.isEmpty()) { - printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":")); + printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":")); return 0; } @@ -218,13 +218,13 @@ int main(int argc, char **argv) if (!type.isEmpty()) { if ( type == "desktop" ) - printResult(KGlobalSettings::desktopPath()); + printResult(TDEGlobalSettings::desktopPath()); else if ( type == "autostart" ) - printResult(KGlobalSettings::autostartPath()); + printResult(TDEGlobalSettings::autostartPath()); else if ( type == "trash" ) - printResult(KGlobalSettings::trashPath()); + printResult(TDEGlobalSettings::trashPath()); else if ( type == "document" ) - printResult(KGlobalSettings::documentPath()); + printResult(TDEGlobalSettings::documentPath()); else fprintf(stderr, "%s", TQString(i18n("%1 - unknown type of userpath\n").arg(type)).local8Bit().data() ); return 0; diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index f9c2859c2..372f779c1 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -287,7 +287,7 @@ TDEGenericDevice* TDEGenericDevice::parentDevice() { } TQPixmap TDEGenericDevice::icon(KIcon::StdSizes size) { - return KGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size); + return TDEGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size); } bool TDEGenericDevice::blacklistedForUpdate() { @@ -299,7 +299,7 @@ void TDEGenericDevice::internalSetBlacklistedForUpdate(bool bl) { } TQString TDEGenericDevice::friendlyDeviceType() { - return KGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type()); + return TDEGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type()); } TQString TDEGenericDevice::busID() { @@ -321,10 +321,10 @@ TQString TDEGenericDevice::friendlyName() { m_friendlyName = friendlyDriverName; } else if (m_modAlias.lower().startsWith("pci")) { - m_friendlyName = KGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); + m_friendlyName = TDEGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); } else if (m_modAlias.lower().startsWith("usb")) { - m_friendlyName = KGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); + m_friendlyName = TDEGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID); } else { TQString acpigentype = systemPath(); @@ -333,7 +333,7 @@ TQString TDEGenericDevice::friendlyName() { TQString pnpgentype = acpigentype; pnpgentype.truncate(pnpgentype.find(":")); if (pnpgentype.startsWith("PNP")) { - m_friendlyName = KGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype); + m_friendlyName = TDEGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype); } else if (acpigentype.startsWith("device:")) { acpigentype.remove(0, acpigentype.findRev(":")+1); @@ -706,7 +706,7 @@ TQString TDEStorageDevice::mountPath() { // where <something> is listed in <system path>/dm/name // First, ensure that all device information (mainly holders/slaves) is accurate - KGlobal::hardwareDevices()->rescanDeviceInformation(this); + TDEGlobal::hardwareDevices()->rescanDeviceInformation(this); TQString dmnodename = systemPath(); dmnodename.append("/dm/name"); @@ -746,7 +746,7 @@ TQString TDEStorageDevice::mountPath() { TQStringList slaveDeviceList = holdingDevices(); for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) { // Try to locate this device path in the TDE device tree - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericDevice *hwdevice = hwdevices->findBySystemPath(*slavedevit); if ((hwdevice) && (hwdevice->type() == TDEGenericDeviceType::Disk)) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); @@ -792,7 +792,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); ret = mountPath(); @@ -841,7 +841,7 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); ret = mountPath(); @@ -879,7 +879,7 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) { } // Update internal mount data - KGlobal::hardwareDevices()->processModifiedMounts(); + TDEGlobal::hardwareDevices()->processModifiedMounts(); return false; } @@ -1025,7 +1025,7 @@ void TDECPUDevice::setGovernor(TQString gv) { #endif // WITH_UPOWER // Force update of the device information object - KGlobal::hardwareDevices()->processModifiedCPUs(); + TDEGlobal::hardwareDevices()->processModifiedCPUs(); } bool TDECPUDevice::canSetMaximumScalingFrequency() { @@ -1049,7 +1049,7 @@ void TDECPUDevice::setMaximumScalingFrequency(double fr) { } // Force update of the device information object - KGlobal::hardwareDevices()->processModifiedCPUs(); + TDEGlobal::hardwareDevices()->processModifiedCPUs(); } int TDECPUDevice::coreNumber() { @@ -1217,7 +1217,7 @@ bool TDERootSystemDevice::canPowerOff() { // Can we power down this system? // This should probably be checked via DCOP and therefore interface with KDM - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); @@ -3065,7 +3065,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ } } else { - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/deviceclasses/"); TQString hardware_info_directory; @@ -3079,7 +3079,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { TQDir d(hardware_info_directory); d.setFilter( TQDir::Files | TQDir::Hidden ); @@ -5126,7 +5126,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { if (!pnp_id_map) { pnp_id_map = new TDEDeviceIDMap; - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/pnpdev/"); TQString hardware_info_directory; TQString database_filename; @@ -5135,7 +5135,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { database_filename = hardware_info_directory + "pnp.ids"; if (TQFile::exists(database_filename)) { break; @@ -5196,7 +5196,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { if (!dpy_id_map) { dpy_id_map = new TDEDeviceIDMap; - TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data")); + TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data")); TQString hardware_info_directory_suffix("tdehwlib/pnpdev/"); TQString hardware_info_directory; TQString database_filename; @@ -5205,7 +5205,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { hardware_info_directory = (*it); hardware_info_directory += hardware_info_directory_suffix; - if (KGlobal::dirs()->exists(hardware_info_directory)) { + if (TDEGlobal::dirs()->exists(hardware_info_directory)) { database_filename = hardware_info_directory + "dpy.ids"; if (TQFile::exists(database_filename)) { break; diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp index 80f34b765..2705343f7 100644 --- a/tdecore/tdenetworkconnections.cpp +++ b/tdecore/tdenetworkconnections.cpp @@ -717,7 +717,7 @@ TDENetworkConnection* TDENetworkConnectionManager::findConnectionByUUID(TQString } TDENetworkDevice* TDENetworkConnectionManager::findDeviceByUUID(TQString uuid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) return NULL; TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network); @@ -1071,7 +1071,7 @@ TDENetworkDevice* TDEGlobalNetworkManager::findDeviceByUUID(TQString uuid) { } TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddress bssid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); if (!hwdevices) { return NULL; } diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp index 62b14aa7a..fef409d71 100644 --- a/tdecore/tests/kcalendartest.cpp +++ b/tdecore/tests/kcalendartest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) { calType = args->getOption("type"); - KGlobal::locale()->setCalendar(calType); + TDEGlobal::locale()->setCalendar(calType); /* * If we like to see some date @@ -65,7 +65,7 @@ int main(int argc, char **argv) { */ if ( args->isSet("date") ) { option = args->getOption("date"); - date = KGlobal::locale()->readDate(option); + date = TDEGlobal::locale()->readDate(option); } else date = TQDate::currentDate(); @@ -83,70 +83,70 @@ void test(TQDate & date) { kdDebug() << "(KLocale) readDate" << endl; - kdDebug() << "Created calendar: " << KGlobal::locale()->calendar()->calendarName() << endl; + kdDebug() << "Created calendar: " << TDEGlobal::locale()->calendar()->calendarName() << endl; - kdDebug() << "Day name for first day of week is " << KGlobal::locale()->calendar()->weekDayName(1) << endl; - kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->weekDayName(1, true) << endl; + kdDebug() << "Day name for first day of week is " << TDEGlobal::locale()->calendar()->weekDayName(1) << endl; + kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->weekDayName(1, true) << endl; - kdDebug() << "Month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date)) << endl; - kdDebug() << "Short month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date), true) << endl; + kdDebug() << "Month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date)) << endl; + kdDebug() << "Short month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date), true) << endl; - kdDebug() << "Day for date " << date.toString() << " is " << KGlobal::locale()->calendar()->day(date) << endl; - kdDebug() << "Month for date " << date.toString() << " is " << KGlobal::locale()->calendar()->month(date) << endl; - kdDebug() << "Year for date " << date.toString() << " is " << KGlobal::locale()->calendar()->year(date) << endl; + kdDebug() << "Day for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->day(date) << endl; + kdDebug() << "Month for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->month(date) << endl; + kdDebug() << "Year for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->year(date) << endl; - kdDebug() << "Day for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->dayString(date, true) << endl; - kdDebug() << "Month for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->monthString(date, true) << endl; - kdDebug() << "Year for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->yearString(date, true) << endl; + kdDebug() << "Day for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->dayString(date, true) << endl; + kdDebug() << "Month for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->monthString(date, true) << endl; + kdDebug() << "Year for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->yearString(date, true) << endl; - kdDebug() << "Day of week for date " << date.toString() << " is number " << KGlobal::locale()->calendar()->dayOfWeek(date) << endl; - kdDebug() << "Week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date) << endl; - kdDebug() << "Short week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date, true) << endl; + kdDebug() << "Day of week for date " << date.toString() << " is number " << TDEGlobal::locale()->calendar()->dayOfWeek(date) << endl; + kdDebug() << "Week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date) << endl; + kdDebug() << "Short week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date, true) << endl; - kdDebug() << "Month name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthName(date) << endl; - kdDebug() << "Short month name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthName(date, true) << endl; - kdDebug() << "Month name possessive for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthNamePossessive(date) << endl; - kdDebug() << "Short month name possessive for date " << date.toString() << " is " << KGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl; + kdDebug() << "Month name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthName(date) << endl; + kdDebug() << "Short month name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthName(date, true) << endl; + kdDebug() << "Month name possessive for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthNamePossessive(date) << endl; + kdDebug() << "Short month name possessive for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl; - kdDebug() << "It's week number " << KGlobal::locale()->calendar()->weekNumber(date) << endl; + kdDebug() << "It's week number " << TDEGlobal::locale()->calendar()->weekNumber(date) << endl; - kdDebug() << "(KLocale) Formatted date: " << KGlobal::locale()->formatDate(date) << endl; - kdDebug() << "(KLocale) Short formatted date: " << KGlobal::locale()->formatDate(date, true) << endl; + kdDebug() << "(KLocale) Formatted date: " << TDEGlobal::locale()->formatDate(date) << endl; + kdDebug() << "(KLocale) Short formatted date: " << TDEGlobal::locale()->formatDate(date, true) << endl; - kdDebug() << "That month have : " << KGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl; + kdDebug() << "That month have : " << TDEGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl; - kdDebug() << "That year has " << KGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl; - kdDebug() << "There are " << KGlobal::locale()->calendar()->weeksInYear(KGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl; - kdDebug() << "There are " << KGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl; + kdDebug() << "That year has " << TDEGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl; + kdDebug() << "There are " << TDEGlobal::locale()->calendar()->weeksInYear(TDEGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl; + kdDebug() << "There are " << TDEGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl; - kdDebug() << "The day of pray is number " << KGlobal::locale()->calendar()->weekDayOfPray() << endl; + kdDebug() << "The day of pray is number " << TDEGlobal::locale()->calendar()->weekDayOfPray() << endl; - kdDebug() << "Max valid year supported is " << KGlobal::locale()->calendar()->maxValidYear() << endl; - kdDebug() << "Min valid year supported is " << KGlobal::locale()->calendar()->minValidYear() << endl; + kdDebug() << "Max valid year supported is " << TDEGlobal::locale()->calendar()->maxValidYear() << endl; + kdDebug() << "Min valid year supported is " << TDEGlobal::locale()->calendar()->minValidYear() << endl; - kdDebug() << "It's the day number " << KGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl; + kdDebug() << "It's the day number " << TDEGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl; kdDebug() << "Add 3 days" << endl; - date = KGlobal::locale()->calendar()->addDays(date, 3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addDays(date, 3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; kdDebug() << "Then add 3 months" << endl; - date = KGlobal::locale()->calendar()->addMonths(date, 3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addMonths(date, 3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; kdDebug() << "And last, add -3 years" << endl; - date = KGlobal::locale()->calendar()->addYears(date, -3); - kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl; + date = TDEGlobal::locale()->calendar()->addYears(date, -3); + kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl; - kdDebug() << "Is lunar based: " << KGlobal::locale()->calendar()->isLunar() << endl; - kdDebug() << "Is lunisolar based: " << KGlobal::locale()->calendar()->isLunisolar() << endl; - kdDebug() << "Is solar based: " << KGlobal::locale()->calendar()->isSolar() << endl; + kdDebug() << "Is lunar based: " << TDEGlobal::locale()->calendar()->isLunar() << endl; + kdDebug() << "Is lunisolar based: " << TDEGlobal::locale()->calendar()->isLunisolar() << endl; + kdDebug() << "Is solar based: " << TDEGlobal::locale()->calendar()->isSolar() << endl; } diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp index fba38f8bf..27dcdf845 100644 --- a/tdecore/tests/kiconloadertest.cpp +++ b/tdecore/tests/kiconloadertest.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { TDEApplication app(argc,argv,"kiconloadertest"/*,false,false*/); - KIconLoader * mpLoader = KGlobal::iconLoader(); + KIconLoader * mpLoader = TDEGlobal::iconLoader(); KIcon::Context mContext = KIcon::Application; TQTime dt; dt.start(); diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp index 3c8df342e..bcb7bc9e8 100644 --- a/tdecore/tests/klocaletest.cpp +++ b/tdecore/tests/klocaletest.cpp @@ -70,19 +70,19 @@ void Test::createFields() TQString string; string+="Selected languages: "; - string+=KGlobal::locale()->languages()+"\n"; + string+=TDEGlobal::locale()->languages()+"\n"; // This will show nothing, as there is no klocaletest.mo // but you can copy other *.mo file string+="Used language: "; - string+=KGlobal::locale()->language()+"\n"; + string+=TDEGlobal::locale()->language()+"\n"; string+="Locale encoding: "; - string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::fromLatin1(TDEGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + string+=TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); string+="\nLocalized monetary numbers: "; - string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89); + string+=TDEGlobal::locale()->formatMoney(1234567.89) + " / \n" +TDEGlobal::locale()->formatMoney(-1234567.89); // This will not work // but you can copy other *.mo file string+="\nSome localized strings:\n"; @@ -93,7 +93,7 @@ void Test::createFields() label=new TQLabel(string,this,"Label"); label->setGeometry(10,10,400,400); - label->setFont(KGlobalSettings::generalFont()); + label->setFont(TDEGlobalSettings::generalFont()); label->show(); } @@ -102,47 +102,47 @@ int main( int argc, char ** argv ) KLocale::setMainCatalogue("tdelibs"); TDEApplication a( argc, argv, "klocaletest" ); - KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::fromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); + TDEGlobal::locale()->setCountry(TQString::fromLatin1("C")); + TDEGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); TQString formatted; - formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70"); - formatted = KGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20"); - formatted = KGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24"); - formatted = KGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457"); + formatted = TDEGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70"); + formatted = TDEGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20"); + formatted = TDEGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24"); + formatted = TDEGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457"); - formatted = KGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00"); - formatted = KGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70"); - formatted = KGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */ - formatted = KGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20"); - formatted = KGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24"); - formatted = KGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/ - formatted = KGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789"); + formatted = TDEGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00"); + formatted = TDEGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70"); + formatted = TDEGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */ + formatted = TDEGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20"); + formatted = TDEGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24"); + formatted = TDEGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/ + formatted = TDEGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789"); double num; bool ok; - num = KGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes"); - num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no"); - num = KGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes"); - num = KGlobal::locale()->readNumber( "1.12345678912", &ok ); + num = TDEGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes"); + num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no"); + num = TDEGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes"); + num = TDEGlobal::locale()->readNumber( "1.12345678912", &ok ); tqDebug( "%s", TQString::number( num, 'g', 12 ).latin1() ); // warning this is the only way to see all decimals check("readNumber(1.12345678912)",ok && num==1.12345678912?"yes":"no","yes"); // bug 95511 - KLocale locale(*KGlobal::locale()); + KLocale locale(*TDEGlobal::locale()); locale.setCurrencySymbol("$$"); num = locale.readMoney("1,234,567.89$$", &ok); check("readMoney(1,234,567.89$$)",ok?"yes":"no","yes"); @@ -151,41 +151,41 @@ int main( int argc, char ** argv ) TQDate date; date.setYMD( 2002, 5, 3 ); - checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + checkDate("readDate( 3, 5, 2002 )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) ); date = TQDate::currentDate(); - checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + checkDate("readDate( TQDate::currentDate() )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) ); TQTime time; - time = KGlobal::locale()->readTime( "11:22:33", &ok ); + time = TDEGlobal::locale()->readTime( "11:22:33", &ok ); check("readTime(\"11:22:33\")", (ok && time == TQTime(11, 22, 33)) ? "yes" : "no", "yes"); - time = KGlobal::locale()->readTime( "11:22", &ok ); + time = TDEGlobal::locale()->readTime( "11:22", &ok ); check("readTime(\"11:22\")", (ok && time == TQTime(11, 22, 0)) ? "yes" : "no", "yes"); - time = KGlobal::locale()->readTime( "foo", &ok ); + time = TDEGlobal::locale()->readTime( "foo", &ok ); check("readTime(\"foo\")", (!ok && !time.isValid()) ? "invalid" : "valid", "invalid"); - time = KGlobal::locale()->readTime( "11:22:33", KLocale::WithoutSeconds, &ok ); + time = TDEGlobal::locale()->readTime( "11:22:33", KLocale::WithoutSeconds, &ok ); check("readTime(\"11:22:33\", WithoutSeconds)", (!ok && !time.isValid()) ? "invalid" : "valid", "invalid"); - time = KGlobal::locale()->readTime( "11:22", KLocale::WithoutSeconds, &ok ); + time = TDEGlobal::locale()->readTime( "11:22", KLocale::WithoutSeconds, &ok ); check("readTime(\"11:22\", WithoutSeconds)", (ok && time == TQTime(11, 22, 0)) ? "yes" : "no", "yes"); - KGlobal::locale()->setTimeFormat( "%H:%M %p" ); + TDEGlobal::locale()->setTimeFormat( "%H:%M %p" ); time = TQTime( 0, 22, 33 ); - TQString timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ ); + TQString timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ ); check("formatTime(\"0:22\", as time)", timeStr, "00:22 am" ); - timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ ); + timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ ); check("formatTime(\"0:22\", as duration)", timeStr, "00:22" ); kdDebug() << "setLanguage C\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("de")); + TDEGlobal::locale()->setLanguage(TQString::fromLatin1("de")); kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl; diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp index bec7c0dd2..f86cb2f20 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/kprocesstest.cpp @@ -1,5 +1,5 @@ // -// MAIN -- a little demo of the capabilities of the "KProcess" class +// MAIN -- a little demo of the capabilities of the "TDEProcess" class // // version 0.2, Aug 2nd 1997 // $Id$ @@ -32,12 +32,12 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n int main(int argc, char *argv[]) { - KProcess p1, p2, p3, p4; + TDEProcess p1, p2, p3, p4; Dummy dummy; TDEApplication app(argc, argv, "kprocesstest"); - printf("Welcome to the KProcess Demo Application!\n"); + printf("Welcome to the TDEProcess Demo Application!\n"); // // The kghostview demo -- Starts a kghostview instance blocking. -- After @@ -46,39 +46,39 @@ int main(int argc, char *argv[]) // p1 << "kghostview"; - TQObject::connect(&p1, TQT_SIGNAL(processExited(KProcess *)), &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); printf("starting kghostview blocking (close to continue)\n"); - p1.start(KProcess::Block); + p1.start(TDEProcess::Block); printf("restarting kghostview non blocking\n"); p1.start(); // // A konsole with tcsh to demonstrate how to pass command line options to a process - // with "KProcess" (is run blocking) + // with "TDEProcess" (is run blocking) // printf("Starting konsole with /bin/tcsh as shell (close to continue)\n"); p2 << "konsole" << "-e" << "/bin/tcsh"; p2.setWorkingDirectory("/tmp"); - TQObject::connect(&p2, TQT_SIGNAL(processExited(KProcess *)), &dummy, TQT_SLOT(printMessage(KProcess *))); - p2.start(KProcess::Block); + TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + p2.start(TDEProcess::Block); // // Getting the output from a process. "ls" with parameter "-l" is called and it output is captured // p3 << "ls" << "-l"; - TQObject::connect(&p3, TQT_SIGNAL(processExited(KProcess *)), - &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), + &dummy, TQT_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); + TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - p3.start(KProcess::NotifyOnExit, KProcess::AllOutput); + p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); // @@ -93,18 +93,18 @@ int main(int argc, char *argv[]) // p4 << "sort"; - TQObject::connect(&p4, TQT_SIGNAL(processExited(KProcess *)), - &dummy, TQT_SLOT(printMessage(KProcess *))); + TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), + &dummy, TQT_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int))); + TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(KProcess *)), - &dummy, TQT_SLOT(outputDone(KProcess *))); + TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)), + &dummy, TQT_SLOT(outputDone(TDEProcess *))); - p4.start(KProcess::NotifyOnExit, KProcess::All); + p4.start(TDEProcess::NotifyOnExit, TDEProcess::All); printf("after p4.start"); p4.writeStdin(txt, strlen(txt)); diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h index 23ac443dd..5817af438 100644 --- a/tdecore/tests/kprocesstest.h +++ b/tdecore/tests/kprocesstest.h @@ -1,5 +1,5 @@ // -// DUMMY -- A dummy class with a slot to demonstrate KProcess signals +// DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals // // version 0.2, Aug 2nd 1997 // @@ -20,20 +20,20 @@ class Dummy : public TQObject Q_OBJECT public slots: - void printMessage(KProcess *proc) + void printMessage(TDEProcess *proc) { printf("Process %d exited!\n", (int)proc->getPid()); } - void gotOutput(KProcess*, char *buffer, int len) + void gotOutput(TDEProcess*, char *buffer, int len) { - char result[1025]; // this is ugly since it relys on the internal buffer size of KProcess, + char result[1025]; // this is ugly since it relys on the internal buffer size of TDEProcess, memcpy(result, buffer, len); // NEVER do that in your own application... ;-) result[len] = '\0'; printf("OUTPUT>>%s", result); } - void outputDone(KProcess *proc) + void outputDone(TDEProcess *proc) /* Slot Procedure for the "sort" example. -- If it is indicated that the "sort" command has absorbed all its input, we send an "EOF" to it to indicate that there is no more diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp index c637e35b2..a4fbb19ad 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/kprociotest.cpp @@ -1,5 +1,5 @@ // -// MAIN -- a little demo of the capabilities of the "KProcess" class +// MAIN -- a little demo of the capabilities of the "TDEProcess" class // // version 0.2, Aug 2nd 1997 // $Id$ @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) p << "rev"; - p.connect(&p, TQT_SIGNAL(processExited(KProcess*)), &dummy, TQT_SLOT(printMessage(KProcess*))); + p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*))); p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*))); bool b; diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h index 9f948e644..fd60bb87b 100644 --- a/tdecore/tests/kprociotest.h +++ b/tdecore/tests/kprociotest.h @@ -1,5 +1,5 @@ // -// DUMMY -- A dummy class with a slot to demonstrate KProcess signals +// DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals // // version 0.2, Aug 2nd 1997 // @@ -20,7 +20,7 @@ class Dummy : public TQObject Q_OBJECT public slots: - void printMessage(KProcess *proc) + void printMessage(TDEProcess *proc) { printf("Process %d exited!\n", (int)proc->getPid()); } diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index 47d709a9b..f1284d394 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -817,9 +817,9 @@ int main(int argc, char *argv[]) check("path",ulong.path(),"/servlet/CookieAccepted"); #if TQT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); + qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) ); #else - TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); + TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) ); #endif TQString raw = "data:text/html,%00%2540%00"; check("data URL: encode-decode of %00", KURL(raw).url(), raw ); @@ -862,9 +862,9 @@ int main(int argc, char *argv[]) testAdjustPath(); #if TQT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); + qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "koi8-r" ) ); #else - TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); + TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "koi8-r" ) ); #endif baseURL = "file:/home/coolo"; KURL russian = baseURL.directory(false, true) + TQString::fromLocal8Bit( "ÆÇÎ7" ); diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 63cdc761f..bdd1e099a 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -483,7 +483,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) if( XGetClassHint( tqt_xdisplay(), win, &hint ) ) { TQString className = hint.res_class; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); @@ -500,7 +500,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) // If the icon is still a null pixmap, load the 'xapp' icon // as a last resort: if ( result.isNull() ) { - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index dfdc04698..1da7f28fb 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -69,7 +69,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MOD(x, y) ((x) < 0 ? ((y) - 1 - ((y) - 1 - (x)) % (y)) : (x) % (y)) /** - * \relates KGlobal + * \relates TDEGlobal * A typesafe function that returns x if it's between low and high values. * low if x is smaller than then low and high if x is bigger than high. */ diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index 9868dbfca..7d58c9f08 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -541,13 +541,13 @@ int main_console(int argc, char **argv) TDECmdLineArgs::init(&aboutd); TDEApplication app(false, false); - TQStringList rds = KGlobal::dirs()->resourceDirs("icon"); + TQStringList rds = TDEGlobal::dirs()->resourceDirs("icon"); for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) { printf(" * %s\n\r", (*it).ascii()); fflush(stdout); } - TQString systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); + TQString systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); if (systemIcon.isNull()) { - systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); + systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n\r"); section = ICON_SECTION; clear_resource(handle, section); diff --git a/tdeprint/ChangeLog b/tdeprint/ChangeLog index 5ce11bd36..cc18bd7eb 100644 --- a/tdeprint/ChangeLog +++ b/tdeprint/ChangeLog @@ -108,7 +108,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be> * tdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces - in file names + system --> KProcess. + in file names + system --> TDEProcess. 07/11/2001 Michael Goffioul <tdeprint@swing.be> * tdeprint: fixed some problems: diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index f0cb1c359..f0057235e 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -47,9 +47,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); @@ -145,7 +145,7 @@ void CupsAddSmb::slotActionClicked() m_proc.kill(); } -void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) +void CupsAddSmb::slotReceived(TDEProcess*, char *buf, int buflen) { TQString line; int index(0); @@ -309,7 +309,7 @@ void CupsAddSmb::doNextAction() } } -void CupsAddSmb::slotProcessExited(KProcess*) +void CupsAddSmb::slotProcessExited(TDEProcess*) { kdDebug(500) << "PROCESS EXITED (" << m_state << ")" << endl; if (m_proc.normalExit() && m_state != Start && m_status) @@ -470,7 +470,7 @@ bool CupsAddSmb::startProcess() m_actionindex = 0; m_buffer.clear(); kdDebug(500) << "PROCESS STARTED = " << m_proc.args()[0] << endl; - return m_proc.start(KProcess::NotifyOnExit, KProcess::All); + return m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); } #include "cupsaddsmb2.moc" diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 84166f53c..9aeccdd4a 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -44,9 +44,9 @@ public: static bool exportDest(const TQString& dest, const TQString& datadir); protected slots: - void slotReceived(KProcess*, char*, int); + void slotReceived(TDEProcess*, char*, int); void doNextAction(); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void slotActionClicked(); protected: @@ -58,7 +58,7 @@ protected: void showError(const TQString& msg); private: - KProcess m_proc; + TDEProcess m_proc; TQStringList m_buffer; int m_state; TQStringList m_actions; diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index bc91f9ffe..5e6d4659d 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -113,8 +113,8 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("cupsdconf"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); setRootIsDecorated(false); @@ -136,7 +136,7 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), KIcon::NoGroup, KIcon::SizeMedium @@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg) else { bool success = false; - KProcess proc; + TDEProcess proc; proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; - success = proc.start( KProcess::Block ) && proc.normalExit(); + success = proc.start( TDEProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); } @@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString } else { - KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" + TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index 0fde06159..4edaefb58 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -208,8 +208,8 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; - TQCString langstr = KGlobal::locale()->language().latin1(); + //kdDebug(500) << "tdeprint: IPP request, lang=" << TDEGlobal::locale()->language() << endl; + TQCString langstr = TDEGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) lang->encoding = CUPS_UTF8; diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2de105b..5c2245e8d 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -155,5 +155,5 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd } } if (!optstr.isEmpty()) - cmd.append(" -o ").append( KProcess::quote( optstr ) ); + cmd.append(" -o ").append( TDEProcess::quote( optstr ) ); } diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index 66acb8daf..e5630652e 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -638,11 +638,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t cups -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index 6a4de31eb..19e8401d8 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -77,9 +77,9 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) } QString cmd = "foomatic-combo-xml -p "; - cmd += KProcess::quote(printer->option("printer")); + cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; - cmd += KProcess::quote(printer->option("driver")); + cmd += TDEProcess::quote(printer->option("driver")); KPipeProcess proc(cmd); QDomDocument doc; doc.setContent(&proc); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 8daa2fe20..661d97764 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..84e120e77 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters() if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); - if (confname.startsWith(KGlobal::dirs()->localtdedir())) + if (confname.startsWith(TDEGlobal::dirs()->localtdedir())) { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " @@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters() if (m_loaded) return true; bool result(true); - TQString localDir = KGlobal::dirs()->localtdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); + TQString localDir = TDEGlobal::dirs()->localtdedir(); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index b64ce075e..ea1ec61e3 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -440,7 +440,7 @@ void KPGeneralPage::initialize() for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 ) m_pagesize->insertItem(i18n(default_size[i])); // set default page size using locale settings - TQString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); + TQString psname = pageSizeToPageName((KPrinter::PageSize)(TDEGlobal::locale()->pageSize())); int index = findOption(default_size, DEFAULT_SIZE, psname); if (index >= 0) m_pagesize->setCurrentItem(index); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 554679ee7..ab70211c8 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -62,7 +62,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) // first retrieve the Qt values for page size and margins TQPrinter prt(TQPrinter::PrinterResolution); prt.setFullPage(true); - prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt())); + prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? TDEGlobal::locale()->pageSize() : ps.toInt())); TQPaintDeviceMetrics metrics(&prt); float w = metrics.width(); float h = metrics.height(); diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 3a0982661..11b5a6574 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -203,7 +203,7 @@ void KPQtPage::init() for (int i=0; i<KPrinter::NPageSize-1; i++) m_pagesize->insertItem(i18n(page_sizes[i].text)); // default page size to locale settings - m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); + m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(TDEGlobal::locale()->pageSize()))); } else { diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 1e0e141a9..5e77f890a 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone))); } @@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) KPrintDialog::~KPrintDialog() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); config->writeEntry("DialogReduced", d->m_reduced); diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..e62bf635b 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig(); + KConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command @@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M) // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const -{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } +{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } KPrinter::PageSetType KPrinter::pageSet() const { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); } diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 171daf45d..9c62d25f8 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) } else { - KProcess proc; + TDEProcess proc; proc << (flag?"mv":"cp") << f[0] << p->outputFileName(); - if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) + if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) { p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName())); return false; @@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin } TQString KPrinterImpl::quote(const TQString& s) -{ return KProcess::quote(s); } +{ return TDEProcess::quote(s); } void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) { @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; i<opts.count(); i+=2) @@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions() if (it.key().startsWith("app-")) optlist << it.key() << it.data(); - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 32381af28..bd812b939 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -42,10 +42,10 @@ #include <kmimetype.h> KPreviewProc::KPreviewProc() -: KProcess() +: TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -63,7 +63,7 @@ bool KPreviewProc::startPreview() return false; } -void KPreviewProc::slotProcessExited(KProcess* proc) +void KPreviewProc::slotProcessExited(TDEProcess* proc) { kapp->exit_loop(); if ( proc->normalExit() && proc->exitStatus() == 0 ) diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index 5fd581fe7..ae99fb405 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -47,7 +47,7 @@ private: KPrintPreviewPrivate *d; }; -class KPreviewProc : public KProcess +class KPreviewProc : public TDEProcess { Q_OBJECT public: @@ -57,7 +57,7 @@ public: bool startPreview(); protected slots: - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: bool m_bOk; }; diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index fb1df2840..fbee05a0c 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotExited( KProcess* ) ) ); + connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } @@ -53,7 +53,7 @@ bool KPrintProcess::print() return start(NotifyOnExit,All); } -void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) +void KPrintProcess::slotReceivedStderr(TDEProcess *proc, char *buf, int len) { if (proc == this) { @@ -62,7 +62,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) } } -void KPrintProcess::slotExited( KProcess* ) +void KPrintProcess::slotExited( TDEProcess* ) { switch ( m_state ) { diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 976b35afe..5ceb3835e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -50,8 +50,8 @@ signals: void printError( KPrintProcess*, const TQString& ); protected slots: - void slotReceivedStderr(KProcess*, char*, int); - void slotExited( KProcess* ); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotExited( TDEProcess* ); private: QString m_buffer; diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 212b53fb5..f2dcb99ce 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.replace( re, TDEProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index fcb79a052..a38aa4e26 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -185,9 +185,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) // 4) change permissions of spool directory TQCString cmd = "chmod -R o-rwx,g+rwX "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); cmd += "&& chown -R lp.lp "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); if (system(cmd.data()) != 0) { setErrorMsg(i18n("Unable to set correct permissions on spool directory %1 for printer <b>%2</b>.").arg(ent->arg("sd")).arg(ent->m_name)); @@ -209,7 +209,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) return false; } TQCString cmd = "rm -rf "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); system(cmd.data()); delete ent; return true; @@ -225,7 +225,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) cmd += " "; cmd += state ? "up" : "down"; cmd += " "; - cmd += KProcess::quote(printer->printerName()); + cmd += TDEProcess::quote(printer->printerName()); if (proc.open(cmd)) { QTextStream t(&proc); @@ -549,9 +549,9 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; // write various driver files using templates TQCString cmd = "cp "; - cmd += TQFile::encodeName(KProcess::quote(driverDirectory()+"/master-filter")); + cmd += TQFile::encodeName(TDEProcess::quote(driverDirectory()+"/master-filter")); cmd += " "; - cmd += TQFile::encodeName(KProcess::quote(spooldir + "/filter")); + cmd += TQFile::encodeName(TDEProcess::quote(spooldir + "/filter")); if (system(cmd.data()) == 0 && savePrinttoolCfgFile(driverDirectory()+"/general.cfg.in",spooldir,options) && savePrinttoolCfgFile(driverDirectory()+"/postscript.cfg.in",spooldir,options) && diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h index bbbda4104..c4a1ac671 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.h +++ b/tdeprint/lpdunix/klpdunixprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KLpdUnixPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 54f987c58..7ea114382 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); + TQStringList l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) { // printcap file saved, entry can be deleted now delete entry; - status = (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0); + status = (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0); if (!status) setErrorMsg(i18n("Unable to remove spool directory %1. " "Check that you have write permissions " diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 05d09c40a..2723eb842 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer)); + TQString result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer)); int status; switch (LprSettings::self()->mode()) @@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm"); return false; } - TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); if (result.find("dequeued") != -1) return true; else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) @@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString answer = lprngAnswer(result, job->printer()); if (answer == "no") { diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 30348f591..52a8d06c5 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit) { KPipeProcess proc; - if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname))) + if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname))) { TQTextStream t(&proc); TQString line; diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 49c33822d..4cabeae98 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool) // changing printer name), the template would be also removed TQString origfilename = maticFile(entry); TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename))); + ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename))); DrMain *driver = Foomatic2Loader::loadDriver(filename); if (driver) { @@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t lpd -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); @@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai inFile.close(); tmpFile.close(); - TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile); + TQString cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile); int status = ::system(TQFile::encodeName(cmd).data()); TQFile::remove(tmpFile.name()); result = (status != -1 && WEXITSTATUS(status) == 0); diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 2bfebcfa4..b60be8510 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -19,7 +19,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index d26b2082d..cd823d540 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -60,7 +60,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 0e72906d7..9c315402f 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -95,7 +95,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena msg = i18n("The executable %1 could not be found in your " "PATH. Check that this program exists and is " "accessible in your PATH variable.").arg(exestr); - else if (!m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + else if (!m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) msg = i18n("Unable to start the creation of the driver " "database. The execution of %1 failed.").arg(exestr); if (!msg.isEmpty()) @@ -124,7 +124,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena return started; } -void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) +void KMDBCreator::slotReceivedStdout(TDEProcess*, char *buf, int len) { // save buffer TQString str( TQCString(buf, len) ); @@ -151,12 +151,12 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) } } -void KMDBCreator::slotReceivedStderr(KProcess*, char*, int) +void KMDBCreator::slotReceivedStderr(TDEProcess*, char*, int) { // just discard it for the moment } -void KMDBCreator::slotProcessExited(KProcess*) +void KMDBCreator::slotProcessExited(TDEProcess*) { // delete the progress dialog if (m_dlg) diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 319d270c0..4b1983ae6 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -40,16 +40,16 @@ public: bool status() const { return m_status; } protected slots: - void slotReceivedStdout(KProcess *p, char *bufm, int len); - void slotReceivedStderr(KProcess *p, char *bufm, int len); - void slotProcessExited(KProcess *p); + void slotReceivedStdout(TDEProcess *p, char *bufm, int len); + void slotReceivedStderr(TDEProcess *p, char *bufm, int len); + void slotProcessExited(TDEProcess *p); void slotCancelled(); signals: void dbCreated(); private: - KProcess m_proc; + TDEProcess m_proc; TQProgressDialog *m_dlg; bool m_status; bool m_firstflag; diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index c2bc28b20..22b9ac8e9 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -233,7 +233,7 @@ void KMMainView::initActions() KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -698,9 +698,9 @@ void KMMainView::slotServerConfigure() void KMMainView::slotServerConfigureAccess() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/system-config-printer-kde"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } void KMMainView::slotToggleToolBar(bool on) diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index e0526ad5a..5586f110f 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -57,7 +57,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) ctn->setWidget(w); connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index fde3a3451..c5b40f942 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -49,11 +49,11 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_state = Idle; m_current = 0; - m_proc = new KProcess(); + m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } @@ -91,7 +91,7 @@ void SmbView::startProcess(int state) m_buffer = TQString::null; m_state = state; TQApplication::setOverrideCursor(KCursor::waitCursor()); - m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout); + m_proc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout); emit running(true); } @@ -118,12 +118,12 @@ void SmbView::endProcess() m_proc->clearArguments(); } -void SmbView::slotProcessExited(KProcess*) +void SmbView::slotProcessExited(TDEProcess*) { endProcess(); } -void SmbView::slotReceivedStdout(KProcess*, char *buf, int len) +void SmbView::slotReceivedStdout(TDEProcess*, char *buf, int len) { m_buffer.append(TQString::fromLocal8Bit(buf,len)); } @@ -178,7 +178,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { // opening group m_current = item; *m_proc << "nmblookup"+m_wins_server+"-M "; - *m_proc << KProcess::quote(item->text(0)); + *m_proc << TDEProcess::quote(item->text(0)); *m_proc << " -S"; startProcess(ServerListing); } @@ -194,14 +194,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { *m_proc << "smbclient -N -L "; } - *m_proc << KProcess::quote (item->text (0)); + *m_proc << TDEProcess::quote (item->text (0)); *m_proc << " -W "; - *m_proc << KProcess::quote (item->parent ()-> + *m_proc << TDEProcess::quote (item->parent ()-> text (0)); if (!krb5ccname) { *m_proc << " -A "; - *m_proc << KProcess:: + *m_proc << TDEProcess:: quote (m_passwdFile->name ()); } startProcess(ShareListing); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index aea1d920d..9b571f4dd 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -22,7 +22,7 @@ #include <klistview.h> -class KProcess; +class TDEProcess; class KTempFile; class SmbView : public KListView @@ -49,15 +49,15 @@ protected: void processShares(); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotSelectionChanged(TQListViewItem*); private: enum State { GroupListing, ServerListing, ShareListing, Idle }; int m_state; TQListViewItem *m_current; - KProcess *m_proc; + TDEProcess *m_proc; TQString m_buffer; TQString m_login, m_password; KTempFile *m_passwdFile; diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index 141cadc56..3a809e06b 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -206,7 +206,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU if ( allowMetricUnit ) { - int mode = (KGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); + int mode = (TDEGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); m_top->setMode(mode); m_bottom->setMode(mode); m_left->setMode(mode); diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 241c53dbf..b76c0181a 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -53,9 +53,9 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { - m_process = new KProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotProcessExited( KProcess* ) ) ); + m_process = new TDEProcess; + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -93,7 +93,7 @@ void PosterPreview::updatePoster() m_process->clearArguments(); *m_process << "poster" << "-F" << "-m" + m_mediasize << "-p" + m_postersize << "-c" + TQString::number( m_cutmargin ) + "%"; - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { m_rows = m_cols = 0; m_dirty = false; @@ -140,11 +140,11 @@ void PosterPreview::drawContents( TQPainter *painter ) for ( int j=0; j<m_cols; j++, x+=m_pw ) { bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() ); - p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); + p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ), - ( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); + ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); p->setPen( Qt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->setPen( Qt::SolidLine ); @@ -206,12 +206,12 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) } } -void PosterPreview::slotProcessStderr( KProcess*, char *buf, int len ) +void PosterPreview::slotProcessStderr( TDEProcess*, char *buf, int len ) { m_buffer.append( TQCString( buf, len ) ); } -void PosterPreview::slotProcessExited( KProcess* ) +void PosterPreview::slotProcessExited( TDEProcess* ) { if ( m_process->normalExit() && m_process->exitStatus() == 0 ) parseBuffer(); diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d0c362a04..d9a23cb59 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqvaluelist.h> -class KProcess; +class TDEProcess; class PosterPreview : public TQFrame { @@ -55,15 +55,15 @@ protected: void emitSelectedPages(); protected slots: - void slotProcessStderr( KProcess*, char*, int ); - void slotProcessExited( KProcess* ); + void slotProcessStderr( TDEProcess*, char*, int ); + void slotProcessExited( TDEProcess* ); private: int m_rows, m_cols; int m_pw, m_ph; // page size int m_mw, m_mh; // cur margins TQRect m_posterbb; // poster bounding box (without any margin) - KProcess *m_process; + TDEProcess *m_process; TQString m_buffer; TQString m_postersize, m_mediasize; int m_cutmargin; diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index e0161a50a..7e46139ef 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -44,7 +44,7 @@ void PrinterFilter::update() m_printers = conf->readListEntry("Printers"); // filter enable state is saved on a per application basis, // so this option is retrieve from the application config file - conf = KGlobal::config(); + conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); m_enabled = conf->readBoolEntry("FilterEnabled", false); } @@ -52,7 +52,7 @@ void PrinterFilter::update() void PrinterFilter::setEnabled(bool on) { m_enabled = on; - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("FilterEnabled", m_enabled); } diff --git a/tdeprint/rlpr/krlprprinterimpl.h b/tdeprint/rlpr/krlprprinterimpl.h index 7af98df0c..741a1a3c8 100644 --- a/tdeprint/rlpr/krlprprinterimpl.h +++ b/tdeprint/rlpr/krlprprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KRlprPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 86c8375cb..7777e19ce 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla if ( !url.isLocalFile() ) { TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); - command.replace( re, KProcess::quote( tmpFilename ) ); + command.replace( re, TDEProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re, KProcess::quote( re.cap( 1 ) ) ); + command.replace( re, TDEProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("tdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + TDEProcess::quote(cmd)); break; } else diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 51cd09877..4ef54b894 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -28,7 +28,7 @@ #include <tqintdict.h> class KPrintProcess; -class KProcess; +class TDEProcess; class StatusWindow; class KDEPrintd : public KDEDModule diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index e4bc1e6f2..d9a1e2a72 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("exec")); @@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg) m_hasoutput = ( arg == "-i" || arg == "-d" ); for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it ) kdDebug() << "ARG: " << *it << endl; - if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) setEnabled(false); else { @@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg) } } -void EscpWidget::slotProcessExited(KProcess*) +void EscpWidget::slotProcessExited(TDEProcess*) { setEnabled(true); if (!m_proc.normalExit() || m_proc.exitStatus() != 0) @@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*) m_hasoutput = false; } -void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_outbuffer.append(bufstr); } -void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_errorbuffer.append(bufstr); diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 7e3ba55e8..4ad284d00 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -37,16 +37,16 @@ public: void setPrinterName(const TQString&); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotReceivedStderr(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotButtonClicked(); protected: void startCommand(const TQString& arg); private: - KProcess m_proc; + TDEProcess m_proc; KURL m_deviceURL; TQString m_errorbuffer, m_outbuffer; TQLabel *m_printer, *m_device; diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp index 99b34ec4e..f5a2d547c 100644 --- a/tdesu/kcookie.cpp +++ b/tdesu/kcookie.cpp @@ -100,7 +100,7 @@ void KCookie::getXCookie() if (!memcmp(disp.data(), "localhost:", 10)) disp.remove(0, 9); - TQString cmd = "xauth list "+KProcess::quote(disp); + TQString cmd = "xauth list "+TDEProcess::quote(disp); blockSigChild(); // pclose uses waitpid() if (!(f = popen(TQFile::encodeName(cmd), "r"))) { @@ -163,7 +163,7 @@ void KCookie::getICECookie() if (strncmp((*it).data(), m_dcopTransport.data(), m_dcopTransport.length()) != 0) continue; m_DCOPSrv = *it; - TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(KProcess::quote(m_DCOPSrv)); + TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(TDEProcess::quote(m_DCOPSrv)); blockSigChild(); if (!(f = popen(cmd, "r"))) { diff --git a/tdesu/process.cpp b/tdesu/process.cpp index 692c01553..f1b353396 100644 --- a/tdesu/process.cpp +++ b/tdesu/process.cpp @@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms) */ bool PtyProcess::checkPid(pid_t pid) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); //sudo does not accept signals from user so we except it diff --git a/tdesu/su.cpp b/tdesu/su.cpp index c4e75772e..5f8d24832 100644 --- a/tdesu/su.cpp +++ b/tdesu/su.cpp @@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command) m_User = user; m_Command = command; - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); if ( superUserCommand != "sudo" && superUserCommand != "su" ) { @@ -128,8 +128,8 @@ int SuProcess::exec(const char *password, int check) if (::access(command, X_OK) != 0) { - /// command = TQFile::encodeName(KGlobal::dirs()->findExe("su")); - command = TQFile::encodeName( KGlobal::dirs()->findExe(superUserCommand.ascii()) ); + /// command = TQFile::encodeName(TDEGlobal::dirs()->findExe("su")); + command = TQFile::encodeName( TDEGlobal::dirs()->findExe(superUserCommand.ascii()) ); if (command.isEmpty()) return check ? SuNotFound : -1; } diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp index 4be70c48c..1b7808fd0 100644 --- a/tdeui/kaboutapplication.cpp +++ b/tdeui/kaboutapplication.cpp @@ -40,7 +40,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name, Close, Close, parent, name, modal ) { - buildDialog(KGlobal::instance()->aboutData()); + buildDialog(TDEGlobal::instance()->aboutData()); } KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent, diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp index 3ed785891..5e6edaeae 100644 --- a/tdeui/kaboutdialog.cpp +++ b/tdeui/kaboutdialog.cpp @@ -436,7 +436,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) { if( mTitleLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); int fs = f.pointSize(); if (fs == -1) @@ -447,7 +447,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) if( mVersionLabel ) { - TQFont f( KGlobalSettings::generalFont() ); + TQFont f( TDEGlobalSettings::generalFont() ); f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); @@ -502,7 +502,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title, TQVBoxLayout* const vbox = new TQVBoxLayout( page, KDialog::spacingHint() ); KTextEdit* const textEdit = new KTextEdit( page, "license" ); - textEdit->setFont( KGlobalSettings::fixedFont() ); + textEdit->setFont( TDEGlobalSettings::fixedFont() ); textEdit->setReadOnly( true ); textEdit->setWordWrap( TQTextEdit::NoWrap ); textEdit->setText( text ); diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp index 89e397450..6fad7d34b 100644 --- a/tdeui/kaction.cpp +++ b/tdeui/kaction.cpp @@ -662,7 +662,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet TQT_SLOT( slotPopupActivated() ), keyQt, -1, index ); @@ -702,7 +702,7 @@ int KAction::plug( TQWidget *w, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index e83a9f05d..4be388afe 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -1101,7 +1101,7 @@ void KRecentFilesAction::addURL( const KURL& url ) void KRecentFilesAction::addURL( const KURL& url, const TQString& name ) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; const TQString file = url.pathOrURL(); TQStringList lst = KSelectAction::items(); @@ -1282,7 +1282,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ), isEnabled(), plainText(), @@ -1832,7 +1832,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), @@ -1958,7 +1958,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), @@ -2294,7 +2294,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) if ( m_parentCollection ) instance = m_parentCollection->instance(); else - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotActivated() ), isEnabled(), plainText(), diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 9cc76902b..9654d0ffd 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -462,7 +462,7 @@ void KActionCollection::setInstance( TDEInstance *instance ) if ( instance ) d->m_instance = instance; else - d->m_instance = KGlobal::instance(); + d->m_instance = TDEGlobal::instance(); } TDEInstance *KActionCollection::instance() const diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index 899ba7bd3..7a5928ab3 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -185,9 +185,9 @@ void KAnimWidget::updateIcons() if (parent()->inherits( "KToolBar" )) d->size = ((KToolBar*)parent())->iconSize(); if (!d->size) - d->size = KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + d->size = TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - TQString path = KGlobal::iconLoader()->iconPath(d->icon_name, -d->size); + TQString path = TDEGlobal::iconLoader()->iconPath(d->icon_name, -d->size); TQImage img(path); if (img.isNull()) diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 37f84a802..3e63af8f9 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -79,11 +79,11 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d = new KBugReportPrivate; // Use supplied aboutdata, otherwise the one from the active instance - // otherwise the KGlobal one. _activeInstance should neved be 0L in theory. + // otherwise the TDEGlobal one. _activeInstance should neved be 0L in theory. m_aboutData = aboutData ? aboutData - : ( KGlobal::_activeInstance ? KGlobal::_activeInstance->aboutData() - : KGlobal::instance()->aboutData() ); + : ( TDEGlobal::_activeInstance ? TDEGlobal::_activeInstance->aboutData() + : TDEGlobal::instance()->aboutData() ); m_process = 0; TQWidget * parent = plainPage(); d->submitBugButton = 0; @@ -318,9 +318,9 @@ void KBugReport::appChanged(int i) void KBugReport::slotConfigureEmail() { if (m_process) return; - m_process = new KProcess; + m_process = new TDEProcess; *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -460,9 +460,9 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::fromLatin1("i18n") && TDEGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + TQString package = TQString::fromLatin1("i18n_%1").arg(TDEGlobal::locale()->language()); package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); return TQString::fromLatin1("Package: %1").arg(package) + TQString::fromLatin1("\n" @@ -498,11 +498,11 @@ bool KBugReport::sendBugReport() TQString subject = m_subject->text(); command += " --subject "; - command += KProcess::quote(subject); + command += TDEProcess::quote(subject); command += " --recipient "; - command += KProcess::quote(recipient); + command += TDEProcess::quote(recipient); command += " > "; - command += KProcess::quote(outputfile.name()); + command += TDEProcess::quote(outputfile.name()); fflush(stdin); fflush(stderr); diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index 2c60b091b..b8ddd39f7 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -24,7 +24,7 @@ class TQMultiLineEdit; class TQLineEdit; class TQHButtonGroup; -class KProcess; +class TDEProcess; class TDEAboutData; class KBugReportPrivate; @@ -100,7 +100,7 @@ protected: */ bool sendBugReport(); - KProcess * m_process; + TDEProcess * m_process; const TDEAboutData * m_aboutData; TQMultiLineEdit * m_lineedit; diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 640b9c7ac..0745bccd9 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -35,7 +35,7 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; + KConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp index a047fe6b8..bba0e5247 100644 --- a/tdeui/kcmodule.cpp +++ b/tdeui/kcmodule.cpp @@ -65,10 +65,10 @@ KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &) init(); if (name && strlen(name)) { d->_instance = new TDEInstance(name); - KGlobal::locale()->insertCatalogue(name); + TDEGlobal::locale()->insertCatalogue(name); } else d->_instance = new TDEInstance("kcmunnamed"); - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); d->managers.setAutoDelete( true ); @@ -82,11 +82,11 @@ KCModule::KCModule(TDEInstance *instance, TQWidget *parent, const TQStringList & if (instance) { - KGlobal::locale()->insertCatalogue(instance->instanceName()); + TDEGlobal::locale()->insertCatalogue(instance->instanceName()); } d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); + TDEGlobal::setActiveInstance(this->instance()); } void KCModule::init() diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index ceded0f58..b28002ebc 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -175,7 +175,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { if( (e->state() & Qt::LeftButton) && - (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) + (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { // Drag color object KColorDrag *dg = new KColorDrag( color(), this); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index ec3930fa3..7db3807a7 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -429,7 +429,7 @@ void KColorCells::mouseMoveEvent( TQMouseEvent *e ) if( !(e->state() & Qt::LeftButton)) return; if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(e->x() > mPos.x()+delay || e->x() < mPos.x()-delay || e->y() > mPos.y()+delay || e->y() < mPos.y()-delay){ // Drag color object @@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void ) return; // Strings already present } - KGlobal::locale()->insertCatalogue("tdelibs_colors"); + TDEGlobal::locale()->insertCatalogue("tdelibs_colors"); // // Code somewhat inspired by KPalette. @@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked() void KColorDialog::readSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = group.readEntry("CurrentPalette"); d->table->setPalette(palette); @@ -1263,7 +1263,7 @@ KColorDialog::readSettings() void KColorDialog::slotWriteSettings() { - KConfigGroup group( KGlobal::config(), "Colors" ); + KConfigGroup group( TDEGlobal::config(), "Colors" ); TQString palette = d->table->palette(); if (!group.hasDefault("CurrentPalette") && diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 198a1e200..5d3914327 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -111,13 +111,13 @@ void KComboBox::setAutoCompletion( bool autocomplete ) { if ( autocomplete ) { - d->klineEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); - setCompletionMode( KGlobalSettings::CompletionAuto ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); } else { - d->klineEdit->setCompletionMode( KGlobalSettings::completionMode() ); - setCompletionMode( KGlobalSettings::completionMode() ); + d->klineEdit->setCompletionMode( TDEGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); } } } @@ -290,8 +290,8 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion))); + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index de3b07aab..41963a56b 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -251,7 +251,7 @@ public: * @return @p true when completion mode is automatic. */ bool autoCompletion() const { - return completionMode() == KGlobalSettings::CompletionAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto; } /** @@ -331,7 +331,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup and KGlobalSettings::CompletionPopupAuto. + * TDEGlobalSettings::CompletionPopup and TDEGlobalSettings::CompletionPopupAuto. * This method will create a completion-box by calling * KLineEdit::completionBox, if none is there, yet. * @@ -373,7 +373,7 @@ signals: * The argument is the current text being edited. * * Note that this signal is @em not available when the widget is non-editable - * or the completion mode is set to @p KGlobalSettings::CompletionNone. + * or the completion mode is set to @p TDEGlobalSettings::CompletionNone. */ void completion( const TQString& ); @@ -399,7 +399,7 @@ signals: * Emitted whenever the completion mode is changed by the user * through the context menu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp index 56d52b88a..efcda9ebe 100644 --- a/tdeui/kcompletionbox.cpp +++ b/tdeui/kcompletionbox.cpp @@ -275,7 +275,7 @@ void KCompletionBox::sizeAndPosition() int x = currentPos.x(), y = currentPos.y(); if ( d->m_parent ) { if ( !isVisible() ) { - TQRect screenSize = KGlobalSettings::desktopGeometry(d->m_parent); + TQRect screenSize = TDEGlobalSettings::desktopGeometry(d->m_parent); TQPoint orig = d->m_parent->mapToGlobal( TQPoint(0, d->m_parent->height()) ); x = orig.x() + geom.x(); diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h index 8016ceab2..5f2f5b660 100644 --- a/tdeui/kcompletionbox.h +++ b/tdeui/kcompletionbox.h @@ -36,7 +36,7 @@ class TQEvent; * It is filled with all possible matches for a completion, so the user * can select the one he wants. * - * It is used when KGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. + * It is used when TDEGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto. * * @author Carsten Pfeiffer <pfeiffer@kde.org> */ diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 1458f88dc..d09b4e9ee 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -46,7 +46,7 @@ TQCursor KCursor::handCursor() if (!hand_cursor) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "General" ); #ifndef Q_WS_WIN // this mask doesn't work too well on win32 @@ -369,7 +369,7 @@ KCursorPrivate::KCursorPrivate() { hideCursorDelay = 5000; // 5s default value - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); enabled = kc->readBoolEntry( TQString::fromLatin1("Autohiding cursor enabled"), true ); diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index ded20474a..1ba83bad1 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -65,7 +65,7 @@ public: void KDatePicker::fillWeeksCombo(const TQDate &date) { // every year can have a different number of weeks - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); // it could be that we had 53,1..52 and now 1..53 which is the same number but different // so always fill with new values @@ -150,9 +150,9 @@ void KDatePicker::init( const TQDate &dt ) line = new KLineEdit(this); val = new KDateValidator(this); table = new KDateTable(this); - fontsize = KGlobalSettings::generalFont().pointSize(); + fontsize = TDEGlobalSettings::generalFont().pointSize(); if (fontsize == -1) - fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize(); + fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize(); fontsize++; // Make a little bigger @@ -247,9 +247,9 @@ KDatePicker::dateChangedSlot(TQDate date) { kdDebug(298) << "KDatePicker::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); - line->setText(KGlobal::locale()->formatDate(date, true)); + line->setText(TDEGlobal::locale()->formatDate(date, true)); selectMonth->setText(calendar->monthName(date, false)); fillWeeksCombo(date); @@ -301,7 +301,7 @@ void KDatePicker::monthForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 ); setDate( temp ); } @@ -310,7 +310,7 @@ void KDatePicker::monthBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 ); setDate( temp ); } @@ -319,7 +319,7 @@ void KDatePicker::yearForwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 ); setDate( temp ); } @@ -328,7 +328,7 @@ void KDatePicker::yearBackwardClicked() { TQDate temp; - temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); + temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 ); setDate( temp ); } @@ -338,7 +338,7 @@ void KDatePicker::selectWeekClicked() {} // ### in 3.2 obsolete; kept for binar void KDatePicker::weekSelected(int week) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int year = calendar->year(date); @@ -355,7 +355,7 @@ void KDatePicker::selectMonthClicked() { // every year can have different month names (in some calendar systems) - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date = table->getDate(); int i, month, months = calendar->monthsInYear(date); @@ -379,7 +379,7 @@ KDatePicker::selectMonthClicked() void KDatePicker::selectYearClicked() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); if (selectYear->state() == TQButton::Off) { @@ -499,8 +499,8 @@ KDatePicker::setFontSize(int s) for (int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(table->getDate()), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(table->getDate()), false); if (str.isNull()) break; r=metrics.boundingRect(str); maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 9387a6322..632c7deea 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -99,7 +99,7 @@ KDateValidator::validate(TQString& text, int&) const TQValidator::State KDateValidator::date(const TQString& text, TQDate& d) const { - TQDate tmp = KGlobal::locale()->readDate(text); + TQDate tmp = TDEGlobal::locale()->readDate(text); if (!tmp.isNull()) { d = tmp; @@ -129,7 +129,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); @@ -145,7 +145,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); - viewport()->setEraseColor(KGlobalSettings::baseColor()); + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth initAccels(); } @@ -169,8 +169,8 @@ void KDateTable::initAccels() int KDateTable::posFromDate( const TQDate &dt ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - const int firstWeekDay = KGlobal::locale()->weekStartDay(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); + const int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int pos = calendar->day( dt ); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. @@ -182,10 +182,10 @@ int KDateTable::posFromDate( const TQDate &dt ) TQDate KDateTable::dateFromPos( int pos ) { TQDate pCellDate; - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(pCellDate, calendar->year(date), calendar->month(date), 1); - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int offset = (firstday - firstWeekDay + 7) % 7; // make sure at least one day of the previous month is visible. // adjust this <1 if more days should be forced visible: @@ -211,14 +211,14 @@ KDateTable::paintEmptyArea(TQPainter *paint, int, int, int, int) void KDateTable::paintCell(TQPainter *painter, int row, int col) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQRect rect; TQString text; TQPen pen; int w=cellWidth(); int h=cellHeight(); - TQFont font=KGlobalSettings::generalFont(); + TQFont font=TDEGlobalSettings::generalFont(); // ----- if(row == 0) @@ -226,7 +226,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) font.setBold(true); painter->setFont(font); bool normalday = true; - int firstWeekDay = KGlobal::locale()->weekStartDay(); + int firstWeekDay = TDEGlobal::locale()->weekStartDay(); int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay : col+firstWeekDay-7; if ( daynum == calendar->weekDayOfPray() || @@ -234,8 +234,8 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) normalday=false; TQBrush brushInvertTitle(colorGroup().base()); - TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); - TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); + TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) ); + TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) ); if (!normalday) { painter->setPen(textColor); @@ -298,7 +298,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } pen=painter->pen(); - int firstWeekDay=KGlobal::locale()->weekStartDay(); + int firstWeekDay=TDEGlobal::locale()->weekStartDay(); int offset=firstday-firstWeekDay; if(offset<1) offset+=7; @@ -339,13 +339,13 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) void KDateTable::nextMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, 1 )); } void KDateTable::previousMonth() { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); setDate(calendar->addMonths( date, -1 )); } @@ -433,7 +433,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(0); for(count=0; count<7; ++count) { - rect=metrics.boundingRect(KGlobal::locale()->calendar() + rect=metrics.boundingRect(TDEGlobal::locale()->calendar() ->weekDayName(count+1, true)); maxCell.setWidth(QMAX(maxCell.width(), rect.width())); maxCell.setHeight(QMAX(maxCell.height(), rect.height())); @@ -500,7 +500,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e) if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) { KPopupMenu *menu = new KPopupMenu(); - menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) ); + menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) ); emit aboutToShowContextMenu( menu, clickedDate ); menu->popup(e->globalPos()); } @@ -524,7 +524,7 @@ KDateTable::setDate(const TQDate& date_) emit(dateChanged(date)); changed=true; } - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); calendar->setYMD(temp, calendar->year(date), calendar->month(date), 1); //temp.setYMD(date.year(), date.month(), 1); @@ -614,7 +614,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); @@ -686,7 +686,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker // ----- activeCol = -1; activeRow = -1; - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); @@ -694,17 +694,17 @@ KDateInternalMonthPicker::KDateInternalMonthPicker setNumCols(3); d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day()); // For monthsInYear != 12 - setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); + setNumRows( (TDEGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3); // enable to find drawing failures: // setTableFlags(Tbl_clipCellPainting); - viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker + viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker // ----- find the preferred size // (this is slow, possibly, but unfortunately it is needed here): TQFontMetrics metrics(font); for(int i = 1; ; ++i) { - TQString str = KGlobal::locale()->calendar()->monthName(i, - KGlobal::locale()->calendar()->year(date), false); + TQString str = TDEGlobal::locale()->calendar()->monthName(i, + TDEGlobal::locale()->calendar()->year(date), false); if (str.isNull()) break; rect=metrics.boundingRect(str); if(max.width()<rect.width()) max.setWidth(rect.width()); @@ -728,7 +728,7 @@ KDateInternalMonthPicker::getResult() const void KDateInternalMonthPicker::setupPainter(TQPainter *p) { - p->setPen(KGlobalSettings::textColor()); + p->setPen(TDEGlobalSettings::textColor()); } void @@ -745,8 +745,8 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) TQString text; // ----- find the number of the cell: index=3*row+col+1; - text=KGlobal::locale()->calendar()->monthName(index, - KGlobal::locale()->calendar()->year(TQDate(d->year, d->month, + text=TDEGlobal::locale()->calendar()->monthName(index, + TDEGlobal::locale()->calendar()->year(TQDate(d->year, d->month, d->day)), false); painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text); if ( activeCol == col && activeRow == row ) @@ -855,7 +855,7 @@ KDateInternalYearSelector::KDateInternalYearSelector { TQFont font; // ----- - font=KGlobalSettings::generalFont(); + font=TDEGlobalSettings::generalFont(); setFont(font); setFrameStyle(TQFrame::NoFrame); // we have to respect the limits of TQDate here, I fear: @@ -879,7 +879,7 @@ KDateInternalYearSelector::yearEnteredSlot() return; } //date.setYMD(year, 1, 1); - KGlobal::locale()->calendar()->setYMD(date, year, 1, 1); + TDEGlobal::locale()->calendar()->setYMD(date, year, 1, 1); if(!date.isValid()) { KNotifyClient::beep(); @@ -982,7 +982,7 @@ void KPopupFrame::popup(const TQPoint &pos) { // Make sure the whole popup is visible. - TQRect d = KGlobalSettings::desktopGeometry(pos); + TQRect d = TDEGlobalSettings::desktopGeometry(pos); int x = pos.x(); int y = pos.y(); diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index ba46a599b..cb690b0ea 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -72,7 +72,7 @@ KDateWidget::KDateWidget( TQDate date, TQWidget *parent, void KDateWidget::init() { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -96,7 +96,7 @@ void KDateWidget::init() void KDateWidget::init(const TQDate& date) { d = new KDateWidgetPrivate; - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); d->m_day = new KDateWidgetSpinBox(1, 1, this); @@ -125,7 +125,7 @@ KDateWidget::~KDateWidget() // ### HPB change TQDate to const TQDate & in KDE 4.0 void KDateWidget::setDate( TQDate date ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); d->m_day->blockSignals(true); d->m_month->blockSignals(true); @@ -151,7 +151,7 @@ TQDate KDateWidget::date() const void KDateWidget::slotDateChanged( ) { - const KCalendarSystem * calendar = KGlobal::locale()->calendar(); + const KCalendarSystem * calendar = TDEGlobal::locale()->calendar(); TQDate date; int y,m,day; diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 868eb3b44..0b99c550c 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -342,7 +342,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) seperatorbox->setMargin(0); TQWidget* ticon = new TQWidget( frame ); - KIconLoader * ldr = KGlobal::iconLoader(); + KIconLoader * ldr = TDEGlobal::iconLoader(); TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true); // Manually draw the alpha portions of the icon onto the widget background color... @@ -431,7 +431,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent) // Center the dialog TQSize sh = sizeHint(); - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); show(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 1fb00aa6d..c18bead0a 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -656,7 +656,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, } } - setButtonStyle( KGlobalSettings::buttonLayout() ); + setButtonStyle( TDEGlobalSettings::buttonLayout() ); } @@ -1740,7 +1740,7 @@ void KDialogBase::showTile( bool state ) TQSize KDialogBase::configDialogSize( const TQString& groupName ) const { - return configDialogSize( *KGlobal::config(), groupName ); + return configDialogSize( *TDEGlobal::config(), groupName ); } @@ -1764,7 +1764,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) { - saveDialogSize( *KGlobal::config(), groupName, global ); + saveDialogSize( *TDEGlobal::config(), groupName, global ); } diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index c47a6a2e9..893e049f7 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -831,7 +831,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * If no size is saved for one dimension of the screen, sizeHint() is returned. * * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. */ TQSize configDialogSize( const TQString& groupName ) const; @@ -841,7 +841,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group - * of KGlobal::config is preserved. + * of TDEGlobal::config is preserved. * @since 3.2 */ TQSize configDialogSize( KConfig& config, const TQString& groupName ) const; diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 95ceb33dd..192c24b05 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1635,7 +1635,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) d->mainDockWidget=0; #ifndef NO_KDE2 - d->splitterOpaqueResize = KGlobalSettings::opaqueResize(); + d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize(); #else d->splitterOpaqueResize = false; #endif @@ -2531,7 +2531,7 @@ void KDockManager::setReadDockConfigMode(int mode) void KDockManager::writeConfig( KConfig* c, TQString group ) { //debug("BEGIN Write Config"); - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); @@ -2672,7 +2672,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) #include <tqmessagebox.h> void KDockManager::readConfig( KConfig* c, TQString group ) { - if ( !c ) c = KGlobal::config(); + if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; c->setGroup( group ); diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h index 4f54e5f13..8f5c288ec 100644 --- a/tdeui/kdockwidget.h +++ b/tdeui/kdockwidget.h @@ -1033,7 +1033,7 @@ public: KDockWidget* getDockWidgetFromName( const TQString& dockName ); /** - * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize(). + * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize(). * Call this method before you create any dock widgets! */ void setSplitterOpaqueResize(bool b=true); diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index f6d49a97e..f0cd5cae1 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -224,7 +224,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) void KDualColorButton::mouseMoveEvent(TQMouseEvent *ev) { if(!miniCtlFlag){ - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay || ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) { KColorDrag *d = new KColorDrag( curColor == Foreground ? diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index b89a5b97a..3f116b903 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -254,8 +254,8 @@ public: */ ToolbarList findToolbars(TQDomNode n) { - static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" ); - static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" ); + static const TQString &tagToolbar = TDEGlobal::staticQString( "ToolBar" ); + static const TQString &attrNoEdit = TDEGlobal::staticQString( "noEdit" ); ToolbarList list; for( ; !n.isNull(); n = n.nextSibling() ) @@ -278,9 +278,9 @@ public: */ TQString toolbarName( const XmlData& xmlData, const TQDomElement& it ) const { - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &tagText2 = KGlobal::staticQString( "Text" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &tagText2 = TDEGlobal::staticQString( "Text" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString name; TQCString txt( it.namedItem( tagText ).toElement().text().utf8() ); @@ -306,7 +306,7 @@ public: */ TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement elem = n.toElement(); @@ -466,7 +466,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { - const TDEInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); + const TDEInstance *instance = client->instance() ? client->instance() : TDEGlobal::instance(); file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); } else @@ -488,7 +488,7 @@ void KEditToolbar::slotDefault() int slash = d->m_file.findRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::fromLatin1( TDEGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -903,7 +903,7 @@ void KEditToolbarWidget::setupLayout() void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // just in case, we clear our combo m_toolbarCombo->clear(); @@ -942,11 +942,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) void KEditToolbarWidget::loadActionList(TQDomElement& elem) { - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagActionList= KGlobal::staticQString( "ActionList" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagActionList= TDEGlobal::staticQString( "ActionList" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); int sep_num = 0; TQString sep_name("separator_%1"); @@ -966,7 +966,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) TQMap<TQString, bool> active_list; // see if our current action is in this toolbar - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQDomNode n = elem.lastChild(); for( ; !n.isNull(); n = n.previousSibling() ) { @@ -1108,7 +1108,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item) ToolbarItem* toolitem = static_cast<ToolbarItem *>(item); m_removeAction->setEnabled( item ); - static const TQString &tagAction = KGlobal::staticQString( "Action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); d->m_changeIcon->setEnabled( item && d->m_hasKDialog && toolitem->internalTag() == tagAction ); @@ -1191,11 +1191,11 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before, if (!item) return; - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); TQDomElement new_item; // let's handle the separator specially @@ -1238,7 +1238,7 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item) if (!item) return; - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); // we're modified, so let this change emit enableOk(true); @@ -1306,7 +1306,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before )); // and set this container as a noMerge - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); d->m_currentToolbarElem.setAttribute( attrNoMerge, "1"); // update the local doc @@ -1330,7 +1330,7 @@ void KEditToolbarWidget::slotDownButton() void KEditToolbarWidget::updateLocal(TQDomElement& elem) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); XmlDataList::Iterator xit = d->m_xmlFiles.begin(); for ( ; xit != d->m_xmlFiles.end(); ++xit) @@ -1389,7 +1389,7 @@ void KEditToolbarWidget::slotChangeIcon() (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; - if ( !d->m_kdialogProcess->start( KProcess::NotifyOnExit ) ) { + if ( !d->m_kdialogProcess->start( TDEProcess::NotifyOnExit ) ) { kdError(240) << "Can't run " << kdialogExe << endl; delete d->m_kdialogProcess; d->m_kdialogProcess = 0; @@ -1399,11 +1399,11 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( KProcess* ) ), - this, TQT_SLOT( slotProcessExited( KProcess* ) ) ); + connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), + this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); } -void KEditToolbarWidget::slotProcessExited( KProcess* ) +void KEditToolbarWidget::slotProcessExited( TDEProcess* ) { m_activeList->setEnabled( true ); m_toolbarCombo->setEnabled( true ); diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 60a15d5de..cc1a0069a 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -23,7 +23,7 @@ #include <kxmlguiclient.h> #include <kdialogbase.h> -class KProcess; +class TDEProcess; class KActionCollection; class TQComboBox; class TQToolButton; @@ -66,7 +66,7 @@ namespace * \code * void MyClass::slotConfigureToolbars() * { - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -76,7 +76,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * createGUI(); - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -91,7 +91,7 @@ namespace * An example would be: * * \code - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -100,7 +100,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * // Do NOT call createGUI()! - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -406,7 +406,7 @@ protected slots: void slotChangeIcon(); private slots: - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); protected: // KDE4: make private void setupLayout(); diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp index 9ef3af912..54b2932aa 100644 --- a/tdeui/kfontcombo.cpp +++ b/tdeui/kfontcombo.cpp @@ -373,8 +373,8 @@ void KFontCombo::updateFonts() bool KFontCombo::displayFonts() { - KConfigGroupSaver saver(KGlobal::config(), "KDE"); - return KGlobal::config()->readBoolEntry("DisplayFontItems", true); + KConfigGroupSaver saver(TDEGlobal::config(), "KDE"); + return TDEGlobal::config()->readBoolEntry("DisplayFontItems", true); } void KFontCombo::virtual_hook( int id, void* data ) diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index eb5b262f8..23d514092 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -290,7 +290,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, row ++; sampleEdit = new TQLineEdit( page, "sampleEdit"); - TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); + TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black ); sampleEdit->setFont(tmpFont); //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); @@ -325,12 +325,12 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, vbox->addWidget( xlfdEdit ); // lets initialize the display if possible - setFont( KGlobalSettings::generalFont(), usingFixed ); + setFont( TDEGlobalSettings::generalFont(), usingFixed ); // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h index 189dc1292..e7d53568a 100644 --- a/tdeui/kguiitem.h +++ b/tdeui/kguiitem.h @@ -61,10 +61,10 @@ public: TQString text() const; TQString plainText() const; #ifndef KDE_NO_COMPAT - TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; TQIconSet iconSet() const { return iconSet( KIcon::Small ); } #else - TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; #endif TQString iconName() const; diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 670439444..0faa137e4 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // I use hardcoded menu id's here. Reason is to stay backward // compatible. // - const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : TDEGlobal::instance()->aboutData(); TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new KPopupMenu(); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 0392f7d50..430a23fa0 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -125,7 +125,7 @@ void KIconView::slotSettingsChanged(int category) { if ( category != TDEApplication::SETTINGS_MOUSE ) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, @@ -150,8 +150,8 @@ void KIconView::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = m_bUseSingle ? KGlobalSettings::autoSelectDelay() : -1; + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = m_bUseSingle ? TDEGlobalSettings::autoSelectDelay() : -1; if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -467,7 +467,7 @@ KIconViewItem::~KIconViewItem() void KIconViewItem::calcRect( const TQString& text_ ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); Q_ASSERT( iconView() ); if ( !iconView() ) @@ -704,7 +704,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) { - bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect(); + bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect(); int textX; if (drawRoundedRect == true) textX = textRect( false ).x() + 4; diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 4c291eda4..6cf02e75e 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -703,7 +703,7 @@ void KJanusWidget::slotFontChanged() { if( mTitleLabel ) { - mTitleLabel->setFont( KGlobalSettings::generalFont() ); + mTitleLabel->setFont( TDEGlobalSettings::generalFont() ); TQFont titleFont( mTitleLabel->font() ); titleFont.setBold( true ); mTitleLabel->setFont( titleFont ); diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 6d197d813..d9ae693f3 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -171,7 +171,7 @@ KKeyChooser::KKeyChooser( KAccel* pAccel, TQWidget* parent, bool bAllowLetterSho insert( pAccel ); } -KKeyChooser::KKeyChooser( KGlobalAccel* pAccel, TQWidget* parent ) +KKeyChooser::KKeyChooser( TDEGlobalAccel* pAccel, TQWidget* parent ) : TQWidget( parent ) { initGUI( ApplicationGlobal, false ); @@ -201,7 +201,7 @@ KKeyChooser::KKeyChooser( KAccel* actions, TQWidget* parent, insert( actions ); } -KKeyChooser::KKeyChooser( KGlobalAccel* actions, TQWidget* parent, +KKeyChooser::KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool /*bAllowWinKey*/ ) @@ -256,7 +256,7 @@ bool KKeyChooser::insert( KAccel* pAccel ) return insert( pList ); } -bool KKeyChooser::insert( KGlobalAccel* pAccel ) +bool KKeyChooser::insert( TDEGlobalAccel* pAccel ) { KShortcutList* pList = new KAccelShortcutList( pAccel ); d->rgpListsAllocated.append( pList ); @@ -296,7 +296,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) m_type = type; d->bAllowLetterShortcuts = bAllowLetterShortcuts; - d->bPreferFourModifierKeys = KGlobalAccel::useFourModifierKeys(); + d->bPreferFourModifierKeys = TDEGlobalAccel::useFourModifierKeys(); // // TOP LAYOUT MANAGER @@ -587,7 +587,7 @@ void KKeyChooser::readGlobalKeys() void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map ) { - TQMap<TQString, TQString> mapEntry = KGlobal::config()->entryMap( "Global Shortcuts" ); + TQMap<TQString, TQString> mapEntry = TDEGlobal::config()->entryMap( "Global Shortcuts" ); TQMap<TQString, TQString>::Iterator it( mapEntry.begin() ); for( uint i = 0; it != mapEntry.end(); ++it, i++ ) map[it.key()] = KShortcut(*it); @@ -679,7 +679,7 @@ void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConf { kdDebug(125) << "KKeyChooser::syncToConfig( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl; if( !pConfig ) - pConfig = KGlobal::config(); + pConfig = TDEGlobal::config(); KConfigGroupSaver cgs( pConfig, sConfigGroup ); TQListViewItemIterator it( d->pList ); @@ -1094,7 +1094,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } @@ -1106,14 +1106,14 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char setMainWidget( m_pKeyChooser ); connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); resize( group.readSizeEntry( "Dialog Size", &sz ) ); } KKeyDialog::~KKeyDialog() { - KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" ); + KConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); group.writeEntry( "Dialog Size", size(), true, true ); } @@ -1154,7 +1154,7 @@ int KKeyDialog::configure( KAccel* keys, TQWidget* parent, bool bSaveSettings ) return configure( keys, true, parent, bSaveSettings); } -int KKeyDialog::configure( KGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, TQWidget* parent, bool bSaveSettings ) { return configure( keys, true, parent, bSaveSettings); } @@ -1169,7 +1169,7 @@ int KKeyDialog::configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget *p return b; } -int KKeyDialog::configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) +int KKeyDialog::configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings ) { KKeyDialog dlg( KKeyChooser::ApplicationGlobal, bAllowLetterShortcuts, parent ); dlg.m_pKeyChooser->insert( keys ); diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h index d291a87d9..b457f133b 100644 --- a/tdeui/kkeydialog.h +++ b/tdeui/kkeydialog.h @@ -35,17 +35,17 @@ class KAccel; class KAccelActions; class KActionCollection; class KConfigBase; -class KGlobalAccel; +class TDEGlobalAccel; class KKeySequence; class KShortcut; class KShortcutList; class KKeyChooserItem; /** - * @short Widget for configuration of KAccel and KGlobalAccel. + * @short Widget for configuration of KAccel and TDEGlobalAccel. * * Configure dictionaries of key/action associations for KAccel and - * KGlobalAccel. + * TDEGlobalAccel. * * The class takes care of all aspects of configuration, including * handling key conflicts internally. Connect to the allDefault() @@ -80,7 +80,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget KKeyChooser( KActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts = true ); KKeyChooser( KAccel* actions, TQWidget* parent, bool bAllowLetterShortcuts = true ); - KKeyChooser( KGlobalAccel* actions, TQWidget* parent ); + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent ); KKeyChooser( KShortcutList*, TQWidget* parent, ActionType type = Application, bool bAllowLetterShortcuts = true ); virtual ~KKeyChooser(); @@ -169,7 +169,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget void initGUI( ActionType type, bool bAllowLetterShortcuts ); bool insert( KAccel* ); - bool insert( KGlobalAccel* ); + bool insert( TDEGlobalAccel* ); bool insert( KShortcutList* ); /// @since 3.1 void buildListView( uint iList, const TQString &title = TQString::null ); @@ -234,7 +234,7 @@ private slots: /** * @obsolete */ - KKeyChooser( KGlobalAccel* actions, TQWidget* parent, + KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent, bool bCheckAgainstStdKeys, bool bAllowLetterShortcuts, bool bAllowWinKey = false ); @@ -256,10 +256,10 @@ private slots: typedef KKeyChooser KKeyChooser; /** - * @short Dialog for configuration of KActionCollection, KAccel, and KGlobalAccel. + * @short Dialog for configuration of KActionCollection, KAccel, and TDEGlobalAccel. * * The KKeyDialog class is used for configuring dictionaries of key/action - * associations for KActionCollection, KAccel, and KGlobalAccel. It uses the KKeyChooser widget + * associations for KActionCollection, KAccel, and TDEGlobalAccel. It uses the KKeyChooser widget * and offers buttons to set all keys to defaults and invoke on-line help. * * Several static methods are supplied which provide the most convenient interface @@ -345,7 +345,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. */ - static int configure( KGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); + static int configure( TDEGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true ); /** @@ -371,7 +371,7 @@ public: * This is an overloaded member function, provided for convenience. * It behaves essentially like the above function. **/ - static int configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true + static int configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true /** * @deprecated Obsolete. @@ -383,7 +383,7 @@ public: * @deprecated Obsolete. * Please use KKeyDialog::configure instead */ - static KDE_DEPRECATED int configureKeys( KGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) + static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 ) { return configure( keys, parent, save_settings ); } /** * @deprecated Obsolete. diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index bc667aaf0..ece9a3ffe 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -62,7 +62,7 @@ public: if ( !initialized ) { - KConfigGroup config( KGlobal::config(), "General" ); + KConfigGroup config( TDEGlobal::config(), "General" ); backspacePerformsCompletion = config.readBoolEntry( "Backspace performs completion", false ); initialized = true; @@ -132,10 +132,10 @@ void KLineEdit::init() KCursor::setAutoHideCursor( this, true, true ); installEventFilter( this ); - KGlobalSettings::Completion mode = completionMode(); - d->autoSuggest = (mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto); + TDEGlobalSettings::Completion mode = completionMode(); + d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto); connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); @@ -147,26 +147,26 @@ void KLineEdit::init() d->drawClickMsg = false; } -void KLineEdit::setCompletionMode( KGlobalSettings::Completion mode ) +void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); - if ( oldMode != mode && (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( oldMode != mode && (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); // If the widgets echo mode is not Normal, no completion // feature will be enabled even if one is requested. if ( echoMode() != TQLineEdit::Normal ) - mode = KGlobalSettings::CompletionNone; // Override the request. + mode = TDEGlobalSettings::CompletionNone; // Override the request. if ( kapp && !kapp->authorize("lineedit_text_completion") ) - mode = KGlobalSettings::CompletionNone; + mode = TDEGlobalSettings::CompletionNone; - if ( mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan ) + if ( mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan ) d->autoSuggest = true; else d->autoSuggest = false; @@ -194,11 +194,11 @@ void KLineEdit::setCompletedText( const TQString& t, bool marked ) void KLineEdit::setCompletedText( const TQString& text ) { - KGlobalSettings::Completion mode = completionMode(); - bool marked = ( mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan || - mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ); + TDEGlobalSettings::Completion mode = completionMode(); + bool marked = ( mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan || + mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ); setCompletedText( text, marked ); } @@ -226,15 +226,15 @@ void KLineEdit::rotateText( KCompletionBase::KeyBindingType type ) void KLineEdit::makeCompletion( const TQString& text ) { KCompletion *comp = compObj(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); - if ( !comp || mode == KGlobalSettings::CompletionNone ) + if ( !comp || mode == TDEGlobalSettings::CompletionNone ) return; // No completion object... TQString match = comp->makeCompletion( text ); - if ( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) + if ( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) { if ( match.isNull() ) { @@ -254,7 +254,7 @@ void KLineEdit::makeCompletion( const TQString& text ) if ( match.isNull() || match == text ) return; - if ( mode != KGlobalSettings::CompletionShell ) + if ( mode != TDEGlobalSettings::CompletionShell ) setUserSelection(false); if ( d->autoSuggest ) @@ -522,17 +522,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // Filter key-events if EchoMode is normal and // completion mode is not set to CompletionNone if ( echoMode() == TQLineEdit::Normal && - completionMode() != KGlobalSettings::CompletionNone ) + completionMode() != TDEGlobalSettings::CompletionNone ) { KeyBindingMap keys = getKeyBindings(); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); bool noModifier = (e->state() == Qt::NoButton || e->state() == TQt::ShiftButton || e->state() == TQt::Keypad); - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionPopupAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionPopupAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && @@ -571,8 +571,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - if ( (mode == KGlobalSettings::CompletionAuto || - mode == KGlobalSettings::CompletionMan) && noModifier ) + if ( (mode == TDEGlobalSettings::CompletionAuto || + mode == TDEGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || @@ -639,8 +639,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } - else if (( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) && + else if (( mode == TDEGlobalSettings::CompletionPopup || + mode == TDEGlobalSettings::CompletionPopupAuto ) && noModifier && !e->text().isEmpty() ) { TQString old_txt = text(); @@ -709,7 +709,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } if ( (e->key() == Key_Backspace || e->key() == Key_Delete ) && - mode == KGlobalSettings::CompletionPopupAuto ) + mode == TDEGlobalSettings::CompletionPopupAuto ) d->autoSuggest=true; e->accept(); @@ -720,7 +720,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) return; } - else if ( mode == KGlobalSettings::CompletionShell ) + else if ( mode == TDEGlobalSettings::CompletionShell ) { // Handles completion. KShortcut cut; @@ -749,7 +749,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) } // handle rotation - if ( mode != KGlobalSettings::CompletionNone ) + if ( mode != TDEGlobalSettings::CompletionNone ) { // Handles previous match KShortcut cut; @@ -895,20 +895,20 @@ TQPopupMenu *KLineEdit::createPopupMenu() subMenu->setAccel( KStdAccel::completion(), ShellCompletion ); - KGlobalSettings::Completion mode = completionMode(); + TDEGlobalSettings::Completion mode = completionMode(); subMenu->setItemChecked( NoCompletion, - mode == KGlobalSettings::CompletionNone ); + mode == TDEGlobalSettings::CompletionNone ); subMenu->setItemChecked( ShellCompletion, - mode == KGlobalSettings::CompletionShell ); + mode == TDEGlobalSettings::CompletionShell ); subMenu->setItemChecked( PopupCompletion, - mode == KGlobalSettings::CompletionPopup ); + mode == TDEGlobalSettings::CompletionPopup ); subMenu->setItemChecked( AutoCompletion, - mode == KGlobalSettings::CompletionAuto ); + mode == TDEGlobalSettings::CompletionAuto ); subMenu->setItemChecked( ShortAutoCompletion, - mode == KGlobalSettings::CompletionMan ); + mode == TDEGlobalSettings::CompletionMan ); subMenu->setItemChecked( PopupAutoCompletion, - mode == KGlobalSettings::CompletionPopupAuto ); - if ( mode != KGlobalSettings::completionMode() ) + mode == TDEGlobalSettings::CompletionPopupAuto ); + if ( mode != TDEGlobalSettings::completionMode() ) { subMenu->insertSeparator(); subMenu->insertItem( i18n("Default"), Default ); @@ -925,30 +925,30 @@ TQPopupMenu *KLineEdit::createPopupMenu() void KLineEdit::completionMenuActivated( int id ) { - KGlobalSettings::Completion oldMode = completionMode(); + TDEGlobalSettings::Completion oldMode = completionMode(); switch ( id ) { case Default: - setCompletionMode( KGlobalSettings::completionMode() ); + setCompletionMode( TDEGlobalSettings::completionMode() ); break; case NoCompletion: - setCompletionMode( KGlobalSettings::CompletionNone ); + setCompletionMode( TDEGlobalSettings::CompletionNone ); break; case AutoCompletion: - setCompletionMode( KGlobalSettings::CompletionAuto ); + setCompletionMode( TDEGlobalSettings::CompletionAuto ); break; case ShortAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionMan ); + setCompletionMode( TDEGlobalSettings::CompletionMan ); break; case ShellCompletion: - setCompletionMode( KGlobalSettings::CompletionShell ); + setCompletionMode( TDEGlobalSettings::CompletionShell ); break; case PopupCompletion: - setCompletionMode( KGlobalSettings::CompletionPopup ); + setCompletionMode( TDEGlobalSettings::CompletionPopup ); break; case PopupAutoCompletion: - setCompletionMode( KGlobalSettings::CompletionPopupAuto ); + setCompletionMode( TDEGlobalSettings::CompletionPopupAuto ); break; default: return; @@ -956,8 +956,8 @@ void KLineEdit::completionMenuActivated( int id ) if ( oldMode != completionMode() ) { - if ( (oldMode == KGlobalSettings::CompletionPopup || - oldMode == KGlobalSettings::CompletionPopupAuto ) && + if ( (oldMode == TDEGlobalSettings::CompletionPopup || + oldMode == TDEGlobalSettings::CompletionPopupAuto ) && d->completionBox && d->completionBox->isVisible() ) d->completionBox->hide(); emit completionModeChanged( completionMode() ); @@ -1101,7 +1101,7 @@ void KLineEdit::setCompletionBox( KCompletionBox *box ) void KLineEdit::userCancelled(const TQString & cancelText) { - if ( completionMode() != KGlobalSettings::CompletionPopupAuto ) + if ( completionMode() != TDEGlobalSettings::CompletionPopupAuto ) { // TODO: this sets modified==false. But maybe it was true before... setText(cancelText); diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index fc1f4ba4a..84e554316 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -80,7 +80,7 @@ class KURL; * second argument. * * If @p EchoMode for this widget is set to something other than @p TQLineEdit::Normal, - * the completion mode will always be defaulted to KGlobalSettings::CompletionNone. + * the completion mode will always be defaulted to TDEGlobalSettings::CompletionNone. * This is done purposefully to guard against protected entries such as passwords being * cached in KCompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the * completion mode is automatically disabled. @@ -204,7 +204,7 @@ public: * * See KCompletionBase::setCompletionMode */ - virtual void setCompletionMode( KGlobalSettings::Completion mode ); + virtual void setCompletionMode( TDEGlobalSettings::Completion mode ); /** * Enables/disables the popup (context) menu. @@ -269,7 +269,7 @@ public: /** * @returns the completion-box, that is used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This method will create a completion-box if none is there, yet. * * @param create Set this to false if you don't want the box to be created @@ -320,7 +320,7 @@ public: /** * Set the completion-box to be used in completion mode - * KGlobalSettings::CompletionPopup. + * TDEGlobalSettings::CompletionPopup. * This will do nothing if a completion-box already exists. * * @param box The KCompletionBox to set @@ -382,7 +382,7 @@ signals: * @p setKeyBinding for details. * * Note that this signal is @em not emitted if the completion - * mode is set to @p KGlobalSettings::CompletionNone or + * mode is set to @p TDEGlobalSettings::CompletionNone or * @p echoMode() is @em not normal. */ void textRotation( KCompletionBase::KeyBindingType ); @@ -391,7 +391,7 @@ signals: * Emitted when the user changed the completion mode by using the * popupmenu. */ - void completionModeChanged( KGlobalSettings::Completion ); + void completionModeChanged( TDEGlobalSettings::Completion ); /** * Emitted before the context menu is displayed. diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp index 04705ad36..d4fb92ef2 100644 --- a/tdeui/klistbox.cpp +++ b/tdeui/klistbox.cpp @@ -73,7 +73,7 @@ void KListBox::slotSettingsChanged(int category) { if (category != TDEApplication::SETTINGS_MOUSE) return; - m_bUseSingle = KGlobalSettings::singleClick(); + m_bUseSingle = TDEGlobalSettings::singleClick(); disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), @@ -99,8 +99,8 @@ void KListBox::slotSettingsChanged(int category) // const TQPoint & ) ) ); } - m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); - m_autoSelectDelay = KGlobalSettings::autoSelectDelay(); + m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); + m_autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !m_bUseSingle || !m_bChangeCursorOverItem ) viewport()->unsetCursor(); diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp index 29f255c3a..8aff145b8 100644 --- a/tdeui/klistview.cpp +++ b/tdeui/klistview.cpp @@ -71,7 +71,7 @@ public: : pCurrentItem (0), autoSelectDelay(0), dragOverItem(0), - dragDelay (KGlobalSettings::dndEventDelay()), + dragDelay (TDEGlobalSettings::dndEventDelay()), editor (new KListViewLineEdit (listview)), cursorInExecuteArea(false), itemsMovable (true), @@ -94,14 +94,14 @@ public: selectionDirection(0), tooltipColumn (0), selectionMode (Single), - contextMenuKey (KGlobalSettings::contextMenuKey()), - showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()), + contextMenuKey (TDEGlobalSettings::contextMenuKey()), + showContextMenusOnPress (TDEGlobalSettings::showContextMenusOnPress()), mDropVisualizerWidth (4), paintAbove (0), paintCurrent (0), paintBelow (0), painting (false), - shadeSortColumn(KGlobalSettings::shadeSortColumn()) + shadeSortColumn(TDEGlobalSettings::shadeSortColumn()) { renameable.append(0); connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); @@ -464,7 +464,7 @@ KListView::KListView( TQWidget *parent, const char *name ) connect (this, TQT_SIGNAL (menuShortCutPressed (KListView*, TQListViewItem*)), this, TQT_SLOT (emitContextMenu (KListView*, TQListViewItem*))); - d->alternateBackground = KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } KListView::~KListView() @@ -544,8 +544,8 @@ void KListView::slotSettingsChanged(int category) switch (category) { case TDEApplication::SETTINGS_MOUSE: - d->dragDelay = KGlobalSettings::dndEventDelay(); - d->bUseSingle = KGlobalSettings::singleClick(); + d->dragDelay = TDEGlobalSettings::dndEventDelay(); + d->bUseSingle = TDEGlobalSettings::singleClick(); disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); @@ -554,9 +554,9 @@ void KListView::slotSettingsChanged(int category) connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); - d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon(); + d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); if( !d->bUseSingle || !d->bChangeCursorOverItem ) viewport()->unsetCursor(); @@ -564,8 +564,8 @@ void KListView::slotSettingsChanged(int category) break; case TDEApplication::SETTINGS_POPUPMENU: - d->contextMenuKey = KGlobalSettings::contextMenuKey (); - d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress (); + d->contextMenuKey = TDEGlobalSettings::contextMenuKey (); + d->showContextMenusOnPress = TDEGlobalSettings::showContextMenusOnPress (); if (d->showContextMenusOnPress) { @@ -753,7 +753,7 @@ void KListView::leaveEvent( TQEvent *e ) bool KListView::event( TQEvent *e ) { if (e->type() == TQEvent::ApplicationPaletteChange) - d->alternateBackground=KGlobalSettings::alternateBackgroundColor(); + d->alternateBackground=TDEGlobalSettings::alternateBackgroundColor(); return TQListView::event(e); } @@ -2135,7 +2135,7 @@ void KListView::resetAutoSelection() return; d->disableAutoSelection = false; - d->autoSelectDelay = KGlobalSettings::autoSelectDelay(); + d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay(); } void KListView::doubleClicked( TQListViewItem *item, const TQPoint &pos, int c ) diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index 5d2a1e705..487d4f197 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -430,7 +430,7 @@ KXMLGUIFactory *KMainWindow::guiFactory() int KMainWindow::configureToolbars() { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); return dlg.exec(); @@ -439,7 +439,7 @@ int KMainWindow::configureToolbars() void KMainWindow::saveNewToolbarConfig() { createGUI(xmlFile()); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } void KMainWindow::setupGUI( int options, const TQString & xmlfile ) { @@ -1026,7 +1026,7 @@ void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWind this, TQT_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings - applyMainWindowSettings( KGlobal::config(), groupName ); + applyMainWindowSettings( TDEGlobal::config(), groupName ); } void KMainWindow::resetAutoSaveSettings() @@ -1050,8 +1050,8 @@ void KMainWindow::saveAutoSaveSettings() { Q_ASSERT( d->autoSaveSettings ); //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl; - saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup ); - KGlobal::config()->sync(); + saveMainWindowSettings( TDEGlobal::config(), d->autoSaveGroup ); + TDEGlobal::config()->sync(); d->settingsDirty = false; if ( d->settingsTimer ) d->settingsTimer->stop(); diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h index 56b5f2666..a90d3dc12 100644 --- a/tdeui/kmainwindow.h +++ b/tdeui/kmainwindow.h @@ -428,7 +428,7 @@ public: * Call this to enable "auto-save" of toolbar/menubar/statusbar settings * (and optionally window size). * If the *bars were moved around/shown/hidden when the window is closed, - * saveMainWindowSettings( KGlobal::config(), groupName ) will be called. + * saveMainWindowSettings( TDEGlobal::config(), groupName ) will be called. * * @param groupName a name that identifies this "type of window". * You can have several types of window in the same application. @@ -731,7 +731,7 @@ public slots: * Example (adding a help button to the first toolbar): * * \code - * KIconLoader &loader = *KGlobal::iconLoader(); + * KIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 7f6983275..7266d8d91 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -235,7 +235,7 @@ void KMenuBar::show() void KMenuBar::slotReadConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver( config, "KDE" ); setTopLevelMenuInternal( config->readBoolEntry( "macStyle", false ) ); } @@ -329,7 +329,7 @@ void KMenuBar::selectionTimeout() if ( d->topLevel ) { d->fallback_mode = true; // KMenuBar is handling its position itself - KConfigGroup xineramaConfig(KGlobal::config(),"Xinerama"); + KConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama"); int screen = xineramaConfig.readNumEntry("MenubarScreen", TQApplication::desktop()->screenNumber(TQPoint(0,0)) ); TQRect area; diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 2dd4c8ca5..4037ffdcc 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -82,7 +82,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) break; } - TQPixmap ret = KGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); if (ret.isNull()) return TQMessageBox::standardIcon(icon); @@ -174,7 +174,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, dialog->font()); - TQRect d = KGlobalSettings::desktopGeometry(dialog); + TQRect d = TDEGlobalSettings::desktopGeometry(dialog); pref_width = d.width() / 3; rt.setWidth(pref_width); @@ -343,7 +343,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); if (dontAsk == "yes") { @@ -362,7 +362,7 @@ KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); } @@ -373,7 +373,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); config->sync(); @@ -384,7 +384,7 @@ KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); config->sync(); @@ -935,7 +935,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri void KMessageBox::enableAllMessages() { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -955,7 +955,7 @@ KMessageBox::enableAllMessages() void KMessageBox::enableMessage(const TQString &dontShowAgainName) { - KConfig *config = againConfig ? againConfig : KGlobal::config(); + KConfig *config = againConfig ? againConfig : TDEGlobal::config(); TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/tdeui/kmessagebox.h b/tdeui/kmessagebox.h index f9d76688c..574ae9ea8 100644 --- a/tdeui/kmessagebox.h +++ b/tdeui/kmessagebox.h @@ -1094,7 +1094,7 @@ public: /** * Use @p cfg for all settings related to the dontShowAgainName feature. - * If @p cfg is 0 (default) KGlobal::config() will be used. + * If @p cfg is 0 (default) TDEGlobal::config() will be used. * @since 3.2 */ static void setDontShowAskAgainConfig(KConfig* cfg); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 238eeee7a..f6c3d9dd7 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -1129,7 +1129,7 @@ void KDoubleSpinBox::setLineStep( double step ) { TQString KDoubleSpinBox::mapValueToText( int value ) { if ( acceptLocalizedNumbers() ) - return KGlobal::locale() + return TDEGlobal::locale() ->formatNumber( d->mapToDouble( value ), d->mPrecision ); else return TQString().setNum( d->mapToDouble( value ), 'f', d->mPrecision ); @@ -1138,7 +1138,7 @@ TQString KDoubleSpinBox::mapValueToText( int value ) { int KDoubleSpinBox::mapTextToValue( bool * ok ) { double value; if ( acceptLocalizedNumbers() ) - value = KGlobal::locale()->readNumber( cleanText(), ok ); + value = TDEGlobal::locale()->readNumber( cleanText(), ok ); else value = cleanText().toDouble( ok ); if ( !*ok ) return 0; diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp index fdc51022c..89f0ca88c 100644 --- a/tdeui/knumvalidator.cpp +++ b/tdeui/knumvalidator.cpp @@ -214,13 +214,13 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==TDEGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { val = newStr.toDouble(&ok); if(!ok && d->acceptLocalizedNumbers) - val= KGlobal::locale()->readNumber(newStr,&ok); + val= TDEGlobal::locale()->readNumber(newStr,&ok); } else { val = 0; @@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) { TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const { TQString s = input; if ( acceptLocalizedNumbers() ) { - KLocale * l = KGlobal::locale(); + KLocale * l = TDEGlobal::locale(); // ok, we have to re-format the number to have: // 1. decimalSymbol == '.' // 2. negativeSign == '-' diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index 5209c515f..50a16fd27 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -80,7 +80,7 @@ class TQPopupMenu; * { * KPanelApplet* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleapplet"); + * TDEGlobal::locale()->insertCatalogue("exampleapplet"); * return new ExampleApplet(configFile, KPanelApplet::Normal, * KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, * parent, "exampleapplet"); diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index e8d7e5a28..437f3795e 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -80,7 +80,7 @@ class KPanelExtensionPrivate; * { * KPanelExtension* init(TQWidget *parent, const TQString& configFile) * { - * KGlobal::locale()->insertCatalogue("exampleextension"); + * TDEGlobal::locale()->insertCatalogue("exampleextension"); * return new ExampleExtension(configFile, KPanelExtension::Normal, * KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences, * parent, "exampleextension"); diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index ed13502a4..194801ff2 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -63,7 +63,7 @@ void KPanelMenu::init(const TQString& path) connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); // setup cache timer - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("menus"); d->clearDelay = config->readNumEntry("MenuCacheTime", 60000); // 1 minute diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 489e14d8f..3b3d74be2 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -110,7 +110,7 @@ KPasswordEdit::KPasswordEdit(TQWidget *parent, const char *name) { init(); - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); KConfigGroupSaver saver(cfg, "Passwords"); const TQString val = cfg->readEntry("EchoMode", "OneStar"); @@ -338,7 +338,7 @@ void KPasswordDialog::init() { m_Row = 0; - KConfig* const cfg = KGlobal::config(); + KConfig* const cfg = TDEGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) @@ -351,7 +351,7 @@ void KPasswordDialog::init() // Row 1: pixmap + prompt TQLabel *lbl; - const TQPixmap pix( KGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 1e86bc57f..fe2414a67 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -300,7 +300,7 @@ void KPassivePopup::moveNear( TQRect target ) int w = width(); int h = height(); - TQRect r = KGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); + TQRect r = TDEGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); if( d->popupStyle == Balloon ) { @@ -359,7 +359,7 @@ void KPassivePopup::updateMask() { // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(d->anchor); int xh = 70, xl = 40; if( width() < 80 ) diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index aafb7f3c2..4164e7db2 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO() #ifdef HAVE_MITSHM setShmPolicy(ShmDontKeep); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (!config->readBoolEntry("UseMitShm", true)) return; diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 07127cdc8..c61d140dd 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item ) void KPushButton::readSettings() { - s_useIcons = KGlobalSettings::showIconsOnPushButtons(); + s_useIcons = TDEGlobalSettings::showIconsOnPushButtons(); } void KPushButton::setGuiItem( const KGuiItem& item ) @@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { startDrag(); setDown( false ); diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h index 2beed9e52..ee7bb3b52 100644 --- a/tdeui/kpushbutton.h +++ b/tdeui/kpushbutton.h @@ -102,7 +102,7 @@ public: /** * Sets the Icon Set for this button. It also takes into account hte - * KGlobalSettings::showIconsOnPushButtons() setting. + * TDEGlobalSettings::showIconsOnPushButtons() setting. */ void setIconSet( const TQIconSet &iconSet ); diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index 5ca0c2b85..824e92bfc 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -80,7 +80,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, , clientcombo(0) { d = new KSpellConfigPrivate; - kc = KGlobal::config(); + kc = TDEGlobal::config(); if( !_ksc ) { @@ -277,12 +277,12 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, // but since aspell 0.6 also 3-character ISO-codes can be used if ( (dname.length() == 2) || (dname.length() == 3) ) { lname = dname; - hname = KGlobal::locale()->twoAlphaToLanguageName( lname ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName( lname ); } else if ( (dname.length() == 5) && (dname[2] == '_') ) { lname = dname.left(2); - hname = KGlobal::locale()->twoAlphaToLanguageName(lname); - TQString country = KGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); + hname = TDEGlobal::locale()->twoAlphaToLanguageName(lname); + TQString country = TDEGlobal::locale()->twoAlphaToCountryName( dname.right(2) ); if ( extension.isEmpty() ) extension = country; else @@ -363,9 +363,9 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && + if ( ( TDEGlobal::locale()->language() == TQString::fromLatin1("C") && lname==TQString::fromLatin1("en") ) || - KGlobal::locale()->language() == lname ) + TDEGlobal::locale()->language() == lname ) return true; return false; diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index 1d37d03d3..5750c8832 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -54,7 +54,7 @@ KScrollView::~KScrollView() void KScrollView::scrollBy(int dx, int dy) { - KConfigGroup cfg( KGlobal::config(), "KDE" ); + KConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", true )) { TQScrollView::scrollBy( dx, dy ); return; diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp index 27d721626..1ed3b7df7 100644 --- a/tdeui/kshortcutdialog.cpp +++ b/tdeui/kshortcutdialog.cpp @@ -119,7 +119,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T setShortcut( shortcut ); resize( 0, 0 ); - s_showMore = KConfigGroup(KGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); + s_showMore = KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); #ifdef Q_WS_X11 @@ -129,7 +129,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T KShortcutDialog::~KShortcutDialog() { - KConfigGroup group(KGlobal::config(), "General"); + KConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("ShowAlternativeShortcutConfig", s_showMore); } diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp index 7a17ad607..b91c74a4d 100644 --- a/tdeui/kspell.cpp +++ b/tdeui/kspell.cpp @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(ispellExit (KProcess *)) ); + connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -313,7 +313,7 @@ KSpell::startIspell() } void -KSpell::ispellErrors( KProcess *, char *buffer, int buflen ) +KSpell::ispellErrors( TDEProcess *, char *buffer, int buflen ) { buffer[buflen-1] = '\0'; // kdDebug(750) << "ispellErrors [" << buffer << "]\n" << endl; @@ -1313,7 +1313,7 @@ void KSpell::cleanUp() proc->closeStdin(); } -void KSpell::ispellExit( KProcess* ) +void KSpell::ispellExit( TDEProcess* ) { kdDebug() << "KSpell::ispellExit() " << m_status << endl; diff --git a/tdeui/kspell.h b/tdeui/kspell.h index e96b61a2e..fef733507 100644 --- a/tdeui/kspell.h +++ b/tdeui/kspell.h @@ -28,7 +28,7 @@ class TQTextCodec; class KProcIO; -class KProcess; +class TDEProcess; class KSpellDlg; /** @@ -461,9 +461,9 @@ protected slots: void suggestWord( KProcIO * ); void slotStopCancel (int); - void ispellExit (KProcess *); + void ispellExit (TDEProcess *); void emitDeath(); - void ispellErrors (KProcess *, char *, int); + void ispellErrors (TDEProcess *, char *, int); void checkNext(); private slots: diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp index 6d605dcd7..b88be8e06 100644 --- a/tdeui/ksplashscreen.cpp +++ b/tdeui/ksplashscreen.cpp @@ -27,7 +27,7 @@ KSplashScreen::KSplashScreen(const TQPixmap &pixmap, WFlags f): TQSplashScreen(pixmap, f) { - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); resize(pixmap.width(), pixmap.height()); setGeometry( ( desk.width() / 2 ) - ( width() / 2 ) + desk.left(), ( desk.height() / 2 ) - ( height() / 2 ) + desk.top(), diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index b70c8ae9c..444f34c6b 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) { // make the size grip stuff configurable // ...but off by default (sven) - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString group(config->group()); config->setGroup(TQString::fromLatin1("StatusBar style")); bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp index befd93fc1..2f33e4843 100644 --- a/tdeui/kstdaction.cpp +++ b/tdeui/kstdaction.cpp @@ -64,13 +64,13 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch case Preferences: case HelpContents: { - const TDEAboutData *aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData(); /* TODO KDE4 const TDEAboutData *aboutData; if ( parent ) aboutData = parent->instance()->aboutData(); else - aboutData = KGlobal::instance()->aboutData(); + aboutData = TDEGlobal::instance()->aboutData(); */ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index fa43dcaf2..5ce1bc074 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -114,7 +114,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( if (defaultLanguages.count() == 0) { - d->addLanguageButton(KGlobal::locale()->defaultLanguage(), true); + d->addLanguageButton(TDEGlobal::locale()->defaultLanguage(), true); } TQHBoxLayout *addButtonHorizontalLayout = new TQHBoxLayout(); @@ -185,7 +185,7 @@ void KSwitchLanguageDialog::languageOnButtonChanged(const TQString & languageCod { //update all buttons which have matching id //might update buttons which were not changed, but well... - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); } } } @@ -207,7 +207,7 @@ void KSwitchLanguageDialog::slotOk() first = false; } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->applicationLanguageList().join(":") != languageString) { @@ -241,7 +241,7 @@ KSwitchLanguageDialogPrivate::KSwitchLanguageDialogPrivate( void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *button) { - KLocale *locale = KGlobal::locale(); + KLocale *locale = TDEGlobal::locale(); TQStringList allLanguages = locale->allLanguagesTwoAlpha(); for ( TQStringList::ConstIterator it = allLanguages.begin(); it != allLanguages.end(); ++it ) { @@ -258,7 +258,7 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQStringList languagesList; if (config->hasGroup("Locale")) @@ -272,7 +272,7 @@ TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList() } if (languagesList.empty()) { - languagesList = KGlobal::locale()->languageList(); + languagesList = TDEGlobal::locale()->languageList(); } return languagesList; } @@ -283,7 +283,7 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo KLanguageButton *languageButton = new KLanguageButton(page); - languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode)); + languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode)); fillApplicationLanguages(languageButton); diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index e118fcd74..66b43e26f 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -290,7 +290,7 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, d->checksDone = 0; d->completeRehighlightRequired = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 ); d->disablePercentage = QMIN( d->disablePercentage, 101 ); @@ -335,7 +335,7 @@ KDictSpellingHighlighter::~KDictSpellingHighlighter() void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) { kdDebug(0) << "KDictSpellingHighlighter::slotSpellReady( " << spell << " )" << endl; - KConfigGroup cg( KGlobal::config(),"KSpell" ); + KConfigGroup cg( TDEGlobal::config(),"KSpell" ); if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { @@ -539,7 +539,7 @@ void KDictSpellingHighlighter::slotLocalSpellConfigChanged() TQString KDictSpellingHighlighter::spellKey() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "KSpell" ); config->reparseConfiguration(); TQString key; diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 668f070dd..e24fde38a 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -95,7 +95,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) { d->on_all_desktops = false; } - setCaption( KGlobal::instance()->aboutData()->programName()); + setCaption( TDEGlobal::instance()->aboutData()->programName()); setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h index a74dc9be6..151cf0166 100644 --- a/tdeui/ksystemtray.h +++ b/tdeui/ksystemtray.h @@ -117,7 +117,7 @@ public: * * @since 3.2 */ - static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=TDEGlobal::instance() ); /** * Loads an icon @p icon using the icon loader class of the given instance @p instance. @@ -128,7 +128,7 @@ public: * * @since 3.5.12 */ - static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=KGlobal::instance() ); + static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() ); signals: /** diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index a2d20a505..35242da4c 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mDragSwitchTab = 0; } - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay || newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay ) @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index a87a677d6..1be5985ad 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -42,9 +42,9 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(KGlobal::config(), "General"); - m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30); - m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3); + KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); + m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; } }; diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index 6b3685a81..15f14d711 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -112,7 +112,7 @@ void KTextBrowser::viewportMouseMoveEvent( TQMouseEvent* e) void KTextBrowser::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextBrowser::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index bc077ddb2..5b1795321 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -252,7 +252,7 @@ TQPopupMenu *KTextEdit::createPopupMenu() void KTextEdit::contentsWheelEvent( TQWheelEvent *e ) { - if ( KGlobalSettings::wheelMouseZooms() ) + if ( TDEGlobalSettings::wheelMouseZooms() ) TQTextEdit::contentsWheelEvent( e ); else // thanks, we don't want to zoom, so skip QTextEdit's impl. TQScrollView::contentsWheelEvent( e ); diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h index 8e42e3a6a..3400e256b 100644 --- a/tdeui/ktimezonewidget.h +++ b/tdeui/ktimezonewidget.h @@ -98,7 +98,7 @@ public: * transformed via an i18n lookup, so the caller should previously have * set the timezone catalogue: * \code - * KGlobal::locale()->insertCatalogue("timezones"); + * TDEGlobal::locale()->insertCatalogue("timezones"); * \endcode * * @return formatted timezone name. diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 3be1d57e6..b9e3bc594 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -180,7 +180,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQImage img; int h,s,v; - mBlendedColor = KGlobalSettings::activeTitleColor(); + mBlendedColor = TDEGlobalSettings::activeTitleColor(); mBlendedColor.hsv(&h,&s,&v); mBlendedColor.setHsv(h, int(s*(71/76.0)), int(v*(67/93.0))); @@ -194,11 +194,11 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } - mBaseColor = KGlobalSettings::alternateBackgroundColor(); + mBaseColor = TDEGlobalSettings::alternateBackgroundColor(); mBaseColor.hsv(&h,&s,&v); mBaseColor.setHsv(h, int(s*(10/6.0)), int(v*(93/99.0))); - mTextColor = KGlobalSettings::textColor(); + mTextColor = TDEGlobalSettings::textColor(); mDatabase = db; @@ -206,8 +206,8 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) setCaption(i18n("Tip of the Day")); #ifdef Q_WS_X11 KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint()); @@ -222,7 +222,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *titlePane = new TQLabel(this); titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); - titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); + titlePane->setFont(TQFont(TDEGlobalSettings::generalFont().family(), 20, TQFont::Bold)); titlePane->setAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -244,7 +244,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) mTipText->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary ); mTipText->mimeSourceFactory()->addFilePath( - KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); + TDEGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/"); mTipText->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); mTipText->setHScrollBarMode(TQScrollView::AlwaysOff); mTipText->setLinkUnderline(false); @@ -258,7 +258,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) pal.setColor( TQPalette::Inactive, TQColorGroup::Link, mBlendedColor ); mTipText->setPalette(pal); - TQStringList icons = KGlobal::dirs()->resourceDirs("icon"); + TQStringList icons = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::Iterator it; for (it = icons.begin(); it != icons.end(); ++it) mTipText->mimeSourceFactory()->addFilePath(*it); @@ -273,7 +273,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) resize(550, 230); TQSize sh = size(); - TQRect rect = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect rect = TDEGlobalSettings::splashScreenDesktopGeometry(); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); @@ -374,7 +374,7 @@ static TQString fixTip(TQString tip) if (iconRegExp.search(tip)>-1) { TQString iconName = iconRegExp.cap(1); if (!iconName.isEmpty()) - if (KGlobal::dirs()->findResource("icon", iconName).isEmpty()) + if (TDEGlobal::dirs()->findResource("icon", iconName).isEmpty()) tip.replace("crystalsvg","hicolor"); } diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index 0fd9e5ada..b6c67568d 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -913,9 +913,9 @@ int KToolBar::iconSize() const int KToolBar::iconSizeDefault() const { if (!::qstrcmp(name(), "mainToolBar")) - return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::MainToolbar); - return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); + return TDEGlobal::iconLoader()->currentSize(KIcon::Toolbar); } void KToolBar::setEnableContextMenu(bool enable ) @@ -1020,7 +1020,7 @@ void KToolBar::saveState() } // if that didn't work, we save to the config file - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); saveSettings(config, TQString::null); config->sync(); } @@ -1469,13 +1469,13 @@ void KToolBar::slotReadConfig() // Read appearance settings (hmm, we used to do both here, // but a well behaved application will call applyMainWindowSettings // anyway, right ?) - applyAppearanceSettings(KGlobal::config(), TQString::null ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null ); } void KToolBar::slotAppearanceChanged() { // Read appearance settings from global file. - applyAppearanceSettings(KGlobal::config(), TQString::null, true /* lose local settings */ ); + applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ ); // And remember to save the new look later KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow()); @@ -1487,24 +1487,24 @@ void KToolBar::slotAppearanceChanged() bool KToolBar::highlightSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); } //static bool KToolBar::transparentSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { TQString grpToolbar(TQString::fromLatin1("Toolbar style")); - KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); + KConfigGroupSaver saver(TDEGlobal::config(), grpToolbar); + TQString icontext = TDEGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) @@ -1527,12 +1527,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG // This is the reason for the xmlgui tests below. bool xmlgui = d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty(); - KConfig *gconfig = KGlobal::config(); + KConfig *gconfig = TDEGlobal::config(); - static const TQString &attrIconText = KGlobal::staticQString("IconText"); - static const TQString &attrHighlight = KGlobal::staticQString("Highlighting"); - static const TQString &attrTrans = KGlobal::staticQString("TransparentMoving"); - static const TQString &attrIconSize = KGlobal::staticQString("IconSize"); + static const TQString &attrIconText = TDEGlobal::staticQString("IconText"); + static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting"); + static const TQString &attrTrans = TDEGlobal::staticQString("TransparentMoving"); + static const TQString &attrIconSize = TDEGlobal::staticQString("IconSize"); // we actually do this in two steps. // First, we read in the global styles [Toolbar style] (from the KControl module). @@ -1670,11 +1670,11 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool { KConfigGroupSaver cgs(config, configGroup); - static const TQString &attrPosition = KGlobal::staticQString("Position"); - static const TQString &attrIndex = KGlobal::staticQString("Index"); - static const TQString &attrOffset = KGlobal::staticQString("Offset"); - static const TQString &attrNewLine = KGlobal::staticQString("NewLine"); - static const TQString &attrHidden = KGlobal::staticQString("Hidden"); + static const TQString &attrPosition = TDEGlobal::staticQString("Position"); + static const TQString &attrIndex = TDEGlobal::staticQString("Index"); + static const TQString &attrOffset = TDEGlobal::staticQString("Offset"); + static const TQString &attrNewLine = TDEGlobal::staticQString("NewLine"); + static const TQString &attrHidden = TDEGlobal::staticQString("Hidden"); TQString position = config->readEntry(attrPosition, d->PositionDefault); int index = config->readNumEntry(attrIndex, -1); @@ -2062,7 +2062,7 @@ KPopupMenu *KToolBar::contextMenu() KPopupMenu *size = new KPopupMenu( context, "size" ); size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); // Query the current theme for available sizes - KIconTheme *theme = KGlobal::instance()->iconLoader()->theme(); + KIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme(); TQValueList<int> avSizes; if (theme) { diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index aa3717324..5fffdd592 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -207,7 +207,7 @@ public: */ int insertButton(const TQString& icon, int id, bool enabled = true, const TQString& text = TQString::null, int index=-1, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * This is the same as above, but with specified signals and @@ -230,7 +230,7 @@ public: int insertButton(const TQString& icon, int id, const char *signal, const TQObject *receiver, const char *slot, bool enabled = true, const TQString& text = TQString::null, - int index=-1, TDEInstance *_instance = KGlobal::instance() ); + int index=-1, TDEInstance *_instance = TDEGlobal::instance() ); /** * Inserts a button (a KToolBarButton) with the specified diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 66b9d6ee9..5a4240f04 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -69,7 +69,7 @@ public: m_iconSize = 0; m_parent = 0; - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); } ~KToolBarButtonPrivate() { @@ -209,7 +209,7 @@ void KToolBarButton::modeChange() if (d->m_iconText != KToolBar::IconOnly) { // okay, we have to deal with fonts. let's get our information now - TQFont tmp_font = KGlobalSettings::toolBarFont(); + TQFont tmp_font = TDEGlobalSettings::toolBarFont(); // now parse out our font sizes from our chosen font TQFontMetrics fm(tmp_font); @@ -421,7 +421,7 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() - > KGlobalSettings::dndEventDelay()) + > TDEGlobalSettings::dndEventDelay()) { openPopup(); return true; @@ -498,7 +498,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); int dx, dy; - TQFont tmp_font(KGlobalSettings::toolBarFont()); + TQFont tmp_font(TDEGlobalSettings::toolBarFont()); TQFontMetrics fm(tmp_font); TQRect textRect; int textFlags = 0; @@ -606,11 +606,11 @@ void KToolBarButton::drawButton( TQPainter *_painter ) // Draw the text at the position given by textRect, and using textFlags if (!textLabel().isNull() && !textRect.isNull()) { - _painter->setFont(KGlobalSettings::toolBarFont()); + _painter->setFont(TDEGlobalSettings::toolBarFont()); if (!isEnabled()) _painter->setPen(palette().disabled().dark()); else if(d->m_isRaised) - _painter->setPen(KGlobalSettings::toolBarHighlightColor()); + _painter->setPen(TDEGlobalSettings::toolBarHighlightColor()); else _painter->setPen( colorGroup().buttonText() ); _painter->drawText(textRect, textFlags, textLabel()); diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h index df26fea7c..126f8923a 100644 --- a/tdeui/ktoolbarbutton.h +++ b/tdeui/ktoolbarbutton.h @@ -61,7 +61,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 71f90abd9..0a95a2c70 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -36,7 +36,7 @@ class KURLLabel::Private public: Private (const TQString& url, KURLLabel* label) : URL (url), - LinkColor (KGlobalSettings::linkColor()), + LinkColor (TDEGlobalSettings::linkColor()), HighlightedLinkColor (Qt::red), Tip(url), Cursor (0L), @@ -358,7 +358,7 @@ bool KURLLabel::event (TQEvent *e) p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, palette().active().foreground()); setPalette(p); - d->LinkColor = KGlobalSettings::linkColor(); + d->LinkColor = TDEGlobalSettings::linkColor(); setLinkColor(d->LinkColor); return true; } diff --git a/tdeui/kwizard.cpp b/tdeui/kwizard.cpp index 21462faad..0e378dbf2 100644 --- a/tdeui/kwizard.cpp +++ b/tdeui/kwizard.cpp @@ -31,7 +31,7 @@ KWizard::KWizard( TQWidget *parent, const char *name, bool modal, WFlags f ) : TQWizard( parent, name, modal, f ) { - bool useIcons = KGlobalSettings::showIconsOnPushButtons(); + bool useIcons = TDEGlobalSettings::showIconsOnPushButtons(); if ( useIcons ) { diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index 43f716870..32083a2c3 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -176,7 +176,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIconSet( icon, 16, instance ); } @@ -351,7 +351,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) @@ -373,7 +373,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { TDEInstance *instance = d->m_instance; if ( !instance ) - instance = KGlobal::instance(); + instance = TDEGlobal::instance(); pix = SmallIcon( icon, instance ); } diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index d8548cadb..da22e83fb 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -41,7 +41,7 @@ class KXMLGUIClientPrivate public: KXMLGUIClientPrivate() { - m_instance = KGlobal::instance(); + m_instance = TDEGlobal::instance(); m_parent = 0L; m_builder = 0L; m_actionCollection = 0; @@ -116,7 +116,7 @@ KActionCollection *KXMLGUIClient::actionCollection() const KAction *KXMLGUIClient::action( const TQDomElement &element ) const { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); return actionCollection()->action( element.attribute( attrName ).latin1() ); } @@ -250,17 +250,17 @@ void KXMLGUIClient::setDOMDocument( const TQDomDocument &document, bool merge ) bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, KActionCollection *actionCollection ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMerge = KGlobal::staticQString( "Merge" ); - static const TQString &tagSeparator = KGlobal::staticQString( "Separator" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); - static const TQString &attrAppend = KGlobal::staticQString( "append" ); - static const TQString &attrWeakSeparator = KGlobal::staticQString( "weakSeparator" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &tagText = KGlobal::staticQString( "text" ); - static const TQString &attrAlreadyVisited = KGlobal::staticQString( "alreadyVisited" ); - static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" ); - static const TQString &attrOne = KGlobal::staticQString( "1" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); + static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrAppend = TDEGlobal::staticQString( "append" ); + static const TQString &attrWeakSeparator = TDEGlobal::staticQString( "weakSeparator" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &tagText = TDEGlobal::staticQString( "text" ); + static const TQString &attrAlreadyVisited = TDEGlobal::staticQString( "alreadyVisited" ); + static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &attrOne = TDEGlobal::staticQString( "1" ); // there is a possibility that we don't want to merge in the // additive.. rather, we might want to *replace* the base with the @@ -501,9 +501,9 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive ) { - static const TQString &tagAction = KGlobal::staticQString( "Action" ); - static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQDomNode n = additive.firstChild(); while ( !n.isNull() ) diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 3c3f24668..78b918862 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -51,9 +51,9 @@ class KXMLGUIFactoryPrivate : public BuildState public: KXMLGUIFactoryPrivate() { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); - static const TQString &actionList = KGlobal::staticQString( "actionlist" ); - static const TQString &name = KGlobal::staticQString( "name" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); + static const TQString &actionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &name = TDEGlobal::staticQString( "name" ); m_rootNode = new ContainerNode( 0L, TQString::null, 0L ); m_defaultMergingName = defaultMergingName; @@ -103,7 +103,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInst TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file; if (!TQDir::isRelativePath(filename)) @@ -142,7 +142,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, const TQString& filename, const TDEInstance *_instance ) { - const TDEInstance *instance = _instance ? _instance : KGlobal::instance(); + const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance(); TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) @@ -224,7 +224,7 @@ KXMLGUIFactory::~KXMLGUIFactory() void KXMLGUIFactory::addClient( KXMLGUIClient *client ) { kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis - static const TQString &actionPropElementName = KGlobal::staticQString( "ActionProperties" ); + static const TQString &actionPropElementName = TDEGlobal::staticQString( "ActionProperties" ); if ( client->factory() ) { if ( client->factory() == this ) @@ -497,7 +497,7 @@ void KXMLGUIFactory::unplugActionList( KXMLGUIClient *client, const TQString &na void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElement ) { - static const TQString &tagAction = KGlobal::staticQString( "action" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); for (TQDomNode n = actionPropElement.firstChild(); !n.isNull(); n = n.nextSibling() ) @@ -528,7 +528,7 @@ void KXMLGUIFactory::configureAction( KAction *action, const TQDomNamedNodeMap & void KXMLGUIFactory::configureAction( KAction *action, const TQDomAttr &attribute ) { - static const TQString &attrShortcut = KGlobal::staticQString( "shortcut" ); + static const TQString &attrShortcut = TDEGlobal::staticQString( "shortcut" ); TQString attrName = attribute.name(); // If the attribute is a deprecated "accel", change to "shortcut". @@ -588,8 +588,8 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create ) { - static const TQString& attrName = KGlobal::staticQString( "name" ); - static const TQString& tagAction = KGlobal::staticQString( "Action" ); + static const TQString& attrName = TDEGlobal::staticQString( "name" ); + static const TQString& tagAction = TDEGlobal::staticQString( "Action" ); for( TQDomNode it = elem.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement e = it.toElement(); if( e.attribute( attrName ) == sName ) diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp index 26d120de7..522fb659d 100644 --- a/tdeui/kxmlguifactory_p.cpp +++ b/tdeui/kxmlguifactory_p.cpp @@ -220,7 +220,7 @@ void ContainerNode::plugActionList( BuildState &state ) void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -262,7 +262,7 @@ void ContainerNode::unplugActionList( BuildState &state ) void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -365,7 +365,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ) { - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); // ### slow for ( TQDomNode n = baseElement.firstChild(); !n.isNull(); @@ -412,7 +412,7 @@ void ContainerNode::unplugActions( BuildState &state ) void ContainerNode::unplugClient( ContainerClient *client ) { - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); assert( builder ); @@ -497,7 +497,7 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName, int BuildHelper::calcMergingIndex( const TQDomElement &element, MergingIndexList::Iterator &it, TQString &group ) { - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); bool haveGroup = false; group = element.attribute( attrGroup ); @@ -521,7 +521,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) : containerClient( 0 ), ignoreDefaultMergingIndex( false ), m_state( state ), parentNode( node ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); // create a list of supported container and custom tags customTags = m_state.builderCustomTags; @@ -556,12 +556,12 @@ void BuildHelper::build( const TQDomElement &element ) void BuildHelper::processElement( const TQDomElement &e ) { // some often used QStrings - static const TQString &tagAction = KGlobal::staticQString( "action" ); - static const TQString &tagMerge = KGlobal::staticQString( "merge" ); - static const TQString &tagState = KGlobal::staticQString( "state" ); - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &attrName = KGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticQString( "action" ); + static const TQString &tagMerge = TDEGlobal::staticQString( "merge" ); + static const TQString &tagState = TDEGlobal::staticQString( "state" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &attrName = TDEGlobal::staticQString( "name" ); TQString tag( e.tagName().lower() ); TQString currName( e.attribute( attrName ) ); @@ -670,10 +670,10 @@ void BuildHelper::processStateElement( const TQDomElement &element ) void BuildHelper::processMergeElement( const TQString &tag, const TQString &name, const TQDomElement &e ) { - static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = KGlobal::staticQString( "actionlist" ); - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); - static const TQString &attrGroup = KGlobal::staticQString( "group" ); + static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); + static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); TQString mergingName( name ); if ( mergingName.isEmpty() ) @@ -734,7 +734,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name void BuildHelper::processContainerElement( const TQDomElement &e, const TQString &tag, const TQString &name ) { - static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" ); + static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" ); ContainerNode *containerNode = parentNode->findContainer( name, tag, &containerList, diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index b8b7d40f8..9e92fb47e 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -94,7 +94,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) connect( cbListView, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); //Create IconView TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index 234f62543..94314ffbc 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -52,7 +52,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); - m_ro->setCompletionMode( KGlobalSettings::CompletionAuto ); + m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); @@ -142,7 +142,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) KCompletion * s_pCompletion = new KCompletion; s_pCompletion->setOrder( KCompletion::Weighted ); s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) ); - s_pCompletion->setCompletionMode( KGlobalSettings::completionMode() ); + s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() ); m_konqc->setCompletionObject( s_pCompletion ); TQPixmap pix = SmallIcon("www"); diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp index 582ae19e9..9fc108e52 100644 --- a/tdeui/tests/klistviewtest.cpp +++ b/tdeui/tests/klistviewtest.cpp @@ -28,12 +28,12 @@ int main( int argc, char **argv ) new KListViewItem( view, "Item 1"); new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" ); - view->restoreLayout( KGlobal::config(), "ListView" ); + view->restoreLayout( TDEGlobal::config(), "ListView" ); new KListViewItem( view, "Item 3" ); dialog.exec(); - view->saveLayout( KGlobal::config(), "ListView" ); + view->saveLayout( TDEGlobal::config(), "ListView" ); return 0; } diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/ktoolbarlabelactiontest.cpp index 5c1ffa757..617808f40 100644 --- a/tdeui/tests/ktoolbarlabelactiontest.cpp +++ b/tdeui/tests/ktoolbarlabelactiontest.cpp @@ -86,7 +86,7 @@ int main( int argc, char **argv ) { TDEApplication app( argc, argv, "ktoolbarlabelactiontest" ); - KGlobal::instance()->dirs()->addResourceDir("data", "."); + TDEGlobal::instance()->dirs()->addResourceDir("data", "."); MainWindow* mw = new MainWindow; app.setMainWidget(mw); diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index 9f764e774..4c9e83bc1 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -22,7 +22,7 @@ int main( int argc, char **argv ) // KXMLGUIClient looks in the "data" resource for the .rc files // Let's add $PWD (ideally $srcdir instead...) to it - KGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); + TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() ); KMainWindow *mainwindow = new KMainWindow; |