summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/favicons/favicons.cpp2
-rw-r--r--libkonq/kfileivi.cc8
-rw-r--r--libkonq/konq_bgnddlg.cc8
-rw-r--r--libkonq/konq_dirpart.cc14
-rw-r--r--libkonq/konq_filetip.cc2
-rw-r--r--libkonq/konq_historymgr.cc6
-rw-r--r--libkonq/konq_iconviewwidget.cc42
-rw-r--r--libkonq/konq_operations.cc14
-rw-r--r--libkonq/konq_pixmapprovider.cc4
-rw-r--r--libkonq/konq_popupmenu.cc4
-rw-r--r--libkonq/konq_propsview.cc16
-rw-r--r--libkonq/konq_settings.cc8
-rw-r--r--libkonq/konq_settings.h2
-rw-r--r--libkonq/konq_xmlguiclient.cc6
14 files changed, 68 insertions, 68 deletions
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index d0b761ae3..ed4cd39b5 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -59,7 +59,7 @@ FaviconsModule::FaviconsModule(const TQCString &obj)
{
// create our favicons folder so that KIconLoader knows about it
d = new FaviconsModulePrivate;
- d->faviconsDir = KGlobal::dirs()->saveLocation( "cache", "favicons/" );
+ d->faviconsDir = TDEGlobal::dirs()->saveLocation( "cache", "favicons/" );
d->faviconsDir.truncate(d->faviconsDir.length()-9); // Strip off "favicons/"
d->metaData.insert("ssl_no_client_cert", "TRUE");
d->metaData.insert("ssl_militant", "TRUE");
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc
index 3bc303bae..84691faa5 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/kfileivi.cc
@@ -98,7 +98,7 @@ void KFileIVI::invalidateThumb( int state, bool redraw )
break;
}
d->icons = TQIconSet();
- d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
+ d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( d->thumb, KIcon::Desktop, state ),
TQIconSet::Large, mode );
m_state = state;
@@ -206,7 +206,7 @@ void KFileIVI::setThumbnailPixmap( const TQPixmap & pixmap )
// TQIconSet::reset() doesn't seem to clear the other generated pixmaps,
// so we just create a blank TQIconSet here
d->icons = TQIconSet();
- d->icons.setPixmap( KGlobal::iconLoader()->iconEffect()->
+ d->icons.setPixmap( TDEGlobal::iconLoader()->iconEffect()->
apply( pixmap, KIcon::Desktop, KIcon::DefaultState ),
TQIconSet::Large, TQIconSet::Normal );
@@ -244,7 +244,7 @@ void KFileIVI::setEffect( int state )
}
// Do not update if the fingerprint is identical (prevents flicker)!
- KIconEffect *effect = KGlobal::iconLoader()->iconEffect();
+ KIconEffect *effect = TDEGlobal::iconLoader()->iconEffect();
bool haveEffect = effect->hasEffect( KIcon::Desktop, m_state ) !=
effect->hasEffect( KIcon::Desktop, state );
@@ -459,7 +459,7 @@ int KFileIVI::compare( TQIconViewItem *i ) const
void KFileIVI::updatePixmapSize()
{
int size = m_size ? m_size :
- KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>( iconView() );
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index ca21c69a3..1ba236a80 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -130,11 +130,11 @@ TQColor KonqBgndDialog::color() const
void KonqBgndDialog::initPictures()
{
- KGlobal::dirs()->addResourceType( "tiles",
- KGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
- kdDebug(1203) << KGlobal::dirs()->kde_default("data") + "konqueror/tiles/" << endl;
+ TDEGlobal::dirs()->addResourceType( "tiles",
+ TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
+ kdDebug(1203) << TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/" << endl;
- TQStringList list = KGlobal::dirs()->findAllResources("tiles");
+ TQStringList list = TDEGlobal::dirs()->findAllResources("tiles");
if ( list.isEmpty() )
m_comboPicture->comboBox()->insertItem( i18n("None") );
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index d64dde7ef..472ea1dbb 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -64,7 +64,7 @@ public:
void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
{
- KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
+ KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
iconSize.resize(1);
if (root) {
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
@@ -106,7 +106,7 @@ void KonqDirPart::KonqDirPartPrivate::findAvailableIconSizes(void)
int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred)
{
int s1 = iconSize[1];
- if (preferred == 0) return KGlobal::iconLoader()->currentSize(KIcon::Desktop);
+ if (preferred == 0) return TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
if (preferred <= s1) return s1;
for (uint i = 2; i <= iconSize.count(); i++) {
if (preferred <= iconSize[i]) {
@@ -183,7 +183,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
d->iconSize[6] = KIcon::SizeEnormous; // 128
d->iconSize[7] = 192;
d->iconSize[8] = 256;
- KIconTheme *root = KGlobal::instance()->iconLoader()->theme();
+ KIconTheme *root = TDEGlobal::instance()->iconLoader()->theme();
if (root)
{
TQValueList<int> avSizes = root->querySizes(KIcon::Desktop);
@@ -280,7 +280,7 @@ TQScrollView * KonqDirPart::scrollWidget()
void KonqDirPart::slotBackgroundSettings()
{
TQColor bgndColor = m_pProps->bgColor( widget() );
- TQColor defaultColor = KGlobalSettings::baseColor();
+ TQColor defaultColor = TDEGlobalSettings::baseColor();
// dlg must be created on the heap as widget() can get deleted while dlg.exec(),
// trying to delete dlg as its child then (#124210) - Frank Osterfeld
TQGuardedPtr<KonqBgndDialog> dlg = new KonqBgndDialog( widget(),
@@ -571,7 +571,7 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn )
void KonqDirPart::slotIncIconSize()
{
int s = m_pProps->iconSize();
- s = s ? s : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@@ -587,7 +587,7 @@ void KonqDirPart::slotIncIconSize()
void KonqDirPart::slotDecIconSize()
{
int s = m_pProps->iconSize();
- s = s ? s : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ s = s ? s : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
uint sizeIndex = 0;
for ( uint idx = 1; idx < d->iconSize.count() ; ++idx )
if (s == d->iconSize[idx]) {
@@ -603,7 +603,7 @@ void KonqDirPart::slotDecIconSize()
// Only updates Actions, a GUI update is done in the views by reimplementing this
void KonqDirPart::newIconSize( int size /*0=default, or 16,32,48....*/ )
{
- int realSize = (size==0) ? KGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size;
+ int realSize = (size==0) ? TDEGlobal::iconLoader()->currentSize( KIcon::Desktop ) : size;
m_paDecIconSize->setEnabled(realSize > d->iconSize[1]);
m_paIncIconSize->setEnabled(realSize < d->iconSize.back());
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index 03f7d64bf..fe1092f4c 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -136,7 +136,7 @@ void KonqFileTip::reposition()
// 4+: none
m_corner = 0;
// should the tooltip be shown to the left or to the right of the ivi ?
- TQRect desk = KGlobalSettings::desktopGeometry(rect.center());
+ TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center());
if (rect.center().x() + width() > desk.right())
{
// to the left
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index a01c53471..6d5f314b7 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -40,7 +40,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_updateTimer = new TQTimer( this );
// defaults
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
m_maxCount = config->readNumEntry( "Maximum of History entries", 500 );
m_maxCount = TQMAX( 1, m_maxCount );
@@ -493,7 +493,7 @@ void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString )
clearPending();
adjustSize();
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum of History entries", m_maxCount );
@@ -509,7 +509,7 @@ void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString )
clearPending();
adjustSize();
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs( config, "HistorySettings" );
config->writeEntry( "Maximum age of History entries", m_maxAgeDays );
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index cb2b9fe81..4be11a989 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -227,7 +227,7 @@ void KonqIconViewWidget::slotIconChanged( int group )
void KonqIconViewWidget::readAnimatedIconsConfig()
{
- KConfigGroup cfgGroup( KGlobal::config(), "DesktopIcons" );
+ KConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" );
d->doAnimations = cfgGroup.readBoolEntry( "Animated", true /*default*/ );
}
@@ -292,7 +292,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
else
#endif
{
- TQMovie movie = KGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
+ TQMovie movie = TDEGlobal::iconLoader()->loadMovie( d->pActiveItem->mouseOverAnimation(), KIcon::Desktop, d->pActiveItem->iconSize() );
if ( !movie.isNull() )
{
delete d->m_movie;
@@ -348,7 +348,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (d->bSoundPreviews && d->pSoundPlayer &&
d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype())
- && KGlobalSettings::showFilePreview(item->item()->url())
+ && TDEGlobalSettings::showFilePreview(item->item()->url())
&& topLevelWidget() == kapp->activeWindow())
{
d->pSoundItem = item;
@@ -467,7 +467,7 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect )
// This can happen if the icon was scaled to the desired size, so KIconLoader
// will happily return a movie with different dimensions than the icon
int iconSize=d->pActiveItem->iconSize();
- if (iconSize==0) iconSize = KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ if (iconSize==0) iconSize = TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if ( frame.width() != iconSize || frame.height() != iconSize ) {
d->pActiveItem->setAnimated( false );
d->m_movie->pause();
@@ -607,7 +607,7 @@ bool KonqIconViewWidget::boostPreview() const
{
if ( m_bDesktop ) return false;
- KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+ KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
return group.readBoolEntry( "BoostSize", false );
}
@@ -636,7 +636,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
if ( sizeChanged || previewSizeChanged )
{
- int realSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
// choose spacing depending on font, but min 5 (due to KFileIVI move limit)
setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ?
QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
@@ -707,7 +707,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
{
// can't call gridXValue() because this already would need the new itemTextPos()
- int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if ( m_bSetGridX )
if ( pos == TQIconView::Bottom )
@@ -725,7 +725,7 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
int* nx, int* ny )
{
int previewSize = previewIconSize( m_size );
- int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
// Grid size
// as KFileIVI limits to move an icon to x >= 5, y >= 5, we define a grid cell as:
@@ -786,7 +786,7 @@ void KonqIconViewWidget::calculateGridX()
int KonqIconViewWidget::gridXValue() const
{
// this method is only used in konqi as filemanager (not desktop)
- int sz = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int newGridX;
if ( itemTextPos() == TQIconView::Bottom )
@@ -811,7 +811,7 @@ void KonqIconViewWidget::setURL( const KURL &kurl )
stopImagePreview();
m_url = kurl;
- d->pFileTip->setPreview( KGlobalSettings::showFilePreview(m_url) );
+ d->pFileTip->setPreview( TDEGlobalSettings::showFilePreview(m_url) );
if ( m_url.isLocalFile() )
m_dotDirectoryPath = m_url.path(1).append( ".directory" );
@@ -824,7 +824,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
stopImagePreview(); // just in case
// Check config
- if ( !KGlobalSettings::showFilePreview( url() ) ) {
+ if ( !TDEGlobalSettings::showFilePreview( url() ) ) {
kdDebug(1203) << "Previews disabled for protocol " << url().protocol() << endl;
emit imagePreviewFinished();
return;
@@ -858,7 +858,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
return; // don't start the preview job if not really necessary
}
- int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int size;
d->bBoostPreview = boostPreview();
@@ -1099,7 +1099,7 @@ void KonqIconViewWidget::slotSelectionChanged()
KURL url = item->url();
TQString local_path = item->localPath();
- if ( url.directory(false) == KGlobalSettings::trashPath() )
+ if ( url.directory(false) == TDEGlobalSettings::trashPath() )
bInTrash = true;
if ( KProtocolInfo::supportsDeleting( url ) )
canDel++;
@@ -1287,7 +1287,7 @@ void KonqIconViewWidget::doubleClickTimeout()
{
url= ( static_cast<KFileIVI *>( item ) )->item()->url();
bool brenameTrash =false;
- if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
+ if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
@@ -1366,9 +1366,9 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
{
url = ( static_cast<KFileIVI *>( item ) )->item()->url();
bool brenameTrash =false;
- if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
+ if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
brenameTrash = true;
- if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
+ if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
{
d->firstClick = true;
d->mousePos = e->pos();
@@ -1564,7 +1564,7 @@ void KonqIconViewWidget::lineupIcons()
return;
}
- int iconSize = m_size ? m_size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int iconSize = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
typedef TQValueList<TQIconViewItem*> Bin;
Bin*** bins = new Bin**[nx];
@@ -1809,7 +1809,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
int KonqIconViewWidget::largestPreviewIconSize( int size ) const
{
- int iconSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (iconSize < 28)
return 48;
@@ -1825,7 +1825,7 @@ int KonqIconViewWidget::largestPreviewIconSize( int size ) const
int KonqIconViewWidget::previewIconSize( int size ) const
{
- int iconSize = size ? size : KGlobal::iconLoader()->currentSize( KIcon::Desktop );
+ int iconSize = size ? size : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
if (!d->bBoostPreview)
return iconSize;
@@ -1848,7 +1848,7 @@ void KonqIconViewWidget::visualActivate(TQIconViewItem * item)
// Adjust for scrolling (David)
rect.moveBy( -contentsX(), -contentsY() );
- if (KGlobalSettings::showKonqIconActivationEffect() == true) {
+ if (TDEGlobalSettings::showKonqIconActivationEffect() == true) {
KIconEffect::visualActivate(viewport(), rect, item->pixmap());
}
}
@@ -1895,7 +1895,7 @@ bool KonqIconViewWidget::caseInsensitiveSort() const
bool KonqIconViewWidget::canPreview( KFileItem* item )
{
- if ( !KGlobalSettings::showFilePreview( url() ) )
+ if ( !TDEGlobalSettings::showFilePreview( url() ) )
return false;
if ( d->pPreviewMimeTypes == 0L )
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index afed003dc..1f81c1027 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -77,7 +77,7 @@ KonqOperations::~KonqOperations()
void KonqOperations::editMimeType( const TQString & mimeType )
{
TQString keditfiletype = TQString::fromLatin1("keditfiletype");
- KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
+ KRun::runCommand( keditfiletype + " " + TDEProcess::quote(mimeType),
keditfiletype, keditfiletype /*unused*/);
}
@@ -474,7 +474,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
// (If this fails, there is a bug in KFileItem::acceptsDrops)
kdDebug(1203) << "KonqOperations::doDrop " << m_destURL.path() << "should be an executable" << endl;
Q_ASSERT ( access( TQFile::encodeName(m_destURL.path()), X_OK ) == 0 );
- KProcess proc;
+ TDEProcess proc;
proc << m_destURL.path() ;
// Launch executable for each of the files
KURL::List lst = m_info->lst;
@@ -482,7 +482,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
for ( ; it != lst.end() ; it++ )
proc << (*it).path(); // assume local files
kdDebug(1203) << "starting " << m_destURL.path() << " with " << lst.count() << " arguments" << endl;
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
}
delete this;
}
@@ -503,7 +503,7 @@ void KonqOperations::doFileCopy()
mlst.append(*it);
if ( local && KDesktopFile::isDesktopFile((*it).path()))
isDesktopFile = true;
- if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))
+ if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath()))
itemIsOnDesktop = true;
if ( local || (*it).protocol() != "trash" )
allItemsAreFromTrash = false;
@@ -511,7 +511,7 @@ void KonqOperations::doFileCopy()
bool linkOnly = false;
if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
- (m_destURL.path(1) == KGlobalSettings::desktopPath()) )
+ (m_destURL.path(1) == TDEGlobalSettings::desktopPath()) )
{
linkOnly = true;
}
@@ -638,10 +638,10 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL&
op->setOperation( job, MOVE, lst, newurl );
(void) new KonqCommandRecorder( KonqCommand::MOVE, lst, newurl, job );
// if moving the desktop then update config file and emit
- if ( oldurl.isLocalFile() && oldurl.path(1) == KGlobalSettings::desktopPath() )
+ if ( oldurl.isLocalFile() && oldurl.path(1) == TDEGlobalSettings::desktopPath() )
{
kdDebug(1203) << "That rename was the Desktop path, updating config files" << endl;
- KConfig *globalConfig = KGlobal::config();
+ KConfig *globalConfig = TDEGlobal::config();
KConfigGroupSaver cgs( globalConfig, "Paths" );
globalConfig->writePathEntry("Desktop" , newurl.path(), true, true );
globalConfig->sync();
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index a23ea3ff6..291857887 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -176,7 +176,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
// favicon? => blend the favicon in the large
if ( url.startsWith( "http:/" ) && icon.startsWith("favicons/") ) {
TQPixmap small = SmallIcon( icon, size );
- big = KGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
+ big = TDEGlobal::iconLoader()->loadIcon( KProtocolInfo::icon("http"),
KIcon::Panel, size );
int x = big.width() - small.width();
@@ -195,7 +195,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
}
else // not a favicon..
- big = KGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size );
+ big = TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Panel, size );
return big;
}
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 129542952..9e2f0bf53 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -356,7 +356,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
bool isTrashLink = false;
m_lstPopupURLs.clear();
int id = 0;
- setFont(KGlobalSettings::menuFont());
+ setFont(TDEGlobalSettings::menuFont());
m_pluginList.setAutoDelete( true );
m_ownActions.setHighlightingEnabled( true );
@@ -706,7 +706,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
// findAllResources() also removes duplicates
- const TQStringList entries = KGlobal::dirs()->findAllResources("data",
+ const TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
"konqueror/servicemenus/*.desktop",
false /* recursive */,
true /* unique */);
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index e1cee86d7..84d6fa5c5 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -121,15 +121,15 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
// So now we read the settings from the app global file, if this is the default props
if (!defaultProps)
{
- KConfigGroupSaver cgs2(KGlobal::config(), "Settings");
- m_textColor = KGlobal::config()->readColorEntry( "TextColor", &m_textColor );
- m_bgColor = KGlobal::config()->readColorEntry( "BgColor", &m_bgColor );
- m_bgPixmapFile = KGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile );
- //kdDebug(1203) << "KonqPropsView::KonqPropsView from KGlobal : BgImage=" << m_bgPixmapFile << endl;
+ KConfigGroupSaver cgs2(TDEGlobal::config(), "Settings");
+ m_textColor = TDEGlobal::config()->readColorEntry( "TextColor", &m_textColor );
+ m_bgColor = TDEGlobal::config()->readColorEntry( "BgColor", &m_bgColor );
+ m_bgPixmapFile = TDEGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile );
+ //kdDebug(1203) << "KonqPropsView::KonqPropsView from TDEGlobal : BgImage=" << m_bgPixmapFile << endl;
}
- KGlobal::dirs()->addResourceType("tiles",
- KGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
+ TDEGlobal::dirs()->addResourceType("tiles",
+ TDEGlobal::dirs()->kde_default("data") + "konqueror/tiles/");
}
bool KonqPropsView::isCaseInsensitiveSort() const
@@ -169,7 +169,7 @@ KConfigBase * KonqPropsView::currentColorConfig()
return currentConfig(); // Will create it if necessary
else
// Save color settings in app's file, not in view's file
- return KGlobal::config();
+ return TDEGlobal::config();
}
KonqPropsView::~KonqPropsView()
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index edde3c3fc..3d67c6798 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -48,7 +48,7 @@ KonqFMSettings * KonqFMSettings::settings()
{
if (!s_pSettings)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cgs(config, "FMSettings");
s_pSettings = new KonqFMSettings(config);
}
@@ -60,7 +60,7 @@ void KonqFMSettings::reparseConfiguration()
{
if (s_pSettings)
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver cgs(config, "FMSettings");
s_pSettings->init( config );
}
@@ -82,9 +82,9 @@ void KonqFMSettings::init( KConfig * config )
// Fonts and colors
m_standardFont = config->readFontEntry( "StandardFont" );
- m_normalTextColor = KGlobalSettings::textColor();
+ m_normalTextColor = TDEGlobalSettings::textColor();
m_normalTextColor = config->readColorEntry( "NormalTextColor", &m_normalTextColor );
- m_highlightedTextColor = KGlobalSettings::highlightedTextColor();
+ m_highlightedTextColor = TDEGlobalSettings::highlightedTextColor();
m_highlightedTextColor = config->readColorEntry( "HighlightedTextColor", &m_highlightedTextColor );
m_itemTextBackground = config->readColorEntry( "ItemTextBackground" );
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h
index 365e03fc9..b81457e02 100644
--- a/libkonq/konq_settings.h
+++ b/libkonq/konq_settings.h
@@ -63,7 +63,7 @@ public:
/**
* Reparse the configuration to update the already-created instances
*
- * Warning : you need to call KGlobal::config()->reparseConfiguration()
+ * Warning : you need to call TDEGlobal::config()->reparseConfiguration()
* first (This is not done here so that the caller can avoid too much
* reparsing if having several classes from the same config file)
*/
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc
index 5561ced8e..69afd7b0a 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cc
@@ -77,7 +77,7 @@ void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu )
void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
{
- static const TQString& tagAction = KGlobal::staticQString( "action" );
+ static const TQString& tagAction = TDEGlobal::staticQString( "action" );
if (!kapp->authorizeKAction(name))
return;
@@ -96,7 +96,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
void KonqXMLGUIClient::addSeparator( const TQDomElement &menu )
{
- static const TQString& tagSeparator = KGlobal::staticQString( "separator" );
+ static const TQString& tagSeparator = TDEGlobal::staticQString( "separator" );
TQDomElement parent = menu;
if ( parent.isNull() ) {
@@ -110,7 +110,7 @@ void KonqXMLGUIClient::addSeparator( const TQDomElement &menu )
//void KonqXMLGUIClient::addWeakSeparator()
//{
-// static const TQString& tagWeakSeparator = KGlobal::staticQString( "weakSeparator" );
+// static const TQString& tagWeakSeparator = TDEGlobal::staticQString( "weakSeparator" );
// m_menuElement.appendChild( m_doc.createElement( tagWeakSeparator ) );
//}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 00:38:17 +0000