From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kdesktop/bgmanager.cc | 4 ++-- kdesktop/desktop.cc | 26 +++++++++++++------------- kdesktop/desktop.h | 4 ++-- kdesktop/init.cc | 18 +++++++++--------- kdesktop/kcustommenu.cc | 4 ++-- kdesktop/kdesktop.kcfg | 4 ++-- kdesktop/kdiconview.cc | 16 ++++++++-------- kdesktop/kfileividesktop.cpp | 2 +- kdesktop/krootwm.cc | 12 ++++++------ kdesktop/lock/lockdlg.cc | 2 +- kdesktop/lock/lockprocess.cc | 26 +++++++++++++------------- kdesktop/lock/lockprocess.h | 6 +++--- kdesktop/lock/main.cc | 4 ++-- kdesktop/lock/sakdlg.cc | 18 +++++++++--------- kdesktop/lock/sakdlg.h | 4 ++-- kdesktop/lockeng.cc | 26 +++++++++++++------------- kdesktop/lockeng.h | 6 +++--- kdesktop/main.cc | 4 ++-- kdesktop/minicli.cpp | 8 ++++---- kdesktop/startupid.cpp | 2 +- 20 files changed, 98 insertions(+), 98 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index aa0aa598d..e15c6aabe 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -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; itype() == TQEvent::DragEnter ) { TQDragEnterEvent* de = static_cast( 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) diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index a681dc9a5..3aa81241c 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -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; diff --git a/kdesktop/init.cc b/kdesktop/init.cc index 81bce942c..27990245c 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -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 ); diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index 1d39a093d..4a51cefdb 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -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) { diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index e83face76..6fee5d5c4 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -411,11 +411,11 @@ - KGlobalSettings::completionMode() + TDEGlobalSettings::completionMode() - + diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 387195a4f..d461a6ecb 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -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(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 diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp index 9c2bd5f8a..90dc69327 100644 --- a/kdesktop/kfileividesktop.cpp +++ b/kdesktop/kfileividesktop.cpp @@ -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) diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 283d46cb3..403c89f13 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -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; } diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 005ac9913..29dc8bd9c 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -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); diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index cd8f38da1..a3f5fb56f 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -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(); } diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index c5b72de80..1694a0eb4 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -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 { diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 89e29a5c0..7f3f61cfd 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -231,7 +231,7 @@ int main( int argc, char **argv ) int parent_connection = 0; // socket to the parent saver TQValueList 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; diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index a79d0e508..6f983ce70 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -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(); } diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h index d72f8d46e..7bc8d1fab 100644 --- a/kdesktop/lock/sakdlg.h +++ b/kdesktop/lock/sakdlg.h @@ -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 diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 553f0ce4c..8a9e7cf88 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -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 ); } diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index d1133aae6..0643e82c7 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -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; }; diff --git a/kdesktop/main.cc b/kdesktop/main.cc index a12f241b8..17fc4addf 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -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"; diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 89b4bc69f..dca215de3 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -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"); diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 3bec0f9af..36d566e31 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -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" ); -- cgit v1.2.1