summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smb4k/core/smb4kbookmarkhandler.cpp2
-rw-r--r--smb4k/core/smb4kcore.cpp2
-rw-r--r--smb4k/core/smb4kmounter.cpp4
-rw-r--r--smb4k/core/smb4kpasswordhandler.cpp4
-rw-r--r--smb4k/core/smb4kpreviewer.cpp4
-rw-r--r--smb4k/core/smb4kscanner.cpp6
-rw-r--r--smb4k/core/smb4ksynchronizer.cpp2
-rw-r--r--smb4k/core/smb4tdefileio.cpp2
-rw-r--r--smb4k/dialogs/smb4kcustomoptionsdialog.cpp2
-rw-r--r--smb4k/smb4k.cpp2
10 files changed, 15 insertions, 15 deletions
diff --git a/smb4k/core/smb4kbookmarkhandler.cpp b/smb4k/core/smb4kbookmarkhandler.cpp
index 4661835..31bb670 100644
--- a/smb4k/core/smb4kbookmarkhandler.cpp
+++ b/smb4k/core/smb4kbookmarkhandler.cpp
@@ -96,7 +96,7 @@ void Smb4KBookmarkHandler::addBookmark( Smb4KBookmark *bookmark )
if ( TQString::compare( bookmark->share(), "homes" ) == 0 )
{
- TQString share = specifyUser( bookmark->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
+ TQString share = specifyUser( bookmark->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
bookmark->setShareName( share );
}
diff --git a/smb4k/core/smb4kcore.cpp b/smb4k/core/smb4kcore.cpp
index 43e3bc9..d550438 100644
--- a/smb4k/core/smb4kcore.cpp
+++ b/smb4k/core/smb4kcore.cpp
@@ -98,7 +98,7 @@ Smb4KCore::Smb4KCore() : TQObject()
connect( m_previewer, TQ_SIGNAL( state( int ) ),
this, TQ_SLOT( slotSetSynchronizerState( int ) ) );
- connect( kapp, TQ_SIGNAL( shutDown() ),
+ connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
}
diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp
index 254bfd9..685423d 100644
--- a/smb4k/core/smb4kmounter.cpp
+++ b/smb4k/core/smb4kmounter.cpp
@@ -93,7 +93,7 @@ Smb4KMounter::Smb4KMounter( TQObject *parent, const char *name ) : TQObject( par
connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
- connect( kapp, TQ_SIGNAL( shutDown() ),
+ connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
}
@@ -480,7 +480,7 @@ void Smb4KMounter::mountShare( const TQString &workgroup, const TQString &host,
if ( TQString::compare( share, "homes" ) == 0 )
{
- share_name = specifyUser( host, kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
+ share_name = specifyUser( host, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
}
else
{
diff --git a/smb4k/core/smb4kpasswordhandler.cpp b/smb4k/core/smb4kpasswordhandler.cpp
index ab8abad..7192fd0 100644
--- a/smb4k/core/smb4kpasswordhandler.cpp
+++ b/smb4k/core/smb4kpasswordhandler.cpp
@@ -109,9 +109,9 @@ void Smb4KPasswordHandler::open_close_wallet()
// Start the wallet manager before accessing the wallet. We
// do not care about the return value, because we do not do
// error handling here.
- if ( kapp )
+ if ( tdeApp )
{
- (void) kapp->tdeinitExec( "tdewalletmanager" );
+ (void) tdeApp->tdeinitExec( "tdewalletmanager" );
}
else
{
diff --git a/smb4k/core/smb4kpreviewer.cpp b/smb4k/core/smb4kpreviewer.cpp
index 68c70d2..da1066c 100644
--- a/smb4k/core/smb4kpreviewer.cpp
+++ b/smb4k/core/smb4kpreviewer.cpp
@@ -83,7 +83,7 @@ bool Smb4KPreviewer::preview( Smb4KPreviewItem *item )
if ( TQString::compare( item->share(), "homes" ) == 0 )
{
- TQString share_name = specifyUser( item->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
+ TQString share_name = specifyUser( item->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
if ( !share_name.isEmpty() )
{
@@ -237,7 +237,7 @@ void Smb4KPreviewer::slotProcessExited( TDEProcess * )
if ( passwordHandler()->askpass( m_item->workgroup(), m_item->host(),
m_item->share(), state,
- kapp->mainWidget() ? kapp->mainWidget() : 0,
+ tdeApp->mainWidget() ? tdeApp->mainWidget() : 0,
"AskPass" ) )
{
// Now we have a password. Retry.
diff --git a/smb4k/core/smb4kscanner.cpp b/smb4k/core/smb4kscanner.cpp
index 4531890..ef94bf9 100644
--- a/smb4k/core/smb4kscanner.cpp
+++ b/smb4k/core/smb4kscanner.cpp
@@ -906,7 +906,7 @@ void Smb4KScanner::processWorkgroupMembers()
if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(),
TQString(), Smb4KPasswordHandler::AccessDenied,
- kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
+ tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
{
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
}
@@ -1088,7 +1088,7 @@ void Smb4KScanner::processWorkgroupMembers()
if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(),
TQString(), Smb4KPasswordHandler::AccessDenied,
- kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
+ tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
{
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4" ).arg( Hosts ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip() ) ) );
}
@@ -1185,7 +1185,7 @@ void Smb4KScanner::processShares()
// Authentication failed:
emit failed();
- if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, kapp->mainWidget() ? kapp->mainWidget() : 0, "AskPass" ) )
+ if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), TQString(), Smb4KPasswordHandler::AccessDenied, tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "AskPass" ) )
{
m_queue.enqueue( new TQString( TQString( "%1:%2:%3:%4:%5" ).arg( Shares ).arg( m_priv->workgroup(), m_priv->host(), m_priv->ip(), TQString() ) ) );
}
diff --git a/smb4k/core/smb4ksynchronizer.cpp b/smb4k/core/smb4ksynchronizer.cpp
index 20a7288..fe1aa3a 100644
--- a/smb4k/core/smb4ksynchronizer.cpp
+++ b/smb4k/core/smb4ksynchronizer.cpp
@@ -72,7 +72,7 @@ Smb4KSynchronizer::Smb4KSynchronizer( TQObject *parent, const char *name )
connect( m_proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
- connect( kapp, TQ_SIGNAL( shutDown() ),
+ connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
}
diff --git a/smb4k/core/smb4tdefileio.cpp b/smb4k/core/smb4tdefileio.cpp
index 49c9f50..6e56fe4 100644
--- a/smb4k/core/smb4tdefileio.cpp
+++ b/smb4k/core/smb4tdefileio.cpp
@@ -72,7 +72,7 @@ Smb4KFileIO::Smb4KFileIO( TQObject *parent, const char *name ) : TQObject( paren
connect( m_proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
- connect( kapp, TQ_SIGNAL( shutDown() ),
+ connect( tdeApp, TQ_SIGNAL( shutDown() ),
this, TQ_SLOT( slotShutdown() ) );
}
diff --git a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
index d2a3ccc..404ba94 100644
--- a/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
+++ b/smb4k/dialogs/smb4kcustomoptionsdialog.cpp
@@ -111,7 +111,7 @@ Smb4KCustomOptionsDialog::Smb4KCustomOptionsDialog( Smb4KShareItem *share, TQWid
}
else
{
- m_homes_user = specifyUser( share->host(), kapp->mainWidget() ? kapp->mainWidget() : 0, "SpecifyUser" );
+ m_homes_user = specifyUser( share->host(), tdeApp->mainWidget() ? tdeApp->mainWidget() : 0, "SpecifyUser" );
m_initialized = m_homes_user.isEmpty() ? false : true;
}
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index 2725447..f37cc29 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -455,7 +455,7 @@ bool Smb4KApp::queryExit()
bool Smb4KApp::queryClose()
{
- if ( !kapp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() &&
+ if ( !tdeApp->sessionSaving() && isVisible() && m_system_tray->isEmbedded() &&
Smb4KSettings::embedIntoSystemTray() )
{
// This part has been 'stolen' from JuK application.