TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent 9a898d493f
commit 79b21d47bc
490 changed files with 1962 additions and 1962 deletions
Show Stats Download Patch File Download Diff File

2
doc/kinfocenter/samba/index.docbook
Unescape Escape View File

@ -188,7 +188,7 @@ often, or which user opened the most files or whatever.</para>
<title>Contributors</title>
<listitem><para>Conversion to kcontrol applet:</para>
<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
<listitem><para>Use of <classname>KProcess</classname> instead of popen, and more error checking:</para>
<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
<para>&David.Faure; &David.Faure.mail;</para></listitem>
<listitem><para>Conversion to kcmodule, added tab pages 2,3,4, bug
fixed:</para>

2
doc/ksplashml/index.docbook
Unescape Escape View File

@ -1154,7 +1154,7 @@ void Theme2k::initUi()
mText-&gt;setFixedHeight( 48 );
setFixedSize( vbox-&gt;sizeHint() );
QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
}

18
drkonqi/backtrace.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent,
: TQObject(parent, name),
m_krashconf(krashconf), m_temp(NULL), m_temp_cmd(NULL)
{
m_proc = new KProcess;
m_proc = new TDEProcess;
}
BackTrace::~BackTrace()
@ -123,7 +123,7 @@ void BackTrace::start()
}
// start the debugger
m_proc = new KProcess;
m_proc = new TDEProcess;
m_proc->setUseShell(true);
if (need_root_access == false) {
@ -133,15 +133,15 @@ void BackTrace::start()
*m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
}
connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
TQT_SLOT(slotReadInput(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(slotReadInput(TDEProcess*, char*, int)));
connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_SLOT(slotProcessExited(TDEProcess*)));
m_proc->start ( KProcess::NotifyOnExit, KProcess::All );
m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All );
}
void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
void BackTrace::slotReadInput(TDEProcess *, char* buf, int buflen)
{
TQString newstr = TQString::fromLocal8Bit(buf, buflen);
newstr.replace("\n\n", "\n");
@ -156,7 +156,7 @@ void BackTrace::slotReadInput(KProcess *, char* buf, int buflen)
}
}
void BackTrace::slotProcessExited(KProcess *proc)
void BackTrace::slotProcessExited(TDEProcess *proc)
{
// start it again
kill(m_krashconf->pid(), SIGCONT);

8
drkonqi/backtrace.h
Unescape Escape View File

@ -28,7 +28,7 @@
#ifndef BACKTRACE_H
#define BACKTRACE_H
class KProcess;
class TDEProcess;
class KrashConfig;
class KTempFile;
@ -52,13 +52,13 @@ signals:
void done(const TQString &); // replaces whole text
protected slots:
void slotProcessExited(KProcess * proc);
void slotReadInput(KProcess * proc, char * buf, int buflen);
void slotProcessExited(TDEProcess * proc);
void slotReadInput(TDEProcess * proc, char * buf, int buflen);
private:
bool usefulBacktrace();
void processBacktrace();
KProcess *m_proc;
TDEProcess *m_proc;
const KrashConfig *m_krashconf;
KTempFile *m_temp;
KTempFile *m_temp_cmd;

2
drkonqi/debugger.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
m_backtrace = new KTextBrowser(this);
m_backtrace->setTextFormat(TQt::PlainText);
m_backtrace->setFont(KGlobalSettings::fixedFont());
m_backtrace->setFont(TDEGlobalSettings::fixedFont());
TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );

2
drkonqi/krashconf.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
KStartupInfo::sendFinish( id );
}
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("drkonqi");
// maybe we should check if it's relative?

4
drkonqi/toplevel.cpp
Unescape Escape View File

@ -176,10 +176,10 @@ void Toplevel :: slotUser2()
TQString str = m_krashconf->debugger();
m_krashconf->expandString(str, true);
KProcess proc;
TDEProcess proc;
proc.setUseShell(true);
proc << str;
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
void Toplevel :: slotNewDebuggingApp(const TQString& launchName)

8
kappfinder/common.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
// find out where to put the .desktop files
TQString destName;
if ( destDir.isNull() )
destDir = KGlobal::dirs()->saveLocation( "apps" );
destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";
@ -82,7 +82,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
exec = exec.left( pos );
// try to locate the binary
TQString pexec = KGlobal::dirs()->findExe( exec,
TQString pexec = TDEGlobal::dirs()->findExe( exec,
TQString( ::getenv( "PATH" ) ) + ":/usr/X11R6/bin:/usr/games" );
if ( pexec.isEmpty() ) {
kdDebug(DBG_CODE) << "looking for " << exec.local8Bit()
@ -134,11 +134,11 @@ void decorateDirs( TQString destDir )
{
// find out where to put the .directory files
if ( destDir.isNull() )
destDir = KGlobal::dirs()->saveLocation( "apps" );
destDir = TDEGlobal::dirs()->saveLocation( "apps" );
else
destDir += "/";
TQStringList dirs = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );
TQStringList dirs = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", true );
TQStringList::Iterator it;
for ( it = dirs.begin(); it != dirs.end(); ++it ) {

2
kappfinder/main_install.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ int main( int argc, char *argv[] )
return -1;
}
TQStringList templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
TQStringList templates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
TQString dir = TQString( argv[ 1 ] ) + "/";

4
kappfinder/toplevel.cpp
Unescape Escape View File

@ -161,9 +161,9 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &
void TopLevel::slotScan()
{
KIconLoader* loader = KGlobal::iconLoader();
KIconLoader* loader = TDEGlobal::iconLoader();
mTemplates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
mAppCache.clear();

2
kate/app/kateapp.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ KateApp::KateApp (TDECmdLineArgs *args)
dcopClient()->suspend();
// insert right translations for the katepart
KGlobal::locale()->insertCatalogue("katepart");
TDEGlobal::locale()->insertCatalogue("katepart");
// some global default
Kate::Document::setFileChangedDialogsActivated (true);

2
kate/app/kateconsole.cpp
Unescape Escape View File

@ -70,7 +70,7 @@ void KateConsole::loadConsoleIfNeeded()
setFocusProxy(m_part->widget());
KGlobal::locale()->insertCatalogue("konsole");
TDEGlobal::locale()->insertCatalogue("konsole");
m_part->widget()->show();

20
kate/app/kategrepdialog.cpp
Unescape Escape View File

@ -69,7 +69,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
: TQWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0)
{
setCaption(i18n("Find in Files"));
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup("GrepTool");
lastSearchItems = config->readListEntry("LastSearchItems");
lastSearchPaths = config->readListEntry("LastSearchPaths");
@ -351,7 +351,7 @@ void GrepTool::slotSearch()
TQString pattern = leTemplate->text();
pattern.replace( "%s", s );
childproc = new KProcess();
childproc = new TDEProcess();
childproc->setWorkingDirectory( m_workingDir );
*childproc << "find" << ".";
if (!cbRecursive->isChecked())
@ -377,18 +377,18 @@ void GrepTool::slotSearch()
*childproc << "/dev/null"; //trick to have grep always display the filename
*childproc << ";";
connect( childproc, TQT_SIGNAL(processExited(KProcess *)),
connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(childExited()) );
connect( childproc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
TQT_SLOT(receivedOutput(KProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
TQT_SLOT(receivedErrOutput(KProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
// actually it should be checked whether the process was started successfully
lbResult->setCursor( TQCursor(Qt::WaitCursor) );
btnClear->setEnabled( false );
btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
void GrepTool::slotSearchFor(const TQString &pattern)
@ -483,13 +483,13 @@ void GrepTool::childExited()
finish();
}
void GrepTool::receivedOutput(KProcess */*proc*/, char *buffer, int buflen)
void GrepTool::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
buf += TQCString(buffer, buflen+1);
processOutput();
}
void GrepTool::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen)
void GrepTool::receivedErrOutput(TDEProcess */*proc*/, char *buffer, int buflen)
{
errbuf += TQCString( buffer, buflen + 1 );
}

8
kate/app/kategrepdialog.h
Unescape Escape View File

@ -30,7 +30,7 @@ class TQCheckBox;
class TQListBox;
class KPushButton;
class TQLabel;
class KProcess;
class TDEProcess;
class KConfig;
class KURLRequester;
class TQEvent;
@ -64,8 +64,8 @@ protected:
private slots:
void templateActivated(int index);
void childExited();
void receivedOutput(KProcess *proc, char *buffer, int buflen);
void receivedErrOutput(KProcess *proc, char *buffer, int buflen);
void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
void receivedErrOutput(TDEProcess *proc, char *buffer, int buflen);
void itemSelected(const TQString&);
void slotSearch();
void slotCancel();
@ -82,7 +82,7 @@ private:
TQCheckBox *cbCasesensitive, *cbRegex;
TQListBox *lbResult;
KPushButton *btnSearch, *btnClear;
KProcess *childproc;
TDEProcess *childproc;
TQString buf;
TQString errbuf;
KConfig* config;

2
kate/app/katemain.h
Unescape Escape View File

@ -45,7 +45,7 @@ class KFileViewItem;
class KHistoryCombo;
class KLineEdit;
class KListBox;
class KProcess;
class TDEProcess;
class KPushButton;
class KRecentFilesAction;
class KSelectAction;

6
kate/app/katemdi.cpp
Unescape Escape View File

@ -287,7 +287,7 @@ void Sidebar::setSplitter (Splitter *sp)
{
m_splitter = sp;
m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
m_ownSplit->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_ownSplit->setChildrenCollapsible( false );
m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
m_ownSplit->hide ();
@ -673,7 +673,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
m_hSplitter = new Splitter (Qt::Horizontal, hb);
m_hSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@ -683,7 +683,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
m_vSplitter = new Splitter (Qt::Vertical, vb);
m_vSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);

10
kate/app/katemwmodonhddialog.cpp
Unescape Escape View File

@ -212,16 +212,16 @@ void KateMwModOnHdDialog::slotDiff()
if ( KateDocManager::self()->documentInfo( doc )->modifiedOnDiscReason == 3 )
return;
// 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" << "-" << 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 = doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@ -247,7 +247,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p)
p->ackRead();
}
void KateMwModOnHdDialog::slotPDone( KProcess *p )
void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )

4
kate/app/katemwmodonhddialog.h
Unescape Escape View File

@ -26,7 +26,7 @@
typedef TQPtrVector<Kate::Document> DocVector;
class KProcIO;
class KProcess;
class TDEProcess;
/**
* A dialog for handling multiple documents modified on disk
* from within KateMainWindow
@ -47,7 +47,7 @@ class KateMwModOnHdDialog : public KDialogBase
void slotDiff();
void slotSelectionChanged();
void slotPRead(KProcIO*);
void slotPDone(KProcess*);
void slotPDone(TDEProcess*);
private:
enum Action { Ignore, Overwrite, Reload };

2
kate/app/katesavemodifieddialog.cpp
Unescape Escape View File

@ -48,7 +48,7 @@ public:
STATE state() const { return m_state;}
void setState(enum STATE state) {
m_state=state;
KIconLoader *loader = KGlobal::instance()->iconLoader();
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
switch (state) {
case InitialState:
setPixmap(0,TQPixmap());

6
kate/app/katesession.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ KateSession::KateSession (KateSessionManager *manager, const TQString &fileName,
void KateSession::init ()
{
// given file exists, use it to load some stuff ;)
if (!m_sessionFileRel.isEmpty() && KGlobal::dirs()->exists(sessionFile ()))
if (!m_sessionFileRel.isEmpty() && TDEGlobal::dirs()->exists(sessionFile ()))
{
KSimpleConfig config (sessionFile (), true);
@ -146,7 +146,7 @@ bool KateSession::create (const TQString &name, bool force)
KMD5 md5 (tname);
m_sessionFileRel = TQString ("%1.katesession").arg (md5.hexDigest().data());
if (!KGlobal::dirs()->exists(sessionFile ()))
if (!TDEGlobal::dirs()->exists(sessionFile ()))
break;
}
@ -211,7 +211,7 @@ KateSessionManager::KateSessionManager (TQObject *parent)
kdDebug() << "LOCAL SESSION DIR: " << m_sessionsDir << endl;
// create dir if needed
KGlobal::dirs()->makeDir (m_sessionsDir);
TDEGlobal::dirs()->makeDir (m_sessionsDir);
}
KateSessionManager::~KateSessionManager()

4
kate/app/kateviewspace.cpp
Unescape Escape View File

@ -349,8 +349,8 @@ KateVSStatusBar::~KateVSStatusBar ()
void KateVSStatusBar::setStatus( int r, int c, int ovr, bool block, int, const TQString &msg )
{
m_lineColLabel->setText(
i18n(" Line: %1 Col: %2 ").arg(KGlobal::locale()->formatNumber(r+1, 0))
.arg(KGlobal::locale()->formatNumber(c+1, 0)) );
i18n(" Line: %1 Col: %2 ").arg(TDEGlobal::locale()->formatNumber(r+1, 0))
.arg(TDEGlobal::locale()->formatNumber(c+1, 0)) );
if (ovr == 0)
m_insertModeLabel->setText( i18n(" R/O ") );

2
kate/app/kateviewspacecontainer.cpp
Unescape Escape View File

@ -455,7 +455,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );
s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
if (! isFirstTime) {
// anders: make sure the split' viewspace is always

2
kate/app/kwritemain.cpp
Unescape Escape View File

@ -593,7 +593,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDEApplication a;
KGlobal::locale()->insertCatalogue("katepart");
TDEGlobal::locale()->insertCatalogue("katepart");
DCOPClient *client = kapp->dcopClient();
if (!client->isRegistered())

2
kate/utils/messageview.h
Unescape Escape View File

@ -36,7 +36,7 @@
@section Usage
To use it in the intended way:
@li Create a KProcess (or derived class)
@li Create a TDEProcess (or derived class)
@li As the output of the process arrives, hand it over
using addText(). The view will add it to the end and
make sure it is scrolled to the end.

10
kcontrol/access/kaccess.cpp
Unescape Escape View File

@ -115,14 +115,14 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
int KAccessApp::newInstance()
{
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
readSettings();
return 0;
}
void KAccessApp::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
// bell ---------------------------------------------------------------
@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
unsigned int enabled = requestedFeatures & ~features;
unsigned int disabled = features & ~requestedFeatures;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
if (enabled & XkbSlowKeysMask)
@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
dialog->deleteLater();
dialog = 0;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:
@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
dialog = 0;
requestedFeatures = features;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Keyboard");
switch (showModeCombobox->currentItem()) {
case 0:

2
kcontrol/access/kcmaccess.cpp
Unescape Escape View File

@ -578,7 +578,7 @@ void KAccessConfig::changeFlashScreenColor()
void KAccessConfig::selectSound()
{
TQStringList list = KGlobal::dirs()->findDirs("sound", "");
TQStringList list = TDEGlobal::dirs()->findDirs("sound", "");
TQString start;
if (list.count()>0)
start = list[0];

38
kcontrol/arts/arts.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ extern "C" {
KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
{
KGlobal::locale()->insertCatalogue("kcmarts");
TDEGlobal::locale()->insertCatalogue("kcmarts");
return new KArtsModule(parent, "kcmarts" );
}
}
@ -96,16 +96,16 @@ static bool startArts()
*/
void KArtsModule::initAudioIOList()
{
KProcess* artsd = new KProcess();
TDEProcess* artsd = new TDEProcess();
*artsd << "artsd";
*artsd << "-A";
connect(artsd, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotArtsdExited(KProcess*)));
connect(artsd, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotProcessArtsdOutput(KProcess*, char*, int)));
connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
if (!artsd->start(KProcess::Block, KProcess::Stderr)) {
if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) {
KMessageBox::error(0, i18n("Unable to start the sound server to "
"retrieve possible sound I/O methods.\n"
"Only automatic detection will be "
@ -114,13 +114,13 @@ void KArtsModule::initAudioIOList()
}
}
void KArtsModule::slotArtsdExited(KProcess* proc)
void KArtsModule::slotArtsdExited(TDEProcess* proc)
{
latestProcessStatus = proc->exitStatus();
delete proc;
}
void KArtsModule::slotProcessArtsdOutput(KProcess*, char* buf, int len)
void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
{
// XXX(gioele): I suppose this will be called with full lines, am I wrong?
@ -438,10 +438,10 @@ void KArtsModule::slotTestSound()
if (configChanged && (userSavedChanges() == KMessageBox::Yes) || !artsdIsRunning() )
restartServer();
KProcess test;
TDEProcess test;
test << "artsplay";
test << locate("sound", "KDE_Startup_1.ogg");
test.start(KProcess::DontCare);
test.start(TDEProcess::DontCare);
}
void KArtsModule::defaults()
@ -538,13 +538,13 @@ bool KArtsModule::realtimeIsPossible()
static bool checked = false;
if (!checked)
{
KProcess* checkProcess = new KProcess();
TDEProcess* checkProcess = new TDEProcess();
*checkProcess << "artswrapper";
*checkProcess << "check";
connect(checkProcess, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotArtsdExited(KProcess*)));
if (!checkProcess->start(KProcess::Block))
connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
if (!checkProcess->start(TDEProcess::Block))
{
delete checkProcess;
realtimePossible = false;
@ -574,10 +574,10 @@ void KArtsModule::restartServer()
DCOPRef("knotify", "qt/knotify").send("quit");
// Shut down artsd
KProcess terminateArts;
TDEProcess terminateArts;
terminateArts << "artsshell";
terminateArts << "terminate";
terminateArts.start(KProcess::Block);
terminateArts.start(TDEProcess::Block);
if (starting)
{
@ -594,10 +594,10 @@ void KArtsModule::restartServer()
bool KArtsModule::artsdIsRunning()
{
KProcess check;
TDEProcess check;
check << "artsshell";
check << "status";
check.start(KProcess::Block);
check.start(TDEProcess::Block);
return (check.exitStatus() == 0);
}

6
kcontrol/arts/arts.h
Unescape Escape View File

@ -43,7 +43,7 @@
#include "hardwaretab.h"
class KProcess;
class TDEProcess;
class DeviceManager;
class KArtsModule : public KCModule
@ -67,8 +67,8 @@ private slots:
void slotChanged();
void slotTestSound();
void slotArtsdExited(KProcess* proc);
void slotProcessArtsdOutput(KProcess* p, char* buf, int len);
void slotArtsdExited(TDEProcess* proc);
void slotProcessArtsdOutput(TDEProcess* p, char* buf, int len);
//void slotStartServerChanged();
private:

4
kcontrol/arts/krichtextlabel.cpp
Unescape Escape View File

@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
m_defaultWidth = TQMIN(500, TDEGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
}

10
kcontrol/background/bgdialog.cpp
Unescape Escape View File

@ -69,8 +69,8 @@
BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
: BGDialog_UI(parent, "BGDialog")
{
m_pGlobals = new KGlobalBackgroundSettings(_config);
m_pDirs = KGlobal::dirs();
m_pGlobals = new TDEGlobalBackgroundSettings(_config);
m_pDirs = TDEGlobal::dirs();
m_multidesktop = _multidesktop;
m_previewUpdates = true;
@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
m_wallpaperPos = KBackgroundSettings::Centred; // Default
if (KGlobal::dirs()->isRestrictedResource("wallpaper"))
if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
{
m_urlWallpaperButton->hide();
m_buttonSetupWallpapers->hide();
@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens()
{
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM));
TQFont identifyFont(KGlobalSettings::generalFont());
TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);
@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
//FIXME set this to a server when we get one
//should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" );

2
kcontrol/background/bgdialog.h
Unescape Escape View File

@ -83,7 +83,7 @@ protected slots:
protected:
void getEScreen();
KGlobalBackgroundSettings *m_pGlobals;
TDEGlobalBackgroundSettings *m_pGlobals;
KStandardDirs *m_pDirs;
bool m_multidesktop;
bool m_useViewports;

8
kcontrol/background/bgrender.cpp
Unescape Escape View File

@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_State = 0;
m_isBusyCursor = false;
m_enableBusyCursor = false;
m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit)
delete m_pProc;
m_pProc = new KShellProcess;
*m_pProc << file;
connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)),
TQT_SLOT(slotBackgroundDone(KProcess *)));
connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(slotBackgroundDone(TDEProcess *)));
m_pProc->start(KShellProcess::NotifyOnExit);
retval = Wait;
break;
@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
void KBackgroundRenderer::slotBackgroundDone(KProcess *process)
void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process)
{
Q_ASSERT(process == m_pProc);
m_State |= BackgroundDone;

4
kcontrol/background/bgrender.h
Unescape Escape View File

@ -24,7 +24,7 @@ class TQString;
class TQTimer;
class KConfig;
class KProcess;
class TDEProcess;
class KTempFile;
class KShellProcess;
class KStandardDirs;
@ -68,7 +68,7 @@ signals:
void programSuccess(int desk); //programSuccess is emitted after imageDone
private slots:
void slotBackgroundDone(KProcess *);
void slotBackgroundDone(TDEProcess *);
void render();
void done();

54
kcontrol/background/bgsettings.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ KBackgroundPattern::KBackgroundPattern(TQString name)
dirty = false;
hashdirty = true;
m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_pattern", m_pDirs->kde_default("data") +
"kdesktop/patterns");
m_pConfig = 0L;
@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
/* static */
TQStringList KBackgroundPattern::list()
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
"kdesktop/patterns");
TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@ -209,7 +209,7 @@ KBackgroundProgram::KBackgroundProgram(TQString name)
dirty = false;
hashdirty = true;
m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_program", m_pDirs->kde_default("data") +
"kdesktop/programs");
m_pConfig = 0L;
@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
/* static */
TQStringList KBackgroundProgram::list()
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_program", dirs->kde_default("data") +
"kdesktop/programs");
TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@ -489,7 +489,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
ADD_STRING(NoMultiRandom)
#undef ADD_STRING
m_pDirs = KGlobal::dirs();
m_pDirs = TDEGlobal::dirs();
if (!config) {
int screen_number = 0;
@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)
void KBackgroundSettings::setWallpaperList(TQStringList list)
{
KStandardDirs *d = KGlobal::dirs();
KStandardDirs *d = TDEGlobal::dirs();
if (m_WallpaperList == list)
return;
@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
TQ_UINT32 rh = TDEGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
@ -1063,9 +1063,9 @@ void KBackgroundSettings::setEnabled(const bool enable)
hashdirty = true;
}
/**** KGlobalBackgroundSettings ****/
/**** TDEGlobalBackgroundSettings ****/
KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
{
m_pConfig = _config;
@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
}
TQString KGlobalBackgroundSettings::deskName(int desk)
TQString TDEGlobalBackgroundSettings::deskName(int desk)
{
return m_Names[desk];
}
/*
void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
void TDEGlobalBackgroundSettings::setDeskName(int desk, TQString name)
{
if (name == m_Names[desk])
return;
@ -1090,7 +1090,7 @@ void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
*/
void KGlobalBackgroundSettings::setCacheSize(int size)
void TDEGlobalBackgroundSettings::setCacheSize(int size)
{
if (size == m_CacheSize)
return;
@ -1099,7 +1099,7 @@ void KGlobalBackgroundSettings::setCacheSize(int size)
}
void KGlobalBackgroundSettings::setLimitCache(bool limit)
void TDEGlobalBackgroundSettings::setLimitCache(bool limit)
{
if (limit == m_bLimitCache)
return;
@ -1108,7 +1108,7 @@ void KGlobalBackgroundSettings::setLimitCache(bool limit)
}
bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
bool TDEGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
{
if ( desk > int(m_bDrawBackgroundPerScreen.size()) )
return _defDrawBackgroundPerScreen;
@ -1116,7 +1116,7 @@ bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
}
void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
void TDEGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
{
if ( desk >= int(m_bDrawBackgroundPerScreen.size()) )
return;
@ -1129,7 +1129,7 @@ void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScr
}
void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
void TDEGlobalBackgroundSettings::setCommonScreenBackground(bool common)
{
if (common == m_bCommonScreen)
return;
@ -1138,7 +1138,7 @@ void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
}
void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
void TDEGlobalBackgroundSettings::setCommonDeskBackground(bool common)
{
if (common == m_bCommonDesk)
return;
@ -1147,7 +1147,7 @@ void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
}
void KGlobalBackgroundSettings::setDockPanel(bool dock)
void TDEGlobalBackgroundSettings::setDockPanel(bool dock)
{
if (dock == m_bDock)
return;
@ -1156,7 +1156,7 @@ void KGlobalBackgroundSettings::setDockPanel(bool dock)
}
void KGlobalBackgroundSettings::setExportBackground(bool _export)
void TDEGlobalBackgroundSettings::setExportBackground(bool _export)
{
if (_export == m_bExport)
return;
@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export)
m_bExport = _export;
}
void KGlobalBackgroundSettings::setTextColor(TQColor _color)
void TDEGlobalBackgroundSettings::setTextColor(TQColor _color)
{
if (_color == m_TextColor)
return;
@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(TQColor _color)
m_TextColor = _color;
}
void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
void TDEGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
{
if (_color == m_TextBackgroundColor)
return;
@ -1180,7 +1180,7 @@ void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
m_TextBackgroundColor = _color;
}
void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
void TDEGlobalBackgroundSettings::setShadowEnabled(bool enabled)
{
if (enabled == m_shadowEnabled)
return;
@ -1188,7 +1188,7 @@ void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
m_shadowEnabled = enabled;
}
void KGlobalBackgroundSettings::setTextLines(int lines)
void TDEGlobalBackgroundSettings::setTextLines(int lines)
{
if (lines == m_textLines)
return;
@ -1196,7 +1196,7 @@ void KGlobalBackgroundSettings::setTextLines(int lines)
m_textLines = lines;
}
void KGlobalBackgroundSettings::setTextWidth(int width)
void TDEGlobalBackgroundSettings::setTextWidth(int width)
{
if (width == m_textWidth)
return;
@ -1204,7 +1204,7 @@ void KGlobalBackgroundSettings::setTextWidth(int width)
m_textWidth = width;
}
void KGlobalBackgroundSettings::readSettings()
void TDEGlobalBackgroundSettings::readSettings()
{
m_pConfig->setGroup("Background Common");
m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
@ -1220,7 +1220,7 @@ void KGlobalBackgroundSettings::readSettings()
for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
m_TextColor = KGlobalSettings::textColor();
m_TextColor = TDEGlobalSettings::textColor();
m_pConfig->setGroup("FMSettings");
m_TextColor = m_pConfig->readColorEntry("NormalTextColor", &m_TextColor);
m_TextBackgroundColor = m_pConfig->readColorEntry("ItemTextBackground");
@ -1234,7 +1234,7 @@ void KGlobalBackgroundSettings::readSettings()
dirty = false;
}
void KGlobalBackgroundSettings::writeSettings()
void TDEGlobalBackgroundSettings::writeSettings()
{
if (!dirty)
return;

4
kcontrol/background/bgsettings.h
Unescape Escape View File

@ -302,10 +302,10 @@ public:
/**
* A class to read/modify the global desktop background settings.
*/
class KGlobalBackgroundSettings
class TDEGlobalBackgroundSettings
{
public:
KGlobalBackgroundSettings(KConfig *config);
TDEGlobalBackgroundSettings(KConfig *config);
TQString deskName(int desk);
//void setDeskName(int desk, TQString name);

2
kcontrol/background/bgwallpaper.cpp
Unescape Escape View File

@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd()
mimeTypes += "image/svg+xml";
#endif
KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(),
KFileDialog fileDialog(TDEGlobal::dirs()->findDirs("wallpaper", "").first(),
mimeTypes.join( " " ), this,
0L, true);

18
kcontrol/clock/dtime.cpp
Unescape Escape View File

@ -195,9 +195,9 @@ void Dtime::serverTimeCheck() {
}
void Dtime::findNTPutility(){
KProcess proc;
TDEProcess proc;
proc << "which" << "ntpdate";
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "ntpdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@ -205,7 +205,7 @@ void Dtime::findNTPutility(){
}
proc.clearArguments();
proc << "which" << "rdate";
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
if(proc.exitStatus() == 0) {
ntpUtility = "rdate";
kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@ -289,9 +289,9 @@ void Dtime::save()
timeServer.replace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
KProcess proc;
TDEProcess proc;
proc << ntpUtility << timeServer;
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
if( proc.exitStatus() != 0 ){
KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
setDateTimeAuto->setChecked( false );
@ -303,7 +303,7 @@ void Dtime::save()
}
else {
// User time setting
KProcess c_proc;
TDEProcess c_proc;
// BSD systems reverse year compared to Susv3
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@ -321,7 +321,7 @@ void Dtime::save()
kdDebug() << "Set date " << BufS << endl;
c_proc << "date" << BufS;
c_proc.start( KProcess::Block );
c_proc.start( TDEProcess::Block );
int result = c_proc.exitStatus();
if (result != 0
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@ -333,9 +333,9 @@ void Dtime::save()
}
// try to set hardware clock. We do not care if it fails
KProcess hwc_proc;
TDEProcess hwc_proc;
hwc_proc << "hwclock" << "--systohc";
hwc_proc.start(KProcess::Block);
hwc_proc.start(TDEProcess::Block);
}
// restart time

2
kcontrol/clock/main.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
" the root password, but feel the system time should be corrected, please contact your system"
" administrator."));
KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());

16
kcontrol/colors/colorscm.cpp
Unescape Escape View File

@ -308,7 +308,7 @@ void KColorScheme::load()
}
void KColorScheme::load( bool useDefaults )
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setReadDefaults( useDefaults );
config->setGroup("KDE");
sCurrentScheme = config->readEntry("colorScheme");
@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )
void KColorScheme::save()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "General" );
cfg->writeEntry("background", cs->back, true, true);
cfg->writeEntry("selectBackground", cs->select, true, true);
@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
}
else
{
sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
KSimpleConfig *config = new KSimpleConfig(sFile);
config->setGroup( "Color Scheme");
config->writeEntry("Name", sName);
@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col)
// of course
if ( selection == CSM_Standard_background &&
color(CSM_Alternate_background) ==
KGlobalSettings::calculateAlternateBackgroundColor(
TDEGlobalSettings::calculateAlternateBackgroundColor(
color(CSM_Standard_background) ) )
{
color(CSM_Alternate_background) =
KGlobalSettings::calculateAlternateBackgroundColor( col );
TDEGlobalSettings::calculateAlternateBackgroundColor( col );
}
color(selection) = col;
@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index )
if (index == 0) {
// Current scheme
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup("General");
} else {
// Open scheme file
@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index )
cs->buttonTxt = config->readColorEntry( "buttonForeground", &black );
cs->link = config->readColorEntry( "linkColor", &link );
cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink );
TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window);
TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window);
cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate );
if (index == 0)
@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames()
nSysSchemes = 2;
// Global + local schemes
TQStringList list = KGlobal::dirs()->findAllResources("data",
TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"kdisplay/color-schemes/*.kcsrc", false, true);
// And add them

6
kcontrol/colors/widgetcanvas.cpp
Unescape Escape View File

@ -282,14 +282,14 @@ void WidgetCanvas::drawSampleWidgets()
// Keep in sync with kglobalsettings.
TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
windowFontGuess.setPixelSize(12);
c->setGroup("WM");
TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess);
c->setGroup("General");
TQFont defaultMenuFont = KGlobalSettings::menuFont();
TQFont defaultMenuFont = TDEGlobalSettings::menuFont();
TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont);
delete c;
@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets()
height(), cg, TRUE, 2, &brush);
// Standard text
TQFont fnt = KGlobalSettings::generalFont();
TQFont fnt = TDEGlobalSettings::generalFont();
paint.setFont( fnt );
paint.setPen( windowTxt );
paint.drawText( 140, 127-20, i18n( "Standard text") );

6
kcontrol/componentchooser/componentchooser.cpp
Unescape Escape View File

@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
@ -198,7 +198,7 @@ void CfgEmailClient::save(KConfig *)
}
// insure proper permissions -- contains sensitive data
TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
TQString cfgName(TDEGlobal::dirs()->findResource("config", "emails"));
if (!cfgName.isEmpty())
::chmod(TQFile::encodeName(cfgName), 0600);
@ -386,7 +386,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
latestEditedService="";
TQStringList dummy;
TQStringList services=KGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
{
KSimpleConfig cfg(*it);

2
kcontrol/componentchooser/kcm_componentchooser.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
{
KGlobal::locale()->insertCatalogue("kcmcomponentchooser");
TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
return new KCMComponentChooser( parent, "kcmcomponentchooser" );
}
}

14
kcontrol/crypto/crypto.cpp
Unescape Escape View File

@ -1227,7 +1227,7 @@ void KCryptoConfig::save()
authcfg->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);
@ -1471,7 +1471,7 @@ TQDateTime qdt = x->getExpires();
int rc = kdtd.exec();
if (rc == KDialog::Accepted) {
x->setExpires(kdtd.getDateTime());
untilDate->setText(KGlobal::locale()->formatDateTime(x->getExpires()));
untilDate->setText(TDEGlobal::locale()->formatDateTime(x->getExpires()));
configChanged();
}
}
@ -1517,8 +1517,8 @@ TQString iss = TQString();
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
: KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
: TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
@ -2024,11 +2024,11 @@ void KCryptoConfig::slotCAImport() {
void KCryptoConfig::offerImportToKMail( const TQString& certFile )
{
if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
KProcess proc;
TDEProcess proc;
proc << "kleopatra";
proc << "--import-certificate";
proc << certFile;
if ( !proc.start( KProcess::DontCare ) )
if ( !proc.start( TDEProcess::DontCare ) )
KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) );
}
}
@ -2054,7 +2054,7 @@ void KCryptoConfig::slotCARestore() {
// For now, we just rm the existing file and rebuild
TQString path = KGlobal::dirs()->saveLocation("config");
TQString path = TDEGlobal::dirs()->saveLocation("config");
path += "/ksslcalist";

2
kcontrol/css/kcmcss.cpp
Unescape Escape View File

@ -371,7 +371,7 @@ void CSSConfig::slotPreview()
// Show the preview
PreviewDialog *dlg = new PreviewDialog(this, 0, true);
dlg->preview->setPaper(back);
dlg->preview->viewport()->setFont(TQFont(KGlobalSettings::generalFont().family(), bfs));
dlg->preview->viewport()->setFont(TQFont(TDEGlobalSettings::generalFont().family(), bfs));
dlg->exec();

2
kcontrol/displayconfig/displayconfig.cpp
Unescape Escape View File

@ -742,7 +742,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
m_randrsimple = new KRandrSimpleAPI();

6
kcontrol/dnssd/kcmdnssd.cpp
Unescape Escape View File

@ -95,7 +95,7 @@ void KCMDnssd::save()
TQString scaryMessage = i18n("Enabling local network browsing will open a network port (5353) on your computer. If security problems are discovered in the zeroconf server, remote attackers could access your computer as the \"avahi\" user.");
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
@ -103,13 +103,13 @@ void KCMDnssd::save()
if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) {
*proc << "/usr/share/avahi/enable_avahi 1";
proc->start(KProcess::Block);
proc->start(TDEProcess::Block);
} else {
enableZeroconf->setChecked(false);
}
} else {
*proc << "/usr/share/avahi/enable_avahi 0";
proc->start(KProcess::Block);
proc->start(TDEProcess::Block);
}
}
setCursor(TQCursor(Qt::ArrowCursor));

2
kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
// Data init
TQStringList charsets = KGlobal::charsets()->availableEncodingNames();
TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames();
charsets.prepend(i18n("Default"));
m_dlg->cbCharset->insertStringList(charsets);

10
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
Unescape Escape View File

@ -82,11 +82,11 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
m_fullname = TQString::null;
KProcess proc;
TDEProcess proc;
proc << helper << host;
connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
TQT_SLOT(receiveOutput(KProcess *, char *, int)) );
if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout ))
connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) );
if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ))
return last_result = false;
last_host = host;
@ -101,7 +101,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
return last_result;
}
void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int )
void LocalDomainURIFilter::receiveOutput( TDEProcess *, char *buf, int )
{
m_fullname = TQFile::decodeName( buf );
}

4
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
Unescape Escape View File

@ -29,7 +29,7 @@
#include <tqregexp.h>
class TDEInstance;
class KProcess;
class TDEProcess;
/*
This filter takes care of hostnames in the local search domain.
@ -59,7 +59,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
TQRegExp m_hostPortPattern;
private slots:
void receiveOutput( KProcess *, char *, int );
void receiveOutput( TDEProcess *, char *, int );
};
#endif

8
kcontrol/fonts/fonts.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults )
bool deleteme = false;
if (_rcfile.isEmpty())
config = KGlobal::config();
config = TDEGlobal::config();
else
{
config = new KConfig(_rcfile, true);
@ -182,7 +182,7 @@ void FontUseItem::writeFont()
KConfigBase *config;
if (_rcfile.isEmpty()) {
config = KGlobal::config();
config = TDEGlobal::config();
config->setGroup(_rcgroup);
config->writeEntry(_rckey, font(), true, true);
} else {
@ -713,7 +713,7 @@ void KFonts::save()
for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
i->writeFont();
KGlobal::config()->sync();
TDEGlobal::config()->sync();
KConfig cfgfonts("kcmfonts");
cfgfonts.setGroup("General");
@ -729,7 +729,7 @@ void KFonts::save()
proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
proc.writeStdin( TQCString( "Xft.dpi" ), true );
proc.closeWhenDone();
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
}
// KDE-1.x support

2
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape Escape View File

@ -312,7 +312,7 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
mainGrid->addWidget(base, 0, 0);
}
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*)));
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*)));

8
kcontrol/hwmanager/hwmanager.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below."));
setUseRootOnlyMsg(true);
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView()));
@ -139,7 +139,7 @@ void TDEHWManager::populateTreeView()
base->deviceTree->clear();
if (show_by_connection) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass(TDEGenericDeviceType::RootSystem);
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@ -152,7 +152,7 @@ void TDEHWManager::populateTreeView()
}
}
else {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
for (int i=0;i<=TDEGenericDeviceType::Last;i++) {
if (i != TDEGenericDeviceType::Root) {
DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0);
@ -172,7 +172,7 @@ void TDEHWManager::populateTreeView()
void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) {
if (show_by_connection) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {

10
kcontrol/icons/icons.cpp
Unescape Escape View File

@ -135,8 +135,8 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
void KIconConfig::init()
{
mpLoader = KGlobal::iconLoader();
mpConfig = KGlobal::config();
mpLoader = TDEGlobal::iconLoader();
mpConfig = TDEGlobal::config();
mpEffect = new KIconEffect;
mpTheme = mpLoader->theme();
mUsage = 0;
@ -289,7 +289,7 @@ void KIconConfig::read()
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
KConfigGroup g( KGlobal::config(), "KDE" );
KConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
@ -410,7 +410,7 @@ void KIconConfig::load()
void KIconConfig::load( bool useDefaults )
{
mpConfig = KGlobal::config();
mpConfig = TDEGlobal::config();
mpConfig->setReadDefaults( useDefaults );
read();
apply();
@ -473,7 +473,7 @@ void KIconConfig::save()
mpKickerConfig->setGroup("General");
mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);
KConfigGroup g( KGlobal::config(), "KDE" );
KConfigGroup g( TDEGlobal::config(), "KDE" );
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);

4
kcontrol/icons/iconthemes.cpp
Unescape Escape View File

@ -191,7 +191,7 @@ void IconThemesConfig::installNewTheme()
KIO::NetAccess::removeTempFile(themeTmpFile);
KGlobal::instance()->newIconLoader();
TDEGlobal::instance()->newIconLoader();
loadThemes();
TQListViewItem *item=iconThemeItem(KIconTheme::current());
@ -302,7 +302,7 @@ void IconThemesConfig::removeSelectedTheme()
unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
KIO::del(KURL( icontheme.dir() ));
KGlobal::instance()->newIconLoader();
TDEGlobal::instance()->newIconLoader();
loadThemes();

12
kcontrol/info/info.cpp
Unescape Escape View File

@ -73,7 +73,7 @@ static bool sorting_allowed; /* is sorting allowed by user ? */
static const TQString Value( int val, int numbers=1 )
{
return KGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
return TDEGlobal::locale()->formatNumber(val, 0).rightJustify(numbers);
}
static const TQString HexStr(unsigned long val, int digits )
@ -189,8 +189,8 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
Value((int)DisplayCells(dpy, scr)));
last = new TQListViewItem(item, last, i18n("Preallocated Pixels"),
i18n("Black %1, White %2")
.arg(KGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
.arg(KGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
.arg(TDEGlobal::locale()->formatNumber(BlackPixel(dpy,scr), 0))
.arg(TDEGlobal::locale()->formatNumber(WhitePixel(dpy,scr), 0)));
TQString YES(i18n("Yes"));
TQString NO(i18n("No"));
@ -239,7 +239,7 @@ static const TQString ByteString( unsigned long n )
return i18n("1 Byte"); // singular form: "1 Byte" (yes, it's "1", not "%1"!)
return i18n("%1 Bytes") // plural form: "%1 Bytes"
.arg(KGlobal::locale()->formatNumber(n,0));
.arg(TDEGlobal::locale()->formatNumber(n,0));
}
static bool GetInfo_XServer_Generic( TQListView *lBox )
@ -370,7 +370,7 @@ void KInfoListWidget::load()
/* is the user allowed to use sorting ? */
lBox->header()->setClickEnabled(sorting_allowed);
lBox->header()->setFont(KGlobalSettings::generalFont());
lBox->header()->setFont(TDEGlobalSettings::generalFont());
lBox->setShowSortIndicator(sorting_allowed);
if (ok)
@ -420,7 +420,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
lBox = new TQListView(widgetStack);
widgetStack->addWidget(lBox, 0);
lBox->setMinimumSize(200,120);
lBox->setFont(KGlobalSettings::generalFont()); /* default font */
lBox->setFont(TDEGlobalSettings::generalFont()); /* default font */
lBox->setAllColumnsShowFocus(true);
TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack);

2
kcontrol/info/info_linux.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ bool GetInfo_CPU(TQListView * lBox)
bool GetInfo_IRQ(TQListView * lBox)
{
lBox->setFont(KGlobalSettings::fixedFont());
lBox->setFont(TDEGlobalSettings::fixedFont());
return GetInfo_ReadfromFile(lBox, INFO_IRQ, 0);
}

8
kcontrol/info/memory.cpp
Unescape Escape View File

@ -80,11 +80,11 @@ static TQString formatted_unit(t_memsize value)
{
if (value > (1024 * 1024))
if (value > (1024 * 1024 * 1024))
return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
return i18n("%1 GB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0), 2));
else
return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
return i18n("%1 MB").arg(TDEGlobal::locale()->formatNumber(value / (1024 * 1024.0), 2));
else
return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, 2));
return i18n("%1 KB").arg(TDEGlobal::locale()->formatNumber(value / 1024.0, 2));
}
KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
@ -368,7 +368,7 @@ void KMemoryWidget::update_Values()
label->clear();
else
label->setText(i18n("%1 bytes =").
arg(KGlobal::locale()->
arg(TDEGlobal::locale()->
formatNumber(Memory_Info[i], 0)));
}

8
kcontrol/input/core/themepage.cpp
Unescape Escape View File

@ -178,7 +178,7 @@ void ThemePage::fixCursorFile()
//
// Run mkfontdir to update fonts.dir in that dir.
KGlobal::dirs()->addResourceType( "font", "share/fonts/" );
TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
@ -200,12 +200,12 @@ void ThemePage::fixCursorFile()
KIO::NetAccess::file_copy( source, installedFont, -1, true );
}
TQString cmd = KGlobal::dirs()->findExe( "mkfontdir" );
TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" );
if ( !cmd.isEmpty() )
{
KProcess p;
TDEProcess p;
p << cmd << overrideDir;
p.start(KProcess::Block);
p.start(TDEProcess::Block);
}
}

2
kcontrol/input/mouse.cpp
Unescape Escape View File

@ -639,7 +639,7 @@ void MouseSettings::load(KConfig *config)
handedEnabled = true;
// ## keep this in sync with KGlobalSettings::mouseSettings
// ## keep this in sync with TDEGlobalSettings::mouseSettings
if( num_buttons == 1 )
{
/* disable button remapping */

2
kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
Unescape Escape View File

@ -119,7 +119,7 @@ void KCMIOSlaveInfo::slotResult(KIO::Job *)
void KCMIOSlaveInfo::showInfo(const TQString& protocol)
{
TQString file = TQString("kioslave/%1.docbook").arg( protocol );
file = KGlobal::locale()->langLookup( file );
file = TDEGlobal::locale()->langLookup( file );
if (m_tfj)
{
m_tfj->kill();

2
kcontrol/joystick/joywidget.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
messageBox = new TQHBox(mainVbox);
messageBox->setSpacing(KDialog::spacingHint());
TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox);

2
kcontrol/kcontrol/aboutwidget.cpp
Unescape Escape View File

@ -150,7 +150,7 @@ void AboutWidget::updatePixmap()
}
else
{
KIconLoader *loader = KGlobal::instance()->iconLoader();
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQString iconPath;
if (!_icon.isEmpty()) {
iconPath = loader->iconPath( _icon, KIcon::Toolbar );

2
kcontrol/kcontrol/dockcontainer.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
TQWhatsThis::remove( this );
TQWhatsThis::add( this, config->comment() );
KIconLoader *loader = KGlobal::instance()->iconLoader();
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
m_icon->setPixmap( icon );
m_name->setText( config->moduleName() );

4
kcontrol/kcontrol/helpwidget.cpp
Unescape Escape View File

@ -74,13 +74,13 @@ bool HelpWidget::clicked(const TQString & _url)
return true;
}
KProcess process;
TDEProcess process;
KURL url(KURL("help:/"), _url);
if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
process << "khelpcenter"
<< url.url();
process.start(KProcess::DontCare);
process.start(TDEProcess::DontCare);
} else {
new KRun(url);
}

8
kcontrol/kcontrol/main.cpp
Unescape Escape View File

@ -56,7 +56,7 @@ KControlApp::KControlApp()
toplevel = new TopLevel();
setMainWidget(toplevel);
KGlobal::setActiveInstance(this);
TDEGlobal::setActiveInstance(this);
// KUniqueApplication does dcop regitration for us
ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
@ -64,8 +64,8 @@ KControlApp::KControlApp()
connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
TQRect desk = KGlobalSettings::desktopGeometry(toplevel);
KConfig *config = KGlobal::config();
TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
KConfig *config = TDEGlobal::config();
config->setGroup("General");
// Initial size is:
// never bigger than workspace as reported by desk
@ -88,7 +88,7 @@ KControlApp::~KControlApp()
{
if (toplevel)
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("General");
TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());

4
kcontrol/kcontrol/modulemenu.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
TQString name = group->caption();
name.replace("&", "&&");
parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, menu);
fill(menu, path);
@ -87,7 +87,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
TQString name = module->moduleName();
name.replace("&", "&&");
int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
, name, id);
_moduleDict.insert(realid, module);

12
kcontrol/kcontrol/modules.cpp
Unescape Escape View File

@ -189,7 +189,7 @@ void ConfigModule::runAsRoot()
TQString tdesu = KStandardDirs::findExe("tdesu");
if (!tdesu.isEmpty())
{
_rootProcess = new KProcess;
_rootProcess = new TDEProcess;
*_rootProcess << tdesu;
*_rootProcess << "--nonewdcop";
// We have to disable the keep-password feature because
@ -198,15 +198,15 @@ void ConfigModule::runAsRoot()
// We also don't have a way to close the module in that case.
*_rootProcess << "--n"; // Don't keep password.
if (kdeshell) {
*_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());
*_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language());
}
else {
*_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() );
*_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() );
}
connect(_rootProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(rootExited(KProcess*)));
connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*)));
if ( !_rootProcess->start(KProcess::NotifyOnExit) )
if ( !_rootProcess->start(TDEProcess::NotifyOnExit) )
{
delete _rootProcess;
_rootProcess = 0L;
@ -226,7 +226,7 @@ void ConfigModule::runAsRoot()
}
void ConfigModule::rootExited(KProcess *)
void ConfigModule::rootExited(TDEProcess *)
{
if (_embedWidget->embeddedWinId())
XDestroyWindow(tqt_xdisplay(), _embedWidget->embeddedWinId());

6
kcontrol/kcontrol/modules.h
Unescape Escape View File

@ -30,7 +30,7 @@ class TQStringList;
class TDEAboutData;
class KCModule;
class ProxyWidget;
class KProcess;
class TDEProcess;
class QXEmbed;
class TQVBoxLayout;
class TQVBox;
@ -63,7 +63,7 @@ private slots:
void clientClosed();
void clientChanged(bool state);
void runAsRoot();
void rootExited(KProcess *proc);
void rootExited(TDEProcess *proc);
void embedded();
@ -80,7 +80,7 @@ private:
bool _changed;
ProxyWidget *_module;
QXEmbed *_embedWidget;
KProcess *_rootProcess;
TDEProcess *_rootProcess;
TQVBoxLayout *_embedLayout;
TQVBox *_embedFrame;
TQWidgetStack *_embedStack;

2
kcontrol/kcontrol/moduletreeview.cpp
Unescape Escape View File

@ -38,7 +38,7 @@
static TQPixmap appIcon(const TQString &iconName)
{
TQString path;
TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
// make sure they are not larger than KIcon::SizeSmall
if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
{

2
kcontrol/kcontrol/searchwidget.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
public:
ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
TQListBoxPixmap(listbox,
KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
module->moduleName())
, m_module(module)
{

10
kcontrol/kcontrol/toplevel.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name)
report_bug = 0;
// read settings
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Index");
TQString viewmode = config->readEntry("ViewMode", "Tree");
@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
KWin::setIcons( winId(),
KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
KGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
}
else
{
@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name)
TopLevel::~TopLevel()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Index");
if (KCGlobal::viewMode() == Tree)
config->writeEntry("ViewMode", "Tree");
@ -486,7 +486,7 @@ void TopLevel::reportBug()
bool deleteit = false;
if (!_active) // report against kcontrol
dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData());
dummyAbout = const_cast<TDEAboutData*>(TDEGlobal::instance()->aboutData());
else
{
if (_active->aboutData())

4
kcontrol/kded/kcmkded.cpp
Unescape Escape View File

@ -148,7 +148,7 @@ void KDEDConfig::load( bool useDefaults ) {
_lvLoD->clear();
TQStringList files;
KGlobal::dirs()->findAllResources( "services",
TDEGlobal::dirs()->findAllResources( "services",
TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );
@ -186,7 +186,7 @@ void KDEDConfig::save() {
TQCheckListItem* item = 0L;
TQStringList files;
KGlobal::dirs()->findAllResources( "services",
TDEGlobal::dirs()->findAllResources( "services",
TQString::fromLatin1( "kded/*.desktop" ),
true, true, files );

4
kcontrol/keys/ChangeLog
Unescape Escape View File

@ -15,8 +15,8 @@
global.cpp did for just the global keys.
* converted main.cpp to use keyconfig.cpp rather than
global.cpp and standard.cpp for standard and globall
key configuration. KGlobalConfig and KStdConfig disappear.
(KGlobalConfig is renamed to KKeyConfig)
key configuration. TDEGlobalConfig and KStdConfig disappear.
(TDEGlobalConfig is renamed to KKeyConfig)
* appropriate changes to Makefile.am.
* standard key binding are now #include'd from
stdbindings.cpp

12
kcontrol/keys/keyconfig.cpp
Unescape Escape View File

@ -226,7 +226,7 @@ void KKeyModule::defaults()
/*void KKeyModule::slotRemove()
{
TQString kksPath =
KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
TDEGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType);
TQDir d( kksPath );
if (!d.exists()) // what can we do?
@ -360,7 +360,7 @@ void KKeyModule::readScheme( int index )
TQT_SLOT( slotPreviewScheme( int ) ) );
TQString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/");
TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
TQDir d( kksPath );
if ( !d.exists() )
@ -426,7 +426,7 @@ void KKeyModule::readScheme( int index )
/*void KKeyModule::readSchemeNames( )
{
TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");
//TQRegExp r( "-kde[34].kksrc$" );
TQRegExp r( "-trinity.kksrc$" );
@ -472,11 +472,11 @@ void KKeyModule::init()
kdDebug(125) << "KKeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();

24
kcontrol/keys/main.cpp
Unescape Escape View File

@ -132,9 +132,9 @@ extern "C"
KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
KGlobal::locale()->insertCatalogue("twin");
KGlobal::locale()->insertCatalogue("kdesktop");
KGlobal::locale()->insertCatalogue("kicker");
TDEGlobal::locale()->insertCatalogue("twin");
TDEGlobal::locale()->insertCatalogue("kdesktop");
TDEGlobal::locale()->insertCatalogue("kicker");
return new KeyModule(parent, "kcmkeys");
}
@ -142,8 +142,8 @@ extern "C"
{
kdDebug(125) << "KeyModule::initModifiers()" << endl;
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
bool bMacSwap = KGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
if( bMacSwap )
ModifiersModule::setupMacModifierKeys();
}
@ -153,11 +153,11 @@ extern "C"
kdDebug(125) << "KeyModule::init()\n";
/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
TQString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
KAccel::useFourModifierKeys( fourMods == "true" );
bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
*/
KAccelActions* keys = new KAccelActions();
@ -179,16 +179,16 @@ extern "C"
// This is needed to be able to check for conflicts with global keys in app's keyconfig
// dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
// However, avoid writing at every KDE startup, just update them after every rebuild of this file.
KConfigGroup group( KGlobal::config(), "Global Shortcuts" );
KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
// Check for old group,
if( KGlobal::config()->hasGroup( "Global Keys" ) ) {
if( TDEGlobal::config()->hasGroup( "Global Keys" ) ) {
keys->readActions( "Global Keys" );
KGlobal::config()->deleteGroup( "Global Keys", true, true );
TDEGlobal::config()->deleteGroup( "Global Keys", true, true );
}
keys->readActions( "Global Shortcuts" );
KGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
TDEGlobal::config()->deleteGroup( "Global Shortcuts", true, true );
kdDebug(125) << "KeyModule::init() - Write Config Bindings\n";
keys->writeActions( "Global Shortcuts", 0, true, true );

26
kcontrol/keys/modifiers.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
void ModifiersModule::load( bool useDefaults )
{
KConfig *c = KGlobal::config();
KConfig *c = TDEGlobal::config();
c->setReadDefaults( useDefaults );
@ -82,35 +82,35 @@ void ModifiersModule::save()
{
kdDebug(125) << "ModifiersModule::save()" << endl;
KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
if( m_plblCtrl->text() != "Ctrl" )
KGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
else
KGlobal::config()->deleteEntry( "Label Ctrl", false, true );
TDEGlobal::config()->deleteEntry( "Label Ctrl", false, true );
if( m_plblAlt->text() != "Alt" )
KGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
TDEGlobal::config()->writeEntry( "Label Alt", m_plblAlt->text(), true, true );
else
KGlobal::config()->deleteEntry( "Label Alt", false, true );
TDEGlobal::config()->deleteEntry( "Label Alt", false, true );
if( m_plblWin->text() != "Win" )
KGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
TDEGlobal::config()->writeEntry( "Label Win", m_plblWin->text(), true, true );
else
KGlobal::config()->deleteEntry( "Label Win", false, true );
TDEGlobal::config()->deleteEntry( "Label Win", false, true );
if( m_pchkMacKeyboard->isChecked() )
KGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
TDEGlobal::config()->writeEntry( "Mac Keyboard", true, true, true );
else
KGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
TDEGlobal::config()->deleteEntry( "Mac Keyboard", false, true );
bool bMacSwap = m_pchkMacKeyboard->isChecked() && m_pchkMacSwap->isChecked();
if( bMacSwap )
KGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
TDEGlobal::config()->writeEntry( "Mac Modifier Swap", true, true, true );
else
KGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
TDEGlobal::config()->deleteEntry( "Mac Modifier Swap", false, true );
KGlobal::config()->sync();
TDEGlobal::config()->sync();
if( m_bMacSwapOrig != bMacSwap ) {
if( bMacSwap )

14
kcontrol/keys/shortcuts.cpp
Unescape Escape View File

@ -69,10 +69,10 @@ void ShortcutsModule::save()
// FIXME: This isn't working. Why? -- ellis, 2002/01/27
// Check for old group,
if( KGlobal::config()->hasGroup( "Keys" ) ) {
KGlobal::config()->deleteGroup( "Keys", true, true );
if( TDEGlobal::config()->hasGroup( "Keys" ) ) {
TDEGlobal::config()->deleteGroup( "Keys", true, true );
}
KGlobal::config()->sync();
TDEGlobal::config()->sync();
m_pkcGeneral->commitChanges();
m_pkcSequence->commitChanges();
@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const
void ShortcutsModule::initGUI()
{
TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
kdDebug(125) << "A-----------" << endl;
KAccelActions* keys = &m_actionsGeneral;
@ -264,7 +264,7 @@ void ShortcutsModule::createActionsSequence()
void ShortcutsModule::readSchemeNames()
{
TQStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
TQStringList schemes = TDEGlobal::dirs()->findAllResources("data", "kcmkeys/*.kksrc");
m_pcbSchemes->clear();
m_rgsSchemeFiles.clear();
@ -406,7 +406,7 @@ void ShortcutsModule::slotSaveSchemeAs()
disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
TQString kksPath = KGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
TQDir dir( kksPath );
if( !dir.exists() && !dir.mkdir( kksPath ) ) {
@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme()
void ShortcutsModule::slotUseRmWinKeysClicked()
{
TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
// See if ~/.trinity/env/win-key.sh exists
TQFile f( kde_winkeys_env_dir + "win-key.sh" );

4
kcontrol/keys/treeview.cpp
Unescape Escape View File

@ -215,7 +215,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath)
TQStringList filelist;
// loop through all resource dirs and build a file list
TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);
@ -254,7 +254,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath)
TQStringList dirlist;
// loop through all resource dirs and build a subdir list
TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps");
TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps");
for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it)
{
TQDir dir((*it) + "/" + relativePath);

2
kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
Unescape Escape View File

@ -82,7 +82,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
#endif
itsConfig(KFI_UI_CFG_FILE)
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEAboutData* about = new TDEAboutData("kcmfontinst",
I18N_NOOP("TDE Font Installer"),

4
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
Unescape Escape View File

@ -189,7 +189,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
void CKFileFontView::selected(TQListViewItem *item)
{
if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
KGlobalSettings::singleClick())
TDEGlobalSettings::singleClick())
{
const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
@ -632,7 +632,7 @@ void CFontListViewItem::init()
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
setText(COL_NAME, itsInf->text());
setText(COL_SIZE, itsInf->isDir() ? "" : KGlobal::locale()->formatNumber(itsInf->size(), 0));
setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));
setText(COL_TYPE, itsInf->mimeComment());
}

2
kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
Unescape Escape View File

@ -268,7 +268,7 @@ namespace KFI
KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args)
: KFilePlugin(parent, name, args)
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
addMimeType("application/x-font-ttf"),
addMimeType("application/x-font-type1");

32
kcontrol/kfontinst/kio/KioFonts.cpp
Unescape Escape View File

@ -1127,15 +1127,15 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
cmd+="cp -f ";
cmd+=TQFile::encodeName(KProcess::quote(tmpFileC));
cmd+=TQFile::encodeName(TDEProcess::quote(tmpFileC));
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote(destC));
cmd+=TQFile::encodeName(TDEProcess::quote(destC));
cmd+=" && chmod 0644 ";
cmd+=destC;
@ -1351,9 +1351,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
if(!Misc::dExists(itsFolders[destFolder].location))
{
cmd+="mkdir ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && chmod 0755 ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
cmd+=" && ";
}
@ -1363,9 +1363,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
for(; fIt!=fEnd; ++fIt)
{
cmd+="cp -f ";
cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
int s=getSize(TQFile::encodeName(fIt.key()));
if(s>0)
size+=s;
@ -1540,7 +1540,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
toSys=FOLDER_SYS==destFolder;
TQCString userId,
groupId,
destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)));
destDir(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)));
userId.setNum(toSys ? 0 : getuid());
groupId.setNum(toSys ? 0 : getgid());
@ -1548,7 +1548,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
for(; fIt!=fEnd; ++fIt)
{
TQCString cmd,
destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data())));
destFile(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+fIt.data())));
if(toSys && !Misc::dExists(itsFolders[destFolder].location))
{
@ -1558,7 +1558,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
}
cmd+="mv -f ";
cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
cmd+=" ";
cmd+=destFile;
cmd+=" && chmod -f 0644 ";
@ -1631,7 +1631,7 @@ void CKioFonts::del(const KURL &url, bool)
modifiedDirs.add(Misc::getDir(file));
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote(file));
cmd+=TQFile::encodeName(TDEProcess::quote(file));
KURL::List urls;
@ -1645,7 +1645,7 @@ void CKioFonts::del(const KURL &url, bool)
for(uIt=urls.begin(); uIt!=uEnd; ++uIt)
{
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote((*uIt).path()));
cmd+=TQFile::encodeName(TDEProcess::quote((*uIt).path()));
}
}
}
@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
cmd+=" && kfontinst ";
cmd+=tmpCmd;
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote(*it));
cmd+=TQFile::encodeName(TDEProcess::quote(*it));
}
}
}
@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
cmd+=" && kfontinst ";
cmd+=itsNrsKfiParams;
cmd+=" ";
cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location));
cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location));
}
}
@ -2437,7 +2437,7 @@ void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd
if(nrs)
{
TQCString cmd("pf2afm ");
cmd+=TQFile::encodeName(KProcess::quote(name));
cmd+=TQFile::encodeName(TDEProcess::quote(name));
doRootCmd(cmd, passwd);
}
else

2
kcontrol/kfontinst/lib/FcEngine.cpp
Unescape Escape View File

@ -579,7 +579,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
if(1==itsSizes.size())
title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
painter.setFont(KGlobalSettings::generalFont());
painter.setFont(TDEGlobalSettings::generalFont());
painter.setPen(Qt::black);
y=painter.fontMetrics().height();
drawText(painter, x, y, w-offset, title);

4
kcontrol/kfontinst/lib/Misc.cpp
Unescape Escape View File

@ -133,7 +133,7 @@ bool createDir(const TQString &dir)
bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3)
{
KProcess proc;
TDEProcess proc;
proc << cmd;
@ -144,7 +144,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ
if(!p3.isEmpty())
proc << p3;
proc.start(KProcess::Block);
proc.start(TDEProcess::Block);
return proc.normalExit() && proc.exitStatus()==0;
}

2
kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ namespace KFI
CFontThumbnail::CFontThumbnail()
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
}
bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img)

2
kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ extern "C"
{
KDE_EXPORT void* init_libkfontviewpart()
{
KGlobal::locale()->insertCatalogue("kfontinst");
TDEGlobal::locale()->insertCatalogue("kfontinst");
return new KFI::CFontViewPartFactory;
}
}

2
kcontrol/kfontinst/viewpart/FontViewerApp.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ void CFontViewerAppMainWindow::fileOpen()
CFontViewerApp::CFontViewerApp()
{
KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
setMainWidget(new CFontViewerAppMainWindow());
}

2
kcontrol/kicker/applettab_impl.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ void AppletTab::load( bool useDefaults )
list_group->setEnabled(trusted_rb->isChecked());
TQStringList list = KGlobal::dirs()->findAllResources("applets", "*.desktop");
TQStringList list = TDEGlobal::dirs()->findAllResources("applets", "*.desktop");
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
TQFileInfo fi(*it);

2
kcontrol/kicker/lookandfeeltab_impl.cpp
Unescape Escape View File

@ -319,7 +319,7 @@ void LookAndFeelTab::fillTileCombos()
m_tilename.clear();
m_tilename << "" << "Colorize";
TQStringList list = KGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
TQStringList list = TDEGlobal::dirs()->findAllResources("tiles","*_tiny_up.png");
int minHeight = 0;
for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it)

14
kcontrol/kicker/main.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ void KickerConfig::init()
}
TQString configname = configName();
TQString configpath = KGlobal::dirs()->findResource("config", configname);
TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
if (configpath.isEmpty())
configpath = locateLocal("config", configname);
KSharedConfig::Ptr config = KSharedConfig::openConfig(configname);
@ -195,9 +195,9 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
// set config group
config.setGroup(group);
TQString df = KGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
TQString df = TDEGlobal::dirs()->findResource("extensions", config.readEntry("DesktopFile"));
TQString configname = config.readEntry("ConfigFile");
TQString configpath = KGlobal::dirs()->findResource("config", configname);
TQString configpath = TDEGlobal::dirs()->findResource("config", configname);
if (checkExists)
{
@ -383,14 +383,14 @@ extern "C"
KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
{
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new PositionConfig(parent, "kcmkicker");
}
KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
{
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
return new HidingConfig(parent, "kcmkicker");
}
@ -403,9 +403,9 @@ extern "C"
KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
{
KImageIO::registerFormats();
KGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
"kicker/tiles");
KGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("hb_pics", KStandardDirs::kde_default("data") +
"kcmkicker/pics");
return new LookAndFeelConfig(parent, "kcmkicker");
}

6
kcontrol/kicker/menutab_impl.cpp
Unescape Escape View File

@ -84,7 +84,7 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
//connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
KIconLoader * ldr = KGlobal::iconLoader();
KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
@ -136,7 +136,7 @@ void MenuTab::load( bool useDefaults )
TQStringList ext_default;
ext_default << "prefmenu.desktop" << "systemmenu.desktop";
TQStringList ext = c->readListEntry("Extensions", ext_default);
TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/menuext");
TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/menuext");
kSubMenuItem* menuItem(0);
for (TQStringList::ConstIterator dit=dirs.begin(); dit!=dirs.end(); ++dit)
{
@ -312,7 +312,7 @@ void MenuTab::launchIconEditor()
return;
m_kmenu_icon = newIcon;
KIconLoader * ldr = KGlobal::iconLoader();
KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);

2
kcontrol/kicker/positiontab_impl.cpp
Unescape Escape View File

@ -689,7 +689,7 @@ void PositionTab::showIdentify()
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM) );
TQFont identifyFont(KGlobalSettings::generalFont());
TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);

4
kcontrol/kio/cache.cpp
Unescape Escape View File

@ -117,9 +117,9 @@ void KCacheConfigDialog::configChanged()
void KCacheConfigDialog::slotClearCache()
{
KProcess process;
TDEProcess process;
process << "kio_http_cache_cleaner" << "--clear-all";
process.start(KProcess::DontCare);
process.start(TDEProcess::DontCare);
// Cleaning up might take a while. Better detach.
process.detach();
}

2
kcontrol/kio/fakeuaprovider.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ void FakeUASProvider::parseDescription()
tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
TQStringList languageList = KGlobal::locale()->languageList();
TQStringList languageList = TDEGlobal::locale()->languageList();
if ( languageList.count() )
{
TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );

2
kcontrol/kio/kcookiesmanagement.cpp
Unescape Escape View File

@ -334,7 +334,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
{
TQDateTime expDate;
expDate.setTime_t(tmp);
cookie->expireDate = KGlobal::locale()->formatDateTime(expDate);
cookie->expireDate = TDEGlobal::locale()->formatDateTime(expDate);
}
tmp = (*c).toUInt();

4
kcontrol/kio/smbrodlg.cpp
Unescape Escape View File

@ -63,7 +63,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
m_encodingList = new KComboBox( false, this );
TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
m_encodingList->insertStringList( _strList );
label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
@ -99,7 +99,7 @@ void SMBRoOptions::load()
// m_workgroupLe->setText(cfg->readEntry("Workgroup"));
// m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
// TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
// TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
// TQString m_encoding = TQTextCodec::codecForLocale()->name();
// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );

2
kcontrol/knotify/knotify.cpp
Unescape Escape View File

@ -163,7 +163,7 @@ void KCMKNotify::load( bool useDefaults )
m_notifyWidget->clear();
TQStringList fullpaths =
KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
TDEGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
TQStringList::ConstIterator it = fullpaths.begin();
for ( ; it != fullpaths.end(); ++it)

2
kcontrol/konq/desktopbehavior_impl.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
* or left handed. The outer button functionality is actually swapped
*
*/
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));

6
kcontrol/konq/fontopts.cpp
Unescape Escape View File

@ -246,11 +246,11 @@ void KonqFontOptions::load( bool useDefaults )
if ( m_fSize == -1 )
m_fSize = TQFontInfo(stdFont).pointSize();
normalTextColor = KGlobalSettings::textColor();
normalTextColor = TDEGlobalSettings::textColor();
normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor );
m_pNormalText->setColor( normalTextColor );
/* highlightedTextColor = KGlobalSettings::highlightedTextColor();
/* highlightedTextColor = TDEGlobalSettings::highlightedTextColor();
highlightedTextColor = g_pConfig->readColorEntry( "HighlightedTextColor", &highlightedTextColor );
m_pHighlightedText->setColor( highlightedTextColor );
*/
@ -298,7 +298,7 @@ void KonqFontOptions::defaults()
void KonqFontOptions::updateGUI()
{
if ( m_stdName.isEmpty() )
m_stdName = KGlobalSettings::generalFont().family();
m_stdName = TDEGlobalSettings::generalFont().family();
m_pStandard->setCurrentFont( m_stdName );
m_pSize->setValue( m_fSize );

8
kcontrol/konq/previews.cpp
Unescape Escape View File

@ -158,8 +158,8 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
void KPreviewOptions::load(bool useDefaults)
{
// *** load and apply to GUI ***
KGlobal::config()->setReadDefaults(useDefaults);
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
TDEGlobal::config()->setReadDefaults(useDefaults);
KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
@ -176,7 +176,7 @@ void KPreviewOptions::load(bool useDefaults)
m_boostSize->setChecked( group.readBoolEntry( "BoostSize", false /*default*/ ) );
m_useFileThumbnails->setChecked( group.readBoolEntry( "UseFileThumbnails", true /*default*/ ) );
KGlobal::config()->setReadDefaults(false);
TDEGlobal::config()->setReadDefaults(false);
}
void KPreviewOptions::load()
@ -191,7 +191,7 @@ void KPreviewOptions::defaults()
void KPreviewOptions::save()
{
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
TQPtrListIterator<TQCheckListItem> it( m_items );
for ( ; it.current() ; ++it ) {
TQString protocol( it.current()->text() );

16
kcontrol/konq/rootopts.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ void DesktopPathConfig::load( bool useDefaults )
// Desktop Paths
config.setReadDefaults( useDefaults );
config.setGroup("Paths");
urAutostart->setURL( config.readPathEntry( "Autostart" , KGlobalSettings::autostartPath() ));
urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() ));
KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
@ -148,7 +148,7 @@ void DesktopPathConfig::defaults()
void DesktopPathConfig::save()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
KConfigGroupSaver cgs( config, "Paths" );
@ -156,17 +156,17 @@ void DesktopPathConfig::save()
bool autostartMoved = false;
KURL desktopURL;
desktopURL.setPath( KGlobalSettings::desktopPath() );
desktopURL.setPath( TDEGlobalSettings::desktopPath() );
KURL newDesktopURL;
newDesktopURL.setPath(urDesktop->url());
KURL autostartURL;
autostartURL.setPath( KGlobalSettings::autostartPath() );
autostartURL.setPath( TDEGlobalSettings::autostartPath() );
KURL newAutostartURL;
newAutostartURL.setPath(urAutostart->url());
KURL documentURL;
documentURL.setPath( KGlobalSettings::documentPath() );
documentURL.setPath( TDEGlobalSettings::documentPath() );
KURL newDocumentURL;
newDocumentURL.setPath(urDocument->url());
@ -202,11 +202,11 @@ void DesktopPathConfig::save()
if ( newAutostartURL.equals( futureAutostartURL, true ) )
autostartMoved = true;
else
autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
}
}
if ( moveDir( KURL( KGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
if ( moveDir( KURL( TDEGlobalSettings::desktopPath() ), KURL( urlDesktop ), i18n("Desktop") ) )
{
xdgconfig->writePathEntry( "XDG_DESKTOP_DIR", '"'+ urlDesktop + '"', true, false );
pathChanged = true;
@ -216,7 +216,7 @@ void DesktopPathConfig::save()
if ( !newAutostartURL.equals( autostartURL, true ) )
{
if (!autostartMoved)
autostartMoved = moveDir( KURL( KGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
if (autostartMoved)
{
config->writePathEntry( "Autostart", urAutostart->url(), true, true );

6
kcontrol/konqhtml/appearance.cpp
Unescape Escape View File

@ -212,7 +212,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget
m_pEncoding = new TQComboBox( false, this );
label->setBuddy( m_pEncoding );
encodings = KGlobal::charsets()->availableEncodingNames();
encodings = TDEGlobal::charsets()->availableEncodingNames();
encodings.prepend(i18n("Use Language Encoding"));
m_pEncoding->insertStringList( encodings );
lay->addMultiCellWidget(m_pEncoding,r, r, M, W);
@ -337,8 +337,8 @@ void KAppearanceOptions::load( bool useDefaults )
fSize = fMinSize;
defaultFonts = TQStringList();
defaultFonts.append( READ_ENTRY( "StandardFont", KGlobalSettings::generalFont().family() ) );
defaultFonts.append( READ_ENTRY( "FixedFont", KGlobalSettings::fixedFont().family() ) );
defaultFonts.append( READ_ENTRY( "StandardFont", TDEGlobalSettings::generalFont().family() ) );
defaultFonts.append( READ_ENTRY( "FixedFont", TDEGlobalSettings::fixedFont().family() ) );
defaultFonts.append( READ_ENTRY( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
defaultFonts.append( READ_ENTRY( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
defaultFonts.append( READ_ENTRY( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );

2
kcontrol/konqhtml/khttpoptdlg.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ void KHTTPOptions::load( bool useDefaults )
m_pConfig->setReadDefaults( useDefaults );
m_pConfig->setGroup( "Browser Settings/HTTP" );
tmp = m_pConfig->readEntry( "AcceptLanguages",KGlobal::locale()->languageList().join(","));
tmp = m_pConfig->readEntry( "AcceptLanguages",TDEGlobal::locale()->languageList().join(","));
le_languages->setText( tmp );
tmp = m_pConfig->readEntry( "AcceptCharsets",defaultCharsets);
le_charsets->setText( tmp );

4
kcontrol/konqhtml/pluginopts.cpp
Unescape Escape View File

@ -292,7 +292,7 @@ void KPluginOptions::scan()
}
m_nspluginscan = new KProcIO;
TQString scanExe = KGlobal::dirs()->findExe("nspluginscan");
TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan");
if (!scanExe) {
kdDebug() << "can't find nspluginviewer" << endl;
delete m_nspluginscan;
@ -314,7 +314,7 @@ void KPluginOptions::scan()
kdDebug() << "Running nspluginscan" << endl;
connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
this, TQT_SLOT(progress(KProcIO*)));
connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)),
connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(scanDone()));
connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));

8
kcontrol/konsole/schemaeditor.cpp
Unescape Escape View File

@ -93,7 +93,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
transparencyCheck->setChecked(false);
KGlobal::locale()->insertCatalogue("konsole"); // For schema translations
TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
@ -228,7 +228,7 @@ void SchemaEditor::show()
void SchemaEditor::loadAllSchema(TQString currentFile)
{
TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
TQStringList::ConstIterator it;
disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
schemaList->clear();
@ -263,7 +263,7 @@ void SchemaEditor::imageSelect()
start = backgndLine->text();
if (start.isEmpty())
{
TQStringList list=KGlobal::dirs()->resourceDirs("wallpaper");
TQStringList list=TDEGlobal::dirs()->resourceDirs("wallpaper");
if(list.count()>0)
start= list.last();
}
@ -361,7 +361,7 @@ void SchemaEditor::saveCurrent()
}
if (fullpath[0] != '/')
fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
TQFile f(fullpath);
if (f.open(IO_WriteOnly)) {

12
kcontrol/konsole/sessioneditor.cpp
Unescape Escape View File

@ -56,8 +56,8 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
oldSession=-1;
loaded=false;
KGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
KGlobal::iconLoader()->addAppDir( "konsole" );
TDEGlobal::locale()->insertCatalogue("konsole"); // For schema and keytab translations
TDEGlobal::iconLoader()->addAppDir( "konsole" );
directoryLine->setMode(KFile::Directory);
connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
@ -97,7 +97,7 @@ void SessionEditor::show()
void SessionEditor::loadAllKeytab()
{
TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
keytabCombo->clear();
keytabFilename.clear();
@ -159,7 +159,7 @@ TQString SessionEditor::readKeymapTitle(const TQString & file)
void SessionEditor::loadAllSession(TQString currentFile)
{
TQStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.desktop", false, true);
sessionList->clear();
TQListBoxItem* currentItem = 0;
@ -296,7 +296,7 @@ void SessionEditor::saveCurrent()
exec = exec.mid( 7, exec.length() - 8 );
exec = KRun::binaryName( exec, false );
exec = KShell::tildeExpand( exec );
TQString pexec = KGlobal::dirs()->findExe( exec );
TQString pexec = TDEGlobal::dirs()->findExe( exec );
if ( pexec.isEmpty() )
{
@ -326,7 +326,7 @@ void SessionEditor::saveCurrent()
}
if (fullpath[0] != '/')
fullpath = KGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
KSimpleConfig* co = new KSimpleConfig(fullpath);
co->setDesktopGroup();

26
kcontrol/krdb/krdb.cpp
Unescape Escape View File

@ -210,7 +210,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
kdeAdded.clear();
//Merge in KDE ones..
plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" );
for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{
@ -257,7 +257,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
settings.writeEntry("/qt/style", style);
/* export font settings */
settings.writeEntry("/qt/font", KGlobalSettings::generalFont().toString());
settings.writeEntry("/qt/font", TDEGlobalSettings::generalFont().toString());
/* ##### looks like kcmfonts skips this, so we don't do this here */
/*bool usexft = kglobals.readBoolEntry("AntiAliasing", false);
@ -444,9 +444,9 @@ void runRdb( uint flags )
// Export colors to non-(KDE/Qt) apps (e.g. Motif, GTK+ apps)
if (exportColors)
{
KGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TDEGlobal::dirs()->addResourceType("appdefaults", KStandardDirs::kde_default("data") + "kdisplay/app-defaults/");
TQColorGroup cg = newPal.active();
KGlobal::locale()->insertCatalogue("krdb");
TDEGlobal::locale()->insertCatalogue("krdb");
createGtkrc( true, cg, 1 );
createGtkrc( true, cg, 2 );
@ -454,23 +454,23 @@ void runRdb( uint flags )
TQColor backCol = cg.background();
addColorDef(preproc, "FOREGROUND" , cg.foreground());
addColorDef(preproc, "BACKGROUND" , backCol);
addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*KGlobalSettings::contrast()+4)*16/1));
addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*KGlobalSettings::contrast()+4)*10));
addColorDef(preproc, "HIGHLIGHT" , backCol.light(100+(2*TDEGlobalSettings::contrast()+4)*16/1));
addColorDef(preproc, "LOWLIGHT" , backCol.dark(100+(2*TDEGlobalSettings::contrast()+4)*10));
addColorDef(preproc, "SELECT_BACKGROUND" , cg.highlight());
addColorDef(preproc, "SELECT_FOREGROUND" , cg.highlightedText());
addColorDef(preproc, "WINDOW_BACKGROUND" , cg.base());
addColorDef(preproc, "WINDOW_FOREGROUND" , cg.foreground());
addColorDef(preproc, "INACTIVE_BACKGROUND", KGlobalSettings::inactiveTitleColor());
addColorDef(preproc, "INACTIVE_FOREGROUND", KGlobalSettings::inactiveTitleColor());
addColorDef(preproc, "ACTIVE_BACKGROUND" , KGlobalSettings::activeTitleColor());
addColorDef(preproc, "ACTIVE_FOREGROUND" , KGlobalSettings::activeTitleColor());
addColorDef(preproc, "INACTIVE_BACKGROUND", TDEGlobalSettings::inactiveTitleColor());
addColorDef(preproc, "INACTIVE_FOREGROUND", TDEGlobalSettings::inactiveTitleColor());
addColorDef(preproc, "ACTIVE_BACKGROUND" , TDEGlobalSettings::activeTitleColor());
addColorDef(preproc, "ACTIVE_FOREGROUND" , TDEGlobalSettings::activeTitleColor());
//---------------------------------------------------------------
tmp.writeBlock( preproc.latin1(), preproc.length() );
TQStringList list;
TQStringList adPaths = KGlobal::dirs()->findDirs("appdefaults", "");
TQStringList adPaths = TDEGlobal::dirs()->findDirs("appdefaults", "");
for (TQStringList::ConstIterator it = adPaths.begin(); it != adPaths.end(); ++it) {
TQDir dSys( *it );
@ -556,13 +556,13 @@ void runRdb( uint flags )
tmpFile.close();
KProcess proc;
TDEProcess proc;
#ifndef NDEBUG
proc << "xrdb" << "-merge" << "-nocpp" << tmpFile.name();
#else
proc << "xrdb" << "-quiet" << "-merge" << "-nocpp" << tmpFile.name();
#endif
proc.start( KProcess::Block, KProcess::Stdin );
proc.start( TDEProcess::Block, TDEProcess::Stdin );
tmpFile.unlink();

16
kcontrol/kthememanager/ktheme.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
//kdDebug() << m_dom.toString( 2 ) << endl;
setName( TQFileInfo( file ).baseName() );
m_kgd = KGlobal::dirs();
m_kgd = TDEGlobal::dirs();
}
KTheme::KTheme( TQWidget *parent, bool create )
@ -72,7 +72,7 @@ KTheme::KTheme( TQWidget *parent, bool create )
m_root.appendChild( m_general );
}
m_kgd = KGlobal::dirs();
m_kgd = TDEGlobal::dirs();
}
KTheme::~KTheme()
@ -125,7 +125,7 @@ TQString KTheme::createYourself( bool pack )
// 1. General stuff set by methods setBlah()
// 2. Background theme
KConfig * globalConf = KGlobal::config();
KConfig * globalConf = TDEGlobal::config();
KConfig twinConf( "twinrc", true );
twinConf.setGroup( "Desktops" );
@ -448,7 +448,7 @@ void KTheme::apply()
TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
if ( !iconElem.isNull() )
{
KConfig * iconConf = KGlobal::config();
KConfig * iconConf = TDEGlobal::config();
iconConf->setGroup( "Icons" );
iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true );
@ -526,7 +526,7 @@ void KTheme::apply()
if ( !colorsElem.isNull() )
{
TQDomNodeList colorList = colorsElem.childNodes();
KConfig * colorConf = KGlobal::config();
KConfig * colorConf = TDEGlobal::config();
TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
@ -643,7 +643,7 @@ void KTheme::apply()
if ( !widgetsElem.isNull() )
{
KConfig * widgetConf = KGlobal::config();
KConfig * widgetConf = TDEGlobal::config();
widgetConf->setGroup( "General" );
widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true );
widgetConf->sync();
@ -654,7 +654,7 @@ void KTheme::apply()
TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
if ( !fontsElem.isNull() )
{
KConfig * fontsConf = KGlobal::config();
KConfig * fontsConf = TDEGlobal::config();
KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
kde1xConf->setGroup( "General" );
@ -688,7 +688,7 @@ void KTheme::apply()
bool KTheme::remove( const TQString & name )
{
kdDebug() << "Going to remove theme: " << name << endl;
return KIO::NetAccess::del( KGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
}
void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent )

2
kcontrol/kthememanager/ktheme.h
Unescape Escape View File

@ -200,7 +200,7 @@ private:
bool copyFile( const TQString & from, const TQString & to );
/**
* Wrapper around KGlobal::dirs()->findResource()
* Wrapper around TDEGlobal::dirs()->findResource()
* @param section Section to work on (desktop, sounds, panel etc)
* @param path The file to find
*/

16
kcontrol/kthememanager/kthememanager.cpp
Unescape Escape View File

@ -106,7 +106,7 @@ kthememanager::~kthememanager()
void kthememanager::init()
{
KGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType( "themes", KStandardDirs::kde_default("data") +
"kthememanager/themes/" );
}
@ -115,7 +115,7 @@ void kthememanager::updateButton()
TQListViewItem * cur = dlg->lvThemes->currentItem();
bool enable = (cur != 0);
if (enable) {
enable = TQFile(KGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
enable = TQFile(TDEGlobal::dirs()->saveLocation( "themes", cur->text( 0 ) + "/"+ cur->text( 0 )+ ".xml" ,false)).exists() ;
}
dlg->btnRemove->setEnabled(enable);
}
@ -160,7 +160,7 @@ void kthememanager::save()
{
TQString themeName = cur->text( 0 );
m_theme = new KTheme( this, KGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
m_theme = new KTheme( this, TDEGlobal::dirs()->findResource( "themes", themeName + "/" + themeName + ".xml") );
m_theme->apply();
// Save the current theme name
@ -180,7 +180,7 @@ void kthememanager::listThemes()
dlg->lvThemes->clear();
dlg->lbPreview->setPixmap( TQPixmap() );
TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList::const_iterator it;
@ -197,7 +197,7 @@ void kthememanager::listThemes()
float kthememanager::getThemeVersion( const TQString & themeName )
{
TQStringList themes = KGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList themes = TDEGlobal::dirs()->findAllResources( "themes", "*.xml", true /*recursive*/ );
TQStringList::const_iterator it;
@ -325,7 +325,7 @@ void kthememanager::slotThemeChanged( TQListViewItem * item )
TQString themeName = item->text(0);
kdDebug() << "Activated theme: " << themeName << endl;
TQString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
TQString themeDir = TDEGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
TQString pixFile = themeDir + themeName + ".preview.png";
@ -392,7 +392,7 @@ void kthememanager::queryLNFModules()
dlg->lvDetails->sort();*/
// For now use a static list
KIconLoader * il = KGlobal::iconLoader();
KIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
@ -417,7 +417,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *)
{
KGlobal::locale()->insertCatalogue( "kthememanager" );
TDEGlobal::locale()->insertCatalogue( "kthememanager" );
return new kthememanager( parent, "kthememanager" );
}
}

52
kcontrol/locale/kcmlocale.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
// #### HPB: This should be implemented for KDE 3
// new TQLabel(this, I18N_NOOP("Encoding:"));
//TQComboBox * cb = new TQComboBox( this );
//cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() );
//cb->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1);
lay->addWidget(m_comboCountry, 0, 2);
@ -122,41 +122,41 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
void KLocaleConfig::slotInstallLanguage()
{
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode install";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotUninstallLanguage()
{
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode uninstall";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotSelectLanguage()
{
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode select";
TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotLanguageSelectorExited(KProcess *)
void KLocaleConfig::slotLanguageSelectorExited(TDEProcess *)
{
//reload here
loadLanguageList();
@ -256,8 +256,8 @@ void KLocaleConfig::slotLanguageDown()
void KLocaleConfig::loadLanguageList()
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
// clear the list
m_addLanguage->clear();
@ -277,7 +277,7 @@ void KLocaleConfig::loadLanguageList()
}
// add all languages to the list
TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"),
false, true);
TQStringList langlist = prilang;
@ -313,21 +313,21 @@ void KLocaleConfig::loadLanguageList()
}
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
}
void KLocaleConfig::loadCountryList()
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
TQString sub = TQString::fromLatin1("l10n/");
// clear the list
m_comboCountry->clear();
TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale",
sub + TQString::fromLatin1("*.desktop"),
false, true );
@ -356,12 +356,12 @@ void KLocaleConfig::loadCountryList()
.arg(tag) ) );
TQIconSet icon;
if ( !map.isNull() )
icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
// add all languages to the list
TQStringList countrylist = KGlobal::dirs()->findAllResources
TQStringList countrylist = TDEGlobal::dirs()->findAllResources
("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
for ( TQStringList::ConstIterator it = countrylist.begin();
@ -383,20 +383,20 @@ void KLocaleConfig::loadCountryList()
TQString flag( locate( "locale",
TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
}
void KLocaleConfig::readLocale(const TQString &path, TQString &name,
const TQString &sub) const
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
// read the name
TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
@ -408,12 +408,12 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name,
name = entry.readEntry("Name");
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
}
void KLocaleConfig::save()
{
KConfigBase *config = KGlobal::config();
KConfigBase *config = TDEGlobal::config();
config->setGroup("Locale");

2
kcontrol/locale/kcmlocale.h
Unescape Escape View File

@ -79,7 +79,7 @@ private slots:
void slotInstallLanguage();
void slotUninstallLanguage();
void slotSelectLanguage();
void slotLanguageSelectorExited(KProcess *);
void slotLanguageSelectorExited(TDEProcess *);
private:
TQStringList languageList() const;

2
kcontrol/locale/localemon.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ KLocaleConfigMoney::~KLocaleConfigMoney()
void KLocaleConfigMoney::save()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",

8
kcontrol/locale/localenum.cpp
Unescape Escape View File

@ -82,10 +82,10 @@ KLocaleConfigNumber::~KLocaleConfigNumber()
void KLocaleConfigNumber::save()
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
@ -122,7 +122,7 @@ void KLocaleConfigNumber::save()
config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
}
void KLocaleConfigNumber::slotLocaleChanged()

2
kcontrol/locale/localeother.cpp
Unescape Escape View File

@ -76,7 +76,7 @@ KLocaleConfigOther::~KLocaleConfigOther()
void KLocaleConfigOther::save()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",

8
kcontrol/locale/localetime.cpp
Unescape Escape View File

@ -246,10 +246,10 @@ KLocaleConfigTime::~KLocaleConfigTime()
void KLocaleConfigTime::save()
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
@ -299,7 +299,7 @@ void KLocaleConfigTime::save()
config->sync();
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
}
void KLocaleConfigTime::showEvent( TQShowEvent *e )

8
kcontrol/locale/toplevel.cpp
Unescape Escape View File

@ -172,8 +172,8 @@ void KLocaleApplication::load( bool useDefaults )
void KLocaleApplication::save()
{
// temperary use of our locale as the global locale
KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale;
KLocale *lsave = TDEGlobal::_locale;
TDEGlobal::_locale = m_locale;
KMessageBox::information(this, m_locale->translate
("Changed language settings apply only to "
"newly started applications.\nTo change the "
@ -182,9 +182,9 @@ void KLocaleApplication::save()
m_locale->translate("Applying Language Settings"),
TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
// restore the old global locale
KGlobal::_locale = lsave;
TDEGlobal::_locale = lsave;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
// ##### this doesn't make sense

6
kcontrol/privacy/kprivacymanager.cpp
Unescape Escape View File

@ -110,9 +110,9 @@ bool KPrivacyManager::clearFormCompletion() const
bool KPrivacyManager::clearWebCache() const
{
KProcess process;
TDEProcess process;
process << "kio_http_cache_cleaner" << "--clear-all";
return process.start(KProcess::DontCare);
return process.start(TDEProcess::DontCare);
}
bool KPrivacyManager::clearRecentDocuments() const
@ -143,7 +143,7 @@ bool KPrivacyManager::clearWebHistory()
bool KPrivacyManager::clearFavIcons()
{
TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" ));
TQDir favIconDir(TDEGlobal::dirs()->saveLocation( "cache", "favicons/" ));
favIconDir.setFilter( TQDir::Files );
TQStringList entries = favIconDir.entryList();

2
kcontrol/privacy/privacy.cpp
Unescape Escape View File

@ -311,7 +311,7 @@ extern "C"
KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/)
{
KGlobal::locale()->insertCatalogue("privacy");
TDEGlobal::locale()->insertCatalogue("privacy");
return new Privacy(parent, "Privacy");
}
}

2
kcontrol/randr/configdialog.cpp
Unescape Escape View File

@ -35,7 +35,7 @@
#include "configdialog.h"
ConfigDialog::ConfigDialog(KGlobalAccel *accel,
ConfigDialog::ConfigDialog(TDEGlobalAccel *accel,
bool isApplet )
: KDialogBase( Tabbed, i18n("Configure"),
Ok | Cancel | Help,

4
kcontrol/randr/configdialog.h
Unescape Escape View File

@ -33,7 +33,7 @@
#include <klistview.h>
#include <knuminput.h>
class KGlobalAccel;
class TDEGlobalAccel;
class KKeyChooser;
class KListView;
class TQPushButton;
@ -45,7 +45,7 @@ class ConfigDialog : public KDialogBase
Q_OBJECT
public:
ConfigDialog(KGlobalAccel *accel, bool isApplet );
ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
~ConfigDialog();
virtual void show();

8
kcontrol/randr/krandrtray.cpp
Unescape Escape View File

@ -52,7 +52,7 @@
KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
: KSystemTray(parent, name)
, m_popupUp(false)
, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
, m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
{
setPixmap(KSystemTray::loadSizedIcon("randr", width()));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@ -61,8 +61,8 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
my_parent = parent;
//printf("Reading configuration...\n\r");
globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
KGlobalAccel* keys = globalKeys;
globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
TDEGlobalAccel* keys = globalKeys;
#include "krandrbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc
globalKeys->readSettings();
@ -90,7 +90,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
applyIccConfiguration(cur_profile, NULL);
}
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
}

2
kcontrol/randr/krandrtray.h
Unescape Escape View File

@ -36,7 +36,7 @@ class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI
public:
KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
KGlobalAccel *globalKeys;
TDEGlobalAccel *globalKeys;
virtual void contextMenuAboutToShow(KPopupMenu* menu);

2
kcontrol/randr/main.cpp
Unescape Escape View File

@ -40,7 +40,7 @@ int main(int argc, char **argv)
aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org");
aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz");
aboutData.setProductName("krandr/krandrtray");
KGlobal::locale()->setMainCatalogue("krandr");
TDEGlobal::locale()->setMainCatalogue("krandr");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions(options);

2
kcontrol/samba/AUTHORS
Unescape Escape View File

@ -6,7 +6,7 @@ Conversion to kcontrol applet:
Matthias Hoelzer <hoelzer@physik.uni-wuerzburg.de>
Use of KProcess instead of popen, and more error checking
Use of TDEProcess instead of popen, and more error checking
David Faure <David.Faure@insa-lyon.fr>

4
kcontrol/samba/kcmsambastatistics.cpp
Unescape Escape View File

@ -126,8 +126,8 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
dataList=list;
filesCount=nrOfFiles;
connectionsCount=nrOfConnections;
connectionsL->setText(i18n("Connections: %1").arg(KGlobal::locale()->formatNumber(connectionsCount, 0)));
filesL->setText(i18n("File accesses: %1").arg(KGlobal::locale()->formatNumber(filesCount, 0)));
connectionsL->setText(i18n("Connections: %1").arg(TDEGlobal::locale()->formatNumber(connectionsCount, 0)));
filesL->setText(i18n("File accesses: %1").arg(TDEGlobal::locale()->formatNumber(filesCount, 0)));
clearStatistics();
}

18
kcontrol/samba/ksmbstatus.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ void NetMon::processSambaLine(char *bufline, int)
// called when we get some data from smbstatus
// can be called for any size of buffer (one line, several lines,
// half of one ...)
void NetMon::slotReceivedData(KProcess *, char *buffer, int )
void NetMon::slotReceivedData(TDEProcess *, char *buffer, int )
{
//kdDebug()<<"received stuff"<<endl;
char s[250],*start,*end;
@ -161,7 +161,7 @@ void NetMon::slotReceivedData(KProcess *, char *buffer, int )
void NetMon::update()
{
KProcess * process = new KProcess();
TDEProcess * process = new TDEProcess();
memset(&lo, 0, sizeof(lo));
list->clear();
@ -175,10 +175,10 @@ void NetMon::update()
nrpid=0;
process->setEnvironment("PATH", path);
connect(process,
TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
*process << "smbstatus";
if (!process->start(KProcess::Block,KProcess::Stdout))
if (!process->start(TDEProcess::Block,TDEProcess::Stdout))
version->setText(i18n("Error: Unable to run smbstatus"));
else if (rownumber==0) // empty result
version->setText(i18n("Error: Unable to open configuration file \"smb.conf\""));
@ -197,16 +197,16 @@ void NetMon::update()
readingpart=nfs;
delete showmountProc;
showmountProc=new KProcess();
showmountProc=new TDEProcess();
showmountProc->setEnvironment("PATH", path);
*showmountProc<<"showmount"<<"-a"<<"localhost";
connect(showmountProc,TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),TQT_SLOT(slotReceivedData(KProcess *, char *, int)));
connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
//without this timer showmount hangs up to 5 minutes
//if the portmapper daemon isn't running
TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
//kdDebug()<<"starting kill timer with 5 seconds"<<endl;
connect(showmountProc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(killShowmount()));
if (!showmountProc->start(KProcess::NotifyOnExit,KProcess::Stdout)) // run showmount
connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount()));
if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount
{
delete showmountProc;
showmountProc=0;

6
kcontrol/samba/ksmbstatus.h
Unescape Escape View File

@ -30,7 +30,7 @@
class TQListView;
class TQListViewItem;
class KProcess;
class TDEProcess;
class NetMon : public TQWidget
{
@ -41,7 +41,7 @@ public:
void loadSettings() {};
private:
KConfig *configFile;
KProcess *showmountProc;
TDEProcess *showmountProc;
TQListView *list;
TQLabel *version;
TQTimer *timer;
@ -59,7 +59,7 @@ private:
private slots:
void killShowmount();
void update();
void slotReceivedData(KProcess *proc, char *buffer, int buflen);
void slotReceivedData(TDEProcess *proc, char *buffer, int buflen);
};
#endif // main_included

30
kcontrol/screensaver/scrnsave.cpp
Unescape Escape View File

@ -82,8 +82,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mTesting = false;
// Add non-TDE path
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
"apps/ScreenSavers/");
setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
@ -107,19 +107,19 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
kdDebug() << "relPath=" << relPath << endl;
}
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
relPath);
readSettings( false );
mSetupProc = new KProcess;
connect(mSetupProc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotSetupDone(KProcess *)));
mSetupProc = new TDEProcess;
connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotSetupDone(TDEProcess *)));
mPreviewProc = new KProcess;
connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotPreviewExited(KProcess *)));
mPreviewProc = new TDEProcess;
connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
@ -465,7 +465,7 @@ void KScreenSaver::save()
void KScreenSaver::findSavers()
{
if ( !mNumLoaded ) {
mSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
mSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
new TQListViewItem ( mSaverListView, i18n("Loading...") );
if ( mSaverFileList.isEmpty() )
@ -562,7 +562,7 @@ void KScreenSaver::setMonitor()
//---------------------------------------------------------------------------
//
void KScreenSaver::slotPreviewExited(KProcess *)
void KScreenSaver::slotPreviewExited(TDEProcess *)
{
// Ugly hack to prevent continual respawning of savers that crash
if (mSelected == mPrevSelected)
@ -754,7 +754,7 @@ void KScreenSaver::slotTest()
return;
if (!mTestProc) {
mTestProc = new KProcess;
mTestProc = new TDEProcess;
}
mTestProc->clearArguments();
@ -800,7 +800,7 @@ void KScreenSaver::slotTest()
}
mTesting = true;
mTestProc->start(KProcess::NotifyOnExit);
mTestProc->start(TDEProcess::NotifyOnExit);
}
}
@ -851,7 +851,7 @@ void KScreenSaver::slotLock( bool l )
//---------------------------------------------------------------------------
//
void KScreenSaver::slotSetupDone(KProcess *)
void KScreenSaver::slotSetupDone(TDEProcess *)
{
mPrevSelected = -1; // see ugly hack in slotPreviewExited()
setMonitor();

12
kcontrol/screensaver/scrnsave.h
Unescape Escape View File

@ -28,7 +28,7 @@ class TQListView;
class TQListViewItem;
class TQPushButton;
class KIntNumInput;
class KProcess;
class TDEProcess;
//===========================================================================
class KScreenSaver : public KCModule
@ -56,11 +56,11 @@ protected slots:
void slotTimeoutChanged( int );
void slotLockTimeoutChanged( int );
void slotLock( bool );
void slotSetupDone(KProcess*);
void slotSetupDone(TDEProcess*);
// when selecting a new screensaver, the old preview will
// be killed. -- This callback is responsible for restarting the
// new preview
void slotPreviewExited(KProcess *);
void slotPreviewExited(TDEProcess *);
void findSavers();
protected:
@ -74,9 +74,9 @@ protected:
protected:
TestWin *mTestWin;
KProcess *mTestProc;
KProcess *mSetupProc;
KProcess *mPreviewProc;
TDEProcess *mTestProc;
TDEProcess *mSetupProc;
TDEProcess *mPreviewProc;
KSSMonitor *mMonitor;
TQPushButton *mSetupBt;
TQPushButton *mTestBt;

8
kcontrol/style/kcmstyle.cpp
Unescape Escape View File

@ -75,7 +75,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*)
{
KGlobal::locale()->insertCatalogue("kcmstyle");
TDEGlobal::locale()->insertCatalogue("kcmstyle");
return new KCMStyle(parent, "kcmstyle");
}
@ -96,7 +96,7 @@ extern "C"
TQByteArray properties;
TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
d << kapp->palette() << KGlobalSettings::generalFont();
d << kapp->palette() << TDEGlobalSettings::generalFont();
Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
// do it for all root windows - multihead support
@ -127,7 +127,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bStyleDirty= false;
m_bToolbarsDirty = false;
KGlobal::dirs()->addResourceType("themes",
TDEGlobal::dirs()->addResourceType("themes",
KStandardDirs::kde_default("data") + "kstyle/themes");
TDEAboutData *about =
@ -727,7 +727,7 @@ void KCMStyle::loadStyle( KConfig& config )
styleEntries.setAutoDelete(true);
TQString strWidgetStyle;
TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );

4
kcontrol/style/keramik/keramikconf.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
@ -70,7 +70,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
KeramikStyleConfig::~KeramikStyleConfig()
{
KGlobal::locale()->removeCatalogue("kstyle_keramik_config");
TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
}

2
kcontrol/style/menupreview.cpp
Unescape Escape View File

@ -82,7 +82,7 @@ void MenuPreview::createPixmaps()
(x % 2) ?
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
KIconLoader* icl = KGlobal::iconLoader();
KIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}

2
kcontrol/tdm/background.h
Unescape Escape View File

@ -16,7 +16,7 @@
class KSimpleConfig;
class BGDialog;
class KGlobalBackgroundSettings;
class TDEGlobalBackgroundSettings;
class TQCheckBox;
class TQLabel;

2
kcontrol/tdm/main.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
setlocale( LC_COLLATE, "C" );
KGlobal::locale()->insertCatalogue("kcmbackground");
TDEGlobal::locale()->insertCatalogue("kcmbackground");
TQStringList sl;
TQMap<gid_t,TQStringList> tgmap;

10
kcontrol/tdm/tdm-appear.cpp
Unescape Escape View File

@ -288,7 +288,7 @@ void TDMAppearanceWidget::makeReadOnly()
void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{
TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
@ -308,7 +308,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{
// XXX: Global + local schemes
TQStringList list = KGlobal::dirs()->
TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kdisplay/color-schemes/*.kcsrc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
@ -329,7 +329,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
{
// XXX: Global + local schemes
TQStringList list = KGlobal::dirs()->
TQStringList list = TDEGlobal::dirs()->
findAllResources("data", "kstyle/themes/*.themerc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
@ -429,7 +429,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// we gotta check if it is a non-local file and make a tmp copy at the hd.
if(!url->isLocalFile()) {
pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() +
"tdm/pics/" + url->fileName());
KIO::NetAccess::copy(*url, pixurl, parentWidget());
istmp = true;
@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
logoRadio->isChecked() ? "Logo" : "Clock" );
config->writeEntry("LogoPixmap", KGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
config->writeEntry("Compositor", compositorcombo->currentId());

4
kcontrol/tdm/tdm-users.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
// We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
// and create them if necessary.
config->setGroup( "X-*-Greeter" );
m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
m_userPixDir = config->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
m_notFirst = false;
TQDir testDir( m_userPixDir );
if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
@ -301,7 +301,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix)
void TDMUsersWidget::slotUserButtonClicked()
{
KFileDialog dlg(m_notFirst ? TQString::null :
KGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
KImageIO::pattern( KImageIO::Reading ),
this, 0, true);
dlg.setOperationMode( KFileDialog::Opening );

2
kcontrol/view1394/view1394.cpp
Unescape Escape View File

@ -325,7 +325,7 @@ extern "C"
KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name)
{
KGlobal::locale()->insertCatalogue("kcmview1394");
TDEGlobal::locale()->insertCatalogue("kcmview1394");
return new View1394(parent, name);
}
}

4
kcontrol/xinerama/kcmxinerama.cpp
Unescape Escape View File

@ -218,7 +218,7 @@ void KCMXinerama::windowIndicator(int dpy) {
TQWidget *KCMXinerama::indicator(int dpy) {
TQLabel *si = new TQLabel(TQString::number(dpy+1), 0, "Screen Indicator", (WFlags)WX11BypassWM );
TQFont fnt = KGlobalSettings::generalFont();
TQFont fnt = TDEGlobalSettings::generalFont();
fnt.setPixelSize(100);
si->setFont(fnt);
si->setFrameStyle(TQFrame::Panel);
@ -240,7 +240,7 @@ void KCMXinerama::clearIndicator() {
extern "C" {
KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) {
KGlobal::locale()->insertCatalogue("kcmxinerama");
TDEGlobal::locale()->insertCatalogue("kcmxinerama");
return new KCMXinerama(parent, name);
}

2
kdcop/kdcopwindow.cpp
Unescape Escape View File

@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{
setExpandable(true);
setText(0, TQString::fromUtf8(app_));
setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
/* Get the icon: we use the icon from a mainwindow in that class.

2
kdepasswd/kcm/kcm_useraccount.kcfg
Unescape Escape View File

@ -9,7 +9,7 @@
<group name="X-*-Greeter">
<entry name="faceDir" type="Path">
<default code="true">
KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/'
TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/'
</default>
</entry>
<entry name="UserFaceDir" type="Path">

10
kdepasswd/kcm/main.cpp
Unescape Escape View File

@ -107,8 +107,8 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
void KCMUserAccount::slotChangePassword()
{
KProcess *proc = new KProcess;
TQString bin = KGlobal::dirs()->findExe("kdepasswd");
TDEProcess *proc = new TDEProcess;
TQString bin = TDEGlobal::dirs()->findExe("kdepasswd");
if ( !bin )
{
kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
@ -122,7 +122,7 @@ void KCMUserAccount::slotChangePassword()
}
*proc << bin << _ku->loginName() ;
proc->start(KProcess::DontCare);
proc->start(TDEProcess::DontCare);
delete proc;
@ -147,7 +147,7 @@ void KCMUserAccount::load()
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
TQString _userPicsDir = KCFGUserAccount::faceDir() +
KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
TQString fs = KCFGUserAccount::faceSource();
if (fs == TQString::fromLatin1("UserOnly"))
@ -270,7 +270,7 @@ void KCMUserAccount::slotFaceButtonClicked()
return;
}
ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
ChFaceDlg* pDlg = new ChFaceDlg( TDEGlobal::dirs()->resourceDirs("data").last() +
"/tdm/pics/users/" );
if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )

4
kdesktop/bgmanager.cc
Unescape Escape View File

@ -78,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_Cache.resize( 1 );
m_Serial = 0; m_Hash = 0;
m_pConfig = KGlobal::config();
m_pConfig = TDEGlobal::config();
m_bExport = m_bCommon = m_bInit = false;
m_pKwinmodule = twinModule;
m_pPixmapServer = new KPixmapServer();
@ -136,7 +136,7 @@ KBackgroundManager::~KBackgroundManager()
for (unsigned i=0; i<m_Renderer.size(); i++)
delete m_Renderer[i];
//delete m_pConfig; Very bad idea, this is KGlobal::config !
//delete m_pConfig; Very bad idea, this is TDEGlobal::config !
delete m_pPixmapServer;
delete m_pTimer;

26
kdesktop/desktop.cc
Unescape Escape View File

@ -92,7 +92,7 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
else if ( e->type() == TQEvent::DragEnter )
{
TQDragEnterEvent* de = static_cast<TQDragEnterEvent*>( e );
bool b = !KGlobal::config()->isImmutable() && !KGlobal::dirs()->isRestrictedResource( "wallpaper" );
bool b = !TDEGlobal::config()->isImmutable() && !TDEGlobal::dirs()->isRestrictedResource( "wallpaper" );
bool imageURL = false;
if ( KURLDrag::canDecode( de ) )
@ -146,9 +146,9 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
m_bWaitForKded = wait_for_kded;
m_miniCli = 0; // created on demand
keys = 0; // created later
KGlobal::locale()->insertCatalogue("kdesktop");
KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
KGlobal::locale()->insertCatalogue("libdmctl");
TDEGlobal::locale()->insertCatalogue("kdesktop");
TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
TDEGlobal::locale()->insertCatalogue("libdmctl");
setCaption( "KDE Desktop");
@ -393,7 +393,7 @@ KDesktop::slotStart()
m_pIconView->start();
// Global keys
keys = new KGlobalAccel( TQT_TQOBJECT(this) );
keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
(void) new KRootWm( this );
#include "kdesktopbindings.cpp"
@ -412,7 +412,7 @@ KDesktop::runAutoStart()
// now let's execute all the stuff in the autostart folder.
// the stuff will actually be really executed when the event loop is
// entered, since KRun internally uses a QTimer
TQDir dir( KGlobalSettings::autostartPath() );
TQDir dir( TDEGlobalSettings::autostartPath() );
TQStringList entries = dir.entryList( TQDir::Files );
TQStringList::Iterator it = entries.begin();
TQStringList::Iterator end = entries.end();
@ -525,7 +525,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
} else {
NETRootInfo i( tqt_xdisplay(), NET::Supported );
if( !i.isSupported( NET::WM2FullPlacement )) {
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2,
rect.y() + (rect.height() - m_miniCli->height())/2);
}
@ -546,13 +546,13 @@ void KDesktop::slotShowWindowList()
void KDesktop::slotShowTaskManager()
{
//kdDebug(1204) << "Launching KSysGuard..." << endl;
KProcess* p = new KProcess;
TDEProcess* p = new TDEProcess;
TQ_CHECK_PTR(p);
*p << "ksysguard";
*p << "--showprocesses";
p->start(KProcess::DontCare);
p->start(TDEProcess::DontCare);
delete p;
}
@ -772,7 +772,7 @@ void KDesktop::slotConfigure()
void KDesktop::configure()
{
// re-read configuration and apply it
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
KDesktopSettings::self()->readConfig();
// If we have done start() already, then re-configure.
@ -990,7 +990,7 @@ void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
TQImage i;
TQImageDrag::decode(e, i);
KTempFile tmpFile(KGlobal::dirs()->saveLocation("wallpaper"), ".png");
KTempFile tmpFile(TDEGlobal::dirs()->saveLocation("wallpaper"), ".png");
i.save(tmpFile.name(), "PNG");
kdDebug(1204) << "KDesktop::contentsDropEvent " << tmpFile.name() << endl;
bgMgr->setWallpaper(tmpFile.name());
@ -1010,7 +1010,7 @@ void KDesktop::slotNewWallpaper(const KURL &url)
TQFileInfo fileInfo( fileName );
TQString ext = fileInfo.extension();
// Store tempfile in a place where it will still be available after a reboot
KTempFile tmpFile( KGlobal::dirs()->saveLocation("wallpaper"), "." + ext );
KTempFile tmpFile( TDEGlobal::dirs()->saveLocation("wallpaper"), "." + ext );
KURL localURL; localURL.setPath( tmpFile.name() );
// We pass 0 as parent window because passing the desktop is not a good idea
KIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ );
@ -1155,7 +1155,7 @@ TQPoint KDesktop::findPlaceForIcon( int column, int row )
void KDesktop::addIcon(const TQString & _url, int x, int y)
{
addIcon( _url, KGlobalSettings::desktopPath(), x, y );
addIcon( _url, TDEGlobalSettings::desktopPath(), x, y );
}
void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int y)

4
kdesktop/desktop.h
Unescape Escape View File

@ -32,7 +32,7 @@ class KURL;
class TQCloseEvent;
class TQDropEvent;
class TQPopupMenu;
class KGlobalAccel;
class TDEGlobalAccel;
class KWinModule;
class KBackgroundManager;
class TQTimer;
@ -187,7 +187,7 @@ signals:
private:
KGlobalAccel *keys;
TDEGlobalAccel *keys;
KWinModule* m_pKwinmodule;

18
kdesktop/init.cc
Unescape Escape View File

@ -101,9 +101,9 @@ static void copyDirectoryFile(const TQString &fileName, const TQString& dir, boo
{
if (force || !TQFile::exists(dir + "/.directory")) {
TQString cmd = "cp ";
cmd += KProcess::quote(locate("data", TQString("kdesktop/") + fileName));
cmd += TDEProcess::quote(locate("data", TQString("kdesktop/") + fileName));
cmd += " ";
cmd += KProcess::quote(dir+"/.directory");
cmd += TDEProcess::quote(dir+"/.directory");
system( TQFile::encodeName(cmd) );
}
}
@ -111,15 +111,15 @@ static void copyDirectoryFile(const TQString &fileName, const TQString& dir, boo
static void copyFile( const TQString& src, const TQString& dest )
{
TQCString cmd = "cp ";
cmd += TQFile::encodeName(KProcess::quote(src));
cmd += TQFile::encodeName(TDEProcess::quote(src));
cmd += " ";
cmd += TQFile::encodeName(KProcess::quote(dest));
cmd += TQFile::encodeName(TDEProcess::quote(dest));
system( cmd );
}
static TQString realDesktopPath()
{
TQString desktopPath = KGlobalSettings::desktopPath();
TQString desktopPath = TDEGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
@ -140,7 +140,7 @@ static void copyDesktopLinks()
return;
TQStringList list =
KGlobal::dirs()->findAllResources("appdata", "DesktopLinks/*", false, true);
TDEGlobal::dirs()->findAllResources("appdata", "DesktopLinks/*", false, true);
TQString desktopPath = realDesktopPath();
@ -197,15 +197,15 @@ void testLocalInstallation()
// Do not force copying that one (it would lose the icon positions)
copyDirectoryFile("directory.desktop", desktopPath, false);
testDir( KGlobalSettings::autostartPath() );
testDir( TDEGlobalSettings::autostartPath() );
// we force the copying in case of a new release, to install new translations....
copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
copyDirectoryFile("directory.autostart", TDEGlobalSettings::autostartPath(), newRelease);
if (emptyDesktop)
copyDesktopLinks();
// Take care of creating or updating trash.desktop
const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
const TQString trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash";
const bool firstTimeWithNewTrash = !TQFile::exists( trashDir );
const TQString trashDesktopPath = desktopPath + "/trash.desktop";
const bool trashDesktopExists = TQFile::exists( trashDesktopPath );

4
kdesktop/kcustommenu.cc
Unescape Escape View File

@ -84,9 +84,9 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
// 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);
TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16) {

4
kdesktop/kdesktop.kcfg
Unescape Escape View File

@ -411,11 +411,11 @@
<!-- config->writePathEntry( "CompletionItems", m_dlg->cbCommand->completionObject()->items() ); -->
</entry>
<entry key="CompletionMode" type="Int">
<default code="true">KGlobalSettings::completionMode()</default>
<default code="true">TDEGlobalSettings::completionMode()</default>
<label></label>
<whatsthis></whatsthis>
<!-- minicli.cpp:210 -->
<!-- int mode = config->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); -->
<!-- int mode = config->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); -->
<!-- minicli.cpp:252 -->
<!-- config->writeEntry( "CompletionMode", m_dlg->cbCommand->completionMode() ); -->
</entry>

16
kdesktop/kdiconview.cc
Unescape Escape View File

@ -154,7 +154,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
setIconArea( desktopRect() ); // the default is the whole desktop
// Initialise the shadow data objects...
m_shadowEngine = new KShadowEngine(new KDesktopShadowSettings(KGlobal::config()));
m_shadowEngine = new KShadowEngine(new KDesktopShadowSettings(TDEGlobal::config()));
// Initialize media handler
mMediaListView = new TQListView();
@ -164,7 +164,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
setURL( desktopURL() ); // sets m_url
m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" );
initDotDirectories();
connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
@ -278,14 +278,14 @@ void KDIconView::initConfig( bool init )
KDesktopSettings::self()->readConfig();
}
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
if ( !init ) {
KDesktopShadowSettings *shadowSettings = static_cast<KDesktopShadowSettings *>(m_shadowEngine->shadowSettings());
shadowSettings->setConfig(config);
}
setMaySetWallpaper(!config->isImmutable() && !KGlobal::dirs()->isRestrictedResource("wallpaper"));
setMaySetWallpaper(!config->isImmutable() && !TDEGlobal::dirs()->isRestrictedResource("wallpaper"));
m_bShowDot = KDesktopSettings::showHidden();
m_bVertAlign = KDesktopSettings::vertAlign();
TQStringList oldPreview = previewSettings();
@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
// set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
int sz = iconSize() ? iconSize() : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
int sz = iconSize() ? iconSize() : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
@ -587,7 +587,7 @@ void KDIconView::recheckDesktopURL()
KURL KDIconView::desktopURL()
{
// Support both paths and URLs
TQString desktopPath = KGlobalSettings::desktopPath();
TQString desktopPath = TDEGlobalSettings::desktopPath();
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
@ -1540,7 +1540,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool isImageDrag = TQImageDrag::canDecode(e);
bool isUrlDrag = KURLDrag::canDecode(e);
bool isImmutable = KGlobal::config()->isImmutable();
bool isImmutable = TDEGlobal::config()->isImmutable();
if ( (isColorDrag || isImageDrag) && !isUrlDrag ) {
// Hack to clear the drag shape

2
kdesktop/kfileividesktop.cpp
Unescape Escape View File

@ -139,7 +139,7 @@ bool KFileIVIDesktop::shouldUpdateShadow(bool selected)
void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
{
bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect();
bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect();
int textX;
if (drawRoundedRect == true)

12
kdesktop/krootwm.cc
Unescape Escape View File

@ -136,7 +136,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
m_actionCollection, "open_terminal" );
}
if (!KGlobal::config()->isImmutable())
if (!TDEGlobal::config()->isImmutable())
{
new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
@ -754,15 +754,15 @@ TQStringList KRootWm::configModules() {
void KRootWm::slotOpenTerminal()
{
// kdDebug() << "KRootWm::slotOpenTerminal" << endl;
KProcess* p = new KProcess;
TDEProcess* p = new TDEProcess;
TQ_CHECK_PTR(p);
KConfigGroupSaver gs(KGlobal::config(), "General");
TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
KConfigGroupSaver gs(TDEGlobal::config(), "General");
TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
*p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/";
*p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
p->start(KProcess::DontCare);
p->start(TDEProcess::DontCare);
delete p;
}

2
kdesktop/lock/lockdlg.cc
Unescape Escape View File

@ -692,7 +692,7 @@ void PasswordDlg::slotStartNewSession()
// Calculate a proper size for the text.
{
TQSimpleRichText rt(qt_text, dialog->font());
TQRect rect = KGlobalSettings::desktopGeometry(dialog);
TQRect rect = TDEGlobalSettings::desktopGeometry(dialog);
pref_width = rect.width() / 3;
rt.setWidth(pref_width);

26
kdesktop/lock/lockprocess.cc
Unescape Escape View File

@ -256,8 +256,8 @@ LockProcess::LockProcess()
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
// Add non-TDE path
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
"System/ScreenSavers/");
// Add KDE specific screensaver path
@ -268,8 +268,8 @@ LockProcess::LockProcess()
relPath=servGroup->relPath();
kdDebug(1204) << "relPath=" << relPath << endl;
}
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
relPath);
// virtual root property
@ -356,7 +356,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
connect(&mHackProc, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(hackExited(KProcess *)));
connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
#ifdef HAVE_DPMS
@ -1684,7 +1684,7 @@ void LockProcess::stopHack()
//---------------------------------------------------------------------------
//
void LockProcess::hackExited(KProcess *)
void LockProcess::hackExited(TDEProcess *)
{
// Hack exited while we're supposed to be saving the screen.
// Make sure the saver window is black.
@ -1831,11 +1831,11 @@ bool LockProcess::checkPass()
if (trinity_desktop_lock_use_sak) {
// Verify SAK operational status
KProcess* checkSAKProcess = new KProcess;
*checkSAKProcess << "tdmtsak" << "check";
checkSAKProcess->start(KProcess::Block, KProcess::NoCommunication);
int retcode = checkSAKProcess->exitStatus();
delete checkSAKProcess;
TDEProcess* checkSATDEProcess = new TDEProcess;
*checkSATDEProcess << "tdmtsak" << "check";
checkSATDEProcess->start(TDEProcess::Block, TDEProcess::NoCommunication);
int retcode = checkSATDEProcess->exitStatus();
delete checkSATDEProcess;
if (retcode != 0) {
trinity_desktop_lock_use_sak = false;
}
@ -1903,7 +1903,7 @@ int LockProcess::execDialog( TQDialog *dlg )
dlg->adjustSize();
TQRect rect = dlg->geometry();
rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center());
rect.moveCenter(TDEGlobalSettings::desktopGeometry(TQCursor::pos()).center());
dlg->move( rect.topLeft() );
if (mDialogs.isEmpty())
@ -2352,7 +2352,7 @@ void LockProcess::showVkbd()
mVkbdLastEventWindow = None;
mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
mVkbdProcess = new KProcess;
mVkbdProcess = new TDEProcess;
*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
mVkbdProcess->start();
}

6
kdesktop/lock/lockprocess.h
Unescape Escape View File

@ -86,7 +86,7 @@ protected:
virtual void resizeEvent(TQResizeEvent *);
private slots:
void hackExited(KProcess *);
void hackExited(TDEProcess *);
void signalPipeSignal();
bool startLock();
void suspend();
@ -136,7 +136,7 @@ private:
int mLockGrace;
int mPriority;
bool mBusy;
KProcess mHackProc;
TDEProcess mHackProc;
int mRootWidth;
int mRootHeight;
TQString mSaverExec;
@ -168,7 +168,7 @@ private:
TQTimer *hackResumeTimer;
KProcess* mVkbdProcess;
TDEProcess* mVkbdProcess;
KWinModule* mKWinModule;
struct VkbdWindow
{

4
kdesktop/lock/main.cc
Unescape Escape View File

@ -231,7 +231,7 @@ int main( int argc, char **argv )
int parent_connection = 0; // socket to the parent saver
TQValueList<int> child_sockets;
if (KGlobalSettings::isMultiHead())
if (TDEGlobalSettings::isMultiHead())
{
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@ -290,7 +290,7 @@ int main( int argc, char **argv )
MyApp app;
kdDebug() << "app " << kdesktop_screen_number << " " << starting_screen << " " << child << " " << child_sockets.count() << " " << parent_connection << endl;
app.disableSessionManagement();
KGlobal::locale()->insertCatalogue("libdmctl");
TDEGlobal::locale()->insertCatalogue("libdmctl");
struct stat st;
KSimpleConfig* tdmconfig;

18
kdesktop/lock/sakdlg.cc
Unescape Escape View File

@ -104,24 +104,24 @@ SAKDlg::SAKDlg(LockProcess *parent)
installEventFilter(this);
setFixedSize( sizeHint() );
mSAKProcess = new KProcess;
*mSAKProcess << "tdmtsak";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
mSATDEProcess = new TDEProcess;
*mSATDEProcess << "tdmtsak";
connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
mSATDEProcess->start();
}
void SAKDlg::slotSAKProcessExited()
void SAKDlg::slotSATDEProcessExited()
{
int retcode = mSAKProcess->exitStatus();
int retcode = mSATDEProcess->exitStatus();
if (retcode != 0) trinity_desktop_lock_use_sak = false;
hide();
}
SAKDlg::~SAKDlg()
{
if ((mSAKProcess) && (mSAKProcess->isRunning())) {
mSAKProcess->kill(SIGTERM);
delete mSAKProcess;
if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
mSATDEProcess->kill(SIGTERM);
delete mSATDEProcess;
}
hide();
}

4
kdesktop/lock/sakdlg.h
Unescape Escape View File

@ -37,7 +37,7 @@ public:
void closeDialogForced();
private slots:
void slotSAKProcessExited();
void slotSATDEProcessExited();
protected slots:
virtual void reject();
@ -51,7 +51,7 @@ private:
TQStringList layoutsList;
TQStringList::iterator currLayout;
int sPid, sFd;
KProcess* mSAKProcess;
TDEProcess* mSATDEProcess;
};
#endif

26
kdesktop/lockeng.cc
Unescape Escape View File

@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
: TQWidget(),
KScreensaverIface(),
mBlankOnly(false),
mSAKProcess(NULL),
mSATDEProcess(NULL),
mTerminationRequested(false)
{
struct sigaction act;
@ -83,12 +83,12 @@ SaverEngine::SaverEngine()
mXAutoLock = 0;
mEnabled = false;
connect(&mLockProcess, TQT_SIGNAL(processExited(KProcess *)),
connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(lockProcessExited()));
mSAKProcess = new KProcess;
*mSAKProcess << "tdmtsak";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSATDEProcess = new TDEProcess;
*mSATDEProcess << "tdmtsak";
connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
@ -134,7 +134,7 @@ void SaverEngine::lock()
bool ok = true;
if (mState != Saving)
{
mSAKProcess->kill(SIGTERM);
mSATDEProcess->kill(SIGTERM);
ok = startLockProcess( ForceLock );
// It takes a while for kdesktop_lock to start and lock the screen.
// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
@ -179,7 +179,7 @@ void SaverEngine::save()
{
if (mState == Waiting)
{
mSAKProcess->kill(SIGTERM);
mSATDEProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}
}
@ -276,18 +276,18 @@ void SaverEngine::enableExports()
void SaverEngine::handleSecureDialog()
{
// Wait for SAK press
if (!mSAKProcess->isRunning()) mSAKProcess->start();
if (!mSATDEProcess->isRunning()) mSATDEProcess->start();
}
void SaverEngine::slotSAKProcessExited()
void SaverEngine::slotSATDEProcessExited()
{
int retcode = mSAKProcess->exitStatus();
if ((retcode != 0) && (mSAKProcess->normalExit())) {
int retcode = mSATDEProcess->exitStatus();
if ((retcode != 0) && (mSATDEProcess->normalExit())) {
trinity_lockeng_sak_available = FALSE;
printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
}
if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
if ((mSATDEProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
bool ok = true;
if (mState == Waiting)
{
@ -525,7 +525,7 @@ void SaverEngine::idleTimeout()
// disable X screensaver
XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
XSetScreenSaver(tqt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures);
mSAKProcess->kill(SIGTERM);
mSATDEProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}

6
kdesktop/lockeng.h
Unescape Escape View File

@ -89,7 +89,7 @@ protected slots:
private slots:
void handleSecureDialog();
void slotSAKProcessExited();
void slotSATDEProcessExited();
/**
* Enable wallpaper exports
@ -110,7 +110,7 @@ protected:
State mState;
XAutoLock *mXAutoLock;
KProcess mLockProcess;
TDEProcess mLockProcess;
int mTimeout;
// the original X screensaver parameters
@ -123,7 +123,7 @@ protected:
TQValueVector< DCOPClientTransaction* > mLockTransactions;
private:
KProcess* mSAKProcess;
TDEProcess* mSATDEProcess;
bool mTerminationRequested;
};

4
kdesktop/main.cc
Unescape Escape View File

@ -112,7 +112,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
signal(SIGHUP, signalHandler);
{
if (KGlobalSettings::isMultiHead())
if (TDEGlobalSettings::isMultiHead())
{
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@ -156,7 +156,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
}
}
KGlobal::locale()->setMainCatalogue("kdesktop");
TDEGlobal::locale()->setMainCatalogue("kdesktop");
if (kdesktop_screen_number == 0) {
kdesktop_name = "kdesktop";

8
kdesktop/minicli.cpp
Unescape Escape View File

@ -130,7 +130,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
m_systempathAutocomplete = 0;
m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion);
m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion);
//m_pURLCompletion->setCompletionMode( KGlobalSettings::completionMode() );
//m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) ));
@ -241,7 +241,7 @@ void Minicli::loadConfig()
m_dlg->cbCommand->completionObject()->setItems( compList );
int mode = KDesktopSettings::completionMode();
m_dlg->cbCommand->setCompletionMode( (KGlobalSettings::Completion) mode );
m_dlg->cbCommand->setCompletionMode( (TDEGlobalSettings::Completion) mode );
KCompletionBox* box = m_dlg->cbCommand->completionBox();
if (box)
@ -268,7 +268,7 @@ void Minicli::loadConfig()
completion->insertItems (users);
m_dlg->leUsername->setCompletionObject(completion, true);
m_dlg->leUsername->setCompletionMode(KGlobalSettings::completionMode());
m_dlg->leUsername->setCompletionMode(TDEGlobalSettings::completionMode());
m_dlg->leUsername->setAutoDeleteCompletionObject( true );
}
@ -1074,7 +1074,7 @@ TQString Minicli::calculate(const TQString &exp)
TQString result, cmd;
const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
cmd = TQString("echo %1 | %2").arg(KProcess::quote(TQString("scale=8; ")+exp), KProcess::quote(bc));
cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(TQString("scale=8; ")+exp), TDEProcess::quote(bc));
else
cmd = TQString("echo $((%1))").arg(exp);
FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");

2
kdesktop/startupid.cpp
Unescape Escape View File

@ -179,7 +179,7 @@ void StartupId::start_startupid( const TQString& icon_P )
= { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
KIcon::DefaultState, 0, true ); // return null pixmap if not found
if( icon_pixmap.isNull())
icon_pixmap = SmallIcon( "exec" );

4
kfind/ChangeLog
Unescape Escape View File

@ -64,7 +64,7 @@ ver. 0.4.1: Mario Weilguni <mweilguni@kde.org>
ver. 0.4: Mario Weilguni <mweilguni@kde.org>
* introduced this ChangeLog
* kfind now uses KShellProcess instead of KProcess, makes
* kfind now uses KShellProcess instead of TDEProcess, makes
regular expression search possible with egrep/xargs
* kftabdlg.cpp: tab-dialog isn't closed anymore if Escape key
is pressed
@ -83,7 +83,7 @@ ver. 0.3.4:
ver. 0.3.3:
o uses KProcess
o uses TDEProcess
o supports other languages then english (at this time german and czech)
ver. 0.3.2:

4
kfind/kdatecombo.cpp
Unescape Escape View File

@ -49,12 +49,12 @@ KDateCombo::~KDateCombo()
TQString KDateCombo::date2String(const TQDate & date)
{
return(KGlobal::locale()->formatDate(date, true));
return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
{
return *qd = KGlobal::locale()->readDate(str);
return *qd = TDEGlobal::locale()->readDate(str);
}
TQDate & KDateCombo::getDate(TQDate *currentDate)

14
kfind/kftabdlg.cpp
Unescape Escape View File

@ -158,7 +158,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
betweenType->setCurrentItem(1);
TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate = new KDateCombo(dt, pages[1], "fromDate");
toDate = new KDateCombo(pages[1], "toDate");
@ -380,7 +380,7 @@ KfindTabWidget::~KfindTabWidget()
void KfindTabWidget::setURL( const KURL & url )
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
m_url = url;
TQStringList sl = conf->readPathListEntry("Directories");
@ -459,7 +459,7 @@ void KfindTabWidget::saveHistory()
void KfindTabWidget::loadHistory()
{
// Load pattern history
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("History");
TQStringList sl = conf->readListEntry("Patterns");
if(!sl.isEmpty())
@ -522,7 +522,7 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
void KfindTabWidget::setDefaults()
{
TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
TQDate dt = TDEGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
fromDate ->setDate(dt);
toDate ->setDate(TQDate::currentDate());
@ -726,11 +726,11 @@ void KfindTabWidget::setQuery(KQuery *query)
}
TQString KfindTabWidget::date2String(const TQDate & date) {
return(KGlobal::locale()->formatDate(date, true));
return(TDEGlobal::locale()->formatDate(date, true));
}
TQDate &KfindTabWidget::string2Date(const TQString & str, TQDate *qd) {
return *qd = KGlobal::locale()->readDate(str);
return *qd = TDEGlobal::locale()->readDate(str);
}
void KfindTabWidget::getDirectory()
@ -849,7 +849,7 @@ static void save_pattern(TQComboBox *obj,
}
}
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup(group);
conf->writePathEntry(entry, sl);
}

6
kfind/kfwin.cpp
Unescape Escape View File

@ -61,11 +61,11 @@ KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& mat
{
fileInfo = new TQFileInfo(item.url().path());
TQString size = KGlobal::locale()->formatNumber(item.size(), 0);
TQString size = TDEGlobal::locale()->formatNumber(item.size(), 0);
TQDateTime dt;
dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
TQString date = KGlobal::locale()->formatDateTime(dt);
TQString date = TDEGlobal::locale()->formatDateTime(dt);
int perm_index;
if(fileInfo->isReadable())
@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init)
{
setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
TQString sampleDate =
KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);

16
kfind/kquery.cpp
Unescape Escape View File

@ -20,10 +20,10 @@ KQuery::KQuery(TQObject *parent, const char * name)
{
m_regexps.setAutoDelete(true);
m_fileItems.setAutoDelete(true);
processLocate = new KProcess(this);
connect(processLocate,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(KProcess*,char*,int)));
connect(processLocate,TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(KProcess*,char*,int)));
connect(processLocate,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(slotendProcessLocate(KProcess*)));
processLocate = new TDEProcess(this);
connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*)));
// Files with these mime types can be ignored, even if
// findFormatByFileContent() in some cases may claim that
@ -78,7 +78,7 @@ void KQuery::start()
*processLocate << m_url.path(1).latin1();
bufferLocate=NULL;
bufferLocateLength=0;
processLocate->start(KProcess::NotifyOnExit,KProcess::AllOutput);
processLocate->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
return;
}
@ -478,12 +478,12 @@ void KQuery::setUseFileIndex(bool useLocate)
m_useLocate=useLocate;
}
void KQuery::slotreceivedSdterr(KProcess* ,char* str,int)
void KQuery::slotreceivedSdterr(TDEProcess* ,char* str,int)
{
KMessageBox::error(NULL, TQString(str), i18n("Error while using locate"));
}
void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
void KQuery::slotreceivedSdtout(TDEProcess*,char* str,int l)
{
int i;
@ -494,7 +494,7 @@ void KQuery::slotreceivedSdtout(KProcess*,char* str,int l)
bufferLocate[bufferLocateLength-l+i]=str[i];
}
void KQuery::slotendProcessLocate(KProcess*)
void KQuery::slotendProcessLocate(TDEProcess*)
{
TQString qstr;
TQStringList strlist;

8
kfind/kquery.h
Unescape Escape View File

@ -53,9 +53,9 @@ class KQuery : public TQObject
void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
void slotResult(KIO::Job *);
void slotCanceled(KIO::Job *);
void slotreceivedSdtout(KProcess*,char*,int);
void slotreceivedSdterr(KProcess*,char*,int);
void slotendProcessLocate(KProcess*);
void slotreceivedSdtout(TDEProcess*,char*,int);
void slotreceivedSdterr(TDEProcess*,char*,int);
void slotendProcessLocate(TDEProcess*);
signals:
void addFile(const KFileItem *filename, const TQString& matchingLine);
@ -86,7 +86,7 @@ class KQuery : public TQObject
char* bufferLocate;
int bufferLocateLength;
TQStringList locateList;
KProcess *processLocate;
TDEProcess *processLocate;
TQPtrList<TQRegExp> m_regexps;// regexps for file name
// TQValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex
KIO::ListJob *job;

4
khelpcenter/docmetainfo.cpp
Unescape Escape View File

@ -123,7 +123,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
{
if ( mLoaded && !force ) return;
mLanguages = KGlobal::locale()->languagesTwoAlpha();
mLanguages = TDEGlobal::locale()->languagesTwoAlpha();
kdDebug( 1400 ) << "LANGS: " << mLanguages.join( " " ) << endl;
@ -137,7 +137,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" );
if ( metaInfos.isEmpty() ) {
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/khelpcenter" );
metaInfos = kstd->findDirs( "data", "plugins" );
}

6
khelpcenter/fontdialog.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ void FontDialog::setupFontEncodingBox()
layout->addWidget( lDefaultEncoding, 0, 0 );
m_defaultEncoding = new KComboBox( false, gb );
layout->addWidget( m_defaultEncoding, 0, 1 );
TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
TQStringList encodings = TDEGlobal::charsets()->availableEncodingNames();
encodings.prepend( i18n( "Use Language Encoding" ) );
m_defaultEncoding->insertStringList( encodings );
lDefaultEncoding->setBuddy( m_defaultEncoding );
@ -157,8 +157,8 @@ void FontDialog::load()
TQStringList fonts = cfg->readListEntry( "Fonts" );
if ( fonts.isEmpty() )
fonts << KGlobalSettings::generalFont().family()
<< KGlobalSettings::fixedFont().family()
fonts << TDEGlobalSettings::generalFont().family()
<< TDEGlobalSettings::fixedFont().family()
<< HTML_DEFAULT_VIEW_SERIF_FONT
<< HTML_DEFAULT_VIEW_SANSSERIF_FONT
<< HTML_DEFAULT_VIEW_CURSIVE_FONT

2
khelpcenter/formatter.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ Formatter:: ~Formatter()
bool Formatter::readTemplates()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Templates" );
TQString mainTemplate = cfg->readEntry( "MainTemplate" );

10
khelpcenter/glossary.cpp
Unescape Escape View File

@ -146,9 +146,9 @@ void Glossary::rebuildGlossaryCache()
Q_ASSERT( mainWindow );
mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
KProcess *meinproc = new KProcess;
connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( meinprocExited( KProcess * ) ) );
TDEProcess *meinproc = new TDEProcess;
connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
@ -156,10 +156,10 @@ void Glossary::rebuildGlossaryCache()
<< locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
*meinproc << m_sourceFile;
meinproc->start( KProcess::NotifyOnExit );
meinproc->start( TDEProcess::NotifyOnExit );
}
void Glossary::meinprocExited( KProcess *meinproc )
void Glossary::meinprocExited( TDEProcess *meinproc )
{
delete meinproc;

4
khelpcenter/glossary.h
Unescape Escape View File

@ -27,7 +27,7 @@
#include <tqstringlist.h>
class KConfig;
class KProcess;
class TDEProcess;
class EntryItem;
@ -117,7 +117,7 @@ class Glossary : public KListView
void entrySelected( const GlossaryEntry &entry );
private slots:
void meinprocExited( KProcess *meinproc );
void meinprocExited( TDEProcess *meinproc );
void treeItemSelected( TQListViewItem *item );
private:

42
khelpcenter/htmlsearch/htmlsearch.cpp
Unescape Escape View File

@ -266,7 +266,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
delete _proc;
// prepare new process
_proc = new KProcess();
_proc = new TDEProcess();
*_proc << exe << "-v" << "-c" << dataPath(_lang)+"/htdig.conf";
if (initial)
{
@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
kdDebug() << "Running htdig" << endl;
connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
this, TQT_SLOT(htdigStdout(KProcess *,char*,int)));
connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(htdigExited(KProcess *)));
connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(htdigExited(TDEProcess *)));
_htdigRunning = true;
@ -308,7 +308,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
// execute htdig
_proc->start(KProcess::NotifyOnExit, KProcess::Stdout );
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
kapp->enter_loop();
@ -335,17 +335,17 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
return false;
}
delete _proc;
_proc = new KProcess();
_proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf";
kdDebug() << "Running htmerge" << endl;
connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(htmergeExited(KProcess *)));
connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(htmergeExited(TDEProcess *)));
_htmergeRunning = true;
_proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();
@ -370,7 +370,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
void HTMLSearch::htdigStdout(TDEProcess *, char *buffer, int len)
{
TQString line = TQString(buffer).left(len);
@ -389,7 +389,7 @@ void HTMLSearch::htdigStdout(KProcess *, char *buffer, int len)
}
void HTMLSearch::htdigExited(KProcess *p)
void HTMLSearch::htdigExited(TDEProcess *p)
{
kdDebug() << "htdig terminated " << p->exitStatus() << endl;
_htdigRunning = false;
@ -397,7 +397,7 @@ void HTMLSearch::htdigExited(KProcess *p)
}
void HTMLSearch::htmergeExited(KProcess *)
void HTMLSearch::htmergeExited(TDEProcess *)
{
kdDebug() << "htmerge terminated" << endl;
_htmergeRunning = false;
@ -405,13 +405,13 @@ void HTMLSearch::htmergeExited(KProcess *)
}
void HTMLSearch::htsearchStdout(KProcess *, char *buffer, int len)
void HTMLSearch::htsearchStdout(TDEProcess *, char *buffer, int len)
{
_searchResult += TQString::fromLocal8Bit(buffer,len);
}
void HTMLSearch::htsearchExited(KProcess *)
void HTMLSearch::htsearchExited(TDEProcess *)
{
kdDebug() << "htsearch terminated" << endl;
_htsearchRunning = false;
@ -438,21 +438,21 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
delete config;
return TQString::null;
}
_proc = new KProcess();
_proc = new TDEProcess();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
kdDebug() << "Running htsearch" << endl;
connect(_proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)));
connect(_proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(htsearchExited(KProcess *)));
connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)));
connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(htsearchExited(TDEProcess *)));
_htsearchRunning = true;
_searchResult = "";
_proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
_proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
kapp->enter_loop();

14
khelpcenter/htmlsearch/htmlsearch.h
Unescape Escape View File

@ -10,7 +10,7 @@ class TQWidget;
class TQProgressDialog;
class KProcess;
class TDEProcess;
class ProgressDialog;
@ -32,11 +32,11 @@ public:
protected slots:
void htdigStdout(KProcess *proc, char *buffer, int buflen);
void htdigExited(KProcess *proc);
void htmergeExited(KProcess *proc);
void htsearchStdout(KProcess *proc, char *buffer, int buflen);
void htsearchExited(KProcess *proc);
void htdigStdout(TDEProcess *proc, char *buffer, int buflen);
void htdigExited(TDEProcess *proc);
void htmergeExited(TDEProcess *proc);
void htsearchStdout(TDEProcess *proc, char *buffer, int buflen);
void htsearchExited(TDEProcess *proc);
protected:
@ -52,7 +52,7 @@ protected:
private:
TQStringList _files;
KProcess *_proc;
TDEProcess *_proc;
int _filesToDig, _filesDigged, _filesScanned;
volatile bool _htdigRunning, _htmergeRunning, _htsearchRunning;
TQString _searchResult;

2
khelpcenter/htmlsearch/index.cpp
Unescape Escape View File

@ -22,7 +22,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("htmlsearch");
TDEGlobal::locale()->setMainCatalogue("htmlsearch");
TDEApplication app;
HTMLSearch search;

18
khelpcenter/htmlsearch/kcmhtmlsearch.cpp
Unescape Escape View File

@ -178,7 +178,7 @@ void KHTMLSearchConfig::loadLanguages()
language->clear();
// add all languages to the list
TQStringList langs = KGlobal::dirs()->findAllResources("locale",
TQStringList langs = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langs.sort();
@ -186,7 +186,7 @@ void KHTMLSearchConfig::loadLanguages()
{
KSimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
TQString path = *it;
int index = path.findRev('/');
@ -272,7 +272,7 @@ void KHTMLSearchConfig::load()
searchPaths->insertItem(*it);
config->setGroup("Locale");
TQString lang = config->readEntry("Search Language", KGlobal::locale()->language());
TQString lang = config->readEntry("Search Language", TDEGlobal::locale()->language());
language->setCurrentItem(lang);
emit changed(false);
@ -320,7 +320,7 @@ void KHTMLSearchConfig::defaults()
searchPaths->clear();
language->setCurrentItem(KGlobal::locale()->language());
language->setCurrentItem(TDEGlobal::locale()->language());
emit changed(true);
}
@ -342,11 +342,11 @@ void KHTMLSearchConfig::generateIndex()
delete indexProc;
indexProc = new KProcess;
indexProc = new TDEProcess;
*indexProc << exe << "--lang" << language->currentTag();
connect(indexProc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(indexTerminated(KProcess *)));
connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(indexTerminated(TDEProcess *)));
runButton->setEnabled(false);
@ -354,7 +354,7 @@ void KHTMLSearchConfig::generateIndex()
}
void KHTMLSearchConfig::indexTerminated(KProcess *)
void KHTMLSearchConfig::indexTerminated(TDEProcess *)
{
runButton->setEnabled(true);
}
@ -364,7 +364,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
{
KGlobal::locale()->insertCatalogue("kcmhtmlsearch");
TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
return new KHTMLSearchConfig(parent, name);
};
}

6
khelpcenter/htmlsearch/kcmhtmlsearch.h
Unescape Escape View File

@ -29,7 +29,7 @@ class TQLineEdit;
class TQCheckBox;
class TQPushButton;
class KListBox;
class KProcess;
class TDEProcess;
class KLanguageCombo;
class KURLRequester;
@ -60,7 +60,7 @@ protected slots:
void urlClicked(const TQString&);
void generateIndex();
void indexTerminated(KProcess *proc);
void indexTerminated(TDEProcess *proc);
private:
@ -74,7 +74,7 @@ private:
KListBox *searchPaths;
KLanguageCombo *language;
KProcess *indexProc;
TDEProcess *indexProc;
};

32
khelpcenter/kcmhelpcenter.cpp
Unescape Escape View File

@ -135,7 +135,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
IndexProgressDialog::~IndexProgressDialog()
{
if ( !mLogView->isHidden() ) {
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
cfg->writeEntry( "size", size() );
}
@ -196,7 +196,7 @@ void IndexProgressDialog::slotEnd()
void IndexProgressDialog::toggleDetails()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "indexprogressdialog" );
if ( mLogView->isHidden() ) {
mLogLabel->show();
@ -234,7 +234,7 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
setButtonOK( i18n("Build Index") );
mConfig = KGlobal::config();
mConfig = TDEGlobal::config();
DocMetaInfo::self()->scanMetaInfo();
@ -465,7 +465,7 @@ void KCMHelpCenter::startIndexProcess()
{
kdDebug() << "KCMHelpCenter::startIndexProcess()" << endl;
mProcess = new KProcess;
mProcess = new TDEProcess;
if ( mRunAsRoot ) {
*mProcess << "tdesu" << "--nonewdcop";
@ -476,14 +476,14 @@ void KCMHelpCenter::startIndexProcess()
*mProcess << mCmdFile->name();
*mProcess << Prefs::indexDirectory();
connect( mProcess, TQT_SIGNAL( processExited( KProcess * ) ),
TQT_SLOT( slotIndexFinished( KProcess * ) ) );
connect( mProcess, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
connect( mProcess, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ),
TQT_SLOT( slotIndexFinished( TDEProcess * ) ) );
connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
<< endl;
}
@ -502,7 +502,7 @@ void KCMHelpCenter::cancelBuildIndex()
}
}
void KCMHelpCenter::slotIndexFinished( KProcess *proc )
void KCMHelpCenter::slotIndexFinished( TDEProcess *proc )
{
kdDebug() << "KCMHelpCenter::slotIndexFinished()" << endl;
@ -527,7 +527,7 @@ void KCMHelpCenter::slotIndexFinished( KProcess *proc )
return;
}
} else if ( !mProcess->normalExit() || mProcess->exitStatus() != 0 ) {
kdDebug() << "KProcess reported an error." << endl;
kdDebug() << "TDEProcess reported an error." << endl;
KMessageBox::error( this, i18n("Failed to build index.") );
} else {
mConfig->setGroup( "Search" );
@ -608,7 +608,7 @@ void KCMHelpCenter::advanceProgress()
}
}
void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
void KCMHelpCenter::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@ -622,7 +622,7 @@ void KCMHelpCenter::slotReceivedStdout( KProcess *, char *buffer, int buflen )
}
}
void KCMHelpCenter::slotReceivedStderr( KProcess *, char *buffer, int buflen )
void KCMHelpCenter::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
int pos = text.findRev( '\n' );
@ -680,7 +680,7 @@ void KCMHelpCenter::findWriteableIndexDir()
{
TQFileInfo currentDir( Prefs::indexDirectory() );
if ( !currentDir.isWritable() )
Prefs::setIndexDirectory( KGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
}
#include "kcmhelpcenter.moc"

10
khelpcenter/kcmhelpcenter.h
Unescape Escape View File

@ -32,7 +32,7 @@ class TQProgressBar;
class TQTextEdit;
class TQLabel;
class KProcess;
class TDEProcess;
class KConfig;
class TDEAboutData;
class KTempFile;
@ -123,11 +123,11 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
protected slots:
bool buildIndex();
void cancelBuildIndex();
void slotIndexFinished( KProcess * );
void slotIndexFinished( TDEProcess * );
void slotIndexProgress();
void slotIndexError( const TQString & );
void slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
void slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
void slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
void slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
void slotProgressClosed();
void slotOk();
@ -171,7 +171,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
KTempFile *mCmdFile;
KProcess *mProcess;
TDEProcess *mProcess;
bool mIsClosing;

22
khelpcenter/khc_indexbuilder.cpp
Unescape Escape View File

@ -84,29 +84,29 @@ void IndexBuilder::processCmdQueue()
kdDebug(1402) << "PROCESS: " << cmd << endl;
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
proc->setRunPrivileged( true );
TQStringList args = TQStringList::split( " ", cmd );
*proc << args;
connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStdout(KProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStderr(KProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
mCmdQueue.remove( it );
if ( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
sendErrorSignal( i18n("Unable to start command '%1'.").arg( cmd ) );
processCmdQueue();
}
}
void IndexBuilder::slotProcessExited( KProcess *proc )
void IndexBuilder::slotProcessExited( TDEProcess *proc )
{
kdDebug(1402) << "IndexBuilder::slotIndexFinished()" << endl;