diff options
Diffstat (limited to 'adept/libadept/dpkgpm-gui.cpp')
-rw-r--r-- | adept/libadept/dpkgpm-gui.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp index 828d18f..9a3fae8 100644 --- a/adept/libadept/dpkgpm-gui.cpp +++ b/adept/libadept/dpkgpm-gui.cpp @@ -6,7 +6,7 @@ #include <fcntl.h> #include <iostream> -#include <qstrlist.h> +#include <tqstrlist.h> #include <kapplication.h> #include <klistbox.h> #include <klocale.h> @@ -43,8 +43,8 @@ pkgPackageManager *PkgSystem::CreatePM( pkgDepCache *c ) const { std::cerr << "kapture::PkgSystem::CreatePM()" << std::endl; adept::DPkgPM *pm = new adept::DPkgPM( c, m_terminalPart ); - connect( pm, SIGNAL( statusChanged( int, QString ) ), - this, SIGNAL( statusChanged( int, QString ) ) ); + connect( pm, TQT_SIGNAL( statusChanged( int, TQString ) ), + this, TQT_SIGNAL( statusChanged( int, TQString ) ) ); return pm; } @@ -57,17 +57,17 @@ bool DPkgPM::forkDpkg( char *const argv[] ) { bool ok = true; std::cerr << "adept::DPkgPM::forkDpkg ()" << std::endl; - QStrList l; + TQStrList l; for (int i = 0; argv[i]; i ++) l.append( argv[i] ); m_processRunning = true; - connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ), - this, SLOT( processExit( KProcess * ) ) ); - connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ), - this, SLOT( processExitC( const KProcess * ) ) ); - connect( m_terminalPart, SIGNAL( forkedChild() ), - this, SLOT( setupDpkgChild() ) ); + connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ), + this, TQT_SLOT( processExit( KProcess * ) ) ); + connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ), + this, TQT_SLOT( processExitC( const KProcess * ) ) ); + connect( m_terminalPart, TQT_SIGNAL( forkedChild() ), + this, TQT_SLOT( setupDpkgChild() ) ); terminal()->startProgram( u8( argv[0] ), l ); @@ -110,19 +110,19 @@ bool DPkgPM::forkScript (const char *cmd, bool fP) SetCloseExec (m_scriptPipe[0], true); SetCloseExec (m_scriptPipe[1], true); } - QStrList l; + TQStrList l; l.append ("/bin/sh"); l.append ("-c"); l.append (cmd); if (fP) { - connect( m_terminalPart, SIGNAL( forkedChild() ), - this, SLOT( setupScriptPipe() ) ); + connect( m_terminalPart, TQT_SIGNAL( forkedChild() ), + this, TQT_SLOT( setupScriptPipe() ) ); } - connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ), - this, SLOT( processExit( KProcess * ) ) ); - connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ), - this, SLOT( processExitC( const KProcess * ) ) ); + connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ), + this, TQT_SLOT( processExit( KProcess * ) ) ); + connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ), + this, TQT_SLOT( processExitC( const KProcess * ) ) ); m_processRunning = true; terminal()->startProgram( u8( "/bin/sh" ), l); @@ -183,7 +183,7 @@ bool DPkgPM::Go( int ) std::cerr << "kapture::DPkgPM::Go ()" << std::endl; statusChanged( 0, i18n( "Preparing..." ) ); bool ret = aptFront::DPkgPM::Go(-1); - QStrList l; + TQStrList l; l.append("echo"); l.append("dpkg run finished!"); terminal()->startProgram( u8( "echo" ), l ); @@ -197,10 +197,10 @@ void DPkgPM::dpkgMonitor () kapp->processEvents(); } -void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r ) +void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r ) { std::string op, msg; - aptFront::DPkgPM::updateStatus( pkg, ev, r ); + aptFront::DPkgPM::updatetqStatus( pkg, ev, r ); entity::Package p = cache::Global::get().packages().packageByName( pkg ); if ( m_currentOp == OInstall ) { @@ -245,12 +245,12 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r ) msg = u8( i18n( "Purged %1" ) ); } - std::cerr << "updateStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl; - std::cerr << "updateStatus: msg = " << msg << std::endl; - std::cerr << "updateStatus: seen = " << m_seenOpCount + std::cerr << "updatetqStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl; + std::cerr << "updatetqStatus: msg = " << msg << std::endl; + std::cerr << "updatetqStatus: seen = " << m_seenOpCount << ", total = " << m_totalOpCount << std::endl; statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount, - u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) ); + u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) ); } } |