TDE
/
tdebase
9
4
Fork 1
Code Issues 116 Pull Requests 10 Releases Wiki Activity

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

Browse Source
pull/2/head
Timothy Pearson 11 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 View File

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

2
kcontrol/tdm/main.cpp
Unescape 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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;
@ -124,13 +124,13 @@ void IndexBuilder::slotProcessExited( KProcess *proc )
processCmdQueue();
}
void IndexBuilder::slotReceivedStdout( KProcess *, char *buffer, int buflen )
void IndexBuilder::slotReceivedStdout( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cout << text.local8Bit().data() << std::flush;
}
void IndexBuilder::slotReceivedStderr( KProcess *, char *buffer, int buflen )
void IndexBuilder::slotReceivedStderr( TDEProcess *, char *buffer, int buflen )
{
TQString text = TQString::fromLocal8Bit( buffer, buflen );
std::cerr << text.local8Bit().data() << std::flush;

8
khelpcenter/khc_indexbuilder.h
Unescape View File

@ -26,7 +26,7 @@
#include <tqobject.h>
#include <tqtimer.h>
class KProcess;
class TDEProcess;
namespace KHC {
@ -44,9 +44,9 @@ class IndexBuilder : public QObject
protected slots:
void buildIndices();
void slotProcessExited( KProcess * );
void slotReceivedStdout( KProcess *, char *buffer, int buflen );
void slotReceivedStderr( KProcess *, char *buffer, int buflen );
void slotProcessExited( TDEProcess * );
void slotReceivedStdout( TDEProcess *, char *buffer, int buflen );
void slotReceivedStderr( TDEProcess *, char *buffer, int buflen );
private:
TQString m_cmdFile;

2
khelpcenter/khelpcenter.kcfg
Unescape View File

@ -10,7 +10,7 @@
<entry type="Path" key="IndexDirectory">
<label>Path to index directory.</label>
<whatsthis>Path to directory containing search indices.</whatsthis>
<default code="true">KGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
<default code="true">TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/")</default>
</entry>
<entry type="Int" key="Method">

6
khelpcenter/mainwindow.cpp
Unescape View File

@ -185,7 +185,7 @@ void MainWindow::readProperties( KConfig *config )
void MainWindow::readConfig()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
TQValueList<int> sizes = config->readIntListEntry( "Splitter" );
if ( sizes.count() == 2 ) {
@ -197,7 +197,7 @@ void MainWindow::readConfig()
void MainWindow::writeConfig()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "MainWindowState" );
config->writeEntry( "Splitter", mSplitter->sizes() );
@ -237,7 +237,7 @@ void MainWindow::setupActions()
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),

6
khelpcenter/navigator.cpp
Unescape View File

@ -131,7 +131,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
hideSearch();
} else {
mSearchWidget->updateScopeList();
mSearchWidget->readConfig( KGlobal::config() );
mSearchWidget->readConfig( TDEGlobal::config() );
}
connect( mTabWidget, TQT_SIGNAL( currentChanged( QWidget * ) ),
@ -591,7 +591,7 @@ void Navigator::hideSearch()
bool Navigator::checkSearchIndex()
{
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
if ( cfg->readBoolEntry( "IndexExists", false ) ) return true;
@ -626,7 +626,7 @@ KURL Navigator::homeURL()
{
if ( !mHomeUrl.isEmpty() ) return mHomeUrl;
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
// We have to reparse the configuration here in order to get a
// language-specific StartUrl, e.g. "StartUrl[de]".
cfg->reparseConfiguration();

2
khelpcenter/navigator.h
Unescape View File

@ -38,7 +38,7 @@ class TQPushButton;
class KListView;
class KService;
class KProcess;
class TDEProcess;
class KProcIO;
class KCMHelpCenter;

4
khelpcenter/scrollkeepertreebuilder.cpp
Unescape View File

@ -54,7 +54,7 @@ void ScrollKeeperTreeBuilder::loadConfig()
NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
NavigatorItem *after )
{
TQString lang = KGlobal::locale()->language();
TQString lang = TDEGlobal::locale()->language();
kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
@ -62,7 +62,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
proc << "scrollkeeper-get-content-list";
proc << lang;
connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
if (!proc.start(KProcess::Block)) {
if (!proc.start(TDEProcess::Block)) {
kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
return 0;
}

30
khelpcenter/searchengine.cpp
Unescape View File

@ -205,7 +205,7 @@ SearchEngine::SearchEngine( View *destination )
mProc( 0 ), mSearchRunning( false ), mView( destination ),
mRootTraverser( 0 )
{
mLang = KGlobal::locale()->language().left( 2 );
mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchEngine::~SearchEngine()
@ -215,7 +215,7 @@ SearchEngine::~SearchEngine()
bool SearchEngine::initSearchHandlers()
{
TQStringList resources = KGlobal::dirs()->findAllResources(
TQStringList resources = TDEGlobal::dirs()->findAllResources(
"appdata", "searchhandlers/*.desktop" );
TQStringList::ConstIterator it;
for( it = resources.begin(); it != resources.end(); ++it ) {
@ -246,7 +246,7 @@ bool SearchEngine::initSearchHandlers()
return true;
}
void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
void SearchEngine::searchStdout(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@ -262,7 +262,7 @@ void SearchEngine::searchStdout(KProcess *, char *buffer, int len)
free(p);
}
void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
void SearchEngine::searchStderr(TDEProcess *, char *buffer, int len)
{
if ( !buffer || len == 0 )
return;
@ -270,7 +270,7 @@ void SearchEngine::searchStderr(KProcess *, char *buffer, int len)
mStderr.append( TQString::fromUtf8( buffer, len ) );
}
void SearchEngine::searchExited(KProcess *)
void SearchEngine::searchExited(TDEProcess *)
{
kdDebug() << "Search terminated" << endl;
mSearchRunning = false;
@ -293,7 +293,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
if ( method == "or" ) mOperation = Or;
else mOperation = And;
KConfig *cfg = KGlobal::config();
KConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Search" );
TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" );
bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false );
@ -320,7 +320,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
return true;
} else {
TQString lang = KGlobal::locale()->language().left(2);
TQString lang = TDEGlobal::locale()->language().left(2);
if ( lang.lower() == "c" || lang.lower() == "posix" )
lang = "en";
@ -340,7 +340,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
kdDebug() << "Common Search: " << commonSearchProgram << endl;
mProc = new KProcess();
mProc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", commonSearchProgram );
TQStringList::ConstIterator it;
@ -352,18 +352,18 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
*mProc << arg.utf8();
}
connect( mProc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
connect( mProc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
connect( mProc, TQT_SIGNAL( processExited( KProcess * ) ),
TQT_SLOT( searchExited( KProcess * ) ) );
connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ),
TQT_SLOT( searchExited( TDEProcess * ) ) );
mSearchRunning = true;
mSearchResult = "";
mStderr = "<b>" + commonSearchProgram + "</b>\n\n";
mProc->start(KProcess::NotifyOnExit, KProcess::All);
mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
while (mSearchRunning && mProc->isRunning())
kapp->processEvents();

10
khelpcenter/searchengine.h
Unescape View File

@ -11,7 +11,7 @@
#include "docentrytraverser.h"
class TQWidget;
class KProcess;
class TDEProcess;
class KConfig;
class KHTMLPart;
@ -114,15 +114,15 @@ class SearchEngine : public TQObject
void searchFinished();
protected slots:
void searchStdout(KProcess *proc, char *buffer, int buflen);
void searchStderr(KProcess *proc, char *buffer, int buflen);
void searchExited(KProcess *proc);
void searchStdout(TDEProcess *proc, char *buffer, int buflen);
void searchStderr(TDEProcess *proc, char *buffer, int buflen);
void searchExited(TDEProcess *proc);
protected:
void processSearchQueue();
private:
KProcess *mProc;
TDEProcess *mProc;
bool mSearchRunning;
TQString mSearchResult;

30
khelpcenter/searchhandler.cpp
Unescape View File

@ -37,7 +37,7 @@ using namespace KHC;
SearchHandler::SearchHandler()
{
mLang = KGlobal::locale()->language().left( 2 );
mLang = TDEGlobal::locale()->language().left( 2 );
}
SearchHandler *SearchHandler::initFromFile( const TQString &filename )
@ -102,7 +102,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
kdDebug() << "SearchHandler::search() CMD: " << cmdString << endl;
KProcess *proc = new KProcess();
TDEProcess *proc = new TDEProcess();
TQStringList cmd = TQStringList::split( " ", cmdString );
TQStringList::ConstIterator it;
@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
*proc << arg.utf8();
}
connect( proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
TQT_SLOT( searchStdout( KProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
TQT_SLOT( searchStderr( KProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
TQT_SLOT( searchExited( KProcess * ) ) );
connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
TQT_SLOT( searchExited( TDEProcess * ) ) );
SearchJob *searchJob = new SearchJob;
searchJob->mEntry = entry;
@ -128,7 +128,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
mProcessJobs.insert( proc, searchJob );
if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
TQString txt = i18n("Error executing search command '%1'.").arg( cmdString );
emit searchFinished( this, entry, txt );
}
@ -155,7 +155,7 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
}
}
void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
void SearchHandler::searchStdout( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
@ -166,7 +166,7 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
p = strncpy( p, buffer, len );
p[len] = '\0';
TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mResult += bufferStr.fromUtf8( p );
}
@ -174,18 +174,18 @@ void SearchHandler::searchStdout( KProcess *proc, char *buffer, int len )
free( p );
}
void SearchHandler::searchStderr( KProcess *proc, char *buffer, int len )
void SearchHandler::searchStderr( TDEProcess *proc, char *buffer, int len )
{
if ( !buffer || len == 0 )
return;
TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
(*it)->mError += TQString::fromUtf8( buffer, len );
}
}
void SearchHandler::searchExited( KProcess *proc )
void SearchHandler::searchExited( TDEProcess *proc )
{
// kdDebug() << "SearchHandler::searchExited()" << endl;
@ -193,7 +193,7 @@ void SearchHandler::searchExited( KProcess *proc )
TQString error;
DocEntry *entry = 0;
TQMap<KProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
TQMap<TDEProcess *, SearchJob *>::ConstIterator it = mProcessJobs.find( proc );
if ( it != mProcessJobs.end() ) {
SearchJob *j = *it;
entry = j->mEntry;

10
khelpcenter/searchhandler.h
Unescape View File

@ -38,7 +38,7 @@ class SearchJob
DocEntry *mEntry;
KProcess *mProcess;
TDEProcess *mProcess;
KIO::Job *mKioJob;
TQString mCmd;
@ -71,9 +71,9 @@ class SearchHandler : public QObject
bool checkBinary( const TQString &cmd ) const;
protected slots:
void searchStdout( KProcess *proc, char *buffer, int buflen );
void searchStderr( KProcess *proc, char *buffer, int buflen );
void searchExited( KProcess *proc );
void searchStdout( TDEProcess *proc, char *buffer, int buflen );
void searchStderr( TDEProcess *proc, char *buffer, int buflen );
void searchExited( TDEProcess *proc );
void slotJobResult( KIO::Job *job );
void slotJobData( KIO::Job *, const TQByteArray &data );
@ -88,7 +88,7 @@ class SearchHandler : public QObject
TQString mIndexCommand;
TQStringList mDocumentTypes;
TQMap<KProcess *,SearchJob *> mProcessJobs;
TQMap<TDEProcess *,SearchJob *> mProcessJobs;
TQMap<KIO::Job *,SearchJob *> mKioJobs;
};

4
khelpcenter/searchwidget.cpp
Unescape View File

@ -111,7 +111,7 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
SearchWidget::~SearchWidget()
{
writeConfig( KGlobal::config() );
writeConfig( TDEGlobal::config() );
}
@ -311,7 +311,7 @@ int ScopeTraverser::mNestingLevel = 2;
void SearchWidget::searchIndexUpdated()
{
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
updateScopeList();
update();
}

12
khelpcenter/toc.cpp
Unescape View File

@ -78,7 +78,7 @@ void TOC::build( const TQString &file )
{
TQFileInfo fileInfo( file );
TQString fileName = fileInfo.absFilePath();
const TQStringList resourceDirs = KGlobal::dirs()->resourceDirs( "html" );
const TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs( "html" );
TQStringList::ConstIterator it = resourceDirs.begin();
TQStringList::ConstIterator end = resourceDirs.end();
for ( ; it != end; ++it ) {
@ -132,19 +132,19 @@ int TOC::cachedCTime() const
void TOC::buildCache()
{
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", "meinproc" );
*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
*meinproc << "--output" << m_cacheFile;
*meinproc << m_sourceFile;
meinproc->start( KProcess::NotifyOnExit );
meinproc->start( TDEProcess::NotifyOnExit );
}
void TOC::meinprocExited( KProcess *meinproc )
void TOC::meinprocExited( TDEProcess *meinproc )
{
if ( !meinproc->normalExit() || meinproc->exitStatus() != 0 ) {
delete meinproc;

4
khelpcenter/toc.h
Unescape View File

@ -26,7 +26,7 @@
#include <tqlistview.h>
#include <tqobject.h>
class KProcess;
class TDEProcess;
namespace KHC {
@ -47,7 +47,7 @@ class TOC : public QObject
private slots:
void slotItemSelected( TQListViewItem *item );
void meinprocExited( KProcess *meinproc );
void meinprocExited( TDEProcess *meinproc );
private:
enum CacheStatus { NeedRebuild, CacheOk };

4
khelpcenter/view.cpp
Unescape View File

@ -149,12 +149,12 @@ TQString View::langLookup( const TQString &fname )
TQStringList search;
// assemble the local search paths
const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html");
const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html");
// look up the different languages
for (int id=localDoc.count()-1; id >= 0; --id)
{
TQStringList langs = KGlobal::locale()->languageList();
TQStringList langs = TDEGlobal::locale()->languageList();
langs.append( "en" );
langs.remove( "C" );
TQStringList::ConstIterator lang;

2
khotkeys/kcontrol/kcmkhotkeys.cpp
Unescape View File

@ -51,7 +51,7 @@ extern "C"
KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
{
// sleep( 20 ); // CHECKME DEBUG
KGlobal::locale()->insertCatalogue("khotkeys");
TDEGlobal::locale()->insertCatalogue("khotkeys");
KHotKeys::Module* ret = new KHotKeys::Module( parent_P, name_P );
ret->load(); // CHECKME
return ret;

2
khotkeys/kcontrol/menuedit.cpp
Unescape View File

@ -39,7 +39,7 @@ static TQObject* owner = NULL;
void khotkeys_init()
{
// I hope this works
KGlobal::locale()->insertCatalogue("khotkeys");
TDEGlobal::locale()->insertCatalogue("khotkeys");
// CHECKME hack
assert( owner == NULL );
owner = new TQObject;

4
khotkeys/shared/actions.cpp
Unescape View File

@ -292,9 +292,9 @@ void Dcop_action::execute()
}
}
kdDebug( 1217 ) << "DCOP call:" << app << ":" << obj << ":" << call << ":" << args_list << endl;
KProcess proc;
TDEProcess proc;
proc << "dcop" << app << obj << call << args_list;
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
}
TQString Dcop_action::description() const

4
khotkeys/shared/input.cpp
Unescape View File

@ -43,7 +43,7 @@ Kbd::Kbd( bool grabbing_enabled_P, TQObject* parent_P )
{
assert( keyboard_handler == NULL );
keyboard_handler = this;
kga = new KGlobalAccel( NULL );
kga = new TDEGlobalAccel( NULL );
kga->setEnabled( grabbing_enabled_P );
}
@ -122,7 +122,7 @@ void Kbd::ungrab_shortcut( const KShortcut& shortcut_P )
if( --grabs[ shortcut_P ] == 0 )
{
#if 0
// CHECKME workaround for KGlobalAccel::disconnectItem() not working
// CHECKME workaround for TDEGlobalAccel::disconnectItem() not working
kga->setItemEnabled( ' ' + TQString::number( keycode_P ), false );
// kga->disconnectItem( ' ' + TQString::number( keycode_P ), NULL, NULL );
kga->removeItem( ' ' + TQString::number( keycode_P ));

4
khotkeys/shared/input.h
Unescape View File

@ -21,7 +21,7 @@
#include <X11/X.h>
#include <fixx11h.h>
class KGlobalAccel;
class TDEGlobalAccel;
namespace KHotKeys
{
@ -60,7 +60,7 @@ class Kbd
};
TQMap< Kbd_receiver*, Receiver_data > receivers;
TQMap< KShortcut, int > grabs;
KGlobalAccel* kga;
TDEGlobalAccel* kga;
};
class Mouse

2
khotkeys/shared/khotkeysglobal.cpp
Unescape View File

@ -61,7 +61,7 @@ bool khotkeys_active()
// "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop"
TQString get_menu_entry_from_path( const TQString& path_P )
{
TQStringList dirs = KGlobal::dirs()->resourceDirs( "apps" );
TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "apps" );
for( TQStringList::ConstIterator it = dirs.begin();
it != dirs.end();
++it )

2
khotkeys/shared/voices.cpp
Unescape View File

@ -205,7 +205,7 @@ void Voice::set_shortcut( const KShortcut &shortcut)
if( !_enabled )
return;
if(!_kga)
_kga = new KGlobalAccel( this );
_kga = new TDEGlobalAccel( this );
_kga->remove("voice");
_kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;

4
khotkeys/shared/voices.h
Unescape View File

@ -16,7 +16,7 @@
class Sound;
class TQTimer;
class KGlobalAccel;
class TDEGlobalAccel;
namespace KHotKeys
{
@ -70,7 +70,7 @@ class KDE_EXPORT Voice : public TQObject
SoundRecorder *_recorder;
KShortcut _shortcut;
KGlobalAccel *_kga;
TDEGlobalAccel *_kga;
TQTimer *_timer;
};

38
kicker/applets/clock/clock.cpp
Unescape View File

@ -218,7 +218,7 @@ PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons
int PlainClock::preferedWidthForHeight(int ) const
{
TQString maxLengthTime = KGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds());
TQString maxLengthTime = TDEGlobal::locale()->formatTime( TQTime( 23, 59 ), _prefs->plainShowSeconds());
return fontMetrics().width( maxLengthTime ) + 8;
}
@ -231,7 +231,7 @@ int PlainClock::preferedHeightForWidth(int /*w*/) const
void PlainClock::updateClock()
{
TQString newStr = KGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
TQString newStr = TDEGlobal::locale()->formatTime(_applet->clockGetTime(), _prefs->plainShowSeconds());
if (_force || newStr != _timeStr) {
_timeStr = newStr;
@ -334,7 +334,7 @@ void DigitalClock::updateClock()
if (_prefs->digitalShowSeconds())
format += sep + "%02d";
if (KGlobal::locale()->use12Clock()) {
if (TDEGlobal::locale()->use12Clock()) {
if (h > 12)
h -= 12;
else if( h == 0)
@ -940,8 +940,8 @@ ClockApplet::~ClockApplet()
{
delete m_shadowEngine;
//reverse for the moment
KGlobal::locale()->removeCatalogue("clockapplet");
KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
TDEGlobal::locale()->removeCatalogue("clockapplet");
TDEGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
if (_calendar)
{
@ -1019,7 +1019,7 @@ int ClockApplet::widthForHeight(int h) const
{
// if the date format STARTS with a year, assume it's in descending
// order and should therefore PRECEED the date.
TQString dateFormat = KGlobal::locale()->dateFormatShort();
TQString dateFormat = TDEGlobal::locale()->dateFormatShort();
dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y';
}
@ -1508,7 +1508,7 @@ void ClockApplet::contextMenuActivated(int result)
return;
};
KProcess proc;
TDEProcess proc;
switch (result)
{
case 102:
@ -1519,13 +1519,13 @@ void ClockApplet::contextMenuActivated(int result)
proc << "--nonewdcop";
proc << TQString("%1 tde-clock.desktop --lang %2")
.arg(locate("exe", "kcmshell"))
.arg(KGlobal::locale()->language());
proc.start(KProcess::DontCare);
.arg(TDEGlobal::locale()->language());
proc.start(TDEProcess::DontCare);
break;
case 104:
proc << locate("exe", "kcmshell");
proc << "tde-language.desktop";
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
break;
case 110:
preferences(true);
@ -1540,7 +1540,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->clear();
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
KLocale *loc = KGlobal::locale();
KLocale *loc = TDEGlobal::locale();
TQDateTime dt = TQDateTime::currentDateTime();
dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
@ -1694,7 +1694,7 @@ void ClockApplet::positionChange(Position p)
void ClockApplet::updateDateLabel(bool reLayout)
{
_lastDate = clockGetDate();
_dayOfWeek->setText(KGlobal::locale()->calendar()->weekDayName(_lastDate));
_dayOfWeek->setText(TDEGlobal::locale()->calendar()->weekDayName(_lastDate));
if (zone->zoneIndex() != 0)
{
@ -1704,7 +1704,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
}
else
{
TQString dateStr = KGlobal::locale()->formatDate(_lastDate, true);
TQString dateStr = TDEGlobal::locale()->formatDate(_lastDate, true);
_date->setText(dateStr);
_date->setShown(showDate);
}
@ -1728,9 +1728,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
TQString activeZone = zone->zone();
if (zoneCount == 0)
{
TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false);
data.message = _time;
data.subtext = _date;
@ -1754,9 +1754,9 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
m_zone = i18n(m_zone.utf8()); // ensure it gets translated
}
TQString _time = KGlobal::locale()->formatTime(clockGetTime(),
TQString _time = TDEGlobal::locale()->formatTime(clockGetTime(),
_prefs->plainShowSeconds());
TQString _date = KGlobal::locale()->formatDate(clockGetDate(), false);
TQString _date = TDEGlobal::locale()->formatDate(clockGetDate(), false);
if (activeIndex == i)
{
@ -1840,11 +1840,11 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
(m_clock->type() == Prefs::EnumType::Analog) )
{
// show full time (incl. hour) as tooltip for Fuzzy clock
tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
}
else
{
tipText = KGlobal::locale()->formatDate(m_clock->clockGetDate());
tipText = TDEGlobal::locale()->formatDate(m_clock->clockGetDate());
}
if (m_clock->timezones() && m_clock->timezones()->zoneIndex() > 0)

6
kicker/applets/clock/clockapplet.kcfg
Unescape View File

@ -29,7 +29,7 @@
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
TQFont defFont=KGlobalSettings::generalFont();
TQFont defFont=TDEGlobalSettings::generalFont();
defFont.setPointSize(8);
</code>
<default code="true">defFont</default>
@ -55,7 +55,7 @@ defFont.setPointSize(8);
<entry name="PlainFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
defFont=KGlobalSettings::generalFont();
defFont=TDEGlobalSettings::generalFont();
defFont.setPointSize(8);
defFont.setBold(true);
</code>
@ -162,7 +162,7 @@ defFont.setBold(true);
<entry name="FuzzyFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
defFont=KGlobalSettings::generalFont();
defFont=TDEGlobalSettings::generalFont();
</code>
<default code="true">defFont</default>
</entry>

4
kicker/applets/clock/init.cpp
Unescape View File

@ -70,8 +70,8 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("clockapplet");
KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
TDEGlobal::locale()->insertCatalogue("clockapplet");
TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
return new ClockApplet(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, parent, "clockapplet");
}

6
kicker/applets/launcher/quickbutton.cpp
Unescape View File

@ -132,7 +132,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
TQPixmap pxmap;
// Load icon
if (_kurl.url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
pxmap = KGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state);
pxmap = TDEGlobal::iconLoader()->loadIcon("desktop", _group, _force_size, _state);
}
else {
pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
@ -231,7 +231,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
if ((e->state() & Qt::LeftButton) == 0) return;
TQPoint p(e->pos() - _dragPos);
if (p.manhattanLength() <= KGlobalSettings::dndEventDelay())
if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
return;
DEBUGSTR<<"dragstart"<<endl<<flush;
setDown(false);
@ -344,7 +344,7 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
data.subtext = data.message;
}
if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
data.icon = KGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
}
else {
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);

4
kicker/applets/launcher/quicklauncher.cpp
Unescape View File

@ -71,7 +71,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("quicklauncher");
TDEGlobal::locale()->insertCatalogue("quicklauncher");
return new QuickLauncher(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences,
parent, "quicklauncher");
@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
QuickLauncher::~QuickLauncher()
{
KGlobal::locale()->removeCatalogue("quicklauncher");
TDEGlobal::locale()->removeCatalogue("quicklauncher");
setCustomMenu(0);
delete m_popup;
delete m_appletPopup;

4
kicker/applets/lockout/lockout.cpp
Unescape View File

@ -48,7 +48,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("lockout");
TDEGlobal::locale()->insertCatalogue("lockout");
return new Lockout(configFile, parent, "lockout");
}
}
@ -105,7 +105,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
Lockout::~Lockout()
{
KGlobal::locale()->removeCatalogue("lockout");
TDEGlobal::locale()->removeCatalogue("lockout");
}
// the -2 is due to kicker allowing us a width/height of 42 and the buttons

4
kicker/applets/media/mediaapplet.cpp
Unescape View File

@ -35,7 +35,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
{
KGlobal::locale()->insertCatalogue("mediaapplet");
TDEGlobal::locale()->insertCatalogue("mediaapplet");
return new MediaApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Preferences,
parent, "mediaapplet");
@ -84,7 +84,7 @@ MediaApplet::~MediaApplet()
delete b;
}
KGlobal::locale()->removeCatalogue("mediaapplet");
TDEGlobal::locale()->removeCatalogue("mediaapplet");
}
void MediaApplet::about()

4
kicker/applets/menu/menuapplet.cpp
Unescape View File

@ -61,7 +61,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
KGlobal::locale()->insertCatalogue("kmenuapplet");
TDEGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
}
}
@ -102,7 +102,7 @@ Applet::~Applet()
delete selection;
delete selection_watcher;
delete module;
KGlobal::locale()->removeCatalogue("kmenuapplet");
TDEGlobal::locale()->removeCatalogue("kmenuapplet");
}
void Applet::windowAdded( WId w_P )

10
kicker/applets/minipager/pagerapplet.cpp
Unescape View File

@ -75,7 +75,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("kminipagerapplet");
TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
}
}
@ -112,7 +112,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
m_group->setFrameStyle(TQFrame::NoFrame);
m_group->setExclusive( true );
setFont( KGlobalSettings::taskbarFont() );
setFont( TDEGlobalSettings::taskbarFont() );
m_twin = new KWinModule(TQT_TQOBJECT(this));
m_activeWindow = m_twin->activeWindow();
@ -164,7 +164,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
KMiniPager::~KMiniPager()
{
KGlobal::locale()->removeCatalogue("kminipagerapplet");
TDEGlobal::locale()->removeCatalogue("kminipagerapplet");
delete m_contextMenu;
delete m_settings;
delete m_shadowEngine;
@ -897,10 +897,10 @@ void KMiniPager::showPager()
TQString strAppPath(locate("exe", "kpager"));
if (!strAppPath.isEmpty())
{
KProcess process;
TDEProcess process;
process << strAppPath;
process << "--hidden";
process.start(KProcess::DontCare);
process.start(TDEProcess::DontCare);
}
}
}

2
kicker/applets/minipager/pagerapplet.h
Unescape View File

@ -37,7 +37,7 @@ class TQButtonGroup;
class TQGridLayout;
class TQTimer;
class KProcess;
class TDEProcess;
class KWinModule;
class KTextShadowEngine;
class KSelectionOwner;

2
kicker/applets/minipager/pagerbutton.cpp
Unescape View File

@ -576,7 +576,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
}
if (m_currentWindow && !m_pager->clickPos.isNull() &&
(m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
(m_pager->clickPos - e->pos()).manhattanLength() > TDEGlobalSettings::dndEventDelay())
{
TQRect r = m_currentWindow->geometry();

6
kicker/applets/naughty/NaughtyApplet.cpp
Unescape View File

@ -40,7 +40,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile)
{
KGlobal::locale()->insertCatalogue("naughtyapplet");
TDEGlobal::locale()->insertCatalogue("naughtyapplet");
return new NaughtyApplet
(
@ -63,7 +63,7 @@ NaughtyApplet::NaughtyApplet
)
: KPanelApplet(configFile, t, actions, parent, name)
{
KGlobal::iconLoader()->addAppDir("naughtyapplet");
TDEGlobal::iconLoader()->addAppDir("naughtyapplet");
setBackgroundOrigin( AncestorOrigin );
button_ = new SimpleButton(this);
@ -99,7 +99,7 @@ NaughtyApplet::NaughtyApplet
NaughtyApplet::~NaughtyApplet()
{
KGlobal::locale()->removeCatalogue("naughtyapplet");
TDEGlobal::locale()->removeCatalogue("naughtyapplet");
}
void

8
kicker/applets/run/runapplet.cpp
Unescape View File

@ -44,7 +44,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("krunapplet");
TDEGlobal::locale()->insertCatalogue("krunapplet");
return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet");
}
}
@ -87,8 +87,8 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
_input->completionObject()->setItems(list);
list = c->readListEntry("History list");
_input->setHistoryItems(list);
int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() );
_input->setCompletionMode( (KGlobalSettings::Completion) mode );
int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() );
_input->setCompletionMode( (TDEGlobalSettings::Completion) mode );
_filterData = new KURIFilterData();
@ -110,7 +110,7 @@ RunApplet::~RunApplet()
c->sync();
delete _filterData;
KGlobal::locale()->removeCatalogue("krunapplet");
TDEGlobal::locale()->removeCatalogue("krunapplet");
}
void RunApplet::resizeEvent(TQResizeEvent*)

10
kicker/applets/swallow/swallow.cpp
Unescape View File

@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app )
///////////////////////////////////////////////////////////////////
static void parseCommand(KProcess *proc, TQString cmd)
static void parseCommand(TDEProcess *proc, TQString cmd)
{
int pos;
@ -282,15 +282,15 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
this, TQT_SLOT(windowAdded(WId)));
if (!swc->cmdline.isEmpty()) {
KProcess *process = new KProcess;
TDEProcess *process = new TDEProcess;
parseCommand(process, swc->cmdline);
// move window out of sight
// *process << "-geometry";
// *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
connect(process, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(processExited(KProcess*)));
connect(process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(processExited(TDEProcess*)));
process->start();
}
@ -340,7 +340,7 @@ void SwallowApp::windowAdded(WId win)
}
void SwallowApp::processExited(KProcess *)
void SwallowApp::processExited(TDEProcess *)
{
SwallowApplet::removeApplet( this ); // also deletes this app
}

8
kicker/applets/swallow/swallow.h
Unescape View File

@ -28,7 +28,7 @@
class TQBoxLayout;
class KConfig;
class KProcess;
class TDEProcess;
class KWinModule;
class SwallowApp;
@ -61,7 +61,7 @@ public: // for KPanelApplet
int heightForWidth( int h );
void windowAdded(WId win);
void processExited(KProcess *proc);
void processExited(TDEProcess *proc);
public slots:
virtual void preferences();
@ -102,10 +102,10 @@ signals:
protected slots:
void windowAdded(WId win);
void processExited(KProcess *proc);
void processExited(TDEProcess *proc);
private:
KProcess *process;
TDEProcess *process;
TQString winTitle;
float wh_ratio;

4
kicker/applets/systemtray/systemtrayapplet.cpp
Unescape View File

@ -64,7 +64,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("ksystemtrayapplet");
TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet");
return new SystemTrayApplet(configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, parent, "ksystemtrayapplet");
}
@ -201,7 +201,7 @@ SystemTrayApplet::~SystemTrayApplet()
if (m_leftSpacer) delete m_leftSpacer;
if (m_rightSpacer) delete m_rightSpacer;
KGlobal::locale()->removeCatalogue("ksystemtrayapplet");
TDEGlobal::locale()->removeCatalogue("ksystemtrayapplet");
}
bool SystemTrayApplet::x11Event( XEvent *e )

4
kicker/applets/taskbar/taskbarapplet.cpp
Unescape View File

@ -41,7 +41,7 @@ extern "C"
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
{
// FIXME: what about two taskbars? perhaps this should be inserted just once
KGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
int options = 0;
if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
options = KPanelApplet::Preferences;
@ -67,7 +67,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions
TaskbarApplet::~TaskbarApplet()
{
// FIXME: what about TWO taskbars?
KGlobal::locale()->removeCatalogue( "ktaskbarapplet" );
TDEGlobal::locale()->removeCatalogue( "ktaskbarapplet" );
}
int TaskbarApplet::widthForHeight(int h) const

4
kicker/applets/trash/trashapplet.cpp
Unescape View File

@ -33,7 +33,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("trashapplet");
TDEGlobal::locale()->insertCatalogue("trashapplet");
return new TrashApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About, parent, "trashapplet");
}
@ -70,7 +70,7 @@ TrashApplet::~TrashApplet()
disconnect( mpDirLister, TQT_SIGNAL( clear() ),
this, TQT_SLOT( slotClear() ) );
delete mpDirLister;
KGlobal::locale()->removeCatalogue("trashapplet");
TDEGlobal::locale()->removeCatalogue("trashapplet");
}
void TrashApplet::about()

6
kicker/extensions/dockbar/dockbarextension.cpp
Unescape View File

@ -46,7 +46,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("dockbarextension");
TDEGlobal::locale()->insertCatalogue("dockbarextension");
return new DockBarExtension(configFile, KPanelExtension::Normal,
0, parent, "dockbarextension");
}
@ -316,9 +316,9 @@ void DockBarExtension::loadContainerConfig()
DockContainer* c = new DockContainer(cmd, this, resName, resClass );
addContainer(c);
KProcess proc;
TDEProcess proc;
proc << KShell::splitArgs( cmd );
if (!proc.start(KProcess::DontCare)) {
if (!proc.start(TDEProcess::DontCare)) {
fail_list.append(cmd);
removeContainer(c);
}

4
kicker/extensions/kasbar/ChangeLog
Unescape View File

@ -594,7 +594,7 @@
2002-08-30 Friday 10:37 pfeiffer
* use KGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro
* use TDEGlobal::taskbarFont(), patch by CCMAIL: Luciano Montanaro
<mikelima@virgilio.it>
2002-08-29 Thursday 17:38 mueller
@ -656,7 +656,7 @@
* grrr, I fixed that before 2.2.2 and it's back :(
+ KGlobal::locale()->insertCatalogue("kasbarextension");
+ TDEGlobal::locale()->insertCatalogue("kasbarextension");
2002-02-26 Tuesday 17:04 elter

4
kicker/extensions/kasbar/kasaboutdlg.cpp
Unescape View File

@ -80,8 +80,8 @@
#include "kasaboutdlg.h"
#include "version.h"
#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
KasAboutDialog::KasAboutDialog( TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),

2
kicker/extensions/kasbar/kasbar.cpp
Unescape View File

@ -717,7 +717,7 @@ void KasBar::addTestItems()
KasItem *i = new KasItem( this );
insert( 0, i );
i->setText( "Animated" );
i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setAnimation( resources()->startupAnimation() );
TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );

2
kicker/extensions/kasbar/kasbarapp.cpp
Unescape View File

@ -77,7 +77,7 @@ int main( int argc, char **argv )
{
TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue( "kasbarextension" );
TDEGlobal::locale()->setMainCatalogue( "kasbarextension" );
TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

4
kicker/extensions/kasbar/kasbarextension.cpp
Unescape View File

@ -76,7 +76,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue("kasbarextension");
TDEGlobal::locale()->insertCatalogue("kasbarextension");
return new KasBarExtension( configFile,
KPanelExtension::Normal,
KPanelExtension::About | KPanelExtension::Preferences,
@ -109,7 +109,7 @@ KasBarExtension::~KasBarExtension()
{
if ( detached_ && (!kasbar.isNull()) )
kasbar->deleteLater();
KGlobal::locale()->removeCatalogue("kasbarextension");
TDEGlobal::locale()->removeCatalogue("kasbarextension");
}
void KasBarExtension::setDetached( bool detach )

4
kicker/extensions/kasbar/kasclockitem.cpp
Unescape View File

@ -75,8 +75,8 @@ KasPopup *KasClockItem::createPopup()
void KasClockItem::updateTime()
{
setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
setText( TDEGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
lcd->display( TDEGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
update();
}

4
kicker/extensions/kasbar/kasgroupitem.cpp
Unescape View File

@ -144,7 +144,7 @@ void KasGroupItem::updateIcon()
bool usedIconLoader = false;
Task::Ptr t = items.first();
if (!t)
p = KGlobal::iconLoader()->loadIcon( "kicker",
p = TDEGlobal::iconLoader()->loadIcon( "kicker",
KIcon::NoGroup,
KIcon::SizeSmall );
@ -157,7 +157,7 @@ void KasGroupItem::updateIcon()
p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
if ( p.isNull() )
p = KGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
setIcon( p );
}

4
kicker/extensions/kasbar/kasitem.cpp
Unescape View File

@ -341,7 +341,7 @@ void KasItem::paintLabel( TQPainter *p )
}
}
p->setFont( KGlobalSettings::taskbarFont() );
p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > extent()-4 )
@ -405,7 +405,7 @@ void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft )
w -= arrowSize;
}
p->setFont( KGlobalSettings::taskbarFont() );
p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > w )
p->drawText( lx, ly, w, h-1, AlignLeft | AlignVCenter, text );

4
kicker/extensions/kasbar/kasprefsdlg.cpp
Unescape View File

@ -75,8 +75,8 @@
#include "kasprefsdlg.h"
#include "kasprefsdlg.moc"
#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )

12
kicker/extensions/kasbar/kasstartupitem.cpp
Unescape View File

@ -98,33 +98,33 @@ TQPixmap KasStartupItem::icon() const
switch( kasbar()->itemSize() ) {
case KasBar::Small:
/* ***** NOP ******
pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeSmall );
*/
break;
case KasBar::Medium:
pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeMedium );
break;
case KasBar::Large:
pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeLarge );
break;
case KasBar::Huge:
pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeHuge );
break;
case KasBar::Enormous:
pixmap = KGlobal::iconLoader()->loadIcon( startup_->icon(),
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeEnormous );
break;
default:
pixmap = KGlobal::iconLoader()->loadIcon( "error",
pixmap = TDEGlobal::iconLoader()->loadIcon( "error",
KIcon::NoGroup,
KIcon::SizeSmall );
}

6
kicker/extensions/kasbar/kastaskitem.cpp
Unescape View File

@ -85,7 +85,7 @@
#include "kastaskitem.h"
#include "kasbarextension.h"
#define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
static const int CHECK_ATTENTION_DELAY = 2000;
@ -350,11 +350,11 @@ void KasTaskItem::sendToTray()
TQString s;
s.setNum( task_->window() );
KProcess proc;
TDEProcess proc;
proc << "ksystraycmd";
proc << "--wid" << s << "--hidden";
bool ok = proc.start( KProcess::DontCare );
bool ok = proc.start( TDEProcess::DontCare );
if ( !ok ) {
kdWarning(1345) << "Unable to launch ksystraycmd" << endl;
KPassivePopup::message( i18n("Could Not Send to Tray"),

2
kicker/extensions/kasbar/kastaskpopup.cpp
Unescape View File

@ -73,7 +73,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
{
this->item = item;
setFont(KGlobalSettings::generalFont());
setFont(TDEGlobalSettings::generalFont());
setMouseTracking( true );
TQString text = item->task()->visibleIconicName();

8
kicker/extensions/sidebar/sidebarextension.cpp
Unescape View File

@ -33,8 +33,8 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue("kickersidebarextension");
KGlobal::locale()->insertCatalogue("konqueror");
TDEGlobal::locale()->insertCatalogue("kickersidebarextension");
TDEGlobal::locale()->insertCatalogue("konqueror");
return new SidebarExtension( configFile,
KPanelExtension::Normal,
0,
@ -106,8 +106,8 @@ void SidebarExtension::openURLRequest( const KURL &url, const KParts::URLArgs &)
SidebarExtension::~SidebarExtension()
{
KGlobal::locale()->removeCatalogue("kickersidebarextension");
KGlobal::locale()->removeCatalogue("konqueror");
TDEGlobal::locale()->removeCatalogue("kickersidebarextension");
TDEGlobal::locale()->removeCatalogue("konqueror");
}
bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {

4
kicker/extensions/taskbar/taskbarextension.cpp
Unescape View File

@ -44,7 +44,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue( "taskbarextension" );
TDEGlobal::locale()->insertCatalogue( "taskbarextension" );
return new TaskBarExtension( configFile, KPanelExtension::Stretch,
KPanelExtension::Preferences, parent, "taskbarextension" );
}
@ -78,7 +78,7 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
TaskBarExtension::~TaskBarExtension()
{
KGlobal::locale()->removeCatalogue( "taskbarextension" );
TDEGlobal::locale()->removeCatalogue( "taskbarextension" );
}
void TaskBarExtension::positionChange( Position p )

2
kicker/kicker/buttons/desktopbutton.cpp
Unescape View File

@ -76,7 +76,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
void DesktopButton::dropEvent( TQDropEvent *ev )
{
KURL dPath ( KGlobalSettings::desktopPath() );
KURL dPath ( TDEGlobalSettings::desktopPath() );
KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown );
KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev);

6
kicker/kicker/buttons/nonkdeappbutton.cpp
Unescape View File

@ -182,12 +182,12 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev)
deskFile.setDesktopGroup();
// ... and add it to the exec string
execStr += KProcess::quote(deskFile.readURL()) + " ";
execStr += TDEProcess::quote(deskFile.readURL()) + " ";
}
else
{
// it's just a URL of some sort, add it directly to the exec
execStr += KProcess::quote(url.path()) + " ";
execStr += TDEProcess::quote(url.path()) + " ";
}
}
@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
// run in a terminal? ok! we find this in the config file in the
// [misc] group (this will usually be in kdeglobal, actually, which
// get merged into the application config automagically for us
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("misc");
TQString termStr = config->readPathEntry("Terminal", "konsole");

4
kicker/kicker/buttons/servicebutton.cpp
Unescape View File

@ -54,7 +54,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent)
{
if (_id.startsWith("/"))
{
TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}
@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
if (_id.startsWith("/"))
{
TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id);
TQString tmp = TDEGlobal::dirs()->relativeLocation("appdata", _id);
if (!tmp.startsWith("/"))
_id = ":"+tmp;
}

2
kicker/kicker/core/container_base.cpp
Unescape View File

@ -105,7 +105,7 @@ void BaseContainer::slotRemoved(KConfig* config)
{
if (!config)
{
config = KGlobal::config();
config = TDEGlobal::config();
}
config->deleteGroup(appletId().latin1());

10
kicker/kicker/core/container_extension.cpp
Unescape View File

@ -172,7 +172,7 @@ void ExtensionContainer::init()
updateHighlightColor();
// if we were hidden when kicker quit, let's start out hidden as well!
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
int tmp = config->readNumEntry("UserHidden", Unhidden);
if (tmp > Unhidden && tmp <= RightBottom)
@ -359,7 +359,7 @@ void ExtensionContainer::readConfig()
void ExtensionContainer::writeConfig()
{
// kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writePathEntry("ConfigFile", _info.configFile());
@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
if (!_opMnu)
{
KDesktopFile f(KGlobal::dirs()->findResource("extensions", _info.desktopFile()));
KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
_opMnu = new PanelExtensionOpMenu(f.readName(),
m_extension ? m_extension->actions() : 0,
this);
@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left)
// save our hidden status so that when kicker starts up again
// we'll come back in the same state
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup(extensionId());
config->writeEntry("UserHidden", userHidden());
@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p)
void ExtensionContainer::updateHighlightColor()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
m_highlightColor = config->readColorEntry("activeBackground", &color);

8
kicker/kicker/core/extensionmanager.cpp
Unescape View File

@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager()
void ExtensionManager::initialize()
{
// kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl;
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
PluginManager* pm = PluginManager::the();
// set up the "main" panel
@ -179,7 +179,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
|| KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
{
if (KGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
m_menubarPanel)
{
return;
@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar()
// panel, meaning kickerrc itself would have to be vastly modified
// with lots of complications. not work it IMHO.
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("General");
if (config->readBoolEntry("CheckedForMenubar", false))
@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig()
{
// kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
// build the extension list
TQStringList elist;

30
kicker/kicker/core/kicker.cpp
Unescape View File

@ -96,26 +96,26 @@ Kicker::Kicker()
dcopClient()->setDefaultObject("Panel");
disableSessionManagement();
TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
KGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
KGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
KGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
KGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
TDEGlobal::dirs()->addResourceType("specialbuttons", dataPathBase + "menuext");
TDEGlobal::dirs()->addResourceType("applets", dataPathBase + "applets");
TDEGlobal::dirs()->addResourceType("tiles", dataPathBase + "tiles");
TDEGlobal::dirs()->addResourceType("extensions", dataPathBase + "extensions");
KImageIO::registerFormats();
KGlobal::iconLoader()->addExtraDesktopThemes();
TDEGlobal::iconLoader()->addExtraDesktopThemes();
KGlobal::locale()->insertCatalogue("tdmgreet");
KGlobal::locale()->insertCatalogue("libkonq");
KGlobal::locale()->insertCatalogue("libdmctl");
KGlobal::locale()->insertCatalogue("libtaskbar");
TDEGlobal::locale()->insertCatalogue("tdmgreet");
TDEGlobal::locale()->insertCatalogue("libkonq");
TDEGlobal::locale()->insertCatalogue("libdmctl");
TDEGlobal::locale()->insertCatalogue("libtaskbar");
// initialize our keys
// note that this creates the KMenu by calling MenuManager::the()
keys = new KGlobalAccel( TQT_TQOBJECT(this) );
keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
#define KICKER_ALL_BINDINGS
#include "kickerbindings.cpp"
keys->readSettings();
@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category)
void Kicker::paletteChanged()
{
KConfigGroup c(KGlobal::config(), "General");
KConfigGroup c(TDEGlobal::config(), "General");
KickerSettings::setTintColor(c.readColorEntry("TintColor",
&palette().active().mid()));
KickerSettings::self()->writeConfig();
@ -227,7 +227,7 @@ void Kicker::configure()
{
static bool notFirstConfig = false;
KConfig* c = KGlobal::config();
KConfig* c = TDEGlobal::config();
c->reparseConfiguration();
c->setGroup("General");
m_canAddContainers = !c->entryIsImmutable("Applets2");

4
kicker/kicker/core/kicker.h
Unescape View File

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KCMultiDialog;
class KDirWatch;
class KGlobalAccel;
class TDEGlobalAccel;
class KWinModule;
class PanelKMenu;
class PanelPopupButton;
@ -122,7 +122,7 @@ private slots:
private:
static void crashHandler(int signal);
KGlobalAccel* keys;
TDEGlobalAccel* keys;
KWinModule* m_twinModule;
KCMultiDialog* m_configDialog;
bool m_canAddContainers;

2
kicker/kicker/core/main.cpp
Unescape View File

@ -99,7 +99,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
}
}
KGlobal::locale()->setMainCatalogue("kicker");
TDEGlobal::locale()->setMainCatalogue("kicker");
TQCString appname;
if (kicker_screen_number == 0)

2
kicker/kicker/core/panelextension.cpp
Unescape View File

@ -388,7 +388,7 @@ void PanelExtension::slotBuildOpMenu()
if (kapp->authorize("action/help"))
{
KHelpMenu* help = new KHelpMenu( this, KGlobal::instance()->aboutData(), false);
KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
_opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
}
_opMnu->adjustSize();

22
kicker/kicker/core/pluginmanager.cpp
Unescape View File

@ -55,28 +55,28 @@ PluginManager* PluginManager::the()
AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list)
{
TQStringList rel;
KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
TDEGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Applet, sort, list);
}
AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list)
{
TQStringList rel;
KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
TDEGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::Extension, sort, list);
}
AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
TDEGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::BuiltinButton, sort, list);
}
AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list)
{
TQStringList rel;
KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
TDEGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel);
return plugins(rel, AppletInfo::SpecialButton, sort, list);
}
@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles,
PluginManager::PluginManager()
{
KConfigGroup generalGroup(KGlobal::config(), "General");
KConfigGroup generalGroup(TDEGlobal::config(), "General");
m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets");
m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions");
}
@ -250,13 +250,13 @@ AppletContainer* PluginManager::createAppletContainer(
TQWidget* parent,
bool isImmutable)
{
TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile );
TQString desktopPath = TDEGlobal::dirs()->findResource( "applets", desktopFile );
// KDE4: remove
// support the old (KDE 2.2) nameing scheme
if (desktopPath.isEmpty())
{
desktopPath = KGlobal::dirs()->findResource( "applets",
desktopPath = TDEGlobal::dirs()->findResource( "applets",
desktopFile.right(
desktopFile.length() - 1 ) );
}
@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer(
{
// we haven't loaded this puppy before and we're not in the untrusted list
m_untrustedApplets.append(desktopFile);
KConfigGroup generalGroup(KGlobal::config(), "General");
KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.sync();
}
@ -308,7 +308,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
return 0;
}
TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile);
TQString desktopPath = TDEGlobal::dirs()->findResource("extensions", desktopFile);
if (desktopPath.isEmpty())
{
return 0;
@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk
{
// we don't have an instance around and we're not in the untrusted list!
m_untrustedExtensions.append(desktopFile);
KConfigGroup generalGroup(KGlobal::config(), "General");
KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();
}
@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists()
m_untrustedExtensions.clear();
m_untrustedApplets.clear();
KConfigGroup generalGroup(KGlobal::config(), "General");
KConfigGroup generalGroup(TDEGlobal::config(), "General");
generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets);
generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions);
generalGroup.sync();

4
kicker/kicker/kicker-3.4-reverseLayout.cpp
Unescape View File

@ -143,9 +143,9 @@ int main(int argc, char** argv)
tempFile.close();
// Run kconf_update on the childpanel config files.
KProcess kconf_update;
TDEProcess kconf_update;
kconf_update << "kconf_update" << tempFile.name();
kconf_update.start(KProcess::Block);
kconf_update.start(TDEProcess::Block);
tempFile.unlink();
}

2
kicker/kicker/plugins/kickoff-beagle-plugin.cpp
Unescape View File

@ -407,7 +407,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit)
title = i18n("Conversation With %1").arg(title.isEmpty() ? i18n("Unknown Person") : title);
TQDateTime datetime;
datetime = datetimeFromString((*hit) [fixme_starttime]);
info=i18n("Date: %1").arg(KGlobal::locale()->formatDateTime(datetime,false));
info=i18n("Date: %1").arg(TDEGlobal::locale()->formatDateTime(datetime,false));
if (hit->getMimeType()=="beagle/x-kopete-log")
icon="kopete";
else

22
kicker/kicker/ui/addapplet.cpp
Unescape View File

@ -74,7 +74,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
itemDescription->installEventFilter(this);
KIconLoader * ldr = KGlobal::iconLoader();
KIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
itemPixmap->setPixmap(icon);
itemPixmap->installEventFilter(this);
@ -99,7 +99,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
if ((me->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay())
TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@ -165,7 +165,7 @@ void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
if (e->button() == Qt::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay())
TDEGlobalSettings::dndEventDelay())
{
AppletInfoDrag* drag = new AppletInfoDrag(m_appletInfo, this);
@ -202,18 +202,18 @@ void AppletWidget::setSelected(bool selected)
// for now just used to switch colours around =)
if (m_selected)
{
setPaletteBackgroundColor(KGlobalSettings::highlightColor());
setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if (m_odd)
{
setPaletteBackgroundColor(KGlobalSettings::baseColor());
setPaletteForegroundColor(KGlobalSettings::textColor());
setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor());
setPaletteForegroundColor(KGlobalSettings::textColor());
setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor());
setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}
@ -241,7 +241,7 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget");
m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual);
m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff);
m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor());
m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
setMainWidget(m_mainWidget);
@ -311,7 +311,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
void AddAppletDialog::populateApplets()
{
m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport());
m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor());
m_appletBox->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0);
m_appletBox->show();
TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox);

12
kicker/kicker/ui/browser_mnu.cpp
Unescape View File

@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize()
// only the first part menu got them
if(_startid == 0 && !_filesOnly) {
insertTitle(path());
KConfig *c = KGlobal::config();
KConfig *c = TDEGlobal::config();
c->setGroup("menus");
insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false))
@ -196,7 +196,7 @@ void PanelBrowserMenu::initialize()
if ( iconPath.startsWith("./") )
iconPath = path + '/' + iconPath.mid(2);
icon = KGlobal::iconLoader()->loadIcon(iconPath,
icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull())
@ -245,7 +245,7 @@ void PanelBrowserMenu::initialize()
TQString s = c.readEntry("Icon");
if(!_icons->contains(s)) {
icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
icon = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
KIcon::DefaultState, 0, true);
if(icon.isNull()) {
@ -309,7 +309,7 @@ void PanelBrowserMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
if(KGlobalSettings::insertTearOffHandle() && item_count > 0)
if(TDEGlobalSettings::insertTearOffHandle() && item_count > 0)
insertTearOffHandle();
#endif
@ -453,13 +453,13 @@ void PanelBrowserMenu::slotOpenTerminal()
config->setGroup("General");
TQString term = config->readPathEntry("TerminalApplication", "konsole");
KProcess proc;
TDEProcess proc;
proc << term;
if (term == "konsole")
proc << "--workdir" << path();
else
proc.setWorkingDirectory(path());
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
void PanelBrowserMenu::slotOpenFileManager()

2
kicker/kicker/ui/hidebutton.cpp
Unescape View File

@ -153,7 +153,7 @@ void HideButton::slotSettingsChanged(int category)
return;
}
bool changeCursor = KGlobalSettings::changeCursorOverIcon();
bool changeCursor = TDEGlobalSettings::changeCursorOverIcon();
if (changeCursor)
{

8
kicker/kicker/ui/itemview.cpp
Unescape View File

@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
void KMenuItem::setIcon(const TQString& icon, int size)
{
m_icon = icon;
TQListViewItem::setPixmap(0, KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
}
void KMenuItem::setHasChildren( bool flag )
@ -152,7 +152,7 @@ void KMenuItem::setup()
{
// if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt
// the 7pt could be read out of konquerorrc I guess
float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.);
float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
const int expected_height = 38;
description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
return 0;
o = new KMultipleDrag(viewport());
TQPixmap pix = KGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
TQPixmap add = KGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
TQPainter p( &pix );
p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);

2
kicker/kicker/ui/k_mnu.cpp
Unescape View File

@ -404,7 +404,7 @@ void PanelKMenu::initialize()
// WABA: tear off handles don't work together with dynamically updated
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif

32
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -124,7 +124,7 @@ static TQString calculate(const TQString &exp)
TQString result, cmd;
const TQString bc = KStandardDirs::findExe("bc");
if ( !bc.isEmpty() )
cmd = TQString("echo %1 | %2").arg(KProcess::quote(exp), KProcess::quote(bc));
cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(exp), TDEProcess::quote(bc));
else
cmd = TQString("echo $((%1))").arg(exp);
FILE *fs = popen(TQFile::encodeName(cmd).data(), "r");
@ -160,7 +160,7 @@ int base_category_id[] = {ACTIONS_ID_BASE, APP_ID_BASE, BOOKMARKS_ID_BASE, NOTES
static int used_size( TQLabel *label, int oldsize )
{
TQSimpleRichText st( label->text(), KGlobalSettings::toolBarFont() );
TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() );
st.setWidth( oldsize );
return QMAX( st.widthUsed(), oldsize );
}
@ -344,7 +344,7 @@ KMenu::KMenu()
m_kcommand->setDuplicatesEnabled( false );
m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
m_kcommand->setCompletionMode( KGlobalSettings::CompletionAuto );
m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
@ -1353,9 +1353,9 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ );
if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
{
TQString documentPath = KGlobalSettings::documentPath();
TQString documentPath = TDEGlobalSettings::documentPath();
if ( documentPath.endsWith( "/" ) )
documentPath = documentPath.left( documentPath.length() - 1 );
if (documentPath!=TQDir::homeDirPath())
@ -2083,7 +2083,7 @@ void KMenu::searchProgramList(TQString relPath)
int pos = exe.find(' ');
if (pos>0)
exe=exe.left(pos);
m_programsInMenu+=KGlobal::dirs()->findExe(exe);
m_programsInMenu+=TDEGlobal::dirs()->findExe(exe);
}
}
}
@ -2282,7 +2282,7 @@ void KMenu::doQuery (bool return_pressed)
"kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc");
int index = getHitMenuItemPosition (hit_item);
m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
hit_item->display_info, TDEGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
}
}
@ -2321,7 +2321,7 @@ void KMenu::doQuery (bool return_pressed)
case KURIFilterData::SHELL:
case KURIFilterData::EXECUTABLE:
{
exe = KGlobal::dirs()->findExe(filterData.uri().url());
exe = TDEGlobal::dirs()->findExe(filterData.uri().url());
#ifdef KDELIBS_SUSE
bool gimp_hack = false;
if (exe.endsWith("/bin/gimp")) {
@ -2688,13 +2688,13 @@ void KMenu::slotStartURL(const TQString& u)
else {
addToHistory();
if (u.startsWith("kaddressbook:/")) {
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "kaddressbook" << "--uid" << u.mid(14);
proc->start();
accept();
return;
} else if (u.startsWith("note:/")) {
KProcess *proc = new KProcess;
TDEProcess *proc = new TDEProcess;
*proc << "tomboy";
*proc << "--open-note" << u;
if (!proc->start())
@ -2892,7 +2892,7 @@ void KMenu::slotContextMenu(int selected)
KURL src,dest;
KIO::CopyJob *job;
KProcess *proc;
TDEProcess *proc;
TQStringList favs = KickerSettings::favorites();
@ -2900,15 +2900,15 @@ void KMenu::slotContextMenu(int selected)
case AddItemToDesktop:
accept();
if (m_popupService) {
src.setPath( KGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
dest.setPath( KGlobalSettings::desktopPath() );
src.setPath( TDEGlobal::dirs()->findResource( "apps", m_popupService->desktopEntryPath() ) );
dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
job->setDefaultPermissions( true );
}
else {
KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), KGlobalSettings::desktopPath() ) );
KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
df->writeEntry("GenericName", m_popupPath.description);
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", m_popupPath.path );
@ -2933,7 +2933,7 @@ void KMenu::slotContextMenu(int selected)
case EditItem:
case EditMenu:
accept();
proc = new KProcess(TQT_TQOBJECT(this));
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
@ -2951,7 +2951,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToDesktop: {
accept();
KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),KGlobalSettings::desktopPath()));
KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
df->writeEntry( "Name", m_popupPath.title );

16
kicker/kicker/ui/service_mnu.cpp
Unescape View File

@ -330,7 +330,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
// menus. We can't update the menu while torn off, and we don't know
// when it is torn off.
if ( count() > 0 && !relPath_.isEmpty() )
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
insertTearOffHandle();
#endif
}
@ -662,7 +662,7 @@ extern int kicker_screen_number;
void PanelServiceMenu::slotContextMenu(int selected)
{
KProcess *proc;
TDEProcess *proc;
KService::Ptr service;
KServiceGroup::Ptr g;
TQByteArray ba;
@ -676,8 +676,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddItemToDesktop:
service = static_cast<KService *>(contextKSycocaEntry_);
src.setPath( KGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
dest.setPath( KGlobalSettings::desktopPath() );
src.setPath( TDEGlobal::dirs()->findResource( "apps", service->desktopEntryPath() ) );
dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( src.fileName() );
job = KIO::copyAs( src, dest );
@ -694,7 +694,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditItem:
proc = new KProcess(TQT_TQOBJECT(this));
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
@ -713,7 +713,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
case AddMenuToDesktop:
g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
dest.setPath( KGlobalSettings::desktopPath() );
dest.setPath( TDEGlobalSettings::desktopPath() );
dest.setFileName( g->caption() );
df = new KDesktopFile( dest.path() );
@ -738,7 +738,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditMenu:
proc = new KProcess(TQT_TQOBJECT(this));
proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
@ -795,7 +795,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
icon = KGlobal::iconLoader()
icon = TDEGlobal::iconLoader()
->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
break;

8
kicker/libkicker/global.cpp
Unescape View File

@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d,
void colorize(TQImage& image)
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("WM");
TQColor color = TQApplication::palette().active().highlight();
TQColor activeTitle = config->readColorEntry("activeBackground", &color);
@ -414,20 +414,20 @@ TQIconSet menuIconSet(const TQString& icon)
{
if (iconSize > 0)
{
iconset = KGlobal::iconLoader()->loadIconSet(icon,
iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
KIcon::NoGroup,
iconSize, true);
}
else if (iconSize == 0)
{
TQPixmap normal = KGlobal::iconLoader()->loadIcon(icon,
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::DefaultState,
0,
true);
TQPixmap active = KGlobal::iconLoader()->loadIcon(icon,
TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon,
KIcon::Small,
0,
KIcon::ActiveState,

4
kicker/libkicker/kickerSettings.kcfg
Unescape View File

@ -441,12 +441,12 @@
<entry name="ButtonFont" key="Font" type="Font" >
<label>Font for the buttons with text.</label>
<default code="true">KGlobalSettings::generalFont()</default>
<default code="true">TDEGlobalSettings::generalFont()</default>
</entry>
<entry name="ButtonTextColor" key="TextColor" type="Color" >
<label>Text color for the buttons.</label>
<default code="true">KGlobalSettings::textColor()</default>
<default code="true">TDEGlobalSettings::textColor()</default>
</entry>
</group>

16
kicker/libkicker/panelbutton.cpp
Unescape View File

@ -80,11 +80,11 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
{
setBackgroundOrigin(AncestorOrigin);
setWFlags(TQt::WNoAutoErase);
KGlobal::locale()->insertCatalogue("libkicker");
TDEGlobal::locale()->insertCatalogue("libkicker");
calculateIconSize();
setAcceptDrops(true);
m_textColor = KGlobalSettings::textColor();
m_textColor = TDEGlobalSettings::textColor();
updateSettings(TDEApplication::SETTINGS_MOUSE);
@ -108,7 +108,7 @@ void PanelButton::configure()
return;
}
KConfigGroup tilesGroup( KGlobal::config(), "button_tiles" );
KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" );
if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) {
setTile( TQString::null );
return;
@ -171,7 +171,7 @@ TQImage PanelButton::loadTile(const TQString& tile,
name += state + ".png";
TQImage tileImg(KGlobal::dirs()->findResource("tiles", name));
TQImage tileImg(TDEGlobal::dirs()->findResource("tiles", name));
// scale if size does not match exactly
if (!tileImg.isNull() && tileImg.size() != size)
@ -225,7 +225,7 @@ void PanelButton::updateSettings(int category)
}
if (m_forceStandardCursor == FALSE)
m_changeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
else
m_changeCursorOverItem = FALSE;
@ -490,7 +490,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
TQPoint p(e->pos() - m_lastLeftMouseButtonPress);
if (p.manhattanLength() <= 16)
{
// KGlobalSettings::dndEventDelay() is not enough!
// TDEGlobalSettings::dndEventDelay() is not enough!
return;
}
@ -781,7 +781,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
{
// (re)calculates the icon sizes and report true if they have changed.
// Get sizes from icontheme. We assume they are sorted.
KIconTheme *ith = KGlobal::iconLoader()->theme();
KIconTheme *ith = TDEGlobal::iconLoader()->theme();
if (!ith)
{
@ -878,7 +878,7 @@ void PanelButton::loadTiles()
void PanelButton::loadIcons()
{
KIconLoader * ldr = KGlobal::iconLoader();
KIconLoader * ldr = TDEGlobal::iconLoader();
TQString nm = m_iconName;
KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
KIcon::DisabledState;

2
kicker/libkicker/panner.cpp
Unescape View File

@ -42,7 +42,7 @@ Panner::Panner( TQWidget* parent, const char* name )
_cwidth(0), _cheight(0),
_cx(0), _cy(0)
{
KGlobal::locale()->insertCatalogue("libkicker");
TDEGlobal::locale()->insertCatalogue("libkicker");
setBackgroundOrigin( AncestorOrigin );
_updateScrollButtonsTimer = new TQTimer(this);

2
kicker/libkicker/simplebutton.cpp
Unescape View File

@ -172,7 +172,7 @@ void SimpleButton::slotSettingsChanged(int category)
bool changeCursor;
if (m_forceStandardCursor == FALSE)
changeCursor = KGlobalSettings::changeCursorOverIcon();
changeCursor = TDEGlobalSettings::changeCursorOverIcon();
else
changeCursor = FALSE;

2
kicker/menuext/find/findmenu.cpp
Unescape View File

@ -44,7 +44,7 @@ FindMenu::~FindMenu()
void FindMenu::initialize()
{
TQStringList list = KGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kicker/menuext/find/*.desktop", false, true );
list.sort();

2
kicker/menuext/kate/katesessionmenu.cpp
Unescape View File

@ -76,7 +76,7 @@ void KateSessionMenu::initialize()
insertSeparator();
TQStringList list = KGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );

4
kicker/menuext/konq-profiles/konqy_menu.cpp
Unescape View File

@ -41,7 +41,7 @@ KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name,
{
static bool tdeprintIconsInitialized = false;
if ( !tdeprintIconsInitialized ) {
KGlobal::iconLoader()->addAppDir("tdeprint");
TDEGlobal::iconLoader()->addAppDir("tdeprint");
tdeprintIconsInitialized = true;
}
}
@ -55,7 +55,7 @@ void KonquerorProfilesMenu::initialize()
if (initialized()) clear();
setInitialized(true);
TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
m_profiles.resize(profiles.count());
int id=1;

8
kicker/menuext/konsole/konsole_mnu.cpp
Unescape View File

@ -54,7 +54,7 @@ KonsoleMenu::KonsoleMenu(TQWidget *parent, const char *name, const TQStringList&
KonsoleMenu::~KonsoleMenu()
{
KGlobal::locale()->removeCatalogue("libkickermenu_konsole");
TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole");
}
static void insertItemSorted(KPopupMenu *menu,
@ -96,7 +96,7 @@ void KonsoleMenu::initialize()
setInitialized(true);
TQStringList list = KGlobal::dirs()->findAllResources("data",
TQStringList list = TDEGlobal::dirs()->findAllResources("data",
"konsole/*.desktop",
false, true);
@ -126,7 +126,7 @@ void KonsoleMenu::initialize()
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
TQString pexec = KGlobal::dirs()->findExe(exec);
TQString pexec = TDEGlobal::dirs()->findExe(exec);
if (text.isEmpty() ||
conf.readEntry("Type") != "KonsoleApplication" ||
(!exec.isEmpty() && pexec.isEmpty()))
@ -197,7 +197,7 @@ void KonsoleMenu::initialize()
delete m_profileMenu;
m_profileMenu = new KPopupMenu(this);
TQStringList profiles = KGlobal::dirs()->findAllResources("data",
TQStringList profiles = TDEGlobal::dirs()->findAllResources("data",
"konsole/profiles/*",
false, true );
m_profiles.resize(profiles.count());

2
kicker/menuext/prefmenu/prefmenu.cpp
Unescape View File

@ -182,7 +182,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
case KST_KServiceGroup:
{
icon = KGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
icon = TDEGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
KIcon::Small);
url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath();
break;

2
kicker/menuext/recentdocs/recentdocsmenu.cpp
Unescape View File

@ -119,7 +119,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
int dragLength = (e->pos() - _mouseDown).manhattanLength();
if (dragLength <= KGlobalSettings::dndEventDelay())
if (dragLength <= TDEGlobalSettings::dndEventDelay())
return; // ignore it
int id = idAt(_mouseDown);

6
kicker/menuext/remote/remotemenu.cpp
Unescape View File

@ -42,10 +42,10 @@ RemoteMenu::RemoteMenu(TQWidget *parent, const char *name,
const TQStringList &/*args*/)
: KPanelMenu(parent, name), KDirNotify()
{
KGlobal::dirs()->addResourceType("remote_entries",
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TQString path = KGlobal::dirs()->saveLocation("remote_entries");
TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
TQDir dir = path;
if (!dir.exists())
@ -76,7 +76,7 @@ void RemoteMenu::initialize()
m_desktopMap.clear();
TQStringList names_found;
TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();

2
kicker/menuext/tdeprint/print_mnu.cpp
Unescape View File

@ -45,7 +45,7 @@ PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*
{
static bool tdeprintIconsInitialized = false;
if ( !tdeprintIconsInitialized ) {
KGlobal::iconLoader()->addAppDir("tdeprint");
TDEGlobal::iconLoader()->addAppDir("tdeprint");
tdeprintIconsInitialized = true;
}
}

10
kicker/menuext/tom/tom.cc
Unescape View File

@ -64,7 +64,7 @@ extern "C"
{
KDE_EXPORT void* init_kickermenu_tom()
{
KGlobal::locale()->insertCatalogue("libkickermenu_tom");
TDEGlobal::locale()->insertCatalogue("libkickermenu_tom");
return new TOMFactory;
}
};
@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name)
setCaption(i18n("Task-Oriented Menu"));
// KMenu legacy: support some menu config options
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("menus");
m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false);
if (m_detailedTaskEntries)
@ -438,7 +438,7 @@ void TOM::initialize()
// TASKS
insertTitle(i18n("Tasks"), contextMenuTitleID);
TQStringList dirs = KGlobal::dirs()->findDirs("data", "kicker/tom/");
TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kicker/tom/");
TQStringList::ConstIterator dIt = dirs.begin();
TQStringList::ConstIterator dEnd = dirs.end();
@ -516,7 +516,7 @@ void TOM::initialize()
}
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQStringList menu_ext = config->readListEntry("Extensions");
if (!menu_ext.isEmpty())
{
@ -628,7 +628,7 @@ void TOM::removeTask()
*
bool TOM::loadSidePixmap()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
TQColor color = palette().active().highlight();
TQImage image;

4
kicker/proxy/appletproxy.cpp
Unescape View File

@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
"kicker/applets");
// setup proxy object
@ -162,7 +162,7 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config
df = finfo.absFilePath();
} else {
// locate desktop file
df = KGlobal::dirs()->findResource("applets", desktopFile);
df = TDEGlobal::dirs()->findResource("applets", desktopFile);
}
TQFile file(df);

4
kicker/proxy/extensiondebugger.cpp
Unescape View File

@ -88,7 +88,7 @@ int main( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
TQString df;
@ -109,7 +109,7 @@ int main( int argc, char ** argv )
df = finfo.absFilePath();
} else {
// locate desktop file
df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
// does the config file exist?

4
kicker/proxy/extensionproxy.cpp
Unescape View File

@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
TDEApplication a;
a.disableSessionManagement();
KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
"kicker/extensions");
// setup proxy object
@ -134,7 +134,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString
df = finfo.absFilePath();
} else {
// locate desktop file
df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile));
df = TDEGlobal::dirs()->findResource("extensions", TQString(desktopFile));
}
TQFile file(df);

10
kicker/taskbar/taskbar.cpp
Unescape View File

@ -125,7 +125,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TQWidget *parent, const char
blocklayout = false;
connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
keys = new KGlobalAccel( TQT_TQOBJECT(this) );
keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
#include "taskbarbindings.cpp"
keys->readSettings();
keys->updateConnections();
@ -172,7 +172,7 @@ TQSize TaskBar::sizeHint() const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
TQFontMetrics fm(KGlobalSettings::taskbarFont());
TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@ -183,7 +183,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
TQFontMetrics fm(KGlobalSettings::taskbarFont());
TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@ -710,7 +710,7 @@ void TaskBar::reLayout()
// number of rows simply depends on our height which is either the
// minimum button height or the height of the font in use, whichever is
// largest
TQFontMetrics fm(KGlobalSettings::taskbarFont());
TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
@ -970,7 +970,7 @@ int TaskBar::taskCount() const
int TaskBar::maximumButtonsWithoutShrinking() const
{
TQFontMetrics fm(KGlobalSettings::taskbarFont());
TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ?
fm.height() : m_settingsObject->minimumButtonHeight();
int rows = contentsRect().height() / minButtonHeight;

4
kicker/taskbar/taskbar.h
Unescape View File

@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class Startup;
class Task;
class KGlobalAccel;
class TDEGlobalAccel;
class TaskBar : public Panner
{
@ -127,7 +127,7 @@ private:
bool shouldGroup() const;
bool isGrouping;
void reGroup();
KGlobalAccel* keys;
TDEGlobalAccel* keys;
KTextShadowEngine* m_textShadowEngine;
bool m_ignoreUpdates;
TQTimer m_relayoutTimer;

6
kicker/taskbar/taskcontainer.cpp
Unescape View File

@ -577,7 +577,7 @@ void TaskContainer::drawButton(TQPainter *p)
bool drawButton = alwaysDrawButtons ||
(m_mouseOver && !halo && isEnabled() &&
m_settingsObject->showButtonOnHover());
TQFont font(KGlobalSettings::taskbarFont());
TQFont font(TDEGlobalSettings::taskbarFont());
// draw sunken if we contain the active task
bool active = false;
@ -1273,7 +1273,7 @@ bool TaskContainer::startDrag(const TQPoint& pos)
return false;
}
int delay = KGlobalSettings::dndEventDelay();
int delay = TDEGlobalSettings::dndEventDelay();
if ((m_dragStartPos - pos).manhattanLength() > delay)
{
@ -1663,7 +1663,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
data.message = m_startup->text();
data.duration = 4000;
data.subtext = i18n("Loading application ...");
data.icon = KGlobal::iconLoader()->loadIcon(m_startup->icon(),
data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
KIcon::Small,
KIcon::SizeMedium,
KIcon::DefaultState,

2
kicker/taskmanager/tasklmbmenu.cpp
Unescape View File

@ -255,7 +255,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e)
return;
}
int delay = KGlobalSettings::dndEventDelay();
int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos(e->pos());
if ((m_dragStartPos - newPos).manhattanLength() > delay)

16
kicker/taskmanager/taskmanager.cpp
Unescape View File

@ -60,7 +60,7 @@ TaskManager::TaskManager()
m_winModule(new KWinModule()),
m_trackGeometry(false)
{
KGlobal::locale()->insertCatalogue("libtaskmanager");
TDEGlobal::locale()->insertCatalogue("libtaskmanager");
connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
this, TQT_SLOT(windowAdded(WId)));
connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
@ -88,7 +88,7 @@ TaskManager::TaskManager()
TaskManager::~TaskManager()
{
KGlobal::locale()->removeCatalogue("libtaskmanager");
TDEGlobal::locale()->removeCatalogue("libtaskmanager");
}
void TaskManager::configure_startup()
@ -628,7 +628,7 @@ Task::Task(WId win, TQObject *parent, const char *name)
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
KGlobal::iconLoader()->loadIcon(className().lower(),
TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
@ -709,7 +709,7 @@ void Task::refreshIcon()
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
KGlobal::iconLoader()->loadIcon(className().lower(),
TDEGlobal::iconLoader()->loadIcon(className().lower(),
KIcon::Small,
KIcon::Small,
KIcon::DefaultState,
@ -914,7 +914,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = KGlobal::iconLoader()->loadIcon( "go",
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeSmall );
isStaticIcon = true;
@ -937,7 +937,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = KGlobal::iconLoader()->loadIcon( "go",
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeMedium );
isStaticIcon = true;
@ -951,7 +951,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
pixmap = KGlobal::iconLoader()->loadIcon( className(),
pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
KIcon::NoGroup,
size,
KIcon::DefaultState,
@ -968,7 +968,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = KGlobal::iconLoader()->loadIcon( "go",
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
size );
isStaticIcon = true;

2
kioslave/cgi/cgi.cpp
Unescape View File

@ -156,7 +156,7 @@ void CgiProtocol::get( const KURL& url )
} else {
kdDebug(7124) << "Cmd: " << cmd << endl;
fd = popen( TQFile::encodeName(KProcess::quote( cmd )).data(), "r" );
fd = popen( TQFile::encodeName(TDEProcess::quote( cmd )).data(), "r" );
if ( !fd ) {
kdDebug(7124) << "Error running '" << cmd << "'" << endl;

2
kioslave/cgi/cgi.h
Unescape View File

@ -22,7 +22,7 @@
#include <kio/slavebase.h>
class KProcess;
class TDEProcess;
/*!
This class implements an ioslave for viewing CGI script output without the

2
kioslave/cgi/kcmcgi/kcmcgi.cpp
Unescape View File

@ -35,7 +35,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * )
{
KGlobal::locale()->insertCatalogue("kcmcgi");
TDEGlobal::locale()->insertCatalogue("kcmcgi");
return new KCMCgi( parent, "kcmcgi" );
}
}

22
kioslave/finger/kio_finger.cpp
Unescape View File

@ -121,17 +121,17 @@ void FingerProtocol::get(const KURL& url )
//kdDebug() << "Refresh rate: " << refreshRate << endl;
myKProcess = new KProcess();
*myKProcess << *myPerlPath << *myFingerPerlScript
myTDEProcess = new TDEProcess();
*myTDEProcess << *myPerlPath << *myFingerPerlScript
<< *myFingerPath << *myFingerCSSFile
<< refreshRate << myURL->host() << myURL->user() ;
connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
//connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
// this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
//connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
// this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
data(TQCString(TQString(*myStdStream).local8Bit()));
@ -140,14 +140,14 @@ void FingerProtocol::get(const KURL& url )
//clean up
delete myKProcess;
delete myTDEProcess;
}
/* ---------------------------------------------------------------------------------- */
void FingerProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
void FingerProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len)
{
//kdDebug() << "void FingerProtocol::slotGetStdoutOutput()" << endl;
*myStdStream += TQString::fromLocal8Bit(s, len);
@ -172,7 +172,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "kfingerMainWindow::getProgramPath()" << endl;
// Not to sure wether I'm using the right error number here. - schlpbch -
myPerlPath = new TQString(KGlobal::dirs()->findExe("perl"));
myPerlPath = new TQString(TDEGlobal::dirs()->findExe("perl"));
if (myPerlPath->isEmpty())
{
//kdDebug() << "Perl command not found" << endl;
@ -185,7 +185,7 @@ void FingerProtocol::getProgramPath()
//kdDebug() << "Perl command found:" << *myPerlPath << endl;
}
myFingerPath = new TQString(KGlobal::dirs()->findExe("finger"));
myFingerPath = new TQString(TDEGlobal::dirs()->findExe("finger"));
if ((myFingerPath->isEmpty()))
{
//kdDebug() << "Finger command not found" << endl;

4
kioslave/finger/kio_finger.h
Unescape View File

@ -41,7 +41,7 @@ public:
virtual void get(const KURL& url);
private slots:
void slotGetStdOutput(KProcess*, char*, int);
void slotGetStdOutput(TDEProcess*, char*, int);
private:
KURL *myURL;
@ -54,7 +54,7 @@ private:
QString *myStdStream;
KProcess *myKProcess;
TDEProcess *myTDEProcess;
void getProgramPath();
void parseCommandLine(const KURL& url);

4
kioslave/fish/fish.cpp
Unescape View File

@ -19,9 +19,9 @@
done by David Faure <faure@kde.org>.
Structure is a bit complicated, since I made the mistake to use
KProcess... now there is a lightweight homebrew async IO system
TDEProcess... now there is a lightweight homebrew async IO system
inside, but if signals/slots become available for ioslaves, switching
back to KProcess should be easy.
back to TDEProcess should be easy.
*/
#include "config.h"

2
kioslave/home/kdedmodule/homedirnotifymodule.cpp
Unescape View File

@ -30,7 +30,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_home");
TDEGlobal::locale()->insertCatalogue("kio_home");
return new HomeDirNotifyModule(obj);
}
}

16
kioslave/info/info.cc
Unescape View File

@ -25,7 +25,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app )
{
kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl;
m_perl = KGlobal::dirs()->findExe( "perl" );
m_perl = TDEGlobal::dirs()->findExe( "perl" );
m_infoScript = locate( "data", "kio_info/kde-info2html" );
m_infoConf = locate("data", "kio_info/kde-info2html.conf");
@ -92,21 +92,21 @@ void InfoProtocol::get( const KURL& url )
// extract the path and node from url
decodeURL( url );
TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
int revindex = path.findRev('/');
path = path.left(revindex);
TQString cmd = KProcess::quote(m_perl);
TQString cmd = TDEProcess::quote(m_perl);
cmd += " ";
cmd += KProcess::quote(m_infoScript);
cmd += TDEProcess::quote(m_infoScript);
cmd += " ";
cmd += KProcess::quote(m_infoConf);
cmd += TDEProcess::quote(m_infoConf);
cmd += " ";
cmd += KProcess::quote(path);
cmd += TDEProcess::quote(path);
cmd += " ";
cmd += KProcess::quote(m_page);
cmd += TDEProcess::quote(m_page);
cmd += " ";
cmd += KProcess::quote(m_node);
cmd += TDEProcess::quote(m_node);
kdDebug( 7108 ) << "cmd: " << cmd << endl;

2
kioslave/info/info.h
Unescape View File

@ -5,7 +5,7 @@
#include <kio/slavebase.h>
class KProcess;
class TDEProcess;
class InfoProtocol : public KIO::SlaveBase
{

96
kioslave/mac/kio_mac.cpp
Unescape View File

@ -60,8 +60,8 @@ MacProtocol::~MacProtocol() {
delete logStream;
logStream = 0;
*/
delete myKProcess;
myKProcess = 0L;
delete myTDEProcess;
myTDEProcess = 0L;
}
//get() called when a file is to be read
@ -100,24 +100,24 @@ void MacProtocol::get(const KURL& url) {
}
//now we can read the file
myKProcess = new KProcess();
myTDEProcess = new TDEProcess();
*myKProcess << "hpcopy" << mode << path << "-";
*myTDEProcess << "hpcopy" << mode << path << "-";
//data is now sent directly from the slot
connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotSetDataStdOutput(KProcess *, char *, int)));
connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
if (!myKProcess->normalExit() || !(myKProcess->exitStatus() == 0)) {
if (!myTDEProcess->normalExit() || !(myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("There was an error with hpcopy - please ensure it is installed"));
return;
}
//clean up
delete myKProcess; myKProcess = 0;
delete myTDEProcess; myTDEProcess = 0;
//finish
data(TQByteArray());
finished();
@ -130,24 +130,24 @@ void MacProtocol::listDir(const KURL& url) {
if (filename.isNull()) {
error(ERR_CANNOT_LAUNCH_PROCESS, i18n("No filename was found"));
} else {
myKProcess = new KProcess();
*myKProcess << "hpls" << "-la" << filename;
myTDEProcess = new TDEProcess();
*myTDEProcess << "hpls" << "-la" << filename;
standardOutputStream = TQString::null;
connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("There was an error with hpls - please ensure it is installed"));
}
//clean up
delete myKProcess; myKProcess = 0;
disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
delete myTDEProcess; myTDEProcess = 0;
disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
UDSEntry entry;
if (!standardOutputStream.isEmpty()) {
@ -186,25 +186,25 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
if (filename.isNull()) {
error(ERR_SLAVE_DEFINED, i18n("No filename was found in the URL"));
} else if (! filename.isEmpty()) {
myKProcess = new KShellProcess();
myTDEProcess = new KShellProcess();
*myKProcess << "hpls" << "-ld" << filename;
*myTDEProcess << "hpls" << "-ld" << filename;
standardOutputStream = TQString::null;
connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("hpls did not exit normally - please ensure you have installed the hfsplus tools"));
}
//clean up
delete myKProcess; myKProcess = 0;
disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
delete myTDEProcess; myTDEProcess = 0;
disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
if (standardOutputStream.isEmpty()) {
filename.replace("\\ ", " "); //get rid of escapes
@ -254,13 +254,13 @@ TQString MacProtocol::prepareHP(const KURL& url) {
delete config; config = 0;
//first we run just hpmount and check the output to see if it's version 1.0.2 or 1.0.4
myKProcess = new KProcess();
*myKProcess << "hpmount";
myTDEProcess = new TDEProcess();
*myTDEProcess << "hpmount";
standardOutputStream = TQString::null;
connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
bool version102 = true;
@ -268,21 +268,21 @@ TQString MacProtocol::prepareHP(const KURL& url) {
version102 = false;
}
delete myKProcess; myKProcess = 0;
disconnect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
delete myTDEProcess; myTDEProcess = 0;
disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
//now mount the drive
myKProcess = new KProcess();
myTDEProcess = new TDEProcess();
if (version102) {
*myKProcess << "hpmount" << device;
*myTDEProcess << "hpmount" << device;
} else {
*myKProcess << "hpmount" << "-r" << device;
*myTDEProcess << "hpmount" << "-r" << device;
}
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
//TODO this error interrupts the user when typing ?dev=foo on each letter of foo
error(ERR_SLAVE_DEFINED,
i18n("hpmount did not exit normally - please ensure that hfsplus utils are installed,\n"
@ -293,7 +293,7 @@ TQString MacProtocol::prepareHP(const KURL& url) {
}
//clean up
delete myKProcess; myKProcess = 0;
delete myTDEProcess; myTDEProcess = 0;
//escape any funny characters
//TODO are there any more characters to escape?
@ -310,19 +310,19 @@ TQString MacProtocol::prepareHP(const KURL& url) {
dir = path.left(s);
path = path.mid(s+1);
myKProcess = new KProcess();
*myKProcess << "hpcd" << dir;
myTDEProcess = new TDEProcess();
*myTDEProcess << "hpcd" << dir;
myKProcess->start(KProcess::Block, KProcess::All);
myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) {
if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) {
error(ERR_SLAVE_DEFINED,
i18n("hpcd did not exit normally - please ensure it is installed"));
return NULL;
}
//clean up
delete myKProcess; myKProcess = 0;
delete myTDEProcess; myTDEProcess = 0;
s = path.find('/');
}
@ -412,13 +412,13 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) {
//slotGetStdOutput() grabs output from the hp commands
// and adds it to the buffer
void MacProtocol::slotGetStdOutput(KProcess*, char *s, int len) {
void MacProtocol::slotGetStdOutput(TDEProcess*, char *s, int len) {
standardOutputStream += TQString::fromLocal8Bit(s, len);
}
//slotSetDataStdOutput() is used during hpcopy to give
//standard output to KDE
void MacProtocol::slotSetDataStdOutput(KProcess*, char *s, int len) {
void MacProtocol::slotSetDataStdOutput(TDEProcess*, char *s, int len) {
processedBytes += len;
processedSize(processedBytes);
TQByteArray array;

6
kioslave/mac/kio_mac.h
Unescape View File

@ -36,8 +36,8 @@ public:
virtual void listDir(const KURL& url);
virtual void stat(const KURL& url);
protected slots:
void slotGetStdOutput(KProcess*, char*, int);
void slotSetDataStdOutput(KProcess*, char *s, int len);
void slotGetStdOutput(TDEProcess*, char*, int);
void slotSetDataStdOutput(TDEProcess*, char *s, int len);
protected:
TQString prepareHP(const KURL& _url);
TQValueList<KIO::UDSAtom> makeUDS(const TQString& _line);
@ -47,7 +47,7 @@ protected:
KIO::filesize_t processedBytes;
TQString standardOutputStream;
KProcess* myKProcess;
TDEProcess* myTDEProcess;
//for debugging
//TQFile* logFile;

36
kioslave/man/kio_man.cpp
Unescape View File

@ -116,7 +116,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock
{
assert(!_self);
_self = this;
const TQString common_dir = KGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" );
const TQString common_dir = TDEGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" );
const TQString strPath=TQString( "file:%1/en/common" ).arg( common_dir );
m_htmlPath=strPath.local8Bit(); // ### TODO encode for HTML
m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS
@ -195,12 +195,12 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
break;
}
if ( it_name == names.end() ) {
KProcess proc;
TDEProcess proc;
proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
myStdStream = TQString::null;
connect( &proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ),
TQT_SLOT( slotGetStdOutput( KProcess *, char *, int ) ) );
proc.start( KProcess::Block, KProcess::Stdout );
connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
proc.start( TDEProcess::Block, TDEProcess::Stdout );
TQTextStream t( &myStdStream, IO_ReadOnly );
parseWhatIs( i, t, mark );
}
@ -223,7 +223,7 @@ TQStringList MANProtocol::manDirectories()
{
// Translated pages in "<mandir>/<lang>" if the directory
// exists
TQStringList languages = KGlobal::locale()->languageList();
TQStringList languages = TDEGlobal::locale()->languageList();
for (TQStringList::ConstIterator it_lang = languages.begin();
it_lang != languages.end();
@ -512,12 +512,12 @@ void MANProtocol::get(const KURL& url )
finished();
}
void MANProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len)
void MANProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len)
{
myStdStream += TQString::fromLocal8Bit(s, len);
}
void MANProtocol::slotGetStdOutputUtf8(KProcess* /* p */, char *s, int len)
void MANProtocol::slotGetStdOutputUtf8(TDEProcess* /* p */, char *s, int len)
{
myStdStream += TQString::fromUtf8(s, len);
}
@ -537,15 +537,15 @@ char *MANProtocol::readManPage(const char *_filename)
if (filename.contains("sman", false)) //file_mimetype == "text/html" || )
{
myStdStream =TQString::null;
KProcess proc;
TDEProcess proc;
/* Determine path to sgml2roff, if not already done. */
getProgramPath();
proc << mySgml2RoffPath << filename;
TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
proc.start(KProcess::Block, KProcess::All);
TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.latin1();
const int len = cstr.size()-1;
@ -570,14 +570,14 @@ char *MANProtocol::readManPage(const char *_filename)
lastdir = filename.left(filename.findRev('/'));
myStdStream = TQString::null;
KProcess proc;
TDEProcess proc;
/* TODO: detect availability of 'man --recode' so that this can go
* upstream */
proc << "man" << "--recode" << "UTF-8" << filename;
TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
proc.start(KProcess::Block, KProcess::All);
TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.utf8();
const int len = cstr.size()-1;
@ -1517,12 +1517,12 @@ void MANProtocol::getProgramPath()
if (!mySgml2RoffPath.isEmpty())
return;
mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff");
mySgml2RoffPath = TDEGlobal::dirs()->findExe("sgml2roff");
if (!mySgml2RoffPath.isEmpty())
return;
/* sgml2roff isn't found in PATH. Check some possible locations where it may be found. */
mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS));
mySgml2RoffPath = TDEGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS));
if (!mySgml2RoffPath.isEmpty())
return;

4
kioslave/man/kio_man.h
Unescape View File

@ -60,8 +60,8 @@ public:
static MANProtocol *self();
private slots:
void slotGetStdOutput(KProcess*, char*, int);
void slotGetStdOutputUtf8(KProcess*, char*, int);
void slotGetStdOutput(TDEProcess*, char*, int);
void slotGetStdOutputUtf8(TDEProcess*, char*, int);
private:
void checkManPaths();

2
kioslave/media/kcmodule/main.cpp
Unescape View File

@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
: KCModule(MediaFactory::instance(), parent, name )
{
KGlobal::locale()->insertCatalogue("kio_media");
TDEGlobal::locale()->insertCatalogue("kio_media");
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQTabWidget *tab = new TQTabWidget( this );

2
kioslave/media/libmediacommon/notifieraction.cpp
Unescape View File

@ -57,7 +57,7 @@ TQPixmap NotifierAction::pixmap() const
}
else
{
TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 );
TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 );
return TQPixmap( path );
}
}

2
kioslave/media/libmediacommon/notifiersettings.cpp
Unescape View File

@ -361,7 +361,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString
TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const
{
TQValueList<NotifierServiceAction*> services;
TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
TQStringList::ConstIterator dir_it = dirs.begin();
TQStringList::ConstIterator dir_end = dirs.end();

2
kioslave/media/mediamanager/dialog.cpp
Unescape View File

@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

16
kioslave/media/mediamanager/halbackend.cpp
Unescape View File

@ -376,9 +376,9 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition)
}
}
if (medium) {
KProcess p;
TDEProcess p;
p << "kio_media_mounthelper" << "-e" << medium->name();
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
}
}
@ -1128,7 +1128,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command,
const TQString& dialogCaption, const TQString& dialogComment)
{
KProcess tdesudoProcess;
TDEProcess tdesudoProcess;
tdesudoProcess << tdesudoPath
<< "-d"
@ -1138,7 +1138,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman
<< "-c" << command;
// @todo handle tdesudo output
tdesudoProcess.start(KProcess::Block);
tdesudoProcess.start(TDEProcess::Block);
return TQString();
}
@ -1146,7 +1146,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman
TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
const TQString& dialogCaption)
{
KProcess tdesuProcess;
TDEProcess tdesuProcess;
tdesuProcess << tdesuPath
<< "-d"
@ -1155,7 +1155,7 @@ TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
<< "-c" << command;
// @todo handle tdesu output
tdesuProcess.start(KProcess::Block);
tdesuProcess.start(TDEProcess::Block);
return TQString();
}
@ -1299,7 +1299,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char
TQString HALBackend::listUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@ -1336,7 +1336,7 @@ TQString HALBackend::listUsingProcesses(const Medium* medium)
TQString HALBackend::killUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;

2
kioslave/media/mediamanager/mediamanager.cpp
Unescape View File

@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam
extern "C" {
KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_media");
TDEGlobal::locale()->insertCatalogue("kio_media");
return new MediaManager(obj);
}
}

24
kioslave/media/mediamanager/tdehardwarebackend.cpp
Unescape View File

@ -63,7 +63,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
, m_parent(parent)
{
// Initialize the TDE device manager
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
// Connect device monitoring signals/slots
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
@ -78,7 +78,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
TDEBackend::~TDEBackend()
{
// Remove all media from the media list
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@ -113,7 +113,7 @@ void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) {
// List devices (at startup)
bool TDEBackend::ListDevices()
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices();
TDEGenericDevice *hwdevice;
for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
@ -391,7 +391,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
void TDEBackend::setVolumeProperties(Medium* medium)
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -570,7 +570,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
// Handle floppies and zip drives
bool TDEBackend::setFloppyProperties(Medium* medium)
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -636,7 +636,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
void TDEBackend::setCameraProperties(Medium* medium)
{
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -702,7 +702,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
return TQStringList();
}
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -961,7 +961,7 @@ TQString TDEBackend::mount(const Medium *medium)
}
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -1162,7 +1162,7 @@ TQString TDEBackend::unmount(const TQString &_udi)
TQString udi = TQString::null;
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) {
@ -1271,7 +1271,7 @@ TQString TDEBackend::isInFstab(const Medium *medium)
TQString TDEBackend::listUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@ -1308,7 +1308,7 @@ TQString TDEBackend::listUsingProcesses(const Medium* medium)
TQString TDEBackend::killUsingProcesses(const Medium* medium)
{
TQString proclist, fullmsg;
TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint()));
FILE *fuser = popen(cmdline.latin1(), "r");
uint counter = 0;
@ -1346,7 +1346,7 @@ TQString TDEBackend::generateName(const TQString &devNode)
}
TQString TDEBackend::driveUDIFromDeviceUID(TQString uuid) {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice * sdevice = hwdevices->findDiskByUID(uuid);
TQString ret;

4
kioslave/media/medianotifier/medianotifier.cpp
Unescape View File

@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path,
// confirmed its execution the autostart file MUST be executed
// with the current working directory ( CWD ) set to the root
// directory of the medium.
KProcess proc;
TDEProcess proc;
proc << "sh" << autorunFile;
proc.setWorkingDirectory( path );
proc.start();
@ -313,7 +313,7 @@ extern "C"
{
KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
{
KGlobal::locale()->insertCatalogue("kay");
TDEGlobal::locale()->insertCatalogue("kay");
return new MediaNotifier(name);
}
}

2
kioslave/media/mounthelper/dialog.cpp
Unescape View File

@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

10
kioslave/media/mounthelper/kio_media_mounthelper.cpp
Unescape View File

@ -182,19 +182,19 @@ MountHelper::MountHelper() : TDEApplication()
void MountHelper::invokeEject(const TQString &device, bool quiet)
{
KProcess *proc = new KProcess(TQT_TQOBJECT(this));
TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "kdeeject";
if (quiet)
{
*proc << "-q";
}
*proc << device;
connect( proc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT( ejectFinished(KProcess *) ) );
connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT( ejectFinished(TDEProcess *) ) );
proc->start();
}
void MountHelper::ejectFinished(KProcess* proc)
void MountHelper::ejectFinished(TDEProcess* proc)
{
/*
* If eject failed, report the error stored in m_errorStr
@ -268,7 +268,7 @@ int main(int argc, char **argv)
"0.1");
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("kio_media");
TDEGlobal::locale()->setMainCatalogue("kio_media");
TDEApplication::addCmdLineOptions();
if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();

2
kioslave/media/mounthelper/kio_media_mounthelper.h
Unescape View File

@ -47,7 +47,7 @@ private:
private slots:
void slotSendPassword();
void slotCancel();
void ejectFinished(KProcess* proc);
void ejectFinished(TDEProcess* proc);
void error();
signals:

4
kioslave/remote/kdedmodule/remotedirnotify.cpp
Unescape View File

@ -30,10 +30,10 @@
RemoteDirNotify::RemoteDirNotify()
{
KGlobal::dirs()->addResourceType("remote_entries",
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TQString path = KGlobal::dirs()->saveLocation("remote_entries");
TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
m_baseURL.setPath(path);
}

2
kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
Unescape View File

@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_remote");
TDEGlobal::locale()->insertCatalogue("kio_remote");
return new RemoteDirNotifyModule(obj);
}
}

8
kioslave/remote/remoteimpl.cpp
Unescape View File

@ -36,10 +36,10 @@
RemoteImpl::RemoteImpl()
{
KGlobal::dirs()->addResourceType("remote_entries",
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TQString path = KGlobal::dirs()->saveLocation("remote_entries");
TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
TQDir dir = path;
if (!dir.exists())
@ -54,7 +54,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const
kdDebug(1220) << "RemoteImpl::listRoot" << endl;
TQStringList names_found;
TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@ -89,7 +89,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co
{
kdDebug(1220) << "RemoteImpl::findDirectory" << endl;
TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();

4
kioslave/sftp/CHANGELOG
Unescape View File

@ -4,12 +4,12 @@
- After the user cancels with the stop button, we get ERR_CANNOT_LAUNCH_PROCESS
errors, until we kill the ioslave. Same thing after trying the wrong passwd
too many times.
This is happening because KProcess thinks that the ssh process is still running
This is happening because TDEProcess thinks that the ssh process is still running
even though it exited.
- How to handle password and caching?
- Write our own askpass program using kde
- set env SSH_ASKPASS_PROGRAM before launching
-how to do this? KProcess doesn't give us access to env variables.
-how to do this? TDEProcess doesn't give us access to env variables.
- Our askpass program can probably talk to the tdesu daemon to implement caching.
- chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
dialog is right though.

6
kioslave/smb/kio_smb.h
Unescape View File

@ -87,7 +87,7 @@ extern "C"
#define KIO_SMB 7106
using namespace KIO;
class KProcess;
class TDEProcess;
//===========================================================================
@ -262,8 +262,8 @@ public:
virtual void special( const TQByteArray & );
private slots:
void readOutput(KProcess *proc, char *buffer, int buflen);
void readStdErr(KProcess *proc, char *buffer, int buflen);
void readOutput(TDEProcess *proc, char *buffer, int buflen);
void readStdErr(TDEProcess *proc, char *buffer, int buflen);
private:
TQString mybuf, mystderr;

40
kioslave/smb/kio_smb_mount.cpp
Unescape View File

@ -25,12 +25,12 @@
#include <tqdir.h>
#include <kprocess.h>
void SMBSlave::readOutput(KProcess *, char *buffer, int buflen)
void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen)
{
mybuf += TQString::fromLocal8Bit(buffer, buflen);
}
void SMBSlave::readStdErr(KProcess *, char *buffer, int buflen)
void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen)
{
mystderr += TQString::fromLocal8Bit(buffer, buflen);
}
@ -85,7 +85,7 @@ void SMBSlave::special( const TQByteArray & data)
// using smbmount instead of "mount -t smbfs", because mount does not allow a non-root
// user to do a mount, but a suid smbmnt does allow this
KProcess proc;
TDEProcess proc;
proc.setUseShell(true); // to have the path to smbmnt (which is used by smbmount); see man smbmount
proc << "smbmount";
@ -98,28 +98,28 @@ void SMBSlave::special( const TQByteArray & data)
}
else
{
options = "-o username=" + KProcess::quote(smburl.user());
options = "-o username=" + TDEProcess::quote(smburl.user());
user = smburl.user();
if ( ! smburl.pass().isEmpty() )
options += ",password=" + KProcess::quote(smburl.pass());
options += ",password=" + TDEProcess::quote(smburl.pass());
}
// TODO: check why the control center uses encodings with a blank char, e.g. "cp 1250"
//if ( ! m_default_encoding.isEmpty() )
//options += ",codepage=" + KProcess::quote(m_default_encoding);
//options += ",codepage=" + TDEProcess::quote(m_default_encoding);
proc << KProcess::quote(remotePath.local8Bit());
proc << KProcess::quote(mountPoint.local8Bit());
proc << TDEProcess::quote(remotePath.local8Bit());
proc << TDEProcess::quote(mountPoint.local8Bit());
proc << options;
connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
TQT_SLOT(readOutput(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
TQT_SLOT(readOutput(TDEProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
TQT_SLOT(readStdErr(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
if (!proc.start( KProcess::Block, KProcess::AllOutput ))
if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput ))
{
error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
"smbmount"+i18n("\nMake sure that the samba package is installed properly on your system."));
@ -146,21 +146,21 @@ void SMBSlave::special( const TQByteArray & data)
TQString mountPoint;
stream >> mountPoint;
KProcess proc;
TDEProcess proc;
proc.setUseShell(true);
proc << "smbumount";
proc << KProcess::quote(mountPoint);
proc << TDEProcess::quote(mountPoint);
mybuf.truncate(0);
mystderr.truncate(0);
connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )),
TQT_SLOT(readOutput(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
TQT_SLOT(readOutput(TDEProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )),
TQT_SLOT(readStdErr(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
if ( !proc.start( KProcess::Block, KProcess::AllOutput ) )
if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) )
{
error(KIO::ERR_CANNOT_LAUNCH_PROCESS,
"smbumount"+i18n("\nMake sure that the samba package is installed properly on your system."));

4
kioslave/system/kdedmodule/systemdirnotify.cpp
Unescape View File

@ -41,11 +41,11 @@ void SystemDirNotify::init()
printf("[systemdirnotify] SystemDirNotify::init(mInited)");
return;
mInited = true;
KGlobal::dirs()->addResourceType("system_entries",
TDEGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
TQStringList names_found;
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();

2
kioslave/system/kdedmodule/systemdirnotifymodule.cpp
Unescape View File

@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
extern "C" {
KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
{
KGlobal::locale()->insertCatalogue("kio_system");
TDEGlobal::locale()->insertCatalogue("kio_system");
return new SystemDirNotifyModule(obj);
}
}

8
kioslave/system/systemimpl.cpp
Unescape View File

@ -33,7 +33,7 @@
SystemImpl::SystemImpl() : TQObject()
{
KGlobal::dirs()->addResourceType("system_entries",
TDEGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview");
}
@ -42,7 +42,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list)
kdDebug() << "SystemImpl::listRoot" << endl;
TQStringList names_found;
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@ -114,7 +114,7 @@ bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry)
{
kdDebug() << "SystemImpl::statByName" << endl;
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();
@ -147,7 +147,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const
{
kdDebug() << "SystemImpl::findBaseURL" << endl;
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries");
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end();

2
kioslave/thumbnail/exrcreator.cpp
Unescape View File

@ -62,7 +62,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img)
// EXR images just to turn it into an icon, so we go back
// to honouring it in here.
kdDebug() << "EXRcreator - using original image" << endl;
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
KConfigGroupSaver cgs( config, "PreviewSettings" );
unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
unsigned long long fileSize = TQFile( path ).size();

6
kioslave/thumbnail/thumbnail.cpp
Unescape View File

@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url)
#endif
if (!iconSize)
iconSize = KGlobal::iconLoader()->currentSize(KIcon::Desktop);
iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (iconSize != m_iconSize)
m_iconDict.clear();
m_iconSize = iconSize;
@ -206,7 +206,7 @@ void ThumbnailProtocol::get(const KURL &url)
TQImage img;
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
// ### KFMI
@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url)
}
#endif
if ((flags & ThumbCreator::BlendIcon) && KGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
{
// blending the mimetype icon in
TQImage icon = getIcon();

2
kioslave/trash/kfile-plugin/kfile_trash.cpp
Unescape View File

@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
const TQStringList &args) : KFilePlugin(parent, name, args)
{
KGlobal::locale()->insertCatalogue( "kio_trash" );
TDEGlobal::locale()->insertCatalogue( "kio_trash" );
kdDebug(7034) << "Trash file meta info plugin\n";

4
kioslave/trash/testtrash.cpp
Unescape View File

@ -135,7 +135,7 @@ static void removeDir( const TQString& trashDir, const TQString& dirName )
void TestTrash::setup()
{
m_trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
m_trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash";
kdDebug() << "setup: using trash directory " << m_trashDir << endl;
// Look for another writable partition than $HOME (not mandatory)
@ -380,7 +380,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
infoFile.setGroup( "Trash Info" );
const TQString origPath = infoFile.readEntry( "Path" );
assert( !origPath.isEmpty() );
assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) );
assert( origPath == KURL::encode_string( origFilePath, TDEGlobal::locale()->fileEncodingMib() ) );
const TQString date = infoFile.readEntry( "DeletionDate" );
assert( !date.isEmpty() );
assert( date.contains( "T" ) );

6
kioslave/trash/trashimpl.cpp
Unescape View File

@ -56,7 +56,7 @@ TrashImpl::TrashImpl() :
m_lastId( 0 ),
m_homeDevice( 0 ),
m_trashDirectoriesScanned( false ),
m_mibEnum( KGlobal::locale()->fileEncodingMib() ),
m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
// not using kio_trashrc since KIO uses that one already for kio_trash
// so better have a separate one, for faster parsing by e.g. kmimetype.cpp
m_config( "trashrc" )
@ -132,7 +132,7 @@ bool TrashImpl::init()
// see also kdesktop/init.cc for first time initialization
m_initStatus = InitError;
// $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
const TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir();
const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
kdWarning() << "failed to create " << xdgDataDir << endl;
return false;
@ -161,7 +161,7 @@ bool TrashImpl::init()
void TrashImpl::migrateOldTrash()
{
kdDebug() << k_funcinfo << endl;
const TQString oldTrashDir = KGlobalSettings::trashPath();
const TQString oldTrashDir = TDEGlobalSettings::trashPath();
const TQStrList entries = listDir( oldTrashDir );
bool allOK = true;
TQStrListIterator entryIt( entries );

2
klipper/applet.cpp
Unescape View File

@ -34,7 +34,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("klipper");
TDEGlobal::locale()->insertCatalogue("klipper");
int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help;
return new KlipperApplet(configFile, KPanelApplet::Normal, actions, parent, "klipper");
}

2
klipper/configdialog.cpp
Unescape View File

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

4
klipper/configdialog.h
Unescape View File

@ -35,7 +35,7 @@
#include "urlgrabber.h"
class KGlobalAccel;
class TDEGlobalAccel;
class KKeyChooser;
class KListView;
class TQPushButton;
@ -137,7 +137,7 @@ class ConfigDialog : public KDialogBase
Q_OBJECT
public:
ConfigDialog( const ActionList *list, KGlobalAccel *accel, bool isApplet );
ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet );
~ConfigDialog();
ActionList * actionList() const { return actionWidget->actionList(); }

4
klipper/klipperpopup.cpp
Unescape View File

@ -107,7 +107,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
{
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
TQRect g = i.geometry();
TQRect screen = KGlobalSettings::desktopGeometry(g.center());
TQRect screen = TDEGlobalSettings::desktopGeometry(g.center());
int menu_height = ( screen.height() ) * 3/4;
int menu_width = ( screen.width() ) * 1/3;
@ -167,7 +167,7 @@ void KlipperPopup::buildFromScratch() {
action->plug( this, -1 );
}
if ( KGlobalSettings::insertTearOffHandle() ) {
if ( TDEGlobalSettings::insertTearOffHandle() ) {
insertTearOffHandle();
}

12
klipper/toplevel.cpp
Unescape View File

@ -206,8 +206,8 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
m_iconOrigHeight = height();
adjustSize();
globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
KGlobalAccel* keys = globalKeys;
globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
TDEGlobalAccel* keys = globalKeys;
#include "klipperbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02
globalKeys->readSettings();
@ -337,7 +337,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
} else {
KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry );
TQRect g = i.geometry();
TQRect screen = KGlobalSettings::desktopGeometry(g.center());
TQRect screen = TDEGlobalSettings::desktopGeometry(g.center());
if ( g.x()-screen.x() > screen.width()/2 &&
g.y()-screen.y() + size.height() > screen.height() )
@ -606,7 +606,7 @@ void KlipperWidget::slotQuit()
saveSession();
int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Klipper start automatically\nwhen you login?"), i18n("Automatically Start Klipper?"), i18n("Start"), i18n("Do Not Start") );
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("General");
if ( autoStart == KMessageBox::Yes ) {
config->writeEntry("AutoStart", true);
@ -1176,8 +1176,8 @@ static void ensureGlobalSyncOff(KConfig* config) {
true,
true );
config->sync();
KClipboardSynchronizer::setSynchronizing( false );
KClipboardSynchronizer::setReverseSynchronizing( false );
TDEClipboardSynchronizer::setSynchronizing( false );
TDEClipboardSynchronizer::setReverseSynchronizing( false );
KIPC::sendMessageAll( KIPC::ClipboardConfigChanged, 0 );
}

2
klipper/toplevel.h
Unescape View File

@ -59,7 +59,7 @@ public:
~KlipperWidget();
virtual void adjustSize();
KGlobalAccel *globalKeys;
TDEGlobalAccel *globalKeys;
/**
* Get clipboard history (the "document")

4
klipper/urlgrabber.cpp
Unescape View File

@ -251,14 +251,14 @@ void URLGrabber::execute( const struct ClipCommand *command,
if ( cmdLine.isEmpty() )
return;
KProcess proc;
TDEProcess proc;
const char *shell = getenv("KLIPPER_SHELL");
if (shell==NULL) shell = getenv("SHELL");
proc.setUseShell(true,shell);
proc << cmdLine.stripWhiteSpace();
if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication ))
if ( !proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication ))
tqWarning("Klipper: Couldn't start process!");
}
}

2
kmenuedit/basictab.cpp
Unescape View File

@ -460,7 +460,7 @@ void BasicTab::slotExecSelected()
{
TQString path = _execEdit->lineEdit()->text();
if (!path.startsWith("'"))
_execEdit->lineEdit()->setText(KProcess::quote(path));
_execEdit->lineEdit()->setText(TDEProcess::quote(path));
}
void BasicTab::slotCapturedShortcut(const KShortcut& cut)

4
kmenuedit/kmenuedit.cpp
Unescape View File

@ -53,7 +53,7 @@ KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name)
KMenuEdit::~KMenuEdit()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("General");
config->writeEntry("SplitterSizes", m_splitter->sizes());
@ -101,7 +101,7 @@ void KMenuEdit::setupView()
m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &)));
// restore splitter sizes
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQValueList<int> sizes = config->readIntListEntry("SplitterSizes");
if (sizes.isEmpty())

2
kmenuedit/menufile.cpp
Unescape View File

@ -194,7 +194,7 @@ static TQString entryToDirId(const TQString &path)
{
// XDG Desktop menu items come with absolute paths, we need to
// extract their relative path and then build a local path.
local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", path);
local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", path);
}
if (local.isEmpty() || local.startsWith("/"))

8
kmenuedit/treeview.cpp
Unescape View File

@ -134,7 +134,7 @@ void TreeItem::setup()
static TQPixmap appIcon(const TQString &iconName)
{
TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
{
@ -329,7 +329,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted)
TQString res = df->resource();
bool isLocal = true;
TQStringList files = KGlobal::dirs()->findAllResources(res.latin1(), file);
TQStringList files = TDEGlobal::dirs()->findAllResources(res.latin1(), file);
for(TQStringList::ConstIterator it = files.begin();
it != files.end();
++it)
@ -598,7 +598,7 @@ TQStringList TreeView::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);
@ -637,7 +637,7 @@ TQStringList TreeView::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);

4
knetattach/knetattach.ui.h
Unescape View File

@ -169,10 +169,10 @@ void KNetAttach::finished()
TQString name = _connectionName->text().stripWhiteSpace();
if (_createIcon->isChecked()) {
KGlobal::dirs()->addResourceType("remote_entries",
TDEGlobal::dirs()->addResourceType("remote_entries",
KStandardDirs::kde_default("data") + "remoteview");
TQString path = KGlobal::dirs()->saveLocation("remote_entries");
TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
path += name + ".desktop";
KSimpleConfig desktopFile(path, false);
desktopFile.setGroup("Desktop Entry");

2
konqueror/ChangeLog
Unescape View File

@ -55,7 +55,7 @@
setHighlightingEnabled in the KonqDirPart constructor
* konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and
KGlobal::config()->sync() after toggling the visiblity of the menubar,
TDEGlobal::config()->sync() after toggling the visiblity of the menubar,
just like it is done for toolbars.
(slotPartActivated): connect and disconnect to/from the actionStatusText
and clearStatusText signals of the part's actioncollection

2
konqueror/KonquerorIface.cc
Unescape View File

@ -182,7 +182,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
void KonquerorIface::reparseConfiguration()
{
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
KonqFMSettings::reparseConfiguration();
TQPtrList<KonqMainWindow> *mainWindows = KonqMainWindow::mainWindowList();

10
konqueror/about/konq_aboutpage.cc
Unescape View File

@ -98,7 +98,7 @@ TQString KonqAboutPageFactory::launch()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
KIconLoader *iconloader = TDEGlobal::iconLoader();
int iconSize = iconloader->currentSize(KIcon::Desktop);
TQString home_icon_path = iconloader->iconPath("kfm_home", KIcon::Desktop );
TQString storage_icon_path = iconloader->iconPath("system", KIcon::Desktop );
@ -190,7 +190,7 @@ TQString KonqAboutPageFactory::intro()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
KIconLoader *iconloader = TDEGlobal::iconLoader();
TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", KIcon::Small ):iconloader->iconPath("back", KIcon::Small );
TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
@ -244,7 +244,7 @@ TQString KonqAboutPageFactory::specs()
if ( s_specs_html )
return *s_specs_html;
KIconLoader *iconloader = KGlobal::iconLoader();
KIconLoader *iconloader = TDEGlobal::iconLoader();
TQString res = loadFile( locate( "data", "konqueror/about/specs.html" ));
TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
if ( res.isEmpty() )
@ -330,7 +330,7 @@ TQString KonqAboutPageFactory::tips()
if ( res.isEmpty() )
return res;
KIconLoader *iconloader = KGlobal::iconLoader();
KIconLoader *iconloader = TDEGlobal::iconLoader();
TQString viewmag_icon_path =
iconloader->iconPath("viewmag", KIcon::Small );
TQString history_icon_path =
@ -432,7 +432,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow *
: KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI )
{
//m_mainWindow = mainWindow;
TQTextCodec* codec = KGlobal::locale()->codecForEncoding();
TQTextCodec* codec = TDEGlobal::locale()->codecForEncoding();
if (codec)
setCharset(codec->name(), true);
else

12
konqueror/client/kfmclient.cc
Unescape View File

@ -308,9 +308,9 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{
if ( tempFile )
kdWarning() << "kfmclient used with --tempfile but is passing to an external browser! Tempfile will never be deleted" << endl;
KProcess proc;
TDEProcess proc;
proc << strBrowser << url.url();
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
return true;
}
@ -370,16 +370,16 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
KStartupInfoId id;
id.initId( startup_id_str );
id.setupStartupEnv();
KProcess proc;
TDEProcess proc;
proc << "kshell" << "konqueror";
if ( !mimetype.isEmpty() )
proc << "-mimetype" << mimetype;
if ( tempFile )
proc << "-tempfile";
proc << url.url();
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
KStartupInfo::resetStartupEnv();
kdDebug( 1202 ) << "clientApp::createNewWindow KProcess started" << endl;
kdDebug( 1202 ) << "clientApp::createNewWindow TDEProcess started" << endl;
//}
}
return true;
@ -422,7 +422,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url,
void clientApp::delayedQuit()
{
// Quit in 2 seconds. This leaves time for KRun to pop up
// "app not found" in KProcessRunner, if that was the case.
// "app not found" in TDEProcessRunner, if that was the case.
TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) );
// don't access the KRun instance later, it will be deleted after calling slots
if( static_cast< const KRun* >( sender())->hasError())

2
konqueror/iconview/konq_iconview.cc
Unescape View File

@ -1059,7 +1059,7 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
{
KFileItem* fileItem = item->item();
if ( KGlobalSettings::showFilePreview( fileItem->url() ) ) {
if ( TDEGlobalSettings::showFilePreview( fileItem->url() ) ) {
m_paOutstandingOverlays.append(item);
if (m_paOutstandingOverlays.count() == 1)
{

10
konqueror/keditbookmarks/toplevel.cpp
Unescape View File

@ -185,8 +185,8 @@ TQString CurrentMgr::makeTimeStr(int b)
TQDateTime dt;
dt.setTime_t(b);
return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false);
? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: TDEGlobal::locale()->formatDateTime(dt, false);
}
/* -------------------------- */
@ -252,7 +252,7 @@ KEBApp::KEBApp(
ListView::self()->connectSignals();
KGlobal::locale()->insertCatalogue("libkonq");
TDEGlobal::locale()->insertCatalogue("libkonq");
m_canPaste = false;
@ -337,7 +337,7 @@ void KEBApp::notifyCommandExecuted() {
/* -------------------------- */
void KEBApp::slotConfigureToolbars() {
saveMainWindowSettings(KGlobal::config(), "MainWindow");
saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
TQT_SLOT( slotNewToolbarConfig() ));
@ -347,7 +347,7 @@ void KEBApp::slotConfigureToolbars() {
void KEBApp::slotNewToolbarConfig() {
// called when OK or Apply is clicked
createGUI();
applyMainWindowSettings(KGlobal::config(), "MainWindow");
applyMainWindowSettings(TDEGlobal::config(), "MainWindow");
}
/* -------------------------- */

4
konqueror/konq_combo.cc
Unescape View File

@ -568,7 +568,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
if ( e->state() & Qt::LeftButton &&
(e->pos() - m_dragStart).manhattanLength() >
KGlobalSettings::dndEventDelay() )
TDEGlobalSettings::dndEventDelay() )
{
KURL url = KURL::fromPathOrURL( currentText() );
if ( url.isValid() )
@ -733,7 +733,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight,
Qt::AlignLeft | Qt::AlignTop, squeezedText );
//painter->setPen( KGlobalSettings::inactiveTextColor() );
//painter->setPen( TDEGlobalSettings::inactiveTextColor() );
squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
TQFont font = painter->font();
font.setItalic( true );

4
konqueror/konq_extensionmanager.cc
Unescape View File

@ -61,7 +61,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
// There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins)
// have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab.
d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", KGlobal::config());
d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config());
if ( activePart ) {
TDEInstance* instance = activePart->instance();
d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config());
@ -100,7 +100,7 @@ void KonqExtensionManager::apply()
setChanged(false);
if( d->mainWindow )
{
KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, KGlobal::instance());
KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance());
TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;

2
konqueror/konq_frame.cc
Unescape View File

@ -497,7 +497,7 @@ KonqFrameContainer::KonqFrameContainer( Orientation o,
m_pFirstChild = 0L;
m_pSecondChild = 0L;
m_pActiveChild = 0L;
setOpaqueResize( KGlobalSettings::opaqueResize() );
setOpaqueResize( TDEGlobalSettings::opaqueResize() );
}
KonqFrameContainer::~KonqFrameContainer()

4
konqueror/konq_main.cc
Unescape View File

@ -62,7 +62,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
KonquerorIface *kiface = new KonquerorIface;
app.dcopClient()->setDefaultObject( kiface->objId() );
KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
TDEGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq
KImageIO::registerFormats();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@ -87,7 +87,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
if (args->isSet("profiles"))
{
TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
profiles.sort();
for(TQStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)

62
konqueror/konq_mainwindow.cc
Unescape View File

@ -202,7 +202,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
// setup the completion object before createGUI(), so that the combo
// picks up the correct mode from the HistoryManager (in slotComboPlugged)
int mode = KonqSettings::settingsCompletionMode();
s_pCompletion->setCompletionMode( (KGlobalSettings::Completion) mode );
s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode );
}
connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory()));
@ -218,7 +218,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
initCombo();
initActions();
setInstance( KGlobal::instance() );
setInstance( TDEGlobal::instance() );
connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
this, TQT_SLOT( slotDatabaseChanged() ) );
@ -1455,7 +1455,7 @@ void KonqMainWindow::slotOpenTerminal()
}
}
KProcess cmd;
TDEProcess cmd;
cmd.setWorkingDirectory(dir);
// Compensate for terminal having arguments.
@ -1465,7 +1465,7 @@ void KonqMainWindow::slotOpenTerminal()
kdDebug(1202) << "slotOpenTerminal: directory " << dir
<< ", terminal:" << term << endl;
cmd.start(KProcess::DontCare);
cmd.start(TDEProcess::DontCare);
}
void KonqMainWindow::slotOpenLocation()
@ -1945,7 +1945,7 @@ void KonqMainWindow::slotGoTrash()
void KonqMainWindow::slotGoAutostart()
{
KURL u;
u.setPath( KGlobalSettings::autostartPath() );
u.setPath( TDEGlobalSettings::autostartPath() );
openURL( 0L, u );
}
@ -2022,7 +2022,7 @@ void KonqMainWindow::slotConfigureSpellChecking()
void KonqMainWindow::slotConfigureToolbars()
{
if ( autoSaveSettings() )
saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
KEditToolbar dlg(factory());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar()));
@ -2038,7 +2038,7 @@ void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply i
plugViewModeActions();
applyMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
}
void KonqMainWindow::slotUndoAvailable( bool avail )
@ -2728,7 +2728,7 @@ void KonqMainWindow::slotPopupThisWindow()
void KonqMainWindow::slotPopupNewTabAtFront()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
popupNewTab(true, openAfterCurrentPage);
@ -3281,8 +3281,8 @@ void KonqMainWindow::initCombo()
// We do want completion of user names, right?
//m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!!
connect( m_combo, TQT_SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion )));
connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
connect( m_combo, TQT_SIGNAL( completion( const TQString& )),
TQT_SLOT( slotMakeCompletion( const TQString& )));
connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )),
@ -3312,7 +3312,7 @@ void KonqMainWindow::bookmarksIntoCompletion()
}
// the user changed the completion mode in the combo
void KonqMainWindow::slotCompletionModeChanged( KGlobalSettings::Completion m )
void KonqMainWindow::slotCompletionModeChanged( TDEGlobalSettings::Completion m )
{
s_pCompletion->setCompletionMode( m );
@ -3350,8 +3350,8 @@ void KonqMainWindow::slotMakeCompletion( const TQString& text )
completion = s_pCompletion->makeCompletion( text );
// some special handling necessary for CompletionPopup
if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup ||
m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto )
if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup ||
m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto )
m_combo->setCompletedItems( historyPopupCompletionItems( text ) );
else if ( !completion.isNull() )
@ -3414,8 +3414,8 @@ void KonqMainWindow::slotMatch( const TQString &match )
m_urlCompletionStarted = false;
// some special handling necessary for CompletionPopup
if ( m_combo->completionMode() == KGlobalSettings::CompletionPopup ||
m_combo->completionMode() == KGlobalSettings::CompletionPopupAuto ) {
if ( m_combo->completionMode() == TDEGlobalSettings::CompletionPopup ||
m_combo->completionMode() == TDEGlobalSettings::CompletionPopupAuto ) {
TQStringList items = m_pURLCompletion->allMatches();
items += historyPopupCompletionItems( m_combo->currentText() );
// items.sort(); // should we?
@ -3599,8 +3599,8 @@ void KonqMainWindow::slotForceSaveMainWindowSettings()
// kdDebug(1202)<<"slotForceSaveMainWindowSettings()"<<endl;
if ( autoSaveSettings() ) // don't do it on e.g. JS window.open windows with no toolbars!
{
saveMainWindowSettings( KGlobal::config(), "KonqMainWindow" );
KGlobal::config()->sync();
saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
TDEGlobal::config()->sync();
}
}
@ -5107,7 +5107,7 @@ void KonqMainWindow::updateViewModeActions()
// Another temporary map, the preferred service for each library (2 entries in our example)
TQMap<TQString,TQString> preferredServiceMap;
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
KTrader::OfferList::ConstIterator it = services.begin();
@ -5243,7 +5243,7 @@ void KonqMainWindow::saveToolBarServicesMap()
{
TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
for ( ; serviceIt != serviceEnd ; ++serviceIt )
config->writeEntry( serviceIt.key(), serviceIt.data()->desktopEntryName() );
@ -5295,7 +5295,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(viewManager()->docContainer());
if ( tabContainer->count() > 1 )
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) )
@ -5481,8 +5481,8 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name)
void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
{
static const TQString& http = KGlobal::staticQString( "http" );
static const TQString& ftp = KGlobal::staticQString( "ftp" );
static const TQString& http = TDEGlobal::staticQString( "http" );
static const TQString& ftp = TDEGlobal::staticQString( "ftp" );
if ( group.isNull() )
return;
@ -5990,23 +5990,23 @@ static int current_memory_usage( int* limit )
void KonqMainWindow::saveWindowSize() const
{
TQString savedGroup = KGlobal::config()->group();
KGlobal::config()->setGroup( "KonqMainWindow_Size" );
TQString savedGroup = TDEGlobal::config()->group();
TDEGlobal::config()->setGroup( "KonqMainWindow_Size" );
KParts::MainWindow::saveWindowSize( KGlobal::config() );
KParts::MainWindow::saveWindowSize( TDEGlobal::config() );
KGlobal::config()->setGroup( savedGroup );
KGlobal::config()->sync();
TDEGlobal::config()->setGroup( savedGroup );
TDEGlobal::config()->sync();
}
void KonqMainWindow::restoreWindowSize()
{
TQString savedGroup = KGlobal::config()->group();
KGlobal::config()->setGroup( "KonqMainWindow_Size" );
TQString savedGroup = TDEGlobal::config()->group();
TDEGlobal::config()->setGroup( "KonqMainWindow_Size" );
KParts::MainWindow::restoreWindowSize( KGlobal::config() );
KParts::MainWindow::restoreWindowSize( TDEGlobal::config() );
KGlobal::config()->setGroup( savedGroup );
TDEGlobal::config()->setGroup( savedGroup );
}

2
konqueror/konq_mainwindow.h
Unescape View File

@ -491,7 +491,7 @@ protected slots:
void slotForwardActivated( int id );
void slotGoHistoryDelayed();
void slotCompletionModeChanged( KGlobalSettings::Completion );
void slotCompletionModeChanged( TDEGlobalSettings::Completion );
void slotMakeCompletion( const TQString& );
void slotSubstringcompletion( const TQString& );
void slotRotation( KCompletionBase::KeyBindingType );

2
konqueror/konq_profiledlg.cc
Unescape View File

@ -42,7 +42,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
{
KonqProfileMap mapProfiles;
TQStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
TQStringList profiles = TDEGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
TQStringList::ConstIterator pIt = profiles.begin();
TQStringList::ConstIterator pEnd = profiles.end();
for (; pIt != pEnd; ++pIt )

2
konqueror/konq_tabs.cc
Unescape View File

@ -321,7 +321,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
{
setTabColor( newPage, KGlobalSettings::textColor() );
setTabColor( newPage, TDEGlobalSettings::textColor() );
KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage);
if (currentFrame && !m_pViewManager->isLoadingProfile()) {

4
konqueror/konq_view.cc
Unescape View File

@ -1342,9 +1342,9 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
void KonqView::setActiveInstance()
{
if ( m_bBuiltinView || !m_pPart->instance() /*never!*/)
KGlobal::_activeInstance = KGlobal::instance();
TDEGlobal::_activeInstance = TDEGlobal::instance();
else
KGlobal::_activeInstance = m_pPart->instance();
TDEGlobal::_activeInstance = m_pPart->instance();
}
bool KonqView::prepareReload( KParts::URLArgs& args )

2
konqueror/konq_view.h
Unescape View File

@ -309,7 +309,7 @@ public:
void goHistory( int steps );
// Set the KGlobal active instance (the one used by KBugReport)
// Set the TDEGlobal active instance (the one used by KBugReport)
void setActiveInstance();
// Called before reloading this view. Sets args.reload to true, and offers to repost form data.

16
konqueror/konq_viewmgr.cc
Unescape View File

@ -1078,7 +1078,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString
{
TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) +
fileName, KGlobal::instance() );
fileName, TDEGlobal::instance() );
if ( TQFile::exists( path ) )
TQFile::remove( path );
@ -1299,7 +1299,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
if( resetWindow )
{ // force default settings for the GUI
m_pMainWindow->applyMainWindowSettings( KGlobal::config(), "KonqMainWindow", true );
m_pMainWindow->applyMainWindowSettings( TDEGlobal::config(), "KonqMainWindow", true );
}
// Apply menu/toolbar settings saved in profile. Read from a separate group
@ -1411,7 +1411,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
int width = -1;
int height = -1;
TQRect geom = KGlobalSettings::desktopGeometry(widget);
TQRect geom = TDEGlobalSettings::desktopGeometry(widget);
if ( widthStr.contains( '%' ) == 1 )
{
@ -1755,15 +1755,15 @@ void KonqViewManager::setLoading( KonqView *view, bool loading )
TQColor color;
KonqFrameTabs* konqframetabs = static_cast<KonqFrameTabs*>( parentContainer );
if ( loading )
color = TQColor( (KGlobalSettings::linkColor().red() + KGlobalSettings::inactiveTextColor().red())/2,
(KGlobalSettings::linkColor().green()+ KGlobalSettings::inactiveTextColor().green())/2,
(KGlobalSettings::linkColor().blue() + KGlobalSettings::inactiveTextColor().blue())/2 );
color = TQColor( (TDEGlobalSettings::linkColor().red() + TDEGlobalSettings::inactiveTextColor().red())/2,
(TDEGlobalSettings::linkColor().green()+ TDEGlobalSettings::inactiveTextColor().green())/2,
(TDEGlobalSettings::linkColor().blue() + TDEGlobalSettings::inactiveTextColor().blue())/2 );
else
{
if ( konqframetabs->currentPage() != view->frame() )
color = KGlobalSettings::linkColor();
color = TDEGlobalSettings::linkColor();
else
color = KGlobalSettings::textColor();
color = TDEGlobalSettings::textColor();
}
konqframetabs->setTabColor( view->frame(), color );
}

4
konqueror/konqueror.kcfg
Unescape View File

@ -53,7 +53,7 @@
</entry>
<!-- fontopts.cpp -->
<entry key="StandardFont" type="Font"> <!--LIBKONQ-->
<default code="true">KGlobalSettings::generalFont()</default>
<default code="true">TDEGlobalSettings::generalFont()</default>
<label>Standard font</label>
<whatsthis>This is the font used to display text in Konqueror windows.</whatsthis>
<!-- checked -->
@ -580,7 +580,7 @@ PATH_JAVA
<!-- checked -->
</entry>
<entry name="SettingsCompletionMode" key="CompletionMode" type="Enum">
<default code="true">KGlobalSettings::completionMode()</default>
<default code="true">TDEGlobalSettings::completionMode()</default>
<label></label>
<whatsthis></whatsthis>
</entry>

6
konqueror/listview/konq_infolistviewitem.cc
Unescape View File

@ -87,7 +87,7 @@ void KonqInfoListViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
break;
@ -103,7 +103,7 @@ void KonqInfoListViewItem::updateContents()
if ( _time != 0 )
{
dt.setTime_t( _time );
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
}
}
break;
@ -202,7 +202,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = static_cast<KonqBaseListViewWidget *>(listView())->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}

2
konqueror/listview/konq_listview.cc
Unescape View File

@ -124,7 +124,7 @@ void ListViewBrowserExtension::updateActions()
{
canCopy++;
KURL url = item->url();
if ( url.directory(false) == KGlobalSettings::trashPath() )
if ( url.directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
if ( KProtocolInfo::supportsDeleting( url ) )
canDel++;

10
konqueror/listview/konq_listviewitems.cc
Unescape View File

@ -119,7 +119,7 @@ void KonqListViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
break;
@ -135,7 +135,7 @@ void KonqListViewItem::updateContents()
if ( _time != 0 )
{
dt.setTime_t( _time );
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
}
}
break;
@ -146,7 +146,7 @@ void KonqListViewItem::updateContents()
{
TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
setText(tmpColumn->displayInColumn,
KGlobal::locale()->formatDateTime(dt));
TDEGlobal::locale()->formatDateTime(dt));
}
else // if ( tmpColumn->type == TQVariant::String )
setText(tmpColumn->displayInColumn, entryStr);
@ -164,7 +164,7 @@ void KonqListViewItem::setDisabled( bool disabled )
{
KonqBaseListViewItem::setDisabled( disabled );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}
@ -176,7 +176,7 @@ void KonqListViewItem::setActive( bool active )
//#### Optimize away repaint if possible, like the iconview does?
KonqBaseListViewItem::setActive( active );
int iconSize = m_pListViewWidget->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
}

12
konqueror/listview/konq_listviewwidget.cc
Unescape View File

@ -276,7 +276,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
TQString str;
if ( tmpColumn->udsId == KIO::UDS_SIZE )
str = KGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
else if ( tmpColumn->udsId == KIO::UDS_ACCESS )
str = "--Permissions--";
else if ( tmpColumn->udsId == KIO::UDS_USER )
@ -296,7 +296,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
(tmpColumn->type & TQVariant::DateTime)) )
{
TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
str = KGlobal::locale()->formatDateTime( dt ) + "--";
str = TDEGlobal::locale()->formatDateTime( dt ) + "--";
}
else
str = "it_is_the_default_width";
@ -492,7 +492,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
vp.setY( itemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
m_fileTip->setPreview( TDEGlobalSettings::showFilePreview( item->item()->url() ) );
setShowToolTips( !m_pSettings->showFileTips() );
}
else
@ -839,7 +839,7 @@ void KonqBaseListViewWidget::startDrag()
if (( urls.count() > 1 ) || (pixmap0Invalid))
{
int iconSize = m_pBrowserView->m_pProps->iconSize();
iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
pixmap2 = DesktopIcon( "kmultiple", iconSize );
if ( pixmap2.isNull() )
kdWarning(1202) << "Could not find multiple pixmap" << endl;
@ -977,7 +977,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
KURL url = fileItem->url();
url.cleanPath();
bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath());
bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(TDEGlobalSettings::trashPath());
if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) )
{
m_pBrowserView->lmbClicked( fileItem );
@ -1010,7 +1010,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
// call the icon effect if enabled
if (KGlobalSettings::showKonqIconActivationEffect() == true) {
if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, pix);
}

4
konqueror/listview/konq_textviewitem.cc
Unescape View File

@ -171,7 +171,7 @@ void KonqTextViewItem::updateContents()
break;
case KIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatNumber(size, 0)+" ");
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" ");
else
setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
break;
@ -187,7 +187,7 @@ void KonqTextViewItem::updateContents()
{
TQDateTime dt;
dt.setTime_t((time_t) (*it).m_long);
setText(tmpColumn->displayInColumn,KGlobal::locale()->formatDateTime(dt));
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatDateTime(dt));
break;
};

4
konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
Unescape View File

@ -77,7 +77,7 @@ KRemoteEncodingPlugin::loadSettings()
{
m_loaded = true;
m_encodingDescriptions = KGlobal::charsets()->descriptiveEncodingNames();
m_encodingDescriptions = TDEGlobal::charsets()->descriptiveEncodingNames();
fillMenu();
}
@ -172,7 +172,7 @@ KRemoteEncodingPlugin::slotItemSelected(int id)
if (!m_menu->popupMenu()->isItemChecked(id))
{
TQString charset = KGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
TQString charset = TDEGlobal::charsets()->encodingForName(m_encodingDescriptions[id - 1]);
config.setGroup(host);
config.writeEntry(DATA_KEY, charset);

2
konqueror/shellcmdplugin/kshellcmdexecutor.cpp
Unescape View File

@ -39,7 +39,7 @@ KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget*
,m_writeNotifier(0)
{
setTextFormat(PlainText);
setFont( KGlobalSettings::fixedFont() );
setFont( TDEGlobalSettings::fixedFont() );
}
KShellCommandExecutor::~KShellCommandExecutor()

4
konqueror/shellcmdplugin/kshellcmdplugin.cpp
Unescape View File

@ -67,12 +67,12 @@ void KShellCmdPlugin::slotExecuteShellCommand()
bool ok;
TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"),
i18n( "Execute shell command in current directory:" ),
KProcess::quote( path ), &ok, part->widget() );
TDEProcess::quote( path ), &ok, part->widget() );
if ( ok )
{
TQString chDir;
chDir="cd ";
chDir+=KProcess::quote(part->url().path());
chDir+=TDEProcess::quote(part->url().path());
chDir+="; ";
chDir+=cmd;

20
konqueror/sidebar/sidebar_widget.cpp
Unescape View File

@ -67,7 +67,7 @@ void addBackEnd::aboutToShowAddMenu()
{
if (!menu)
return;
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
TQStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
libNames.setAutoDelete(true);
libNames.resize(0);
@ -122,7 +122,7 @@ void addBackEnd::doRollBack()
{
if (KMessageBox::warningContinueCancel(m_parent, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"))==KMessageBox::Continue)
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
TQString loc=dirs->saveLocation("data","konqsidebartng/" + m_currentProfile + "/",true);
TQDir dir(loc);
TQStringList dirEntries = dir.entryList( TQDir::Dirs | TQDir::NoSymLinks );
@ -139,7 +139,7 @@ void addBackEnd::doRollBack()
static TQString findFileName(const TQString* tmpl,bool universal, const TQString &profile) {
TQString myFile, filename;
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
TQString tmp = *tmpl;
if (universal) {
@ -248,7 +248,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
{
m_relPath = "konqsidebartng/" + currentProfile + "/entries/";
}
m_path = KGlobal::dirs()->saveLocation("data", m_relPath, true);
m_path = TDEGlobal::dirs()->saveLocation("data", m_relPath, true);
m_buttons.setAutoDelete(true);
m_hasStoredUrl = false;
m_latestViewed = -1;
@ -331,7 +331,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
// << " [" << name << "]" << endl;
// Look for existing ones with this URL
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
TQString list;
dirs->saveLocation("data", m_relPath, true);
list = locateLocal("data", m_relPath);
@ -370,7 +370,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
void Sidebar_Widget::finishRollBack()
{
m_path = KGlobal::dirs()->saveLocation("data",m_relPath,true);
m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true);
initialCopy();
TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
}
@ -421,9 +421,9 @@ void Sidebar_Widget::initialCopy()
kdDebug()<<"Initial copy"<<endl;
TQStringList dirtree_dirs;
if (m_universalMode)
dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/kicker_entries/");
else
dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/entries/");
dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/entries/");
if (dirtree_dirs.last()==m_path)
return; //oups;
@ -467,9 +467,9 @@ void Sidebar_Widget::initialCopy()
!dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += TDEProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(m_path);
cp += TDEProcess::quote(m_path);
kdDebug() << "SidebarWidget::intialCopy executing " << cp << endl;
::system( TQFile::encodeName(cp) );
}

4
konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
Unescape View File

@ -92,7 +92,7 @@ void KonqSidebarDirTreeItem::setOpen( bool open )
MYMODULE->openSubFolder( this );
else if ( hasStandardIcon() )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
if ( open )
setPixmap( 0, DesktopIcon( "folder_open", size ) );
else
@ -159,7 +159,7 @@ void KonqSidebarDirTreeItem::itemSelected()
{
bool bInTrash = false;
if ( m_fileItem->url().directory(false) == KGlobalSettings::trashPath() )
if ( m_fileItem->url().directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
TQMimeSource *data = TQApplication::clipboard()->data();

8
konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
Unescape View File

@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
if ( !item->isTopLevelItem() &&
static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
TQPixmap pix = DesktopIcon( "folder_open", size );
m_pTree->startAnimation( item, "kde", 6, &pix );
}
@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
{
// We have this directory listed already, just copy the entries as we
// can't use the dirlister, it would invalidate the old entries
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
KonqSidebarTreeItem * parentItem = item;
KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
while(oldItem)
@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
}
kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl;
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
do
{
kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl;
@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
{
int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small );
TQPtrListIterator<KFileItem> kit ( entries );
kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl;

2
konqueror/sidebar/trees/history_module/history_item.cpp
Unescape View File

@ -119,7 +119,7 @@ TQString KonqSidebarHistoryItem::toolTipText() const
// .arg() calls. So to fix this, we first substitute the last items
// and then put in the url.
TQString tip = i18n("<qt><center><b>%4</b></center><hr>Last visited: %1<br>First visited: %2<br>Number of times visited: %3</qt>");
return tip.arg( KGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( KGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
return tip.arg( TDEGlobal::locale()->formatDateTime( m_entry->lastVisited ) ).arg( TDEGlobal::locale()->formatDateTime( m_entry->firstVisited ) ).arg( m_entry->numberOfTimesVisited ).arg( m_entry->url.url() );
}
return m_entry->url.url();

8
konqueror/sidebar/trees/history_module/history_module.cpp
Unescape View File

@ -56,7 +56,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
m_dict.setAutoDelete( true );
m_currentTime = TQDateTime::currentDateTime();
KConfig *kc = KGlobal::config();
KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
@ -111,7 +111,7 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
++it;
}
KConfig *kc = KGlobal::config();
KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry("OpenGroups", openGroups);
kc->sync();
@ -143,7 +143,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
++it;
}
KConfig *kc = KGlobal::config();
KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
TQStringList openGroups = kc->readListEntry("OpenGroups");
TQStringList::Iterator it2 = openGroups.begin();
@ -297,7 +297,7 @@ void KonqSidebarHistoryModule::sortingChanged()
{
m_topLevelItem->sort();
KConfig *kc = KGlobal::config();
KConfig *kc = TDEGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
kc->sync();

2
konqueror/sidebar/trees/history_module/history_module.h
Unescape View File

@ -61,7 +61,7 @@ public:
bool sortsByName() const { return m_sortsByName; }
static TQString groupForURL( const KURL& url ) {
static const TQString& misc = KGlobal::staticQString(i18n("Miscellaneous"));
static const TQString& misc = TDEGlobal::staticQString(i18n("Miscellaneous"));
return url.host().isEmpty() ? misc : url.host();
}

2
konqueror/sidebar/trees/history_module/history_settings.cpp
Unescape View File

@ -46,7 +46,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
TQString oldgroup;
if (global) {
config = KGlobal::config();
config = TDEGlobal::config();
oldgroup= config->group();
}
else

2
konqueror/sidebar/trees/history_module/kcmhistory.cpp
Unescape View File

@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
: KCModule (KCMHistoryFactory::instance(), parent, name)
{
KGlobal::locale()->insertCatalogue("konqueror");
TDEGlobal::locale()->insertCatalogue("konqueror");
m_settings = new KonqSidebarHistorySettings( 0, "history settings" );
m_settings->readSettings( false );

18
konqueror/sidebar/trees/konq_sidebartree.cpp
Unescape View File

@ -87,7 +87,7 @@ void KonqSidebarTree::loadModuleFactories()
{
pluginFactories.clear();
pluginInfo.clear();
KStandardDirs *dirs=KGlobal::dirs();
KStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
@ -168,12 +168,12 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
/* assert( m_part->getInterfaces()->getInstance()->dirs );
TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
// assert( KGlobal::dirs() );
// assert( TDEGlobal::dirs() );
// TQString dirtreeDir = part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" );
if (virt==VIRT_Folder)
{
m_dirtreeDir.dir.setPath(KGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/"));
m_dirtreeDir.dir.setPath(TDEGlobal::dirs()->saveLocation("data","konqsidebartng/virtual_folders/"+path+"/"));
m_dirtreeDir.relDir=path;
}
else
@ -620,10 +620,10 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
if (copyConfig)
{
// We will copy over the configuration for the dirtree, from the global directory
TQStringList dirtree_dirs = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
TQStringList dirtree_dirs = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/");
// TQString dirtree_dir = KGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
// TQString dirtree_dir = TDEGlobal::dirs()->findDirs("data","konqsidebartng/virtual_folders/"+m_dirtreeDir.relDir+"/").last(); // most global
// kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir=" << dirtree_dir << endl;
/*
@ -655,9 +655,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
&& !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += KProcess::quote(dirtree_dir + *eIt);
cp += TDEProcess::quote(dirtree_dir + *eIt);
cp += " ";
cp += KProcess::quote(path);
cp += TDEProcess::quote(path);
kdDebug(1201) << "KonqSidebarTree::scanDir executing " << cp << endl;
::system( TQFile::encodeName(cp) );
}
@ -698,7 +698,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
{
TQString newPath = TQString( path ).append( *eIt ).append( '/' );
if ( newPath == KGlobalSettings::autostartPath() )
if ( newPath == TDEGlobalSettings::autostartPath() )
continue;
loadTopLevelGroup( parent, newPath );
@ -984,7 +984,7 @@ void KonqSidebarTree::slotCreateFolder()
name = name + "-2";
}
KGlobal::dirs()->makeDir(path);
TDEGlobal::dirs()->makeDir(path);
loadTopLevelGroup(m_currentTopLevelItem, path);
}

2
konqueror/sidebar/trees/konqsidebar_tree.cpp
Unescape View File

@ -134,7 +134,7 @@ extern "C"
{
KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
{
KStandardDirs *dirs=KGlobal::dirs();
KStandardDirs *dirs=TDEGlobal::dirs();
TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
TQStringList names;
for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)

4
konqueror/sidebar/web_module/web_module.cpp
Unescape View File

@ -191,10 +191,10 @@ extern "C" {
extern "C" {
KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
Q_UNUSED(param);
KGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
TDEGlobal::dirs()->addResourceType("websidebardata", KStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
KURL url;
url.setProtocol("file");
TQStringList paths = KGlobal::dirs()->resourceDirs("websidebardata");
TQStringList paths = TDEGlobal::dirs()->resourceDirs("websidebardata");
for (TQStringList::Iterator i = paths.begin(); i != paths.end(); ++i) {
if (TQFileInfo(*i + "websidebar.html").exists()) {
url.setPath(*i + "websidebar.html");

12
konsole/konsole/TEPty.cpp
Unescape View File

@ -171,11 +171,11 @@ void TEPty::setWriteable(bool writeable)
TEPty::TEPty()
{
m_bufferFull = false;
connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
this, TQT_SLOT(dataReceived(KProcess *,char *, int)));
connect(this, TQT_SIGNAL(processExited(KProcess *)),
connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
this, TQT_SLOT(dataReceived(TDEProcess *,char *, int)));
connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(donePty()));
connect(this, TQT_SIGNAL(wroteStdin(KProcess *)),
connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)),
this, TQT_SLOT(writeReady()));
setUsePty(All, false); // utmp will be overridden later
@ -237,7 +237,7 @@ void TEPty::send_bytes(const char* s, int len)
}
/*! indicates that a block of data is received */
void TEPty::dataReceived(KProcess *,char *buf, int len)
void TEPty::dataReceived(TDEProcess *,char *buf, int len)
{
emit block_in(buf,len);
}
@ -252,7 +252,7 @@ void TEPty::lockPty(bool lock)
int TEPty::commSetupDoneC ()
{
int ok = KProcess::commSetupDoneC ();
int ok = TDEProcess::commSetupDoneC ();
if ( ok ) {
emit forkedChild();
}

6
konsole/konsole/TEPty.h
Unescape View File

@ -29,7 +29,7 @@
#include <tqvaluelist.h>
#include <tqmemarray.h>
class TEPty: public KProcess
class TEPty: public TDEProcess
{
Q_OBJECT
@ -94,12 +94,12 @@ Q_OBJECT
void send_string(const char* s);
bool buffer_full() { return m_bufferFull; }
// override from KProcess to allow the client of konsolePart
// override from TDEProcess to allow the client of konsolePart
// to set up things after fork() but before exec()
virtual int commSetupDoneC();
protected slots:
void dataReceived(KProcess *, char *buf, int len);
void dataReceived(TDEProcess *, char *buf, int len);
public slots:
void donePty();

4
konsole/konsole/TEWidget.cpp
Unescape View File

@ -941,7 +941,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
if (!mResizeWidget)
{
mResizeWidget = new TQFrame(this);
TQFont f = KGlobalSettings::generalFont();
TQFont f = TDEGlobalSettings::generalFont();
int fs = f.pointSize();
if (fs == -1)
fs = TQFontInfo(f).pointSize();
@ -1367,7 +1367,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
// we had a mouse down, but haven't confirmed a drag yet
// if the mouse has moved sufficiently, we will confirm
int distance = KGlobalSettings::dndEventDelay();
int distance = TDEGlobalSettings::dndEventDelay();
if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
// we've left the drag square, we can start a real drag operation now

2
konsole/konsole/keytrans.cpp
Unescape View File

@ -716,7 +716,7 @@ void KeyTrans::loadAll()
KeyTrans* sc = new KeyTrans("[buildin]");
sc->addKeyTrans();
TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
{

72
konsole/konsole/konsole.cpp
Unescape View File

@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
// read and apply default values ///////////////////////////////////////////
resize(321, 321); // Dummy.
TQSize currentSize = size();
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
config->setDesktopGroup();
applyMainWindowSettings(config);
if (currentSize != size())
@ -367,7 +367,7 @@ Konsole::~Konsole()
}
// Wait a bit for all childs to clean themselves up.
while(sessions.count() && KProcessController::theKProcessController->waitForProcessExit(1))
while(sessions.count() && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
;
sessions.setAutoDelete(true);
@ -652,7 +652,7 @@ void Konsole::makeGUI()
// encoding menu, start with default checked !
selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
selectSetEncoding->setCurrentItem (0);
@ -703,7 +703,7 @@ void Konsole::makeGUI()
KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
configure->plug(m_options);
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
m_options->insertTearOffHandle();
}
@ -758,7 +758,7 @@ void Konsole::makeGUI()
}
m_rightButton->insertSeparator();
m_closeSession->plug(m_rightButton );
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
m_rightButton->insertTearOffHandle();
}
@ -884,8 +884,8 @@ void Konsole::slotSetEncoding()
else
{
bool found;
TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
qtc = KGlobal::charsets()->codecForName(enc, found);
TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
qtc = TDEGlobal::charsets()->codecForName(enc, found);
// BR114535 : Remove jis7 due to infinite loop.
if ( enc == "jis7" ) {
@ -966,7 +966,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
{
TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
> KGlobalSettings::dndEventDelay())
> TDEGlobalSettings::dndEventDelay())
{
m_newSessionButton->openPopup();
return true;
@ -1167,7 +1167,7 @@ void Konsole::makeBasicGUI()
new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
if ( KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
b_sessionShortcutsEnabled = true;
loadSessionCommands();
loadScreenSessions();
@ -1438,7 +1438,7 @@ void Konsole::slotSaveSessionsProfile()
if ( ok ) {
TQString path = locateLocal( "data",
TQString::fromLatin1( "konsole/profiles/" ) + prof,
KGlobal::instance() );
TDEGlobal::instance() );
if ( TQFile::exists( path ) )
TQFile::remove( path );
@ -1454,7 +1454,7 @@ void Konsole::saveProperties(KConfig* config) {
uint active=0;
TQString key;
if (config != KGlobal::config())
if (config != TDEGlobal::config())
{
// called by the session manager
config->writeEntry("numSes",sessions.count());
@ -1526,7 +1526,7 @@ void Konsole::saveProperties(KConfig* config) {
if (selectSetEncoding)
{
TQString encoding = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
TQString encoding = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
config->writeEntry("EncodingName", encoding);
} else { // This will not always work (ie 'winsami' saves as 'ws2')
if (se) config->writeEntry("EncodingName", se->encoding());
@ -1538,7 +1538,7 @@ void Konsole::saveProperties(KConfig* config) {
}
config->writeEntry("class",name());
if (config != KGlobal::config())
if (config != TDEGlobal::config())
{
saveMainWindowSettings(config);
}
@ -1551,7 +1551,7 @@ void Konsole::saveProperties(KConfig* config) {
}
// Called by constructor (with config = KGlobal::config())
// Called by constructor (with config = TDEGlobal::config())
// and by session-management (with config = sessionconfig).
// So it has to apply the settings when reading them.
void Konsole::readProperties(KConfig* config)
@ -1567,7 +1567,7 @@ void Konsole::readProperties(KConfig* config)
void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly)
{
if (config==KGlobal::config())
if (config==TDEGlobal::config())
{
config->setDesktopGroup();
b_warnQuit=config->readBoolEntry( "WarnQuit", true );
@ -1614,7 +1614,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
// (1) set menu items and Konsole members
TQFont tmpFont = KGlobalSettings::fixedFont();
TQFont tmpFont = TDEGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
//set the schema
@ -2013,7 +2013,7 @@ void Konsole::slotSelectTabbar() {
void Konsole::slotSaveSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setDesktopGroup();
saveProperties(config);
saveMainWindowSettings(config);
@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys()
m_shortcuts->action( i )->shortcut().count() &&
TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) {
b_sessionShortcutsEnabled = true;
KConfigGroup group(KGlobal::config(), "General");
KConfigGroup group(TDEGlobal::config(), "General");
group.writeEntry("SessionShortcutsEnabled", true);
}
}
@ -2078,8 +2078,8 @@ void Konsole::slotConfigure()
void Konsole::reparseConfiguration()
{
KGlobal::config()->reparseConfiguration();
readProperties(KGlobal::config(), TQString::null, true);
TDEGlobal::config()->reparseConfiguration();
readProperties(TDEGlobal::config(), TQString::null, true);
// The .desktop files may have been changed by user...
b_sessionShortcutsMapped = false;
@ -2125,7 +2125,7 @@ void Konsole::reparseConfiguration()
m_shortcuts->readShortcutSettings();
// User may have changed Schema->Set as default schema
s_kconfigSchema = KGlobal::config()->readEntry("schema");
s_kconfigSchema = TDEGlobal::config()->readEntry("schema");
ColorSchema* sch = colors->find(s_kconfigSchema);
if (!sch)
{
@ -2662,8 +2662,8 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
session = se;
bool found = false;
TQString enc = KGlobal::charsets()->encodingForName(encoding);
TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
TQString enc = TDEGlobal::charsets()->encodingForName(encoding);
TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
if ( !found || !qtc )
return;
@ -2671,13 +2671,13 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
// it corresponds to.
int i = 0;
bool found_encoding = false;
TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
TQStringList::ConstIterator it = encodingNames.begin();
TQString t_encoding = encoding.lower();
while ( it != encodingNames.end() && !found_encoding )
{
if ( TQString::compare( KGlobal::charsets()->encodingForName(*it),
if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it),
t_encoding ) == 0 ) {
found_encoding = true;
}
@ -2727,7 +2727,7 @@ void Konsole::allowPrevNext()
KSimpleConfig *Konsole::defaultSession()
{
if (!m_defaultSession) {
KConfig * config = KGlobal::config();
KConfig * config = TDEGlobal::config();
config->setDesktopGroup();
setDefaultSession(config->readEntry("DefaultSession","shell.desktop"));
}
@ -2886,7 +2886,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
initTEWidget(te, te_old);
}
else {
readProperties(KGlobal::config(), "", true);
readProperties(TDEGlobal::config(), "", true);
te->setVTFont(font);
te->setScrollbarLocation(n_scroll);
te->setBellMode(n_bell);
@ -3287,9 +3287,9 @@ void Konsole::notifySessionState(TESession* session, int state)
&& session->testAndSetStateIconName(state_iconname)
&& m_tabViewMode != ShowTextOnly) {
TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::DefaultState, 0L, true);
TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
KIcon::Small, 0, KIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
@ -3375,7 +3375,7 @@ void Konsole::addSessionCommand(const TQString &path)
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
TQString pexec = KGlobal::dirs()->findExe(exec);
TQString pexec = TDEGlobal::dirs()->findExe(exec);
if (typ.isEmpty() || txt.isEmpty() || typ != "KonsoleApplication"
|| ( !exec.isEmpty() && pexec.isEmpty() ) )
@ -3425,7 +3425,7 @@ void Konsole::loadSessionCommands()
addSessionCommand(TQString::null);
TQStringList lst = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
TQStringList lst = TDEGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
if (!(*it).endsWith("/shell.desktop"))
@ -4128,9 +4128,9 @@ void Konsole::slotZModemUpload()
i18n("<p>The current session already has a ZModem file transfer in progress."));
return;
}
TQString zmodem = KGlobal::dirs()->findExe("sz");
TQString zmodem = TDEGlobal::dirs()->findExe("sz");
if (zmodem.isEmpty())
zmodem = KGlobal::dirs()->findExe("lsz");
zmodem = TDEGlobal::dirs()->findExe("lsz");
if (zmodem.isEmpty())
{
KMessageBox::sorry(this,
@ -4155,9 +4155,9 @@ void Konsole::slotZModemDetected(TESession *session)
if(se != session)
activateSession(session);
TQString zmodem = KGlobal::dirs()->findExe("rz");
TQString zmodem = TDEGlobal::dirs()->findExe("rz");
if (zmodem.isEmpty())
zmodem = KGlobal::dirs()->findExe("lrz");
zmodem = TDEGlobal::dirs()->findExe("lrz");
if (zmodem.isEmpty())
{
KMessageBox::information(this,
@ -4167,7 +4167,7 @@ void Konsole::slotZModemDetected(TESession *session)
"<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"));
return;
}
KURLRequesterDlg dlg(KGlobalSettings::documentPath(),
KURLRequesterDlg dlg(TDEGlobalSettings::documentPath(),
i18n("A ZModem file transfer attempt has been detected.\n"
"Please specify the folder you want to store the file(s):"),
this, "zmodem_dlg");

18
konsole/konsole/konsole_part.cpp
Unescape View File

@ -261,7 +261,7 @@ konsolePart::~konsolePart()
se->closeSession();
// Wait a bit for all childs to clean themselves up.
while(se && KProcessController::theKProcessController->waitForProcessExit(1))
while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
;
disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
@ -370,7 +370,7 @@ void konsolePart::makeGUI()
// encoding menu, start with default checked !
selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
selectSetEncoding->setCurrentItem (0);
@ -447,7 +447,7 @@ void konsolePart::makeGUI()
KAction *saveSettings = new KAction(i18n("&Save as Default"), "filesave", 0, this,
TQT_SLOT(saveProperties()), actions, "save_default");
saveSettings->plug(m_options);
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
m_options->insertTearOffHandle();
}
@ -480,7 +480,7 @@ void konsolePart::makeGUI()
KAction *closeSession = new KAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this,
TQT_SLOT(closeCurrentSession()), actions, "close_session");
closeSession->plug(m_popupMenu);
if (KGlobalSettings::insertTearOffHandle())
if (TDEGlobalSettings::insertTearOffHandle())
m_popupMenu->insertTearOffHandle();
}
@ -569,7 +569,7 @@ void konsolePart::readProperties()
n_encoding = config->readNumEntry("encoding",0);
TQFont tmpFont = KGlobalSettings::fixedFont();
TQFont tmpFont = TDEGlobalSettings::fixedFont();
defaultFont = config->readFontEntry("defaultfont", &tmpFont);
TQString schema = config->readEntry("Schema");
@ -891,8 +891,8 @@ void konsolePart::slotSetEncoding()
if (!se) return;
bool found;
TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
if(!found)
{
kdDebug() << "Codec " << selectSetEncoding->currentText() << " not found!" << endl;
@ -1098,8 +1098,8 @@ void konsolePart::newSession()
this, TQT_SLOT( updateTitle(TESession*) ) );
connect( se, TQT_SIGNAL(enableMasterModeConnections()),
this, TQT_SLOT(enableMasterModeConnections()) );
connect( se, TQT_SIGNAL( processExited(KProcess *) ),
this, TQT_SIGNAL( processExited(KProcess *) ) );
connect( se, TQT_SIGNAL( processExited(TDEProcess *) ),
this, TQT_SIGNAL( processExited(TDEProcess *) ) );
connect( se, TQT_SIGNAL( receivedData( const TQString& ) ),
this, TQT_SIGNAL( receivedData( const TQString& ) ) );
connect( se, TQT_SIGNAL( forkedChild() ),

2
konsole/konsole/konsole_part.h
Unescape View File

@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
virtual ~konsolePart();
signals:
void processExited( KProcess * );
void processExited( TDEProcess * );
void receivedData( const TQString& s );
void forkedChild();
protected:

8
konsole/konsole/kwrited.cpp
Unescape View File

@ -66,8 +66,8 @@ KWrited::KWrited() : TQTextEdit()
{
int pref_width, pref_height;
setFont(KGlobalSettings::fixedFont());
pref_width = (2 * KGlobalSettings::desktopGeometry(0).width()) / 3;
setFont(TDEGlobalSettings::fixedFont());
pref_width = (2 * TDEGlobalSettings::desktopGeometry(0).width()) / 3;
pref_height = fontMetrics().lineSpacing() * 10;
setMinimumWidth(pref_width);
setMinimumHeight(pref_height);
@ -125,14 +125,14 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos )
KWritedModule::KWritedModule( const TQCString& obj )
: KDEDModule( obj )
{
KGlobal::locale()->insertCatalogue("konsole");
TDEGlobal::locale()->insertCatalogue("konsole");
pro = new KWrited;
}
KWritedModule::~KWritedModule()
{
delete pro;
KGlobal::locale()->removeCatalogue("konsole");
TDEGlobal::locale()->removeCatalogue("konsole");
}
extern "C"

12
konsole/konsole/main.cpp
Unescape View File

@ -256,7 +256,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
#endif
TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
KGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");
TDEGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");
KImageIO::registerFormats(); // add io for additional image formats
//2.1 secs
@ -316,7 +316,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
type = args->getOption("type");
}
if(args->isSet("types")) {
TQStringList types = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
TQStringList types = TDEGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
types.sort();
for(TQStringList::ConstIterator it = types.begin();
it != types.end(); ++it)
@ -343,7 +343,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
}
if(args->isSet("keytabs")) {
TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
printf("default\n"); // 'buildin' keytab
lst.sort();
@ -378,7 +378,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
}
if (args->isSet("profiles"))
{
TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
profiles.sort();
for(TQStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)
@ -477,7 +477,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
m->setEncoding(sessionconfig->readNumEntry("Encoding0"));
m->setSchema(sessionconfig->readEntry("Schema0"));
// Use konsolerc default as tmpFont instead?
TQFont tmpFont = KGlobalSettings::fixedFont();
TQFont tmpFont = TDEGlobalSettings::fixedFont();
m->initSessionFont(sessionconfig->readFontEntry("SessionFont0", &tmpFont));
m->initSessionKeyTab(sessionconfig->readEntry("KeyTab0"));
m->initMonitorActivity(sessionconfig->readBoolEntry("MonitorActivity0",false));
@ -522,7 +522,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
key = TQString("Encoding%1").arg(counter);
m->setEncoding(sessionconfig->readNumEntry(key));
key = TQString("SessionFont%1").arg(counter);
TQFont tmpFont = KGlobalSettings::fixedFont();
TQFont tmpFont = TDEGlobalSettings::fixedFont();
m->initSessionFont(sessionconfig->readFontEntry(key, &tmpFont));
key = TQString("KeyTab%1").arg(counter);
m->initSessionKeyTab(sessionconfig->readEntry(key));

2
konsole/konsole/schema.cpp
Unescape View File

@ -530,7 +530,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now)
// KONSOLEDEBUG << "Updating time stamps" << endl;
TQStringList list;
KGlobal::dirs()->findAllResources("data", "konsole/*.schema", false, true, list);
TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema", false, true, list);
TQStringList::ConstIterator it;
bool r = false;

18
konsole/konsole/session.cpp
Unescape View File

@ -174,7 +174,7 @@ void TESession::run()
TQString exec = TQFile::encodeName(pgm);
exec = KRun::binaryName(exec, false);
exec = KShell::tildeExpand(exec);
TQString pexec = KGlobal::dirs()->findExe(exec);
TQString pexec = TDEGlobal::dirs()->findExe(exec);
if ( pexec.isEmpty() ) {
kdError()<<"can not execute "<<exec<<endl;
TQTimer::singleShot(1, this, TQT_SLOT(done()));
@ -633,12 +633,12 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
zmodemProc->start(KProcIO::NotifyOnExit, false);
// Override the read-processing of KProcIO
disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), 0, 0);
connect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
this, TQT_SLOT(zmodemSendBlock(KProcess *, char *, int)));
connect(zmodemProc,TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
this, TQT_SLOT(zmodemStatus(KProcess *, char *, int)));
connect(zmodemProc,TQT_SIGNAL (processExited(KProcess *)),
disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int)));
connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)),
this, TQT_SLOT(zmodemDone()));
disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
@ -654,7 +654,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
zmodemProgress->show();
}
void TESession::zmodemSendBlock(KProcess *, char *data, int len)
void TESession::zmodemSendBlock(TDEProcess *, char *data, int len)
{
sh->send_bytes(data, len);
// tqWarning("<-- %d bytes", len);
@ -671,7 +671,7 @@ void TESession::zmodemContinue()
// tqWarning("ZModem resume");
}
void TESession::zmodemStatus(KProcess *, char *data, int len)
void TESession::zmodemStatus(TDEProcess *, char *data, int len)
{
TQCString msg(data, len+1);
while(!msg.isEmpty())

8
konsole/konsole/session.h
Unescape View File

@ -32,7 +32,7 @@
#include "sessioniface.h"
class KProcIO;
class KProcess;
class TDEProcess;
class ZModemDialog;
class TESession : public TQObject, virtual public SessionIface
@ -137,15 +137,15 @@ public slots:
void slotZModemDetected();
void emitZModemDetected();
void zmodemStatus(KProcess *, char *data, int len);
void zmodemSendBlock(KProcess *, char *data, int len);
void zmodemStatus(TDEProcess *, char *data, int len);
void zmodemSendBlock(TDEProcess *, char *data, int len);
void zmodemRcvBlock(const char *data, int len);
void zmodemDone();
void zmodemContinue();
signals:
void processExited(KProcess *);
void processExited(TDEProcess *);
void forkedChild();
void receivedData( const TQString& text );
void done(TESession*);

6
kpager/desktop.cpp
Unescape View File

@ -62,7 +62,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char *
setBackgroundMode(NoBackground);
if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true);
KConfig *cfg= KGlobal::config();
KConfig *cfg= TDEGlobal::config();
m_transparentMode=static_cast<WindowTransparentMode>
(cfg->readNumEntry("windowTransparentMode", c_defWindowTransparentMode));
resize(67, 50);
@ -466,11 +466,11 @@ void Desktop::paintEvent( TQPaintEvent * )
// set font
if (sname) {
TQFont f(KGlobalSettings::generalFont().family(), 10, TQFont::Bold);
TQFont f(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
p.setFont(f);
}
else {
TQFont f(KGlobalSettings::generalFont().family(), 12, TQFont::Bold);
TQFont f(TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold);
p.setFont(f);
}

6
kpager/kpager.cpp
Unescape View File

@ -122,7 +122,7 @@ extern bool closed_by_sm;
bool KPagerMainWindow::queryClose()
{
KConfig *cfg=KGlobal::config();
KConfig *cfg=TDEGlobal::config();
cfg->setGroup("KPager");
cfg->writeEntry("layoutType", static_cast<int>(m_pPager->m_layoutType));
@ -227,7 +227,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
connect(kapp, TQT_SIGNAL(backgroundChanged(int)),
TQT_SLOT(slotBackgroundChanged(int)));
TQFont defFont(KGlobalSettings::generalFont().family(), 10, TQFont::Bold);
TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
defFont = cfg->readFontEntry("Font", &defFont);
setFont(defFont);
@ -356,7 +356,7 @@ void KPager::configureDialog()
if (dialog->exec())
{
m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType);
KConfig *cfg=KGlobal::config();
KConfig *cfg=TDEGlobal::config();
int nWd = (parent() ? ((TQWidget *)parent())->width() : width());
int nHg = (parent() ? ((TQWidget *)parent())->width() : width());

12
kpersonalizer/kcountrypage.cpp
Unescape View File

@ -50,7 +50,7 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
flang = new KFindLanguage();
// need this ones for decision over restarts of kp, kicker, etc
s_oldlocale = KGlobal::locale()->language();
s_oldlocale = TDEGlobal::locale()->language();
// load the Menus and guess the selection
loadCountryList(cb_country);
@ -81,7 +81,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
// clear the list
combo->clear();
TQStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop");
TQStringList regionfiles = TDEGlobal::dirs()->findAllResources("locale", sub + "*.desktop");
TQMap<TQString,TQString> regionnames;
for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
@ -108,7 +108,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
}
// add all languages to the list
TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop");
TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop");
countrylist.sort();
for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
@ -149,7 +149,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
/** No descriptions */
bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLang) {
kdDebug() << "KCountryPage::save()" << endl;
KConfigBase *config = KGlobal::config();
KConfigBase *config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1("Locale"));
config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
@ -166,9 +166,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
// ksycoca needs to be rebuilt
KProcess proc;
TDEProcess proc;
proc << TQString::fromLatin1("kbuildsycoca");
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
// inform kicker and kdeskop about the new language
kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);

112
kpersonalizer/keyecandypage.cpp
Unescape View File

@ -324,23 +324,23 @@ void KEyeCandyPage::enableDesktopWindowMovingContents(bool enable, bool restore)
// see /tdebase/kcontrol/kwm module, KAdvancedConfig class. Used are:
// -Display content in moving window
// -Display content in resizing window
// And KGlobalSettings::opaqueResize() for QSplitters
// And TDEGlobalSettings::opaqueResize() for QSplitters
twinconf->setGroup( "Windows" );
KGlobal::config()->setGroup("KDE");
TDEGlobal::config()->setGroup("KDE");
if (enable){
twinconf->writeEntry("ResizeMode","Opaque");
twinconf->writeEntry("MoveMode","Opaque");
KGlobal::config()->writeEntry("OpaqueResize", true, true, true);
TDEGlobal::config()->writeEntry("OpaqueResize", true, true, true);
} else {
twinconf->writeEntry("ResizeMode","Transparent");
twinconf->writeEntry("MoveMode","Transparent");
KGlobal::config()->writeEntry("OpaqueResize", false, true, true);
TDEGlobal::config()->writeEntry("OpaqueResize", false, true, true);
}
if(restore){
twinconf->writeEntry("ResizeMode",s_ResizeMode);
twinconf->writeEntry("MoveMode",s_MoveMode);
KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true);
TDEGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true);
}
}
@ -378,32 +378,32 @@ void KEyeCandyPage::enableIconZoomingPanel(bool enable){
/** enable Icon highlighting, Level 3 */
void KEyeCandyPage::enableIconEffectGamma(bool enable, bool user){
if(enable){
KGlobal::config()->setGroup("DesktopIcons");
KGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true);
KGlobal::config()->writeEntry("ActiveValue", "0.7", true, true);
KGlobal::config()->setGroup("PanelIcons");
KGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true);
KGlobal::config()->writeEntry("ActiveValue", "0.7", true, true);
TDEGlobal::config()->setGroup("DesktopIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true);
TDEGlobal::config()->writeEntry("ActiveValue", "0.7", true, true);
TDEGlobal::config()->setGroup("PanelIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true);
TDEGlobal::config()->writeEntry("ActiveValue", "0.7", true, true);
} else {
if(user){
KGlobal::config()->setGroup("DesktopIcons");
KGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectDesktop, true, true);
KGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValueDesktop, true, true);
KGlobal::config()->setGroup("PanelIcons");
KGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectPanel, true, true);
KGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValuePanel, true, true);
TDEGlobal::config()->setGroup("DesktopIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectDesktop, true, true);
TDEGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValueDesktop, true, true);
TDEGlobal::config()->setGroup("PanelIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectPanel, true, true);
TDEGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValuePanel, true, true);
} else {
KGlobal::config()->setGroup("DesktopIcons");
KGlobal::config()->writeEntry("ActiveEffect", "none", true, true);
KGlobal::config()->setGroup("PanelIcons");
KGlobal::config()->writeEntry("ActiveEffect", "none", true, true);
TDEGlobal::config()->setGroup("DesktopIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", "none", true, true);
TDEGlobal::config()->setGroup("PanelIcons");
TDEGlobal::config()->writeEntry("ActiveEffect", "none", true, true);
}
}
}
void KEyeCandyPage::enableIconMngAnimation(bool enable) {
KGlobal::config()->setGroup("DesktopIcons");
KGlobal::config()->writeEntry("Animated", enable, true, true);
TDEGlobal::config()->setGroup("DesktopIcons");
TDEGlobal::config()->writeEntry("Animated", enable, true, true);
}
/** No descriptions */
@ -421,11 +421,11 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){
/** No descriptions */
void KEyeCandyPage::enableIconEffectSizeDesktop(bool enable){
KGlobal::config()->setGroup("DesktopIcons");
TDEGlobal::config()->setGroup("DesktopIcons");
if( enable ) { // use 48x48 icons
KGlobal::config()->writeEntry("Size", 48, true, true);
TDEGlobal::config()->writeEntry("Size", 48, true, true);
} else {
KGlobal::config()->writeEntry("Size", desktopiconsize, true, true);
TDEGlobal::config()->writeEntry("Size", desktopiconsize, true, true);
}
}
//----------------------------ICON STUFF-------------------------------------------------
@ -435,33 +435,33 @@ void KEyeCandyPage::enableIconEffectSizeDesktop(bool enable){
/** Enable fading tooltips in Level 7 */
void KEyeCandyPage::enableFadingToolTips(bool enable){
KGlobal::config()->setGroup("KDE");
KGlobal::config()->writeEntry( "EffectFadeTooltip", enable, true, true);
TDEGlobal::config()->setGroup("KDE");
TDEGlobal::config()->writeEntry( "EffectFadeTooltip", enable, true, true);
}
/** enables/disables fading menus which are off by default in KDE. Enable this in Level 9 */
void KEyeCandyPage::enableFadingMenus(bool enable){
KGlobal::config()->setGroup("KDE");
KGlobal::config()->writeEntry("EffectFadeMenu", enable,true, true);
TDEGlobal::config()->setGroup("KDE");
TDEGlobal::config()->writeEntry("EffectFadeMenu", enable,true, true);
}
/** enables/disables icons on pushbuttons, which are off by default in KDE. Enable this in Level 5 */
void KEyeCandyPage::enablePushButtonIcons(bool enable){
KGlobal::config()->setGroup("KDE");
KGlobal::config()->writeEntry("ShowIconsOnPushButtons", enable,true, true);
TDEGlobal::config()->setGroup("KDE");
TDEGlobal::config()->writeEntry("ShowIconsOnPushButtons", enable,true, true);
}
/** Enable animated combo boxes, see styles kcontrol module. Enable in Level 6 (disabled by default anyway, so doesn't need to be
disabled in levels below 4) */
void KEyeCandyPage::enableAnimatedCombo(bool enable){
KGlobal::config()->setGroup("KDE");
KGlobal::config()->writeEntry("EffectAnimateCombo", enable, true, true);
TDEGlobal::config()->setGroup("KDE");
TDEGlobal::config()->writeEntry("EffectAnimateCombo", enable, true, true);
}
/** generally enable/disable style-Effects, depending on if one of the three is enabled. */
void KEyeCandyPage::enableEffects(bool enable){
KGlobal::config()->setGroup("KDE");
KGlobal::config()->writeEntry("EffectsEnabled", enable, true, true);
TDEGlobal::config()->setGroup("KDE");
TDEGlobal::config()->writeEntry("EffectsEnabled", enable, true, true);
}
//----------------------------STYLE EFFECTS-------------------------------------------------
@ -621,7 +621,7 @@ void KEyeCandyPage::save(bool currSettings){
konqiconconf->sync();
kickerconf->sync();
kdesktopconf->sync();
KGlobal::config()->sync();
TDEGlobal::config()->sync();
// restart twin for window effects
kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
@ -683,7 +683,7 @@ void KEyeCandyPage::getUserDefaults(){
// Wallpaper-User-Defaults
kdesktopconf->setGroup("FMSettings");
TQColor tempcolor=KGlobalSettings::textColor();
TQColor tempcolor=TDEGlobalSettings::textColor();
desktopTextColor = kdesktopconf->readColorEntry("NormalTextColor", &tempcolor );
kdesktopconf->setGroup("Background Common");
st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true);
@ -694,29 +694,29 @@ void KEyeCandyPage::getUserDefaults(){
deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER);
// Wallpaper-User-Defaults (END)
KGlobal::config()->setGroup("KDE");
TDEGlobal::config()->setGroup("KDE");
// Font-User-Defaults
b_useXft=TQSettings().readBoolEntry("/qt/useXft");
b_enableXft=TQSettings().readBoolEntry("/qt/enableXft");
KGlobal::config()->setGroup("PanelIcons");
st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
st_UserGamma.ValuePanel=KGlobal::config()->readEntry("ActiveValue", "0.7");
KGlobal::config()->setGroup("DesktopIcons");
st_UserGamma.EffectDesktop=KGlobal::config()->readEntry("ActiveEffect", "none");
st_UserGamma.ValueDesktop=KGlobal::config()->readEntry("ActiveValue", "0.7");
desktopiconsize=KGlobal::config()->readNumEntry("Size", 32);
b_iconMngAnim = KGlobal::config()->readBoolEntry( "Animated", true );
KGlobal::config()->setGroup("KDE");
b_EffectFadeTooltip=KGlobal::config()->readBoolEntry( "EffectFadeTooltip", false );
b_PushButtonIcons=KGlobal::config()->readBoolEntry("ShowIconsOnPushButtons", false);
b_EffectFadeMenu=KGlobal::config()->readBoolEntry("EffectFadeMenu", false);
b_EffectAnimateCombo=KGlobal::config()->readBoolEntry("EffectAnimateCombo", false);
b_EffectsEnabled=KGlobal::config()->readBoolEntry("EffectsEnabled", false);
b_OpaqueResize=KGlobal::config()->readBoolEntry("OpaqueResize", true);
TDEGlobal::config()->setGroup("PanelIcons");
st_UserGamma.EffectPanel=TDEGlobal::config()->readEntry("ActiveEffect", "none");
st_UserGamma.ValuePanel=TDEGlobal::config()->readEntry("ActiveValue", "0.7");
TDEGlobal::config()->setGroup("DesktopIcons");
st_UserGamma.EffectDesktop=TDEGlobal::config()->readEntry("ActiveEffect", "none");
st_UserGamma.ValueDesktop=TDEGlobal::config()->readEntry("ActiveValue", "0.7");
desktopiconsize=TDEGlobal::config()->readNumEntry("Size", 32);
b_iconMngAnim = TDEGlobal::config()->readBoolEntry( "Animated", true );
TDEGlobal::config()->setGroup("KDE");
b_EffectFadeTooltip=TDEGlobal::config()->readBoolEntry( "EffectFadeTooltip", false );
b_PushButtonIcons=TDEGlobal::config()->readBoolEntry("ShowIconsOnPushButtons", false);
b_EffectFadeMenu=TDEGlobal::config()->readBoolEntry("EffectFadeMenu", false);
b_EffectAnimateCombo=TDEGlobal::config()->readBoolEntry("EffectAnimateCombo", false);
b_EffectsEnabled=TDEGlobal::config()->readBoolEntry("EffectsEnabled", false);
b_OpaqueResize=TDEGlobal::config()->readBoolEntry("OpaqueResize", true);
kickerconf->setGroup("buttons");
b_EnableIconZoom=kickerconf->readBoolEntry("EnableIconZoom", true);

4
kpersonalizer/kfindlanguage.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "kfindlanguage.h"
KFindLanguage::KFindLanguage() {
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Locale");
m_oldlang = config->readEntry("Language");
@ -69,7 +69,7 @@ KFindLanguage::KFindLanguage() {
}
// add all languages to the list
TQStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true);
TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true);
alllang.sort();
TQStringList langlist = prilang;
if (langlist.count() > 0)

2
kpersonalizer/kospage.cpp
Unescape View File

@ -105,7 +105,7 @@ void KOSPage::save(bool currSettings){
void KOSPage::saveCheckState(bool currSettings){
if(currSettings){
// Set the path for the keysscheme resource files
KGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys");
TDEGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys");
// write the settings to the configfiles, depending on wich radiobutton is checked
if(rb_kde->isChecked()){
writeKDE();

2
kpersonalizer/kpersonalizer.cpp
Unescape View File

@ -259,7 +259,7 @@ void KPersonalizer::setPosition() {
hint.setHeight(refine_size.height());
// set the position
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
int w = rect.x() + (rect.width() - hint.width())/2 - 9;
int h = rect.y() + (rect.height() - hint.height())/2;
move(w, h);

2
kpersonalizer/krefinepage.cpp
Unescape View File

@ -33,7 +33,7 @@ KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(p
pb_kcontrol->hide();
lb_kcontrol->hide();
}
px_kcontrol->setPixmap(KGlobal::iconLoader()->loadIcon("kcontrol", KIcon::Panel, KIcon::SizeMedium));
px_kcontrol->setPixmap(TDEGlobal::iconLoader()->loadIcon("kcontrol", KIcon::Panel, KIcon::SizeMedium));
}
KRefinePage::~KRefinePage(){
}

30
kpersonalizer/kstylepage.cpp
Unescape View File

@ -118,7 +118,7 @@ void KStylePage::saveKWin(bool curSettings){
TQString twin = origKWinStyle;
if(curSettings) {
KDesktopFile* kdf = 0L;
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
if (cde->isSelected() && twin_cde_exist)
kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
else if (win->isSelected() && twin_win_exist)
@ -160,7 +160,7 @@ void KStylePage::saveColors(bool curSettings){
// the GLOBAL config entries must be taken from the kcsrc file and written to it. Use the default values
// equals that the file is <default> which is no file. TODO: use the default values in that case (kde selected)
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "General" );
config->writeEntry("foreground", toSave->foreground, true, true);
config->writeEntry("background", toSave->background, true, true);
@ -173,7 +173,7 @@ void KStylePage::saveColors(bool curSettings){
config->writeEntry("linkColor", toSave->linkColor, true, true);
config->writeEntry("visitedLinkColor", toSave->visitedLinkColor, true, true);
// set to the WM group, *only* the KGlobal one, a kcsrc file only has the group "Color Scheme" hmpf...
// set to the WM group, *only* the TDEGlobal one, a kcsrc file only has the group "Color Scheme" hmpf...
config->setGroup( "WM" );
config->writeEntry("activeForeground", toSave->activeForeground, true, true);
config->writeEntry("inactiveForeground", toSave->inactiveForeground, true, true);
@ -231,17 +231,17 @@ void KStylePage::saveIcons(bool curSettings) {
theme = "Locolor";
}
// save, what we got
KGlobal::config()->setGroup("Icons");
KGlobal::config()->writeEntry("Theme", theme, true, true);
TDEGlobal::config()->setGroup("Icons");
TDEGlobal::config()->writeEntry("Theme", theme, true, true);
KIconTheme icontheme(theme);
const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", 0L };
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
if (groups[i] == 0L)
break;
KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
TDEGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
TDEGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
}
KGlobal::config()->sync();
TDEGlobal::config()->sync();
kdDebug() << "KStylePage::saveIcons(): " << theme << endl;
}
@ -324,7 +324,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
bool deleteConfig = false;
// get the color scheme file and go to the color scheme group
if(colorfile){
KGlobal::dirs()->addResourceType("colors", KStandardDirs::kde_default("data")+"kdisplay/color-schemes");
TDEGlobal::dirs()->addResourceType("colors", KStandardDirs::kde_default("data")+"kdisplay/color-schemes");
// set the style
if (kde->isSelected()) {
set->bgMode="Flat";
@ -378,7 +378,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
set->usrCol1=kdesktop.readColorEntry("Color1", &tmp1);
set->usrCol2=kdesktop.readColorEntry("Color2", &tmp2);
// write the color scheme filename and the contrast, default 7, otherwise from file
config=KGlobal::config();
config=TDEGlobal::config();
config->setGroup("KDE");
set->colorFile=config->readEntry("colorScheme", "<default>");
set->contrast=config->readNumEntry("contrast", 7);
@ -439,7 +439,7 @@ void KStylePage::getAvailability() {
twin_keramik_exist = twin_system_exist = twin_plastik_exist
= twin_default_exist = twin_win_exist
= twin_cde_exist = twin_quartz_exist = false;
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
if (!kstd->findResource("data", "twin/keramik.desktop").isNull())
twin_keramik_exist = true;
if (!kstd->findResource("data", "twin/plastik.desktop").isNull())
@ -469,8 +469,8 @@ void KStylePage::getAvailability() {
/** get the user's former settings */
void KStylePage::getUserDefaults() {
// Get the user's current widget-style
KGlobal::config()->setGroup("General");
origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() );
TDEGlobal::config()->setGroup("General");
origStyle = TDEGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() );
// get the user's current KWin-style
ctwin = new KConfig("twinrc");
@ -481,8 +481,8 @@ void KStylePage::getUserDefaults() {
getColors(&usrColors, false);
// Get the user's current iconset
KGlobal::config()->setGroup("Icons");
origIcons = KGlobal::config()->readEntry("Theme");
TDEGlobal::config()->setGroup("Icons");
origIcons = TDEGlobal::config()->readEntry("Theme");
kdDebug() << "KStylePage::getUserDefaults(): style: " << origStyle << endl;
kdDebug() << "KStylePage::getUserDefaults(): KWinStyle: " << origKWinStyle << endl;

2
kpersonalizer/main.cpp
Unescape View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
if (!args->isSet("r")) { // we'll first show the first page
KFindLanguage *flang = new KFindLanguage();
if( !flang->getBestLang().isEmpty()) // if we have the users language, use it
KGlobal::locale()->setLanguage( flang->getBestLang() );
TDEGlobal::locale()->setLanguage( flang->getBestLang() );
delete flang;
}

4
kreadconfig/kreadconfig.cpp
Unescape View File

@ -65,12 +65,12 @@ int main(int argc, char **argv)
}
TDEInstance inst(&aboutData);
KGlobal::config();
TDEGlobal::config();
KConfig *konfig;
bool configMustDeleted = false;
if (file.isEmpty())
konfig = KGlobal::config();
konfig = TDEGlobal::config();
else
{
konfig = new KConfig(file, true, false);

6
kscreensaver/blankscrn.cpp
Unescape View File

@ -75,7 +75,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
// read settings from config file
void KBlankSetup::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
color = config->readColorEntry( "Color", &black );
@ -90,7 +90,7 @@ void KBlankSetup::slotColor( const TQColor &col )
// Ok pressed - save settings and exit
void KBlankSetup::slotOk()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
config->writeEntry( "Color", color );
config->sync();
@ -121,7 +121,7 @@ void KBlankSaver::setColor( const TQColor &col )
// read configuration settings from config file
void KBlankSaver::readSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
color = config->readColorEntry( "Color", &black );

10
kscreensaver/random.cpp
Unescape View File

@ -128,13 +128,13 @@ int main(int argc, char *argv[])
windowId = RootWindow(tqt_xdisplay(), tqt_xscreen());
}
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
"apps/ScreenSavers/");
KGlobal::dirs()->addResourceType("scrsav",
KGlobal::dirs()->kde_default("apps") +
TDEGlobal::dirs()->addResourceType("scrsav",
TDEGlobal::dirs()->kde_default("apps") +
"System/ScreenSavers/");
TQStringList tempSaverFileList = KGlobal::dirs()->findAllResources("scrsav",
TQStringList tempSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav",
"*.desktop", false, true);
TQStringList saverFileList;

2
ksmserver/main.cpp
Unescape View File

@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
IceSetIOErrorHandler( IoErrorHandler );
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup( "General" );
int realScreenCount = ScreenCount( tqt_xdisplay() );

24
ksmserver/server.cpp
Unescape View File

@ -131,11 +131,11 @@ void KSMServer::executeCommand( const TQStringList& command )
{
if ( command.isEmpty() )
return;
KProcess proc;
TDEProcess proc;
for ( TQStringList::ConstIterator it = command.begin();
it != command.end(); ++it )
proc << (*it).latin1();
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
}
IceAuthDataEntry *authDataEntries = 0;
@ -432,16 +432,16 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
addAuthFile.close();
remAuthFile->close();
TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
TQString iceAuth = TDEGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
tqWarning("[KSMServer] could not find iceauth");
return 0;
}
KProcess p;
TDEProcess p;
p << iceAuth << "source" << addAuthFile.name();
p.start(KProcess::Block);
p.start(TDEProcess::Block);
return (1);
}
@ -462,16 +462,16 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
free (authDataEntries);
TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
TQString iceAuth = TDEGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty())
{
tqWarning("[KSMServer] could not find iceauth");
return;
}
KProcess p;
TDEProcess p;
p << iceAuth << "source" << remAuthFile->name();
p.start(KProcess::Block);
p.start(TDEProcess::Block);
delete remAuthFile;
remAuthFile = 0;
@ -592,7 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
dialogActive = false;
saveSession = false;
wmPhase1WaitingCount = 0;
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("General" );
clientInteracting = 0;
xonCommand = config->readEntry( "xonCommand", "xon" );
@ -807,7 +807,7 @@ TQString KSMServer::currentSession()
void KSMServer::discardSession()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count", 0 );
for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
@ -828,7 +828,7 @@ void KSMServer::discardSession()
void KSMServer::storeSession()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
@ -895,7 +895,7 @@ void KSMServer::storeSession()
TQStringList KSMServer::sessionList()
{
TQStringList sessions = "default";
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQStringList groups = config->groupList();
for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ )
if ( (*it).startsWith( "Session: " ) )

10
ksmserver/shutdown.cpp
Unescape View File

@ -125,7 +125,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
return false;
}
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
@ -156,7 +156,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) )
return;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("General" );
if (!maysd) {
@ -168,7 +168,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
sdmode = TDEApplication::ShutdownModeInteractive;
// shall we show a logout status dialog box?
bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
if (showLogoutStatusDlg) {
KSMShutdownIPFeedback::start();
@ -294,7 +294,7 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
{
int confirmDelay;
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup( "General" );
if ( sdtype == TDEApplication::ShutdownTypeHalt )
@ -525,7 +525,7 @@ void KSMServer::completeShutdownOrCheckpoint()
if ( waitForPhase2 )
return;
bool showLogoutStatusDlg = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
if (showLogoutStatusDlg && state != Checkpoint) {
KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();

14
ksmserver/shutdowndlg.cpp
Unescape View File

@ -119,14 +119,14 @@ void KSMShutdownFeedback::fadeBack( void )
void KSMShutdownFeedback::slotPaintEffect()
{
// determine which fade to use
if (KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
if (KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
{
float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
float doFancyLogoutFadeTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
float doFancyLogoutFadeTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
float doFancyLogoutFadeBackTime = (float)KConfigGroup(KGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
float doFancyLogoutFadeBackTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
if (kapp->isX11CompositionAvailable()) {
// We can do this in a different (simpler) manner because we have compositing support!
@ -697,7 +697,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
2 * KDialog::spacingHint() );
// default factor
bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
// slighty more space for the new logout
int factor = 2;
@ -1169,7 +1169,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, TDEApplication::ShutdownType&
// Show dialog (will save the background in showEvent)
TQSize sh = l->sizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2,
rect.y() + (rect.height() - sh.height())/2);
@ -1299,7 +1299,7 @@ bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, cons
kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
TQSize sh = msg.sizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
msg.move(rect.x() + (rect.width() - sh.width())/2,
rect.y() + (rect.height() - sh.height())/2);

10
ksmserver/startup.cpp
Unescape View File

@ -95,7 +95,7 @@ bool trinity_startup_main_sequence_done = FALSE;
*/
void KSMServer::restoreSession( TQString sessionName )
{
showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") )
@ -107,7 +107,7 @@ void KSMServer::restoreSession( TQString sessionName )
kdDebug( 1218 ) << "KSMServer::restoreSession " << sessionName << endl;
upAndRunning( "restore session");
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
sessionGroup = "Session: " + sessionName;
@ -161,7 +161,7 @@ void KSMServer::restoreSession( TQString sessionName )
*/
void KSMServer::startDefaultSession()
{
showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") )
@ -286,7 +286,7 @@ void KSMServer::tryRestoreNext()
if( state != Restoring )
return;
restoreTimer.stop();
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup( sessionGroup );
while ( lastAppStarted < appsToStart ) {
@ -336,7 +336,7 @@ void KSMServer::autoStart2()
TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
if( !defaultSession())
restoreLegacySession( KGlobal::config());
restoreLegacySession( TDEGlobal::config());
KNotifyClient::event( 0, "starttde" ); // this is the time KDE is up, more or less
}

16
ksplashml/kcmksplash/installer.cpp
Unescape View File

@ -68,7 +68,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{
if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
{
int delay = KGlobalSettings::dndEventDelay();
int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->globalPos();
if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
@ -88,7 +88,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aInit)
: TQWidget(aParent, aName), mGui(!aInit)
{
KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
if (!mGui)
return;
@ -161,7 +161,7 @@ int SplashInstaller::addTheme(const TQString &path, const TQString &name)
// Copy theme package into themes directory
void SplashInstaller::addNewTheme(const KURL &srcURL)
{
TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes");
TQString dir = TDEGlobal::dirs()->saveLocation("ksplashthemes");
KURL url;
TQString filename = srcURL.fileName();
int i = filename.findRev('.');
@ -222,7 +222,7 @@ void SplashInstaller::readThemesList()
mThemesList->clear();
// Read local themes
TQStringList entryList = KGlobal::dirs()->resourceDirs("ksplashthemes");
TQStringList entryList = TDEGlobal::dirs()->resourceDirs("ksplashthemes");
//kdDebug() << "readThemesList: " << entryList << endl;
TQDir dir;
TQStringList subdirs;
@ -468,15 +468,15 @@ void SplashInstaller::slotTest()
return;
if( themeName == "Simple" )
{
KProcess proc;
TDEProcess proc;
proc << "ksplashsimple" << "--test";
if (!proc.start(KProcess::Block))
if (!proc.start(TDEProcess::Block))
KMessageBox::error(this,i18n("Unable to start ksplashsimple."));
return;
}
KProcess proc;
TDEProcess proc;
proc << "ksplash" << "--test" << "--theme" << themeName;
if (!proc.start(KProcess::Block))
if (!proc.start(TDEProcess::Block))
KMessageBox::error(this,i18n("Unable to start ksplash."));
}

2
ksplashml/kcmksplash/main.cpp
Unescape View File

@ -86,7 +86,7 @@ TQString KSplashThemeMgr::quickHelp() const
void KSplashThemeMgr::init()
{
KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
}
void KSplashThemeMgr::save()

2
ksplashml/themeengine/default/themelegacy.cpp
Unescape View File

@ -187,7 +187,7 @@ void ThemeDefault::_initUi()
top_label->height() + bottom_label->height() );
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// kdDebug() << "ThemeDefault::_initUi" << rect << endl;
move( rect.x() + (rect.width() - size().width())/2,

6
ksplashml/themeengine/redmond/themeredmond.cpp
Unescape View File

@ -87,7 +87,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
void ThemeRedmond::_initUi()
{
const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
//TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
//TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
mImage.resize( screen.width(), screen.height() );
@ -197,7 +197,7 @@ void ThemeRedmond::_initUi()
int faceSource = fAdminOnly;
KConfig *tdmconfig = new KConfig("tdm/tdmrc", true);
tdmconfig->setGroup("X-*-Greeter");
TQString userPicsDir = tdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
TQString userPicsDir = tdmconfig->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
TQString fs = tdmconfig->readEntry( "FaceSource" );
if (fs == TQString::fromLatin1("UserOnly"))
faceSource = fUserOnly;
@ -309,7 +309,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
void ThemeRedmond::_readSettings()
{
const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
//TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
//TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
if( !mTheme )
return;

2
ksplashml/themeengine/standard/themestandard.cpp
Unescape View File

@ -76,7 +76,7 @@ void ThemeStandard::_initUi()
}
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );

2
ksplashml/themeengine/standard/wndicon.cpp
Unescape View File

@ -99,7 +99,7 @@ TQPoint WndIcon::determinePosition()
bottomshift = topshift = 0;
const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
DW = srect.width();
DH = srect.height();
SBH = mStatusHeight;

2
ksplashml/themeengine/standard/wndstatus.cpp
Unescape View File

@ -47,7 +47,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
setSpacing( 5 );
const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
// KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
TQLabel *pix = new TQLabel( this );
TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("run"):icon) );

2
ksplashml/themeengine/unified/themeunified.cpp
Unescape View File

@ -81,7 +81,7 @@ void ThemeUnified::_initUi()
// Center the dialog
TQSize sh = sizeHint();
TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos());
TQRect rect1 = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2);
}

4
kstart/kstart.cpp
Unescape View File

@ -32,7 +32,7 @@
// some globals
static KProcess proc;
static TDEProcess proc;
static TQCString windowtitle = 0;
static TQCString windowclass = 0;
static int desktop = 0;
@ -65,7 +65,7 @@ KStart::KStart()
id.setupStartupEnv();
//finally execute the comand
if( proc.start(KProcess::DontCare) ) {
if( proc.start(TDEProcess::DontCare) ) {
KStartupInfoData data;
data.addPid( proc.pid() );
TQCString bin = proc.args().first();

6
ksysguard/gui/KSysGuardApplet.cc
Unescape View File

@ -52,7 +52,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
{
KGlobal::locale()->insertCatalogue( "ksysguard" );
TDEGlobal::locale()->insertCatalogue( "ksysguard" );
return new KSysGuardApplet( configFile, KPanelApplet::Normal,
KPanelApplet::Preferences, parent,
"ksysguardapplet" );
@ -309,7 +309,7 @@ void KSysGuardApplet::resizeDocks( uint newDockCount )
bool KSysGuardApplet::load()
{
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString fileName = kstd->findResource( "data", "KSysGuardApplet.xml" );
@ -458,7 +458,7 @@ bool KSysGuardApplet::save()
((KSGRD::SensorDisplay*)mDockList[ i ])->saveSettings( doc, element );
}
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString fileName = kstd->saveLocation( "data", "ksysguard" );
fileName += "/KSysGuardApplet.xml";

4
ksysguard/gui/SensorBrowser.cc
Unescape View File

@ -128,7 +128,7 @@ void SensorBrowser::update()
TQString hostName = mSensorManager->hostName( host );
HostItem* lvi = new HostItem( this, hostName, id, host );
TQPixmap pix = KGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall );
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "computer", KIcon::Desktop, KIcon::SizeSmall );
lvi->setPixmap( 0, pix );
HostInfo* hostInfo = new HostInfo( id, host, hostName, lvi );
@ -214,7 +214,7 @@ void SensorBrowser::answerReceived( int id, const TQString &answer )
if ( !found ) {
TQListViewItem* lvi = new TQListViewItem( parent, name );
if ( j == absolutePath.count() - 1 ) {
TQPixmap pix = KGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop,
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( "ksysguardd", KIcon::Desktop,
KIcon::SizeSmall );
lvi->setPixmap( 0, pix );
lvi->setText( 1, KSGRD::SensorMgr->translateSensorType( sensorType ) );

12
ksysguard/gui/SensorDisplayLib/ListView.cc
Unescape View File

@ -51,8 +51,8 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending
int type = ((PrivateListView*)listView())->columnType( col );
if ( type == PrivateListView::Int ) {
int prev = (int)KGlobal::locale()->readNumber( key( col, ascending ) );
int next = (int)KGlobal::locale()->readNumber( item->key( col, ascending ) );
int prev = (int)TDEGlobal::locale()->readNumber( key( col, ascending ) );
int next = (int)TDEGlobal::locale()->readNumber( item->key( col, ascending ) );
if ( prev < next )
return -1;
else if ( prev == next )
@ -60,8 +60,8 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending
else
return 1;
} else if ( type == PrivateListView::Float ) {
double prev = KGlobal::locale()->readNumber( key( col, ascending ) );
double next = KGlobal::locale()->readNumber( item->key( col, ascending ) );
double prev = TDEGlobal::locale()->readNumber( key( col, ascending ) );
double next = TDEGlobal::locale()->readNumber( item->key( col, ascending ) );
if ( prev < next )
return -1;
else
@ -130,9 +130,9 @@ void PrivateListView::update(const TQString& answer)
KSGRD::SensorTokenizer records(lines[i], '\t');
for (uint j = 0; j < records.count(); j++) {
if ( mColumnTypes[ j ] == "f" )
item->setText(j, KGlobal::locale()->formatNumber( records[j].toFloat() ) );
item->setText(j, TDEGlobal::locale()->formatNumber( records[j].toFloat() ) );
else if ( mColumnTypes[ j ] == "D" )
item->setText(j, KGlobal::locale()->formatNumber( records[j].toDouble(), 0 ) );
item->setText(j, TDEGlobal::locale()->formatNumber( records[j].toDouble(), 0 ) );
else
item->setText(j, records[j]);
}

16
ksysguard/gui/SensorDisplayLib/ProcessList.cc
Unescape View File

@ -64,8 +64,8 @@ int ProcessLVI::compare( TQListViewItem *item, int col, bool ascending ) const
int type = ((ProcessList*)listView())->columnType( col );
if ( type == ProcessList::Int ) {
int prev = (int)KGlobal::locale()->readNumber( key( col, ascending ) );
int next = (int)KGlobal::locale()->readNumber( item->key( col, ascending ) );
int prev = (int)TDEGlobal::locale()->readNumber( key( col, ascending ) );
int next = (int)TDEGlobal::locale()->readNumber( item->key( col, ascending ) );
if ( prev < next )
return -1;
else if ( prev == next )
@ -75,8 +75,8 @@ int ProcessLVI::compare( TQListViewItem *item, int col, bool ascending ) const
}
if ( type == ProcessList::Float ) {
double prev = KGlobal::locale()->readNumber( key( col, ascending ) );
double next = KGlobal::locale()->readNumber( item->key( col, ascending ) );
double prev = TDEGlobal::locale()->readNumber( key( col, ascending ) );
double next = TDEGlobal::locale()->readNumber( item->key( col, ascending ) );
if ( prev < next )
return -1;
else
@ -613,11 +613,11 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
TQPixmap pix;
if (!iconCache[name])
{
pix = KGlobal::iconLoader()->loadIcon(name, KIcon::Small,
pix = TDEGlobal::iconLoader()->loadIcon(name, KIcon::Small,
KIcon::SizeSmall, KIcon::DefaultState,
0L, true);
if (pix.isNull() || !pix.mask())
pix = KGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User,
pix = TDEGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User,
KIcon::SizeSmall);
if (pix.width() != 16 || pix.height() != 16)
@ -659,9 +659,9 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
if (mColumnTypes[col] == "S" && columnDict[(*p)[col]])
pli->setText(col, *columnDict[(*p)[col]]);
else if ( mColumnTypes[col] == "f" )
pli->setText( col, KGlobal::locale()->formatNumber( (*p)[col].toFloat() ) );
pli->setText( col, TDEGlobal::locale()->formatNumber( (*p)[col].toFloat() ) );
else if ( mColumnTypes[col] == "D" )
pli->setText( col, KGlobal::locale()->formatNumber( (*p)[col].toInt(), 0 ) );
pli->setText( col, TDEGlobal::locale()->formatNumber( (*p)[col].toInt(), 0 ) );
else
pli->setText(col, (*p)[col]);
}

2
ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
Unescape View File

@ -439,7 +439,7 @@ void SensorDisplay::setSensorOk( bool ok )
if ( mErrorIndicator )
return;
TQPixmap errorIcon = KGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop,
TQPixmap errorIcon = TDEGlobal::iconLoader()->loadIcon( "connect_creating", KIcon::Desktop,
KIcon::SizeSmall );
if ( !mPlotterWdg )
return;

4
ksysguard/gui/Workspace.cc
Unescape View File

@ -91,7 +91,7 @@ void Workspace::readProperties( KConfig *cfg )
/* If workDir is not specified in the config file, it's
* probably the first time the user has started KSysGuard. We
* then "restore" a special default configuration. */
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
mWorkDir = kstd->saveLocation( "data", "ksysguard" );
@ -440,7 +440,7 @@ void Workspace::applyStyle()
void Workspace::showProcesses()
{
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString file = kstd->findResource( "data", "ProcessTable.sgrd" );

2
ksysguard/gui/ksgrd/SensorAgent.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqobject.h>
#include <tqptrlist.h>
class KProcess;
class TDEProcess;
class KShellProcess;
class TQString;

30
ksysguard/gui/ksgrd/SensorShellAgent.cc
Unescape View File

@ -49,20 +49,20 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell,
const TQString &command, int )
{
mRetryCount = 3;
mDaemon = new KProcess;
mDaemon = new TDEProcess;
mDaemon->setUseShell(true);
setHostName( host );
mShell = shell;
mCommand = command;
connect( mDaemon, TQT_SIGNAL( processExited( KProcess* ) ),
TQT_SLOT( daemonExited( KProcess* ) ) );
connect( mDaemon, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
TQT_SLOT( msgRcvd( KProcess*, char*, int ) ) );
connect( mDaemon, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
TQT_SLOT( errMsgRcvd( KProcess*, char*, int ) ) );
connect( mDaemon, TQT_SIGNAL( wroteStdin( KProcess* ) ),
TQT_SLOT( msgSent( KProcess* ) ) );
connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ),
TQT_SLOT( daemonExited( TDEProcess* ) ) );
connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) );
connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) );
connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ),
TQT_SLOT( msgSent( TDEProcess* ) ) );
TQString cmd;
if ( !command.isEmpty() )
@ -71,7 +71,7 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell,
cmd = mShell + " " + hostName() + " ksysguardd";
*mDaemon << cmd;
if ( !mDaemon->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if ( !mDaemon->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
sensorManager()->hostLost( this );
kdDebug (1215) << "Command '" << cmd << "' failed" << endl;
return false;
@ -88,7 +88,7 @@ void SensorShellAgent::hostInfo( TQString &shell, TQString &command,
port = -1;
}
void SensorShellAgent::msgSent( KProcess* )
void SensorShellAgent::msgSent( TDEProcess* )
{
setTransmitting( false );
@ -96,7 +96,7 @@ void SensorShellAgent::msgSent( KProcess* )
executeCommand();
}
void SensorShellAgent::msgRcvd( KProcess*, char *buffer, int buflen )
void SensorShellAgent::msgRcvd( TDEProcess*, char *buffer, int buflen )
{
if ( !buffer || buflen == 0 )
return;
@ -106,7 +106,7 @@ void SensorShellAgent::msgRcvd( KProcess*, char *buffer, int buflen )
processAnswer( aux );
}
void SensorShellAgent::errMsgRcvd( KProcess*, char *buffer, int buflen )
void SensorShellAgent::errMsgRcvd( TDEProcess*, char *buffer, int buflen )
{
if ( !buffer || buflen == 0 )
return;
@ -117,10 +117,10 @@ void SensorShellAgent::errMsgRcvd( KProcess*, char *buffer, int buflen )
<< endl << buf << endl;
}
void SensorShellAgent::daemonExited( KProcess *process )
void SensorShellAgent::daemonExited( TDEProcess *process )
{
kdDebug() << "daemonExited" << endl;
if ( mRetryCount-- <= 0 || !mDaemon->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if ( mRetryCount-- <= 0 || !mDaemon->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
kdDebug() << "daemon could not be restart" << endl;
setDaemonOnLine( false );
sensorManager()->hostLost( this );

12
ksysguard/gui/ksgrd/SensorShellAgent.h
Unescape View File

@ -29,7 +29,7 @@
class TQString;
class KProcess;
class TDEProcess;
namespace KSGRD {
@ -57,16 +57,16 @@ class SensorShellAgent : public SensorAgent
void hostInfo( TQString &shell, TQString &command, int &port) const;
private slots:
void msgSent( KProcess* );
void msgRcvd( KProcess*, char *buffer, int buflen );
void errMsgRcvd( KProcess*, char *buffer, int buflen );
void daemonExited( KProcess* );
void msgSent( TDEProcess* );
void msgRcvd( TDEProcess*, char *buffer, int buflen );
void errMsgRcvd( TDEProcess*, char *buffer, int buflen );
void daemonExited( TDEProcess* );
private:
bool writeMsg( const char *msg, int len );
bool txReady();
TQGuardedPtr<KProcess> mDaemon;
TQGuardedPtr<TDEProcess> mDaemon;
TQString mShell;
TQString mCommand;
int mRetryCount;

12
ksysguard/gui/ksysguard.cc
Unescape View File

@ -77,7 +77,7 @@ TopLevel::TopLevel( const char *name )
mSplitter = new TQSplitter( this );
mSplitter->setOrientation( Qt::Horizontal );
mSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
setCentralWidget( mSplitter );
mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr );
@ -162,7 +162,7 @@ void TopLevel::resetWorkSheets()
mWorkSpace->removeAllWorkSheets();
KStandardDirs* kstd = KGlobal::dirs();
KStandardDirs* kstd = TDEGlobal::dirs();
kstd->addResourceType( "data", "share/apps/ksysguard" );
TQString workDir = kstd->saveLocation( "data", "ksysguard" );
@ -444,8 +444,8 @@ void TopLevel::answerReceived( int id, const TQString &answer )
case 2:
mUsed = answer.toLong();
s = i18n( "Memory: %1 %2 used, %3 %4 free" )
.arg( KGlobal::locale()->formatNumber( mUsed, 0 ) ).arg( unit )
.arg( KGlobal::locale()->formatNumber( mFree, 0 ) ).arg( unit );
.arg( TDEGlobal::locale()->formatNumber( mUsed, 0 ) ).arg( unit )
.arg( TDEGlobal::locale()->formatNumber( mFree, 0 ) ).arg( unit );
statusBar()->changeItem( s, 1 );
break;
@ -504,8 +504,8 @@ void TopLevel::setSwapInfo( long used, long free, const TQString &unit )
msg = i18n( "No swap space available" );
else {
msg = i18n( "Swap: %1 %2 used, %3 %4 free" )
.arg( KGlobal::locale()->formatNumber( used, 0 ) ).arg( unit )
.arg( KGlobal::locale()->formatNumber( free, 0 ) ).arg( unit );
.arg( TDEGlobal::locale()->formatNumber( used, 0 ) ).arg( unit )
.arg( TDEGlobal::locale()->formatNumber( free, 0 ) ).arg( unit );
}
statusBar()->changeItem( msg, 2 );

2
ksystraycmd/ksystraycmd.cpp
Unescape View File

@ -180,7 +180,7 @@ bool KSysTrayCmd::startClient()
client = new KShellProcess();
*client << command;
connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) );
connect( client, TQT_SIGNAL( processExited(KProcess *) ),
connect( client, TQT_SIGNAL( processExited(TDEProcess *) ),
this, TQT_SLOT( clientExited() ) );
return client->start();

2
ksystraycmd/main.cpp
Unescape View File

@ -95,7 +95,7 @@ int main( int argc, char *argv[] )
// Read the command
TQString command;
for ( int i = 0; i < args->count(); i++ )
command += KProcess::quote(TQString::fromLocal8Bit( args->arg(i) )) + " ";
command += TDEProcess::quote(TQString::fromLocal8Bit( args->arg(i) )) + " ";
if ( !command.isEmpty() )
cmd.setCommand( command );

4
kxkb/TODO
Unescape View File

@ -14,8 +14,8 @@
- prevent application/window list from growing endlessly
- bug 59203: call kcontrol/keys/modifiers.cpp:
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();
after each switch

22
kxkb/extension.cpp
Unescape View File

@ -41,7 +41,7 @@ XKBExtension::XKBExtension(Display *d)
d = tqt_xdisplay();
m_dpy = d;
// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
// TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
// m_tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
m_tempDir = locateLocal("tmp", "");
}
@ -99,17 +99,17 @@ bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
if (options.isEmpty())
return true;
TQString exe = KGlobal::dirs()->findExe("setxkbmap");
TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
if (exe.isEmpty())
return false;
KProcess p;
TDEProcess p;
p << exe;
if( resetOld )
p << "-option";
p << "-option" << options;
p.start(KProcess::Block);
p.start(TDEProcess::Block);
return p.normalExit() && (p.exitStatus() == 0);
}
@ -150,7 +150,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
if ( layout.isEmpty() )
return false;
TQString exe = KGlobal::dirs()->findExe("setxkbmap");
TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
if( exe.isEmpty() ) {
kdError() << "Can't find setxkbmap" << endl;
return false;
@ -168,7 +168,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
fullVariant += variant;
}
KProcess p;
TDEProcess p;
p << exe;
// p << "-rules" << rule;
if( model.isEmpty() == false )
@ -177,19 +177,19 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
if( !fullVariant.isNull() && !fullVariant.isEmpty() )
p << "-variant" << fullVariant;
p.start(KProcess::Block);
p.start(TDEProcess::Block);
// reload system-wide hotkey-setup keycode -> keysym maps
if ( TQFile::exists( "/opt/trinity/share/apps/kxkb/system.xmodmap" ) ) {
KProcess pXmodmap;
TDEProcess pXmodmap;
pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
pXmodmap.start(KProcess::Block);
pXmodmap.start(TDEProcess::Block);
}
if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
KProcess pXmodmapHome;
TDEProcess pXmodmapHome;
pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
pXmodmapHome.start(KProcess::Block);
pXmodmapHome.start(TDEProcess::Block);
}
return p.normalExit() && (p.exitStatus() == 0);

6
kxkb/kcmmisc.cpp
Unescape View File

@ -528,14 +528,14 @@ void set_repeatrate(int delay, double rate)
else
r = (int)floor(rate + 0.5);
TQString exe = KGlobal::dirs()->findExe("xset");
TQString exe = TDEGlobal::dirs()->findExe("xset");
if (exe.isEmpty())
return;
KProcess p;
TDEProcess p;
p << exe << "r" << "rate" << TQString::number(delay) << TQString::number(r);
p.start(KProcess::Block);
p.start(TDEProcess::Block);
}
#endif

12
kxkb/kxkb.cpp
Unescape View File

@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
}
// keep in sync with kcmlayout.cpp
keys = new KGlobalAccel(TQT_TQOBJECT(this));
keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
#include "kxkbbindings.cpp"
keys->updateConnections();
@ -180,7 +180,7 @@ bool KXKBApp::settingsRead()
initTray();
KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
keys->readSettings();
keys->updateConnections();
@ -268,9 +268,9 @@ void KXKBApp::menuActivated(int id)
}
else if (id == KxkbLabelController::CONFIG_MENU_ID)
{
KProcess p;
TDEProcess p;
p << "kcmshell" << "keyboard_layout";
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
}
else if (id == KxkbLabelController::HELP_MENU_ID)
{
@ -324,7 +324,7 @@ void KXKBApp::slotSettingsChanged(int category)
if ( category != TDEApplication::SETTINGS_SHORTCUTS)
return;
KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
keys->readSettings();
keys->updateConnections();
}
@ -347,7 +347,7 @@ This is done by loading each one of them and then dumping the compiled
map from the X server into our local buffer.*/
// void KXKBApp::initPrecompiledLayouts()
// {
// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" );
// TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
// TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
//
// TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();

4
kxkb/kxkb.h
Unescape View File

@ -39,7 +39,7 @@ DESCRIPTION
class XKBExtension;
class XkbRules;
class KGlobalAccel;
class TDEGlobalAccel;
class KWinModule;
class LayoutMap;
@ -91,7 +91,7 @@ private:
XKBExtension *m_extension;
XkbRules *m_rules;
KxkbLabelController *m_tray;
KGlobalAccel *keys;
TDEGlobalAccel *keys;
KWinModule* kWinModule;
bool m_forceSetXKBMap;
};

2
libkonq/favicons/favicons.cpp
Unescape View File

@ -59,7 +59,7 @@ FaviconsModule::FaviconsModule(const TQCString &obj)
{
// create our favicons folder so that KIconLoader knows about it
d = new FaviconsModulePrivate;
d->faviconsDir = KGlobal::dirs()->saveLocation( "cache", "favicons/" );
d->faviconsDir = TDEGlobal::dirs()->saveLocation( "cache", "favicons/" );
d->faviconsDir.truncate(d->faviconsDir.length()-9); // Strip off "favicons/"
d->metaData.insert("ssl_no_client_cert", "TRUE");
d->metaData.insert("ssl_militant", "TRUE");

8
libkonq/kfileivi.cc
Unescape View File

@ -98,7 +98,7 @@ void KFileIVI::invalidateThumb( int state, bool redraw )
break;
}
d->icons = TQIconSet();
d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( d->thumb, KIcon::Desktop, state ),
TQIconSet::Large, mode );
m_state = state;
@ -206,7 +206,7 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap )
// TQIconSet::reset() doesn't seem to clear the other generated pixmaps,
// so we just create a blank TQIconSet here
d->icons = TQIconSet();
d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( pixmap, KIcon::Desktop, KIcon::DefaultState ),
TQIconSet::Large, TQIconSet::Normal );
@ -244,7 +244,7 @@ void KFileIVI::setEffect( int state )
}
// Do not update if the fingerprint is identical (prevents flicker)!
KIconEffect *effect = KGlobal::iconLoader()->iconEffect();
KIconEffect *effect = TDEGlobal::iconLoader()->iconEffect();
bool haveEffect = effect->hasEffect( KIcon::Desktop, m_state ) !=
effect->hasEffect( KIcon::Desktop, state );
@ -459,7 +459,7 @@ int KFileIVI::compare( TQIconViewItem *i ) const
void KFileIVI::updatePixmapSize()
{
int size = m_size ? m_size :
KGlobal::iconLoader()->currentSize( KIcon::Desktop );
TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>( iconView() );

8
libkonq/konq_bgnddlg.cc
Unescape View File

@ -130,11 +130,11 @@ TQColor KonqBgndDialog::color() const
void KonqBgndDialog::initPictures()
{
KGlobal::dirs()->addResourceType( "tiles",
KGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
kdDebug(1203) << KGlobal::dirs()->kde_default("data") + "konqueror/tiles/" << endl;
TDEGlobal::dirs()->addResourceType( "tiles",
TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
kdDebug(1203) << TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/" << endl;
TQStringList list = KGlobal::dirs()->findAllResources("tiles");
TQStringList list = TDEGlobal::dirs()->findAllResources("tiles");
if ( list.isEmpty() )
m_comboPicture->comboBox()->insertItem( i18n("None") );

14
libkonq/konq_dirpart.cc
Unescape View File

@ -64,7 +64,7 @@ public:
void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
{
KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
iconSize.resize(1);
if (root) {
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
@ -106,7 +106,7 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred)
{
int s1 = iconSize[1];
if (preferred == 0) return KGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (preferred <= s1) return s1;
for (uint i = 2; i <= iconSize.count(); i++) {
if (preferred <= iconSize[i]) {
@ -183,7 +183,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
d->iconSize[6] = KIcon::SizeEnormous; // 128
d->iconSize[7] = 192;
d->iconSize[8] = 256;
KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
if (root)
{
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
@ -280,7 +280,7 @@ TQScrollView * KonqDirPart::scrollWidget()
void KonqDirPart::slotBackgroundSettings()
{
TQColor bgndColor = m_pProps->bgColor( widget() );
TQColor defaultColor = KGlobalSettings::baseColor();
TQColor defaultColor = TDEGlobalSettings::baseColor();
// dlg must be created on the heap as widget() can get deleted while dlg.exec(),
// trying to delete dlg as its child then (#124210) - Frank Osterfeld
TQGuardedPtr<KonqBgndDialog> dlg = new KonqBgndDialog( widget(),
@ -571,7 +571,7 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn )
void KonqDirPart::slotIncIconSize()
{
int s = m_pProps->iconSize();
s = s ? s : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@ -587,7 +587,7 @@ void KonqDirPart::slotIncIconSize()
void KonqDirPart::slotDecIconSize()
{
int s = m_pProps->iconSize();
s = s ? s : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@ -603,7 +603,7 @@ void KonqDirPart::slotDecIconSize()
// Only updates Actions, a GUI update is done in the views by reimplementing this
void KonqDirPart::newIconSize( int size /*0=default, or 16,32,48....*/ )
{
int realSize = (size==0) ? KGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size;
int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size;
m_paDecIconSize->setEnabled(realSize > d->iconSize[1]);
m_paIncIconSize->setEnabled(realSize < d->iconSize.back());

2
libkonq/konq_filetip.cc
Unescape View File

@ -136,7 +136,7 @@ void KonqFileTip::reposition()
// 4+: none
m_corner = 0;
// should the tooltip be shown to the left or to the right of the ivi ?
TQRect desk = KGlobalSettings::desktopGeometry(rect.center());
TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center());
if (rect.center().x() + width() > desk.right())
{
// to the left

6
libkonq/konq_historymgr.cc
Unescape View File

@ -40,7 +40,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_updateTimer = new TQTimer( this );
// defaults
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
m_maxCount = config->readNumEntry( "Maximum of History entries", 500 );
m_maxCount = TQMAX( 1, m_maxCount );
@ -493,7 +493,7 @@ void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString )
clearPending();
adjustSize();
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum of History entries", m_maxCount );
@ -509,7 +509,7 @@ void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString )
clearPending();
adjustSize();
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum age of History entries", m_maxAgeDays );

42
libkonq/konq_iconviewwidget.cc
Unescape View File

@ -227,7 +227,7 @@ void KonqIconViewWidget::slotIconChanged( int group )
void KonqIconViewWidget::readAnimatedIconsConfig()
{
KConfigGroup cfgGroup( KGlobal::config(), "DesktopIcons" );
KConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" );
d->doAnimations = cfgGroup.readBoolEntry( "Animated", true /*default*/ );
}
@ -292,7 +292,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
else
#endif
{
TQMovie movie = KGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
TQMovie movie = TDEGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
if ( !movie.isNull() )
{
delete d->m_movie;
@ -348,7 +348,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (d->bSoundPreviews && d->pSoundPlayer &&
d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype())
&& KGlobalSettings::showFilePreview(item->item()->url())
&& TDEGlobalSettings::showFilePreview(item->item()->url())
&& topLevelWidget() == kapp->activeWindow())
{
d->pSoundItem = item;
@ -467,7 +467,7 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect )
// This can happen if the icon was scaled to the desired size, so KIconLoader
// will happily return a movie with different dimensions than the icon
int iconSize=d->pActiveItem->iconSize();
if (iconSize==0) iconSize = KGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if ( frame.width() != iconSize || frame.height() != iconSize ) {
d->pActiveItem->setAnimated( false );
d->m_movie->pause();
@ -607,7 +607,7 @@ bool KonqIconViewWidget::boostPreview() const
{
if ( m_bDesktop ) return false;
KConfigGroup group( KGlobal::config(), "PreviewSettings" );
KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
return group.readBoolEntry( "BoostSize", false );
}
@ -636,7 +636,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
if ( sizeChanged || previewSizeChanged )
{
int realSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
// choose spacing depending on font, but min 5 (due to KFileIVI move limit)
setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ?
QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
@ -707,7 +707,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
{
// can't call gridXValue() because this already would need the new itemTextPos()
int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if ( m_bSetGridX )
if ( pos == TQIconView::Bottom )
@ -725,7 +725,7 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
int* nx, int* ny )
{
int previewSize = previewIconSize( m_size );
int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
// Grid size
// as KFileIVI limits to move an icon to x >= 5, y >= 5, we define a grid cell as:
@ -786,7 +786,7 @@ void KonqIconViewWidget::calculateGridX()
int KonqIconViewWidget::gridXValue() const
{
// this method is only used in konqi as filemanager (not desktop)
int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int newGridX;
if ( itemTextPos() == TQIconView::Bottom )
@ -811,7 +811,7 @@ void KonqIconViewWidget::setURL( const KURL &kurl )
stopImagePreview();
m_url = kurl;
d->pFileTip->setPreview( KGlobalSettings::showFilePreview(m_url) );
d->pFileTip->setPreview( TDEGlobalSettings::showFilePreview(m_url) );
if ( m_url.isLocalFile() )
m_dotDirectoryPath = m_url.path(1).append( ".directory" );
@ -824,7 +824,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
stopImagePreview(); // just in case
// Check config
if ( !KGlobalSettings::showFilePreview( url() ) ) {
if ( !TDEGlobalSettings::showFilePreview( url() ) ) {
kdDebug(1203) << "Previews disabled for protocol " << url().protocol() << endl;
emit imagePreviewFinished();
return;
@ -858,7 +858,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
return; // don't start the preview job if not really necessary
}
int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int size;
d->bBoostPreview = boostPreview();
@ -1099,7 +1099,7 @@ void KonqIconViewWidget::slotSelectionChanged()
KURL url = item->url();
TQString local_path = item->localPath();
if ( url.directory(false) == KGlobalSettings::trashPath() )
if ( url.directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
if ( KProtocolInfo::supportsDeleting( url ) )
canDel++;
@ -1287,7 +1287,7 @@ void KonqIconViewWidget::doubleClickTimeout()
{
url= ( static_cast<KFileIVI *>( item ) )->item()->url();
bool brenameTrash =false;
if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
@ -1366,9 +1366,9 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
{
url = ( static_cast<KFileIVI *>( item ) )->item()->url();
bool brenameTrash =false;
if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
{
d->firstClick = true;
d->mousePos = e->pos();
@ -1564,7 +1564,7 @@ void KonqIconViewWidget::lineupIcons()
return;
}
int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
typedef TQValueList<TQIconViewItem*> Bin;
Bin*** bins = new Bin**[nx];
@ -1809,7 +1809,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
int KonqIconViewWidget::largestPreviewIconSize( int size ) const
{
int iconSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (iconSize < 28)
return 48;
@ -1825,7 +1825,7 @@ int KonqIconViewWidget::largestPreviewIconSize( int size ) const
int KonqIconViewWidget::previewIconSize( int size ) const
{
int iconSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (!d->bBoostPreview)
return iconSize;
@ -1848,7 +1848,7 @@ void KonqIconViewWidget::visualActivate(TQIconViewItem * item)
// Adjust for scrolling (David)
rect.moveBy( -contentsX(), -contentsY() );
if (KGlobalSettings::showKonqIconActivationEffect() == true) {
if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, item->pixmap());
}
}
@ -1895,7 +1895,7 @@ bool KonqIconViewWidget::caseInsensitiveSort() const
bool KonqIconViewWidget::canPreview( KFileItem* item )
{
if ( !KGlobalSettings::showFilePreview( url() ) )
if ( !TDEGlobalSettings::showFilePreview( url() ) )
return false;
if ( d->pPreviewMimeTypes == 0L )

14
libkonq/konq_operations.cc
Unescape View File

@ -77,7 +77,7 @@ KonqOperations::~KonqOperations()
void KonqOperations::editMimeType( const TQString & mimeType )
{
TQString keditfiletype = TQString::fromLatin1("keditfiletype");
KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
KRun::runCommand( keditfiletype + " " + TDEProcess::quote(mimeType),
keditfiletype, keditfiletype /*unused*/);
}
@ -474,7 +474,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
// (If this fails, there is a bug in KFileItem::acceptsDrops)
kdDebug(1203) << "KonqOperations::doDrop " << m_destURL.path() << "should be an executable" << endl;
Q_ASSERT ( access( TQFile::encodeName(m_destURL.path()), X_OK ) == 0 );
KProcess proc;
TDEProcess proc;
proc << m_destURL.path() ;
// Launch executable for each of the files
KURL::List lst = m_info->lst;
@ -482,7 +482,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
for ( ; it != lst.end() ; it++ )
proc << (*it).path(); // assume local files
kdDebug(1203) << "starting " << m_destURL.path() << " with " << lst.count() << " arguments" << endl;
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
}
delete this;
}
@ -503,7 +503,7 @@ void KonqOperations::doFileCopy()
mlst.append(*it);
if ( local && KDesktopFile::isDesktopFile((*it).path()))
isDesktopFile = true;
if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))
if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath()))
itemIsOnDesktop = true;
if ( local || (*it).protocol() != "trash" )
allItemsAreFromTrash = false;
@ -511,7 +511,7 @@ void KonqOperations::doFileCopy()
bool linkOnly = false;
if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
(m_destURL.path(1) == KGlobalSettings::desktopPath()) )
(m_destURL.path(1) == TDEGlobalSettings::desktopPath()) )
{
linkOnly = true;
}
@ -638,10 +638,10 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
op->setOperation( job, MOVE, lst, newurl );
(void) new KonqCommandRecorder( KonqCommand::MOVE, lst, newurl, job );
// if moving the desktop then update config file and emit
if ( oldurl.isLocalFile() && oldurl.path(1) == KGlobalSettings::desktopPath() )
if ( oldurl.isLocalFile() && oldurl.path(1) == TDEGlobalSettings::desktopPath() )
{
kdDebug(1203) << "That rename was the Desktop path, updating config files" << endl;
KConfig *globalConfig = KGlobal::config();
KConfig *globalConfig = TDEGlobal::config();
KConfigGroupSaver cgs( globalConfig, "Paths" );
globalConfig->writePathEntry("Desktop" , newurl.path(), true, true );
globalConfig->sync();

4
libkonq/konq_pixmapprovider.cc
Unescape View File

@ -176,7 +176,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
// favicon? => blend the favicon in the large
if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) {
TQPixmap small = SmallIcon( icon, size );
big = KGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
big = TDEGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
KIcon::Panel, size );
int x = big.width() - small.width();
@ -195,7 +195,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
}
else // not a favicon..
big = KGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size );
big = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size );
return big;
}

4
libkonq/konq_popupmenu.cc
Unescape View File

@ -356,7 +356,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
bool isTrashLink = false;
m_lstPopupURLs.clear();
int id = 0;
setFont(KGlobalSettings::menuFont());
setFont(TDEGlobalSettings::menuFont());
m_pluginList.setAutoDelete( true );
m_ownActions.setHighlightingEnabled( true );
@ -706,7 +706,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
// findAllResources() also removes duplicates
const TQStringList entries = KGlobal::dirs()->findAllResources("data",
const TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
"konqueror/servicemenus/*.desktop",
false /* recursive */,
true /* unique */);

16
libkonq/konq_propsview.cc
Unescape View File

@ -121,15 +121,15 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
// So now we read the settings from the app global file, if this is the default props
if (!defaultProps)
{
KConfigGroupSaver cgs2(KGlobal::config(), "Settings");
m_textColor = KGlobal::config()->readColorEntry( "TextColor", &m_textColor );
m_bgColor = KGlobal::config()->readColorEntry( "BgColor", &m_bgColor );
m_bgPixmapFile = KGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile );
//kdDebug(1203) << "KonqPropsView::KonqPropsView from KGlobal : BgImage=" << m_bgPixmapFile << endl;
KConfigGroupSaver cgs2(TDEGlobal::config(), "Settings");
m_textColor = TDEGlobal::config()->readColorEntry( "TextColor", &m_textColor );
m_bgColor = TDEGlobal::config()->readColorEntry( "BgColor", &m_bgColor );
m_bgPixmapFile = TDEGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile );
//kdDebug(1203) << "KonqPropsView::KonqPropsView from TDEGlobal : BgImage=" << m_bgPixmapFile << endl;
}
KGlobal::dirs()->addResourceType("tiles",
KGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
TDEGlobal::dirs()->addResourceType("tiles",
TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
}
bool KonqPropsView::isCaseInsensitiveSort() const
@ -169,7 +169,7 @@ KConfigBase * KonqPropsView::currentColorConfig()
return currentConfig(); // Will create it if necessary
else
// Save color settings in app's file, not in view's file
return KGlobal::config();
return TDEGlobal::config();
}
KonqPropsView::~KonqPropsView()

8
libkonq/konq_settings.cc
Unescape View File

@ -48,7 +48,7 @@ KonqFMSettings * KonqFMSettings::settings()
{
if (!s_pSettings)
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cgs(config, "FMSettings");
s_pSettings = new KonqFMSettings(config);
}
@ -60,7 +60,7 @@ void KonqFMSettings::reparseConfiguration()
{
if (s_pSettings)
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cgs(config, "FMSettings");
s_pSettings->init( config );
}
@ -82,9 +82,9 @@ void KonqFMSettings::init( KConfig * config )
// Fonts and colors
m_standardFont = config->readFontEntry( "StandardFont" );
m_normalTextColor = KGlobalSettings::textColor();
m_normalTextColor = TDEGlobalSettings::textColor();
m_normalTextColor = config->readColorEntry( "NormalTextColor", &m_normalTextColor );
m_highlightedTextColor = KGlobalSettings::highlightedTextColor();
m_highlightedTextColor = TDEGlobalSettings::highlightedTextColor();
m_highlightedTextColor = config->readColorEntry( "HighlightedTextColor", &m_highlightedTextColor );
m_itemTextBackground = config->readColorEntry( "ItemTextBackground" );

2
libkonq/konq_settings.h
Unescape View File

@ -63,7 +63,7 @@ public:
/**
* Reparse the configuration to update the already-created instances
*
* Warning : you need to call KGlobal::config()->reparseConfiguration()
* Warning : you need to call TDEGlobal::config()->reparseConfiguration()
* first (This is not done here so that the caller can avoid too much
* reparsing if having several classes from the same config file)
*/

6
libkonq/konq_xmlguiclient.cc
Unescape View File

@ -77,7 +77,7 @@ void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu )
void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
{
static const TQString& tagAction = KGlobal::staticQString( "action" );
static const TQString& tagAction = TDEGlobal::staticQString( "action" );
if (!kapp->authorizeKAction(name))
return;
@ -96,7 +96,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
void KonqXMLGUIClient::addSeparator( const TQDomElement &menu )
{
static const TQString& tagSeparator = KGlobal::staticQString( "separator" );
static const TQString& tagSeparator = TDEGlobal::staticQString( "separator" );
TQDomElement parent = menu;
if ( parent.isNull() ) {
@ -110,7 +110,7 @@ void KonqXMLGUIClient::addSeparator( const TQDomElement &menu )
//void KonqXMLGUIClient::addWeakSeparator()
//{
// static const TQString& tagWeakSeparator = KGlobal::staticQString( "weakSeparator" );
// static const TQString& tagWeakSeparator = TDEGlobal::staticQString( "weakSeparator" );
// m_menuElement.appendChild( m_doc.createElement( tagWeakSeparator ) );
//}

12
nsplugins/nspluginloader.cpp
Unescape View File

@ -331,17 +331,17 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
kdDebug() << "NSPluginLoader::loadViewer" << endl;
_running = false;
_process = new KProcess;
_process = new TDEProcess;
// get the dcop app id
int pid = (int)getpid();
_dcopid.sprintf("nspluginviewer-%d", pid);
connect( _process, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(processTerminated(KProcess*)) );
connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(processTerminated(TDEProcess*)) );
// find the external viewer process
TQString viewer = KGlobal::dirs()->findExe("nspluginviewer");
TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer");
if (!viewer)
{
kdDebug() << "can't find nspluginviewer" << endl;
@ -352,7 +352,7 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
// find the external artsdsp process
if( _useArtsdsp && mimeType != "application/pdf" ) {
kdDebug() << "trying to use artsdsp" << endl;
TQString artsdsp = KGlobal::dirs()->findExe("artsdsp");
TQString artsdsp = TDEGlobal::dirs()->findExe("artsdsp");
if (!artsdsp)
{
kdDebug() << "can't find artsdsp" << endl;
@ -441,7 +441,7 @@ void NSPluginLoader::applicationRegistered( const TQCString& appId )
}
void NSPluginLoader::processTerminated(KProcess *proc)
void NSPluginLoader::processTerminated(TDEProcess *proc)
{
if ( _process == proc)
{

6
nsplugins/nspluginloader.h
Unescape View File

@ -39,7 +39,7 @@
#define EMBEDCLASS QXEmbed
class KProcess;
class TDEProcess;
class TQPushButton;
class TQGridLayout;
@ -106,13 +106,13 @@ protected:
protected slots:
void applicationRegistered( const TQCString& appId );
void processTerminated( KProcess *proc );
void processTerminated( TDEProcess *proc );
private:
TQStringList _searchPaths;
TQDict<TQString> _mapping, _filetype;
KProcess *_process;
TDEProcess *_process;
bool _running;
TQCString _dcopid;
NSPluginViewerIface_stub *_viewer;

12
nsplugins/pluginscan.cpp
Unescape View File

@ -121,7 +121,7 @@ bool isPluginMimeType( TQString fname )
void deletePluginMimeTypes()
{
// iterate through local mime type directories
TQString dir = KGlobal::dirs()->saveLocation( "mime" );
TQString dir = TDEGlobal::dirs()->saveLocation( "mime" );
kdDebug(1433) << "Removing nsplugin MIME types in " << dir << endl;
TQDir dirs( dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs );
if ( !dirs.exists() ) {
@ -168,7 +168,7 @@ void generateMimeType( TQString mime, TQString extensions, TQString pluginName,
kdDebug(1433) << "<- generateMimeType" << endl;
return;
}
dir = KGlobal::dirs()->saveLocation( "mime", mime.left(pos) );
dir = TDEGlobal::dirs()->saveLocation( "mime", mime.left(pos) );
name = mime.mid(pos);
// create mimelnk file
@ -455,7 +455,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
void writeServicesFile( TQStringList mimeTypes )
{
TQString fname = KGlobal::dirs()->saveLocation("services", "")
TQString fname = TDEGlobal::dirs()->saveLocation("services", "")
+ "/nsplugin.desktop";
kdDebug(1433) << "Creating services file " << fname << endl;
@ -566,12 +566,12 @@ int main( int argc, char **argv )
TQStringList searchPaths = getSearchPaths();
TQStringList mimeInfoList;
infoConfig = new KConfig( KGlobal::dirs()->saveLocation("data", "nsplugins") +
infoConfig = new KConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") +
"/pluginsinfo" );
infoConfig->writeEntry( "number", 0 );
// open the cache file for the mime information
TQString cacheName = KGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
TQString cacheName = TDEGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
kdDebug(1433) << "Creating MIME cache file " << cacheName << endl;
TQFile cachef(cacheName);
if (!cachef.open(IO_WriteOnly))
@ -625,7 +625,7 @@ int main( int argc, char **argv )
mimeTypes.append( type );
// check mimelnk file
TQString fname = KGlobal::dirs()->findResource("mime", type+".desktop");
TQString fname = TDEGlobal::dirs()->findResource("mime", type+".desktop");
if ( fname.isEmpty() || isPluginMimeType(fname) ) {
kdDebug(1433) << " - creating MIME type description" << endl;
removeExistingExtensions( extension );

10
nsplugins/viewer/nsplugin.cpp
Unescape View File

@ -514,20 +514,20 @@ void g_NPN_ReloadPlugins(NPBool reloadPages)
{
// http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api15.html#999713
kdDebug(1431) << "g_NPN_ReloadPlugins()" << endl;
KProcess p;
p << KGlobal::dirs()->findExe("nspluginscan");
TDEProcess p;
p << TDEGlobal::dirs()->findExe("nspluginscan");
if (reloadPages) {
// This is the proper way, but it cannot be done because we have no
// handle to the caller! How stupid! We cannot force all konqi windows
// to reload - that would be evil.
//p.start(KProcess::Block);
//p.start(TDEProcess::Block);
// Let's only allow the caller to be reloaded, not everything.
//if (_callback)
// _callback->reloadPage();
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
} else {
p.start(KProcess::DontCare);
p.start(TDEProcess::DontCare);
}
}

2
tdeprint/slave/kio_print.cpp
Unescape View File

@ -796,7 +796,7 @@ TQString KIO_Print::locateData(const TQString& item)
{
TQString path = locate("data", "tdeprint/template/"+item);
if (path.isEmpty())
path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
path = TDEGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true);
return path;
}

6
tdeprint/tdeprintfax/conffax.cpp
Unescape View File

@ -61,9 +61,9 @@ ConfFax::ConfFax(TQWidget *parent, const char *name)
void ConfFax::load()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
TQString v = conf->readEntry("Page", KGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
TQString v = conf->readEntry("Page", TDEGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter");
if (v == "letter") m_pagesize->setCurrentItem(1);
else if (v == "legal") m_pagesize->setCurrentItem(2);
else m_pagesize->setCurrentItem(0);
@ -73,7 +73,7 @@ void ConfFax::load()
void ConfFax::save()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
conf->writeEntry("Resolution", (m_resolution->currentItem() == 0 ? "High" : "Low"));
conf->writeEntry("Page", (m_pagesize->currentItem() == 0 ? "a4" : (m_pagesize->currentItem() == 1 ? "letter" : "legal")));

4
tdeprint/tdeprintfax/confgeneral.cpp
Unescape View File

@ -69,7 +69,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
void ConfGeneral::load()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("Personal");
m_name->setText(conf->readEntry("Name", getenv("USER")));
m_number->setText(conf->readEntry("Number"));
@ -80,7 +80,7 @@ void ConfGeneral::load()
void ConfGeneral::save()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("Personal");
conf->writeEntry("Name", m_name->text());
conf->writeEntry("Number", m_number->text());

4
tdeprint/tdeprintfax/confsystem.cpp
Unescape View File

@ -97,7 +97,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
void ConfSystem::load()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd));
m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
@ -130,7 +130,7 @@ void ConfSystem::load()
void ConfSystem::save()
{
m_commands[ m_current ] = m_command->text();
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
if (m_commands[EFAX_ID] != defaultCommand(efax_default_cmd))
conf->writePathEntry("EFax", m_commands[EFAX_ID]);

4
tdeprint/tdeprintfax/faxab.cpp
Unescape View File

@ -60,7 +60,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
l2->addWidget(m_ok, 0);
l2->addWidget(m_cancel, 0);
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup( "General" );
TQSize defsize( 400, 200 );
resize( conf->readSizeEntry( "ABSize", &defsize ) );
@ -71,7 +71,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
FaxAB::~FaxAB()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup( "General" );
conf->writeEntry( "ABSize", size() );
}

34
tdeprint/tdeprintfax/faxctrl.cpp
Unescape View File

@ -53,7 +53,7 @@
#include <stdlib.h>
#include <stdarg.h>
#define quote(x) KProcess::quote(x)
#define quote(x) TDEProcess::quote(x)
/** \brief Return a string for the page size.
*
@ -75,14 +75,14 @@ char const* pageSizeText(int size)
*/
static TQString pageSize()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("Fax");
return conf->readEntry("Page", pageSizeText(KGlobal::locale()->pageSize()));
return conf->readEntry("Page", pageSizeText(TDEGlobal::locale()->pageSize()));
}
static TQString stripNumber( const TQString& s )
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup( "Personal" );
// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
@ -193,7 +193,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
// unquote variables (they will be replaced with quoted values later)
TQValueStack<bool> stack;
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
TQString cmd = s;
@ -354,11 +354,11 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
FaxCtrl::FaxCtrl(TQWidget *parent, const char *name)
: TQObject(parent, name)
{
m_process = new KProcess();
m_process = new TDEProcess();
m_process->setUseShell(true);
connect(m_process, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
connect(m_process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
connect(m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles()));
m_logview = 0;
}
@ -390,14 +390,14 @@ bool FaxCtrl::send(KdeprintFax *f)
return true;
}
void FaxCtrl::slotReceivedStdout(KProcess*, char *buffer, int len)
void FaxCtrl::slotReceivedStdout(TDEProcess*, char *buffer, int len)
{
TQCString str(buffer, len);
kdDebug() << "Received stdout: " << str << endl;
addLog(TQString(str));
}
void FaxCtrl::slotProcessExited(KProcess*)
void FaxCtrl::slotProcessExited(TDEProcess*)
{
// we exited a process: if there's still entries in m_files, this was a filter
// process, else this was the fax process
@ -426,7 +426,7 @@ void FaxCtrl::slotProcessExited(KProcess*)
TQString FaxCtrl::faxCommand()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
TQString sys = conf->readPathEntry("System", "efax");
TQString cmd;
@ -465,7 +465,7 @@ void FaxCtrl::sendFax()
m_process->clearArguments();
*m_process << cmd;
addLog(i18n("Sending to fax using: %1").arg(cmd));
if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
emit faxSent(false);
else
emit message(i18n("Sending fax to %1...").arg( item.number ));
@ -490,11 +490,11 @@ void FaxCtrl::filter()
m_filteredfiles.prepend(tmp);
m_tempfiles.append(tmp);
m_process->clearArguments();
*m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters"))
*m_process << locate("data","tdeprintfax/anytops") << "-m" << TDEProcess::quote(locate("data","tdeprintfax/faxfilters"))
<< TQString::fromLatin1("--mime=%1").arg(mimeType)
<< "-p" << pageSize()
<< KProcess::quote(m_files[0]) << KProcess::quote(tmp);
if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
<< TDEProcess::quote(m_files[0]) << TDEProcess::quote(tmp);
if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
emit faxSent(false);
else
emit message(i18n("Filtering %1...").arg(m_files[0]));
@ -576,7 +576,7 @@ void FaxCtrl::addLog(const TQString& s, bool isTitle)
TQString FaxCtrl::faxSystem()
{
KConfig *conf = KGlobal::config();
KConfig *conf = TDEGlobal::config();
conf->setGroup("System");
TQString s = conf->readEntry("System", "efax");
s[0] = s[0].upper();

8
tdeprint/tdeprintfax/faxctrl.h
Unescape View File

@ -27,7 +27,7 @@
#include "tdeprintfax.h"
class KProcess;
class TDEProcess;
class TQTextEdit;
class FaxCtrl : public TQObject
@ -48,8 +48,8 @@ signals:
void faxSent(bool);
protected slots:
void slotReceivedStdout(KProcess*, char*, int);
void slotProcessExited(KProcess*);
void slotReceivedStdout(TDEProcess*, char*, int);
void slotProcessExited(TDEProcess*);
void cleanTempFiles();
void slotClearLog();
void slotCloseLog();
@ -63,7 +63,7 @@ protected:
void addLogTitle( const TQString& );
private:
KProcess *m_process;
TDEProcess *m_process;
TQString m_log, m_command;
TQStringList m_files, m_filteredfiles, m_tempfiles;
TQTextEdit *m_logview;

2
tdesu/tdesu/sudlg.cpp
Unescape View File

@ -17,7 +17,7 @@
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("super-user-command");
TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
if ( superUserCommand != "sudo" && superUserCommand != "su" ) {

4
tdesu/tdesu/tdesu.cpp
Unescape View File

@ -289,7 +289,7 @@ static int startApp()
// root uses TDEROOTHOME
// Translate the TDEHOME of this user to the new user.
TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localtdedir());
TQString kdeHome = TDEGlobal::dirs()->relativeLocation("home", TDEGlobal::dirs()->localtdedir());
if (kdeHome[0] != '/')
kdeHome.prepend("~/");
else
@ -332,7 +332,7 @@ static int startApp()
}
// Read configuration
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Passwords");
int timeout = config->readNumEntry("Timeout", defTimeout);

2
tdm/kfrontend/kfdialog.cpp
Unescape View File

@ -167,7 +167,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
TQLabel *label1 = new TQLabel( this );
label1->setPixmap( TQMessageBox::standardIcon( type ) );
TQLabel *label2 = new TQLabel( text, this );
TQRect d = KGlobalSettings::desktopGeometry(this);
TQRect d = TDEGlobalSettings::desktopGeometry(this);
if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5)
label2->setAlignment(TQt::WordBreak | TQt::AlignAuto );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );

30
tdm/kfrontend/kgapp.cpp
Unescape View File

@ -117,7 +117,7 @@ void GreeterApp::init()
startTimer( pingInterval * 60000 );
}
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
}
@ -202,11 +202,11 @@ kg_main( const char *argv0 )
TDEApplication::disableAutoDcopRegistration();
KCrash::setSafer( true );
KProcess *tsak = 0;
KProcess *proc = 0;
KProcess *comp = 0;
KProcess *dcop = 0;
KProcess *twin = 0;
TDEProcess *tsak = 0;
TDEProcess *proc = 0;
TDEProcess *comp = 0;
TDEProcess *dcop = 0;
TDEProcess *twin = 0;
#ifdef BUILD_TSAK
trinity_desktop_lock_use_sak = _useSAK;
@ -214,9 +214,9 @@ kg_main( const char *argv0 )
trinity_desktop_lock_use_sak = false;
#endif
if (trinity_desktop_lock_use_sak) {
tsak = new KProcess;
tsak = new TDEProcess;
*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
tsak->start(KProcess::Block, KProcess::AllOutput);
tsak->start(TDEProcess::Block, TDEProcess::AllOutput);
}
else {
remove(TSAK_FIFO_FILE);
@ -329,7 +329,7 @@ kg_main( const char *argv0 )
SecureDisplay( dpy );
if (!_grabServer) {
if (_useBackground) {
proc = new KProcess;
proc = new TDEProcess;
*proc << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "krootimage";
*proc << _backgroundCfg;
proc->start();
@ -339,20 +339,20 @@ kg_main( const char *argv0 )
}
if (!_compositor.isEmpty()) {
comp = new KProcess;
comp = new TDEProcess;
*comp << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _compositor.ascii();
comp->start(KProcess::NotifyOnExit, KProcess::Stdin);
comp->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin);
}
if (!_windowManager.isEmpty()) {
if (_windowManager == "twin") {
// Special case
// Start DCOP...
dcop = new KProcess;
dcop = new TDEProcess;
*dcop << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "dcopserver" << TQCString("--suicide");
dcop->start();
}
twin = new KProcess;
twin = new TDEProcess;
*twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
twin->start();
has_twin = true;
@ -384,7 +384,7 @@ kg_main( const char *argv0 )
cmd = G_Greet;
}
KProcess *proc2 = 0;
TDEProcess *proc2 = 0;
app->setOverrideCursor( Qt::WaitCursor );
FDialog *dialog = NULL;
#ifdef XDMCP
@ -440,7 +440,7 @@ kg_main( const char *argv0 )
TQCursor::setPos(oldCursorPos.x() + primaryScreenPosition.x(), oldCursorPos.y() + primaryScreenPosition.y());
#endif
if (*_preloader) {
proc2 = new KProcess;
proc2 = new TDEProcess;
*proc2 << _preloader;
proc2->start();
}

20
tdm/kfrontend/sakdlg.cc
Unescape View File

@ -125,17 +125,17 @@ SAKDlg::SAKDlg(TQWidget *parent)
installEventFilter(this);
mSAKProcess = new KProcess;
*mSAKProcess << "tdmtsak" << "dm";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
mSATDEProcess = new TDEProcess;
*mSATDEProcess << "tdmtsak" << "dm";
connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
mSATDEProcess->start();
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
}
void SAKDlg::slotSAKProcessExited()
void SAKDlg::slotSATDEProcessExited()
{
int retcode = mSAKProcess->exitStatus();
int retcode = mSATDEProcess->exitStatus();
if (retcode != 0) trinity_desktop_lock_use_sak = false;
closingDown = true;
hide();
@ -207,7 +207,7 @@ void SAKDlg::handleInputPipe(void) {
inputcommand = inputcommand.replace('\n', "");
TQStringList commandList = TQStringList::split('\t', inputcommand, false);
if ((*(commandList.at(0))) == "CLOSE") {
mSAKProcess->kill();
mSATDEProcess->kill();
}
if (!closingDown) {
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
@ -221,9 +221,9 @@ void SAKDlg::handleInputPipe(void) {
SAKDlg::~SAKDlg()
{
if ((mSAKProcess) && (mSAKProcess->isRunning())) {
mSAKProcess->kill(SIGTERM);
delete mSAKProcess;
if ((mSATDEProcess) && (mSATDEProcess->isRunning())) {
mSATDEProcess->kill(SIGTERM);
delete mSATDEProcess;
}
if (mPipe_fd != -1) {
closingDown = true;

4
tdm/kfrontend/sakdlg.h
Unescape View File

@ -37,7 +37,7 @@ public:
void closeDialogForced();
private slots:
void slotSAKProcessExited();
void slotSATDEProcessExited();
void handleInputPipe();
protected slots:
@ -52,7 +52,7 @@ private:
TQStringList layoutsList;
TQStringList::iterator currLayout;
int sPid, sFd;
KProcess* mSAKProcess;
TDEProcess* mSATDEProcess;
int mPipe_fd;
TQString mPipeFilename;

4
tdm/kfrontend/tdmshutdown.cpp
Unescape View File

@ -329,7 +329,7 @@ get_date( const char *str )
{
KProcIO prc;
prc << "/bin/date" << "+%s" << "-d" << str;
prc.start( KProcess::Block, false );
prc.start( TDEProcess::Block, false );
TQString dstr;
if (prc.readln( dstr, false, 0 ) < 0)
return -1;
@ -472,7 +472,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
{
setCaption(i18n("Shutdown TDE"));
bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
TQFrame* lfrm = new TQFrame( this );
TQHBoxLayout* hbuttonbox;

6
tdm/kfrontend/themer/tdmlabel.cpp
Unescape View File

@ -52,7 +52,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
label.prelight.present = false;
label.maximumWidth = -1;
const TQString locale = KGlobal::locale()->language();
const TQString locale = TDEGlobal::locale()->language();
// Read LABEL ID
TQDomNode n = node;
@ -267,8 +267,8 @@ KdmLabel::lookupText( const TQString &t )
m['d'] = TQString::number( KThemedGreeter::timedDelay );
m['s'] = KThemedGreeter::timedUser;
// xgettext:no-c-format
KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
TDEGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
m['c'] = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
return KMacroExpander::expandMacros( text, m );
}

2
tdm/kfrontend/themer/tdmpixmap.cpp
Unescape View File

@ -72,7 +72,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
if ((_compositor.isEmpty()) || (!argb_visual_available)) {
// Software blend only (no compositing support)
// Use the preset TDM background...
KStandardDirs *m_pDirs = KGlobal::dirs();
KStandardDirs *m_pDirs = TDEGlobal::dirs();
KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
config->setGroup("Desktop0");
pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));

6
tdmlib/kgreet_classic.cpp
Unescape View File

@ -180,7 +180,7 @@ KClassicGreeter::loadUsers( const TQStringList &users )
userNamesCompletion->setItems( users );
loginEdit->setCompletionObject( userNamesCompletion );
loginEdit->setAutoDeleteCompletionObject( true );
loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
}
void // virtual
@ -485,13 +485,13 @@ static bool init( const TQString &,
void *ctx )
{
echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
KGlobal::locale()->insertCatalogue( "kgreet_classic" );
TDEGlobal::locale()->insertCatalogue( "kgreet_classic" );
return true;
}
static void done( void )
{
KGlobal::locale()->removeCatalogue( "kgreet_classic" );
TDEGlobal::locale()->removeCatalogue( "kgreet_classic" );
}
static KGreeterPlugin *

6
tdmlib/kgreet_pam.cpp
Unescape View File

@ -223,7 +223,7 @@ KPamGreeter::loadUsers( const TQStringList &users )
userNamesCompletion->setItems( users );
loginEdit->setCompletionObject( userNamesCompletion );
loginEdit->setAutoDeleteCompletionObject( true );
loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
}
void // virtual
@ -643,13 +643,13 @@ static bool init( const TQString &,
void *ctx )
{
echoMode = (KPasswordEdit::EchoModes) getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
KGlobal::locale()->insertCatalogue( "kgreet_pam" );
TDEGlobal::locale()->insertCatalogue( "kgreet_pam" );
return true;
}
static void done( void )
{
KGlobal::locale()->removeCatalogue( "kgreet_pam" );
TDEGlobal::locale()->removeCatalogue( "kgreet_pam" );
if (log && log != stderr)
fclose(log);
log = 0;

10
tdmlib/kgreet_winbind.cpp
Unescape View File

@ -246,7 +246,7 @@ KWinbindGreeter::loadUsers( const TQStringList &users )
KCompletion *userNamesCompletion = new KCompletion;
loginEdit->setCompletionObject( userNamesCompletion );
loginEdit->setAutoDeleteCompletionObject( true );
loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
slotChangedDomain( defaultDomain );
}
@ -572,10 +572,10 @@ KWinbindGreeter::slotStartDomainList()
m_domainLister = new KProcIO;
connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
connect(m_domainLister, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotEndDomainList()));
connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList()));
(*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
m_domainLister->setComm (KProcess::Stdout);
m_domainLister->setComm (TDEProcess::Stdout);
m_domainLister->start();
}
@ -648,13 +648,13 @@ static bool init( const TQString &,
sepstr = "\\";
}
separator = sepstr[0].latin1();
KGlobal::locale()->insertCatalogue( "kgreet_winbind" );
TDEGlobal::locale()->insertCatalogue( "kgreet_winbind" );
return true;
}
static void done( void )
{
KGlobal::locale()->removeCatalogue( "kgreet_winbind" );
TDEGlobal::locale()->removeCatalogue( "kgreet_winbind" );
// avoid static deletion problems ... hopefully
staticDomains.clear();
defaultDomain = TQString::null;

2
tqt3integration/module/module.cpp
Unescape View File

@ -78,7 +78,7 @@ bool Module::initializeIntegration( const TQString& hostname )
if( hostname != getHostname())
return false;
// multihead support in KDE is just a hack, it wouldn't work very well anyway
if( KGlobalSettings::isMultiHead())
if( TDEGlobalSettings::isMultiHead())
return false;
return true;
}

16
twin/client.cpp
Unescape View File

@ -1819,25 +1819,25 @@ void Client::killProcess( bool ask, Time timestamp )
{
if( machine != "localhost" )
{
KProcess proc;
TDEProcess proc;
proc << "xon" << machine << "kill" << pid;
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
}
else
::kill( pid, SIGTERM );
}
else
{ // SELI TODO handle the window created by handler specially (on top,urgent?)
process_killer = new KProcess( this );
process_killer = new TDEProcess( this );
*process_killer << KStandardDirs::findExe( "twin_killer_helper" )
<< "--pid" << TQCString().setNum( pid ) << "--hostname" << machine
<< "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass()
<< "--wid" << TQCString().setNum( window())
<< "--timestamp" << TQCString().setNum( timestamp );
connect( process_killer, TQT_SIGNAL( processExited( KProcess* )),
connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )),
TQT_SLOT( processKillerExited()));
if( !process_killer->start( KProcess::NotifyOnExit ))
if( !process_killer->start( TDEProcess::NotifyOnExit ))
{
delete process_killer;
process_killer = NULL;
@ -1957,15 +1957,15 @@ bool Client::queryUserSuspendedResume()
return false;
}
// FIXME We should display a busy cursor until twin_resumer_helper loads
process_resumer = new KProcess( this );
process_resumer = new TDEProcess( this );
*process_resumer << KStandardDirs::findExe( "twin_resumer_helper" )
<< "--pid" << TQCString().setNum( info->pid() ) << "--hostname" << wmClientMachine( true )
<< "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass()
<< "--wid" << TQCString().setNum( window());
connect( process_resumer, TQT_SIGNAL( processExited( KProcess* )),
connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )),
TQT_SLOT( processResumerExited()));
if( !process_resumer->start( KProcess::NotifyOnExit ))
if( !process_resumer->start( TDEProcess::NotifyOnExit ))
{
delete process_resumer;
process_resumer = NULL;

6
twin/client.h
Unescape View File

@ -31,7 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "rules.h"
class TQTimer;
class KProcess;
class TDEProcess;
class KStartupInfoData;
namespace KWinInternal
@ -561,8 +561,8 @@ class Client : public TQObject, public KDecorationDefines
Window window_group;
Layer in_layer;
TQTimer* ping_timer;
KProcess* process_killer;
KProcess* process_resumer;
TDEProcess* process_killer;
TDEProcess* process_resumer;
Time ping_timestamp;
Time user_time;
unsigned long allowed_actions;

2
twin/clients/b2/config/config.cpp
Unescape View File

@ -33,7 +33,7 @@ extern "C"
B2Config::B2Config( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
KGlobal::locale()->insertCatalogue("twin_b2_config");
TDEGlobal::locale()->insertCatalogue("twin_b2_config");
b2Config = new KConfig("twinb2rc");
gb = new TQVBox(parent);

2
twin/clients/default/config/config.cpp
Unescape View File

@ -32,7 +32,7 @@ extern "C"
KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
KGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_clients");
highcolor = TQPixmap::defaultDepth() > 8;
gb = new TQVBox( parent );
gb->setSpacing( KDialog::spacingHint() );

2
twin/clients/default/kdedefault.cpp
Unescape View File

@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed )
unsigned long KDEDefaultHandler::readConfig( bool update )
{
unsigned long changed = 0;
KConfig* conf = KGlobal::config();
KConfig* conf = TDEGlobal::config();
conf->setGroup("KDEDefault");
bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true);

2
twin/clients/keramik/config/config.cpp
Unescape View File

@ -51,7 +51,7 @@ extern "C"
KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
KGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_clients");
c = new KConfig( "twinkeramikrc" );
ui = new KeramikConfigUI( parent );

6
twin/clients/kwmtheme/cli_installer/main.cpp
Unescape View File

@ -57,10 +57,10 @@ int main(int argc, char **argv)
return(2);
}
TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin");
TQStringList appDirs = TDEGlobal::dirs()->findDirs("data", "twin");
TQString localDirStr = *(appDirs.end());
if(localDirStr.isEmpty()){
localDirStr = KGlobal::dirs()->saveLocation("data", "twin");
localDirStr = TDEGlobal::dirs()->saveLocation("data", "twin");
}
localDirStr += "/pics/";
if(!TQFile::exists(localDirStr))
@ -69,7 +69,7 @@ int main(int argc, char **argv)
TQFileInfo fi(f);
KSimpleConfig input(fi.absFilePath());
srcStr = fi.dirPath(true) + "/";
KConfig *output = KGlobal::config();
KConfig *output = TDEGlobal::config();
input.setGroup("Window Border");
output->setGroup("General");

4
twin/clients/kwmtheme/kwmthemeclient.cpp
Unescape View File

@ -83,7 +83,7 @@ static void create_pixmaps()
return;
pixmaps_created = true;
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("General");
TQString tmpStr;
@ -270,7 +270,7 @@ void KWMThemeClient::init()
TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
layout->addLayout( hb, 1, 1 );
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
config->setGroup("Buttons");
TQString val;
MyButton *btn;

2
twin/clients/modernsystem/config/config.cpp
Unescape View File

@ -28,7 +28,7 @@ extern "C"
ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
{
clientrc = new KConfig("twinmodernsysrc");
KGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_clients");
mainw = new TQWidget(parent);
vbox = new TQVBoxLayout(mainw);
vbox->setSpacing(6);

2
twin/clients/plastik/config/config.cpp
Unescape View File

@ -39,7 +39,7 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent)
{
// create the configuration object
m_config = new KConfig("twinplastikrc");
KGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_clients");
// create and show the configuration dialog
m_dialog = new ConfigDialog(parent);

2
twin/clients/quartz/config/config.cpp
Unescape View File

@ -34,7 +34,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
quartzConfig = new KConfig("twinquartzrc");
KGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_clients");
gb = new TQVBox( parent );
cbColorBorder = new TQCheckBox(
i18n("Draw window frames using &titlebar colors"), gb );

2
twin/kcmtwin/twindecoration/buttons.cpp
Unescape View File

@ -607,7 +607,7 @@ void ButtonDropSite::drawContents( TQPainter* p )
TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour
p->fillRect( r, c1 );
p->setPen( Qt::white );
p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") );
offset = geometry().width() - 3 - rightoffset;

4
twin/kcmtwin/twindecoration/preview.cpp
Unescape View File

@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
TQIconSet KDecorationPreviewBridge::icon() const
{
return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
}
TQString KDecorationPreviewBridge::caption() const

6
twin/kcmtwin/twindecoration/twindecoration.cpp
Unescape View File

@ -399,7 +399,7 @@ KWinDecorationModule::~KWinDecorationModule()
// And insert these into a DecorationInfo structure
void KWinDecorationModule::findDecorations()
{
TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin");
TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin");
TQStringList::ConstIterator it;
for (it = dirList.begin(); it != dirList.end(); it++)
@ -819,13 +819,13 @@ void KWinDecorationModule::writeConfig( KConfig* conf )
wmExecutableName.truncate(descStart);
}
if (conf->readEntry("WMExecutable", "twin") != wmExecutableName) {
KProcess newWMProc;
TDEProcess newWMProc;
TQStringList wmstartupcommand;
wmstartupcommand.split(" ", thirdpartyWMArguments->text());
wmstartupcommand.prepend(wmExecutableName);
wmstartupcommand.append("--replace");
newWMProc << wmstartupcommand;
newWMProc.start(KProcess::DontCare, KProcess::NoCommunication);
newWMProc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
newWMProc.detach();
}
conf->writeEntry("WMExecutable", wmExecutableName);

12
twin/kcmtwin/twinoptions/main.cpp
Unescape View File

@ -39,7 +39,7 @@ extern "C"
KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
KConfig *c = new KConfig("twinrc", false, true);
return new KFocusConfig(true, c, parent, name);
}
@ -47,14 +47,14 @@ extern "C"
KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
return new KActionsOptions( parent, name);
}
KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
KConfig *c = new KConfig("twinrc", false, true);
return new KMovingConfig(true, c, parent, name);
}
@ -62,7 +62,7 @@ extern "C"
KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
KConfig *c = new KConfig("twinrc", false, true);
return new KAdvancedConfig(true, c, parent, name);
}
@ -70,7 +70,7 @@ extern "C"
KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
KConfig *c = new KConfig("twinrc", false, true);
return new KTranslucencyConfig(true, c, parent, name);
}
@ -78,7 +78,7 @@ extern "C"
KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name)
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue("kcmkwm");
TDEGlobal::locale()->insertCatalogue("kcmkwm");
return new KWinOptions( parent, name);
}
}

8
twin/kcmtwin/twinoptions/mouse.cpp
Unescape View File

@ -109,8 +109,8 @@ void createMaxButtonPixmaps()
"..............."},
};
TQString baseColor(". c " + KGlobalSettings::baseColor().name());
TQString textColor("# c " + KGlobalSettings::textColor().name());
TQString baseColor(". c " + TDEGlobalSettings::baseColor().name());
TQString textColor("# c " + TDEGlobalSettings::textColor().name());
for (int t = 0; t < 3; ++t)
{
maxButtonXpms[t][0] = "15 13 2 1";
@ -143,7 +143,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
TQString strMouseButton1, strMouseButton3, strMouseWheel;
TQString txtButton1, txtButton3, txtButton4;
TQStringList items;
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
/** Titlebar doubleclick ************/
@ -595,7 +595,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
TQString strMouseButton1, strMouseButton3;
TQString txtButton1, txtButton3;
TQStringList items;
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
bool leftHandedMouse = ( TDEGlobalSettings::mouseSettings().handed == TDEGlobalSettings::KMouseSettings::LeftHanded);
/** Inactive inner window ******************/

4
twin/kcmtwin/twinoptions/windows.cpp
Unescape View File

@ -1708,9 +1708,9 @@ void KTranslucencyConfig::defaults()
bool KTranslucencyConfig::kompmgrAvailable()
{
bool ret;
KProcess proc;
TDEProcess proc;
proc << "kompmgr" << "-v";
ret = proc.start(KProcess::DontCare, KProcess::AllOutput);
ret = proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
proc.detach();
return ret;
}

4
twin/kcmtwin/twinoptions/windows.h
Unescape View File

@ -238,7 +238,7 @@ private:
TQCheckBox* hideUtilityWindowsForInactive;
};
class KProcess;
class TDEProcess;
class KTranslucencyConfig : public KCModule
{
Q_OBJECT
@ -289,7 +289,7 @@ private:
void startKompmgr();
void stopKompmgr();
bool kompmgrAvailable_;
KProcess *kompmgr;
TDEProcess *kompmgr;
private slots:
void resetKompmgr();

2
twin/kcmtwin/twinrules/kcm.cpp
Unescape View File

@ -31,7 +31,7 @@ extern "C"
KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name )
{
//CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue( "kcmtwinrules" );
TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" );
return new KWinInternal::KCMRules( parent, name );
}

4
twin/killer/killer.cpp
Unescape View File

@ -77,9 +77,9 @@ int main( int argc, char* argv[] )
{
if( hostname != "localhost" )
{
KProcess proc;
TDEProcess proc;
proc << "xon" << hostname << "kill" << pid;
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
}
else
::kill( pid, SIGKILL );

2
twin/lib/kdecoration_p.cpp
Unescape View File

@ -145,7 +145,7 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
TQFont old_activeFontSmall = activeFontSmall;
TQFont old_inactiveFontSmall = inactiveFontSmall;
TQFont activeFontGuess = KGlobalSettings::windowTitleFont();
TQFont activeFontGuess = TDEGlobalSettings::windowTitleFont();
activeFont = config->readFontEntry("activeFont", &activeFontGuess);
inactiveFont = config->readFontEntry("inactiveFont", &activeFont);

8
twin/lib/kdecoration_plugins_p.cpp
Unescape View File

@ -168,13 +168,13 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
// For clients in tdeartwork
TQString catalogue = nameStr;
catalogue.replace( "twin3_", "twin_" );
KGlobal::locale()->insertCatalogue( catalogue );
TDEGlobal::locale()->insertCatalogue( catalogue );
// For KCommonDecoration based clients
KGlobal::locale()->insertCatalogue( "twin_lib" );
TDEGlobal::locale()->insertCatalogue( "twin_lib" );
// For clients in tdebase
KGlobal::locale()->insertCatalogue( "twin_clients" );
TDEGlobal::locale()->insertCatalogue( "twin_clients" );
// For clients in tdeartwork
KGlobal::locale()->insertCatalogue( "twin_art_clients" );
TDEGlobal::locale()->insertCatalogue( "twin_art_clients" );
old_library = oldLibrary; // save for delayed destroying
old_fact = oldFactory;

2
twin/main.cpp
Unescape View File

@ -307,7 +307,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
}
}
KGlobal::locale()->setMainCatalogue("twin");
TDEGlobal::locale()->setMainCatalogue("twin");
TDEAboutData aboutData( "twin", I18N_NOOP("TWin"),
version, description, TDEAboutData::License_GPL,

2
twin/options.cpp
Unescape View File

@ -46,7 +46,7 @@ Options::~Options()
unsigned long Options::updateSettings()
{
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
unsigned long changed = 0;
changed |= d->updateKWinSettings( config ); // read decoration settings

2
twin/plugins.cpp
Unescape View File

@ -20,7 +20,7 @@ namespace KWinInternal
{
PluginMgr::PluginMgr()
: KDecorationPlugins( KGlobal::config())
: KDecorationPlugins( TDEGlobal::config())
{
defaultPlugin = (TQPixmap::defaultDepth() > 8) ?
"twin3_plastik" : "twin3_quartz";

2
twin/popupinfo.cpp
Unescape View File

@ -116,7 +116,7 @@ void PopupInfo::hide()
void PopupInfo::reconfigure()
{
KConfig * c(KGlobal::config());
KConfig * c(TDEGlobal::config());
c->setGroup("PopupInfo");
m_show = c->readBoolEntry("ShowPopup", false );
m_delayTime = c->readNumEntry("PopupHideDelay", 350 );

8
twin/tabbox.cpp
Unescape View File

@ -667,7 +667,7 @@ void TabBox::hide()
void TabBox::reconfigure()
{
KConfig * c(KGlobal::config());
KConfig * c(TDEGlobal::config());
c->setGroup("TabBox");
options_traverse_all = c->readBoolEntry("TraverseAll", false );
}
@ -692,7 +692,7 @@ void TabBox::reconfigure()
*/
void TabBox::delayedShow()
{
KConfig * c(KGlobal::config());
KConfig * c(TDEGlobal::config());
c->setGroup("TabBox");
bool delay = c->readBoolEntry("ShowDelay", true);
@ -1060,8 +1060,8 @@ void Workspace::CDEWalkThroughWindows( bool forward )
Client* nc = c;
bool options_traverse_all;
{
KConfigGroupSaver saver( KGlobal::config(), "TabBox" );
options_traverse_all = KGlobal::config()->readBoolEntry("TraverseAll", false );
KConfigGroupSaver saver( TDEGlobal::config(), "TabBox" );
options_traverse_all = TDEGlobal::config()->readBoolEntry("TraverseAll", false );
}
Client* firstClient = 0;

2
twin/twinbindings.cpp
Unescape View File

@ -160,7 +160,7 @@
DEF( I18N_NOOP("Desktop Screenshot"), CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() );
#ifdef IN_KWIN
{
KGlobalAccel* keys = disable_shortcuts_keys;
TDEGlobalAccel* keys = disable_shortcuts_keys;
#endif
DEF( I18N_NOOP("Block Global Shortcuts"), 0, 0, slotDisableGlobalShortcuts());
#ifdef IN_KWIN

14
twin/useractions.cpp
Unescape View File

@ -50,13 +50,13 @@ TQPopupMenu* Workspace::clientPopup()
{
popup = new TQPopupMenu;
popup->setCheckable( TRUE );
popup->setFont(KGlobalSettings::menuFont());
popup->setFont(TDEGlobalSettings::menuFont());
connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) );
connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
advanced_popup = new TQPopupMenu( popup );
advanced_popup->setCheckable( TRUE );
advanced_popup->setFont(KGlobalSettings::menuFont());
advanced_popup->setFont(TDEGlobalSettings::menuFont());
connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
advanced_popup->insertItem( SmallIconSet( "up" ),
i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp );
@ -102,7 +102,7 @@ TQPopupMenu* Workspace::clientPopup()
popup->insertSeparator();
if (!KGlobal::config()->isImmutable() &&
if (!TDEGlobal::config()->isImmutable() &&
!kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
{
popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, TQT_SLOT( configureWM() ));
@ -200,7 +200,7 @@ void Workspace::initDesktopPopup()
desk_popup = new TQPopupMenu( popup );
desk_popup->setCheckable( TRUE );
desk_popup->setFont(KGlobalSettings::menuFont());
desk_popup->setFont(TDEGlobalSettings::menuFont());
connect( desk_popup, TQT_SIGNAL( activated(int) ),
this, TQT_SLOT( slotSendToDesktop(int) ) );
connect( desk_popup, TQT_SIGNAL( aboutToShow() ),
@ -258,10 +258,10 @@ void Workspace::closeActivePopup()
*/
void Workspace::initShortcuts()
{
keys = new KGlobalAccel( this );
// a separate KGlobalAccel is needed for the shortcut for disabling global shortcuts,
keys = new TDEGlobalAccel( this );
// a separate TDEGlobalAccel is needed for the shortcut for disabling global shortcuts,
// otherwise it would also disable itself
disable_shortcuts_keys = new KGlobalAccel( this );
disable_shortcuts_keys = new TDEGlobalAccel( this );
disable_shortcuts_keys->disableBlocking( true );
#define IN_KWIN
#include "twinbindings.cpp"

52
twin/workspace.cpp
Unescape View File

@ -55,7 +55,7 @@ extern int screen_number;
Workspace *Workspace::_self = 0;
KProcess* kompmgr = 0;
TDEProcess* kompmgr = 0;
KSelectionOwner* kompmgr_selection;
bool allowKompmgrRestart = TRUE;
@ -202,7 +202,7 @@ Workspace::Workspace( bool restore )
1
);
client_keys = new KGlobalAccel( this );
client_keys = new TDEGlobalAccel( this );
initShortcuts();
tab_box = new TabBox( this );
popupinfo = new PopupInfo( this );
@ -219,8 +219,8 @@ Workspace::Workspace( bool restore )
// start kompmgr - i wanted to put this into main.cpp, but that would prevent dcop support, as long as Application was no dcop_object
if (options->useTranslucency)
{
kompmgr = new KProcess;
connect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int)));
kompmgr = new TDEProcess;
connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
*kompmgr << "kompmgr";
startKompmgr();
}
@ -523,7 +523,7 @@ Workspace::~Workspace()
XDeleteProperty(tqt_xdisplay(), tqt_xrootwin(), atoms->twin_running);
writeWindowRules();
KGlobal::config()->sync();
TDEGlobal::config()->sync();
delete rootInfo;
delete supportWindow;
@ -1013,7 +1013,7 @@ void Workspace::slotReconfigure()
kdDebug(1212) << "Workspace::slotReconfigure()" << endl;
reconfigureTimer.stop();
KGlobal::config()->reparseConfiguration();
TDEGlobal::config()->reparseConfiguration();
unsigned long changed = options->updateSettings();
tab_box->reconfigure();
popupinfo->reconfigure();
@ -1146,7 +1146,7 @@ void Workspace::slotReconfigure()
void Workspace::loadDesktopSettings()
{
KConfig* c = KGlobal::config();
KConfig* c = TDEGlobal::config();
TQCString groupname;
if (screen_number == 0)
groupname = "Desktops";
@ -1175,7 +1175,7 @@ void Workspace::loadDesktopSettings()
void Workspace::saveDesktopSettings()
{
KConfig* c = KGlobal::config();
KConfig* c = TDEGlobal::config();
TQCString groupname;
if (screen_number == 0)
groupname = "Desktops";
@ -2761,7 +2761,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c )
}
else
assert( false );
KProcess proc;
TDEProcess proc;
proc << "kdialog" << args;
if( !type.isEmpty())
{
@ -2773,7 +2773,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c )
}
if( c != NULL )
proc << "--embed" << TQString::number( c->window());
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
}
@ -2800,14 +2800,14 @@ void Workspace::startKompmgr()
kompmgrReloadSettings();
return;
}
if (!kompmgr->start(KProcess::OwnGroup, KProcess::Stderr))
if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr))
{
options->useTranslucency = FALSE;
KProcess proc;
TDEProcess proc;
proc << "kdialog" << "--error"
<< i18n("The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory.")
<< "--title" << "Composite Manager Failure";
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
else
{
@ -2817,7 +2817,7 @@ void Workspace::startKompmgr()
kompmgr_selection = new KSelectionOwner( selection_name );
connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
kompmgr_selection->claim( true );
connect(kompmgr, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(restartKompmgr(KProcess*)));
connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*)));
options->useTranslucency = TRUE;
//allowKompmgrRestart = FALSE;
//TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
@ -2836,7 +2836,7 @@ void Workspace::stopKompmgr()
}
delete kompmgr_selection;
kompmgr_selection = NULL;
kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(KProcess*)));
kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*)));
options->useTranslucency = FALSE;
if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
kompmgr->kill(SIGKILL);
@ -2864,7 +2864,7 @@ void Workspace::unblockKompmgrRestart()
allowKompmgrRestart = TRUE;
}
void Workspace::restartKompmgr( KProcess *proc )
void Workspace::restartKompmgr( TDEProcess *proc )
// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr()));
{
bool crashed;
@ -2882,11 +2882,11 @@ void Workspace::restartKompmgr( KProcess *proc )
kompmgr_selection = NULL;
options->useTranslucency = FALSE;
if (crashed) {
KProcess proc;
TDEProcess proc;
proc << "kdialog" << "--error"
<< i18n( "The Composite Manager crashed twice within a minute and is therefore disabled for this session.")
<< "--title" << i18n("Composite Manager Failure");
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
return;
}
@ -2895,21 +2895,21 @@ void Workspace::restartKompmgr( KProcess *proc )
// this should be useless, i keep it for maybe future need
// if (!kcompmgr)
// {
// kompmgr = new KProcess;
// kompmgr = new TDEProcess;
// kompmgr->clearArguments();
// *kompmgr << "kompmgr";
// }
// -------------------
if (!kompmgr->start(KProcess::NotifyOnExit, KProcess::Stderr))
if (!kompmgr->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr))
{
delete kompmgr_selection;
kompmgr_selection = NULL;
options->useTranslucency = FALSE;
KProcess proc;
TDEProcess proc;
proc << "kdialog" << "--error"
<< i18n("The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory.")
<< "--title" << i18n("Composite Manager Failure");
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
else
{
@ -2919,7 +2919,7 @@ void Workspace::restartKompmgr( KProcess *proc )
}
}
void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
{
TQString message;
TQString output = TQString::fromLocal8Bit( buffer, buflen );
@ -2941,14 +2941,14 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
else return; //skip others
// kompmgr startup failed or succeeded, release connection
kompmgr->closeStderr();
disconnect(kompmgr, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(KProcess*, char*, int)));
disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
if( !message.isEmpty())
{
KProcess proc;
TDEProcess proc;
proc << "kdialog" << "--error"
<< message
<< "--title" << i18n("Composite Manager Failure");
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
}
}

14
twin/workspace.h
Unescape View File

@ -28,14 +28,14 @@ License. See the file "COPYING" for the exact licensing terms.
class TQPopupMenu;
class KConfig;
class KGlobalAccel;
class TDEGlobalAccel;
class KShortcutDialog;
class KStartupInfo;
class KStartupInfoId;
class KStartupInfoData;
class TQSlider;
class TQPushButton;
class KProcess;
class TDEProcess;
namespace KWinInternal
{
@ -411,8 +411,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
void resetClientOpacity();
void setTransButtonText(int value);
void unblockKompmgrRestart();
void restartKompmgr( KProcess *proc );
void handleKompmgrOutput( KProcess *proc, char *buffer, int buflen);
void restartKompmgr( TDEProcess *proc );
void handleKompmgrOutput( TDEProcess *proc, char *buffer, int buflen);
void stopKompmgr();
void kompmgrReloadSettings();
// end
@ -584,11 +584,11 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
TQPopupMenu *desk_popup;
int desk_popup_index;
KGlobalAccel *keys;
KGlobalAccel *client_keys;
TDEGlobalAccel *keys;
TDEGlobalAccel *client_keys;
ShortcutDialog* client_keys_dialog;
Client* client_keys_client;
KGlobalAccel *disable_shortcuts_keys;
TDEGlobalAccel *disable_shortcuts_keys;
bool global_shortcuts_disabled;
bool global_shortcuts_disabled_for_client;

Write Preview
Loading…
Cancel
Save