summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/konq_dirpart.cpp2
-rw-r--r--libkonq/konq_faviconmgr.cpp4
-rw-r--r--libkonq/konq_filetip.cpp4
-rw-r--r--libkonq/konq_historymgr.cpp16
-rw-r--r--libkonq/konq_iconviewwidget.cpp6
-rw-r--r--libkonq/konq_operations.cpp6
-rw-r--r--libkonq/konq_pixmapprovider.cpp2
-rw-r--r--libkonq/konq_popupmenu.cpp26
-rw-r--r--libkonq/konq_undo.cpp6
-rw-r--r--libkonq/konq_xmlguiclient.cpp2
-rw-r--r--libkonq/konqbookmarkmanager.h2
11 files changed, 38 insertions, 38 deletions
diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp
index c4d90d5b7..2066d9600 100644
--- a/libkonq/konq_dirpart.cpp
+++ b/libkonq/konq_dirpart.cpp
@@ -168,7 +168,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
- connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+ connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
#if 0
// Extract 6 icon sizes from the icon theme.
// Use 16,22,32,48,64,128 as default.
diff --git a/libkonq/konq_faviconmgr.cpp b/libkonq/konq_faviconmgr.cpp
index c5c828ec0..411d680f9 100644
--- a/libkonq/konq_faviconmgr.cpp
+++ b/libkonq/konq_faviconmgr.cpp
@@ -44,7 +44,7 @@ void KonqFavIconMgr::setIconForURL(const KURL &url, const KURL &iconURL)
TQByteArray data;
TQDataStream str(data, IO_WriteOnly);
str << url << iconURL;
- kapp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
+ tdeApp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
}
void KonqFavIconMgr::downloadHostIcon(const KURL &url)
@@ -52,6 +52,6 @@ void KonqFavIconMgr::downloadHostIcon(const KURL &url)
TQByteArray data;
TQDataStream str(data, IO_WriteOnly);
str << url;
- kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
+ tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
}
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index 5bc3de86b..ee5e9e272 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -217,12 +217,12 @@ void KonqFileTip::setFilter( bool enable )
if ( enable == m_filter ) return;
if ( enable ) {
- kapp->installEventFilter( this );
+ tdeApp->installEventFilter( this );
TQApplication::setGlobalMouseTracking( true );
}
else {
TQApplication::setGlobalMouseTracking( false );
- kapp->removeEventFilter( this );
+ tdeApp->removeEventFilter( this );
}
m_filter = enable;
}
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index ac6916c81..8d07ab416 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -50,8 +50,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_filename = locateLocal( "data",
TQString::fromLatin1("konqueror/konq_history" ));
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
// take care of the completion object
@@ -355,7 +355,7 @@ void KonqHistoryManager::emitAddToHistory( const KonqHistoryEntry& entry )
// Protection against very long urls (like data:)
if ( data.size() > 4096 )
return;
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyHistoryEntry(KonqHistoryEntry, TQCString)",
data );
}
@@ -397,7 +397,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL& url )
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
stream << url << objId();
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyRemove(KURL, TQCString)", data );
}
@@ -406,7 +406,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL::List& urls )
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
stream << urls << objId();
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyRemove(KURL::List, TQCString)", data );
}
@@ -415,7 +415,7 @@ void KonqHistoryManager::emitClear()
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
stream << objId();
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyClear(TQCString)", data );
}
@@ -424,7 +424,7 @@ void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count )
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
stream << count << objId();
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyMaxCount(TQ_UINT32, TQCString)", data );
}
@@ -433,7 +433,7 @@ void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days )
TQByteArray data;
TQDataStream stream( data, IO_WriteOnly );
stream << days << objId();
- kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+ tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
"notifyMaxAge(TQ_UINT32, TQCString)", data );
}
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 09ed599fd..0dbd11782 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -127,8 +127,8 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
connect( this, TQ_SIGNAL( selectionChanged() ),
this, TQ_SLOT( slotSelectionChanged() ) );
- kapp->addKipcEventMask( KIPC::IconChanged );
- connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+ tdeApp->addKipcEventMask( KIPC::IconChanged );
+ connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) );
connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) );
connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
@@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype())
&& TDEGlobalSettings::showFilePreview(item->item()->url())
- && topLevelWidget() == kapp->activeWindow())
+ && topLevelWidget() == tdeApp->activeWindow())
{
d->pSoundItem = item;
d->bSoundItemClicked = false;
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 520506879..a57746bee 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -296,7 +296,7 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
if (!keyName.isEmpty())
{
// Check kmessagebox setting... erase & copy to konquerorrc.
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver saver(config, "Notification Messages");
if (!config->readBoolEntry(keyName, true))
{
@@ -512,7 +512,7 @@ void KonqOperations::doFileCopy()
}
bool linkOnly = false;
- if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
+ if (isDesktopFile && !tdeApp->authorize("run_desktop_files") &&
(m_destURL.path(1) == TDEGlobalSettings::desktopPath()) )
{
linkOnly = true;
@@ -520,7 +520,7 @@ void KonqOperations::doFileCopy()
if ( !mlst.isEmpty() && m_destURL.protocol() == "trash" )
{
- if ( itemIsOnDesktop && !kapp->authorize("editable_desktop_icons") )
+ if ( itemIsOnDesktop && !tdeApp->authorize("editable_desktop_icons") )
{
delete this;
return;
diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp
index b814af2f3..e560cc63c 100644
--- a/libkonq/konq_pixmapprovider.cpp
+++ b/libkonq/konq_pixmapprovider.cpp
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
KonqPixmapProvider * KonqPixmapProvider::self()
{
if ( !s_self )
- s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" );
+ s_self = new KonqPixmapProvider( tdeApp, "KonqPixmapProvider" );
return s_self;
}
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index 7d7600b8c..c26484485 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -314,13 +314,13 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg)
}
TQStringList list = cfg.readListEntry("X-TDE-AuthorizeAction");
- if (kapp && !list.isEmpty())
+ if (tdeApp && !list.isEmpty())
{
for(TQStringList::ConstIterator it = list.begin();
it != list.end();
++it)
{
- if (!kapp->authorize((*it).stripWhiteSpace()))
+ if (!tdeApp->authorize((*it).stripWhiteSpace()))
{
return false;
}
@@ -433,7 +433,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
while (!d->localURLSlotFired) {
- kapp->eventLoop()->enterLoop();
+ tdeApp->eventLoop()->enterLoop();
}
if (d->localURLResultIsLocal) {
realURL = d->localURLResultURL;
@@ -488,10 +488,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if (!isCurrentTrash)
addMerge( "konqueror" );
- bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
+ bool isKDesktop = TQCString( tdeApp->name() ) == "kdesktop";
if (( kpf & ShowProperties ) && isKDesktop &&
- !kapp->authorize("editable_desktop_icons"))
+ !tdeApp->authorize("editable_desktop_icons"))
{
kpf &= ~ShowProperties; // remove flag
}
@@ -584,7 +584,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
addDel = true;
}
else {
- TDEConfigGroup configGroup( kapp->config(), "KDE" );
+ TDEConfigGroup configGroup( tdeApp->config(), "KDE" );
if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
addDel = true;
}
@@ -634,7 +634,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
if (m_lstItems.count() > 1)
act->setEnabled(false);
- if (kapp->authorizeTDEAction("bookmarks"))
+ if (tdeApp->authorizeTDEAction("bookmarks"))
addAction( act );
if (bIsLink)
addGroup( "linkactions" );
@@ -715,7 +715,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( cfg.hasKey( "X-TDE-ShowIfRunning" ) )
{
const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" );
- if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) )
+ if ( !tdeApp->dcopClient()->isApplicationRegistered( app.utf8() ) )
continue;
}
if ( cfg.hasKey( "X-TDE-ShowIfDcopCall" ) )
@@ -723,7 +723,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
TQString dcopcall = cfg.readEntry( "X-TDE-ShowIfDcopCall" );
const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();
- //if( !kapp->dcopClient()->isApplicationRegistered( app ))
+ //if( !tdeApp->dcopClient()->isApplicationRegistered( app ))
// continue; //app does not exist so cannot send call
TQByteArray dataToSend;
@@ -739,7 +739,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
continue; //Be safe.
}
- if(!kapp->dcopClient()->call( app, object,
+ if(!tdeApp->dcopClient()->call( app, object,
function.utf8(),
dataToSend, replyType, replyData, true, 1000))
continue;
@@ -839,7 +839,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
TDETrader::OfferList offers;
- if (kapp->authorizeTDEAction("openwith"))
+ if (tdeApp->authorizeTDEAction("openwith"))
{
TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'";
TQString subConstraint = " and '%1' in ServiceTypes";
@@ -1221,7 +1221,7 @@ void KonqPopupMenu::slotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool
d->localURLSlotFired = true;
d->localURLResultURL = url;
d->localURLResultIsLocal = isLocal;
- kapp->eventLoop()->exitLoop();
+ tdeApp->eventLoop()->exitLoop();
}
void KonqPopupMenu::slotLocalURLKIODestroyed()
@@ -1230,7 +1230,7 @@ void KonqPopupMenu::slotLocalURLKIODestroyed()
d->localURLSlotFired = true;
d->localURLResultURL = KURL();
d->localURLResultIsLocal = false;
- kapp->eventLoop()->exitLoop();
+ tdeApp->eventLoop()->exitLoop();
}
}
diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp
index 9272bbf5c..4ecca65fa 100644
--- a/libkonq/konq_undo.cpp
+++ b/libkonq/konq_undo.cpp
@@ -197,8 +197,8 @@ public:
KonqUndoManager::KonqUndoManager()
: DCOPObject( "KonqUndoManager" )
{
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
d = new KonqUndoManagerPrivate;
d->m_syncronized = initializeFromKDesky();
@@ -625,7 +625,7 @@ bool KonqUndoManager::initializeFromKDesky()
// ### FIXME: post 2.1
return false;
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if ( client->appId() == "kdesktop" ) // we are master :)
return true;
diff --git a/libkonq/konq_xmlguiclient.cpp b/libkonq/konq_xmlguiclient.cpp
index a12d237c6..2352498c1 100644
--- a/libkonq/konq_xmlguiclient.cpp
+++ b/libkonq/konq_xmlguiclient.cpp
@@ -79,7 +79,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
{
static const TQString& tagAction = TDEGlobal::staticQString( "action" );
- if (!kapp->authorizeTDEAction(name))
+ if (!tdeApp->authorizeTDEAction(name))
return;
handlePendingSeparator();
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 88ff45ced..1c6f092f4 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -22,7 +22,7 @@ public:
{
TDEIO::file_copy(KURL::fromPathOrURL(globalBookmarkFile),
KURL::fromPathOrURL(bookmarksFile));
- kapp->processEvents(3000); // Allows up to 3 seconds to copy the file
+ tdeApp->processEvents(3000); // Allows up to 3 seconds to copy the file
}
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-12 23:21:44 +0000