diff options
Diffstat (limited to 'kio')
72 files changed, 281 insertions, 281 deletions
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 44b8b496c..ab1cc398a 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -89,9 +89,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const // firstElement() and lastElement() TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const { - static const TQString & bookmark = KGlobal::staticQString("bookmark"); - static const TQString & folder = KGlobal::staticQString("folder"); - static const TQString & separator = KGlobal::staticQString("separator"); + static const TQString & bookmark = TDEGlobal::staticQString("bookmark"); + static const TQString & folder = TDEGlobal::staticQString("folder"); + static const TQString & separator = TDEGlobal::staticQString("separator"); for( TQDomNode n = start; !n.isNull(); ) { diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index 08c34061b..dc2ad0cde 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -223,8 +223,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) action->setDelayed( false ); // this flag doesn't have any UI yet - KGlobal::config()->setGroup( "Settings" ); - bool addEntriesBookmarkBar = KGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); + TDEGlobal::config()->setGroup( "Settings" ); + bool addEntriesBookmarkBar = TDEGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true); KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 96ce12896..9e6d711d2 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old void KBookmarkManager::importDesktopFiles() { KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) ); - TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); + TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true)); importer.import( path ); //kdDebug(7043) << internalDocument().toCString() << endl; @@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) proc << TQString::fromLatin1("--nobrowser"); proc << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("keditbookmarks") << TQString::fromLatin1("--address") << address << m_bookmarksFile; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } /////// diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index 30513bbf3..1c762bfb9 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -60,7 +60,7 @@ public: // to accelators, replace them with two ampersands. serviceName.replace("&", "&&"); - TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, + TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 16x16 @@ -164,7 +164,7 @@ KCustomMenuEditor::save(KConfigBase *cfg) { i++; TQString path = item->s->desktopEntryPath(); - if (TQDir::isRelativePath(path) || TQDir::isRelativePath(KGlobal::dirs()->relativeLocation("xdgdata-apps", path))) + if (TQDir::isRelativePath(path) || TQDir::isRelativePath(TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path))) path = item->s->desktopEntryName(); cfg->writePathEntry(TQString("Item%1").arg(i), path); item = (Item *) item->nextSibling(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index f9e2d237c..0f2e9f4e1 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -812,7 +812,7 @@ bool KDirOperator::checkPreviewSupport() KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" )); bool hasPreviewSupport = false; - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver cs( kc, ConfigGroup ); if ( kc->readBoolEntry( "Show Default Preview", true ) ) hasPreviewSupport = checkPreviewInternal(); @@ -1385,7 +1385,7 @@ void KDirOperator::setupMenu(int whichActions) actionMenu->insert( mkdirAction ); if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); - KConfig *globalconfig = KGlobal::config(); + KConfig *globalconfig = TDEGlobal::config(); KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index 85bcf9187..e644f7b98 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -82,7 +82,7 @@ namespace KIO { * connect(op, TQT_SIGNAL(finishedLoading()), * TQT_SLOT(slotLoadingFinished())); * - * op->readConfig( KGlobal::config(), "Your KDiroperator ConfigGroup" ); + * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); * \endcode * @@ -400,7 +400,7 @@ class KIO_EXPORT KDirOperator : public TQWidget * instantiation can make use of it already. * * Note that KDirOperator does NOT take ownership of that object (typically - * it's KGlobal::config() anyway. + * it's TDEGlobal::config() anyway. * * @see viewConfig * @see viewConfigGroup diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 4a3613b98..8f8a8b299 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -133,7 +133,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, if ( localOnly && !d->startURL.isLocalFile() ) { d->startURL = KURL(); - TQString docPath = KGlobalSettings::documentPath(); + TQString docPath = TDEGlobalSettings::documentPath(); if (TQDir(docPath).exists()) d->startURL.setPath( docPath ); else @@ -146,7 +146,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->branch = createBranch( root ); - readConfig( KGlobal::config(), "DirSelect Dialog" ); + readConfig( TDEGlobal::config(), "DirSelect Dialog" ); m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); @@ -314,7 +314,7 @@ void KDirSelectDialog::accept() KFileDialog::setStartDir( url() ); KDialogBase::accept(); - saveConfig( KGlobal::config(), "DirSelect Dialog" ); + saveConfig( TDEGlobal::config(), "DirSelect Dialog" ); } diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 86dfc756d..3ab42817b 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -79,8 +79,8 @@ void KDirSize::startNextJob( const KURL & url ) void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) { - static const TQString& dot = KGlobal::staticQString( "." ); - static const TQString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticQString( "." ); + static const TQString& dotdot = TDEGlobal::staticQString( ".." ); KIO::UDSEntryListConstIterator it = list.begin(); KIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 1e9d3a130..21338c058 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -46,11 +46,11 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) : TQObject(parent,name) { - dfProc = new KProcess(); TQ_CHECK_PTR(dfProc); + dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ), + connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), this, TQT_SLOT(dfDone() ) ); readingDFStdErrOut=false; @@ -68,7 +68,7 @@ KDiskFreeSp::~KDiskFreeSp() /*************************************************************************** * is called, when the df-command writes on StdOut **/ -void KDiskFreeSp::receivedDFStdErrOut(KProcess *, char *data, int len) +void KDiskFreeSp::receivedDFStdErrOut(TDEProcess *, char *data, int len) { TQCString tmp(data,len+1); // adds a zero-byte dfStringErrOut.append(tmp); @@ -85,7 +85,7 @@ int KDiskFreeSp::readDF( const TQString & mountPoint ) dfStringErrOut=""; // yet no data received dfProc->clearArguments(); (*dfProc) << TQString::fromLocal8Bit(DF_COMMAND) << TQString::fromLocal8Bit(DF_ARGS); - if (!dfProc->start( KProcess::NotifyOnExit, KProcess::AllOutput )) + if (!dfProc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput )) kdError() << "could not execute ["<< DF_COMMAND << "]" << endl; return 1; } diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index b7286f2df..7b9fc6238 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -31,7 +31,7 @@ #include <tdelibs_export.h> -class KProcess; +class TDEProcess; /** * This class parses the output of "df" to find the disk usage @@ -72,11 +72,11 @@ signals: void done(); private slots: - void receivedDFStdErrOut(KProcess *, char *data, int len); + void receivedDFStdErrOut(TDEProcess *, char *data, int len); void dfDone(); private: - KProcess *dfProc; + TDEProcess *dfProc; TQCString dfStringErrOut; TQString m_mountPoint; bool readingDFStdErrOut; diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..183023cf5 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,14 +54,14 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding()); - TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); + TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { bool found = false; - TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found); + TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found); if (found) { diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..1bc6f6257 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -234,7 +234,7 @@ void KFileDetailView::selected( TQListViewItem *item ) if ( !item ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileListViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -671,7 +671,7 @@ void KFileListViewItem::init() KFileListViewItem::setPixmap( COL_NAME, inf->pixmap(KIcon::SizeSmall)); setText( COL_NAME, inf->text() ); - setText( COL_SIZE, KGlobal::locale()->formatNumber( inf->size(), 0)); + setText( COL_SIZE, TDEGlobal::locale()->formatNumber( inf->size(), 0)); setText( COL_DATE, inf->timeString() ); setText( COL_PERM, inf->permissionsString() ); setText( COL_OWNER, inf->user() ); diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 1decc462e..5e1634144 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -185,7 +185,7 @@ KFileDialog::~KFileDialog() { hide(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (d->urlBar) d->urlBar->save( config ); @@ -672,7 +672,7 @@ void KFileDialog::accept() locationEdit->insertItem( file, 1 ); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -751,7 +751,7 @@ void KFileDialog::multiSelectionChanged() return; } - static const TQString &begin = KGlobal::staticQString(" \""); + static const TQString &begin = TDEGlobal::staticQString(" \""); KFileItemListIterator it ( *list ); TQString text; while ( (item = it.current()) ) { @@ -857,7 +857,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); KURL docPath; - docPath.setPath( KGlobalSettings::documentPath() ); + docPath.setPath( TDEGlobalSettings::documentPath() ); if ( (u.path(+1) != docPath.path(+1)) && TQDir(docPath.path(+1)).exists() ) { @@ -867,7 +867,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge text ); } - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); text = i18n("Desktop: %1").arg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), @@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge initGUI(); // activate GM - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); readRecentFiles( config ); adjustSize(); @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const d->urlList.clear(); if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename - static const TQString &prot = KGlobal::staticQString(":/"); + static const TQString &prot = TDEGlobal::staticQString(":/"); KURL u; if ( d->filenames.find( prot ) != -1 ) u = d->filenames; @@ -1717,16 +1717,16 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) autoDirectoryFollowing = kc->readBoolEntry( AutoDirectoryFollowing, DefaultDirectoryFollowing ); - KGlobalSettings::Completion cm = (KGlobalSettings::Completion) + TDEGlobalSettings::Completion cm = (TDEGlobalSettings::Completion) kc->readNumEntry( PathComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) combo->setCompletionMode( cm ); - cm = (KGlobalSettings::Completion) + cm = (TDEGlobalSettings::Completion) kc->readNumEntry( LocationComboCompletionMode, - KGlobalSettings::completionMode() ); - if ( cm != KGlobalSettings::completionMode() ) + TDEGlobalSettings::completionMode() ); + if ( cm != TDEGlobalSettings::completionMode() ) locationEdit->setCompletionMode( cm ); // show or don't show the speedbar @@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel() ops->close(); KDialogBase::slotCancel(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setForceGlobal( true ); writeConfig( config, ConfigGroup ); config->setForceGlobal( false ); @@ -2332,7 +2332,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir, if ( useDefaultStartDir ) { if (lastDirectory->isEmpty()) { - lastDirectory->setPath(KGlobalSettings::documentPath()); + lastDirectory->setPath(TDEGlobalSettings::documentPath()); KURL home; home.setPath( TQDir::homeDirPath() ); // if there is no docpath set (== home dir), we prefer the current diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 10b8285c1..a9882d56f 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -365,7 +365,7 @@ void KFileIconView::selected( TQIconViewItem *item ) if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 ) return; - if ( KGlobalSettings::singleClick() ) { + if ( TDEGlobalSettings::singleClick() ) { const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo(); if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) ) sig->activate( fi ); @@ -547,7 +547,7 @@ void KFileIconView::slotLargeRows() // setIconSize() all call arrangeItemsInGrid() :( Prevent this. d->noArrangement = true; // stop arrangeItemsInGrid()! - setGridX( KGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); + setGridX( TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 ); setItemTextPos( Bottom ); setArrangement( LeftToRight ); setWordWrapIconText( true ); diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 0a2798ae6..e9b4c2673 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -45,7 +45,7 @@ class KFileSharePropsPlugin::Private { public: TQVBox *m_vBox; - KProcess *m_configProc; + TDEProcess *m_configProc; bool m_bAllShared; bool m_bAllUnshared; bool m_bAllReadOnly; @@ -86,7 +86,7 @@ bool KFileSharePropsPlugin::supports( const KFileItemList& items ) if ( !(*it)->isDir() || !isLocal ) return false; // And sharing the trash doesn't make sense - if ( isLocal && (*it)->url().path( 1 ) == KGlobalSettings::trashPath() ) + if ( isLocal && (*it)->url().path( 1 ) == TDEGlobalSettings::trashPath() ) return false; } return true; @@ -236,15 +236,15 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() { if (d->m_configProc) return; - d->m_configProc = new KProcess(this); + d->m_configProc = new TDEProcess(this); (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; - if (!d->m_configProc->start( KProcess::NotifyOnExit )) + if (!d->m_configProc->start( TDEProcess::NotifyOnExit )) { delete d->m_configProc; d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(KProcess *)), + connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..9ab3b8ee5 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -35,24 +35,24 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) : KURLBar( true, parent, name ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults", true ); setIconSize(KIcon::SizeSmallMedium); - readConfig( KGlobal::config(), "KFileDialog Speedbar" ); + readConfig( TDEGlobal::config(), "KFileDialog Speedbar" ); if ( m_initializeSpeedbar ) { KURL u; - u.setPath( KGlobalSettings::desktopPath() ); + u.setPath( TDEGlobalSettings::desktopPath() ); insertItem( u, i18n("Desktop"), false ); //TODO: win32 - if ((KGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && - TQDir(KGlobalSettings::documentPath()).exists()) + if ((TDEGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) && + TQDir(TDEGlobalSettings::documentPath()).exists()) { - u.setPath( KGlobalSettings::documentPath() ); + u.setPath( TDEGlobalSettings::documentPath() ); insertItem( u, i18n("Documents"), false, "folder_txt" ); } diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..b32746aa6 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -171,7 +171,7 @@ void KFileView::sortReversed() #if 0 int KFileView::compareItems(const KFileItem *fi1, const KFileItem *fi2) const { - static const TQString &dirup = KGlobal::staticQString(".."); + static const TQString &dirup = TDEGlobal::staticQString(".."); bool bigger = true; bool keepFirst = false; bool dirsFirst = ((m_sorting & TQDir::DirsFirst) == TQDir::DirsFirst); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 3d0b6be8f..dfbf47d0d 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -241,7 +241,7 @@ KIconDialog::KIconDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Select Icon"), Ok|Cancel, Ok) { d = new KIconDialogPrivate; - mpLoader = KGlobal::iconLoader(); + mpLoader = TDEGlobal::iconLoader(); init(); } @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = TDEGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -660,7 +660,7 @@ class KIconButton::KIconButtonPrivate KIconButton::KIconButton(TQWidget *parent, const char *name) : TQPushButton(parent, name) { - init( KGlobal::iconLoader() ); + init( TDEGlobal::iconLoader() ); } KIconButton::KIconButton(KIconLoader *loader, diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..c55acaf9e 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -35,7 +35,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) : KPreviewWidgetBase( parent ), m_job( 0L ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); autoMode = config->readBoolEntry( "Automatic Preview", true ); @@ -70,7 +70,7 @@ KImageFilePreview::~KImageFilePreview() if ( m_job ) m_job->kill(); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, ConfigGroup ); config->writeEntry( "Automatic Preview", autoPreview->isChecked() ); } diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index d82c4523b..c349693e5 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -250,7 +250,7 @@ bool KFileMetaPropsPlugin::supports( KFileItemList _items ) if (KExecPropsPlugin::supports(_items) || KURLPropsPlugin::supports(_items)) return false; // Having both is redundant. - bool metaDataEnabled = KGlobalSettings::showFilePreview(_items.first()->url()); + bool metaDataEnabled = TDEGlobalSettings::showFilePreview(_items.first()->url()); return _items.count() == 1 && metaDataEnabled; } diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index ebaadaa76..69d7be4e8 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -864,8 +864,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); TQStringList soundDirs = - KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; @@ -920,8 +920,8 @@ void KNotifyWidget::playSound() // find the first "sound"-resource that contains files const Application *app = currentEvent()->application(); - TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); - soundDirs += KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds"); + soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { TQDir dir; diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 1f758a01b..ef5d356fd 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -71,7 +71,7 @@ public: KNotifyDialog( TQWidget *parent = 0, const char *name = 0, bool modal = true, const TDEAboutData *aboutData = - KGlobal::instance()->aboutData() ); + TDEGlobal::instance()->aboutData() ); /** * Destroys the KNotifyDialog */ @@ -88,7 +88,7 @@ public: * @return The value of TQDialog::exec() */ static int configure( TQWidget *parent = 0, const char *name = 0, - const TDEAboutData *aboutData = KGlobal::instance()->aboutData() ); + const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData() ); /** * With this method, you can add the KNotify events of one eventsrc diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index c8623ced2..9a3fcabd1 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -171,7 +171,7 @@ bool TDEApplicationTree::isDirSel() static TQPixmap appIcon(const TQString &iconName) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { @@ -412,13 +412,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // init the history combo and insert it into the URL-Requester KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), - KGlobalSettings::completionMode()); - combo->setCompletionMode((KGlobalSettings::Completion)mode); + TDEGlobalSettings::completionMode()); + combo->setCompletionMode((TDEGlobalSettings::Completion)mode); TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); @@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") @@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using @@ -813,7 +813,7 @@ void KOpenWithDlg::accept() if ( combo ) { combo->addToHistory( edit->url() ); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); kc->writeEntry(TQString::fromLatin1("CompletionMode"), diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp index 9fd91cc7b..3672f4387 100644 --- a/kio/kfile/kpreviewprops.cpp +++ b/kio/kfile/kpreviewprops.cpp @@ -66,7 +66,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) { if ( _items.count() != 1) return false; - if( !KGlobalSettings::showFilePreview(_items.first()->url())) + if( !TDEGlobalSettings::showFilePreview(_items.first()->url())) return false; KMimeType::Ptr mt = KMimeType::findByURL( _items.first()->url() ); if ( mt->inherits("inode/directory") || mt->name() == "application/octet-stream" ) diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index a1076c134..94b95a2b6 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -885,7 +885,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); - iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); + iconLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); @@ -1041,7 +1041,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1052,7 +1052,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } @@ -1063,7 +1063,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget(l, curRow, 0); dt.setTime_t( tim ); - l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame ); + l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame ); grid->addWidget(l, curRow++, 2); } } @@ -1139,7 +1139,7 @@ void KFilePropsPlugin::slotEditFileType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) - + " " + KProcess::quote(mime), + + " " + TDEProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif } @@ -1162,16 +1162,16 @@ void KFilePropsPlugin::determineRelativePath( const TQString & path ) TQStringList dirs; if (KBindingPropsPlugin::supports(properties->items())) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("mime", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("mime", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; } else { - m_sRelativePath =KGlobal::dirs()->relativeLocation("apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("apps", path); if (m_sRelativePath.startsWith("/")) { - m_sRelativePath =KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + m_sRelativePath =TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); if (m_sRelativePath.startsWith("/")) m_sRelativePath = TQString::null; else @@ -1220,7 +1220,7 @@ void KFilePropsPlugin::slotDirSizeUpdate() KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs(); m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1236,7 +1236,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) - .arg(KGlobal::locale()->formatNumber(totalSize, 0)) + .arg(TDEGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs))); } @@ -1755,8 +1755,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) kcom->addItem(TQString::fromLatin1(user->pw_name)); endpwent(); - usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : - KGlobalSettings::CompletionNone); + usrEdit->setCompletionMode((i < maxEntries) ? TDEGlobalSettings::CompletionAuto : + TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -1833,7 +1833,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setItems(groupList); grpEdit->setCompletionObject(kcom, true); grpEdit->setAutoDeleteCompletionObject( true ); - grpEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), @@ -3402,11 +3402,11 @@ void KDesktopPropsPlugin::applyChanges() config.sync(); // KSycoca update needed? - TQString sycocaPath = KGlobal::dirs()->relativeLocation("apps", path); + TQString sycocaPath = TDEGlobal::dirs()->relativeLocation("apps", path); bool updateNeeded = !sycocaPath.startsWith("/"); if (!updateNeeded) { - sycocaPath = KGlobal::dirs()->relativeLocation("xdgdata-apps", path); + sycocaPath = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path); updateNeeded = !sycocaPath.startsWith("/"); } if (updateNeeded) @@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3499,7 +3499,7 @@ void KDesktopPropsPlugin::slotAdvanced() { w->suidEdit->setCompletionObject(kcom, true); w->suidEdit->setAutoDeleteCompletionObject( true ); - w->suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + w->suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { @@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); @@ -3773,7 +3773,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) { suidEdit->setCompletionObject(kcom, true); suidEdit->setAutoDeleteCompletionObject( true ); - suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto); + suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); } else { diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..609668373 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -34,7 +34,7 @@ static void recentdirs_done(KConfig *config) { - if (config == KGlobal::config()) + if (config == TDEGlobal::config()) { config->sync(); } @@ -57,14 +57,14 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re else { key = key.mid(1); - config = KGlobal::config(); + config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); if (result.isEmpty()) { - result.append(KGlobalSettings::documentPath()); + result.append(TDEGlobalSettings::documentPath()); } return config; } diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 7ad690be4..d91e7551f 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -79,14 +79,14 @@ void KRecentDocument::add(const KURL& url) void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) { - if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) + if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/")) return; TQString openStr = url.url(); openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded kdDebug(250) << "KRecentDocument::add for " << openStr << endl; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString oldGrp = config->group(); config->setGroup(TQString::fromLatin1("RecentDocuments")); bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); @@ -169,7 +169,7 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index ee79b4e58..1d2cf1547 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -142,7 +142,7 @@ void KURLBarItem::setIcon( const TQString& icon, KIcon::Group group ) if ( icon.isEmpty() ) m_pixmap = KMimeType::pixmapForURL( m_url, 0, group, iconSize() ); else - m_pixmap = KGlobal::iconLoader()->loadIcon( icon, group, iconSize(), + m_pixmap = TDEGlobal::iconLoader()->loadIcon( icon, group, iconSize(), KIcon::DefaultState ); } @@ -585,7 +585,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup ) m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize ); if ( m_useGlobal ) { // read global items - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)")); int num = globalConfig->readNumEntry( "Number of Entries" ); for ( int i = 0; i < num; i++ ) { @@ -977,10 +977,10 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( allowGlobal ) { TQString appName; - if ( KGlobal::instance()->aboutData() ) - appName = KGlobal::instance()->aboutData()->programName(); + if ( TDEGlobal::instance()->aboutData() ) + appName = TDEGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::fromLatin1( TDEGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..e01be4548 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -81,7 +81,7 @@ void KURLComboBox::init( Mode mode ) TQStringList KURLComboBox::urls() const { kdDebug(250) << "::urls()" << endl; - //static const TQString &fileProt = KGlobal::staticQString("file:"); + //static const TQString &fileProt = TDEGlobal::staticQString("file:"); TQStringList list; TQString url; for ( int i = defaultList.count(); i < count(); i++ ) { diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index e131bda3a..cf28557f8 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -66,7 +66,7 @@ void testFrame::showPath( const KURL &url ) { TQString fname = "TestBranch"; // url.fileName (); /* try a user icon */ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); TQPixmap pix = loader->loadIcon( "contents2", KIcon::Small ); TQPixmap pixOpen = loader->loadIcon( "contents", KIcon::Small ); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index f85995a61..b0ecabcc6 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) if (argv1 == TQString::fromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); - op->setViewConfig( KGlobal::config(), "TestGroup" ); + op->setViewConfig( TDEGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); op->show(); a.setMainWidget(op); diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 12eacab5d..3f16f565f 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -89,8 +89,8 @@ void DefaultProgress::init() #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), - KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), @@ -470,7 +470,7 @@ void DefaultProgress::checkDestination(const KURL& dest) { bool ok = true; if ( dest.isLocalFile() ) { TQString path = dest.path( -1 ); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" ); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" ); for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it ) if ( path.contains( *it ) ) ok = false; // it's in the tmp resource @@ -486,17 +486,17 @@ void DefaultProgress::checkDestination(const KURL& dest) { void DefaultProgress::slotOpenFile() { - KProcess proc; + TDEProcess proc; proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::slotOpenLocation() { - KProcess proc; + TDEProcess proc; d->location.setFileName(""); proc << "konqueror" << d->location.prettyURL(); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void DefaultProgress::virtual_hook( int id, void* data ) diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 1ad304a41..63ba82921 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -45,7 +45,7 @@ KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size ) { if ( size >= 1024 ) - return convertSize( size ) + " (" + i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(size, 0) ) + ")"; + return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")"; else return convertSize( size ); } @@ -59,26 +59,26 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size ) { fsize /= 1073741824.0; if ( fsize > 1024 ) // Tera-byte - s = i18n( "%1 TB" ).arg( KGlobal::locale()->formatNumber(fsize / 1024.0, 1)); + s = i18n( "%1 TB" ).arg( TDEGlobal::locale()->formatNumber(fsize / 1024.0, 1)); else - s = i18n( "%1 GB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 GB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Mega-byte else if ( size >= 1048576 ) { fsize /= 1048576.0; - s = i18n( "%1 MB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 MB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Kilo-byte else if ( size >= 1024 ) { fsize /= 1024.0; - s = i18n( "%1 KB" ).arg( KGlobal::locale()->formatNumber(fsize, 1)); + s = i18n( "%1 KB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1)); } // Just byte else if ( size > 0 ) { - s = i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(fsize, 0)); + s = i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(fsize, 0)); } // Nothing else @@ -117,7 +117,7 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds ) seconds = (seconds - (days * 86400) - (hours * 3600) - (mins * 60)); const TQTime time(hours, mins, seconds); - const TQString timeStr( KGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); + const TQString timeStr( TDEGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) ); if ( days > 0 ) return i18n("1 day %1", "%n days %1", days).arg(timeStr); else @@ -477,7 +477,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 url = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); ret << errorName; @@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT protocol = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); TQString errorName, techName, description; @@ -1666,7 +1666,7 @@ static TQString get_mount_info(const TQString& filename, gotDevice = true; if (stat_buf.st_dev == rootDevice) { - static const TQString &root = KGlobal::staticQString("/"); + static const TQString &root = TDEGlobal::staticQString("/"); isautofs = Wrong; isslow = Wrong; ismanual = Wrong; diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 69b363392..3bbb72432 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -298,7 +298,7 @@ void Job::showErrorDialog( TQWidget * parent ) // Show a message box, except for "user canceled" or "no content" if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) { //old plain error message - //kdDebug(7007) << "Default language: " << KGlobal::locale()->defaultLanguage() << endl; + //kdDebug(7007) << "Default language: " << TDEGlobal::locale()->defaultLanguage() << endl; if ( 1 ) KMessageBox::queuedMessageBox( parent, KMessageBox::Error, errorString() ); #if 0 diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 76cf7836b..17a220541 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -98,7 +98,7 @@ TQPixmap KDataToolInfo::icon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("icon"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("icon"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; @@ -112,7 +112,7 @@ TQPixmap KDataToolInfo::miniIcon() const return TQPixmap(); TQPixmap pix; - TQStringList lst = KGlobal::dirs()->resourceDirs("mini"); + TQStringList lst = TDEGlobal::dirs()->resourceDirs("mini"); TQStringList::ConstIterator it = lst.begin(); while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() ) it++; diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 0641645a6..b6905b3a3 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -951,8 +951,8 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes; // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = entries.begin(); KIO::UDSEntryListConstIterator end = entries.end(); @@ -1539,8 +1539,8 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) fileItems.insert( (*kit)->url().url(), *kit ); } - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KFileItem *item = 0, *tmp; @@ -1979,8 +1979,8 @@ void KDirLister::emitChanges() if ( d->changes == NONE ) return; - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); for ( KURL::List::Iterator it = d->lstDirs.begin(); it != d->lstDirs.end(); ++it ) @@ -2180,7 +2180,7 @@ bool KDirLister::matchesMimeFilter( const TQString& mime ) const bool KDirLister::matchesFilter( const KFileItem *item ) const { Q_ASSERT( item ); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); if ( item->text() == dotdot ) return false; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index 330e6cd39..580de16cc 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() delayRemove = false; m_ref = 0; - KConfigGroup config(KGlobal::config(), TQCString("DirWatch")); + KConfigGroup config(TDEGlobal::config(), TQCString("DirWatch")); m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000); m_PollInterval = config.readNumEntry("PollInterval", 500); diff --git a/kio/kio/kfilefilter.cpp b/kio/kio/kfilefilter.cpp index 05c53c02c..c927804b5 100644 --- a/kio/kio/kfilefilter.cpp +++ b/kio/kio/kfilefilter.cpp @@ -79,8 +79,8 @@ void KSimpleFileFilter::setModeFilter( mode_t mode ) bool KSimpleFileFilter::passesFilter( const KFileItem *item ) const { - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); const TQString& name = item->name(); diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index cf903f712..50ee1a5d2 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -261,7 +261,7 @@ void KFileItem::readUDSEntry( bool _urlIsDirectory ) } // avoid creating these QStrings again and again - static const TQString& dot = KGlobal::staticQString("."); + static const TQString& dot = TDEGlobal::staticQString("."); if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot ) m_url.addPath( m_strName ); } @@ -602,7 +602,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const if ( !m_pMimeType ) { static const TQString & defaultFolderIcon = - KGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); + TDEGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); if ( S_ISDIR( m_fileMode ) ) return DesktopIcon( defaultFolderIcon, _size, _state ); @@ -672,7 +672,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { p = DesktopIcon( sysIconName.ascii(), _size, _state ); } } @@ -688,7 +688,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; p = DesktopIcon( entry->name, _size, _state ); break; @@ -1137,7 +1137,7 @@ TQString KFileItem::timeString( unsigned int which ) const TQDateTime t; t.setTime_t( time_); - return KGlobal::locale()->formatDateTime( t ); + return TDEGlobal::locale()->formatDateTime( t ); } void KFileItem::setMetaInfo( const KFileMetaInfo & info ) @@ -1151,7 +1151,7 @@ const KFileMetaInfo & KFileItem::metaInfo(bool autoget, int) const KURL url = mostLocalURL(isLocalURL); if ( autoget && !m_metaInfo.isValid() && - KGlobalSettings::showFilePreview(url) ) + TDEGlobalSettings::showFilePreview(url) ) { m_metaInfo = KFileMetaInfo( url, mimetype() ); } diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index d04a22ca1..c345ef89e 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -1634,11 +1634,11 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle return KIO::convertSizeFromKB(value.toInt()); } else - s = KGlobal::locale()->formatNumber( value.toInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toInt() , 0); break; case TQVariant::LongLong : - s = KGlobal::locale()->formatNumber( value.toLongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toLongLong(), 0 ); break; case TQVariant::ULongLong : @@ -1647,27 +1647,27 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle else if ( unit() == KFileMimeTypeInfo::KiloBytes ) return KIO::convertSizeFromKB( value.toULongLong() ); else - s = KGlobal::locale()->formatNumber( value.toULongLong(), 0 ); + s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 ); break; case TQVariant::UInt : - s = KGlobal::locale()->formatNumber( value.toUInt() , 0); + s = TDEGlobal::locale()->formatNumber( value.toUInt() , 0); break; case TQVariant::Double : - s = KGlobal::locale()->formatNumber( value.toDouble(), 3); + s = TDEGlobal::locale()->formatNumber( value.toDouble(), 3); break; case TQVariant::Date : - s = KGlobal::locale()->formatDate( value.toDate(), true ); + s = TDEGlobal::locale()->formatDate( value.toDate(), true ); break; case TQVariant::Time : - s = KGlobal::locale()->formatTime( value.toTime(), true ); + s = TDEGlobal::locale()->formatTime( value.toTime(), true ); break; case TQVariant::DateTime : - s = KGlobal::locale()->formatDateTime( value.toDateTime(), + s = TDEGlobal::locale()->formatDateTime( value.toDateTime(), true, true ); break; diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 1f6dca285..bf8cdca1d 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -181,7 +181,7 @@ void KFileShare::readShareList() } KProcIO proc; proc << exe; - if ( !proc.start( KProcess::Block ) ) { + if ( !proc.start( TDEProcess::Block ) ) { kdError() << "Can't run " << exe << endl; s_authorization = ErrorNotFound; return; @@ -264,11 +264,11 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) return false; // we want to share, so we kick it first - just to be sure - KProcess proc; + TDEProcess proc; proc << exe; proc << "--remove"; proc << path; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); proc.clearArguments(); proc << exe; @@ -279,7 +279,7 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw ) else proc << "--remove"; proc << path; - proc.start( KProcess::Block ); // should be ok, the perl script terminates fast + proc.start( TDEProcess::Block ); // should be ok, the perl script terminates fast bool ok = proc.normalExit() && (proc.exitStatus() == 0); kdDebug(7000) << "KFileSharePropsPlugin::setShared normalExit=" << proc.normalExit() << endl; diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index e2c4c1fa7..f639a7049 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -529,7 +529,7 @@ public: // The trick is that we also don't want the user to override globally set // directories. So we have to misuse KStandardDirs :} - TQStringList confDirs = KGlobal::dirs()->resourceDirs( "config" ); + TQStringList confDirs = TDEGlobal::dirs()->resourceDirs( "config" ); if ( !confDirs.isEmpty() ) { TQString globalConf = confDirs.last() + "kmimemagicrc"; @@ -2121,7 +2121,7 @@ KMimeMagic::KMimeMagic() TQString mimefile = locate( "mime", "magic" ); init( mimefile ); // Add snippets from share/config/magic/* - TQStringList snippets = KGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); + TQStringList snippets = TDEGlobal::dirs()->findAllResources( "config", "magic/*.magic", true ); for ( TQStringList::Iterator it = snippets.begin() ; it != snippets.end() ; ++it ) if ( !mergeConfig( *it ) ) kdWarning() << k_funcinfo << "Failed to parse " << *it << endl; diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 09a45b5ea..37867cd23 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -204,7 +204,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, TQString fileName ( _url.fileName() ); - static const TQString& slash = KGlobal::staticQString("/"); + static const TQString& slash = TDEGlobal::staticQString("/"); if ( ! fileName.isNull() && !path.endsWith( slash ) ) { // Try to find it out by looking at the filename @@ -230,9 +230,9 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, } } - static const TQString& dotdesktop = KGlobal::staticQString(".desktop"); - static const TQString& dotkdelnk = KGlobal::staticQString(".kdelnk"); - static const TQString& dotdirectory = KGlobal::staticQString(".directory"); + static const TQString& dotdesktop = TDEGlobal::staticQString(".desktop"); + static const TQString& dotkdelnk = TDEGlobal::staticQString(".kdelnk"); + static const TQString& dotdirectory = TDEGlobal::staticQString(".directory"); // Another filename binding, hardcoded, is .desktop: if ( fileName.endsWith( dotdesktop ) ) @@ -453,7 +453,7 @@ KMimeType::~KMimeType() TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( TQString::null, false ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -469,7 +469,7 @@ TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state, TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName=icon( _url, _url.isLocalFile() ); if (!iconLoader->extraDesktopThemesAdded()) { @@ -485,7 +485,7 @@ TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_si TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, KIcon::Group _group, int _force_size, int _state, TQString * _path ) { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); TQString iconName = iconForURL( _url, _mode ); if (!iconLoader->extraDesktopThemesAdded()) @@ -504,7 +504,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) { const KMimeType::Ptr mt = findByURL( _url, _mode, _url.isLocalFile(), false /*HACK*/); - static const TQString& unknown = KGlobal::staticQString("unknown"); + static const TQString& unknown = TDEGlobal::staticQString("unknown"); const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() ); TQString i = mimeTypeIcon; @@ -533,7 +533,7 @@ TQString KMimeType::favIconForURL( const KURL& url ) static bool check = true; if ( check ) { check = false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs( config, "HTML Settings" ); useFavIcons = config->readBoolEntry( "EnableFavicon", true ); } @@ -749,10 +749,10 @@ TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, KIcon::Group _group, int int _state, TQString * _path ) const { TQString _icon = icon( _url, _url.isLocalFile() ); - TQPixmap pix = KGlobal::iconLoader()->loadIcon( _icon, _group, + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group, _force_size, _state, _path, false ); if ( pix.isNull() ) - pix = KGlobal::iconLoader()->loadIcon( "unknown", _group, + pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group, _force_size, _state, _path, false ); return pix; } @@ -903,9 +903,9 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) ) return pid; - KProcess p; + TDEProcess p; p << "kfmclient" << args; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); return p.pid(); } @@ -1152,7 +1152,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT const TQString & KMimeType::defaultMimeType() { static const TQString & s_strDefaultMimeType = - KGlobal::staticQString( "application/octet-stream" ); + TDEGlobal::staticQString( "application/octet-stream" ); return s_strDefaultMimeType; } diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 78011e143..0cb010913 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -198,7 +198,7 @@ void KMimeTypeChooser::editMimeType() TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) - + " " + KProcess::quote(mt), + + " " + TDEProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( this, "chooser" ); setMainWidget(m_chooser); - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); TQSize defaultSize( 400, 300 ); resize( group.readSizeEntry("size", &defaultSize) ); } @@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog( KMimeTypeChooserDialog::~KMimeTypeChooserDialog() { - KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog"); + KConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog"); group.writeEntry("size", size()); } diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index a3d8e0302..252bdbfbd 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -189,7 +189,7 @@ KIO::CacheControl KProtocolManager::cacheControl() TQString KProtocolManager::cacheDir() { KConfig *cfg = http_config(); - return cfg->readPathEntry("CacheDir", KGlobal::dirs()->saveLocation("cache","http")); + return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http")); } int KProtocolManager::maxCacheAge() @@ -470,7 +470,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) } if( modifiers.contains('l') ) { - TQStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = TDEGlobal::locale()->languageList(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index cbc72242e..2f6e9861a 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -184,7 +184,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, KURL::List lst; lst.append( u ); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); KService::Ptr offer = KServiceTypeProfile::preferredService( _mimetype, app_str ); @@ -476,8 +476,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List */ if (_service.terminal()) { - KConfigGroupSaver gs(KGlobal::config(), "General"); - TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); if (terminal == "konsole") terminal += " -caption=%c %i %m"; terminal += " "; @@ -549,7 +549,7 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) return TQString(); } -static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName, +static pid_t runCommandInternal( TDEProcess* proc, const KService* service, const TQString& binName, const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn ) { if (service && !service->desktopEntryPath().isEmpty() @@ -590,7 +590,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const data.setLaunchedBy( window->winId()); KStartupInfo::sendStartup( id, data ); } - pid_t pid = KProcessRunner::run( proc, binName, id ); + pid_t pid = TDEProcessRunner::run( proc, binName, id ); if( startup_notify && pid ) { KStartupInfoData data; @@ -602,7 +602,7 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const #else Q_UNUSED( execName ); Q_UNUSED( iconName ); - return KProcessRunner::run( proc, bin ); + return TDEProcessRunner::run( proc, bin ); #endif } @@ -681,9 +681,9 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls, { args = KRun::processDesktopExec(_service, _urls, false, tempFiles, suggestedFileName); } - kdDebug(7010) << "runTempService: KProcess args=" << args << endl; + kdDebug(7010) << "runTempService: TDEProcess args=" << args << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; *proc << args; if (!_service.path().isEmpty()) @@ -856,7 +856,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS TQWidget* window, const TQCString& asn ) { kdDebug(7010) << "runCommand " << cmd << "," << execName << endl; - KProcess * proc = new KProcess; + TDEProcess * proc = new TDEProcess; proc->setUseShell(true); *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); @@ -1440,7 +1440,7 @@ void KRun::abort() void KRun::setEnableExternalBrowser(bool b) { if (b) - d->m_externalBrowser = KConfigGroup(KGlobal::config(), "General").readEntry("BrowserApplication"); + d->m_externalBrowser = KConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication"); else d->m_externalBrowser = TQString::null; } @@ -1477,27 +1477,27 @@ bool KRun::isExecutable( const TQString& serviceType ) /****************/ pid_t -KProcessRunner::run(KProcess * p, const TQString & binName) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName) { - return (new KProcessRunner(p, binName))->pid(); + return (new TDEProcessRunner(p, binName))->pid(); } #ifdef Q_WS_X11 pid_t -KProcessRunner::run(KProcess * p, const TQString & binName, const KStartupInfoId& id ) +TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const KStartupInfoId& id ) { - return (new KProcessRunner(p, binName, id))->pid(); + return (new TDEProcessRunner(p, binName, id))->pid(); } #endif -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) : TQObject(), process_(p), binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1505,15 +1505,15 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName ) } #ifdef Q_WS_X11 -KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KStartupInfoId& id ) +TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const KStartupInfoId& id ) : TQObject(), process_(p), binName( _binName ), id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + process_, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1521,19 +1521,19 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KS } #endif -KProcessRunner::~KProcessRunner() +TDEProcessRunner::~TDEProcessRunner() { delete process_; } pid_t -KProcessRunner::pid() const +TDEProcessRunner::pid() const { return process_->pid(); } void -KProcessRunner::slotProcessExited(KProcess * p) +TDEProcessRunner::slotProcessExited(TDEProcess * p) { if (p != process_) return; // Eh ? diff --git a/kio/kio/krun.h b/kio/kio/krun.h index e6aa4d027..9e4bf8c44 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -30,7 +30,7 @@ #include <kurl.h> #include <kstartupinfo.h> -class KProcess; +class TDEProcess; class KService; namespace KIO { class Job; @@ -475,34 +475,34 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT KProcessRunner : public TQObject +class KIO_EXPORT TDEProcessRunner : public TQObject { Q_OBJECT public: - static pid_t run(KProcess *, const TQString & binName); + static pid_t run(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - static pid_t run(KProcess *, const TQString & binName, const KStartupInfoId& id ); + static pid_t run(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - virtual ~KProcessRunner(); + virtual ~TDEProcessRunner(); pid_t pid() const; protected slots: - void slotProcessExited(KProcess *); + void slotProcessExited(TDEProcess *); private: - KProcessRunner(KProcess *, const TQString & binName); + TDEProcessRunner(TDEProcess *, const TQString & binName); #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded - KProcessRunner(KProcess *, const TQString & binName, const KStartupInfoId& id ); + TDEProcessRunner(TDEProcess *, const TQString & binName, const KStartupInfoId& id ); #endif - KProcessRunner(); + TDEProcessRunner(); - KProcess * process_; + TDEProcess * process_; TQString binName; #ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded KStartupInfoId id_; diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index defeae4a7..ff5b9c104 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -151,7 +151,7 @@ bool KSambaSharePrivate::readSmbConf() { TQString name = completeLine.left(i).stripWhiteSpace().lower(); TQString value = completeLine.mid(i+1).stripWhiteSpace(); - if (name == KGlobal::staticQString("path")) { + if (name == TDEGlobal::staticQString("path")) { // Handle quotation marks if ( value[0] == '"' ) value.remove(0,1); diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index e3b4a4adb..9324f964d 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -310,7 +310,7 @@ KService::~KService() TQPixmap KService::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const { - KIconLoader *iconLoader=KGlobal::iconLoader(); + KIconLoader *iconLoader=TDEGlobal::iconLoader(); if (!iconLoader->extraDesktopThemesAdded()) { TQPixmap pixmap=iconLoader->loadIcon( m_strIcon, _group, _force_size, _state, _path, true ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index c7e076eac..d1425e9eb 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -186,7 +186,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -200,7 +200,7 @@ TQString KURIFilterData::iconName() if (service && service->icon() != TQString::fromLatin1( "unknown" )) { m_strIconName = service->icon(); } - else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { + else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) { m_strIconName = exeName; } else { @@ -239,7 +239,7 @@ TQString KURIFilterData::iconName() // See if there is a system icon we can use TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon"); if (!sysIconName.isEmpty()) { - if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") { m_strIconName = sysIconName; } } @@ -255,7 +255,7 @@ TQString KURIFilterData::iconName() // Try loading this icon as fallback icon = libr_icon_geticon_byname(handle, entry->name); } - if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { + if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") { iconresnamefound = 1; m_strIconName = entry->name; break; diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 17caccb88..0443e0fce 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -519,7 +519,7 @@ void KURLCompletion::init() d->mode = KURLCompletion::FileCompletion; // Read settings - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); KConfigGroupSaver cgs( c, "URLCompletion" ); d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true); @@ -736,10 +736,10 @@ bool KURLCompletion::isListedURL( int complType, */ bool KURLCompletion::isAutoCompletion() { - return completionMode() == KGlobalSettings::CompletionAuto - || completionMode() == KGlobalSettings::CompletionPopup - || completionMode() == KGlobalSettings::CompletionMan - || completionMode() == KGlobalSettings::CompletionPopupAuto; + return completionMode() == TDEGlobalSettings::CompletionAuto + || completionMode() == TDEGlobalSettings::CompletionPopup + || completionMode() == TDEGlobalSettings::CompletionMan + || completionMode() == TDEGlobalSettings::CompletionPopupAuto; } ////////////////////////////////////////////////// ////////////////////////////////////////////////// @@ -963,7 +963,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) if (url.url().length() == 1) { *match = - ( completionMode() == KGlobalSettings::CompletionMan )? "." : ".."; + ( completionMode() == TDEGlobalSettings::CompletionMan )? "." : ".."; return true; } if (url.url().length() == 2 && url.url()[1]=='.') @@ -1008,8 +1008,8 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) // Append '/' to directories in Popup mode? bool append_slash = ( d->popup_append_slash - && (completionMode() == KGlobalSettings::CompletionPopup || - completionMode() == KGlobalSettings::CompletionPopupAuto ) ); + && (completionMode() == TDEGlobalSettings::CompletionPopup || + completionMode() == TDEGlobalSettings::CompletionPopupAuto ) ); bool only_dir = ( d->mode == DirCompletion ); diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index b7ef68c76..fe07c3ad1 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -55,7 +55,7 @@ void KServiceTypeProfile::initStatic() KConfig config( "profilerc", true, false); - static const TQString & defaultGroup = KGlobal::staticQString("<default>"); + static const TQString & defaultGroup = TDEGlobal::staticQString("<default>"); TQStringList tmpList = config.groupList(); for (TQStringList::Iterator aIt = tmpList.begin(); @@ -243,7 +243,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const KServiceTypeProfile* KServiceTypeProfile::serviceTypeProfile( const TQString& _servicetype, const TQString& _genericServiceType ) { initStatic(); - static const TQString& app_str = KGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticQString("Application"); const TQString &_genservicetype = ((!_genericServiceType.isEmpty()) ? _genericServiceType : app_str); diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index e18666328..28d32d377 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -74,7 +74,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->nRow = 0; d->keepCheckBox = 0; - KConfig* cfg = KGlobal::config(); + KConfig* cfg = TDEGlobal::config(); KConfigGroupSaver saver( cfg, "Passwords" ); d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint()); @@ -82,7 +82,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 0: pixmap prompt TQLabel* lbl; - TQPixmap pix( KGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); + TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true)); if ( !pix.isNull() ) { lbl = new TQLabel( main ); @@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label) // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, label->font()); - TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); + TQRect d = TDEGlobalSettings::desktopGeometry(label->topLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 2249a1bfa..c266947f3 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -244,7 +244,7 @@ void PreviewJob::startPreview() } // Read configuration value for the maximum allowed size - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 722f2874b..9eb7a2c73 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -253,14 +253,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeDest != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeDest ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeDest != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeDest ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } @@ -288,14 +288,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, if ( ctimeSrc != (time_t)-1 ) { TQDateTime dctime; dctime.setTime_t( ctimeSrc ); - TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this ); + TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } if ( mtimeSrc != (time_t)-1 ) { TQDateTime dmtime; dmtime.setTime_t( mtimeSrc ); - TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this ); + TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this ); gridLayout->addWidget( lb, row, 1 ); row++; } diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 8619c2dc4..d3c398fc4 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -252,7 +252,7 @@ void SessionData::configDataFor( MetaData &configData, const TQString &proto, if ( configData["Charsets"].isEmpty() ) configData["Charsets"] = d->charsets; if ( configData["CacheDir"].isEmpty() ) - configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http"); + configData["CacheDir"] = TDEGlobal::dirs()->saveLocation("cache", "http"); if ( configData["UserAgent"].isEmpty() ) { configData["UserAgent"] = KProtocolManager::defaultUserAgent(); @@ -269,10 +269,10 @@ void SessionData::reset() d->useCookie = cfg->readBoolEntry( "Cookies", true ); delete cfg; - static const TQString & english = KGlobal::staticQString( "en" ); + static const TQString & english = TDEGlobal::staticQString( "en" ); // Get language settings... - TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); + TQStringList languageList = TDEGlobal::locale()->languagesTwoAlpha(); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if ( it != languageList.end() ) { diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 29b8482fb..8306c8650 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -363,7 +363,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { @@ -388,7 +388,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error // klauncher for a slave, because the slave might have that other uid // as well, which might either be a) undesired or b) make it impossible // for the slave to connect to the application. - // In such case we start the slave via KProcess. + // In such case we start the slave via TDEProcess. // It's possible to force this by setting the env. variable // TDE_FORK_SLAVES, Clearcase seems to require this. static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty(); @@ -411,12 +411,12 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error return 0; } - KProcess proc; + TDEProcess proc; proc << locate("exe", "kioslave") << lib_path << protocol << "" << socketfile.name(); kdDebug(7002) << "kioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); #ifndef Q_WS_WIN slave->setPID(proc.pid()); @@ -468,7 +468,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) if (!client->isAttached()) client->attach(); - TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); + TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName()); KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index fe888c99c..9ce4a86a0 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -72,7 +72,7 @@ void SlaveConfigPrivate::readGlobalConfig() global.clear(); // Read stuff... KConfig *config = KProtocolManager::config(); - readConfig(KGlobal::config(), "Socks", &global); // Socks settings. + readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings. if ( config ) readConfig(config, "<default>", &global); } diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 2a1494043..22c539a75 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -111,7 +111,7 @@ KIOExec::KIOExec() // Build the destination filename, in ~/.trinity/cache-*/krun/ // Unlike KDE-1.1, we put the filename at the end so that the extension is kept // (Some programs rely on it) - TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + + TQString tmp = TDEGlobal::dirs()->saveLocation( "cache", "krun/" ) + TQString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName); fileInfo file; file.path = tmp; @@ -211,9 +211,9 @@ void KIOExec::slotRunApp() id.setupStartupEnv(); #endif - KProcess proc; + TDEProcess proc; proc << params; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); #ifdef Q_WS_X11 KStartupInfo::resetStartupEnv(); diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 511bd4021..3d51c1e85 100644 --- a/kio/kssl/ksslcertdlg.cc +++ b/kio/kssl/ksslcertdlg.cc @@ -60,7 +60,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _certs = new TQListView(this); _certs->addColumn(i18n("Certificate")); _certs->setResizeMode(TQListView::LastColumn); - TQFontMetrics fm( KGlobalSettings::generalFont() ); + TQFontMetrics fm( TDEGlobalSettings::generalFont() ); _certs->setMinimumHeight(4*fm.height()); grid->addWidget(_certs); diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 285bb1d2d..8e2192f7d 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -93,7 +93,7 @@ public: KSSLCertificate::KSSLCertificate() { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; #endif @@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() { KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) { d = new KSSLCertificatePrivate; d->m_stateCached = false; - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); #ifdef KSSL_HAVE_SSL d->m_cert = NULL; setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert())); @@ -637,7 +637,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi return errors; } - TQStringList qsl = KGlobal::dirs()->resourceDirs("kssl"); + TQStringList qsl = TDEGlobal::dirs()->resourceDirs("kssl"); if (qsl.isEmpty()) { errors << KSSLCertificate::NoCARoot; diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index bc67d3e6e..c6f76a190 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -127,9 +127,9 @@ KSSLInfoDlg::~KSSLInfoDlg() { } void KSSLInfoDlg::launchConfig() { - KProcess p; + TDEProcess p; p << "kcmshell" << "crypto"; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc index 5e7eb3a77..a34773989 100644 --- a/kio/kssl/ksslkeygen.cc +++ b/kio/kssl/ksslkeygen.cc @@ -166,9 +166,9 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits // back from there. Yes it's inefficient, but it doesn't happen // often and this way things are uniform. - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); - TQString path = KGlobal::dirs()->saveLocation("kssl"); + TQString path = TDEGlobal::dirs()->saveLocation("kssl"); KTempFile csrFile(path + "csr_", ".der"); if (!csrFile.fstream()) { diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 5a77b12bf..26f6114a1 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -98,7 +98,7 @@ KSSLSettings::KSSLSettings(bool readConfig) { d = new KSSLSettingsPrivate; m_cfg = new KConfig("cryptodefaults", false, false); - if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { + if (!TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) { //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl; } @@ -316,7 +316,7 @@ void KSSLSettings::save() { m_cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); #endif diff --git a/kio/kssl/ksslutils.cc b/kio/kssl/ksslutils.cc index cf024347c..80651757f 100644 --- a/kio/kssl/ksslutils.cc +++ b/kio/kssl/ksslutils.cc @@ -73,7 +73,7 @@ TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm) { int gmt; TQDateTime qdt = ASN1_UTCTIME_QDateTime(tm, &gmt); - qstr = KGlobal::locale()->formatDateTime(qdt, false, true); + qstr = TDEGlobal::locale()->formatDateTime(qdt, false, true); if (gmt) { qstr += " "; qstr += i18n("GMT"); diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..4f33d1389 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -54,7 +54,7 @@ namespace KPAC m_helper( new KProcIO ) { connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp index 6f419f5f5..19417b1fb 100644 --- a/kio/misc/kpac/downloader.cpp +++ b/kio/misc/kpac/downloader.cpp @@ -71,7 +71,7 @@ namespace KPAC if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() ) { bool dummy; - m_script = KGlobal::charsets()->codecForName( + m_script = TDEGlobal::charsets()->codecForName( job->queryMetaData( "charset" ), dummy )->toUnicode( m_data ); emit result( true ); } diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 760e654d7..40c52a1be 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); } - KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); + TDEGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl"); caVerifyUpdate(); cacheLoadDefaultPolicies(); certList.setAutoDelete(false); @@ -195,7 +195,7 @@ KSSLCNode *node; cfg->sync(); // insure proper permissions -- contains sensitive data - TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies")); + TQString cfgName(TDEGlobal::dirs()->findResource("config", "ksslpolicies")); if (!cfgName.isEmpty()) { ::chmod(TQFile::encodeName(cfgName), 0600); @@ -618,12 +618,12 @@ return false; /////////////////////////////////////////////////////////////////////////// void KSSLD::caVerifyUpdate() { - TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; + TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; if (!TQFile::exists(path)) return; cfg->setGroup(TQString::null); - TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 newStamp = TDEGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { @@ -634,7 +634,7 @@ void KSSLD::caVerifyUpdate() { } bool KSSLD::caRegenerate() { -TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; +TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt"; TQFile out(path); diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index a88f4e5b1..e87f96c31 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(KGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = KGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQDir dir(path, "*.kwl"); TQStringList rc; diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 1626f2ebc..79f050f51 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -44,7 +44,7 @@ TestService::TestService(const TQString &exec) this, TQT_SLOT(newApp(const TQCString&))); connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(KProcess *)), + connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(appExit())); TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index 9a76e6246..593dbba1e 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -22,7 +22,7 @@ public slots: protected: int result; TQString m_exec; - KProcess proc; + TDEProcess proc; }; #endif diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index 03bbbdac6..845f3367c 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) { assert( KProtocolInfo::showFilePreview( "file" ) == true ); assert( KProtocolInfo::showFilePreview( "audiocd" ) == false ); - assert( KGlobalSettings::showFilePreview( "audiocd:/" ) == false ); + assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); |