diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:37:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:37:21 -0600 |
| commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
| tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /korn/kio.cpp | |
| parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
| download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'korn/kio.cpp')
| -rw-r--r-- | korn/kio.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/korn/kio.cpp b/korn/kio.cpp index a21311980..63a9dc683 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -90,7 +90,7 @@ KKioDrop::KKioDrop() _mailurls( 0 ) { _kurl = new KURL; - _metadata = new KIO::MetaData; + _metadata = new TDEIO::MetaData; //Initialising protocol; if no protocol is set before first use, it will use the first protocol _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default @@ -112,7 +112,7 @@ KKioDrop::KKioDrop() _mailurls = new TQValueList<FileInfo>; } -KKioDrop::KKioDrop( KConfigGroup* ) +KKioDrop::KKioDrop( TDEConfigGroup* ) : KPollableDrop(), _kurl( 0 ), _metadata( 0 ), @@ -128,7 +128,7 @@ KKioDrop::KKioDrop( KConfigGroup* ) _mailurls( 0 ) { _kurl = new KURL; - _metadata = new KIO::MetaData; + _metadata = new TDEIO::MetaData; //Initialising protocol; if no protocol is set before first use, it will use the first protocol _protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default @@ -154,11 +154,11 @@ KKioDrop::KKioDrop( KConfigGroup* ) void KKioDrop::setKioServer( const TQString & proto, const TQString & server, int port ) { - //Settings default for last vars; could not inline because KIO::MetaData-object is not defined in header. - setKioServer( proto, server, port, KIO::MetaData(), false, true ); + //Settings default for last vars; could not inline because TDEIO::MetaData-object is not defined in header. + setKioServer( proto, server, port, TDEIO::MetaData(), false, true ); } -void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const KIO::MetaData metadata, bool ssl, +void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int port, const TDEIO::MetaData metadata, bool ssl, bool setProtocol ) { TQString auth; @@ -351,7 +351,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr _protocol = Protocols::firstProtocol()->getKIOProtocol(); val = *map.find( "server" ); - setKioServer( val2, val, (*map.find( "port" )).toInt(), KIO::MetaData(), *map.find( "ssl" ) == "true", false ); + setKioServer( val2, val, (*map.find( "port" )).toInt(), TDEIO::MetaData(), *map.find( "ssl" ) == "true", false ); _kurl->setUser( *map.find( "username" ) ); _kurl->setPath( *map.find( "mailbox" ) ); @@ -373,7 +373,7 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr return true; } -bool KKioDrop::writeConfigGroup( KConfigBase& cfg ) const +bool KKioDrop::writeConfigGroup( TDEConfigBase& cfg ) const { KPollableDrop::writeConfigGroup( cfg ); /*TQString p; @@ -431,9 +431,9 @@ void KKioDrop::deleteMailsCanceled() //Private slots for displaying connection errors void KKioDrop::slotConnectionError( int number, const TQString& arg ) { - kdError() << KIO::buildErrorString( number, arg ) << endl; + kdError() << TDEIO::buildErrorString( number, arg ) << endl; // if( passivePopup() ) - emitShowPassivePopup( KIO::buildErrorString( number, arg ) ); + emitShowPassivePopup( TDEIO::buildErrorString( number, arg ) ); } void KKioDrop::slotConnectionWarning( const TQString& msg ) |